From 8a7cef6f64a96c8753fc68f680b119fc5d6f06fd Mon Sep 17 00:00:00 2001 From: Yehonal Date: Fri, 3 Nov 2017 11:20:00 +0000 Subject: [PATCH] Fixed arena statistics by type --- .../rev_1509353420962391661.sql | 38 +++++++++++++++++++ src/scripts/World/achievement_scripts.cpp | 11 +++--- 2 files changed, 43 insertions(+), 6 deletions(-) create mode 100644 data/sql/updates/pending_db_world/rev_1509353420962391661.sql diff --git a/data/sql/updates/pending_db_world/rev_1509353420962391661.sql b/data/sql/updates/pending_db_world/rev_1509353420962391661.sql new file mode 100644 index 000000000..703e3243f --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1509353420962391661.sql @@ -0,0 +1,38 @@ +INSERT INTO version_db_world (`sql_rev`) VALUES ('1509353420962391661'); + +-- change script name to arena kills by type +UPDATE achievement_criteria_data SET ScriptName="achievement_arena_2v2_check" WHERE criteria_id = 5541 AND TYPE = 11; +UPDATE achievement_criteria_data SET ScriptName="achievement_arena_3v3_check" WHERE criteria_id = 5542 AND TYPE = 11; +UPDATE achievement_criteria_data SET ScriptName="achievement_arena_5v5_check" WHERE criteria_id = 5543 AND TYPE = 11; + +-- arena matches by type +INSERT INTO achievement_criteria_data (criteria_id,TYPE,ScriptName) VALUES (5728,11,'achievement_arena_2v2_check'); +INSERT INTO achievement_criteria_data (criteria_id,TYPE,ScriptName) VALUES (8615,11,'achievement_arena_2v2_check'); +INSERT INTO achievement_criteria_data (criteria_id,TYPE,ScriptName) VALUES (8616,11,'achievement_arena_2v2_check'); +INSERT INTO achievement_criteria_data (criteria_id,TYPE,ScriptName) VALUES (8617,11,'achievement_arena_2v2_check'); +INSERT INTO achievement_criteria_data (criteria_id,TYPE,ScriptName) VALUES (8618,11,'achievement_arena_2v2_check'); +INSERT INTO achievement_criteria_data (criteria_id,TYPE,ScriptName) VALUES (5725,11,'achievement_arena_2v2_check'); +INSERT INTO achievement_criteria_data (criteria_id,TYPE,ScriptName) VALUES (8611,11,'achievement_arena_2v2_check'); +INSERT INTO achievement_criteria_data (criteria_id,TYPE,ScriptName) VALUES (8612,11,'achievement_arena_2v2_check'); +INSERT INTO achievement_criteria_data (criteria_id,TYPE,ScriptName) VALUES (8613,11,'achievement_arena_2v2_check'); +INSERT INTO achievement_criteria_data (criteria_id,TYPE,ScriptName) VALUES (8614,11,'achievement_arena_2v2_check'); +INSERT INTO achievement_criteria_data (criteria_id,TYPE,ScriptName) VALUES (5727,11,'achievement_arena_3v3_check'); +INSERT INTO achievement_criteria_data (criteria_id,TYPE,ScriptName) VALUES (8607,11,'achievement_arena_3v3_check'); +INSERT INTO achievement_criteria_data (criteria_id,TYPE,ScriptName) VALUES (8608,11,'achievement_arena_3v3_check'); +INSERT INTO achievement_criteria_data (criteria_id,TYPE,ScriptName) VALUES (8609,11,'achievement_arena_3v3_check'); +INSERT INTO achievement_criteria_data (criteria_id,TYPE,ScriptName) VALUES (8610,11,'achievement_arena_3v3_check'); +INSERT INTO achievement_criteria_data (criteria_id,TYPE,ScriptName) VALUES (5724,11,'achievement_arena_3v3_check'); +INSERT INTO achievement_criteria_data (criteria_id,TYPE,ScriptName) VALUES (8603,11,'achievement_arena_3v3_check'); +INSERT INTO achievement_criteria_data (criteria_id,TYPE,ScriptName) VALUES (8604,11,'achievement_arena_3v3_check'); +INSERT INTO achievement_criteria_data (criteria_id,TYPE,ScriptName) VALUES (8605,11,'achievement_arena_3v3_check'); +INSERT INTO achievement_criteria_data (criteria_id,TYPE,ScriptName) VALUES (8606,11,'achievement_arena_3v3_check'); +INSERT INTO achievement_criteria_data (criteria_id,TYPE,ScriptName) VALUES (5726,11,'achievement_arena_5v5_check'); +INSERT INTO achievement_criteria_data (criteria_id,TYPE,ScriptName) VALUES (8599,11,'achievement_arena_5v5_check'); +INSERT INTO achievement_criteria_data (criteria_id,TYPE,ScriptName) VALUES (8600,11,'achievement_arena_5v5_check'); +INSERT INTO achievement_criteria_data (criteria_id,TYPE,ScriptName) VALUES (8601,11,'achievement_arena_5v5_check'); +INSERT INTO achievement_criteria_data (criteria_id,TYPE,ScriptName) VALUES (8602,11,'achievement_arena_5v5_check'); +INSERT INTO achievement_criteria_data (criteria_id,TYPE,ScriptName) VALUES (5723,11,'achievement_arena_5v5_check'); +INSERT INTO achievement_criteria_data (criteria_id,TYPE,ScriptName) VALUES (8595,11,'achievement_arena_5v5_check'); +INSERT INTO achievement_criteria_data (criteria_id,TYPE,ScriptName) VALUES (8596,11,'achievement_arena_5v5_check'); +INSERT INTO achievement_criteria_data (criteria_id,TYPE,ScriptName) VALUES (8597,11,'achievement_arena_5v5_check'); +INSERT INTO achievement_criteria_data (criteria_id,TYPE,ScriptName) VALUES (8598,11,'achievement_arena_5v5_check'); diff --git a/src/scripts/World/achievement_scripts.cpp b/src/scripts/World/achievement_scripts.cpp index a0a9f893b..95c4db480 100644 --- a/src/scripts/World/achievement_scripts.cpp +++ b/src/scripts/World/achievement_scripts.cpp @@ -112,10 +112,10 @@ class achievement_bg_sa_artillery : public AchievementCriteriaScript } }; -class achievement_arena_kills : public AchievementCriteriaScript +class achievement_arena_by_type : public AchievementCriteriaScript { public: - achievement_arena_kills(char const* name, uint8 arenaType) : AchievementCriteriaScript(name), + achievement_arena_by_type(char const* name, uint8 arenaType) : AchievementCriteriaScript(name), _arenaType(arenaType) { } @@ -129,7 +129,6 @@ class achievement_arena_kills : public AchievementCriteriaScript uint8 const _arenaType; }; - class achievement_sickly_gazelle : public AchievementCriteriaScript { public: @@ -254,9 +253,9 @@ void AddSC_achievement_scripts() new achievement_sickly_gazelle(); new achievement_everything_counts(); new achievement_bg_av_perfection(); - new achievement_arena_kills("achievement_arena_2v2_kills", ARENA_TYPE_2v2); - new achievement_arena_kills("achievement_arena_3v3_kills", ARENA_TYPE_3v3); - new achievement_arena_kills("achievement_arena_5v5_kills", ARENA_TYPE_5v5); + new achievement_arena_by_type("achievement_arena_2v2_check", ARENA_TYPE_2v2); + new achievement_arena_by_type("achievement_arena_3v3_check", ARENA_TYPE_3v3); + new achievement_arena_by_type("achievement_arena_5v5_check", ARENA_TYPE_5v5); new achievement_sa_defense_of_the_ancients(); new achievement_tilted(); new achievement_not_even_a_scratch();