mirror of
https://github.com/cmangos/mangos-tbc
synced 2026-08-14 04:26:10 -04:00
Rework Shadowfang Keep prisoners
* Rework Shadowfang Keep prisoners: - Remove workaround using duplicate waypoints to time the event - Use timers instead and adjust timers - Add missing emotes and remove incorrect ones - Adjust a few positions and orientations - Adjust event sequencing - Remove unneeded code - Fix despawn and move back to first waypoint This closes https://github.com/cmangos/mangos-tbc/pull/440 and closes https://github.com/cmangos/wotlk-db/issues/363
This commit is contained in:
cala
parent
201e7afdf1
commit
3833036428
3 changed files with 134 additions and 101 deletions
|
|
@ -2729,14 +2729,14 @@ INSERT INTO script_texts (entry,content_default,sound,type,language,emote,broadc
|
|||
|
||||
-- -1 033 000 SHADOWFANG KEEP
|
||||
INSERT INTO script_texts (entry,content_default,sound,type,language,emote,broadcast_text_id,comment) VALUES
|
||||
('-1033000','Follow me and I''ll open the courtyard door for you.','0','0','7','1','1331','prisoner ashcrombe SAY_FREE_AS'),
|
||||
('-1033001','I have just the spell to get this door open. Too bad the cell doors weren''t locked so haphazardly.','0','0','7','1','1332','prisoner ashcrombe SAY_OPEN_DOOR_AS'),
|
||||
('-1033002','There it is! Wide open. Good luck to you conquering what lies beyond. I must report back to the Kirin Tor at once!','0','0','7','1','1334','prisoner ashcrombe SAY_POST_DOOR_AS'),
|
||||
('-1033000','Follow me and I''ll open the courtyard door for you.','0','0','7','25','1331','prisoner ashcrombe SAY_FREE_AS'),
|
||||
('-1033001','I have just the spell to get this door open. Too bad the cell doors weren''t locked so haphazardly.','0','0','7','0','1332','prisoner ashcrombe SAY_OPEN_DOOR_AS'),
|
||||
('-1033002','There it is! Wide open. Good luck to you conquering what lies beyond. I must report back to the Kirin Tor at once!','0','0','7','0','1334','prisoner ashcrombe SAY_POST_DOOR_AS'),
|
||||
|
||||
('-1033003','Free from this wretched cell at last! Let me show you to the courtyard....','0','0','1','1','1320','prisoner adamant SAY_FREE_AD'),
|
||||
('-1033004','You are indeed courageous for wanting to brave the horrors that lie beyond this door.','0','0','1','1','1321','prisoner adamant SAY_OPEN_DOOR_AD'),
|
||||
('-1033005','There we go!','0','0','1','1','1323','prisoner adamant SAY_POST1_DOOR_AD'),
|
||||
('-1033006','Good luck with Arugal. I must hurry back to Hadrec now.','0','0','1','1','1324','prisoner adamant SAY_POST2_DOOR_AD'),
|
||||
('-1033005','There we go!','0','0','1','25','1323','prisoner adamant SAY_POST1_DOOR_AD'),
|
||||
('-1033006','Good luck with Arugal. I must hurry back to Hadrec now.','0','0','1','0','1324','prisoner adamant SAY_POST2_DOOR_AD'),
|
||||
|
||||
('-1033007','About time someone killed the wretch.','0','0','1','1','1328','prisoner adamant SAY_BOSS_DIE_AD'),
|
||||
('-1033008','For once I agree with you... scum.','0','0','7','1','1329','prisoner ashcrombe SAY_BOSS_DIE_AS'),
|
||||
|
|
@ -2748,7 +2748,7 @@ INSERT INTO script_texts (entry,content_default,sound,type,language,emote,broadc
|
|||
|
||||
('-1033013','Who dares interfere with the Sons of Arugal?','5791','1','0','0','1435','boss_arugal YELL_FENRUS'),
|
||||
('-1033014','%s vanishes.','0','2','0','0','1343','prisoner ashcrombe EMOTE_VANISH_AS'),
|
||||
('-1033015','%s fumbles with the rusty lock on the courtyard door.','0','2','0','0','1322','prisoner adamant EMOTE_UNLOCK_DOOR_AD'),
|
||||
('-1033015','%s fumbles with the rusty lock on the courtyard door.','0','2','0','69','1322','prisoner adamant EMOTE_UNLOCK_DOOR_AD'),
|
||||
('-1033016','Arrrgh!','0','0','0','0','1458','deathstalker vincent SAY_VINCENT_DIE'),
|
||||
('-1033017','You, too, shall serve!','5793','1','0','0','6115','boss_arugal YELL_AGGRO'),
|
||||
('-1033018','Another falls!','5795','1','0','0','6116','boss_arugal YELL_KILLED_PLAYER'),
|
||||
|
|
@ -5682,30 +5682,27 @@ INSERT INTO script_waypoint (entry, pathId, pointid, position_x, position_y, pos
|
|||
(3849,0,8,-237.514,2142.07,87.012,0,0,0,''),
|
||||
(3849,0,9,-235.638,2149.23,90.587,0,0,0,''),
|
||||
(3849,0,10,-237.188,2151.95,90.624,0,0,0,''),
|
||||
(3849,0,11,-241.162,2153.65,90.624,0,0,0,'SAY_OPEN_DOOR_AD'),
|
||||
(3849,0,12,-241.13,2154.56,90.624,0,2000,0,'SAY_UNLOCK_DOOR_AD'),
|
||||
(3849,0,13,-241.13,2154.56,90.624,0,3000,0,''),
|
||||
(3849,0,14,-241.13,2154.56,90.624,0,5000,0,'SAY_POST1_DOOR_AD'),
|
||||
(3849,0,15,-241.13,2154.56,90.624,0,0,0,'SAY_POST2_DOOR_AD'),
|
||||
(3849,0,16,-208.764,2141.6,90.6257,0,0,0,''),
|
||||
(3849,0,17,-206.441,2143.51,90.4287,0,0,0,''),
|
||||
(3849,0,18,-203.715,2145.85,88.7052,0,0,0,''),
|
||||
(3849,0,19,-199.199,2144.88,86.501,0,0,0,''),
|
||||
(3849,0,20,-195.798,2143.58,86.501,0,0,0,''),
|
||||
(3849,0,21,-190.029,2141.38,83.2712,0,0,0,''),
|
||||
(3849,0,22,-189.353,2138.65,83.1102,0,0,0,''),
|
||||
(3849,0,23,-190.304,2135.73,81.5288,0,0,0,''),
|
||||
(3849,0,24,-207.325,2112.43,81.0548,0,0,0,''),
|
||||
(3849,0,25,-208.754,2109.9,81.0527,0,0,0,''),
|
||||
(3849,0,26,-206.248,2108.62,81.0555,0,0,0,''),
|
||||
(3849,0,27,-202.017,2106.64,78.6836,0,0,0,''),
|
||||
(3849,0,28,-200.928,2104.49,78.5569,0,0,0,''),
|
||||
(3849,0,29,-201.845,2101.17,76.9256,0,0,0,''),
|
||||
(3849,0,30,-202.844,2100.11,76.8911,0,0,0,''),
|
||||
(3849,0,31,-213.326,2105.83,76.8925,0,0,0,''),
|
||||
(3849,0,32,-226.993,2111.47,76.8892,0,0,0,''),
|
||||
(3849,0,33,-227.955,2112.34,76.8895,0,0,0,''),
|
||||
(3849,0,34,-230.05,2106.64,76.8895,0,0,0,''),
|
||||
(3849,0,11,-238.84,2153.6,90.625,0,0,0,''),
|
||||
(3849,0,12,-239.56,2155.80,90.625,1.889,2000,0,'SAY_OPEN_DOOR_AD SAY_UNLOCK_DOOR_AD'),
|
||||
(3849,0,13,-208.764,2141.6,90.6257,0,0,0,''),
|
||||
(3849,0,14,-206.441,2143.51,90.4287,0,0,0,''),
|
||||
(3849,0,15,-203.715,2145.85,88.7052,0,0,0,''),
|
||||
(3849,0,16,-199.199,2144.88,86.501,0,0,0,''),
|
||||
(3849,0,17,-195.798,2143.58,86.501,0,0,0,''),
|
||||
(3849,0,18,-190.029,2141.38,83.2712,0,0,0,''),
|
||||
(3849,0,19,-189.353,2138.65,83.1102,0,0,0,''),
|
||||
(3849,0,20,-190.304,2135.73,81.5288,0,0,0,''),
|
||||
(3849,0,21,-207.325,2112.43,81.0548,0,0,0,''),
|
||||
(3849,0,22,-208.754,2109.9,81.0527,0,0,0,''),
|
||||
(3849,0,23,-206.248,2108.62,81.0555,0,0,0,''),
|
||||
(3849,0,24,-202.017,2106.64,78.6836,0,0,0,''),
|
||||
(3849,0,25,-200.928,2104.49,78.5569,0,0,0,''),
|
||||
(3849,0,26,-201.845,2101.17,76.9256,0,0,0,''),
|
||||
(3849,0,27,-202.844,2100.11,76.8911,0,0,0,''),
|
||||
(3849,0,28,-213.326,2105.83,76.8925,0,0,0,''),
|
||||
(3849,0,29,-226.993,2111.47,76.8892,0,0,0,''),
|
||||
(3849,0,30,-227.955,2112.34,76.8895,0,0,0,''),
|
||||
(3849,0,31,-230.05,2106.64,76.8895,0,0,0,''),
|
||||
(3850,0,1,-241.817,2122.9,81.179,0,0,0,'SAY_FREE_AS'),
|
||||
(3850,0,2,-247.139,2124.89,81.179,0,0,0,''),
|
||||
(3850,0,3,-253.179,2127.41,81.179,0,0,0,''),
|
||||
|
|
@ -5717,11 +5714,7 @@ INSERT INTO script_waypoint (entry, pathId, pointid, position_x, position_y, pos
|
|||
(3850,0,9,-235.638,2149.23,90.587,0,0,0,''),
|
||||
(3850,0,10,-237.188,2151.95,90.624,0,0,0,''),
|
||||
(3850,0,11,-241.162,2153.65,90.624,0,0,0,'SAY_OPEN_DOOR_AS'),
|
||||
(3850,0,12,-241.13,2154.56,90.624,0,5000,0,'cast'),
|
||||
(3850,0,13,-241.13,2154.56,90.624,0,0,0,''),
|
||||
(3850,0,14,-241.13,2154.56,90.624,0,5000,0,'SAY_POST_DOOR_AS'),
|
||||
(3850,0,15,-241.13,2154.56,90.624,0,2500,0,'cast'),
|
||||
(3850,0,16,-241.13,2154.56,90.624,0,0,0,'SAY_VANISH_AS'),
|
||||
(3850,0,12,-241.153,2154.67,90.625,1.1534,2000,0,'SAY_OPEN_DOOR_AS'),
|
||||
(4484,0,1,3178.57,188.52,4.27,0,0,0,'SAY_QUEST_START'),
|
||||
(4484,0,2,3189.82,198.56,5.62,0,0,0,''),
|
||||
(4484,0,3,3215.21,185.78,6.43,0,0,0,''),
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue