Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

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

Signed-off-by: Schmoozerd <schmoozerd@scriptdev2.com>
  • Loading branch information...
commit c9f82b59dbf154e56f29213d6cdcbf70fc725698 1 parent 94d5afa
Schmoozerd Schmoozerd authored

Showing 2 changed files with 15 additions and 13 deletions. Show diff stats Hide diff stats

  1. +14 12 src/game/AchievementMgr.cpp
  2. +1 1  src/shared/revision_nr.h
26 src/game/AchievementMgr.cpp
@@ -593,7 +593,7 @@ void AchievementMgr::LoadFromDB(QueryResult *achievementResult, QueryResult *cri
593 593 }
594 594 }
595 595
596   - // check intergiry with max allowed counter value
  596 + // check integrity with max allowed counter value
597 597 if (uint32 maxcounter = GetCriteriaProgressMaxCounter(criteria, achievement))
598 598 {
599 599 if (progress.counter > maxcounter)
@@ -678,14 +678,16 @@ void AchievementMgr::CheckAllAchievementCriteria()
678 678 }
679 679
680 680 static const uint32 achievIdByArenaSlot[MAX_ARENA_SLOT] = { 1057, 1107, 1108 };
681   -static const uint32 achievIdForDangeon[][4] =
  681 +static const uint32 achievIdForDungeon[][4] =
682 682 {
683 683 // ach_cr_id,is_dungeon,is_raid,is_heroic_dungeon
684   - { 321, true, true, true },
685   - { 916, false, true, false },
686   - { 917, false, true, false },
687   - { 918, true, false, false },
688   - { 2219, false, false, true },
  684 + { 321, true, true, true }, // Total raid and dungeon deaths
  685 + //323 // Total deaths to Lich King 10-player raid bosses
  686 + //324 // Total deaths to Lich King 25-player raid bosses
  687 + { 916, false, true, false }, // Total deaths in 25-player raids
  688 + { 917, false, true, false }, // Total deaths in 10-player raids
  689 + { 918, true, false, false }, // Total deaths in 5-player dungeons
  690 + { 2219, false, false, true }, // Total deaths in 5-player heroic dungeons
689 691 { 0, false, false, false }
690 692 };
691 693
@@ -1091,26 +1093,26 @@ void AchievementMgr::UpdateAchievementCriteria(AchievementCriteriaTypes type, ui
1091 1093
1092 1094 // search case
1093 1095 bool found = false;
1094   - for(int j = 0; achievIdForDangeon[j][0]; ++j)
  1096 + for(int j = 0; achievIdForDungeon[j][0]; ++j)
1095 1097 {
1096   - if(achievIdForDangeon[j][0] == achievement->ID)
  1098 + if(achievIdForDungeon[j][0] == achievement->ID)
1097 1099 {
1098 1100 if(map->IsRaid())
1099 1101 {
1100 1102 // if raid accepted (ignore difficulty)
1101   - if(!achievIdForDangeon[j][2])
  1103 + if(!achievIdForDungeon[j][2])
1102 1104 break; // for
1103 1105 }
1104 1106 else if(GetPlayer()->GetDungeonDifficulty()==DUNGEON_DIFFICULTY_NORMAL)
1105 1107 {
1106 1108 // dungeon in normal mode accepted
1107   - if(!achievIdForDangeon[j][1])
  1109 + if(!achievIdForDungeon[j][1])
1108 1110 break; // for
1109 1111 }
1110 1112 else
1111 1113 {
1112 1114 // dungeon in heroic mode accepted
1113   - if(!achievIdForDangeon[j][3])
  1115 + if(!achievIdForDungeon[j][3])
1114 1116 break; // for
1115 1117 }
1116 1118
2  src/shared/revision_nr.h
... ... @@ -1,4 +1,4 @@
1 1 #ifndef __REVISION_NR_H__
2 2 #define __REVISION_NR_H__
3   - #define REVISION_NR "11945"
  3 + #define REVISION_NR "11946"
4 4 #endif // __REVISION_NR_H__

0 comments on commit c9f82b5

Please sign in to comment.
Something went wrong with that request. Please try again.