Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-21 09:44:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4124 from horn/master

Browse Source 
Core/Achievements: Fixed gaining of some battleground achievements
This commit is contained in:
Shocker
2011-11-28 13:32:40 -08:00
parent 5b034ee631 5a4dfbf300
commit e9df08a7c2
2 changed files with 11 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sql/updates/world/2011_11_28_00_world_achievement_criteria_data.sql Normal file
View File

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

32
src/server/scripts/World/achievement_scripts.cpp
View File

@@ -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;
BattlegroundWS* pWSG = static_cast<BattlegroundWS*>(source->GetBattleground());
if (pWSG->GetFlagState(player->GetTeam()) == BG_WS_FLAG_STATE_ON_BASE)
if (bg->GetTypeID(true) != BATTLEGROUND_WS)
return false;
if (static_cast<BattlegroundWS*>(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<BattlegroundAV*>(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<BattlegroundAV*>(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();