From 64e21f76bb2fd210783d4696e3d2414106f82503 Mon Sep 17 00:00:00 2001 From: PKX Date: Sun, 27 Nov 2011 18:49:39 +0100 Subject: Correction to previous commit 61866831caca9f2c980e518bf6b0b8b8691ad151 Closes #4100 --- sql/updates/world/2011_11_27_01_world_spell_script.sql | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 sql/updates/world/2011_11_27_01_world_spell_script.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2011_11_27_01_world_spell_script.sql b/sql/updates/world/2011_11_27_01_world_spell_script.sql new file mode 100644 index 00000000000..933566c5f99 --- /dev/null +++ b/sql/updates/world/2011_11_27_01_world_spell_script.sql @@ -0,0 +1,4 @@ +DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_gen_damage_reduction_aura' AND `spell_id`=50720; +DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_warr_vigilance'; +INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES +(50720,'spell_warr_vigilance'); -- Vigilance \ No newline at end of file -- cgit v1.2.3 From 5a4dfbf300bdd27f928e73437eebd71773f30426 Mon Sep 17 00:00:00 2001 From: horn Date: Mon, 28 Nov 2011 00:47:18 +0100 Subject: Core/Achievements: Some achievements can now be obtained in random chosen battlegrounds too (not only in specific battlegrounds). Removed unneeded script for Storm Glory achievement. Signed-off-by: horn --- ...11_11_28_00_world_achievement_criteria_data.sql | 3 ++ src/server/scripts/World/achievement_scripts.cpp | 32 ++++++---------------- 2 files changed, 11 insertions(+), 24 deletions(-) create mode 100644 sql/updates/world/2011_11_28_00_world_achievement_criteria_data.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2011_11_28_00_world_achievement_criteria_data.sql b/sql/updates/world/2011_11_28_00_world_achievement_criteria_data.sql new file mode 100644 index 00000000000..9fea807a97c --- /dev/null +++ b/sql/updates/world/2011_11_28_00_world_achievement_criteria_data.sql @@ -0,0 +1,3 @@ +DELETE FROM achievement_criteria_data WHERE criteria_id = 3693; +INSERT INTO achievement_criteria_data VALUES +(3693, 11, 0, 0, 'achievement_bg_control_all_nodes'); diff --git a/src/server/scripts/World/achievement_scripts.cpp b/src/server/scripts/World/achievement_scripts.cpp index 2dbbd949526..29cb6c082a2 100755 --- a/src/server/scripts/World/achievement_scripts.cpp +++ b/src/server/scripts/World/achievement_scripts.cpp @@ -24,24 +24,6 @@ #include "BattlegroundAV.h" #include "Vehicle.h" -class achievement_storm_glory : public AchievementCriteriaScript -{ - public: - achievement_storm_glory() : AchievementCriteriaScript("achievement_storm_glory") { } - - bool OnCheck(Player* source, Unit* /*target*/) - { - if (source->GetBattlegroundTypeId() != BATTLEGROUND_EY) - return false; - - Battleground* pEotS = source->GetBattleground(); - if (!pEotS) - return false; - - return pEotS->IsAllNodesConrolledByTeam(source->GetTeam()); - } -}; - class achievement_resilient_victory : public AchievementCriteriaScript { public: @@ -93,11 +75,14 @@ class achievement_save_the_day : public AchievementCriteriaScript if (Player const* player = target->ToPlayer()) { - if (source->GetBattlegroundTypeId() != BATTLEGROUND_WS || !source->GetBattleground()) + Battleground* bg = source->GetBattleground(); + if (!bg) + return false; + + if (bg->GetTypeID(true) != BATTLEGROUND_WS) return false; - BattlegroundWS* pWSG = static_cast(source->GetBattleground()); - if (pWSG->GetFlagState(player->GetTeam()) == BG_WS_FLAG_STATE_ON_BASE) + if (static_cast(bg)->GetFlagState(player->GetTeam()) == BG_WS_FLAG_STATE_ON_BASE) return true; } return false; @@ -219,7 +204,7 @@ class achievement_everything_counts : public AchievementCriteriaScript if (!bg) return false; - if (source->GetBattlegroundTypeId() != BATTLEGROUND_AV) + if (bg->GetTypeID(true) != BATTLEGROUND_AV) return false; if (static_cast(bg)->IsBothMinesControlledByTeam(source->GetTeam())) @@ -240,7 +225,7 @@ class achievement_bg_av_perfection : public AchievementCriteriaScript if (!bg) return false; - if (source->GetBattlegroundTypeId() != BATTLEGROUND_AV) + if (bg->GetTypeID(true) != BATTLEGROUND_AV) return false; if (static_cast(bg)->IsAllTowersControlledAndCaptainAlive(source->GetTeam())) @@ -302,7 +287,6 @@ class achievement_bg_sa_defense_of_ancients : public AchievementCriteriaScript void AddSC_achievement_scripts() { - new achievement_storm_glory(); new achievement_resilient_victory(); new achievement_bg_control_all_nodes(); new achievement_save_the_day(); -- cgit v1.2.3 From 5ea9931f75ce5a64a2920ab4a763e9f06fe35151 Mon Sep 17 00:00:00 2001 From: tobmaps Date: Tue, 29 Nov 2011 19:41:19 +0700 Subject: SQL: File namings after recent pull --- sql/updates/world/2011_11_27_01_world_spell_script.sql | 4 ---- sql/updates/world/2011_11_29_00_world_spell_script.sql | 4 ++++ 2 files changed, 4 insertions(+), 4 deletions(-) delete mode 100644 sql/updates/world/2011_11_27_01_world_spell_script.sql create mode 100644 sql/updates/world/2011_11_29_00_world_spell_script.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2011_11_27_01_world_spell_script.sql b/sql/updates/world/2011_11_27_01_world_spell_script.sql deleted file mode 100644 index 933566c5f99..00000000000 --- a/sql/updates/world/2011_11_27_01_world_spell_script.sql +++ /dev/null @@ -1,4 +0,0 @@ -DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_gen_damage_reduction_aura' AND `spell_id`=50720; -DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_warr_vigilance'; -INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES -(50720,'spell_warr_vigilance'); -- Vigilance \ No newline at end of file diff --git a/sql/updates/world/2011_11_29_00_world_spell_script.sql b/sql/updates/world/2011_11_29_00_world_spell_script.sql new file mode 100644 index 00000000000..ff87ebff788 --- /dev/null +++ b/sql/updates/world/2011_11_29_00_world_spell_script.sql @@ -0,0 +1,4 @@ +DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_gen_damage_reduction_aura' AND `spell_id`=50720; +DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_warr_vigilance'; +INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES +(50720,'spell_warr_vigilance'); -- Vigilance -- cgit v1.2.3 From 978f31bad6d9958d761c683f03a34ff0bf59dd00 Mon Sep 17 00:00:00 2001 From: Nay Date: Sat, 3 Dec 2011 21:43:12 +0000 Subject: DB/Quests: Re-fix 24559/24461; spawn needed GOs at correct places Ref #836 --- sql/updates/world/2011_12_03_00_world_gameobject.sql | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 sql/updates/world/2011_12_03_00_world_gameobject.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2011_12_03_00_world_gameobject.sql b/sql/updates/world/2011_12_03_00_world_gameobject.sql new file mode 100644 index 00000000000..5707ee28d12 --- /dev/null +++ b/sql/updates/world/2011_12_03_00_world_gameobject.sql @@ -0,0 +1,4 @@ +DELETE FROM `gameobject` WHERE `guid` IN (207,215) AND `id`=300245; -- TEMP Forgemaster''s Anvil +INSERT INTO `gameobject` (`guid`, `id`, `map`, `spawnMask`, `phaseMask`, `position_x`, `position_y`, `position_z`, `orientation`, `rotation0`, `rotation1`, `rotation2`, `rotation3`, `spawntimesecs`, `animprogress`, `state`) VALUES +(207, 300245, 658, 3, 1, 637.954, -209.544, 533.269, 3.53903, 0, 0, 0.980321, -0.197413, 300, 0, 1), +(215, 300245, 658, 3, 1, 726.268, -237.654, 534.13, 5.5732, 0, 0, 0.347582, -0.93765, 300, 0, 1); -- cgit v1.2.3