feat(Core): improved some hooks (#6302)

This commit is contained in:
Yehonal
2021-06-13 10:23:24 +02:00
committed by GitHub
parent 806dc4052f
commit baf437bb98
43 changed files with 162 additions and 93 deletions

View File

@@ -19,7 +19,7 @@ class achievement_resilient_victory : public AchievementCriteriaScript
public:
achievement_resilient_victory() : AchievementCriteriaScript("achievement_resilient_victory") { }
bool OnCheck(Player* source, Unit* /*target*/) override
bool OnCheck(Player* source, Unit* /*target*/, uint32 /*criteria_id*/) override
{
Battleground* bg = source->GetBattleground();
return bg && bg->GetBgTypeID(true) == BATTLEGROUND_AB && bg->ToBattlegroundAB()->IsTeamScores500Disadvantage(source->GetTeamId());
@@ -31,7 +31,7 @@ class achievement_bg_control_all_nodes : public AchievementCriteriaScript
public:
achievement_bg_control_all_nodes() : AchievementCriteriaScript("achievement_bg_control_all_nodes") { }
bool OnCheck(Player* source, Unit* /*target*/) override
bool OnCheck(Player* source, Unit* /*target*/, uint32 /*criteria_id*/) override
{
Battleground* bg = source->GetBattleground();
return bg && bg->AllNodesConrolledByTeam(source->GetTeamId());
@@ -43,7 +43,7 @@ class achievement_save_the_day : public AchievementCriteriaScript
public:
achievement_save_the_day() : AchievementCriteriaScript("achievement_save_the_day") { }
bool OnCheck(Player* source, Unit* target) override
bool OnCheck(Player* source, Unit* target, uint32 /*criteria_id*/) override
{
if (!target)
return false;
@@ -62,7 +62,7 @@ class achievement_bg_ic_resource_glut : public AchievementCriteriaScript
public:
achievement_bg_ic_resource_glut() : AchievementCriteriaScript("achievement_bg_ic_resource_glut") { }
bool OnCheck(Player* source, Unit* /*target*/) override
bool OnCheck(Player* source, Unit* /*target*/, uint32 /*criteria_id*/) override
{
Battleground* bg = source->GetBattleground();
return bg && bg->GetBgTypeID(true) == BATTLEGROUND_IC && bg->ToBattlegroundIC()->IsResourceGlutAllowed(source->GetTeamId());
@@ -74,7 +74,7 @@ class achievement_bg_ic_glaive_grave : public AchievementCriteriaScript
public:
achievement_bg_ic_glaive_grave() : AchievementCriteriaScript("achievement_bg_ic_glaive_grave") { }
bool OnCheck(Player* source, Unit* /*target*/) override
bool OnCheck(Player* source, Unit* /*target*/, uint32 /*criteria_id*/) override
{
if (Creature* vehicle = source->GetVehicleCreatureBase())
return vehicle->GetEntry() == NPC_GLAIVE_THROWER_H || vehicle->GetEntry() == NPC_GLAIVE_THROWER_A;
@@ -88,7 +88,7 @@ class achievement_bg_ic_mowed_down : public AchievementCriteriaScript
public:
achievement_bg_ic_mowed_down() : AchievementCriteriaScript("achievement_bg_ic_mowed_down") { }
bool OnCheck(Player* source, Unit* /*target*/) override
bool OnCheck(Player* source, Unit* /*target*/, uint32 /*criteria_id*/) override
{
if (Creature* vehicle = source->GetVehicleCreatureBase())
return vehicle->GetEntry() == NPC_KEEP_CANNON;
@@ -102,7 +102,7 @@ class achievement_bg_sa_artillery : public AchievementCriteriaScript
public:
achievement_bg_sa_artillery() : AchievementCriteriaScript("achievement_bg_sa_artillery") { }
bool OnCheck(Player* source, Unit* /*target*/) override
bool OnCheck(Player* source, Unit* /*target*/, uint32 /*criteria_id*/) override
{
if (Creature* vehicle = source->GetVehicleCreatureBase())
return vehicle->GetEntry() == NPC_ANTI_PERSONNAL_CANNON;
@@ -119,7 +119,7 @@ public:
{
}
bool OnCheck(Player* source, Unit* /*target*/) override
bool OnCheck(Player* source, Unit* /*target*/, uint32 /*criteria_id*/) override
{
return source->InArena() && source->GetBattleground()->GetArenaType() == _arenaType;
}
@@ -133,7 +133,7 @@ class achievement_sickly_gazelle : public AchievementCriteriaScript
public:
achievement_sickly_gazelle() : AchievementCriteriaScript("achievement_sickly_gazelle") { }
bool OnCheck(Player* /*source*/, Unit* target) override
bool OnCheck(Player* /*source*/, Unit* target, uint32 /*criteria_id*/) override
{
if (!target)
return false;
@@ -151,7 +151,7 @@ class achievement_everything_counts : public AchievementCriteriaScript
public:
achievement_everything_counts() : AchievementCriteriaScript("achievement_everything_counts") { }
bool OnCheck(Player* source, Unit* /*target*/) override
bool OnCheck(Player* source, Unit* /*target*/, uint32 /*criteria_id*/) override
{
Battleground* bg = source->GetBattleground();
return bg && bg->GetBgTypeID(true) == BATTLEGROUND_AV && bg->ToBattlegroundAV()->IsBothMinesControlledByTeam(source->GetTeamId());
@@ -163,7 +163,7 @@ class achievement_bg_av_perfection : public AchievementCriteriaScript
public:
achievement_bg_av_perfection() : AchievementCriteriaScript("achievement_bg_av_perfection") { }
bool OnCheck(Player* source, Unit* /*target*/) override
bool OnCheck(Player* source, Unit* /*target*/, uint32 /*criteria_id*/) override
{
Battleground* bg = source->GetBattleground();
return bg && bg->GetBgTypeID(true) == BATTLEGROUND_AV && bg->ToBattlegroundAV()->IsAllTowersControlledAndCaptainAlive(source->GetTeamId());
@@ -175,7 +175,7 @@ class achievement_sa_defense_of_the_ancients : public AchievementCriteriaScript
public:
achievement_sa_defense_of_the_ancients() : AchievementCriteriaScript("achievement_sa_defense_of_the_ancients") { }
bool OnCheck(Player* source, Unit* /*target*/) override
bool OnCheck(Player* source, Unit* /*target*/, uint32 /*criteria_id*/) override
{
Battleground* bg = source->GetBattleground();
return bg && bg->GetBgTypeID(true) == BATTLEGROUND_SA && bg->ToBattlegroundSA()->AllowDefenseOfTheAncients(source);
@@ -197,7 +197,7 @@ class achievement_tilted : public AchievementCriteriaScript
public:
achievement_tilted() : AchievementCriteriaScript("achievement_tilted") {}
bool OnCheck(Player* player, Unit* /*target*/) override
bool OnCheck(Player* player, Unit* /*target*/, uint32 /*criteria_id*/) override
{
if (!player)
return false;
@@ -219,7 +219,7 @@ class achievement_not_even_a_scratch : public AchievementCriteriaScript
public:
achievement_not_even_a_scratch() : AchievementCriteriaScript("achievement_not_even_a_scratch") { }
bool OnCheck(Player* source, Unit* /*target*/) override
bool OnCheck(Player* source, Unit* /*target*/, uint32 /*criteria_id*/) override
{
if (!source)
return false;
@@ -234,7 +234,7 @@ class achievement_killed_exp_or_honor_target : public AchievementCriteriaScript
public:
achievement_killed_exp_or_honor_target() : AchievementCriteriaScript("achievement_killed_exp_or_honor_target") { }
bool OnCheck(Player* player, Unit* target) override
bool OnCheck(Player* player, Unit* target, uint32 /*criteria_id*/) override
{
return target && player->isHonorOrXPTarget(target);
}