[453] Arena patch for TC was updated.

Shadez · Jan 16, 2011 · 42df9a6 · 42df9a6
1 parent c0b599c
commit 42df9a6
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 9 deletions.
diff --git a/includes/revision_nr.php b/includes/revision_nr.php
@@ -1,5 +1,5 @@
 <?php
-define('ARMORY_REVISION', 452);
+define('ARMORY_REVISION', 453);
 define('DB_VERSION', 'armory_r434');
 define('CONFIG_VERSION', '2812201001');
 ?>
diff --git a/tools/trinity_core/wowarmory_arena_chart.patch b/tools/trinity_core/wowarmory_arena_chart.patch
@@ -1,8 +1,8 @@
 diff --git a/src/server/game/Battlegrounds/Battleground.cpp b/src/server/game/Battlegrounds/Battleground.cpp
-index 581a119..bce2e1e 100755
+index a372f08..abbc9f4 100755
 --- a/src/server/game/Battlegrounds/Battleground.cpp
 +++ b/src/server/game/Battlegrounds/Battleground.cpp
-@@ -750,6 +750,47 @@ void Battleground::EndBattleground(uint32 winner)
+@@ -772,6 +772,47 @@ void Battleground::EndBattleground(uint32 winner)
                      winner_matchmaker_rating, loser_matchmaker_rating, winner_change, loser_change);
                  SetArenaTeamRatingChangeForTeam(winner, winner_change);
                  SetArenaTeamRatingChangeForTeam(GetOtherTeam(winner), loser_change);
@@ -50,7 +50,7 @@ index 581a119..bce2e1e 100755
                  sLog->outArena("Arena match Type: %u for Team1Id: %u - Team2Id: %u ended. WinnerTeamId: %u. Winner rating: +%d, Loser rating: %d", m_ArenaType, m_ArenaTeamIds[BG_TEAM_ALLIANCE], m_ArenaTeamIds[BG_TEAM_HORDE], winner_arena_team->GetId(), winner_change, loser_change);
                  if (sWorld->getBoolConfig(CONFIG_ARENA_LOG_EXTENDED_INFO))
                      for (Battleground::BattlegroundScoreMap::const_iterator itr = GetPlayerScoresBegin(); itr != GetPlayerScoresEnd(); itr++)
-@@ -1364,6 +1405,14 @@ void Battleground::UpdatePlayerScore(Player *Source, uint32 type, uint32 value,
+@@ -1386,6 +1427,14 @@ void Battleground::UpdatePlayerScore(Player *Source, uint32 type, uint32 value,
          case SCORE_HEALING_DONE:                            // Healing Done
              itr->second->HealingDone += value;
              break;
@@ -66,15 +66,13 @@ index 581a119..bce2e1e 100755
              sLog->outError("Battleground: Unknown player score type %u", type);
              break;
 diff --git a/src/server/game/Battlegrounds/Battleground.h b/src/server/game/Battlegrounds/Battleground.h
-index 4dba8a8..1e61acc 100755
+index 2e2a452..67000cb 100755
 --- a/src/server/game/Battlegrounds/Battleground.h
 +++ b/src/server/game/Battlegrounds/Battleground.h
-@@ -208,7 +208,11 @@ enum ScoreType
-     SCORE_SECONDARY_OBJECTIVES  = 17,
+@@ -209,6 +209,10 @@ enum ScoreType
      //SOTA
      SCORE_DESTROYED_DEMOLISHER  = 18,
--    SCORE_DESTROYED_WALL        = 19
-+    SCORE_DESTROYED_WALL        = 19,
+     SCORE_DESTROYED_WALL        = 19,
 +    /** World of Warcraft Armory **/
 +    SCORE_DAMAGE_TAKEN          = 20,
 +    SCORE_HEALING_TAKEN         = 21
@@ -93,6 +91,7 @@ index 4dba8a8..1e61acc 100755
  };
 
  enum BGHonorMode
+
 diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp
 index 81b0233..1a6ccfa 100755
 --- a/src/server/game/Entities/Unit/Unit.cpp