From 23e25e7b34300a7124223496569e0c06ebb60ad6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=91=E4=BD=A9=E8=8C=B9?= Date: Thu, 8 Sep 2022 16:44:38 -0600 Subject: [PATCH] Move Onyxia 40 to difficulty 2, warnings clean up --- sql/world/base/ZZ_cleanup.sql | 2 - sql/world/base/boss_lord_kazzak.sql | 6 +- sql/world/base/class_trainers.sql | 15 - sql/world/base/dungeon_blackwing_lair.sql | 2 + sql/world/base/dungeon_onyxia.sql | 951 +++++++++++++++++- sql/world/base/naxx40_creatures.sql | 5 +- sql/world/base/professions.sql | 3 +- sql/world/base/quest_the_masquerade.sql | 2 +- sql/world/base/tbc_item_changes.sql | 3 - sql/world/base/vanilla_creature_values.sql | 9 - ...aq_quest_nerf.sql => zz_aq_quest_nerf.sql} | 0 sql/world/base/zz_cleanup.sql | 9 + src/IndividualProgression.cpp | 2 +- src/IndividualProgression_loader.cpp | 8 +- src/vanillaScripts/boss_chromaggus.cpp | 2 +- src/vanillaScripts/boss_onyxia.cpp | 17 +- src/vanillaScripts/instance_onyxias_lair.cpp | 36 +- src/vanillaScripts/onyxias_lair.h | 6 + 18 files changed, 966 insertions(+), 112 deletions(-) delete mode 100644 sql/world/base/ZZ_cleanup.sql create mode 100644 sql/world/base/dungeon_blackwing_lair.sql rename sql/world/base/{ZZ_aq_quest_nerf.sql => zz_aq_quest_nerf.sql} (100%) create mode 100644 sql/world/base/zz_cleanup.sql diff --git a/sql/world/base/ZZ_cleanup.sql b/sql/world/base/ZZ_cleanup.sql deleted file mode 100644 index 31298b8..0000000 --- a/sql/world/base/ZZ_cleanup.sql +++ /dev/null @@ -1,2 +0,0 @@ -DELETE FROM `game_event_creature` WHERE `guid` IN (208146, 208159, 208185, 208207, 208240, 208251, 208355, 208368, 208394, 208407); -DELETE FROM `creature_addon` WHERE `guid` IN (29803, 133925, 133926); \ No newline at end of file diff --git a/sql/world/base/boss_lord_kazzak.sql b/sql/world/base/boss_lord_kazzak.sql index eab20c4..d90ac94 100644 --- a/sql/world/base/boss_lord_kazzak.sql +++ b/sql/world/base/boss_lord_kazzak.sql @@ -1,4 +1,4 @@ -UPDATE `creature_template` SET `minlevel` = 63, `maxlevel` = 63,`ScriptName` = 'boss_lord_kazzak' WHERE `entry` = 12397; +UPDATE `creature_template` SET `MovementType` = 1, `minlevel` = 63, `maxlevel` = 63, `flags_extra` = 0, `ScriptName` = 'boss_lord_kazzak' WHERE `entry` = 12397; DELETE FROM `spell_script_names` WHERE `spell_id` = 21056; INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES @@ -21,8 +21,8 @@ INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Lan (12397, 8, 0, 'Kazzak is supreme!', 16, 0, 0, 0, 0, 0, 0, 0, 'kazzak SAY_SUPREME_VANILA'); DELETE FROM `creature` WHERE `guid` = 156950 AND `id1` = 12397; -INSERT INTO `creature` (`guid`, `id1`, `id2`, `id3`, `map`, `position_x`, `position_y`, `position_z`, `orientation`, `wander_distance`, `spawntimesecs`) VALUES -(156950, 12397, 0, 0, 0, -12275.6, -2524.26, 3.79202, 1.69492, 259200, 604800); +INSERT INTO `creature` (`guid`, `id1`, `id2`, `id3`, `map`, `position_x`, `position_y`, `position_z`, `orientation`, `wander_distance`, `spawntimesecs`, `MovementType`) VALUES +(156950, 12397, 0, 0, 0, -12275.6, -2524.26, 3.79202, 1.69492, 259200, 604800, 1); DELETE FROM `reference_loot_template` WHERE `Entry` = 60000; INSERT INTO `reference_loot_template` (`Entry`, `Item`, `Reference`, `Chance`, `QuestRequired`, `LootMode`, `GroupId`, `MinCount`, `MaxCount`, `Comment`) VALUES diff --git a/sql/world/base/class_trainers.sql b/sql/world/base/class_trainers.sql index 53ff0b1..43e42d0 100644 --- a/sql/world/base/class_trainers.sql +++ b/sql/world/base/class_trainers.sql @@ -276,22 +276,7 @@ INSERT INTO `creature_loot_template` (`Entry`, `Item`, `Chance`, `GroupId`, `Min (12467, 22891, 0.02, 0, 1, 1), (13197, 22891, 0.02, 0, 1, 1), (13285, 22891, 0.02, 0, 1, 1), -(15974, 22891, 0.03, 0, 1, 1), -(15975, 22891, 0.02, 0, 1, 1), -(15976, 22891, 0.03, 0, 1, 1), -(15980, 22891, 0.03, 0, 1, 1), -(15981, 22891, 0.03, 0, 1, 1), -(16018, 22891, 0.03, 0, 1, 1), -(16020, 22891, 0.02, 0, 1, 1), -(16145, 22891, 0.21, 0, 1, 1), -(16154, 22891, 0.03, 0, 1, 1), -(16163, 22891, 0.24, 0, 1, 1), -(16167, 22891, 0.03, 0, 1, 1), -(16168, 22891, 0.02, 0, 1, 1), -(16368, 22891, 0.06, 0, 1, 1), -(16453, 22891, 0.03, 0, 1, 1), (12397, 22891, 0.02, 0, 1, 1), -(16017, 22891, 0.02, 0, 1, 1), (10371, 22891, 0.02, 0, 1, 1), (11471, 22891, 0.02, 0, 1, 1), (11448, 22891, 0.02, 0, 1, 1), diff --git a/sql/world/base/dungeon_blackwing_lair.sql b/sql/world/base/dungeon_blackwing_lair.sql new file mode 100644 index 0000000..62b3493 --- /dev/null +++ b/sql/world/base/dungeon_blackwing_lair.sql @@ -0,0 +1,2 @@ +INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES +(23310, 'spell_bwl_chromaggus_time_lapse'); \ No newline at end of file diff --git a/sql/world/base/dungeon_onyxia.sql b/sql/world/base/dungeon_onyxia.sql index 32f34ba..21c774e 100644 --- a/sql/world/base/dungeon_onyxia.sql +++ b/sql/world/base/dungeon_onyxia.sql @@ -1,68 +1,911 @@ --- Onyxia -UPDATE `creature_template` SET `minlevel` = 63, `maxlevel` = 63, `lootid` = 54003, `DamageModifier` = 13 WHERE `entry` = 10184; +DELETE FROM `creature_template` WHERE `entry` BETWEEN 301000 AND 301003; +REPLACE INTO `creature_template` (`entry`, `modelid1`, `name`, `subname`, `minlevel`, `maxlevel`, `faction`, `speed_walk`, `speed_run`, `detection_range`,`scale`,`rank`,`dmgschool`,`DamageModifier`,`BaseAttackTime`,`RangeAttackTime`,`BaseVariance`,`RangeVariance`,`unit_class`,`unit_flags`,`unit_flags2`,`family`,`type`,`type_flags`,`lootid`,`skinloot`,`PetSpellDataId`,`mingold`,`maxgold`,`AIName`,`MovementType`,`HoverHeight`,`HealthModifier`,`ManaModifier`,`ArmorModifier`,`ExperienceModifier`,`movementId`,`RegenHealth`,`mechanic_immune_mask`,`spell_school_immune_mask`,`flags_extra`,`ScriptName`) VALUES +(301000, 8570, "Onyxia", "", 63, 63, 103, 1.0, 1.28571, 20.0, 1.0, 3, 0, 15.05, 2000, 2000, 1.0, 1.0, 1, 64, 2048, 0, 2, 108, 301000, 0, 0, 914892, 1066294, '', 0, 1.0, 330.0, 1.0, 1.0, 1.0, 0, 1, 646659963, 0, 1073742337, 'boss_onyxia_40'), +(301001, 397, "Onyxian Whelp", "", 56, 57, 16, 1.11111, 1.14286, 18.0, 1.0, 0, 0, 3.7, 2000, 2000, 1.0, 1.0, 1, 0, 2048, 0, 2, 8, 0, 0, 0, 0, 0, '', 1, 1.0, 1.0, 1.0, 1.0, 1.0, 0, 1, 0, 0, 0, ''), +(301002, 8711, "Onyxian Warder", "", 60, 63, 103, 0.888888, 1.14286, 20.0, 1.0, 1, 0, 9.8, 2000, 2000, 1.0, 1.0, 1, 64, 2048, 0, 2, 8, 301002, 0, 0, 1185, 4741, 'SmartAI', 1, 1.0, 25.0, 1.0, 1.0, 1.0, 0, 1, 617299803, 0, 0, ''); --- Trash mobs -UPDATE `creature_template` SET `minlevel` = 60, `maxlevel` = 60, `lootid` = 0, `skinloot` = 0 WHERE `entry` IN (11262, 12129); +REPLACE INTO `creature_loot_template` (`Entry`, `Item`, `Reference`, `Chance`, `QuestRequired`, `GroupId`, `MinCount`, `MaxCount`) VALUES +(301000, 17966, 0, 100.0, 0, 0, 1, 1), +(301000, 18422, 0, 100.0, 0, 0, 1, 1), +(301000, 18423, 0, 100.0, 0, 0, 1, 1), +(301000, 18705, 0, 40.0, 0, 0, 1, 1), +(301000, 21108, 0, 100.0, 0, 0, 1, 1), +(301000, 300000, 300000, 100.0, 0, 0, 2, 2), +(301000, 300440, 300440, 100.0, 0, 0, 1, 1), +(301000, 301710, 301710, 100.0, 0, 0, 1, 1), +(301000, 301720, 301720, 100.0, 0, 0, 1, 1), +(301000, 301730, 301730, 100.0, 0, 0, 1, 1), +(301000, 302620, 302620, 100.0, 0, 0, 1, 1), +(301000, 302630, 302630, 100.0, 0, 0, 1, 1), +(301002, 4500, 0, 0.06, 0, 0, 1, 1), +(301002, 5759, 0, 0.1, 0, 0, 1, 1), +(301002, 5760, 0, 0.6254, 0, 0, 1, 1), +(301002, 7909, 0, 0.6254, 0, 0, 1, 1), +(301002, 7910, 0, 0.6254, 0, 0, 1, 1), +(301002, 8766, 0, 2.8143, 0, 0, 1, 1), +(301002, 8952, 0, 5.4409, 0, 0, 1, 1), +(301002, 10305, 0, 0.28, 0, 0, 1, 1), +(301002, 10306, 0, 0.32, 0, 0, 1, 1), +(301002, 10307, 0, 0.22, 0, 0, 1, 1), +(301002, 10308, 0, 0.26, 0, 0, 1, 1), +(301002, 10309, 0, 0.1, 0, 0, 1, 1), +(301002, 10310, 0, 0.1, 0, 0, 1, 1), +(301002, 12682, 0, 0.02, 0, 0, 1, 1), +(301002, 12689, 0, 0.04, 0, 0, 1, 1), +(301002, 12693, 0, 0.02, 0, 0, 1, 1), +(301002, 12694, 0, 0.02, 0, 0, 1, 1), +(301002, 12695, 0, 0.02, 0, 0, 1, 1), +(301002, 12697, 0, 0.02, 0, 0, 1, 1), +(301002, 12704, 0, 0.02, 0, 0, 1, 1), +(301002, 12713, 0, 0.16, 0, 0, 1, 1), +(301002, 12728, 0, 0.02, 0, 0, 1, 1), +(301002, 13444, 0, 1.18, 0, 0, 1, 1), +(301002, 13446, 0, 1.7, 0, 0, 1, 1), +(301002, 13490, 0, 0.06, 0, 0, 1, 1), +(301002, 13492, 0, 0.04, 0, 0, 1, 1), +(301002, 14466, 0, 0.02, 0, 0, 1, 1), +(301002, 14470, 0, 0.02, 0, 0, 1, 1), +(301002, 14478, 0, 0.02, 0, 0, 1, 1), +(301002, 14489, 0, 0.02, 0, 0, 1, 1), +(301002, 14491, 0, 0.02, 0, 0, 1, 1), +(301002, 14492, 0, 0.02, 0, 0, 1, 1), +(301002, 14494, 0, 0.02, 0, 0, 1, 1), +(301002, 14496, 0, 0.02, 0, 0, 1, 1), +(301002, 14498, 0, 0.02, 0, 0, 1, 1), +(301002, 14499, 0, 0.02, 0, 0, 1, 1), +(301002, 14504, 0, 0.16, 0, 0, 1, 1), +(301002, 14506, 0, 0.1, 0, 0, 1, 1), +(301002, 14508, 0, 0.1, 0, 0, 1, 1), +(301002, 15731, 0, 0.02, 0, 0, 1, 1), +(301002, 15737, 0, 0.02, 0, 0, 1, 1), +(301002, 15745, 0, 0.04, 0, 0, 1, 1), +(301002, 15746, 0, 0.04, 0, 0, 1, 1), +(301002, 15755, 0, 0.02, 0, 0, 1, 1), +(301002, 15757, 0, 0.02, 0, 0, 1, 1), +(301002, 15765, 0, 0.06, 0, 0, 1, 1), +(301002, 16043, 0, 0.02, 0, 0, 1, 1), +(301002, 16051, 0, 0.02, 0, 0, 1, 1), +(301002, 16215, 0, 0.02, 0, 0, 1, 1), +(301002, 16245, 0, 0.02, 0, 0, 1, 1), +(301002, 16251, 0, 0.04, 0, 0, 1, 1), +(301002, 20400, 0, 0.06, 0, 0, 1, 1), +(301002, 240160, 240160, 1.0, 0, 0, 1, 1), +(301002, 240240, 240240, 5.0, 0, 0, 1, 1), +(301002, 240900, 240900, 0.005, 0, 0, 1, 1), +(301002, 300480, 300480, 5.0, 0, 0, 1, 1), +(301002, 300790, 300790, 0.025, 0, 2, 1, 1), +(301002, 300810, 300810, 1.0, 0, 0, 1, 1), +(301002, 300830, 300830, 1.0, 0, 3, 1, 1), +(301002, 300840, 300840, 0.025, 0, 4, 1, 1), +(301002, 300870, 300870, 0.005, 0, 0, 1, 1), +(301002, 300880, 300880, 0.025, 0, 0, 1, 1), +(301002, 300890, 300890, 1.0, 0, 5, 1, 1), +(301002, 301830, 301830, 0.005, 0, 10, 1, 1), +(301002, 302680, 302680, 0.005, 0, 0, 1, 1); -DELETE FROM `reference_loot_template` WHERE `Entry` IN (54000, 54001); -INSERT INTO `reference_loot_template` (`Entry`, `Item`, `Reference`, `Chance`, `QuestRequired`, `LootMode`, `GroupId`, `MinCount`, `MaxCount`, `Comment`) VALUES -(54000, 17067, 0, 0, 0, 1, 1, 1, 1, 'Onyxia Ref - Ancient Cornerstone Grimoire'), -(54000, 17078, 0, 0, 0, 1, 1, 1, 1, 'Onyxia Ref - Sapphiron Drape'), -(54000, 18205, 0, 0, 0, 1, 1, 1, 1, 'Onyxia Ref - Eskhandar Collar'), -(54000, 18813, 0, 0, 0, 1, 1, 1, 1, 'Onyxia Ref - Ring of Binding'); +REPLACE INTO `reference_loot_template` (`Entry`, `Item`, `Reference`, `Chance`, `QuestRequired`, `GroupId`, `MinCount`, `MaxCount`) VALUES +(240160, 8283, 0, 0.0, 0, 1, 1, 1), +(240160, 8289, 0, 0.0, 0, 1, 1, 1), +(240160, 8290, 0, 0.0, 0, 1, 1, 1), +(240160, 8296, 0, 0.0, 0, 1, 1, 1), +(240160, 8300, 0, 0.0, 0, 1, 1, 1), +(240160, 8307, 0, 0.0, 0, 1, 1, 1), +(240160, 8308, 0, 0.0, 0, 1, 1, 1), +(240160, 8309, 0, 0.0, 0, 1, 1, 1), +(240160, 8310, 0, 0.0, 0, 1, 1, 1), +(240160, 10105, 0, 0.0, 0, 1, 1, 1), +(240160, 10136, 0, 0.0, 0, 1, 1, 1), +(240160, 10137, 0, 0.0, 0, 1, 1, 1), +(240160, 10140, 0, 0.0, 0, 1, 1, 1), +(240160, 10144, 0, 0.0, 0, 1, 1, 1), +(240160, 10146, 0, 0.0, 0, 1, 1, 1), +(240160, 10147, 0, 0.0, 0, 1, 1, 1), +(240160, 10149, 0, 0.0, 0, 1, 1, 1), +(240160, 10154, 0, 0.0, 0, 1, 1, 1), +(240160, 10155, 0, 0.0, 0, 1, 1, 1), +(240160, 10156, 0, 0.0, 0, 1, 1, 1), +(240160, 10161, 0, 0.0, 0, 1, 1, 1), +(240160, 10210, 0, 0.0, 0, 1, 1, 1), +(240160, 10217, 0, 0.0, 0, 1, 1, 1), +(240160, 10219, 0, 0.0, 0, 1, 1, 1), +(240160, 10226, 0, 0.0, 0, 1, 1, 1), +(240160, 10228, 0, 0.0, 0, 1, 1, 1), +(240160, 10230, 0, 0.0, 0, 1, 1, 1), +(240160, 10249, 0, 0.0, 0, 1, 1, 1), +(240160, 10256, 0, 0.0, 0, 1, 1, 1), +(240160, 10258, 0, 0.0, 0, 1, 1, 1), +(240160, 10267, 0, 0.0, 0, 1, 1, 1), +(240160, 10275, 0, 0.0, 0, 1, 1, 1), +(240160, 10363, 0, 0.0, 0, 1, 1, 1), +(240160, 10373, 0, 0.0, 0, 1, 1, 1), +(240160, 10376, 0, 0.0, 0, 1, 1, 1), +(240160, 10379, 0, 0.0, 0, 1, 1, 1), +(240160, 10380, 0, 0.0, 0, 1, 1, 1), +(240160, 10383, 0, 0.0, 0, 1, 1, 1), +(240160, 10387, 0, 0.0, 0, 1, 1, 1), +(240160, 10391, 0, 0.0, 0, 1, 1, 1), +(240160, 11979, 0, 0.0, 0, 1, 1, 1), +(240160, 12016, 0, 0.0, 0, 1, 1, 1), +(240160, 12046, 0, 0.0, 0, 1, 1, 1), +(240160, 12057, 0, 0.0, 0, 1, 1, 1), +(240160, 14303, 0, 0.0, 0, 1, 1, 1), +(240160, 14306, 0, 0.0, 0, 1, 1, 1), +(240160, 14308, 0, 0.0, 0, 1, 1, 1), +(240160, 14312, 0, 0.0, 0, 1, 1, 1), +(240160, 14317, 0, 0.0, 0, 1, 1, 1), +(240160, 14323, 0, 0.0, 0, 1, 1, 1), +(240160, 14324, 0, 0.0, 0, 1, 1, 1), +(240160, 14325, 0, 0.0, 0, 1, 1, 1), +(240160, 14330, 0, 0.0, 0, 1, 1, 1), +(240160, 14337, 0, 0.0, 0, 1, 1, 1), +(240160, 14458, 0, 0.0, 0, 1, 1, 1), +(240160, 14465, 0, 0.0, 0, 1, 1, 1), +(240160, 14684, 0, 0.0, 0, 1, 1, 1), +(240160, 14688, 0, 0.0, 0, 1, 1, 1), +(240160, 14863, 0, 0.0, 0, 1, 1, 1), +(240160, 14865, 0, 0.0, 0, 1, 1, 1), +(240160, 14868, 0, 0.0, 0, 1, 1, 1), +(240160, 14935, 0, 0.0, 0, 1, 1, 1), +(240160, 14936, 0, 0.0, 0, 1, 1, 1), +(240160, 14966, 0, 0.0, 0, 1, 1, 1), +(240160, 14973, 0, 0.0, 0, 1, 1, 1), +(240160, 14976, 0, 0.0, 0, 1, 1, 1), +(240160, 14977, 0, 0.0, 0, 1, 1, 1), +(240160, 15189, 0, 0.0, 0, 1, 1, 1), +(240160, 15192, 0, 0.0, 0, 1, 1, 1), +(240160, 15194, 0, 0.0, 0, 1, 1, 1), +(240160, 15239, 0, 0.0, 0, 1, 1, 1), +(240160, 15266, 0, 0.0, 0, 1, 1, 1), +(240160, 15278, 0, 0.0, 0, 1, 1, 1), +(240160, 15282, 0, 0.0, 0, 1, 1, 1), +(240160, 15288, 0, 0.0, 0, 1, 1, 1), +(240160, 15325, 0, 0.0, 0, 1, 1, 1), +(240160, 15430, 0, 0.0, 0, 1, 1, 1), +(240160, 15433, 0, 0.0, 0, 1, 1, 1), +(240160, 15434, 0, 0.0, 0, 1, 1, 1), +(240160, 15436, 0, 0.0, 0, 1, 1, 1), +(240160, 15437, 0, 0.0, 0, 1, 1, 1), +(240160, 15660, 0, 0.0, 0, 1, 1, 1), +(240160, 15664, 0, 0.0, 0, 1, 1, 1), +(240160, 15665, 0, 0.0, 0, 1, 1, 1), +(240160, 15667, 0, 0.0, 0, 1, 1, 1), +(240160, 15670, 0, 0.0, 0, 1, 1, 1), +(240160, 15672, 0, 0.0, 0, 1, 1, 1), +(240160, 15674, 0, 0.0, 0, 1, 1, 1), +(240160, 15676, 0, 0.0, 0, 1, 1, 1), +(240160, 15677, 0, 0.0, 0, 1, 1, 1), +(240160, 15679, 0, 0.0, 0, 1, 1, 1), +(240160, 15683, 0, 0.0, 0, 1, 1, 1), +(240160, 15931, 0, 0.0, 0, 1, 1, 1), +(240160, 15943, 0, 0.0, 0, 1, 1, 1), +(240160, 15986, 0, 0.0, 0, 1, 1, 1), +(240160, 15987, 0, 0.0, 0, 1, 1, 1), +(240240, 3944, 0, 0.0, 0, 1, 1, 1), +(240240, 3945, 0, 0.0, 0, 1, 1, 1), +(240240, 3946, 0, 0.0, 0, 1, 1, 1), +(240240, 3947, 0, 0.0, 0, 1, 1, 1), +(240240, 3948, 0, 0.0, 0, 1, 1, 1), +(240240, 3949, 0, 0.0, 0, 1, 1, 1), +(240240, 3950, 0, 0.0, 0, 1, 1, 1), +(240240, 3951, 0, 0.0, 0, 1, 1, 1), +(240240, 3969, 0, 0.0, 0, 1, 1, 1), +(240240, 3970, 0, 0.0, 0, 1, 1, 1), +(240240, 3971, 0, 0.0, 0, 1, 1, 1), +(240240, 3972, 0, 0.0, 0, 1, 1, 1), +(240240, 3973, 0, 0.0, 0, 1, 1, 1), +(240240, 3974, 0, 0.0, 0, 1, 1, 1), +(240240, 3975, 0, 0.0, 0, 1, 1, 1), +(240240, 3976, 0, 0.0, 0, 1, 1, 1), +(240240, 3987, 0, 0.0, 0, 1, 1, 1), +(240240, 3990, 0, 0.0, 0, 1, 1, 1), +(240240, 3992, 0, 0.0, 0, 1, 1, 1), +(240240, 3993, 0, 0.0, 0, 1, 1, 1), +(240240, 3994, 0, 0.0, 0, 1, 1, 1), +(240240, 3995, 0, 0.0, 0, 1, 1, 1), +(240240, 3996, 0, 0.0, 0, 1, 1, 1), +(240240, 3997, 0, 0.0, 0, 1, 1, 1), +(240240, 3998, 0, 0.0, 0, 1, 1, 1), +(240240, 3999, 0, 0.0, 0, 1, 1, 1), +(240240, 8080, 0, 0.0, 0, 1, 1, 1), +(240240, 8081, 0, 0.0, 0, 1, 1, 1), +(240240, 8082, 0, 0.0, 0, 1, 1, 1), +(240240, 8083, 0, 0.0, 0, 1, 1, 1), +(240240, 8084, 0, 0.0, 0, 1, 1, 1), +(240240, 8085, 0, 0.0, 0, 1, 1, 1), +(240240, 8086, 0, 0.0, 0, 1, 1, 1), +(240240, 8752, 0, 0.0, 0, 1, 1, 1), +(240240, 8753, 0, 0.0, 0, 1, 1, 1), +(240240, 8754, 0, 0.0, 0, 1, 1, 1), +(240240, 8755, 0, 0.0, 0, 1, 1, 1), +(240240, 13816, 0, 0.0, 0, 1, 1, 1), +(240240, 13817, 0, 0.0, 0, 1, 1, 1), +(240240, 13818, 0, 0.0, 0, 1, 1, 1), +(240240, 13819, 0, 0.0, 0, 1, 1, 1), +(240240, 13820, 0, 0.0, 0, 1, 1, 1), +(240240, 13821, 0, 0.0, 0, 1, 1, 1), +(240240, 13822, 0, 0.0, 0, 1, 1, 1), +(240240, 13823, 0, 0.0, 0, 1, 1, 1), +(240240, 13825, 0, 0.0, 0, 1, 1, 1), +(240900, 2243, 0, 0.0, 0, 1, 1, 1), +(240900, 14554, 0, 0.0, 0, 1, 1, 1), +(240900, 14555, 0, 0.0, 0, 1, 1, 1), +(300000, 16900, 0, 0.0, 0, 1, 1, 1), +(300000, 16908, 0, 0.0, 0, 1, 1, 1), +(300000, 16914, 0, 0.0, 0, 1, 1, 1), +(300000, 16921, 0, 0.0, 0, 1, 1, 1), +(300000, 16929, 0, 0.0, 0, 1, 1, 1), +(300000, 16939, 0, 0.0, 0, 1, 1, 1), +(300000, 16947, 0, 0.0, 0, 1, 1, 1), +(300000, 16963, 0, 0.0, 0, 1, 1, 1), +(300000, 16955, 0, 0.0, 0, 1, 1, 1), +(300440, 2564, 0, 0.0, 0, 1, 1, 1), +(300440, 7734, 0, 0.0, 0, 1, 1, 1), +(300440, 13009, 0, 0.0, 0, 1, 1, 1), +(300440, 13030, 0, 0.0, 0, 1, 1, 1), +(300440, 13046, 0, 0.0, 0, 1, 1, 1), +(300440, 13065, 0, 0.0, 0, 1, 1, 1), +(300440, 13066, 0, 0.0, 0, 1, 1, 1), +(300440, 13085, 0, 0.0, 0, 1, 1, 1), +(300440, 13125, 0, 0.0, 0, 1, 1, 1), +(300440, 13139, 0, 0.0, 0, 1, 1, 1), +(300480, 3936, 0, 0.0, 0, 1, 1, 1), +(300480, 3937, 0, 0.0, 0, 1, 1, 1), +(300480, 3938, 0, 0.0, 0, 1, 1, 1), +(300480, 3939, 0, 0.0, 0, 1, 1, 1), +(300480, 3940, 0, 0.0, 0, 1, 1, 1), +(300480, 3941, 0, 0.0, 0, 1, 1, 1), +(300480, 3942, 0, 0.0, 0, 1, 1, 1), +(300480, 3943, 0, 0.0, 0, 1, 1, 1), +(300480, 3961, 0, 0.0, 0, 1, 1, 1), +(300480, 3962, 0, 0.0, 0, 1, 1, 1), +(300480, 3963, 0, 0.0, 0, 1, 1, 1), +(300480, 3964, 0, 0.0, 0, 1, 1, 1), +(300480, 3965, 0, 0.0, 0, 1, 1, 1), +(300480, 3966, 0, 0.0, 0, 1, 1, 1), +(300480, 3967, 0, 0.0, 0, 1, 1, 1), +(300480, 3968, 0, 0.0, 0, 1, 1, 1), +(300480, 3986, 0, 0.0, 0, 1, 1, 1), +(300480, 3989, 0, 0.0, 0, 1, 1, 1), +(300480, 4000, 0, 0.0, 0, 1, 1, 1), +(300480, 4001, 0, 0.0, 0, 1, 1, 1), +(300480, 4002, 0, 0.0, 0, 1, 1, 1), +(300480, 4003, 0, 0.0, 0, 1, 1, 1), +(300480, 4004, 0, 0.0, 0, 1, 1, 1), +(300480, 4005, 0, 0.0, 0, 1, 1, 1), +(300480, 4006, 0, 0.0, 0, 1, 1, 1), +(300480, 4007, 0, 0.0, 0, 1, 1, 1), +(300480, 4017, 0, 0.0, 0, 1, 1, 1), +(300480, 4018, 0, 0.0, 0, 1, 1, 1), +(300480, 4019, 0, 0.0, 0, 1, 1, 1), +(300480, 4020, 0, 0.0, 0, 1, 1, 1), +(300480, 4021, 0, 0.0, 0, 1, 1, 1), +(300480, 4022, 0, 0.0, 0, 1, 1, 1), +(300480, 4023, 0, 0.0, 0, 1, 1, 1), +(300480, 4024, 0, 0.0, 0, 1, 1, 1), +(300480, 4025, 0, 0.0, 0, 1, 1, 1), +(300480, 4026, 0, 0.0, 0, 1, 1, 1), +(300480, 8749, 0, 0.0, 0, 1, 1, 1), +(300480, 8750, 0, 0.0, 0, 1, 1, 1), +(300480, 8751, 0, 0.0, 0, 1, 1, 1), +(300480, 13824, 0, 0.0, 0, 1, 1, 1), +(300610, 10135, 0, 0.0, 0, 1, 1, 1), +(300610, 10143, 0, 0.0, 0, 1, 1, 1), +(300610, 10151, 0, 0.0, 0, 1, 1, 1), +(300610, 10157, 0, 0.0, 0, 1, 1, 1), +(300610, 10158, 0, 0.0, 0, 1, 1, 1), +(300610, 10246, 0, 0.0, 0, 1, 1, 1), +(300610, 10252, 0, 0.0, 0, 1, 1, 1), +(300610, 10254, 0, 0.0, 0, 1, 1, 1), +(300610, 10262, 0, 0.0, 0, 1, 1, 1), +(300610, 10264, 0, 0.0, 0, 1, 1, 1), +(300610, 10266, 0, 0.0, 0, 1, 1, 1), +(300610, 10271, 0, 0.0, 0, 1, 1, 1), +(300610, 10273, 0, 0.0, 0, 1, 1, 1), +(300610, 10367, 0, 0.0, 0, 1, 1, 1), +(300610, 10384, 0, 0.0, 0, 1, 1, 1), +(300610, 10389, 0, 0.0, 0, 1, 1, 1), +(300610, 11980, 0, 0.0, 0, 1, 1, 1), +(300610, 12017, 0, 0.0, 0, 1, 1, 1), +(300610, 12048, 0, 0.0, 0, 1, 1, 1), +(300610, 12058, 0, 0.0, 0, 1, 1, 1), +(300610, 14328, 0, 0.0, 0, 1, 1, 1), +(300610, 14332, 0, 0.0, 0, 1, 1, 1), +(300610, 14336, 0, 0.0, 0, 1, 1, 1), +(300610, 14456, 0, 0.0, 0, 1, 1, 1), +(300610, 14464, 0, 0.0, 0, 1, 1, 1), +(300610, 14680, 0, 0.0, 0, 1, 1, 1), +(300610, 14811, 0, 0.0, 0, 1, 1, 1), +(300610, 14812, 0, 0.0, 0, 1, 1, 1), +(300610, 14975, 0, 0.0, 0, 1, 1, 1), +(300610, 14979, 0, 0.0, 0, 1, 1, 1), +(300610, 14982, 0, 0.0, 0, 1, 1, 1), +(300610, 15221, 0, 0.0, 0, 1, 1, 1), +(300610, 15240, 0, 0.0, 0, 1, 1, 1), +(300610, 15247, 0, 0.0, 0, 1, 1, 1), +(300610, 15258, 0, 0.0, 0, 1, 1, 1), +(300610, 15283, 0, 0.0, 0, 1, 1, 1), +(300610, 15289, 0, 0.0, 0, 1, 1, 1), +(300610, 15439, 0, 0.0, 0, 1, 1, 1), +(300610, 15442, 0, 0.0, 0, 1, 1, 1), +(300610, 15680, 0, 0.0, 0, 1, 1, 1), +(300610, 15684, 0, 0.0, 0, 1, 1, 1), +(300610, 15687, 0, 0.0, 0, 1, 1, 1), +(300610, 15941, 0, 0.0, 0, 1, 1, 1), +(300610, 15942, 0, 0.0, 0, 1, 1, 1), +(300610, 15968, 0, 0.0, 0, 1, 1, 1), +(300610, 15989, 0, 0.0, 0, 1, 1, 1), +(300790, 9402, 0, 0.0, 0, 2, 1, 1), +(300790, 13001, 0, 0.0, 0, 2, 1, 1), +(300790, 13015, 0, 0.0, 0, 2, 1, 1), +(300790, 13028, 0, 0.0, 0, 2, 1, 1), +(300790, 13053, 0, 0.0, 0, 2, 1, 1), +(300790, 13060, 0, 0.0, 0, 2, 1, 1), +(300790, 13072, 0, 0.0, 0, 2, 1, 1), +(300790, 13096, 0, 0.0, 0, 2, 1, 1), +(300790, 13116, 0, 0.0, 0, 2, 1, 1), +(300790, 13133, 0, 0.0, 0, 2, 1, 1), +(300810, 8288, 0, 0.0, 0, 1, 1, 1), +(300810, 8292, 0, 0.0, 0, 1, 1, 1), +(300810, 8299, 0, 0.0, 0, 1, 1, 1), +(300810, 8301, 0, 0.0, 0, 1, 1, 1), +(300810, 8302, 0, 0.0, 0, 1, 1, 1), +(300810, 8305, 0, 0.0, 0, 1, 1, 1), +(300810, 8306, 0, 0.0, 0, 1, 1, 1), +(300810, 10101, 0, 0.0, 0, 1, 1, 1), +(300810, 10102, 0, 0.0, 0, 1, 1, 1), +(300810, 10104, 0, 0.0, 0, 1, 1, 1), +(300810, 10112, 0, 0.0, 0, 1, 1, 1), +(300810, 10118, 0, 0.0, 0, 1, 1, 1), +(300810, 10138, 0, 0.0, 0, 1, 1, 1), +(300810, 10145, 0, 0.0, 0, 1, 1, 1), +(300810, 10148, 0, 0.0, 0, 1, 1, 1), +(300810, 10159, 0, 0.0, 0, 1, 1, 1), +(300810, 10164, 0, 0.0, 0, 1, 1, 1), +(300810, 10178, 0, 0.0, 0, 1, 1, 1), +(300810, 10181, 0, 0.0, 0, 1, 1, 1), +(300810, 10182, 0, 0.0, 0, 1, 1, 1), +(300810, 10211, 0, 0.0, 0, 1, 1, 1), +(300810, 10213, 0, 0.0, 0, 1, 1, 1), +(300810, 10214, 0, 0.0, 0, 1, 1, 1), +(300810, 10216, 0, 0.0, 0, 1, 1, 1), +(300810, 10221, 0, 0.0, 0, 1, 1, 1), +(300810, 10222, 0, 0.0, 0, 1, 1, 1), +(300810, 10223, 0, 0.0, 0, 1, 1, 1), +(300810, 10225, 0, 0.0, 0, 1, 1, 1), +(300810, 10232, 0, 0.0, 0, 1, 1, 1), +(300810, 10234, 0, 0.0, 0, 1, 1, 1), +(300810, 10235, 0, 0.0, 0, 1, 1, 1), +(300810, 10236, 0, 0.0, 0, 1, 1, 1), +(300810, 10237, 0, 0.0, 0, 1, 1, 1), +(300810, 10279, 0, 0.0, 0, 1, 1, 1), +(300810, 10280, 0, 0.0, 0, 1, 1, 1), +(300810, 10281, 0, 0.0, 0, 1, 1, 1), +(300810, 10362, 0, 0.0, 0, 1, 1, 1), +(300810, 10364, 0, 0.0, 0, 1, 1, 1), +(300810, 10365, 0, 0.0, 0, 1, 1, 1), +(300810, 10369, 0, 0.0, 0, 1, 1, 1), +(300810, 10371, 0, 0.0, 0, 1, 1, 1), +(300810, 10372, 0, 0.0, 0, 1, 1, 1), +(300810, 10374, 0, 0.0, 0, 1, 1, 1), +(300810, 10377, 0, 0.0, 0, 1, 1, 1), +(300810, 10381, 0, 0.0, 0, 1, 1, 1), +(300810, 11978, 0, 0.0, 0, 1, 1, 1), +(300810, 11991, 0, 0.0, 0, 1, 1, 1), +(300810, 12004, 0, 0.0, 0, 1, 1, 1), +(300810, 12026, 0, 0.0, 0, 1, 1, 1), +(300810, 14307, 0, 0.0, 0, 1, 1, 1), +(300810, 14310, 0, 0.0, 0, 1, 1, 1), +(300810, 14314, 0, 0.0, 0, 1, 1, 1), +(300810, 14315, 0, 0.0, 0, 1, 1, 1), +(300810, 14316, 0, 0.0, 0, 1, 1, 1), +(300810, 14319, 0, 0.0, 0, 1, 1, 1), +(300810, 14327, 0, 0.0, 0, 1, 1, 1), +(300810, 14331, 0, 0.0, 0, 1, 1, 1), +(300810, 14453, 0, 0.0, 0, 1, 1, 1), +(300810, 14455, 0, 0.0, 0, 1, 1, 1), +(300810, 14457, 0, 0.0, 0, 1, 1, 1), +(300810, 14670, 0, 0.0, 0, 1, 1, 1), +(300810, 14676, 0, 0.0, 0, 1, 1, 1), +(300810, 14677, 0, 0.0, 0, 1, 1, 1), +(300810, 14682, 0, 0.0, 0, 1, 1, 1), +(300810, 14683, 0, 0.0, 0, 1, 1, 1), +(300810, 14798, 0, 0.0, 0, 1, 1, 1), +(300810, 14799, 0, 0.0, 0, 1, 1, 1), +(300810, 14800, 0, 0.0, 0, 1, 1, 1), +(300810, 14804, 0, 0.0, 0, 1, 1, 1), +(300810, 14808, 0, 0.0, 0, 1, 1, 1), +(300810, 14810, 0, 0.0, 0, 1, 1, 1), +(300810, 14854, 0, 0.0, 0, 1, 1, 1), +(300810, 14858, 0, 0.0, 0, 1, 1, 1), +(300810, 14864, 0, 0.0, 0, 1, 1, 1), +(300810, 14869, 0, 0.0, 0, 1, 1, 1), +(300810, 14932, 0, 0.0, 0, 1, 1, 1), +(300810, 14933, 0, 0.0, 0, 1, 1, 1), +(300810, 14937, 0, 0.0, 0, 1, 1, 1), +(300810, 14969, 0, 0.0, 0, 1, 1, 1), +(300810, 14970, 0, 0.0, 0, 1, 1, 1), +(300810, 14983, 0, 0.0, 0, 1, 1, 1), +(300810, 15219, 0, 0.0, 0, 1, 1, 1), +(300810, 15238, 0, 0.0, 0, 1, 1, 1), +(300810, 15256, 0, 0.0, 0, 1, 1, 1), +(300810, 15265, 0, 0.0, 0, 1, 1, 1), +(300810, 15272, 0, 0.0, 0, 1, 1, 1), +(300810, 15276, 0, 0.0, 0, 1, 1, 1), +(300810, 15426, 0, 0.0, 0, 1, 1, 1), +(300810, 15429, 0, 0.0, 0, 1, 1, 1), +(300810, 15431, 0, 0.0, 0, 1, 1, 1), +(300810, 15432, 0, 0.0, 0, 1, 1, 1), +(300810, 15658, 0, 0.0, 0, 1, 1, 1), +(300810, 15666, 0, 0.0, 0, 1, 1, 1), +(300810, 15668, 0, 0.0, 0, 1, 1, 1), +(300810, 15673, 0, 0.0, 0, 1, 1, 1), +(300810, 15681, 0, 0.0, 0, 1, 1, 1), +(300810, 15693, 0, 0.0, 0, 1, 1, 1), +(300810, 15890, 0, 0.0, 0, 1, 1, 1), +(300810, 15938, 0, 0.0, 0, 1, 1, 1), +(300810, 15939, 0, 0.0, 0, 1, 1, 1), +(300810, 15967, 0, 0.0, 0, 1, 1, 1), +(300830, 8303, 0, 0.0, 0, 3, 1, 1), +(300830, 8313, 0, 0.0, 0, 3, 1, 1), +(300830, 10139, 0, 0.0, 0, 3, 1, 1), +(300830, 10141, 0, 0.0, 0, 3, 1, 1), +(300830, 10142, 0, 0.0, 0, 3, 1, 1), +(300830, 10150, 0, 0.0, 0, 3, 1, 1), +(300830, 10152, 0, 0.0, 0, 3, 1, 1), +(300830, 10153, 0, 0.0, 0, 3, 1, 1), +(300830, 10160, 0, 0.0, 0, 3, 1, 1), +(300830, 10162, 0, 0.0, 0, 3, 1, 1), +(300830, 10163, 0, 0.0, 0, 3, 1, 1), +(300830, 10215, 0, 0.0, 0, 3, 1, 1), +(300830, 10218, 0, 0.0, 0, 3, 1, 1), +(300830, 10220, 0, 0.0, 0, 3, 1, 1), +(300830, 10227, 0, 0.0, 0, 3, 1, 1), +(300830, 10247, 0, 0.0, 0, 3, 1, 1), +(300830, 10248, 0, 0.0, 0, 3, 1, 1), +(300830, 10250, 0, 0.0, 0, 3, 1, 1), +(300830, 10251, 0, 0.0, 0, 3, 1, 1), +(300830, 10253, 0, 0.0, 0, 3, 1, 1), +(300830, 10255, 0, 0.0, 0, 3, 1, 1), +(300830, 10257, 0, 0.0, 0, 3, 1, 1), +(300830, 10259, 0, 0.0, 0, 3, 1, 1), +(300830, 10260, 0, 0.0, 0, 3, 1, 1), +(300830, 10261, 0, 0.0, 0, 3, 1, 1), +(300830, 10263, 0, 0.0, 0, 3, 1, 1), +(300830, 10265, 0, 0.0, 0, 3, 1, 1), +(300830, 10268, 0, 0.0, 0, 3, 1, 1), +(300830, 10269, 0, 0.0, 0, 3, 1, 1), +(300830, 10270, 0, 0.0, 0, 3, 1, 1), +(300830, 10272, 0, 0.0, 0, 3, 1, 1), +(300830, 10274, 0, 0.0, 0, 3, 1, 1), +(300830, 10366, 0, 0.0, 0, 3, 1, 1), +(300830, 10368, 0, 0.0, 0, 3, 1, 1), +(300830, 10378, 0, 0.0, 0, 3, 1, 1), +(300830, 10382, 0, 0.0, 0, 3, 1, 1), +(300830, 10385, 0, 0.0, 0, 3, 1, 1), +(300830, 10386, 0, 0.0, 0, 3, 1, 1), +(300830, 10388, 0, 0.0, 0, 3, 1, 1), +(300830, 10390, 0, 0.0, 0, 3, 1, 1), +(300830, 11992, 0, 0.0, 0, 3, 1, 1), +(300830, 12005, 0, 0.0, 0, 3, 1, 1), +(300830, 12027, 0, 0.0, 0, 3, 1, 1), +(300830, 12036, 0, 0.0, 0, 3, 1, 1), +(300830, 14318, 0, 0.0, 0, 3, 1, 1), +(300830, 14322, 0, 0.0, 0, 3, 1, 1), +(300830, 14326, 0, 0.0, 0, 3, 1, 1), +(300830, 14329, 0, 0.0, 0, 3, 1, 1), +(300830, 14333, 0, 0.0, 0, 3, 1, 1), +(300830, 14334, 0, 0.0, 0, 3, 1, 1), +(300830, 14335, 0, 0.0, 0, 3, 1, 1), +(300830, 14460, 0, 0.0, 0, 3, 1, 1), +(300830, 14461, 0, 0.0, 0, 3, 1, 1), +(300830, 14462, 0, 0.0, 0, 3, 1, 1), +(300830, 14463, 0, 0.0, 0, 3, 1, 1), +(300830, 14681, 0, 0.0, 0, 3, 1, 1), +(300830, 14685, 0, 0.0, 0, 3, 1, 1), +(300830, 14686, 0, 0.0, 0, 3, 1, 1), +(300830, 14687, 0, 0.0, 0, 3, 1, 1), +(300830, 14809, 0, 0.0, 0, 3, 1, 1), +(300830, 14814, 0, 0.0, 0, 3, 1, 1), +(300830, 14815, 0, 0.0, 0, 3, 1, 1), +(300830, 14816, 0, 0.0, 0, 3, 1, 1), +(300830, 14817, 0, 0.0, 0, 3, 1, 1), +(300830, 14862, 0, 0.0, 0, 3, 1, 1), +(300830, 14866, 0, 0.0, 0, 3, 1, 1), +(300830, 14867, 0, 0.0, 0, 3, 1, 1), +(300830, 14931, 0, 0.0, 0, 3, 1, 1), +(300830, 14978, 0, 0.0, 0, 3, 1, 1), +(300830, 14980, 0, 0.0, 0, 3, 1, 1), +(300830, 14981, 0, 0.0, 0, 3, 1, 1), +(300830, 15193, 0, 0.0, 0, 3, 1, 1), +(300830, 15195, 0, 0.0, 0, 3, 1, 1), +(300830, 15220, 0, 0.0, 0, 3, 1, 1), +(300830, 15246, 0, 0.0, 0, 3, 1, 1), +(300830, 15257, 0, 0.0, 0, 3, 1, 1), +(300830, 15267, 0, 0.0, 0, 3, 1, 1), +(300830, 15273, 0, 0.0, 0, 3, 1, 1), +(300830, 15296, 0, 0.0, 0, 3, 1, 1), +(300830, 15435, 0, 0.0, 0, 3, 1, 1), +(300830, 15438, 0, 0.0, 0, 3, 1, 1), +(300830, 15440, 0, 0.0, 0, 3, 1, 1), +(300830, 15441, 0, 0.0, 0, 3, 1, 1), +(300830, 15669, 0, 0.0, 0, 3, 1, 1), +(300830, 15675, 0, 0.0, 0, 3, 1, 1), +(300830, 15678, 0, 0.0, 0, 3, 1, 1), +(300830, 15682, 0, 0.0, 0, 3, 1, 1), +(300830, 15685, 0, 0.0, 0, 3, 1, 1), +(300830, 15686, 0, 0.0, 0, 3, 1, 1), +(300830, 15887, 0, 0.0, 0, 3, 1, 1), +(300830, 15940, 0, 0.0, 0, 3, 1, 1), +(300830, 15988, 0, 0.0, 0, 3, 1, 1), +(300830, 15991, 0, 0.0, 0, 3, 1, 1), +(300840, 5267, 0, 0.0, 0, 4, 1, 1), +(300840, 6622, 0, 0.0, 0, 4, 1, 1), +(300840, 13000, 0, 0.0, 0, 4, 1, 1), +(300840, 13006, 0, 0.0, 0, 4, 1, 1), +(300840, 13023, 0, 0.0, 0, 4, 1, 1), +(300840, 13075, 0, 0.0, 0, 4, 1, 1), +(300840, 13083, 0, 0.0, 0, 4, 1, 1), +(300840, 13107, 0, 0.0, 0, 4, 1, 1), +(300840, 13113, 0, 0.0, 0, 4, 1, 1), +(300840, 13123, 0, 0.0, 0, 4, 1, 1), +(300870, 944, 0, 0.0, 0, 1, 1, 1), +(300870, 1263, 0, 0.0, 0, 1, 1, 1), +(300870, 1443, 0, 0.0, 0, 1, 1, 1), +(300870, 14553, 0, 0.0, 0, 1, 1, 1), +(300880, 1973, 0, 0.0, 0, 1, 1, 1), +(300880, 4696, 0, 0.0, 0, 1, 1, 1), +(300880, 13002, 0, 0.0, 0, 1, 1, 1), +(300880, 13004, 0, 0.0, 0, 1, 1, 1), +(300880, 13007, 0, 0.0, 0, 1, 1, 1), +(300880, 13047, 0, 0.0, 0, 1, 1, 1), +(300880, 13070, 0, 0.0, 0, 1, 1, 1), +(300880, 13101, 0, 0.0, 0, 1, 1, 1), +(300880, 13135, 0, 0.0, 0, 1, 1, 1), +(300880, 13146, 0, 0.0, 0, 1, 1, 1), +(300890, 10135, 0, 0.0, 0, 5, 1, 1), +(300890, 10143, 0, 0.0, 0, 5, 1, 1), +(300890, 10151, 0, 0.0, 0, 5, 1, 1), +(300890, 10157, 0, 0.0, 0, 5, 1, 1), +(300890, 10158, 0, 0.0, 0, 5, 1, 1), +(300890, 10246, 0, 0.0, 0, 5, 1, 1), +(300890, 10252, 0, 0.0, 0, 5, 1, 1), +(300890, 10254, 0, 0.0, 0, 5, 1, 1), +(300890, 10262, 0, 0.0, 0, 5, 1, 1), +(300890, 10264, 0, 0.0, 0, 5, 1, 1), +(300890, 10266, 0, 0.0, 0, 5, 1, 1), +(300890, 10271, 0, 0.0, 0, 5, 1, 1), +(300890, 10273, 0, 0.0, 0, 5, 1, 1), +(300890, 10367, 0, 0.0, 0, 5, 1, 1), +(300890, 10384, 0, 0.0, 0, 5, 1, 1), +(300890, 10389, 0, 0.0, 0, 5, 1, 1), +(300890, 11980, 0, 0.0, 0, 5, 1, 1), +(300890, 12017, 0, 0.0, 0, 5, 1, 1), +(300890, 12048, 0, 0.0, 0, 5, 1, 1), +(300890, 12058, 0, 0.0, 0, 5, 1, 1), +(300890, 14328, 0, 0.0, 0, 5, 1, 1), +(300890, 14332, 0, 0.0, 0, 5, 1, 1), +(300890, 14336, 0, 0.0, 0, 5, 1, 1), +(300890, 14456, 0, 0.0, 0, 5, 1, 1), +(300890, 14464, 0, 0.0, 0, 5, 1, 1), +(300890, 14680, 0, 0.0, 0, 5, 1, 1), +(300890, 14811, 0, 0.0, 0, 5, 1, 1), +(300890, 14812, 0, 0.0, 0, 5, 1, 1), +(300890, 14975, 0, 0.0, 0, 5, 1, 1), +(300890, 14979, 0, 0.0, 0, 5, 1, 1), +(300890, 14982, 0, 0.0, 0, 5, 1, 1), +(300890, 15221, 0, 0.0, 0, 5, 1, 1), +(300890, 15240, 0, 0.0, 0, 5, 1, 1), +(300890, 15247, 0, 0.0, 0, 5, 1, 1), +(300890, 15258, 0, 0.0, 0, 5, 1, 1), +(300890, 15283, 0, 0.0, 0, 5, 1, 1), +(300890, 15289, 0, 0.0, 0, 5, 1, 1), +(300890, 15439, 0, 0.0, 0, 5, 1, 1), +(300890, 15442, 0, 0.0, 0, 5, 1, 1), +(300890, 15680, 0, 0.0, 0, 5, 1, 1), +(300890, 15684, 0, 0.0, 0, 5, 1, 1), +(300890, 15687, 0, 0.0, 0, 5, 1, 1), +(300890, 15941, 0, 0.0, 0, 5, 1, 1), +(300890, 15942, 0, 0.0, 0, 5, 1, 1), +(300890, 15968, 0, 0.0, 0, 5, 1, 1), +(300890, 15989, 0, 0.0, 0, 5, 1, 1), +(301710, 1203, 0, 0.0, 0, 1, 1, 1), +(301710, 1973, 0, 0.0, 0, 1, 1, 1), +(301710, 2564, 0, 0.0, 0, 1, 1, 1), +(301710, 4696, 0, 0.0, 0, 1, 1, 1), +(301710, 5266, 0, 0.0, 0, 1, 1, 1), +(301710, 5267, 0, 0.0, 0, 1, 1, 1), +(301710, 6622, 0, 0.0, 0, 1, 1, 1), +(301710, 7734, 0, 0.0, 0, 1, 1, 1), +(301710, 7976, 0, 0.0, 0, 1, 1, 1), +(301710, 7991, 0, 0.0, 0, 1, 1, 1), +(301710, 8028, 0, 0.0, 0, 1, 1, 1), +(301710, 9402, 0, 0.0, 0, 1, 1, 1), +(301710, 10605, 0, 0.0, 0, 1, 1, 1), +(301710, 10608, 0, 0.0, 0, 1, 1, 1), +(301710, 11302, 0, 0.0, 0, 1, 1, 1), +(301710, 12698, 0, 0.0, 0, 1, 1, 1), +(301710, 12711, 0, 0.0, 0, 1, 1, 1), +(301710, 12717, 0, 0.0, 0, 1, 1, 1), +(301710, 12720, 0, 0.0, 0, 1, 1, 1), +(301710, 12728, 0, 0.0, 0, 1, 1, 1), +(301710, 13000, 0, 0.0, 0, 1, 1, 1), +(301710, 13001, 0, 0.0, 0, 1, 1, 1), +(301710, 13002, 0, 0.0, 0, 1, 1, 1), +(301710, 13003, 0, 0.0, 0, 1, 1, 1), +(301710, 13004, 0, 0.0, 0, 1, 1, 1), +(301710, 13006, 0, 0.0, 0, 1, 1, 1), +(301710, 13007, 0, 0.0, 0, 1, 1, 1), +(301710, 13008, 0, 0.0, 0, 1, 1, 1), +(301710, 13009, 0, 0.0, 0, 1, 1, 1), +(301710, 13013, 0, 0.0, 0, 1, 1, 1), +(301710, 13015, 0, 0.0, 0, 1, 1, 1), +(301710, 13030, 0, 0.0, 0, 1, 1, 1), +(301710, 13036, 0, 0.0, 0, 1, 1, 1), +(301710, 13040, 0, 0.0, 0, 1, 1, 1), +(301710, 13047, 0, 0.0, 0, 1, 1, 1), +(301710, 13053, 0, 0.0, 0, 1, 1, 1), +(301710, 13060, 0, 0.0, 0, 1, 1, 1), +(301710, 13066, 0, 0.0, 0, 1, 1, 1), +(301710, 13067, 0, 0.0, 0, 1, 1, 1), +(301710, 13070, 0, 0.0, 0, 1, 1, 1), +(301710, 13072, 0, 0.0, 0, 1, 1, 1), +(301710, 13073, 0, 0.0, 0, 1, 1, 1), +(301710, 13075, 0, 0.0, 0, 1, 1, 1), +(301710, 13077, 0, 0.0, 0, 1, 1, 1), +(301710, 13083, 0, 0.0, 0, 1, 1, 1), +(301710, 13085, 0, 0.0, 0, 1, 1, 1), +(301710, 13091, 0, 0.0, 0, 1, 1, 1), +(301710, 13096, 0, 0.0, 0, 1, 1, 1), +(301710, 13107, 0, 0.0, 0, 1, 1, 1), +(301710, 13111, 0, 0.0, 0, 1, 1, 1), +(301710, 13113, 0, 0.0, 0, 1, 1, 1), +(301710, 13116, 0, 0.0, 0, 1, 1, 1), +(301710, 13118, 0, 0.0, 0, 1, 1, 1), +(301710, 13120, 0, 0.0, 0, 1, 1, 1), +(301710, 13123, 0, 0.0, 0, 1, 1, 1), +(301710, 13125, 0, 0.0, 0, 1, 1, 1), +(301710, 13126, 0, 0.0, 0, 1, 1, 1), +(301710, 13130, 0, 0.0, 0, 1, 1, 1), +(301710, 13133, 0, 0.0, 0, 1, 1, 1), +(301710, 13135, 0, 0.0, 0, 1, 1, 1), +(301710, 13144, 0, 0.0, 0, 1, 1, 1), +(301710, 13146, 0, 0.0, 0, 1, 1, 1), +(301710, 14501, 0, 0.0, 0, 1, 1, 1), +(301710, 14509, 0, 0.0, 0, 1, 1, 1), +(301710, 14511, 0, 0.0, 0, 1, 1, 1), +(301710, 17413, 0, 0.0, 0, 1, 1, 1), +(301710, 17414, 0, 0.0, 0, 1, 1, 1), +(301710, 17682, 0, 0.0, 0, 1, 1, 1), +(301710, 17683, 0, 0.0, 0, 1, 1, 1), +(301710, 18600, 0, 0.0, 0, 1, 1, 1), +(301710, 22388, 0, 0.0, 0, 1, 1, 1), +(301710, 22389, 0, 0.0, 0, 1, 1, 1), +(301710, 22390, 0, 0.0, 0, 1, 1, 1), +(301710, 22393, 0, 0.0, 0, 1, 1, 1), +(301710, 22890, 0, 0.0, 0, 1, 1, 1), +(301710, 22891, 0, 0.0, 0, 1, 1, 1), +(301720, 9297, 0, 0.0, 0, 1, 1, 1), +(301720, 10246, 0, 0.0, 0, 1, 1, 1), +(301720, 10247, 0, 0.0, 0, 1, 1, 1), +(301720, 10248, 0, 0.0, 0, 1, 1, 1), +(301720, 10249, 0, 0.0, 0, 1, 1, 1), +(301720, 10250, 0, 0.0, 0, 1, 1, 1), +(301720, 10251, 0, 0.0, 0, 1, 1, 1), +(301720, 10252, 0, 0.0, 0, 1, 1, 1), +(301720, 10253, 0, 0.0, 0, 1, 1, 1), +(301720, 10254, 0, 0.0, 0, 1, 1, 1), +(301720, 10255, 0, 0.0, 0, 1, 1, 1), +(301720, 10256, 0, 0.0, 0, 1, 1, 1), +(301720, 10257, 0, 0.0, 0, 1, 1, 1), +(301720, 10258, 0, 0.0, 0, 1, 1, 1), +(301720, 10259, 0, 0.0, 0, 1, 1, 1), +(301720, 10260, 0, 0.0, 0, 1, 1, 1), +(301720, 10261, 0, 0.0, 0, 1, 1, 1), +(301720, 10262, 0, 0.0, 0, 1, 1, 1), +(301720, 10263, 0, 0.0, 0, 1, 1, 1), +(301720, 10264, 0, 0.0, 0, 1, 1, 1), +(301720, 10265, 0, 0.0, 0, 1, 1, 1), +(301720, 10266, 0, 0.0, 0, 1, 1, 1), +(301720, 10267, 0, 0.0, 0, 1, 1, 1), +(301720, 10268, 0, 0.0, 0, 1, 1, 1), +(301720, 10269, 0, 0.0, 0, 1, 1, 1), +(301720, 10270, 0, 0.0, 0, 1, 1, 1), +(301720, 10272, 0, 0.0, 0, 1, 1, 1), +(301720, 10273, 0, 0.0, 0, 1, 1, 1), +(301720, 10274, 0, 0.0, 0, 1, 1, 1), +(301720, 10367, 0, 0.0, 0, 1, 1, 1), +(301720, 10384, 0, 0.0, 0, 1, 1, 1), +(301720, 10385, 0, 0.0, 0, 1, 1, 1), +(301720, 10386, 0, 0.0, 0, 1, 1, 1), +(301720, 10387, 0, 0.0, 0, 1, 1, 1), +(301720, 10388, 0, 0.0, 0, 1, 1, 1), +(301720, 10389, 0, 0.0, 0, 1, 1, 1), +(301720, 10390, 0, 0.0, 0, 1, 1, 1), +(301720, 10391, 0, 0.0, 0, 1, 1, 1), +(301720, 11224, 0, 0.0, 0, 1, 1, 1), +(301720, 11226, 0, 0.0, 0, 1, 1, 1), +(301720, 12017, 0, 0.0, 0, 1, 1, 1), +(301720, 12048, 0, 0.0, 0, 1, 1, 1), +(301720, 12682, 0, 0.0, 0, 1, 1, 1), +(301720, 12683, 0, 0.0, 0, 1, 1, 1), +(301720, 12684, 0, 0.0, 0, 1, 1, 1), +(301720, 12685, 0, 0.0, 0, 1, 1, 1), +(301720, 12689, 0, 0.0, 0, 1, 1, 1), +(301720, 12702, 0, 0.0, 0, 1, 1, 1), +(301720, 13486, 0, 0.0, 0, 1, 1, 1), +(301720, 13487, 0, 0.0, 0, 1, 1, 1), +(301720, 13488, 0, 0.0, 0, 1, 1, 1), +(301720, 13489, 0, 0.0, 0, 1, 1, 1), +(301720, 14328, 0, 0.0, 0, 1, 1, 1), +(301720, 14329, 0, 0.0, 0, 1, 1, 1), +(301720, 14330, 0, 0.0, 0, 1, 1, 1), +(301720, 14331, 0, 0.0, 0, 1, 1, 1), +(301720, 14332, 0, 0.0, 0, 1, 1, 1), +(301720, 14333, 0, 0.0, 0, 1, 1, 1), +(301720, 14334, 0, 0.0, 0, 1, 1, 1), +(301720, 14335, 0, 0.0, 0, 1, 1, 1), +(301720, 14336, 0, 0.0, 0, 1, 1, 1), +(301720, 14337, 0, 0.0, 0, 1, 1, 1), +(301720, 14975, 0, 0.0, 0, 1, 1, 1), +(301720, 14976, 0, 0.0, 0, 1, 1, 1), +(301720, 14977, 0, 0.0, 0, 1, 1, 1), +(301720, 14978, 0, 0.0, 0, 1, 1, 1), +(301720, 14979, 0, 0.0, 0, 1, 1, 1), +(301720, 14980, 0, 0.0, 0, 1, 1, 1), +(301720, 14981, 0, 0.0, 0, 1, 1, 1), +(301720, 14982, 0, 0.0, 0, 1, 1, 1), +(301720, 14983, 0, 0.0, 0, 1, 1, 1), +(301720, 15221, 0, 0.0, 0, 1, 1, 1), +(301720, 15229, 0, 0.0, 0, 1, 1, 1), +(301720, 15240, 0, 0.0, 0, 1, 1, 1), +(301720, 15247, 0, 0.0, 0, 1, 1, 1), +(301720, 15258, 0, 0.0, 0, 1, 1, 1), +(301720, 15267, 0, 0.0, 0, 1, 1, 1), +(301720, 15273, 0, 0.0, 0, 1, 1, 1), +(301720, 15278, 0, 0.0, 0, 1, 1, 1), +(301720, 15283, 0, 0.0, 0, 1, 1, 1), +(301720, 15289, 0, 0.0, 0, 1, 1, 1), +(301720, 15325, 0, 0.0, 0, 1, 1, 1), +(301720, 15434, 0, 0.0, 0, 1, 1, 1), +(301720, 15435, 0, 0.0, 0, 1, 1, 1), +(301720, 15436, 0, 0.0, 0, 1, 1, 1), +(301720, 15437, 0, 0.0, 0, 1, 1, 1), +(301720, 15438, 0, 0.0, 0, 1, 1, 1), +(301720, 15439, 0, 0.0, 0, 1, 1, 1), +(301720, 15440, 0, 0.0, 0, 1, 1, 1), +(301720, 15441, 0, 0.0, 0, 1, 1, 1), +(301720, 15442, 0, 0.0, 0, 1, 1, 1), +(301720, 15678, 0, 0.0, 0, 1, 1, 1), +(301720, 15679, 0, 0.0, 0, 1, 1, 1), +(301720, 15680, 0, 0.0, 0, 1, 1, 1), +(301720, 15681, 0, 0.0, 0, 1, 1, 1), +(301720, 15682, 0, 0.0, 0, 1, 1, 1), +(301720, 15683, 0, 0.0, 0, 1, 1, 1), +(301720, 15684, 0, 0.0, 0, 1, 1, 1), +(301720, 15685, 0, 0.0, 0, 1, 1, 1), +(301720, 15686, 0, 0.0, 0, 1, 1, 1), +(301720, 15687, 0, 0.0, 0, 1, 1, 1), +(301720, 15942, 0, 0.0, 0, 1, 1, 1), +(301720, 16044, 0, 0.0, 0, 1, 1, 1), +(301720, 16055, 0, 0.0, 0, 1, 1, 1), +(301720, 16253, 0, 0.0, 0, 1, 1, 1), +(301730, 17962, 0, 0.0, 0, 1, 1, 1), +(301730, 17963, 0, 0.0, 0, 1, 1, 1), +(301730, 17964, 0, 0.0, 0, 1, 1, 1), +(301730, 17965, 0, 0.0, 0, 1, 1, 1), +(301730, 17969, 0, 0.0, 0, 1, 1, 1), +(301830, 1168, 0, 0.0, 0, 10, 1, 1), +(301830, 2099, 0, 0.0, 0, 10, 1, 1), +(301830, 2245, 0, 0.0, 0, 10, 1, 1), +(301830, 2246, 0, 0.0, 0, 10, 1, 1), +(302620, 17064, 0, 8.0, 0, 1, 1, 1), +(302620, 17068, 0, 8.0, 0, 1, 1, 1), +(302620, 17075, 0, 8.0, 0, 1, 1, 1), +(302630, 17067, 0, 0.0, 0, 1, 1, 1), +(302630, 17078, 0, 0.0, 0, 1, 1, 1), +(302630, 18205, 0, 0.0, 0, 1, 1, 1), +(302630, 18813, 0, 0.0, 0, 1, 1, 1), +(302680, 1728, 0, 0.0, 0, 1, 1, 1), +(302680, 2801, 0, 0.0, 0, 1, 1, 1), +(302680, 3475, 0, 0.0, 0, 1, 1, 1); -INSERT INTO `reference_loot_template` (`Entry`, `Item`, `Reference`, `Chance`, `QuestRequired`, `LootMode`, `GroupId`, `MinCount`, `MaxCount`, `Comment`) VALUES -(54001, 16900, 0, 0, 0, 1, 1, 1, 1, 'Onyxia Ref - Stormrage Covert'), -(54001, 16908, 0, 0, 0, 1, 1, 1, 1, 'Onyxia Ref - Bloodfang Hood'), -(54001, 16914, 0, 0, 0, 1, 1, 1, 1, 'Onyxia Ref - Netherwind Crown'), -(54001, 16921, 0, 0, 0, 1, 1, 1, 1, 'Onyxia Ref - Halo of Transcendence'), -(54001, 16929, 0, 0, 0, 1, 1, 1, 1, 'Onyxia Ref - Nemesis Skullcap'), -(54001, 16939, 0, 0, 0, 1, 1, 1, 1, 'Onyxia Ref - Dragonstalker Helmet'), -(54001, 16947, 0, 0, 0, 1, 1, 1, 1, 'Onyxia Ref - Helmet of Ten Storms'), -(54001, 16955, 0, 0, 0, 1, 1, 1, 1, 'Onyxia Ref - Judgment Crown'), -(54001, 16963, 0, 0, 0, 1, 1, 1, 1, 'Onyxia Ref - Helm of Wrath'); +DELETE FROM `creature` WHERE `guid` BETWEEN 311000 AND 311006; +INSERT INTO `creature` (`guid`, `id1`, `id2`, `id3`, `map`, `spawnMask`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`, `wander_distance`, `MovementType`) VALUES +(311000, 301000, 0, 0, 249, 4, 0.69628, -211.972, -86.075, 3.19974, 604800, 0.0, 0), +(311001, 301002, 0, 0, 249, 4, -166.623, -196.003, -66.2619, 5.06806, 6300, 0.0, 2), +(311002, 301002, 0, 0, 249, 4, -52.9699, -96.8813, -38.6419, 5.66711, 6300, 0.0, 2), +(311003, 301002, 0, 0, 249, 4, 49.8206, -114.607, -24.3112, 1.24193, 1201, 0.0, 2), +(311004, 301002, 0, 0, 249, 4, -131.203, -137.47, -52.5151, 0.641988, 1201, 0.0, 2), +(311005, 301002, 0, 0, 249, 4, -199.097, -209.826, -68.9112, 0.650188, 1201, 0.0, 0); -DELETE FROM `creature_loot_template` WHERE `Entry` = 54003; -INSERT INTO `creature_loot_template` (`Entry`, `Item`, `Reference`, `Chance`, `QuestRequired`, `LootMode`, `GroupId`, `MinCount`, `MaxCount`, `Comment`) VALUES -(54003, 1, 54000, 100, 0, 1, 0, 1, 1, 'Onyxia - Reference Loot - Trinkets'), -(54003, 2, 54001, 100, 0, 1, 0, 1, 2, 'Onyxia - Reference Loot - Tier Pieces'), -(54003, 17966, 0, 100, 0, 1, 2, 1, 2, 'Onyxia - Onyxia Hide Backpack'), -(54003, 17966, 0, 20, 0, 1, 3, 1, 2, 'Onyxia - Onyxia Hide Backpack'), -(54003, 18422, 0, 100, 0, 1, 0, 1, 1, 'Onyxia - Head of Onyxia'), -(54003, 18423, 0, 100, 0, 1, 0, 1, 1, 'Onyxia - Head of Onyxia'), -(54003, 18705, 0, 40, 1, 1, 0, 1, 1, 'Onyxia - Mature Black Dragon Sinew'), -(54003, 21108, 0, 100, 0, 1, 0, 1, 1, 'Onyxia - Draconic for Dummies'), -(54003, 17064, 0, 8.0, 0, 1, 1, 1, 1, 'Onyxia Ref - Shard of the Scale'), -(54003, 17075, 0, 8.0, 0, 1, 1, 1, 1, 'Onyxia Ref - Viskag the Bloodletter'), -(54003, 17068, 0, 8.0, 0, 1, 1, 1, 1, 'Onyxia Ref - Deathbringer'); +DELETE FROM `waypoint_data` WHERE `id` IN (3110010,3110020,3110030,3110040); +INSERT INTO `waypoint_data` (`id`, `point`, `position_x`, `position_y`, `position_z`, `orientation`, `delay`) VALUES +(3110010, 1, -163.83, -204.604, -66.2683, 5.05628, 0), +(3110010, 2, -155.152, -212.384, -66.6343, 2.93965, 0), +(3110010, 3, -141.729, -213.377, -68.8695, 6.22261, 0), +(3110010, 4, -154.952, -212.483, -66.6419, 3.19293, 0), +(3110010, 5, -164.343, -204.266, -66.2673, 2.19352, 0), +(3110010, 6, -166.675, -190.895, -66.2472, 1.57895, 0), +(3110010, 7, -168.71, -181.385, -65.4601, 1.68498, 0), +(3110010, 8, -166.79, -190.459, -66.2541, 4.92081, 0), +(3110020, 1, -52.1412, -98.2359, -38.6507, 6.28153, 0), +(3110020, 2, -74.7562, -98.3192, -34.9932, 3.1635, 0), +(3110020, 3, -86.2188, -99.9578, -36.5755, 3.30691, 0), +(3110020, 4, -96.563, -108.612, -39.2156, 3.85668, 0), +(3110020, 5, -101.853, -112.661, -41.5379, 0.587407, 0), +(3110020, 6, -96.8643, -108.629, -39.2921, 3.76435, 0), +(3110020, 7, -85.8067, -100.253, -36.5221, 0.449972, 0), +(3110020, 8, -74.6329, -98.5399, -34.9836, 0.108325, 0), +(3110030, 1, 52.2852, -105.334, -24.8035, 1.31584, 0), +(3110030, 2, 52.4425, -97.069, -25.1109, 4.82655, 0), +(3110030, 3, 50.325, -90.0214, -25.7882, 4.67538, 0), +(3110030, 4, 46.1806, -77.3484, -26.5919, 2.78651, 0), +(3110030, 5, 50.5625, -90.3953, -25.7437, 5.09165, 0), +(3110030, 6, 52.57, -97.4695, -25.0943, 4.95223, 0), +(3110030, 7, 52.5036, -105.629, -24.777, 4.30625, 0), +(3110030, 8, 46.4701, -114.817, -24.6921, 1.14113, 0), +(3110040, 1, -135.799, -142.144, -53.378, 0.681684, 0), +(3110040, 2, -149.953, -151.32, -53.526, 0.554059, 0), +(3110040, 3, -159.632, -158.221, -57.4562, 3.90378, 0), +(3110040, 4, -164.138, -163.099, -59.3168, 0.895706, 0), +(3110040, 5, -169.922, -173.997, -63.4661, 1.12346, 0), +(3110040, 6, -164.278, -163.272, -59.3729, 1.0135, 0), +(3110040, 7, -159.712, -157.77, -57.4116, 0.632569, 0), +(3110040, 8, -149.381, -150.852, -53.5372, 0.565795, 0), +(3110040, 9, -135.617, -142.149, -53.3473, 3.88019, 0), +(3110040, 10, -125.857, -133.639, -51.4387, 0.728772, 0), +(3110040, 11, -113.42, -122.504, -49.0254, 0.69146, 0), +(3110040, 12, -125.618, -133.461, -51.4287, 3.8802, 0); + +DELETE FROM `smart_scripts` WHERE `entryorguid` BETWEEN 301000 AND 301003; +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_param4`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(301002, 0, 0, 0, 0, 0, 100, 6, 1000, 1000, 12000, 12000, 0, 11, 20203, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0.0, 0.0, 0.0, 0.0, "Onyxian Warder - In Combat - Cast 'Fire Nova' (No Repeat) (Normal Dungeon) (Onyxia 40)"), +(301002, 0, 1, 0, 0, 0, 90, 6, 5000, 5000, 20000, 20000, 0, 11, 18958, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0.0, 0.0, 0.0, 0.0, "Onyxian Warder - In Combat - Cast 'Flame Lash' (No Repeat) (Normal Dungeon) (Onyxia 40)"), +(301002, 0, 2, 0, 0, 0, 80, 6, 7000, 7000, 9000, 11000, 0, 11, 15284, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0.0, 0.0, 0.0, 0.0, "Onyxian Warder - In Combat - Cast 'Cleave' (No Repeat) (Normal Dungeon) (Onyxia 40)"), +(301002, 0, 3, 0, 0, 0, 95, 6, 3000, 3000, 35000, 35000, 0, 11, 12097, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0.0, 0.0, 0.0, 0.0, "Onyxian Warder - In Combat - Cast 'Pierce Armor' (No Repeat) (Normal Dungeon) (Onyxia 40)"); + +DELETE FROM `creature_text` WHERE `CreatureID` BETWEEN 301000 AND 301003; +INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES +(301000, 0, 0, "How fortuitous. Usually, I must leave my lair in order to feed.", 14, 0, 100.0, 0, 0, 0, 8286, 0, "Onyxia - Aggro (Onyxia 40)"), +(301000, 1, 0, "Learn your place, mortal!", 14, 0, 100.0, 0, 0, 0, 8287, 0, "Onyxia - Kill Player (Onyxia 40)"), +(301000, 2, 0, "This meaningless exertion bores me. I'll incinerate you all from above!", 14, 0, 100.0, 0, 0, 0, 8288, 0, "Onyxia - Phase 2 (Onyxia 40)"), +(301000, 3, 0, "It seems you'll need another lesson, mortals!", 14, 0, 100.0, 0, 0, 0, 8290, 0, "Onyxia - Phase 3 (Onyxia 40)"), +(301000, 4, 0, "%s takes in a deep breath...", 41, 0, 100.0, 0, 0, 0, 36542, 0, "Onyxia - Deep Breath Emote (Onyxia 40)"), +(301000, 5, 0, "You seek to lure me from my clutch? You shall pay for your insolence!", 14, 0, 100.0, 0, 0, 0, 8570, 0, "Onyxia - Boundary Evade (Onyxia 40)"); + +DELETE FROM `creature_equip_template` WHERE `CreatureID` BETWEEN 301000 and 301003; +REPLACE INTO `creature_equip_template` (`CreatureID`, `ID`, `ItemID1`, `ItemID2`, `ItemID3`) VALUES +(301002, 1, 13631, 0, 0); + +UPDATE `creature` SET `equipment_id` = 1 WHERE `id1` IN (301002); +DELETE FROM `creature_addon` WHERE `guid` BETWEEN 311000 AND 311006; +INSERT INTO `creature_addon` (`guid`, `path_id`, `mount`, `bytes1`, `bytes2`, `emote`, `auras`) VALUES +(311000, 0, 0, 3, 1, 0, NULL), +(311001, 3110010, 0, 0, 0, 0, NULL), +(311002, 3110020, 0, 0, 0, 0, NULL), +(311003, 3110030, 0, 0, 0, 0, NULL), +(311004, 3110040, 0, 0, 0, 0, NULL); DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` = 1 AND `SourceGroup` = 54003 AND `SourceEntry` = 21108; INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES -(1, 54003, 21108, 0, 0, 9, 0, 8620, 0, 0, 0, 0, 0, '', 'Draconic for Dummies Chapter VI will drop only when a player have The Only Prescription (8620) in their quest log'); +(1, 301000, 21108, 0, 0, 9, 0, 8620, 0, 0, 0, 0, 0, '', 'Draconic for Dummies Chapter VI will drop only when a player have The Only Prescription (8620) in their quest log'); -DELETE FROM `disables` WHERE `entry` IN (12565, 12566, 12564, 12558) AND `sourceType` = 4; -INSERT INTO `disables` (`sourceType`, `entry`, `flags`, `params_0`, `params_1`, `comment`) VALUES -(4, 12565, 0, 0, 0, 'Disable Many Whelps, Handle it! (10) achievement'), -(4, 12566, 0, 0, 0, 'Disable She deeps breah more (10) achievement'), -(4, 12564, 0, 0, 0, 'Disable More dots! (10) achievement'), -(4, 12558, 0, 0, 0, 'Disable Onyxia Lair (10) achievement'); +DELETE FROM `dungeon_access_template` WHERE `id`=123; +INSERT INTO `dungeon_access_template` (`id`, `map_id`, `difficulty`, `min_level`, `max_level`, `min_avg_item_level`, `comment`) VALUES (123, 249, 2, 50, 0, 0, 'Onyxia\'s Lair - 40man'); -DELETE FROM `dungeon_access_requirements` WHERE `dungeon_access_id` = 15; +DELETE FROM `dungeon_access_requirements` WHERE `dungeon_access_id` = 123; INSERT INTO `dungeon_access_requirements` (`dungeon_access_id`, `requirement_type`, `requirement_id`, `requirement_note`, `faction`, `priority`, `leader_only`, `comment`) VALUES -(15, 2, 16309, 'You must have the Drakefire Amulet in your inventory before entering Onyxia\'s Lair.', 2, NULL, 0, ''); - -UPDATE `dungeon_access_template` SET `min_level` = 50 WHERE `map_id` = 249 AND `difficulty` = 0; +(123, 2, 16309, 'You must have the Drakefire Amulet in your inventory before entering Onyxia\'s Lair.', 2, NULL, 0, ''); DELETE FROM `mapdifficulty_dbc` WHERE `MapID` = 249; INSERT INTO `mapdifficulty_dbc` (`ID`, `MapID`, `Difficulty`, `RaidDuration`, `MaxPlayers`, `Difficultystring`) VALUES -(26, 249, 0, 604800, 25, 'RAID_DIFFICULTY_25PLAYER'); +(755, 249, 2, 604800, 40, 'RAID_DIFFICULTY_40PLAYER'); -UPDATE `achievement_criteria_data` SET `value1` = 0 WHERE `criteria_id` IN (12567, 12568, 12569); - --- Victory for the Alliance - Varian +-- Victory for the Alliance - Bolvar or Varian DELETE FROM `creature_questender` WHERE `quest` = 7495; INSERT INTO `creature_questender` (`id`, `quest`) VALUES -(29611, 7495); +(29611, 7495), +(1748, 7495); -- Thrall DELETE FROM `creature_questender` WHERE `quest` = 7490; @@ -145,12 +988,6 @@ INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry (15,5747,0,0,0,8,0,7507,0,0,0,0,0,'','Lydros Pre Quel\'Serrar Gossip Option - Requires to have Foror\'s Compendium rewarded'), (15,5747,0,0,0,8,0,7508,0,0,1,0,0,'','Lydros Pre Quel\'Serrar Gossip Option - Requires to not have The Forging of Quel\'Serrar rewarded'); - -DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` = 15 AND `SourceGroup` = 5747 AND `SourceEntry` = 60040; -INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES -(15,5747,60040,0,0,8,0,7507,0,0,0,0,0,'','Lydros Pre Quel\'Serrar Gossip - Requires to have Foror\'s Compendium rewarded'), -(15,5747,60040,0,0,8,0,7508,0,0,1,0,0,'','Lydros Pre Quel\'Serrar Gossip - Requires to not have The Forging of Quel\'Serrar rewarded'); - DELETE FROM `gossip_menu_option` WHERE `MenuID` IN (5747, 60040, 60041, 60042, 60043, 60044, 60045, 60046); INSERT INTO `gossip_menu_option` (`menuID`, `optionid`, `OptionIcon`, `OptionText`, `OptionBroadcastTextID`, `OptionType`, `OptionNpcFlag`, `ActionMenuID`, `ActionPoiID`, `BoxCoded`, `BoxMoney`, `BoxText`, `BoxBroadcastTextID`, `VerifiedBuild`) VALUES (5747,0,0,'(Continue.)', 9519,1,3,60041,0,0,0,NULL,0,0), @@ -174,3 +1011,7 @@ INSERT INTO spell_linked_spell (spell_trigger, spell_effect, TYPE, COMMENT) VALU (22905, 22906, 0, 'quelserrar'); UPDATE `quest_template_addon` SET `SpecialFlags` = 0 WHERE `id` = 7509; + +DELETE FROM `areatrigger_teleport` WHERE `ID` = 2848; +INSERT INTO `areatrigger_scripts` (`entry`, `ScriptName`) VALUES +(2848, 'onyxia_entrance_trigger'); \ No newline at end of file diff --git a/sql/world/base/naxx40_creatures.sql b/sql/world/base/naxx40_creatures.sql index d3d4c6c..23ad612 100644 --- a/sql/world/base/naxx40_creatures.sql +++ b/sql/world/base/naxx40_creatures.sql @@ -84,11 +84,12 @@ REPLACE INTO `creature_template` (`entry`, `modelid1`, `name`, `subname`, `minle (351081, 16603, "Naxxramas Worshipper", "", 61, 61, 21, 1.0, 1.42857, 20.0, 1.0, 1, 0, 35.0, 2000, 1265, 1.0, 1.0, 8, 32832, 2048, 0, 7, 72, 0, 0, 0, 0, 0, 'SmartAI', 0, 1.0, 40.0, 10.0, 1.0, 1.0, 144, 1, 1021294170, 0, 0, ''), (351082, 14698, "Crypt Guard", "", 61, 61, 21, 1.0, 1.42857, 20.0, 1.0, 1, 0, 14.7, 1000, 1265, 1.0, 1.0, 1, 64, 2048, 0, 6, 72, 0, 0, 0, 0, 0, 'SmartAI', 0, 1.0, 65.0, 1.0, 1.0, 1.0, 144, 1, 1021296218, 0, 0, ''), (351083, 10005, "Corpse Scarab", "", 60, 60, 21, 0.833332, 2.14286, 18.0, 1.0, 0, 0, 2.1, 1000, 1265, 1.0, 1.0, 1, 0, 2048, 0, 10, 72, 0, 0, 0, 0, 0, 'SmartAI', 2, 1.0, 2.0, 1.0, 1.0, 1.0, 188, 1, 1019945489, 0, 0, ''), -(351084, 16539, "Deathknight Understudy", "", 60, 60, 21, 1.0, 1.42857, 20.0, 1.0, 1, 0, 45.5, 3500, 1265, 1.0, 1.0, 1, 32832, 2048, 0, 7, 72, 0, 0, 0, 0, 0, '', 0, 1.0, 30.0, 2.0, 1.0, 1.0, 144, 1, 0, 0, 0, 'boss_razuvious_minion'), +(351084, 16539, "Deathknight Understudy", "", 60, 60, 21, 1.0, 1.42857, 20.0, 1.0, 1, 0, 45.5, 3500, 1265, 1.0, 1.0, 1, 32832, 2048, 0, 7, 72, 0, 0, 0, 0, 0, '', 0, 1.0, 30.0, 2.0, 1.0, 1.0, 144, 1, 0, 0, 0, 'boss_razuvious_minion_40'), (351085, 2606, "Plagued Guardian", "", 61, 61, 21, 1.0, 1.42857, 20.0, 1.0, 1, 0, 24.25, 3000, 2000, 1.0, 1.0, 8, 0, 2048, 0, 6, 72, 0, 0, 0, 0, 0, 'SmartAI', 0, 1.0, 8.0, 18.0, 1.0, 1.0, 144, 1, 1015751184, 0, 0, ''), (351086, 7847, "Plagued Champion", "", 61, 61, 21, 0.888888, 1.42857, 20.0, 1.0, 1, 0, 26.85, 2000, 2000, 1.0, 1.0, 1, 64, 2048, 0, 6, 72, 0, 0, 0, 0, 0, 'SmartAI', 0, 1.0, 11.0, 1.0, 1.0, 1.0, 144, 1, 1015226896, 0, 0, ''), (351087, 16916, "Plagued Warrior", "", 61, 61, 21, 1.0, 1.42857, 20.0, 1.0, 1, 0, 22.4, 2700, 2000, 1.0, 1.0, 1, 64, 2048, 0, 6, 72, 0, 0, 0, 0, 0, 'SmartAI', 0, 1.0, 10.0, 1.0, 1.0, 1.0, 144, 1, 1019421201, 0, 0, ''), -(351088, 13111, "Maexxna Spiderling", "", 60, 60, 16, 1.0, 2.14286, 18.0, 1.0, 0, 0, 1.85, 500, 2000, 1.0, 1.0, 1, 0, 2048, 0, 1, 72, 0, 0, 0, 0, 0, 'SmartAI', 0, 1.0, 1.25, 1.0, 1.0, 1.0, 188, 1, 1019945489, 0, 0, ''); +(351088, 13111, "Maexxna Spiderling", "", 60, 60, 16, 1.0, 2.14286, 18.0, 1.0, 0, 0, 1.85, 500, 2000, 1.0, 1.0, 1, 0, 2048, 0, 1, 72, 0, 0, 0, 0, 0, 'SmartAI', 0, 1.0, 1.25, 1.0, 1.0, 1.0, 188, 1, 1019945489, 0, 0, ''), +(351089, 11686, "Grobbulus Cloud", "", 63, 63, 21, 0.004, 0.001429, 18.0, 1.0, 0, 0, 0.05, 2000, 2000, 1.0, 1.0, 1, 33554432, 2048, 0, 10, 0, 0, 0, 0, 0, 0, '', 0, 1.0, 1.35, 1.0, 1.0, 1.0, 60, 1, 0, 0, 0, 'boss_grobbulus_poison_cloud_40'); REPLACE INTO `creature_loot_template` (`Entry`, `Item`, `Reference`, `Chance`, `QuestRequired`, `GroupId`, `MinCount`, `MaxCount`) VALUES (351000, 22726, 0, 30.0, 0, 0, 1, 1), diff --git a/sql/world/base/professions.sql b/sql/world/base/professions.sql index 4cef095..7fb6295 100644 --- a/sql/world/base/professions.sql +++ b/sql/world/base/professions.sql @@ -856,4 +856,5 @@ DELETE FROM creature WHERE `id1` IN (33676, 35101); -- Delete added riding trainers -DELETE FROM creature WHERE `id1` IN (35093, 35100); \ No newline at end of file +DELETE FROM creature WHERE `id1` IN (35093, 35100); +DELETE FROM creature_addon WHERE `guid` IN (88165, 88166); \ No newline at end of file diff --git a/sql/world/base/quest_the_masquerade.sql b/sql/world/base/quest_the_masquerade.sql index 9a47fa5..7460413 100644 --- a/sql/world/base/quest_the_masquerade.sql +++ b/sql/world/base/quest_the_masquerade.sql @@ -72,7 +72,7 @@ DELETE FROM `gossip_menu` WHERE `MenuID` = 12580 AND `TextID` = 5633; INSERT INTO `gossip_menu` (`MenuID`, `TextID`) VALUES (12580, 5633); -UPDATE `creature_template` SET `gossip_menu_id` = 12580 WHERE `entry` = 12580; +UPDATE `creature_template` SET `gossip_menu_id` = 12580, `npcflag` = `npcflag` | 1 WHERE `entry` = 12580; DELETE FROM `gossip_menu_option` WHERE `MenuID` = 12580; INSERT INTO `gossip_menu_option` (`MenuID`, `OptionID`, `OptionIcon`, `OptionText`, `OptionBroadcastTextId`, `OptionType`, `OptionNpcFlag`, `ActionMenuID`, `ActionPoiID`, `BoxCoded`, `BoxMoney`, `BoxText`, `BoxBroadcastTextId`) VALUES diff --git a/sql/world/base/tbc_item_changes.sql b/sql/world/base/tbc_item_changes.sql index 694040f..93ed8b1 100644 --- a/sql/world/base/tbc_item_changes.sql +++ b/sql/world/base/tbc_item_changes.sql @@ -4105,9 +4105,6 @@ UPDATE `item_template` SET `stat_type3` = 30 WHERE entry=34212; /* Heroic Judicator's Chestguard */ UPDATE `item_template` SET `stat_type2` = 5, `stat_value2` = 22, `spellid_1` = 26158 WHERE entry=34216; -/* Deadman's Hand */ -UPDATE `item_template` SET `DisenchantID` = 0 WHERE entry=34227; - /* Vicious Hawkstrider Hauberk */ UPDATE `item_template` SET `DisenchantID` = 0 WHERE entry=34228; diff --git a/sql/world/base/vanilla_creature_values.sql b/sql/world/base/vanilla_creature_values.sql index 604cfd6..116c3a7 100644 --- a/sql/world/base/vanilla_creature_values.sql +++ b/sql/world/base/vanilla_creature_values.sql @@ -16940,9 +16940,6 @@ UPDATE `creature_template` SET `DamageModifier` = 1.5 WHERE `entry`=10177; /* Lady Sylvanas Windrunner */ UPDATE `creature_template` SET `modelid1` = 11657, `minlevel` = 63, `maxlevel` = 63, `DamageModifier` = 13.05, `HealthModifier` = 300.0, `ArmorModifier` = 1.3, `mingold` = 1, `maxgold` = 866 WHERE `entry`=10181; -/* Onyxia */ -UPDATE `creature_template` SET `minlevel` = 63, `maxlevel` = 63, `DamageModifier` = 15.05, `HealthModifier` = 330.0, `ArmorModifier` = 1.3, `ManaModifier` = 4.0, `mingold` = 914892, `maxgold` = 1066294 WHERE `entry`=10184; - /* General Colbatann */ UPDATE `creature_template` SET `speed_walk` = 0.888888, `DamageModifier` = 3.6, `RangeAttackTime` = 1292 WHERE `entry`=10196; @@ -18455,9 +18452,6 @@ UPDATE `creature_template` SET `DamageModifier` = 1.3 WHERE `entry`=11260; /* Doctor Theolen Krastinov */ UPDATE `creature_template` SET `DamageModifier` = 5.2, `ArmorModifier` = 1.1, `maxgold` = 2253 WHERE `entry`=11261; -/* Onyxian Whelp */ -UPDATE `creature_template` SET `minlevel` = 56, `maxlevel` = 57, `DamageModifier` = 3.7, `HealthModifier` = 1.0 WHERE `entry`=11262; - /* Spectral Projection */ UPDATE `creature_template` SET `minlevel` = 58, `DamageModifier` = 2.15, `HealthModifier` = 1.0, `ArmorModifier` = 1.05, `mingold` = 61, `maxgold` = 307 WHERE `entry`=11263; @@ -19967,9 +19961,6 @@ UPDATE `creature_template` SET `DamageModifier` = 1.6, `ArmorModifier` = 0.65, ` /* Crimson Elite */ UPDATE `creature_template` SET `DamageModifier` = 3.75, `ArmorModifier` = 1.1, `RangeAttackTime` = 1265, `mingold` = 176, `maxgold` = 3033 WHERE `entry`=12128; -/* Onyxian Warder */ -UPDATE `creature_template` SET `minlevel` = 60, `maxlevel` = 63, `DamageModifier` = 9.8, `HealthModifier` = 25.0, `ArmorModifier` = 1.3, `ManaModifier` = 3.0, `mingold` = 1185 WHERE `entry`=12129; - /* Snurk Bucksquick */ UPDATE `creature_template` SET `subname` = 'Zeppelin Master', `DamageModifier` = 4.9 WHERE `entry`=12136; diff --git a/sql/world/base/ZZ_aq_quest_nerf.sql b/sql/world/base/zz_aq_quest_nerf.sql similarity index 100% rename from sql/world/base/ZZ_aq_quest_nerf.sql rename to sql/world/base/zz_aq_quest_nerf.sql diff --git a/sql/world/base/zz_cleanup.sql b/sql/world/base/zz_cleanup.sql new file mode 100644 index 0000000..60e0614 --- /dev/null +++ b/sql/world/base/zz_cleanup.sql @@ -0,0 +1,9 @@ +DELETE FROM `game_event_creature` WHERE `guid` IN (208146, 208159, 208185, 208207, 208240, 208251, 208355, 208368, 208394, 208407); +DELETE FROM `creature_addon` WHERE `guid` IN (29803, 133925, 133926); + +/* Several unused BG NPCs have wrong classes in AC - fix to prevent console warning */ +UPDATE `creature_template` SET `unit_class` = 2 WHERE `entry` IN (22742, 22791, 22796, 22792, 22627, 22532, 22774, 22534, 22529, 22537, 22790, 22791, 22637, 22599, + 32013, 22781, 31930, 32128, 31935, 31927, 31938, 32120, 37332, 32142, 31821, 37248, 37453, 37253, + 37245, 37256, 37443, 37472, 37341); +UPDATE `creature_template` SET `unit_class` = 1 WHERE `entry` IN (22632, 32055, 31921, 37376); +UPDATE `creature_template` SET `unit_class` = 8 WHERE `entry` IN (29273); diff --git a/src/IndividualProgression.cpp b/src/IndividualProgression.cpp index e88986d..9124745 100644 --- a/src/IndividualProgression.cpp +++ b/src/IndividualProgression.cpp @@ -651,5 +651,5 @@ void AddSC_mod_individual_progression() new npc_ipp_tbc(); new npc_ipp_wotlk(); new gobject_ipp_tbc(); - new gobject_ipp_wotlk(); +// new gobject_ipp_wotlk(); // Not used yet } diff --git a/src/IndividualProgression_loader.cpp b/src/IndividualProgression_loader.cpp index 295246e..b59566d 100644 --- a/src/IndividualProgression_loader.cpp +++ b/src/IndividualProgression_loader.cpp @@ -4,8 +4,8 @@ // From SC void AddSC_mod_individual_progression(); -void AddSC_boss_onyxia_60_2(); -void AddSC_instance_onyxias_lair_60_2(); +void AddSC_boss_onyxia_40(); +void AddSC_instance_onyxias_lair_40(); void AddSC_instance_blackrock_spire_50_59_B(); void AddSC_instance_molten_core_60_1_A(); void AddSC_quest_jail_break_60_2(); @@ -35,8 +35,8 @@ void AddSC_npc_omarion(); void Addmod_individual_progressionScripts() { AddSC_mod_individual_progression(); - AddSC_boss_onyxia_60_2(); - AddSC_instance_onyxias_lair_60_2(); + AddSC_boss_onyxia_40(); + AddSC_instance_onyxias_lair_40(); AddSC_instance_blackrock_spire_50_59_B(); AddSC_instance_molten_core_60_1_A(); AddSC_quest_jail_break_60_2(); diff --git a/src/vanillaScripts/boss_chromaggus.cpp b/src/vanillaScripts/boss_chromaggus.cpp index 635b725..d45aba5 100644 --- a/src/vanillaScripts/boss_chromaggus.cpp +++ b/src/vanillaScripts/boss_chromaggus.cpp @@ -22,7 +22,7 @@ class spell_bwl_chromaggus_time_lapse_60_2_A : public SpellScriptLoader { public: - spell_bwl_chromaggus_time_lapse_60_2_A() : SpellScriptLoader("spell_bwl_chromaggus_time_lapse_60_2_A") { } + spell_bwl_chromaggus_time_lapse_60_2_A() : SpellScriptLoader("spell_bwl_chromaggus_time_lapse") { } class spell_bwl_chromaggus_time_lapse_60_2_A_SpellScript : public SpellScript { diff --git a/src/vanillaScripts/boss_onyxia.cpp b/src/vanillaScripts/boss_onyxia.cpp index 26f77db..1a4c0fa 100644 --- a/src/vanillaScripts/boss_onyxia.cpp +++ b/src/vanillaScripts/boss_onyxia.cpp @@ -117,15 +117,15 @@ enum Yells EMOTE_BREATH = 4 }; -class boss_onyxia_60_2 : public CreatureScript +class boss_onyxia_40 : public CreatureScript { public: - boss_onyxia_60_2() : CreatureScript("boss_onyxia") {} + boss_onyxia_40() : CreatureScript("boss_onyxia_40") {} - struct boss_onyxiaAI_60_2 : public BossAI + struct boss_onyxiaAI_40 : public BossAI { public: - boss_onyxiaAI_60_2(Creature* pCreature) : BossAI(pCreature, DATA_ONYXIA) + boss_onyxiaAI_40(Creature* pCreature) : BossAI(pCreature, DATA_ONYXIA) { Initialize(); } @@ -172,7 +172,6 @@ public: me->SetCanFly(false); me->SetDisableGravity(false); me->SetSpeed(MOVE_RUN, me->GetCreatureTemplate()->speed_run, false); - instance->DoStopTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, ACHIEV_TIMED_START_EVENT); BossAI::Reset(); } @@ -194,8 +193,6 @@ public: Talk(SAY_AGGRO); SetPhase(PHASE_GROUNDED); - instance->DoStopTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, ACHIEV_TIMED_START_EVENT); // just in case at reset some players already left the instance - instance->DoStartTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, ACHIEV_TIMED_START_EVENT); BossAI::EnterCombat(who); } @@ -539,11 +536,11 @@ public: CreatureAI* GetAI(Creature* creature) const override { - return GetOnyxiasLairAI(creature); + return GetOnyxiasLairAI(creature); }; }; -void AddSC_boss_onyxia_60_2() +void AddSC_boss_onyxia_40() { - new boss_onyxia_60_2(); + new boss_onyxia_40(); } diff --git a/src/vanillaScripts/instance_onyxias_lair.cpp b/src/vanillaScripts/instance_onyxias_lair.cpp index aa28745..2700b70 100644 --- a/src/vanillaScripts/instance_onyxias_lair.cpp +++ b/src/vanillaScripts/instance_onyxias_lair.cpp @@ -22,13 +22,14 @@ ObjectData const creatureData[] = { - { NPC_ONYXIA, DATA_ONYXIA } + { NPC_ONYXIA, DATA_ONYXIA }, + { NPC_ONYXIA_40, DATA_ONYXIA } }; -class instance_onyxias_lair_60_2 : public InstanceMapScript +class instance_onyxias_lair_40 : public InstanceMapScript { public: - instance_onyxias_lair_60_2() : InstanceMapScript("instance_onyxias_lair", 249) {} + instance_onyxias_lair_40() : InstanceMapScript("instance_onyxias_lair", 249) {} InstanceScript* GetInstanceScript(InstanceMap* pMap) const override { @@ -144,6 +145,10 @@ public: bool CheckAchievementCriteriaMeet(uint32 criteria_id, Player const* /*source*/, Unit const* /*target*/, uint32 /*miscvalue1*/) override { + if (instance->GetDifficulty() == RAID_DIFFICULTY_10MAN_HEROIC) + { + return false; // No achievements in Onyxia 40man + } switch(criteria_id) { case ACHIEV_CRITERIA_MANY_WHELPS_10_PLAYER: @@ -158,6 +163,25 @@ public: }; }; +class onyxia_entrance_trigger : public AreaTriggerScript +{ +public: + onyxia_entrance_trigger() : AreaTriggerScript("onyxia_entrance_trigger") { } + + bool OnTrigger(Player* player, AreaTrigger const* areaTrigger) override + { + if (player->getLevel() < 80) + { + player->SetRaidDifficulty(RAID_DIFFICULTY_10MAN_HEROIC); + } + if (!sMapMgr->PlayerCannotEnter(249, player, true)) + { + player->TeleportTo(249, 29.1607f, -71.3372f, -8.18032f, 4.58f); + } + return true; + } +}; + class global_onyxia_tuning_script : public GlobalScript { public: @@ -165,6 +189,7 @@ public: void OnLoadSpellCustomAttr(SpellInfo* spellInfo) override { + // TODO: This is currently overriding 10 man spells switch (spellInfo->Id) { case 18435: // Flame Breath @@ -293,8 +318,9 @@ public: } }; -void AddSC_instance_onyxias_lair_60_2() +void AddSC_instance_onyxias_lair_40() { - new instance_onyxias_lair_60_2(); + new instance_onyxias_lair_40(); new global_onyxia_tuning_script(); + new onyxia_entrance_trigger(); } diff --git a/src/vanillaScripts/onyxias_lair.h b/src/vanillaScripts/onyxias_lair.h index 7d78bc6..146602f 100644 --- a/src/vanillaScripts/onyxias_lair.h +++ b/src/vanillaScripts/onyxias_lair.h @@ -19,6 +19,8 @@ #define DEF_ONYXIAS_LAIR_H #include "CreatureAIImpl.h" +#include "Player.h" +#include "MapMgr.h" #define OnyxiasLairScriptName "instance_onyxias_lair" @@ -35,6 +37,10 @@ enum eCreatures NPC_ONYXIA = 10184, NPC_ONYXIAN_WHELP = 11262, NPC_ONYXIAN_LAIR_GUARD = 36561, + + NPC_ONYXIA_40 = 301000, + NPC_ONYXIAN_WHELP_40 = 301001, + NPC_ONYXIAN_LAIR_GUARD_40 = 301002, }; enum eGameObjects