This commit is contained in:
Ovahlord committed 2018-09-03 07:14:17 +02:00
commit 65a0dbadd3
38 files changed
+30576 -287

No files matched your search

+5 -1
View File
@@ -5,7 +5,11 @@ set pagination 0
set logging on
echo \n--- DEBUG: --- START\n\n
run
echo \n--- DEBUG: BACKTRACE FULL\n\n
echo \n--- DEBUG: BACKTRACE FULL\n
if TrinityAssertionFailedMessage != 0
printf "%s\n", TrinityAssertionFailedMessage
end
echo \n
backtrace full
echo \n--- DEBUG: INFO REGISTERS\n\n
info registers
+5 -2
View File
@@ -1036,6 +1036,7 @@ INSERT INTO `rbac_linked_permissions` VALUES
(198,317),
(198,318),
(198,855),
(198,874),
(198,367),
(198,368),
(198,369),
@@ -1831,7 +1832,8 @@ INSERT INTO `rbac_permissions` VALUES
(865,'Command: npc showloot'),
(866,'Command: list spawnpoints'),
(867,'Command: reload quest_greeting_locale'),
(872,'Command: server debug');
(872,'Command: server debug'),
(874,'Command: go instance');
/*!40000 ALTER TABLE `rbac_permissions` ENABLE KEYS */;
UNLOCK TABLES;
@@ -1976,7 +1978,8 @@ INSERT INTO `updates` VALUES
('2018_07_21_00_auth.sql','93185DC1BCA6A0225EA4CC4ACB1BA26F089E8131','ARCHIVED','2018-07-21 01:40:04',0),
('2018_08_15_00_auth.sql','22DC7AA7A1D2B04C62B2EEBFF4562DDDC412B456','ARCHIVED','2018-08-15 01:40:04',0),
('2018_08_16_00_auth.sql','FF00C2A63E8F1E43442C083F2682E100FB39AA5C','ARCHIVED','2018-08-16 01:40:04',0),
('2018_08_17_00_auth.sql','0C9921DCEF92D0C66524299A2F0B86EBB1B7020E','ARCHIVED','2018-08-17 01:40:04',0);
('2018_08_17_00_auth.sql','0C9921DCEF92D0C66524299A2F0B86EBB1B7020E','ARCHIVED','2018-08-17 01:40:04',0),
('2018_09_02_00_auth_from_335_was_2018_08_30_00_auth.sql','7E6ABD3FF59FC6CC82B227CE074E8E91DE4D1DB2','ARCHIVED','2018-08-17 01:40:04',0);
/*!40000 ALTER TABLE `updates` ENABLE KEYS */;
UNLOCK TABLES;
@@ -0,0 +1,9 @@
--
DELETE FROM `rbac_permissions` WHERE `id`=874;
INSERT INTO `rbac_permissions` (`id`,`name`) VALUES
(874, "Command: go instance");
SET @parent := (SELECT `id` FROM `rbac_linked_permissions` WHERE `linkedId`=852);
DELETE FROM `rbac_linked_permissions` WHERE `linkedId`=874;
INSERT INTO `rbac_linked_permissions` (`id`,`linkedId`) VALUES
(@parent, 874);
@@ -0,0 +1,96 @@
-- NAXXANAR
-- AREATRIGGER-ID
-- SKY
-- 5338 roof
-- 5339 upper chamber
-- 5340 upper platform
-- 5334 lower platform
-- 5332 ground
-- GROUND
DELETE FROM `areatrigger_scripts` WHERE `entry` IN (5332,5334,5340,5339,5338);
INSERT INTO `areatrigger_scripts` (`entry`, `ScriptName`) VALUES
(5332, "SmartTrigger"),
(5334, "SmartTrigger"),
(5340, "SmartTrigger"),
(5339, "SmartTrigger"),
(5338, "SmartTrigger");
DELETE FROM `smart_scripts` WHERE `source_type` = 2 AND `entryorguid` IN (5332,5334,5340,5339,5338);
INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES
(5332, 2, 0, 0, 46, 0, 100, 0, 5332, 0, 0, 0, 0, 62, 571, 0, 0, 0, 0, 0, 7, 0, 0, 0, 3733.68, 3563.25, 290.812, 3.6651, "Areatrigger - On Trigger - Teleport player"),
(5334, 2, 0, 0, 46, 0, 100, 0, 5334, 0, 0, 0, 0, 62, 571, 0, 0, 0, 0, 0, 7, 0, 0, 0, 3802.38, 3585.95, 49.576, 0.0, "Areatrigger - On Trigger - Teleport player"),
(5340, 2, 0, 0, 46, 0, 100, 0, 5340, 0, 0, 0, 0, 62, 571, 0, 0, 0, 0, 0, 7, 0, 0, 0, 3687.91, 3577.28, 473.342, 0.0, "Areatrigger - On Trigger - Teleport player"),
(5340, 2, 1, 0, 46, 0, 100, 0, 5340, 0, 0, 0, 0, 62, 571, 0, 0, 0, 0, 0, 7, 0, 0, 0, 3744.80, 3570.65, 341.66, 0.6, "Areatrigger - On Trigger - Teleport player"),
(5339, 2, 0, 0, 46, 0, 100, 0, 5339, 0, 0, 0, 0, 62, 571, 0, 0, 0, 0, 0, 7, 0, 0, 0, 3733.68, 3563.25, 290.812, 3.6651, "Areatrigger - On Trigger - Teleport player"),
(5338, 2, 0, 0, 46, 0, 100, 0, 5338, 0, 0, 0, 0, 62, 571, 0, 0, 0, 0, 0, 7, 0, 0, 0, 3733.68, 3563.25, 290.812, 3.6651, "Areatrigger - On Trigger - Teleport player");
DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` = 22 AND `SourceEntry` IN (5332,5334,5340,5339,5338);
INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES
(22, 1, 5332, 2, 0, 8, 0, 12019, 0, 0, 0, 0, 0, "", "SAI areatrigger 5332 requires quest Breaking Through turned in OR"),
(22, 1, 5332, 2, 1, 9, 0, 12019, 0, 0, 0, 0, 0, "", "SAI areatrigger 5332 requires quest Breaking Through in the log OR"),
(22, 1, 5332, 2, 2,28, 0, 12019, 0, 0, 0, 0, 0, "", "SAI areatrigger 5332 requires quest Breaking Through completed OR"),
(22, 1, 5332, 2, 3, 8, 0, 11898, 0, 0, 0, 0, 0, "", "SAI areatrigger 5332 requires quest Last Rites turned in OR"),
(22, 1, 5332, 2, 4, 9, 0, 11898, 0, 0, 0, 0, 0, "", "SAI areatrigger 5332 requires quest Last Rites in the log OR"),
(22, 1, 5332, 2, 5,28, 0, 11898, 0, 0, 0, 0, 0, "", "SAI areatrigger 5332 requires quest Last Rites completed OR"),
(22, 1, 5340, 2, 0, 6, 0, 469, 0, 0, 0, 0, 0, "", "SAI areatrigger 5340.0 triggers only if player is alliance"),
(22, 2, 5340, 2, 0, 6, 0, 67, 0, 0, 0, 0, 0, "", "SAI areatrigger 5340.1 triggers only if player is horde");
-- VOLTARUS
-- BUNNY-GUID AREATRIGGER-ID SPELL-ID TELE-ID
-- SKY
-- 114831 5080 52089 52091
-- 114830 5079 52676 52677
-- 114829 5061 52239 52240
-- 114832 5051 52089 52091
-- GROUND
-- Drakuramas Teleport Bunnies should not move or spawn of center
UPDATE `creature` SET `spawndist` = 0, `MovementType` = 0 WHERE `id` IN (28617, 28751);
DELETE FROM `areatrigger_teleport` WHERE `ID` IN (5051, 5061, 5079, 5080);
DELETE FROM `areatrigger_scripts` WHERE `entry` IN (5051, 5061, 5079, 5080);
INSERT INTO `areatrigger_scripts` (`entry`, `ScriptName`) VALUES
(5051, "SmartTrigger"),
(5061, "SmartTrigger"),
(5079, "SmartTrigger"),
(5080, "SmartTrigger");
UPDATE `creature_template` SET `AIName`="SmartAI", `ScriptName`="" WHERE `entry`=28617;
DELETE FROM `smart_scripts` WHERE `source_type` = 2 AND `entryorguid` IN (5051, 5061, 5079, 5080);
DELETE FROM `smart_scripts` WHERE `source_type` = 9 AND `entryorguid` IN (2861700, 2861701, 2861702, 2861703);
INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES
(5051, 2, 0, 1, 46, 0, 100, 0, 5051, 0, 0, 0, 0, 64, 1, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, "Areatrigger - On Trigger - Store target"),
(5051, 2, 1, 2, 61, 0, 100, 0, 0, 0, 0, 0, 0, 100, 1, 0, 0, 0, 0, 0, 10, 114832, 28617, 0, 0, 0, 0, 0, "Areatrigger - On Trigger - Send target"),
(5051, 2, 2, 0, 61, 0, 100, 0, 0, 0, 0, 0, 0, 80, 2861700, 0, 0, 0, 0, 0, 10, 114832, 28617, 0, 0, 0, 0, 0, "Areatrigger - On Trigger - Action list"),
(5061, 2, 0, 1, 46, 0, 100, 0, 5061, 0, 0, 0, 0, 64, 1, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, "Areatrigger - On Trigger - Store target"),
(5061, 2, 1, 2, 61, 0, 100, 0, 0, 0, 0, 0, 0, 100, 1, 0, 0, 0, 0, 0, 10, 114829, 28617, 0, 0, 0, 0, 0, "Areatrigger - On Trigger - Send target"),
(5061, 2, 2, 0, 61, 0, 100, 0, 0, 0, 0, 0, 0, 80, 2861701, 0, 0, 0, 0, 0, 10, 114829, 28617, 0, 0, 0, 0, 0, "Areatrigger - On Trigger - Action list"),
(5079, 2, 0, 1, 46, 0, 100, 0, 5079, 0, 0, 0, 0, 64, 1, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, "Areatrigger - On Trigger - Store target"),
(5079, 2, 1, 2, 61, 0, 100, 0, 0, 0, 0, 0, 0, 100, 1, 0, 0, 0, 0, 0, 10, 114830, 28617, 0, 0, 0, 0, 0, "Areatrigger - On Trigger - Send target"),
(5079, 2, 2, 0, 61, 0, 100, 0, 0, 0, 0, 0, 0, 80, 2861702, 0, 0, 0, 0, 0, 10, 114830, 28617, 0, 0, 0, 0, 0, "Areatrigger - On Trigger - Action list"),
(5080, 2, 0, 1, 46, 0, 100, 0, 5080, 0, 0, 0, 0, 64, 1, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, "Areatrigger - On Trigger - Store target"),
(5080, 2, 1, 2, 61, 0, 100, 0, 0, 0, 0, 0, 0, 100, 1, 0, 0, 0, 0, 0, 10, 114831, 28617, 0, 0, 0, 0, 0, "Areatrigger - On Trigger - Send target"),
(5080, 2, 2, 0, 61, 0, 100, 0, 0, 0, 0, 0, 0, 80, 2861703, 0, 0, 0, 0, 0, 10, 114831, 28617, 0, 0, 0, 0, 0, "Areatrigger - On Trigger - Action list"),
(2861700, 9, 0, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 85, 52089, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, "Drakuramas Teleport Bunny 01 - Action list - Cast 'Drakuramas Teleport Script 01' on self"),
(2861700, 9, 1, 0, 0, 0, 100, 0, 1500, 1500, 0, 0, 0, 85, 52091, 0, 0, 0, 0, 0, 12, 1, 0, 0, 0, 0, 0, 0, "Drakuramas Teleport Bunny 01 - Action list - Cast 'Drakuramas Teleport 01' on stored target"),
(2861701, 9, 0, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 85, 52239, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, "Drakuramas Teleport Bunny 01 - Action list - Cast 'Drakuramas Teleport Script 02' on self"),
(2861701, 9, 1, 0, 0, 0, 100, 0, 1500, 1500, 0, 0, 0, 85, 52240, 0, 0, 0, 0, 0, 12, 1, 0, 0, 0, 0, 0, 0, "Drakuramas Teleport Bunny 01 - Action list - Cast 'Drakuramas Teleport 02' on stored target"),
(2861702, 9, 0, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 85, 52676, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, "Drakuramas Teleport Bunny 01 - Action list - Cast 'Drakuramas Teleport Script 03' on self"),
(2861702, 9, 1, 0, 0, 0, 100, 0, 1500, 1500, 0, 0, 0, 85, 52677, 0, 0, 0, 0, 0, 12, 1, 0, 0, 0, 0, 0, 0, "Drakuramas Teleport Bunny 01 - Action list - Cast 'Drakuramas Teleport 03' on stored target"),
(2861703, 9, 0, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 85, 52089, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, "Drakuramas Teleport Bunny 01 - Action list - Cast 'Drakuramas Teleport Script 01' on self"),
(2861703, 9, 1, 0, 0, 0, 100, 0, 1500, 1500, 0, 0, 0, 85, 52091, 0, 0, 0, 0, 0, 12, 1, 0, 0, 0, 0, 0, 0, "Drakuramas Teleport Bunny 01 - Action list - Cast 'Drakuramas Teleport 01' on stored target");
DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` = 22 AND `SourceEntry` IN (5051, 5061, 5079, 5080);
INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES
(22, 1, 5051, 2, 0, 1, 0, 51966, 0, 0, 0, 0, 0, "", "SAI areatrigger 5051 triggers if player has aura 'Scourge Disguise'"),
(22, 1, 5061, 2, 0, 1, 0, 51966, 0, 0, 0, 0, 0, "", "SAI areatrigger 5061 triggers if player has aura 'Scourge Disguise'"),
(22, 1, 5079, 2, 0, 1, 0, 51966, 0, 0, 0, 0, 0, "", "SAI areatrigger 5079 triggers if player has aura 'Scourge Disguise' AND"),
(22, 1, 5079, 2, 0, 2, 0, 39319, 1, 0, 0, 0, 0, "", "SAI areatrigger 5079 triggers if player has item 'Scepter of Domination' AND"),
(22, 1, 5080, 2, 0, 1, 0, 51966, 0, 0, 0, 0, 0, "", "SAI areatrigger 5080 triggers if player has aura 'Scourge Disguise'");
DELETE FROM `spell_target_position` WHERE `id` IN (52240);
INSERT INTO `spell_target_position` (`ID`, `EffectIndex`, `MapID`, `PositionX`, `PositionY`, `PositionZ`, `Orientation`, `VerifiedBuild`) VALUES
(52240, 0, 571, 6175.59, -2000.67, 241.769, 1.54, 0);
DELETE FROM `spell_linked_spell` WHERE `spell_trigger` IN (52089,52239,52676);
DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=13 AND `SourceEntry` IN (52089, 52091, 52239, 52676, 52240,52677);
@@ -0,0 +1,2 @@
--
UPDATE `gameobject_loot_template` SET `QuestRequired`=0 WHERE `Entry`=3266 AND `Item`=5833;
@@ -0,0 +1,4 @@
--
DELETE FROM `achievement_criteria_data` WHERE `criteria_id`=4244 AND `type`=12;
INSERT INTO `achievement_criteria_data` (`criteria_id`, `type`, `value1`, `value2`, `ScriptName`) VALUES
(4244,12,1,0,'');
@@ -0,0 +1,46 @@
/*
--
DELETE FROM `creature` WHERE `guid` IN (12605,12606,51692,51697,51699,51704,84509,84510,84511,84604,84609,84610,84611,84629,84630,84646,84647,84663,84716,84743,84744,84851,84862,84863,84900,84902,84939);
INSERT INTO `creature` (`guid`, `id`, `map`, `zoneId`, `areaId`, `spawnMask`, `phaseMask`, `modelid`, `equipment_id`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`, `spawndist`, `currentwaypoint`, `curhealth`, `curmana`, `MovementType`, `npcflag`, `unit_flags`, `dynamicflags`, `ScriptName`, `VerifiedBuild`) VALUES
(12605, 29866, 1, 440, 2300, 1, 1, 0, 0, -8743.8, -4428.17, -201.36, 3.07178, 120, 0, 0, 1, 0, 0, 0, 0, 0, "", 0),
(12606, 29867, 1, 440, 2300, 1, 1, 0, 1, -8751.68, -4452.36, -199.699, 1.29154, 120, 0, 0, 1, 0, 0, 0, 0, 0, "", 0), --
(51692, 29866, 1, 440, 2300, 1, 1, 0, 0, -8724.14, -4412.39, -203.747, 3.80482, 120, 0, 0, 1, 0, 0, 0, 0, 0, "", 0),
(51697, 29865, 1, 440, 2300, 1, 1, 0, 0, -8746.62, -4428.1, -201.354, 6.24828, 120, 0, 0, 1, 0, 0, 0, 0, 0, "", 0),
(51699, 29873, 1, 440, 2300, 1, 1, 0, 0, -8706.65, -4417, -205.124, 2.70526, 120, 0, 0, 1, 0, 0, 0, 0, 0, "", 0),
(51704, 29867, 1, 440, 2300, 1, 1, 0, 1, -8759.25, -4450.96, -200.123, 1.39626, 120, 0, 0, 1, 0, 0, 0, 0, 0, "", 0), --
(84509, 29868, 1, 440, 2300, 1, 1, 0, 0, -8747.63, -4450.67, -199.451, 3.52556, 120, 0, 0, 1, 0, 0, 0, 0, 0, "", 0),
(84510, 29868, 1, 440, 2300, 1, 1, 0, 0, -8707.38, -4416.52, -205.047, 5.65487, 120, 0, 0, 1, 0, 0, 0, 0, 0, "", 0),
(84511, 29868, 1, 440, 2300, 1, 1, 0, 0, -8747.43, -4448.76, -199.175, 3.83972, 120, 0, 0, 1, 0, 0, 0, 0, 0, "", 0),
(84604, 29865, 1, 440, 2300, 1, 1, 0, 0, -8643.38, -4351.43, -208.111, 6.26573, 120, 0, 0, 1, 0, 0, 0, 0, 0, "", 0),
(84609, 29866, 1, 440, 2300, 1, 1, 0, 0, -8662.23, -4383.17, -206.934, 5.39307, 120, 0, 0, 1, 0, 0, 0, 0, 0, "", 0),
(84610, 29868, 1, 440, 2300, 1, 1, 0, 0, -8661.53, -4381.77, -206.93, 6.0912, 120, 0, 0, 1, 0, 0, 0, 0, 0, "", 0),
(84611, 29866, 1, 440, 2300, 1, 1, 0, 0, -8641.65, -4352.35, -208.204, 2.77507, 120, 0, 0, 1, 0, 0, 0, 0, 0, "", 0),
(84629, 29865, 1, 440, 2300, 1, 1, 0, 0, -8656.92, -4389.86, -207.436, 2.23402, 120, 0, 0, 1, 0, 0, 0, 0, 0, "", 0),
(84630, 29867, 1, 440, 2300, 1, 1, 0, 1, -8645.1, -4371.34, -208.185, 0.506145, 120, 0, 0, 1, 0, 0, 0, 0, 0, "", 0),
(84646, 29866, 1, 440, 2300, 1, 1, 0, 0, -8642.65, -4359.16, -208.243, 4.2586, 120, 0, 0, 1, 0, 0, 0, 0, 0, "", 0),
(84647, 29866, 1, 440, 2300, 1, 1, 0, 0, -8659.16, -4406.02, -207.438, 2.68781, 120, 0, 0, 1, 0, 0, 0, 0, 0, "", 0),
(84663, 29865, 1, 440, 2300, 1, 1, 0, 0, -8660.77, -4404.86, -207.4, 5.48033, 120, 0, 0, 1, 0, 0, 0, 0, 0, "", 0),
(84716, 29867, 1, 440, 2300, 1, 1, 0, 1, -8678.84, -4405.57, -206.534, 4.60767, 120, 0, 0, 1, 0, 0, 0, 0, 0, "", 0),
(84743, 29865, 1, 440, 2300, 1, 1, 0, 0, -8677.56, -4405.93, -206.679, 3.57792, 120, 0, 0, 1, 0, 0, 0, 0, 0, "", 0),
(84744, 29867, 1, 440, 2300, 1, 1, 0, 1, -8629.69, -4396.92, -208.617, 3.01942, 120, 0, 0, 1, 0, 0, 0, 0, 0, "", 0), --
(84851, 29865, 1, 440, 2300, 1, 1, 0, 0, -8613.5, -4414.04, -209.149, 1.06465, 120, 0, 0, 1, 0, 0, 0, 0, 0, "", 0),
(84862, 29868, 1, 440, 2300, 1, 1, 0, 0, -8611.45, -4411.41, -209.398, 3.92699, 120, 0, 0, 1, 0, 0, 0, 0, 0, "", 0),
(84863, 29866, 1, 440, 2300, 1, 1, 0, 0, -8612.38, -4410.71, -209.356, 4.29351, 120, 0, 0, 1, 0, 0, 0, 0, 0, "", 0),
(84900, 29868, 1, 440, 2300, 1, 1, 0, 0, -8611.28, -4412.6, -209.366, 3.87463, 120, 0, 0, 1, 0, 0, 0, 0, 0, "", 0),
(84902, 29867, 1, 440, 2300, 1, 1, 0, 1, -8630.17, -4400.45, -208.464, 1.27409, 120, 0, 0, 1, 0, 0, 0, 0, 0, "", 0),
(84939, 29868, 1, 440, 2300, 1, 1, 0, 0, -8614.49, -4410.79, -209.182, 4.93928, 120, 0, 0, 1, 0, 0, 0, 0, 0, "", 0);
DELETE FROM `creature_addon` WHERE `guid` IN (12606,51704,84744);
INSERT INTO `creature_addon` (`guid`, `path_id`, `mount`, `auras`) VALUES
(12606, 0, 14583,"34712"),
(51704, 0, 14583,"34712"),
(84744, 0, 14583,"34712");
DELETE FROM `creature_template_addon` WHERE entry IN (29868,29865,29866,29873,29868,29867);
INSERT INTO `creature_template_addon` (`entry`, `bytes2`, `auras`) VALUES
(29865, 1, 34712),
(29866, 1, 34712),
(29867, 0, 34712),
(29868, 1, 34712),
(29873, 1, 34712);
*/
@@ -0,0 +1,118 @@
/*
--
DELETE FROM `creature` WHERE `guid` IN (84950,84953,85044,85057,85155,85156,85157,85158,85172,85177,85198,85199,85323,85324,85486,85488,85531,85544,85566,85574,85575,85576,85577,85578,85587,85617,85627,85653,85654,85787,85885,85895,85896,85897,85898,85945,85979,85986,85990,86059,86060,86061,86062,86063,86064,86067,86072,86082,86085,86086,86087,86088,86089,86090,86091,86092,86097,86098,86165,86168,86175,86176,86177,86178,86190,86193,86253,86254,86255,86256,86258,86259,86260,86261,86262,86264,86265,86266,86267,86268,86273,86274,86275,86276,86279,86281,86320,86327,86330,86331,86332,86333,86334,86335,86358,86359,86360,86361,86362,86374,86376,86382,86387,86445,86446,86447,86448,86449,86450,86451,86483,86508,86509);
INSERT INTO `creature` (`guid`, `id`, `map`, `zoneId`, `areaId`, `spawnMask`, `phaseMask`, `modelid`, `equipment_id`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`, `spawndist`, `currentwaypoint`, `curhealth`, `curmana`, `MovementType`, `npcflag`, `unit_flags`, `dynamicflags`, `ScriptName`, `VerifiedBuild`) VALUES
(84950, 7584, 1, 357, 1137, 1, 1, 0, 0, -4151.32, -448.517, 21.0387, 1.01095, 120, 10, 0, 1, 0, 1, 0, 0, 0, "", 0),
(84953, 7584, 1, 357, 1137, 1, 1, 0, 0, -4250.04, -446.364, 25.0143, 2.81737, 120, 10, 0, 1, 0, 1, 0, 0, 0, "", 0),
(85044, 7584, 1, 357, 1137, 1, 1, 0, 0, 4268.26, -360.039, 33.9388, 4.44923, 120, 10, 0, 1, 0, 1, 0, 0, 0, "", 0),
(85057, 7584, 1, 357, 1137, 1, 1, 0, 0, -4179.31, -285.658, 54.1323, 5.70927, 120, 10, 0, 1, 0, 1, 0, 0, 0, "", 0),
(85155, 7584, 1, 357, 1137, 1, 1, 0, 0, -4207.75, -184.968, 58.1262, 4.45179, 120, 10, 0, 1, 0, 1, 0, 0, 0, "", 0),
(85156, 7584, 1, 357, 1137, 1, 1, 0, 0, -4218.47, -222.988, 55.8767, 5.12189, 120, 10, 0, 1, 0, 1, 0, 0, 0, "", 0),
(85157, 7584, 1, 357, 1137, 1, 1, 0, 0, -4161.8, -115.658, 58.4992, 1.71809, 120, 10, 0, 1, 0, 1, 0, 0, 0, "", 0),
(85158, 7584, 1, 357, 1137, 1, 1, 0, 0, -4229.17, -89.7845, 57.2473, 2.31746, 120, 10, 0, 1, 0, 1, 0, 0, 0, "", 0),
(85172, 7584, 1, 357, 1137, 1, 1, 0, 0, -4132.26, -56.8683, 60.5457, 0.107637, 120, 10, 0, 1, 0, 1, 0, 0, 0, "", 0),
(85177, 7584, 1, 357, 1137, 1, 1, 0, 0, -4325.66, -117.136, 61.7791, 1.7613, 120, 10, 0, 1, 0, 1, 0, 0, 0, "", 0),
(85198, 7584, 1, 357, 1137, 1, 1, 0, 0, -4270.58, -5.94295, 61.2044, 5.53368, 120, 10, 0, 1, 0, 1, 0, 0, 0, "", 0),
(85199, 7584, 1, 357, 1137, 1, 1, 0, 0, -4395.1, -326.348, 34.0922, 5.98239, 120, 10, 0, 1, 0, 1, 0, 0, 0, "", 0),
(85323, 7584, 1, 357, 1137, 1, 1, 0, 0, -4373.92, -324.111, 31.9389, 3.93804, 120, 10, 0, 1, 0, 1, 0, 0, 0, "", 0),
(85324, 7584, 1, 357, 1137, 1, 1, 0, 0, -4421.26, -164.709, 54.2134, 1.39024, 120, 10, 0, 1, 0, 1, 0, 0, 0, "", 0),
(85486, 7584, 1, 357, 1137, 1, 1, 0, 0, -4474.26, -108.166, 58.7249, 3.01429, 120, 10, 0, 1, 0, 1, 0, 0, 0, "", 0),
(85488, 7584, 1, 357, 1137, 1, 1, 0, 0, -4357.43, -37.1399, 59.0266, 2.14742, 120, 10, 0, 1, 0, 1, 0, 0, 0, "", 0),
(85531, 7584, 1, 357, 357, 1, 1, 0, 0, -4447.08, -26.5607, 57.5955, 4.5662, 120, 10, 0, 1, 0, 1, 0, 0, 0, "", 0),
(85544, 7584, 1, 357, 357, 1, 1, 0, 0, -4564.79, -45.4668, 92.2615, 3.74877, 120, 10, 0, 1, 0, 1, 0, 0, 0, "", 0),
(85566, 7584, 1, 357, 1137, 1, 1, 0, 0, -4475.48, -372.892, 45.2324, 3.83433, 120, 10, 0, 1, 0, 1, 0, 0, 0, "", 0),
(85574, 7584, 1, 357, 357, 1, 1, 0, 0, -4621.4, -28.9082, 95.7031, 1.43492, 120, 10, 0, 1, 0, 1, 0, 0, 0, "", 0),
(85575, 7584, 1, 357, 357, 1, 1, 0, 0, -4255.66, 47.0041, 58.0383, 4.42953, 120, 10, 0, 1, 0, 1, 0, 0, 0, "", 0),
(85576, 7584, 1, 357, 357, 1, 1, 0, 0, -4227.68, 285.033, 53.5985, 1.92197, 120, 10, 0, 1, 0, 1, 0, 0, 0, "", 0),
(85577, 7584, 1, 357, 357, 1, 1, 0, 0, -4238.64, 128.081, 57.2193, 1.82951, 120, 10, 0, 1, 0, 1, 0, 0, 0, "", 0),
(85578, 7584, 1, 357, 2518, 1, 1, 0, 0, -4159.31, 28.2621, 61.1084, 5.19087, 120, 10, 0, 1, 0, 1, 0, 0, 0, "", 0),
(85587, 7584, 1, 357, 2518, 1, 1, 0, 0, -4081.01, 31.6737, 58.6187, 5.37587, 120, 10, 0, 1, 0, 1, 0, 0, 0, "", 0),
(85617, 7584, 1, 357, 2518, 1, 1, 0, 0, -4059.92, 178.661, 57.8048, 4.47783, 120, 10, 0, 1, 0, 1, 0, 0, 0, "", 0),
(85627, 7584, 1, 357, 357, 1, 1, 0, 0, -4041.3, 492.047, 80.6981, 0.155829, 120, 10, 0, 1, 0, 1, 0, 0, 0, "", 0),
(85653, 7584, 1, 357, 357, 1, 1, 0, 0, -4141.4, 459.303, 70.3703, 5.76476, 120, 10, 0, 1, 0, 1, 0, 0, 0, "", 0),
(85654, 7584, 1, 357, 1100, 1, 1, 0, 0, -4132.83, 522.669, 70.4734, 6.07659, 120, 10, 0, 1, 0, 1, 0, 0, 0, "", 0),
(85787, 7584, 1, 357, 1100, 1, 1, 0, 0, -4252.56, 573.585, 59.1822, 4.33624, 120, 10, 0, 1, 0, 1, 0, 0, 0, "", 0),
(85885, 7584, 1, 357, 1100, 1, 1, 0, 0, -4287.72, 580.78, 61.3964, 5.28997, 120, 10, 0, 1, 0, 1, 0, 0, 0, "", 0),
(85895, 7584, 1, 357, 357, 1, 1, 0, 0, -4337.29, 575.759, 56.5872, 4.58707, 120, 10, 0, 1, 0, 1, 0, 0, 0, "", 0),
(85896, 7584, 1, 357, 1100, 1, 1, 0, 0, -4215.31, 482.427, 54.2238, 6.22675, 120, 10, 0, 1, 0, 1, 0, 0, 0, "", 0),
(85897, 7584, 1, 357, 357, 1, 1, 0, 0, -4159.53, 300.741, 57.1816, 1.73177, 120, 10, 0, 1, 0, 1, 0, 0, 0, "", 0),
(85898, 7584, 1, 357, 357, 1, 1, 0, 0, -4165.76, 201.555, 60.7011, 3.88414, 120, 10, 0, 1, 0, 1, 0, 0, 0, "", 0),
(85945, 7584, 1, 357, 357, 1, 1, 0, 0, -4268.85, 370.342, 57.4374, 4.96921, 120, 10, 0, 1, 0, 1, 0, 0, 0, "", 0),
(85979, 7584, 1, 357, 357, 1, 1, 0, 0, -4385.88, 582.037, 62.4314, 5.45913, 120, 10, 0, 1, 0, 1, 0, 0, 0, "", 0),
(85986, 7584, 1, 357, 357, 1, 1, 0, 0, -4411.08, 437.567, 51.318, 4.46173, 120, 10, 0, 1, 0, 1, 0, 0, 0, "", 0),
(85990, 7584, 1, 357, 357, 1, 1, 0, 0, -4348.5, 444.451, 52.0015, 0.994175, 120, 10, 0, 1, 0, 1, 0, 0, 0, "", 0),
(86059, 7584, 1, 357, 1102, 1, 1, 0, 0, -4629.62, 352.661, 7.98182, 1.97851, 120, 10, 0, 1, 0, 1, 0, 0, 0, "", 0),
(86060, 7584, 1, 357, 357, 1, 1, 0, 0, -4488.42, 451.863, 48.4782, 3.45575, 120, 10, 0, 1, 0, 1, 0, 0, 0, "", 0),
(86061, 7584, 1, 357, 357, 1, 1, 0, 0, -4557.44, 549.076, 62.9054, 3.53623, 120, 10, 0, 1, 0, 1, 0, 0, 0, "", 0),
(86062, 7584, 1, 357, 1102, 1, 1, 0, 0, -4716.97, 299.92, 17.4529, 5.01994, 120, 10, 0, 1, 0, 1, 0, 0, 0, "", 0),
(86063, 7584, 1, 357, 357, 1, 1, 0, 0, -4728.21, 383.03, 10.0756, 3.72092, 120, 10, 0, 1, 0, 1, 0, 0, 0, "", 0),
(86064, 7584, 1, 357, 357, 1, 1, 0, 0, -4742.9, 175.796, 40.4529, 4.72421, 120, 10, 0, 1, 0, 1, 0, 0, 0, "", 0),
(86067, 7584, 1, 357, 357, 1, 1, 0, 0, -4793.72, 238.594, 39.4675, 4.9408, 120, 10, 0, 1, 0, 1, 0, 0, 0, "", 0),
(86072, 7584, 1, 357, 2519, 1, 1, 0, 0, -4788.5, 655.238, 43.8978, 2.69717, 120, 10, 0, 1, 0, 1, 0, 0, 0, "", 0),
(86082, 7584, 1, 357, 1137, 1, 1, 0, 0, -4827, 285.017, 32.3068, 6.11451, 120, 10, 0, 1, 0, 1, 0, 0, 0, "", 0),
(86085, 7584, 1, 357, 2519, 1, 1, 0, 0, -5167.48, 726.508, 81.7791, 2.29403, 120, 10, 0, 1, 0, 1, 0, 0, 0, "", 0),
(86086, 7584, 1, 357, 2519, 1, 1, 0, 0, -5196.8, 606.61, 51.4097, 0.960155, 120, 10, 0, 1, 0, 1, 0, 0, 0, "", 0),
(86087, 7584, 1, 357, 2519, 1, 1, 0, 0, -5113.75, 589.44, 36.7251, 4.39064, 120, 10, 0, 1, 0, 1, 0, 0, 0, "", 0),
(86088, 7584, 1, 357, 2519, 1, 1, 0, 0, -5182.4, 538.471, 45.3074, 4.59482, 120, 10, 0, 1, 0, 1, 0, 0, 0, "", 0),
(86089, 7584, 1, 357, 2519, 1, 1, 0, 0, -5271.65, 533.945, 62.7954, 4.99729, 120, 10, 0, 1, 0, 1, 0, 0, 0, "", 0),
(86090, 7584, 1, 357, 1101, 1, 1, 0, 0, -5275.33, 491.948, 56.9065, 2.35482, 120, 10, 0, 1, 0, 1, 0, 0, 0, "", 0),
(86091, 7584, 1, 357, 1101, 1, 1, 0, 0, -5211.5, 489.054, 50.1974, 3.86485, 120, 10, 0, 1, 0, 1, 0, 0, 0, "", 0),
(86092, 7584, 1, 357, 1101, 1, 1, 0, 0, -5353.52, 513.069, 70.3344, 3.03396, 120, 10, 0, 1, 0, 1, 0, 0, 0, "", 0),
(86097, 7584, 1, 357, 2519, 1, 1, 0, 0, -5054.6, 284.801, 31.3088, 3.34014, 120, 10, 0, 1, 0, 1, 0, 0, 0, "", 0),
(86098, 7584, 1, 357, 2519, 1, 1, 0, 0, -5073.58, 410.02, 11.1949, 3.94909, 120, 10, 0, 1, 0, 1, 0, 0, 0, "", 0),
(86165, 7584, 1, 357, 2519, 1, 1, 0, 0, -5076.5, 341.069, 21.7106, 4.60281, 120, 10, 0, 1, 0, 1, 0, 0, 0, "", 0),
(86168, 7584, 1, 357, 2519, 1, 1, 0, 0, -5070.07, 472.75, 15.0727, 4.42846, 120, 10, 0, 1, 0, 1, 0, 0, 0, "", 0),
(86175, 7584, 1, 357, 2519, 1, 1, 0, 0, -5088.6, 550.035, 19.9694, 5.8344, 120, 10, 0, 1, 0, 1, 0, 0, 0, "", 0),
(86176, 7584, 1, 357, 2519, 1, 1, 0, 0, -5023.12, 616.4, 33.0851, 3.2296, 120, 10, 0, 1, 0, 1, 0, 0, 0, "", 0),
(86177, 7584, 1, 357, 2522, 1, 1, 0, 0, -5206.36, 1174.25, 75.9587, 6.07182, 120, 10, 0, 1, 0, 1, 0, 0, 0, "", 0),
(86178, 7584, 1, 357, 2522, 1, 1, 0, 0, -5148.43, 1216.07, 59.1323, 3.82883, 120, 10, 0, 1, 0, 1, 0, 0, 0, "", 0),
(86190, 7584, 1, 357, 2522, 1, 1, 0, 0, -5151.25, 1306.27, 46.0041, 1.81128, 120, 10, 0, 1, 0, 1, 0, 0, 0, "", 0),
(86193, 7584, 1, 357, 1136, 1, 1, 0, 0, -5094.77, 1375.84, 45.0193, 5.99151, 120, 10, 0, 1, 0, 1, 0, 0, 0, "", 0),
(86253, 7584, 1, 357, 1136, 1, 1, 0, 0, -5030.23, 1387.06, 46.9254, 0.677881, 120, 10, 0, 1, 0, 1, 0, 0, 0, "", 0),
(86254, 7584, 1, 357, 1136, 1, 1, 0, 0, -5049, 1421.35, 40.8312, 1.04076, 120, 10, 0, 1, 0, 1, 0, 0, 0, "", 0),
(86255, 7584, 1, 357, 1136, 1, 1, 0, 0, -4980.1, 1414.3, 58.2244, 5.1926, 120, 10, 0, 1, 0, 1, 0, 0, 0, "", 0),
(86256, 7584, 1, 357, 1105, 1, 1, 0, 0, -5021.1, 1508.77, 51.5862, 1.1137, 120, 10, 0, 1, 0, 1, 0, 0, 0, "", 0),
(86258, 7584, 1, 357, 1105, 1, 1, 0, 0, -5031.86, 1555.56, 54.183, 1.63918, 120, 10, 0, 1, 0, 1, 0, 0, 0, "", 0),
(86259, 7584, 1, 357, 1105, 1, 1, 0, 0, -5090.59, 1561.24, 55.4228, 1.37819, 120, 10, 0, 1, 0, 1, 0, 0, 0, "", 0),
(86260, 7584, 1, 357, 1136, 1, 1, 0, 0, -4877.62, 1562.61, 75.1564, 0.643745, 120, 10, 0, 1, 0, 1, 0, 0, 0, "", 0),
(86261, 7584, 1, 357, 1136, 1, 1, 0, 0, -4809.16, 1626.54, 77.0204, 0.148996, 120, 10, 0, 1, 0, 1, 0, 0, 0, "", 0),
(86262, 7584, 1, 357, 1136, 1, 1, 0, 0, -4901.78, 1362.45, 63.4631, 5.63851, 120, 10, 0, 1, 0, 1, 0, 0, 0, "", 0),
(86264, 7584, 1, 357, 2522, 1, 1, 0, 0, -5394.13, 1182.89, 61.7511, 0.494206, 120, 10, 0, 1, 0, 1, 0, 0, 0, "", 0),
(86265, 7584, 1, 357, 2522, 1, 1, 0, 0, -5840.83, 1216, 80.4995, 5.78633, 120, 10, 0, 1, 0, 1, 0, 0, 0, "", 0),
(86266, 7584, 1, 357, 2522, 1, 1, 0, 0, -5807.89, 1319.24, 67.9095, 4.955, 120, 10, 0, 1, 0, 1, 0, 0, 0, "", 0),
(86267, 7584, 1, 357, 2522, 1, 1, 0, 0, -5777.78, 1400.12, 51.8296, 3.87463, 120, 10, 0, 1, 0, 1, 0, 0, 0, "", 0),
(86268, 7584, 1, 357, 2522, 1, 1, 0, 0, -5757.28, 1474.03, 57.8793, 3.93437, 120, 10, 0, 1, 0, 1, 0, 0, 0, "", 0),
(86273, 7584, 1, 357, 2522, 1, 1, 0, 0, -5812.28, 1554.56, 73.5598, 0.632171, 120, 10, 0, 1, 0, 1, 0, 0, 0, "", 0),
(86274, 7584, 1, 357, 1106, 1, 1, 0, 0, -5834.92, 1612.01, 83.6121, 1.85982, 120, 10, 0, 1, 0, 1, 0, 0, 0, "", 0),
(86275, 7584, 1, 357, 2522, 1, 1, 0, 0, -5752.09, 1538.15, 68.7885, 1.03155, 120, 10, 0, 1, 0, 1, 0, 0, 0, "", 0),
(86276, 7584, 1, 357, 1106, 1, 1, 0, 0, -5763.17, 1646.9, 84.7156, 3.3122, 120, 10, 0, 1, 0, 1, 0, 0, 0, "", 0),
(86279, 7584, 1, 357, 1106, 1, 1, 0, 0, -5700.27, 1608.71, 76.1697, 1.86814, 120, 10, 0, 1, 0, 1, 0, 0, 0, "", 0),
(86281, 7584, 1, 357, 1106, 1, 1, 0, 0, -5649.8, 1699.73, 89.3356, 4.67136, 120, 10, 0, 1, 0, 1, 0, 0, 0, "", 0),
(86320, 7584, 1, 357, 1106, 1, 1, 0, 0, -5578.71, 1686.23, 73.8897, 1.57846, 120, 10, 0, 1, 0, 1, 0, 0, 0, "", 0),
(86327, 7584, 1, 357, 1106, 1, 1, 0, 0, -5540.93, 1720.06, 74.5695, 0.451427, 120, 10, 0, 1, 0, 1, 0, 0, 0, "", 0),
(86330, 7584, 1, 357, 1106, 1, 1, 0, 0, -5522.82, 1636.97, 50.8731, 1.13948, 120, 10, 0, 1, 0, 1, 0, 0, 0, "", 0),
(86331, 7584, 1, 357, 1106, 1, 1, 0, 0, -5460.06, 1660.93, 57.9558, 0.43665, 120, 10, 0, 1, 0, 1, 0, 0, 0, "", 0),
(86332, 7584, 1, 357, 1106, 1, 1, 0, 0, -5458.34, 1708.2, 62.6877, 1.32757, 120, 10, 0, 1, 0, 1, 0, 0, 0, "", 0),
(86333, 7584, 1, 357, 1136, 1, 1, 0, 0, -5384.79, 1616.59, 50.6181, 5.41215, 120, 10, 0, 1, 0, 1, 0, 0, 0, "", 0),
(86334, 7584, 1, 357, 1106, 1, 1, 0, 0, -5328.62, 1636.79, 53.1874, 2.36518, 120, 10, 0, 1, 0, 1, 0, 0, 0, "", 0),
(86335, 7584, 1, 357, 1136, 1, 1, 0, 0, -5409.93, 1567.31, 35.8662, 4.74561, 120, 10, 0, 1, 0, 1, 0, 0, 0, "", 0),
(86358, 7584, 1, 357, 1136, 1, 1, 0, 0, -5314.48, 1543.69, 41.8313, 1.03494, 120, 10, 0, 1, 0, 1, 0, 0, 0, "", 0),
(86359, 7584, 1, 357, 1136, 1, 1, 0, 0, -5261.02, 1572.37, 57.6371, 5.69518, 120, 10, 0, 1, 0, 1, 0, 0, 0, "", 0),
(86360, 7584, 1, 357, 1136, 1, 1, 0, 0, -5217.67, 1506.76, 51.544, 1.97174, 120, 10, 0, 1, 0, 1, 0, 0, 0, "", 0),
(86361, 7584, 1, 357, 1136, 1, 1, 0, 0, -5155.42, 1584.11, 61.0285, 0.149533, 120, 10, 0, 1, 0, 1, 0, 0, 0, "", 0),
(86362, 7584, 1, 357, 1136, 1, 1, 0, 0, -5117.94, 1513.51, 49.1729, 2.43426, 120, 10, 0, 1, 0, 1, 0, 0, 0, "", 0),
(86374, 7584, 1, 357, 1136, 1, 1, 0, 0, -5182.08, 1426.67, 45.1789, 1.8601, 120, 10, 0, 1, 0, 1, 0, 0, 0, "", 0),
(86376, 7584, 1, 357, 1136, 1, 1, 0, 0, -5272.22, 1471.47, 36.7689, 5.76321, 120, 10, 0, 1, 0, 1, 0, 0, 0, "", 0),
(86382, 7584, 1, 357, 1136, 1, 1, 0, 0, -5314.14, 1431.88, 30.6512, 1.45334, 120, 10, 0, 1, 0, 1, 0, 0, 0, "", 0),
(86387, 7584, 1, 357, 1136, 1, 1, 0, 0, -5388.55, 1504.63, 28.5696, 5.49226, 120, 10, 0, 1, 0, 1, 0, 0, 0, "", 0),
(86445, 7584, 1, 357, 2522, 1, 1, 0, 0, -5514.59, 1529.49, 29.7213, 4.58513, 120, 10, 0, 1, 0, 1, 0, 0, 0, "", 0),
(86446, 7584, 1, 357, 1106, 1, 1, 0, 0, -5550.63, 1610.56, 64.8928, 3.60524, 120, 10, 0, 1, 0, 1, 0, 0, 0, "", 0),
(86447, 7584, 1, 357, 1106, 1, 1, 0, 0, -5670.51, 1571.91, 69.9136, 6.23158, 120, 10, 0, 1, 0, 1, 0, 0, 0, "", 0),
(86448, 7584, 1, 357, 1106, 1, 1, 0, 0, -5605.68, 1617.2, 72.9848, 5.06533, 120, 10, 0, 1, 0, 1, 0, 0, 0, "", 0),
(86449, 7584, 1, 357, 1136, 1, 1, 0, 0, -5253.23, 1400.11, 41.6146, 4.23782, 120, 10, 0, 1, 0, 1, 0, 0, 0, "", 0),
(86450, 7584, 1, 357, 1136, 1, 1, 0, 0, -5231.18, 1350.95, 42.6861, 3.42351, 120, 10, 0, 1, 0, 1, 0, 0, 0, "", 0),
(86451, 7584, 1, 357, 1119, 1, 1, 0, 0, -3566.88, 2191.39, 39.7101, 5.40009, 120, 10, 0, 1, 0, 1, 0, 0, 0, "", 0),
(86483, 7584, 1, 357, 1119, 1, 1, 0, 0, -3458.25, 2491.6, 45.3776, 1.50436, 120, 10, 0, 1, 0, 1, 0, 0, 0, "", 0),
(86508, 7584, 1, 357, 1114, 1, 1, 0, 0, -2772.85, 2237.59, 49.5598, 3.72526, 120, 10, 0, 1, 0, 1, 0, 0, 0, "", 0),
(86509, 7584, 1, 357, 1119, 1, 1, 0, 0, -3262.56, 2524.2, 33.2537, 5.79857, 120, 10, 0, 1, 0, 1, 0, 0, 0, "", 0);
*/
@@ -0,0 +1,2 @@
-- Doctor Gregory Victor
-- UPDATE `creature_template` SET `gossip_menu_id`= 5381 WHERE `entry`=12920 AND `gossip_menu_id`=5382;
@@ -0,0 +1,2 @@
--
UPDATE `creature_addon` SET `mount`=14583, `auras`=34712 WHERE `guid` IN (272560,272564,272598);
@@ -0,0 +1,6 @@
--
DELETE FROM `creature` WHERE `guid` IN (252325,252327,252336);
INSERT INTO `creature` (`guid`, `id`, `map`, `zoneId`, `areaId`, `spawnMask`, `PhaseId`, `modelid`, `equipment_id`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`, `spawndist`, `currentwaypoint`, `curhealth`) VALUES
(252325, 1265, 0, 0, 0, 1, 169, 0, 1, -5513.79, -1304.71, 404.609, 3.50811, 300, 0, 0, 0),
(252327, 41611, 0, 0, 0, 1, 169, 0, 1, -5519.944, -1301.976, 405.013, 4.281697, 300, 0, 0, 0),
(252336, 3177, 0, 0, 0, 1, 169, 0, 1, -5514.956, -1296.109, 405.935, 5.001653, 300, 0, 0, 0);
File diff suppressed because it is too large. Load diff
@@ -0,0 +1,97 @@
--
SET @NPC := 100206;
SET @PATH := @NPC*10;
DELETE FROM `waypoint_data` WHERE `id`=@PATH;
INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES
(@PATH,8,3662.692,328.2304,338.4197,0,0,0,100,0),
(@PATH,7,3648.806,293.8063,321.0587,0,0,0,100,0),
(@PATH,6,3677.441,213.8859,320.1976,0,0,0,100,0),
(@PATH,5,3615.31,209.5691,324.1698,0,0,0,100,0),
(@PATH,4,3637.643,254.0089,332.7251,0,0,0,100,0),
(@PATH,3,3699.886,260.6509,327.8641,0,0,0,100,0),
(@PATH,2,3720.373,308.941,337.7808,0,0,0,100,0),
(@PATH,1,3691.676,352.0933,342.2254,0,0,0,100,0);
SET @NPC := 100209;
SET @PATH := @NPC*10;
DELETE FROM `waypoint_data` WHERE `id`=@PATH;
INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES
(@PATH,1,3748.806,293.8063,201.0587,0,0,0,100,0),
(@PATH,2,3777.441,213.8859,200.1976,0,0,0,100,0),
(@PATH,3,3715.31,209.5691,204.1698,0,0,0,100,0),
(@PATH,4,3737.643,254.0089,202.7251,0,0,0,100,0),
(@PATH,5,3799.886,260.6509,207.8641,0,0,0,100,0),
(@PATH,6,3820.373,308.941,207.7808,0,0,0,100,0),
(@PATH,7,3791.676,352.0933,202.2254,0,0,0,100,0),
(@PATH,8,3762.692,328.2304,208.4197,0,0,0,100,0);
SET @NPC := 99108;
SET @PATH := @NPC*10;
DELETE FROM `waypoint_data` WHERE `id`=@PATH;
INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES
(@PATH,18,3506.288,141.7649,169.6936,0,0,0,100,0),
(@PATH,17,3378.177,251.381,169.6936,0,0,0,100,0),
(@PATH,16,3448.559,417.0887,169.6936,0,0,0,100,0),
(@PATH,15,3659.633,429.129,169.6936,0,0,0,100,0),
(@PATH,14,3726.806,236.8274,169.6936,0,0,0,100,0),
(@PATH,13,3554.261,69.58746,169.6936,0,0,0,100,0),
(@PATH,12,3337.373,175.2911,169.6936,0,0,0,100,0),
(@PATH,11,3292.872,421.84,169.6936,0,0,0,100,0),
(@PATH,10,3355.351,609.4697,169.6936,0,0,0,100,0),
(@PATH,9,3233.689,777.6954,207.249,0,0,0,100,0),
(@PATH,8,3049.014,721.6703,224.4991,0,0,0,100,0),
(@PATH,7,3044.268,566.5984,169.6936,0,0,0,100,0),
(@PATH,6,3142.397,481.2142,169.6936,0,0,0,100,0),
(@PATH,5,3328.336,435.8111,169.6936,0,0,0,100,0),
(@PATH,4,3583.232,539.7742,169.6936,0,0,0,100,0),
(@PATH,3,3799.81,460.638,169.6936,0,0,0,100,0),
(@PATH,2,3717.946,244.38,169.6936,0,0,0,100,0),
(@PATH,1,3542.247,134.1484,169.6936,0,0,0,100,0);
SET @NPC := 100824;
SET @PATH := @NPC*10;
DELETE FROM `waypoint_data` WHERE `id`=@PATH;
INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES
(@PATH,14,3559.792,412.912,244.8625,0,0,0,100,0),
(@PATH,13,3625.949,456.7731,244.8625,0,0,0,100,0),
(@PATH,12,3683.285,437.189,244.8625,0,0,0,100,0),
(@PATH,11,3727.341,385.3615,244.8625,0,0,0,100,0),
(@PATH,10,3786.656,388.9702,244.8625,0,0,0,100,0),
(@PATH,9,3811.097,463.1342,244.8625,0,0,0,100,0),
(@PATH,8,3769.007,516.1342,244.8625,0,0,0,100,0),
(@PATH,7,3685.209,493.7117,244.8625,0,0,0,100,0),
(@PATH,6,3589.482,475.7777,244.8625,0,0,0,100,0),
(@PATH,5,3491.84,496.9259,244.8625,0,0,0,100,0),
(@PATH,4,3406.895,485.8197,244.8625,0,0,0,100,0),
(@PATH,3,3370.333,427.0351,244.8625,0,0,0,100,0),
(@PATH,2,3411.417,366.7467,244.8625,0,0,0,100,0),
(@PATH,1,3479.214,376.5652,244.8625,0,0,0,100,0);
DELETE FROM `waypoint_data` WHERE `id`=1241240;
INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES
(1241240, 26, 4024.11, 7168.08, 232.048,0,0,0,100,0),
(1241240, 25, 4012.89, 7180.92, 232.048,0,0,0,100,0),
(1241240, 24, 3994.29, 7197.3, 232.048,0,0,0,100,0),
(1241240, 23, 3962.67, 7211.43, 232.048,0,0,0,100,0),
(1241240, 22, 3928.03, 7221.9, 232.048,0,0,0,100,0),
(1241240, 21, 3903.5, 7236.1, 237.687,0,0,0,100,0),
(1241240, 20, 3882.38, 7232.92, 242.242,0,0,0,100,0),
(1241240, 19, 3858.55, 7224.29, 241.215,0,0,0,100,0),
(1241240, 18, 3844.43, 7205.01, 231.298,0,0,0,100,0),
(1241240, 17, 3844.95, 7183.08, 225.631,0,0,0,100,0),
(1241240, 16, 3853.11, 7151.16, 217.326,0,0,0,100,0),
(1241240, 15, 3870.74, 7131.27, 210.326,0,0,0,100,0),
(1241240, 14, 3896.19, 7103.67, 211.27,0,0,0,100,0),
(1241240, 13, 3918.27, 7080.29, 210.742,0,0,0,100,0),
(1241240, 12, 3937.72, 7052.57, 210.27,0,0,0,100,0),
(1241240, 11, 3952.93, 7028.98, 209.187,0,0,0,100,0),
(1241240, 10, 3971.03, 7002.62, 209.881,0,0,0,100,0),
(1241240, 9, 4004.69, 6989.1, 213.854,0,0,0,100,0),
(1241240, 8, 4041.09, 7000.58, 221.326,0,0,0,100,0),
(1241240, 7, 4071.54, 7033.09, 221.52,0,0,0,100,0),
(1241240, 6, 4086.07, 7065.28, 224.604,0,0,0,100,0),
(1241240, 5, 4097.13, 7102.44, 232.048,0,0,0,100,0),
(1241240, 4, 4095.98, 7138.24, 243.492,0,0,0,100,0),
(1241240, 3, 4083.88, 7155.52, 249.465,0,0,0,100,0),
(1241240, 2, 4058.74, 7162.29, 244.631,0,0,0,100,0),
(1241240, 1, 4038.05, 7165.02, 238.298,0,0,0,100,0);
@@ -0,0 +1,36 @@
--
UPDATE `smart_scripts` SET `event_param1`=180000, `event_param2`=180000, `event_param3`=180000, `event_param4`=180000 WHERE `entryorguid` IN (-111996, -112005) AND `source_type`=0 AND `id`=0;
UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry` IN(38505);
DELETE FROM `smart_scripts` WHERE `entryorguid` IN(-112002,-111993,38505,38493) AND `source_type`=0;
DELETE FROM `smart_scripts` WHERE `entryorguid` IN(3850500,38505*100+1) AND `source_type`=9;
INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
(-112002, 0, 0, 0, 60, 0, 100, 0, 60000, 90000, 60000, 90000, 80, 38505*100, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Knight of the Ebon Blade - On Update - Run Script'),
(38505*100, 9, 0, 0, 0, 0, 100, 0, 0, 0, 0, 0, 12, 38505, 4, 120000, 0, 0, 0, 8, 0, 0, 0, 5898.320, 2041.114, 636.0415, 1.841691, 'Knight of the Ebon Blade - On Script - Summon Creature Knight of the Ebon Blade'),
(-111993, 0, 0, 0, 60, 0, 100, 0, 60000, 90000, 60000, 90000, 80, 38505*100+1, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Argent Cruasder - On Update - Run Script'),
(38505*100+1, 9, 0, 0, 0, 0, 100, 0, 0, 0, 0, 0, 12, 38493, 4, 120000, 0, 0, 0, 8, 0, 0, 0, 5837.231, 2179.012, 636.0412, 6.169237, 'Argent Cruasder - On Script - Summon Creature Argent Cruasder'),
(38505, 0, 0, 0, 54, 0, 100, 0, 0, 0, 0, 0, 53, 0, 38505, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Knight of the Ebon Blade - On Just summoned - start watpoint'),
(38505, 0, 1, 0, 40, 0, 100, 0, 9, 38505, 0, 0, 41, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Knight of the Ebon Blade - On waypoint reached - despawn'),
(38493, 0, 0, 0, 54, 0, 100, 0, 0, 0, 0, 0, 53, 0, 38493, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Argent Cruasder - On Just summoned - start watpoint'),
(38493, 0, 1, 0, 40, 0, 100, 0, 9, 38493, 0, 0, 41, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Argent Cruasder - On waypoint reached - despawn');
DELETE FROM `waypoints` WHERE `entry` IN (38493,38505);
INSERT INTO `waypoints` (`entry`,`pointid`,`position_x`,`position_y`,`position_z`,`point_comment`) VALUES
(38493,1,5856.899, 2179.507, 636.041,""),
(38493,2,5867.398, 2157.619, 636.041,""),
(38493,3,5873.770, 2144.504, 636.041,""),
(38493,4,5871.876, 2124.536, 636.041,""),
(38493,5,5865.335, 2107.692, 635.977,""),
(38493,6,5854.102, 2101.100, 636.034,""),
(38493,7,5826.581, 2088.601, 636.064,""),
(38493,8,5810.641, 2081.362, 636.064,""),
(38493,9,5782.596, 2068.108, 636.064,""),
(38505,1,5894.719, 2067.567, 636.041,""),
(38505,2,5886.676, 2082.452, 636.041,""),
(38505,3,5876.980, 2088.505, 636.041,""),
(38505,4,5868.985, 2102.083, 636.041,""),
(38505,5,5868.985, 2102.083, 636.041,""),
(38505,6,5853.833, 2101.389, 636.034,""),
(38505,7,5830.794, 2090.629, 636.063,""),
(38505,8,5812.584, 2082.479, 636.063,""),
(38505,9,5782.596, 2068.108, 636.064,"");
@@ -0,0 +1,6 @@
--
DELETE FROM `command` WHERE `name`="go instance";
INSERT INTO `command` (`name`,`permission`,`help`) VALUES
('go instance', 874, 'Syntax: .go instance [mapid | name]
Teleports you to entrance of instance with script name matching input (or given mapid)');
@@ -0,0 +1,12 @@
--
DELETE FROM `trinity_string` WHERE `entry` BETWEEN 1189 AND 1197;
INSERT INTO `trinity_string` (`entry`,`content_default`) VALUES
(1189, "No instances were found matching your input"),
(1190, "Multiple instances match your input - please be more specific:"),
(1191, "│ %03u - %s"),
(1192, "Specified map %u is not instanced"),
(1193, "Could not find entrance portal for map %u (%s)"),
(1194, "Could not find exit portal for map %u (%s)"),
(1195, "Teleported you to the entrance of mapid %u (%s)"),
(1196, "Teleported you to the starting location of mapid %u (%s)"),
(1197, "Failed to teleport you to mapid %u (%s) - missing attunement/expansion for parent map %u?");
@@ -0,0 +1,9 @@
/*
--
DELETE FROM `creature_template_movement` WHERE `CreatureId` IN (36853, 38265, 38266, 38267);
INSERT INTO `creature_template_movement` (`CreatureId`, `Ground`, `Swim`, `Flight`, `Rooted`) VALUES
(36853, 1, 0, 2, 0),
(38265, 1, 0, 2, 0),
(38266, 1, 0, 2, 0),
(38267, 1, 0, 2, 0);
*/
@@ -0,0 +1,4 @@
/*
-- Haughty Modiste
UPDATE `quest_template_locale` SET `Title`="Das gestohlene Tagebuch", `Details`="Mein Tagebuch! Sie haben es in die Höhle gebracht. Der, der es hatte, war ein großer Kerl mit seltsamen Zeichen auf der Haut und im Gesicht. Viel mehr konnte ich leider nicht sehen.$B$BIhr hattet ja mit den Trollen Erfolg, vielleicht könntet Ihr es mir wiederbeschaffen?", `Objectives`="Tötet Grik'nir den Kalten.", `OfferRewardText`="Text: Großartig, $N! Vielen Dank, dass Ihr mein Notizbuch zurückgeholt habt. Nun, es scheint, als sei das Trollproblem hier im Eisklammtal unter Kontrolle und als müssten wir uns nicht allzu viele Sorgen machen.$B$BNachdem ich meinem Bericht den letzten Schliff gegeben habe, werde ich jemanden brauchen, der ihn meinem Bruder Senir bringt.", `RequestItemsText`="$N! Glück gehabt?" WHERE `ID`=218 AND `locale`="deDE";
*/
@@ -0,0 +1,4 @@
/*
-- Haughty Modiste
UPDATE `creature_template` SET `gossip_menu_id`=7524 WHERE `entry`=15165;
*/
@@ -0,0 +1,4 @@
/*
-- Quest: Frostmaw
UPDATE `quest_offer_reward` SET `RewardText`="Both strength and cunning were needed to find and defeat Frostmaw, $N. You have both.$b$bYour path has taken you to the valleys of Thousand Needles and to the high mountains of Alterac. It will one day lead you through all the Earthmother's lands, for such is the way of the hunter." WHERE `ID`= 1136;
*/
File diff suppressed because it is too large. Load diff
@@ -0,0 +1,2 @@
--
DELETE FROM spawn_group WHERE spawnId IN (287328,287382,10873,11348,14387,15031,17874,19107,21584,21594,21692,23229,24268,26987,29241,32333,33115,37085,40210,41759,50381,93194,93301) and spawnType=0;
+61 -28
View File
@@ -17,7 +17,7 @@
*/
#include "Errors.h"
#include "StringFormat.h"
#include <cstdio>
#include <cstdlib>
#include <thread>
@@ -34,14 +34,46 @@
terminates the application.
*/
namespace Trinity {
#if TRINITY_PLATFORM == TRINITY_PLATFORM_WINDOWS
#define Crash(message) \
ULONG_PTR execeptionArgs[] = { reinterpret_cast<ULONG_PTR>(strdup(message)), reinterpret_cast<ULONG_PTR>(_ReturnAddress()) }; \
RaiseException(EXCEPTION_ASSERTION_FAILURE, 0, 2, execeptionArgs);
#else
// should be easily accessible in gdb
extern "C" TC_COMMON_API char const* TrinityAssertionFailedMessage = nullptr;
#define Crash(message) \
TrinityAssertionFailedMessage = strdup(message); \
*((volatile int*)nullptr) = 0; \
exit(1);
#endif
namespace
{
std::string FormatAssertionMessage(char const* format, va_list args)
{
std::string formatted;
va_list len;
va_copy(len, args);
int32 length = vsnprintf(nullptr, 0, format, len);
va_end(len);
formatted.resize(length + 1);
vsnprintf(&formatted[0], length + 1, format, args);
return formatted;
}
}
namespace Trinity
{
void Assert(char const* file, int line, char const* function, char const* message)
{
fprintf(stderr, "\n%s:%i in %s ASSERTION FAILED:\n %s\n",
file, line, function, message);
*((volatile int*)nullptr) = 0;
exit(1);
std::string formattedMessage = StringFormat("\n%s:%i in %s ASSERTION FAILED:\n %s\n", file, line, function, message);
fprintf(stderr, "%s", formattedMessage.c_str());
fflush(stderr);
Crash(formattedMessage.c_str());
}
void Assert(char const* file, int line, char const* function, char const* message, char const* format, ...)
@@ -49,14 +81,13 @@ void Assert(char const* file, int line, char const* function, char const* messag
va_list args;
va_start(args, format);
fprintf(stderr, "\n%s:%i in %s ASSERTION FAILED:\n %s ", file, line, function, message);
vfprintf(stderr, format, args);
fprintf(stderr, "\n");
std::string formattedMessage = StringFormat("\n%s:%i in %s ASSERTION FAILED:\n %s\n", file, line, function, message) + FormatAssertionMessage(format, args) + '\n';
va_end(args);
fprintf(stderr, "%s", formattedMessage.c_str());
fflush(stderr);
va_end(args);
*((volatile int*)nullptr) = 0;
exit(1);
Crash(formattedMessage.c_str());
}
void Fatal(char const* file, int line, char const* function, char const* message, ...)
@@ -64,22 +95,22 @@ void Fatal(char const* file, int line, char const* function, char const* message
va_list args;
va_start(args, message);
fprintf(stderr, "\n%s:%i in %s FATAL ERROR:\n ", file, line, function);
vfprintf(stderr, message, args);
fprintf(stderr, "\n");
std::string formattedMessage = StringFormat("\n%s:%i in %s FATAL ERROR:\n %s\n", file, line, function) + FormatAssertionMessage(message, args) + '\n';
va_end(args);
fprintf(stderr, "%s", formattedMessage.c_str());
fflush(stderr);
std::this_thread::sleep_for(std::chrono::seconds(10));
*((volatile int*)nullptr) = 0;
exit(1);
Crash(formattedMessage.c_str());
}
void Error(char const* file, int line, char const* function, char const* message)
{
fprintf(stderr, "\n%s:%i in %s ERROR:\n %s\n",
file, line, function, message);
*((volatile int*)nullptr) = 0;
exit(1);
std::string formattedMessage = StringFormat("\n%s:%i in %s ERROR:\n %s\n", file, line, function, message);
fprintf(stderr, "%s", formattedMessage.c_str());
fflush(stderr);
Crash(formattedMessage.c_str());
}
void Warning(char const* file, int line, char const* function, char const* message)
@@ -90,17 +121,19 @@ void Warning(char const* file, int line, char const* function, char const* messa
void Abort(char const* file, int line, char const* function)
{
fprintf(stderr, "\n%s:%i in %s ABORTED.\n",
file, line, function);
*((volatile int*)nullptr) = 0;
exit(1);
std::string formattedMessage = StringFormat("\n%s:%i in %s ABORTED.\n", file, line, function);
fprintf(stderr, "%s", formattedMessage.c_str());
fflush(stderr);
Crash(formattedMessage.c_str());
}
void AbortHandler(int /*sigval*/)
void AbortHandler(int sigval)
{
// nothing useful to log here, no way to pass args
*((volatile int*)nullptr) = 0;
exit(1);
std::string formattedMessage = StringFormat("Caught signal %i\n", sigval);
fprintf(stderr, "%s", formattedMessage.c_str());
fflush(stderr);
Crash(formattedMessage.c_str());
}
} // namespace Trinity
+4
View File
@@ -46,6 +46,10 @@ namespace Trinity
#define ASSERT_END
#endif
#if TRINITY_PLATFORM == TRINITY_PLATFORM_WINDOWS
#define EXCEPTION_ASSERTION_FAILURE 0xC0000420L
#endif
#define WPAssert(cond, ...) ASSERT_BEGIN do { if (!(cond)) Trinity::Assert(__FILE__, __LINE__, __FUNCTION__, #cond, ##__VA_ARGS__); } while(0) ASSERT_END
#define WPFatal(cond, ...) ASSERT_BEGIN do { if (!(cond)) Trinity::Fatal(__FILE__, __LINE__, __FUNCTION__, ##__VA_ARGS__); } while(0) ASSERT_END
#define WPError(cond, msg) ASSERT_BEGIN do { if (!(cond)) Trinity::Error(__FILE__, __LINE__, __FUNCTION__, (msg)); } while(0) ASSERT_END
+20 -1
View File
@@ -22,6 +22,7 @@
#include "WheatyExceptionReport.h"
#include "Common.h"
#include "Errors.h"
#include "GitRevision.h"
#include <algorithm>
@@ -168,8 +169,21 @@ PEXCEPTION_POINTERS pExceptionInfo)
info.ExceptionPointers = pExceptionInfo;
info.ThreadId = GetCurrentThreadId();
MINIDUMP_USER_STREAM additionalStream = {};
MINIDUMP_USER_STREAM_INFORMATION additionalStreamInfo = {};
if (pExceptionInfo->ExceptionRecord->ExceptionCode == EXCEPTION_ASSERTION_FAILURE && pExceptionInfo->ExceptionRecord->NumberParameters > 0)
{
additionalStream.Type = CommentStreamA;
additionalStream.Buffer = reinterpret_cast<PVOID>(pExceptionInfo->ExceptionRecord->ExceptionInformation[0]);
additionalStream.BufferSize = strlen(reinterpret_cast<char const*>(pExceptionInfo->ExceptionRecord->ExceptionInformation[0])) + 1;
additionalStreamInfo.UserStreamArray = &additionalStream;
additionalStreamInfo.UserStreamCount = 1;
}
MiniDumpWriteDump(GetCurrentProcess(), GetCurrentProcessId(),
m_hDumpFile, MiniDumpWithIndirectlyReferencedMemory, &info, 0, 0);
m_hDumpFile, MiniDumpWithIndirectlyReferencedMemory, &info, &additionalStreamInfo, 0);
CloseHandle(m_hDumpFile);
}
@@ -501,6 +515,11 @@ PEXCEPTION_POINTERS pExceptionInfo)
Log(_T("Exception code: %08X %s\r\n"),
pExceptionRecord->ExceptionCode,
GetExceptionString(pExceptionRecord->ExceptionCode));
if (pExceptionRecord->ExceptionCode == EXCEPTION_ASSERTION_FAILURE && pExceptionRecord->NumberParameters >= 2)
{
pExceptionRecord->ExceptionAddress = reinterpret_cast<PVOID>(pExceptionRecord->ExceptionInformation[1]);
Log(_T("Assertion message: %s\r\n"), pExceptionRecord->ExceptionInformation[0]);
}
// Now print information about where the fault occured
TCHAR szFaultingModule[MAX_PATH];
+2
View File
@@ -771,6 +771,8 @@ enum RBACPermissions
RBAC_PERM_COMMAND_DEBUG_THREATINFO = 870,
RBAC_PERM_COMMAND_DEBUG_INSTANCESPAWN = 871,
RBAC_PERM_COMMAND_SERVER_DEBUG = 872,
RBAC_PERM_COMMAND_RELOAD_CREATURE_MOVEMENT_OVERRIDE = 873,
RBAC_PERM_COMMAND_GO_INSTANCE = 874,
//
// IF YOU ADD NEW PERMISSIONS, ADD THEM IN MASTER BRANCH AS WELL!
//
@@ -222,9 +222,6 @@ void Creature::AddToWorld()
///- Register the creature for guid lookup
if (!IsInWorld())
{
if (GetZoneScript())
GetZoneScript()->OnCreatureCreate(this);
GetMap()->GetObjectsStore().Insert<Creature>(GetGUID(), this);
if (m_spawnId)
GetMap()->GetCreatureBySpawnIdStore().insert(std::make_pair(m_spawnId, this));
@@ -236,6 +233,9 @@ void Creature::AddToWorld()
AIM_Initialize();
if (IsVehicle())
GetVehicleKit()->Install();
if (GetZoneScript())
GetZoneScript()->OnCreatureCreate(this);
}
}
@@ -108,6 +108,7 @@ class TC_GAME_API GameObject : public WorldObject, public GridObject<GameObject>
void SetWorldRotationAngles(float z_rot, float y_rot, float x_rot);
void SetWorldRotation(float qx, float qy, float qz, float qw);
void SetParentRotation(QuaternionData const& rotation); // transforms(rotates) transport's path
QuaternionData const& GetWorldRotation() const { return m_worldRotation; }
int64 GetPackedWorldRotation() const { return m_packedRotation; }
// overwrite WorldObject function for proper name localization
+1
View File
@@ -949,6 +949,7 @@ class TC_GAME_API ObjectMgr
ItemTemplate const* GetItemTemplate(uint32 entry) const;
ItemTemplateContainer const* GetItemTemplateStore() const { return &_itemTemplateStore; }
InstanceTemplateContainer const& GetInstanceTemplates() const { return _instanceTemplateStore; }
InstanceTemplate const* GetInstanceTemplate(uint32 mapId) const;
PetLevelInfo const* GetPetLevelInfo(uint32 creature_id, uint8 level) const;
+10 -1
View File
@@ -929,7 +929,16 @@ enum TrinityStrings
LANG_GROUP_ROLE_CHANGED = 1186,
LANG_LEADER_CANNOT_BE_ASSISTANT = 1187,
LANG_BAN_EXISTS = 1188,
// Room for more level 3 1189-1199 not used
LANG_COMMAND_NO_INSTANCES_MATCH = 1189,
LANG_COMMAND_MULTIPLE_INSTANCES_MATCH = 1190,
LANG_COMMAND_MULTIPLE_INSTANCES_ENTRY = 1191,
LANG_COMMAND_MAP_NOT_INSTANCE = 1192,
LANG_COMMAND_INSTANCE_NO_ENTRANCE = 1193,
LANG_COMMAND_INSTANCE_NO_EXIT = 1194,
LANG_COMMAND_WENT_TO_INSTANCE_GATE = 1195,
LANG_COMMAND_WENT_TO_INSTANCE_START = 1196,
LANG_COMMAND_GO_INSTANCE_FAILED = 1197,
// Room for more level 3 1197-1199 not used
// Debug commands
LANG_CINEMATIC_NOT_EXIST = 1200,
+1 -1
View File
@@ -1960,7 +1960,7 @@ void Spell::SearchChainTargets(std::list<WorldObject*>& targets, uint32 chainTar
if (Unit* unit = (*itr)->ToUnit())
{
uint32 deficit = unit->GetMaxHealth() - unit->GetHealth();
if ((deficit > maxHPDeficit || foundItr == tempTargets.end()) && target->IsWithinDist(unit, jumpRadius) && target->IsWithinLOSInMap(unit, LINEOFSIGHT_ALL_CHECKS, VMAP::ModelIgnoreFlags::M2))
if (deficit > maxHPDeficit && target->IsWithinDist(unit, jumpRadius) && target->IsWithinLOSInMap(unit, LINEOFSIGHT_ALL_CHECKS, VMAP::ModelIgnoreFlags::M2))
{
foundItr = itr;
maxHPDeficit = deficit;
+99
View File
@@ -55,6 +55,7 @@ public:
{ "xyz", rbac::RBAC_PERM_COMMAND_GO_XYZ, false, &HandleGoXYZCommand, "" },
{ "ticket", rbac::RBAC_PERM_COMMAND_GO_TICKET, false, &HandleGoTicketCommand, "" },
{ "offset", rbac::RBAC_PERM_COMMAND_GO_OFFSET, false, &HandleGoOffsetCommand, "" },
{ "instance", rbac::RBAC_PERM_COMMAND_GO_INSTANCE, false, &HandleGoInstanceCommand, "" }
};
static std::vector<ChatCommand> commandTable =
@@ -596,6 +597,104 @@ public:
player->TeleportTo(player->GetMapId(), x, y, z, o);
return true;
}
static bool HandleGoInstanceCommand(ChatHandler* handler, char const* args)
{
if (!*args)
return false;
char* pos = const_cast<char*>(args);
do *pos = tolower(*pos);
while (*(++pos));
Tokenizer labels(args, ' ');
uint32 mapid = 0;
if (labels.size() == 1)
{
try { mapid = std::stoi(labels[0]); }
catch (...) {}
}
if (!mapid)
{
std::multimap<uint32, std::pair<uint16, std::string>> matches;
for (auto const& pair : sObjectMgr->GetInstanceTemplates())
{
uint32 count = 0;
std::string const& scriptName = sObjectMgr->GetScriptName(pair.second.ScriptId);
for (char const* label : labels)
if (scriptName.find(label) != std::string::npos)
++count;
if (count)
matches.emplace(count, decltype(matches)::mapped_type({ pair.first, scriptName }));
}
if (matches.empty())
{
handler->SendSysMessage(LANG_COMMAND_NO_INSTANCES_MATCH);
return false;
}
auto it = matches.rbegin();
uint32 maxCount = it->first;
mapid = it->second.first;
if (++it != matches.rend() && it->first == maxCount)
{
handler->SendSysMessage(LANG_COMMAND_MULTIPLE_INSTANCES_MATCH);
--it;
do
handler->PSendSysMessage(LANG_COMMAND_MULTIPLE_INSTANCES_ENTRY, it->second.first, it->second.second);
while (++it != matches.rend() && it->first == maxCount);
handler->SetSentErrorMessage(true);
return false;
}
}
ASSERT(mapid);
InstanceTemplate const* temp = sObjectMgr->GetInstanceTemplate(mapid);
if (!temp)
{
handler->PSendSysMessage(LANG_COMMAND_MAP_NOT_INSTANCE, mapid);
handler->SetSentErrorMessage(true);
return false;
}
std::string const& scriptname = sObjectMgr->GetScriptName(temp->ScriptId);
Player* player = handler->GetSession()->GetPlayer();
if (player->IsInFlight())
{
player->GetMotionMaster()->MovementExpired();
player->CleanupAfterTaxiFlight();
}
else
player->SaveRecallPosition();
// try going to entrance
AreaTriggerStruct const* exit = sObjectMgr->GetGoBackTrigger(mapid);
if (!exit)
handler->PSendSysMessage(LANG_COMMAND_INSTANCE_NO_EXIT, mapid, scriptname);
if (exit && player->TeleportTo(exit->target_mapId, exit->target_X, exit->target_Y, exit->target_Z, exit->target_Orientation + M_PI))
{
handler->PSendSysMessage(LANG_COMMAND_WENT_TO_INSTANCE_GATE, mapid, scriptname);
return true;
}
// try going to start
AreaTriggerStruct const* entrance = sObjectMgr->GetMapEntranceTrigger(mapid);
if (!entrance)
handler->PSendSysMessage(LANG_COMMAND_INSTANCE_NO_ENTRANCE, mapid, scriptname);
if (entrance && player->TeleportTo(entrance->target_mapId, entrance->target_X, entrance->target_Y, entrance->target_Z, entrance->target_Orientation))
{
handler->PSendSysMessage(LANG_COMMAND_WENT_TO_INSTANCE_START, mapid, scriptname);
return true;
}
handler->PSendSysMessage(LANG_COMMAND_GO_INSTANCE_FAILED, mapid, scriptname, exit->target_mapId);
handler->SetSentErrorMessage(true);
return false;
}
};
void AddSC_go_commandscript()
@@ -47,6 +47,7 @@ public:
uiMovementDone = 0;
uiGrandChampionsDeaths = 0;
uiArgentSoldierDeaths = 0;
teamInInstance = 0;
bDone = false;
@@ -55,6 +56,7 @@ public:
uint32 m_auiEncounter[MAX_ENCOUNTER];
uint32 teamInInstance;
uint16 uiMovementDone;
uint16 uiGrandChampionsDeaths;
uint8 uiArgentSoldierDeaths;
@@ -87,46 +89,16 @@ public:
return false;
}
void OnPlayerEnter(Player* player) override
{
if (!teamInInstance)
teamInInstance = player->GetTeam();
}
void OnCreatureCreate(Creature* creature) override
{
Map::PlayerList const& players = instance->GetPlayers();
uint32 TeamInInstance = 0;
if (!players.isEmpty())
{
if (Player* player = players.begin()->GetSource())
TeamInInstance = player->GetTeam();
}
switch (creature->GetEntry())
{
// Champions
case VEHICLE_MOKRA_SKILLCRUSHER_MOUNT:
if (TeamInInstance == HORDE)
creature->UpdateEntry(VEHICLE_MARSHAL_JACOB_ALERIUS_MOUNT);
break;
case VEHICLE_ERESSEA_DAWNSINGER_MOUNT:
if (TeamInInstance == HORDE)
creature->UpdateEntry(VEHICLE_AMBROSE_BOLTSPARK_MOUNT);
break;
case VEHICLE_RUNOK_WILDMANE_MOUNT:
if (TeamInInstance == HORDE)
creature->UpdateEntry(VEHICLE_COLOSOS_MOUNT);
break;
case VEHICLE_ZUL_TORE_MOUNT:
if (TeamInInstance == HORDE)
creature->UpdateEntry(VEHICLE_EVENSONG_MOUNT);
break;
case VEHICLE_DEATHSTALKER_VESCERI_MOUNT:
if (TeamInInstance == HORDE)
creature->UpdateEntry(VEHICLE_LANA_STOUTHAMMER_MOUNT);
break;
// Coliseum Announcer || Just NPC_JAEREN must be spawned.
case NPC_JAEREN:
uiAnnouncerGUID = creature->GetGUID();
if (TeamInInstance == ALLIANCE)
creature->UpdateEntry(NPC_ARELAS);
break;
case VEHICLE_ARGENT_WARHORSE:
case VEHICLE_ARGENT_BATTLEWORG:
VehicleList.push_back(creature->GetGUID());
@@ -135,6 +107,42 @@ public:
case NPC_PALETRESS:
uiArgentChampionGUID = creature->GetGUID();
break;
case NPC_JAEREN:
case NPC_ARELAS:
uiAnnouncerGUID = creature->GetGUID();
break;
default:
break;
}
}
uint32 GetCreatureEntry(ObjectGuid::LowType /*guidLow*/, CreatureData const* data) override
{
if (!teamInInstance)
{
Map::PlayerList const& players = instance->GetPlayers();
if (!players.isEmpty())
if (Player* player = players.begin()->GetSource())
teamInInstance = player->GetTeam();
}
uint32 entry = data->id;
switch (entry)
{
case VEHICLE_MOKRA_SKILLCRUSHER_MOUNT:
return teamInInstance == HORDE ? VEHICLE_MARSHAL_JACOB_ALERIUS_MOUNT : VEHICLE_MOKRA_SKILLCRUSHER_MOUNT;
case VEHICLE_ERESSEA_DAWNSINGER_MOUNT:
return teamInInstance == HORDE ? VEHICLE_AMBROSE_BOLTSPARK_MOUNT : VEHICLE_ERESSEA_DAWNSINGER_MOUNT;
case VEHICLE_RUNOK_WILDMANE_MOUNT:
return teamInInstance == HORDE ? VEHICLE_COLOSOS_MOUNT : VEHICLE_RUNOK_WILDMANE_MOUNT;
case VEHICLE_ZUL_TORE_MOUNT:
return teamInInstance == HORDE ? VEHICLE_EVENSONG_MOUNT : VEHICLE_ZUL_TORE_MOUNT;
case VEHICLE_DEATHSTALKER_VESCERI_MOUNT:
return teamInInstance == HORDE ? VEHICLE_LANA_STOUTHAMMER_MOUNT : VEHICLE_DEATHSTALKER_VESCERI_MOUNT;
case NPC_JAEREN:
return teamInInstance == HORDE ? NPC_ARELAS : NPC_JAEREN;
default:
return entry;
}
}
@@ -54,14 +54,6 @@ class instance_forge_of_souls : public InstanceMapScript
void OnCreatureCreate(Creature* creature) override
{
if (!teamInInstance)
{
Map::PlayerList const& players = instance->GetPlayers();
if (!players.isEmpty())
if (Player* player = players.begin()->GetSource())
teamInInstance = player->GetTeam();
}
switch (creature->GetEntry())
{
case NPC_BRONJAHM:
@@ -70,18 +62,30 @@ class instance_forge_of_souls : public InstanceMapScript
case NPC_DEVOURER:
devourerOfSouls = creature->GetGUID();
break;
}
}
uint32 GetCreatureEntry(ObjectGuid::LowType /*guidLow*/, CreatureData const* data) override
{
if (!teamInInstance)
{
Map::PlayerList const& players = instance->GetPlayers();
if (!players.isEmpty())
if (Player* player = players.begin()->GetSource())
teamInInstance = player->GetTeam();
}
uint32 entry = data->id;
switch (entry)
{
case NPC_SYLVANAS_PART1:
if (teamInInstance == ALLIANCE)
creature->UpdateEntry(NPC_JAINA_PART1);
break;
return teamInInstance == ALLIANCE ? NPC_JAINA_PART1 : NPC_SYLVANAS_PART1;
case NPC_LORALEN:
if (teamInInstance == ALLIANCE)
creature->UpdateEntry(NPC_ELANDRA);
break;
return teamInInstance == ALLIANCE ? NPC_ELANDRA : NPC_LORALEN;
case NPC_KALIRA:
if (teamInInstance == ALLIANCE)
creature->UpdateEntry(NPC_KORELN);
break;
return teamInInstance == ALLIANCE ? NPC_KORELN : NPC_KALIRA;
default:
return entry;
}
}
@@ -89,84 +89,60 @@ class instance_pit_of_saron : public InstanceMapScript
case NPC_TYRANNUS_EVENTS:
_tyrannusEventGUID = creature->GetGUID();
break;
case NPC_SYLVANAS_PART1:
if (_teamInInstance == ALLIANCE)
creature->UpdateEntry(NPC_JAINA_PART1);
_jainaOrSylvanas1GUID = creature->GetGUID();
break;
case NPC_SYLVANAS_PART2:
if (_teamInInstance == ALLIANCE)
creature->UpdateEntry(NPC_JAINA_PART2);
_jainaOrSylvanas2GUID = creature->GetGUID();
break;
case NPC_KILARA:
if (_teamInInstance == ALLIANCE)
creature->UpdateEntry(NPC_ELANDRA);
break;
case NPC_KORALEN:
if (_teamInInstance == ALLIANCE)
creature->UpdateEntry(NPC_KORLAEN);
break;
case NPC_CHAMPION_1_HORDE:
if (_teamInInstance == ALLIANCE)
creature->UpdateEntry(NPC_CHAMPION_1_ALLIANCE);
break;
case NPC_CHAMPION_2_HORDE:
if (_teamInInstance == ALLIANCE)
creature->UpdateEntry(NPC_CHAMPION_2_ALLIANCE);
break;
case NPC_CHAMPION_3_HORDE: // No 3rd set for Alliance?
if (_teamInInstance == ALLIANCE)
creature->UpdateEntry(NPC_CHAMPION_2_ALLIANCE);
break;
case NPC_HORDE_SLAVE_1:
if (_teamInInstance == ALLIANCE)
creature->UpdateEntry(NPC_ALLIANCE_SLAVE_1);
break;
case NPC_HORDE_SLAVE_2:
if (_teamInInstance == ALLIANCE)
creature->UpdateEntry(NPC_ALLIANCE_SLAVE_2);
break;
case NPC_HORDE_SLAVE_3:
if (_teamInInstance == ALLIANCE)
creature->UpdateEntry(NPC_ALLIANCE_SLAVE_3);
break;
case NPC_HORDE_SLAVE_4:
if (_teamInInstance == ALLIANCE)
creature->UpdateEntry(NPC_ALLIANCE_SLAVE_4);
break;
case NPC_FREED_SLAVE_1_HORDE:
if (_teamInInstance == ALLIANCE)
creature->UpdateEntry(NPC_FREED_SLAVE_1_ALLIANCE);
break;
case NPC_FREED_SLAVE_2_HORDE:
if (_teamInInstance == ALLIANCE)
creature->UpdateEntry(NPC_FREED_SLAVE_2_ALLIANCE);
break;
case NPC_FREED_SLAVE_3_HORDE:
if (_teamInInstance == ALLIANCE)
creature->UpdateEntry(NPC_FREED_SLAVE_3_ALLIANCE);
break;
case NPC_RESCUED_SLAVE_HORDE:
if (_teamInInstance == ALLIANCE)
creature->UpdateEntry(NPC_RESCUED_SLAVE_ALLIANCE);
break;
case NPC_MARTIN_VICTUS_1:
if (_teamInInstance == ALLIANCE)
creature->UpdateEntry(NPC_MARTIN_VICTUS_1);
break;
case NPC_MARTIN_VICTUS_2:
if (_teamInInstance == ALLIANCE)
creature->UpdateEntry(NPC_MARTIN_VICTUS_2);
break;
case NPC_CAVERN_EVENT_TRIGGER:
_cavernstriggersVector.push_back(creature->GetGUID());
break;
case NPC_SYLVANAS_PART1:
case NPC_SYLVANAS_PART2:
case NPC_JAINA_PART1:
case NPC_JAINA_PART2:
_jainaOrSylvanas1GUID = creature->GetGUID();
break;
default:
break;
}
}
uint32 GetCreatureEntry(ObjectGuid::LowType /*guidLow*/, CreatureData const* data) override
{
uint32 entry = data->id;
switch (entry)
{
case NPC_SYLVANAS_PART1:
return _teamInInstance == ALLIANCE ? NPC_JAINA_PART1 : NPC_SYLVANAS_PART1;
case NPC_SYLVANAS_PART2:
return _teamInInstance == ALLIANCE ? NPC_JAINA_PART2 : NPC_SYLVANAS_PART2;
case NPC_KILARA:
return _teamInInstance == ALLIANCE ? NPC_ELANDRA : NPC_KILARA;
case NPC_KORALEN:
return _teamInInstance == ALLIANCE ? NPC_KORLAEN : NPC_KORALEN;
case NPC_CHAMPION_1_HORDE:
return _teamInInstance == ALLIANCE ? NPC_CHAMPION_1_ALLIANCE : NPC_CHAMPION_1_HORDE;
case NPC_CHAMPION_2_HORDE:
return _teamInInstance == ALLIANCE ? NPC_CHAMPION_2_ALLIANCE : NPC_CHAMPION_2_HORDE;
case NPC_CHAMPION_3_HORDE:
return _teamInInstance == ALLIANCE ? NPC_CHAMPION_2_ALLIANCE : NPC_CHAMPION_3_HORDE;
case NPC_HORDE_SLAVE_1:
return _teamInInstance == ALLIANCE ? NPC_ALLIANCE_SLAVE_1 : NPC_HORDE_SLAVE_1;
case NPC_HORDE_SLAVE_2:
return _teamInInstance == ALLIANCE ? NPC_ALLIANCE_SLAVE_2 : NPC_HORDE_SLAVE_2;
case NPC_HORDE_SLAVE_3:
return _teamInInstance == ALLIANCE ? NPC_ALLIANCE_SLAVE_3 : NPC_HORDE_SLAVE_3;
case NPC_HORDE_SLAVE_4:
return _teamInInstance == ALLIANCE ? NPC_ALLIANCE_SLAVE_4 : NPC_HORDE_SLAVE_4;
case NPC_FREED_SLAVE_1_HORDE:
return _teamInInstance == ALLIANCE ? NPC_FREED_SLAVE_1_ALLIANCE : NPC_FREED_SLAVE_1_HORDE;
case NPC_FREED_SLAVE_2_HORDE:
return _teamInInstance == ALLIANCE ? NPC_FREED_SLAVE_2_ALLIANCE : NPC_FREED_SLAVE_2_HORDE;
case NPC_FREED_SLAVE_3_HORDE:
return _teamInInstance == ALLIANCE ? NPC_FREED_SLAVE_3_ALLIANCE : NPC_FREED_SLAVE_3_HORDE;
case NPC_RESCUED_SLAVE_HORDE:
return _teamInInstance == ALLIANCE ? NPC_RESCUED_SLAVE_ALLIANCE : NPC_RESCUED_SLAVE_HORDE;
default:
return entry;
}
}
void OnGameObjectCreate(GameObject* go) override
{
switch (go->GetEntry())
@@ -187,14 +187,6 @@ class instance_icecrown_citadel : public InstanceMapScript
void OnCreatureCreate(Creature* creature) override
{
if (!TeamInInstance)
{
Map::PlayerList const& players = instance->GetPlayers();
if (!players.isEmpty())
if (Player* player = players.begin()->GetSource())
TeamInInstance = player->GetTeam();
}
switch (creature->GetEntry())
{
case NPC_LORD_MARROWGAR:
@@ -203,42 +195,6 @@ class instance_icecrown_citadel : public InstanceMapScript
case NPC_LADY_DEATHWHISPER:
LadyDeahtwhisperGUID = creature->GetGUID();
break;
case NPC_KOR_KRON_GENERAL:
if (TeamInInstance == ALLIANCE)
creature->UpdateEntry(NPC_ALLIANCE_COMMANDER);
break;
case NPC_KOR_KRON_LIEUTENANT:
if (TeamInInstance == ALLIANCE)
creature->UpdateEntry(NPC_SKYBREAKER_LIEUTENANT);
break;
case NPC_TORTUNOK:
if (TeamInInstance == ALLIANCE)
creature->UpdateEntry(NPC_ALANA_MOONSTRIKE);
break;
case NPC_GERARDO_THE_SUAVE:
if (TeamInInstance == ALLIANCE)
creature->UpdateEntry(NPC_TALAN_MOONSTRIKE);
break;
case NPC_UVLUS_BANEFIRE:
if (TeamInInstance == ALLIANCE)
creature->UpdateEntry(NPC_MALFUS_GRIMFROST);
break;
case NPC_IKFIRUS_THE_VILE:
if (TeamInInstance == ALLIANCE)
creature->UpdateEntry(NPC_YILI);
break;
case NPC_VOL_GUK:
if (TeamInInstance == ALLIANCE)
creature->UpdateEntry(NPC_JEDEBIA);
break;
case NPC_HARAGG_THE_UNSEEN:
if (TeamInInstance == ALLIANCE)
creature->UpdateEntry(NPC_NIBY_THE_ALMIGHTY);
break;
case NPC_GARROSH_HELLSCREAM:
if (TeamInInstance == ALLIANCE)
creature->UpdateEntry(NPC_KING_VARIAN_WRYNN);
break;
case NPC_DEATHBRINGER_SAURFANG:
DeathbringerSaurfangGUID = creature->GetGUID();
break;
@@ -247,16 +203,8 @@ class instance_icecrown_citadel : public InstanceMapScript
creature->SetControlled(true, UNIT_STATE_ROOT);
break;
case NPC_SE_HIGH_OVERLORD_SAURFANG:
if (TeamInInstance == ALLIANCE)
creature->UpdateEntry(NPC_SE_MURADIN_BRONZEBEARD, creature->GetCreatureData());
// no break;
case NPC_SE_MURADIN_BRONZEBEARD:
DeathbringerSaurfangEventGUID = creature->GetGUID();
creature->LastUsedScriptID = creature->GetScriptId();
break;
case NPC_SE_KOR_KRON_REAVER:
if (TeamInInstance == ALLIANCE)
creature->UpdateEntry(NPC_SE_SKYBREAKER_MARINE);
break;
case NPC_FESTERGUT:
FestergutGUID = creature->GetGUID();
@@ -358,6 +306,14 @@ class instance_icecrown_citadel : public InstanceMapScript
// Weekly quest spawn prevention
uint32 GetCreatureEntry(ObjectGuid::LowType /*guidLow*/, CreatureData const* data) override
{
if (!TeamInInstance)
{
Map::PlayerList const& players = instance->GetPlayers();
if (!players.isEmpty())
if (Player* player = players.begin()->GetSource())
TeamInInstance = player->GetTeam();
}
uint32 entry = data->id;
switch (entry)
{
@@ -379,6 +335,9 @@ class instance_icecrown_citadel : public InstanceMapScript
break;
}
}
if (entry == NPC_KOR_KRON_LIEUTENANT && TeamInInstance == ALLIANCE)
return NPC_SKYBREAKER_LIEUTENANT;
break;
}
case NPC_HORDE_GUNSHIP_CANNON:
@@ -404,6 +363,26 @@ class instance_icecrown_citadel : public InstanceMapScript
(TeamInInstance == HORDE && data->spawnPoint.GetPositionX() < 10.0f))
return entry;
return 0;
case NPC_SE_HIGH_OVERLORD_SAURFANG:
return TeamInInstance == ALLIANCE ? NPC_SE_MURADIN_BRONZEBEARD : NPC_SE_HIGH_OVERLORD_SAURFANG;
case NPC_KOR_KRON_GENERAL:
return TeamInInstance == ALLIANCE ? NPC_ALLIANCE_COMMANDER : NPC_KOR_KRON_GENERAL;
case NPC_TORTUNOK:
return TeamInInstance == ALLIANCE ? NPC_ALANA_MOONSTRIKE : NPC_TORTUNOK;
case NPC_GERARDO_THE_SUAVE:
return TeamInInstance == ALLIANCE ? NPC_TALAN_MOONSTRIKE : NPC_GERARDO_THE_SUAVE;
case NPC_UVLUS_BANEFIRE:
return TeamInInstance == ALLIANCE ? NPC_MALFUS_GRIMFROST : NPC_UVLUS_BANEFIRE;
case NPC_IKFIRUS_THE_VILE:
return TeamInInstance == ALLIANCE ? NPC_YILI : NPC_IKFIRUS_THE_VILE;
case NPC_VOL_GUK:
return TeamInInstance == ALLIANCE ? NPC_JEDEBIA : NPC_VOL_GUK;
case NPC_HARAGG_THE_UNSEEN:
return TeamInInstance == ALLIANCE ? NPC_NIBY_THE_ALMIGHTY : NPC_HARAGG_THE_UNSEEN;
case NPC_GARROSH_HELLSCREAM:
return TeamInInstance == ALLIANCE ? NPC_KING_VARIAN_WRYNN : NPC_GARROSH_HELLSCREAM;
case NPC_SE_KOR_KRON_REAVER:
return TeamInInstance == ALLIANCE ? NPC_SE_SKYBREAKER_MARINE : NPC_SE_KOR_KRON_REAVER;
default:
break;
}
@@ -54,42 +54,47 @@ class instance_nexus : public InstanceMapScript
case NPC_KERISTRASZA:
KeristraszaGUID = creature->GetGUID();
break;
// Alliance npcs are spawned by default, if you are alliance, you will fight against horde npcs.
case NPC_ALLIANCE_BERSERKER:
if (ServerAllowsTwoSideGroups())
creature->SetFaction(FACTION_MONSTER_2);
if (_teamInInstance == ALLIANCE)
creature->UpdateEntry(NPC_HORDE_BERSERKER);
break;
case NPC_ALLIANCE_RANGER:
if (ServerAllowsTwoSideGroups())
creature->SetFaction(FACTION_MONSTER_2);
if (_teamInInstance == ALLIANCE)
creature->UpdateEntry(NPC_HORDE_RANGER);
break;
case NPC_ALLIANCE_CLERIC:
if (ServerAllowsTwoSideGroups())
creature->SetFaction(FACTION_MONSTER_2);
if (_teamInInstance == ALLIANCE)
creature->UpdateEntry(NPC_HORDE_CLERIC);
break;
case NPC_ALLIANCE_COMMANDER:
if (ServerAllowsTwoSideGroups())
creature->SetFaction(FACTION_MONSTER_2);
if (_teamInInstance == ALLIANCE)
creature->UpdateEntry(NPC_HORDE_COMMANDER);
break;
case NPC_COMMANDER_STOUTBEARD:
if (ServerAllowsTwoSideGroups())
creature->SetFaction(FACTION_MONSTER_2);
if (_teamInInstance == ALLIANCE)
creature->UpdateEntry(NPC_COMMANDER_KOLURG);
break;
default:
break;
}
}
uint32 GetCreatureEntry(ObjectGuid::LowType /*guidLow*/, CreatureData const* data) override
{
if (!_teamInInstance)
{
Map::PlayerList const& players = instance->GetPlayers();
if (!players.isEmpty())
if (Player* player = players.begin()->GetSource())
_teamInInstance = player->GetTeam();
}
uint32 entry = data->id;
switch (entry)
{
case NPC_ALLIANCE_BERSERKER:
return _teamInInstance == ALLIANCE ? NPC_HORDE_BERSERKER : NPC_ALLIANCE_BERSERKER;
case NPC_ALLIANCE_RANGER:
return _teamInInstance == ALLIANCE ? NPC_HORDE_RANGER : NPC_ALLIANCE_RANGER;
case NPC_ALLIANCE_CLERIC:
return _teamInInstance == ALLIANCE ? NPC_HORDE_CLERIC : NPC_ALLIANCE_CLERIC;
case NPC_ALLIANCE_COMMANDER:
return _teamInInstance == ALLIANCE ? NPC_HORDE_COMMANDER : NPC_ALLIANCE_COMMANDER;
case NPC_COMMANDER_STOUTBEARD:
return _teamInInstance == ALLIANCE ? NPC_COMMANDER_KOLURG : NPC_COMMANDER_STOUTBEARD;
default:
return entry;
}
}
void OnGameObjectCreate(GameObject* go) override
{
switch (go->GetEntry())
@@ -161,57 +161,6 @@ class AreaTrigger_at_scent_larkorwi : public AreaTriggerScript
}
};
/*#####
## at_last_rites
#####*/
enum AtLastRites
{
QUEST_LAST_RITES = 12019,
QUEST_BREAKING_THROUGH = 11898,
};
class AreaTrigger_at_last_rites : public AreaTriggerScript
{
public:
AreaTrigger_at_last_rites() : AreaTriggerScript("at_last_rites") { }
bool OnTrigger(Player* player, AreaTriggerEntry const* trigger) override
{
if (!(player->GetQuestStatus(QUEST_LAST_RITES) == QUEST_STATUS_INCOMPLETE ||
player->GetQuestStatus(QUEST_LAST_RITES) == QUEST_STATUS_COMPLETE ||
player->GetQuestStatus(QUEST_BREAKING_THROUGH) == QUEST_STATUS_INCOMPLETE ||
player->GetQuestStatus(QUEST_BREAKING_THROUGH) == QUEST_STATUS_COMPLETE))
return false;
WorldLocation pPosition;
switch (trigger->id)
{
case 5332:
case 5338:
pPosition = WorldLocation(571, 3733.68f, 3563.25f, 290.812f, 3.665192f);
break;
case 5334:
pPosition = WorldLocation(571, 3802.38f, 3585.95f, 49.5765f, 0.0f);
break;
case 5340:
if (player->GetQuestStatus(QUEST_LAST_RITES) == QUEST_STATUS_INCOMPLETE ||
player->GetQuestStatus(QUEST_LAST_RITES) == QUEST_STATUS_COMPLETE)
pPosition = WorldLocation(571, 3687.91f, 3577.28f, 473.342f);
else
pPosition = WorldLocation(571, 3739.38f, 3567.09f, 341.58f);
break;
default:
return false;
}
player->TeleportTo(pPosition);
return false;
}
};
/*######
## at_sholazar_waygate
######*/
@@ -485,7 +434,6 @@ void AddSC_areatrigger_scripts()
new AreaTrigger_at_legion_teleporter();
new AreaTrigger_at_stormwright_shelf();
new AreaTrigger_at_scent_larkorwi();
new AreaTrigger_at_last_rites();
new AreaTrigger_at_sholazar_waygate();
new AreaTrigger_at_nats_landing();
new AreaTrigger_at_brewfest();