diff options
| -rw-r--r-- | sql/scripts/world_scripts_full.sql | 16 | ||||
| -rw-r--r-- | sql/updates/world/2011_04_30_01_world_misc.txt | 27 | ||||
| -rwxr-xr-x | src/server/scripts/World/achievement_scripts.cpp | 20 |
3 files changed, 28 insertions, 35 deletions
diff --git a/sql/scripts/world_scripts_full.sql b/sql/scripts/world_scripts_full.sql index 9d8eb9b1646..4d6961e5e87 100644 --- a/sql/scripts/world_scripts_full.sql +++ b/sql/scripts/world_scripts_full.sql @@ -1779,23 +1779,9 @@ UPDATE `outdoorpvp_template` SET `ScriptName`='outdoorpvp_si' WHERE `TypeId`=5; UPDATE `outdoorpvp_template` SET `ScriptName`='outdoorpvp_ep' WHERE `TypeId`=6; /* ACHIEVEMENTS */ -DELETE FROM `achievement_criteria_data` WHERE `criteria_id` IN (3693,6641,6642,6643,6644,12398,6651,6652,6653,6654,6655,6656,6657,6659,10391,3804,3805,3806,3807,3808,3809,3810,3811,3812,3813,1234,1239,5605,5606,12778,13036,13035,13037,12977,12967,12986,12982,12993,12780,13012,13011,13013,12062,12063,12064,12065,12183,12068,12060,12061,12822,12996,12972,12989,10062,10063,10054,10055,10046,10047,10048,10049,10050,10051,10044,10045,6446,7625,7628) AND `type` IN (0,11); +DELETE FROM `achievement_criteria_data` WHERE `criteria_id` IN (3693,3804,3805,3806,3807,3808,3809,3810,3811,3812,3813,1234,1239,5605,5606,12778,13036,13035,13037,12977,12967,12986,12982,12993,12780,13012,13011,13013,12062,12063,12064,12065,12183,12068,12060,12061,12822,12996,12972,12989,10062,10063,10054,10055,10046,10047,10048,10049,10050,10051,10044,10045,6446,7625,7628) AND `type` IN (0,11); INSERT INTO `achievement_criteria_data` (`criteria_id`,`type`,`value1`,`value2`,`ScriptName`) VALUES (3693,11,0,0, 'achievement_storm_glory'), -(6641,11,0,0, 'achievement_has_orphan_out'), -(6642,11,0,0, 'achievement_has_orphan_out'), -(6643,11,0,0, 'achievement_has_orphan_out'), -(6644,11,0,0, 'achievement_has_orphan_out'), -(12398,11,0,0, 'achievement_has_orphan_out'), -(6651,11,0,0, 'achievement_has_orphan_out'), -(6652,11,0,0, 'achievement_has_orphan_out'), -(6653,11,0,0, 'achievement_has_orphan_out'), -(6654,11,0,0, 'achievement_has_orphan_out'), -(6655,11,0,0, 'achievement_has_orphan_out'), -(6656,11,0,0, 'achievement_has_orphan_out'), -(6657,11,0,0, 'achievement_has_orphan_out'), -(6659,11,0,0, 'achievement_has_orphan_out'), -(10391,11,0,0, 'achievement_has_orphan_out'), (3804,11,0,0, 'achievement_resilient_victory'), (3805,11,0,0, 'achievement_resilient_victory'), (3806,11,0,0, 'achievement_resilient_victory'), diff --git a/sql/updates/world/2011_04_30_01_world_misc.txt b/sql/updates/world/2011_04_30_01_world_misc.txt new file mode 100644 index 00000000000..90cbae41a0e --- /dev/null +++ b/sql/updates/world/2011_04_30_01_world_misc.txt @@ -0,0 +1,27 @@ +DELETE FROM `achievement_criteria_data` WHERE `criteria_id` IN (6641,6642,6643,6644,6651,6652,6653,6654,6655,6656,6657,6659,10391,12398) AND `type`!=16; +INSERT INTO `achievement_criteria_data` (`criteria_id`,`type`,`value1`,`value2`,`ScriptName`) VALUES +(6641,5,58818,0,''), -- School of Hard Knocks +(6642,5,58818,0,''), -- School of Hard Knocks +(6643,5,58818,0,''), -- School of Hard Knocks +(6644,5,58818,0,''), -- School of Hard Knocks +(6651,5,58818,0,''), -- Bad Example +(6652,5,58818,0,''), -- Bad Example +(6653,5,58818,0,''), -- Bad Example +(6654,5,58818,0,''), -- Bad Example +(6655,5,58818,0,''), -- Bad Example +(6656,5,58818,0,''), -- Bad Example +(6657,5,58818,0,''), -- Bad Example +(6659,5,58818,0,''), -- Hail To The King, Baby +(10391,5,58818,0,''), -- Home Alone +(12398,5,58818,0,''); -- Daily Chores + +UPDATE `creature_template` SET `speed_walk`=1,`speed_run`=1.14286,`faction_A`=35,`faction_H`=35,`unit_flags`=`unit_flags`|768,`dynamicflags`=0,`npcflag`=`npcflag`|3,`baseattacktime`=2000,`scale`=1 WHERE `entry` IN (14305,14444,22817,22818,33532,33533); + +DELETE FROM `creature_template_addon` WHERE `entry` IN (14305,14444,22817,22818,33532,33533); +INSERT INTO `creature_template_addon` (`entry`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES +(14305,0,0,0,1,0,'58818'), +(14444,0,0,0,1,0,'58818'), +(22817,0,0,0,1,0,'58818'), +(22818,0,0,0,1,0,'58818'), +(33532,0,0,0,1,0,'58818'), +(33533,0,0,0,1,0,'58818'); diff --git a/src/server/scripts/World/achievement_scripts.cpp b/src/server/scripts/World/achievement_scripts.cpp index f936c9a9993..ed4f404d9be 100755 --- a/src/server/scripts/World/achievement_scripts.cpp +++ b/src/server/scripts/World/achievement_scripts.cpp @@ -22,25 +22,6 @@ #include "BattlegroundIC.h" #include "BattlegroundSA.h" -class achievement_has_orphan_out : public AchievementCriteriaScript -{ - public: - achievement_has_orphan_out() : AchievementCriteriaScript("achievement_has_orphan_out") { } - - static uint32 const OrphanEntries[6]; - bool OnCheck(Player* source, Unit* /*target*/) - { - uint32 currentPet = GUID_ENPART(source->GetCritterGUID()); - for (uint8 i = 0; i < 6; ++i) - if (currentPet == OrphanEntries[i]) - return true; - - return false; - } -}; - -uint32 const achievement_has_orphan_out::OrphanEntries[6] = {14305, 14444, 22818, 22817, 33533, 33532}; - class achievement_storm_glory : public AchievementCriteriaScript { public: @@ -188,7 +169,6 @@ class achievement_bg_sa_artillery : public AchievementCriteriaScript void AddSC_achievement_scripts() { - new achievement_has_orphan_out(); new achievement_storm_glory(); new achievement_resilient_victory(); new achievement_bg_control_all_nodes(); |