mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-14 16:37:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[8002] Implemented ACHIEVEMENT_CRITERIA_DATA_TYPE S_DRUNK and fixed typos in ACHIEVEMENT_CRITERIA_DATA_TYPE_T_TEAM

Browse source 
(cherry picked from commit c2f9c7a0b46fb3544930666110e240256361cd4a)

Signed-off-by: VladimirMangos <vladimir@getmangos.com>
This commit is contained in:
Dyddye 2009-06-13 17:40:29 +04:00 • committed by VladimirMangos
parent cf7482e0c8
commit d1c96855cb
4 changed files with 21 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/game/AchievementMgr.cpp
View file

@ -207,7 +207,15 @@ bool AchievementCriteriaData::IsValid(AchievementCriteriaEntry const* criteria)
if(team.team != ALLIANCE && team.team != HORDE)
{
sLog.outErrorDb( "Table `achievement_criteria_data` (Entry: %u Type: %u) for data type ACHIEVEMENT_CRITERIA_DATA_TYPE_T_TEAM (%u) have unknown team in value1 (%u), ignore.",
criteria->ID, criteria->requiredType,dataType,gender.gender);
criteria->ID, criteria->requiredType,dataType,team.team);
return false;
}
return true;
case ACHIEVEMENT_CRITERIA_DATA_TYPE_S_DRUNK:
if(drunk.state >= MAX_DRUNKEN)
{
sLog.outErrorDb( "Table `achievement_criteria_data` (Entry: %u Type: %u) for data type ACHIEVEMENT_CRITERIA_DATA_TYPE_S_DRUNK (%u) have unknown drunken state in value1 (%u), ignore.",
criteria->ID, criteria->requiredType,dataType,drunk.state);
return false;
}
return true;
@ -275,6 +283,8 @@ bool AchievementCriteriaData::Meets(Player const* source, Unit const* target, ui
if (!target || target->GetTypeId() != TYPEID_PLAYER)
return false;
return ((Player*)target)->GetTeam() == team.team;
case ACHIEVEMENT_CRITERIA_DATA_TYPE_S_DRUNK:
return Player::GetDrunkenstateByValue(source->GetDrunkValue()) >= drunk.state;
}
return false;
}