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

[11946] Add commits for death in statistics, fix some engrish

Browse source 
Signed-off-by: Schmoozerd <schmoozerd@scriptdev2.com>
This commit is contained in:
Schmoozerd 2012-04-10 20:07:56 +02:00
parent 43dd16ff60
commit 78b0ffe4eb
2 changed files with 15 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/game/AchievementMgr.cpp
View file

@ -593,7 +593,7 @@ void AchievementMgr::LoadFromDB(QueryResult *achievementResult, QueryResult *cri
} }
} }
// check intergiry with max allowed counter value // check integrity with max allowed counter value
if (uint32 maxcounter = GetCriteriaProgressMaxCounter(criteria, achievement)) if (uint32 maxcounter = GetCriteriaProgressMaxCounter(criteria, achievement))
{ {
if (progress.counter > maxcounter) if (progress.counter > maxcounter)
@ -678,14 +678,16 @@ void AchievementMgr::CheckAllAchievementCriteria()
} }
static const uint32 achievIdByArenaSlot[MAX_ARENA_SLOT] = { 1057, 1107, 1108 }; static const uint32 achievIdByArenaSlot[MAX_ARENA_SLOT] = { 1057, 1107, 1108 };
static const uint32 achievIdForDangeon[][4] = static const uint32 achievIdForDungeon[][4] =
{ {
// ach_cr_id,is_dungeon,is_raid,is_heroic_dungeon // ach_cr_id,is_dungeon,is_raid,is_heroic_dungeon
{ 321, true, true, true }, { 321, true, true, true }, // Total raid and dungeon deaths
{ 916, false, true, false }, //323 // Total deaths to Lich King 10-player raid bosses
{ 917, false, true, false }, //324 // Total deaths to Lich King 25-player raid bosses
{ 918, true, false, false }, { 916, false, true, false }, // Total deaths in 25-player raids
{ 2219, false, false, true }, { 917, false, true, false }, // Total deaths in 10-player raids
{ 918, true, false, false }, // Total deaths in 5-player dungeons
{ 2219, false, false, true }, // Total deaths in 5-player heroic dungeons
{ 0, false, false, false } { 0, false, false, false }
}; };
@ -1091,26 +1093,26 @@ void AchievementMgr::UpdateAchievementCriteria(AchievementCriteriaTypes type, ui
// search case // search case
bool found = false; bool found = false;
for(int j = 0; achievIdForDangeon[j][0]; ++j) for(int j = 0; achievIdForDungeon[j][0]; ++j)
{ {
if(achievIdForDangeon[j][0] == achievement->ID) if(achievIdForDungeon[j][0] == achievement->ID)
{ {
if(map->IsRaid()) if(map->IsRaid())
{ {
// if raid accepted (ignore difficulty) // if raid accepted (ignore difficulty)
if(!achievIdForDangeon[j][2]) if(!achievIdForDungeon[j][2])
break; // for break; // for
} }
else if(GetPlayer()->GetDungeonDifficulty()==DUNGEON_DIFFICULTY_NORMAL) else if(GetPlayer()->GetDungeonDifficulty()==DUNGEON_DIFFICULTY_NORMAL)
{ {
// dungeon in normal mode accepted // dungeon in normal mode accepted
if(!achievIdForDangeon[j][1]) if(!achievIdForDungeon[j][1])
break; // for break; // for
} }
else else
{ {
// dungeon in heroic mode accepted // dungeon in heroic mode accepted
if(!achievIdForDangeon[j][3]) if(!achievIdForDungeon[j][3])
break; // for break; // for
} }

2
src/shared/revision_nr.h
View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__ #ifndef __REVISION_NR_H__
#define __REVISION_NR_H__ #define __REVISION_NR_H__
#define REVISION_NR "11945" #define REVISION_NR "11946"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__