Skip to content

Commit 8e9b8f6

Browse files
authored
Scripts/Stratholme: Add waypoints to Timmy the Cruel (TrinityCore#31023)
1 parent 539f6e4 commit 8e9b8f6

File tree

2 files changed

+54
-2
lines changed

2 files changed

+54
-2
lines changed
Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
-- Stratholme: Move Timmy the Cruel to database
2+
SET @TIMMY=10808;
3+
SET @CGUID=39690;
4+
SET @SGROUP=327;
5+
6+
DELETE FROM `creature` WHERE `guid`=@CGUID AND `id`=@TIMMY;
7+
INSERT INTO `creature` (`guid`, `id`, `map`, `zoneId`, `areaId`, `spawnMask`, `phaseMask`, `modelid`, `equipment_id`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`, `wander_distance`, `currentwaypoint`, `curhealth`, `curmana`, `MovementType`, `npcflag`, `unit_flags`, `dynamicflags`, `ScriptName`, `StringId`, `VerifiedBuild`) VALUES
8+
(@CGUID, @TIMMY, 329, 2017, 0, 1, 1, 0, 0, 3625.3583984375, -3188.1083984375, 130.3984832763671875, 4.834561824798583984, 604800, 0, 0, 22968, 0, 2, 0, 0, 0, '', NULL, 11159); -- Timmy the Cruel (Area: 0 - Difficulty: 0) CreateObject2 (possible waypoints or random movement)
9+
10+
DELETE FROM `spawn_group_template` WHERE `groupId`=@SGROUP;
11+
INSERT INTO `spawn_group_template` (`groupId`, `groupName`, `groupFlags`) VALUES
12+
(@SGROUP, 'Stratholme - Timmy the Cruel', 4);
13+
14+
DELETE FROM `spawn_group` WHERE `groupId`=@SGROUP;
15+
INSERT INTO `spawn_group` (`groupId`, `spawnType`, `spawnId`) VALUES
16+
(@SGROUP, 0, @CGUID);
17+
18+
-- Thanks @Rushor for wp
19+
SET @PATH=@TIMMY * 10;
20+
DELETE FROM `waypoint_data` WHERE `id`=@PATH;
21+
INSERT INTO `waypoint_data` (`id`, `point`, `position_x`, `position_y`, `position_z`, `orientation`, `delay`, `move_type`, `action`, `action_chance`, `wpguid`) VALUES
22+
(@PATH, 1, 3625.36, -3188.11, 130.398, NULL, 0, 0, 0, 100, 0),
23+
(@PATH, 2, 3637.91, -3196.12, 128.729, NULL, 0, 0, 0, 100, 0),
24+
(@PATH, 3, 3653.79, -3202.95, 127.506, NULL, 0, 0, 0, 100, 0),
25+
(@PATH, 4, 3674.53, -3204.6, 126.548, NULL, 0, 0, 0, 100, 0),
26+
(@PATH, 5, 3689.46, -3191.14, 127.1, NULL, 0, 0, 0, 100, 0),
27+
(@PATH, 6, 3657.53, -3188.62, 126.672, NULL, 0, 0, 0, 100, 0),
28+
(@PATH, 7, 3655.75, -3177.17, 126.752, NULL, 0, 0, 0, 100, 0),
29+
(@PATH, 8, 3672.97, -3171.48, 126.442, NULL, 0, 0, 0, 100, 0),
30+
(@PATH, 9, 3680.46, -3162.15, 126.653, NULL, 0, 0, 0, 100, 0),
31+
(@PATH, 10, 3689.46, -3191.14, 127.1, NULL, 0, 0, 0, 100, 0),
32+
(@PATH, 11, 3674.53, -3204.6, 126.548, NULL, 0, 0, 0, 100, 0),
33+
(@PATH, 12, 3673.84, -3194.01, 126.247, NULL, 0, 0, 0, 100, 0),
34+
(@PATH, 13, 3668.11, -3185.75, 126.224, NULL, 0, 0, 0, 100, 0),
35+
(@PATH, 14, 3651.18, -3196.81, 127.28, NULL, 0, 0, 0, 100, 0),
36+
(@PATH, 15, 3658.59, -3188.92, 126.64, NULL, 0, 0, 0, 100, 0),
37+
(@PATH, 16, 3668.11, -3185.75, 126.224, NULL, 0, 0, 0, 100, 0),
38+
(@PATH, 17, 3678.24, -3171.01, 126.461, NULL, 0, 0, 0, 100, 0),
39+
(@PATH, 18, 3653.57, -3174.7, 127.125, NULL, 0, 0, 0, 100, 0),
40+
(@PATH, 19, 3645.68, -3185.68, 127.561, NULL, 0, 0, 0, 100, 0),
41+
(@PATH, 20, 3634.09, -3178.54, 128.862, NULL, 0, 0, 0, 100, 0),
42+
(@PATH, 21, 3623.95, -3180.23, 130.456, NULL, 0, 0, 0, 100, 0);
43+
44+
UPDATE `creature_template_addon` SET `SheathState`=1 WHERE `entry`=@TIMMY; -- 10808 (Timmy the Cruel)
45+
46+
DELETE FROM `creature_addon` WHERE `guid`=@CGUID;
47+
INSERT INTO `creature_addon` (`guid`, `path_id`, `mount`, `MountCreatureID`, `StandState`, `AnimTier`, `VisFlags`, `SheathState`, `PvPFlags`, `emote`, `visibilityDistanceType`, `auras`) VALUES
48+
(@CGUID, @PATH, 0, 0, 0, 0, 0, 1, 0, 0, 3, NULL);

src/server/scripts/EasternKingdoms/Stratholme/instance_stratholme.cpp

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,11 @@ enum StratholmeMisc
4848
SAY_YSIDA_SAVED = 0
4949
};
5050

51-
Position const timmyTheCruelSpawnPosition = { 3625.358f, -3188.108f, 130.3985f, 4.834562f };
51+
enum SpawnGroups
52+
{
53+
SPAWN_GROUP_STR_TIMMY = 327
54+
};
55+
5256
EllipseBoundary const beforeScarletGate(Position(3671.158f, -3181.79f), 60.0f, 40.0f);
5357

5458
enum class StratholmeGateTrapType : uint8
@@ -137,7 +141,7 @@ class instance_stratholme : public InstanceMapScript
137141
{
138142
if (++scarletsKilled >= TIMMY_THE_CRUEL_CRUSADERS_REQUIRED)
139143
{
140-
instance->SummonCreature(NPC_TIMMY_THE_CRUEL, timmyTheCruelSpawnPosition);
144+
instance->SpawnGroupSpawn(SPAWN_GROUP_STR_TIMMY);
141145
timmySpawned = true;
142146
}
143147
}

0 commit comments

Comments
 (0)