Merge branch 'master' of https://github.com/azerothcore/azerothcore-wotlk into dir-restructure

This commit is contained in:
Yehonal
2017-12-21 11:26:43 +01:00
445 changed files with 49192 additions and 15431 deletions

View File

@@ -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();