diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundAV.cpp b/src/server/game/Battlegrounds/Zones/BattlegroundAV.cpp index d00a7cb83..21468993b 100644 --- a/src/server/game/Battlegrounds/Zones/BattlegroundAV.cpp +++ b/src/server/game/Battlegrounds/Zones/BattlegroundAV.cpp @@ -1583,7 +1583,10 @@ uint8 BattlegroundAV::GetAttackString(BG_AV_Nodes node, TeamId teamId) strId = AV_TEXT_H_HERALD_SNOWFALL_GRAVEYARD_ATTACK; break; case BG_AV_NODES_ICEBLOOD_TOWER: - strId = AV_TEXT_A_HERALD_ICEBLOOD_TOWER_ATTACK; + if (teamId == TEAM_ALLIANCE) + strId = AV_TEXT_A_HERALD_ICEBLOOD_TOWER_ATTACK; + else + strId = AV_TEXT_H_HERALD_ICEBLOOD_TOWER_ATTACK; break; case BG_AV_NODES_ICEBLOOD_GRAVE: if (teamId == TEAM_ALLIANCE) @@ -1682,7 +1685,10 @@ uint8 BattlegroundAV::GetDefendString(BG_AV_Nodes node, TeamId teamId) strId = AV_TEXT_H_HERALD_SNOWFALL_GRAVEYARD_TAKEN; break; case BG_AV_NODES_ICEBLOOD_TOWER: - strId = AV_TEXT_A_HERALD_ICEBLOOD_TOWER_TAKEN; + if (teamId == TEAM_ALLIANCE) + strId = AV_TEXT_A_HERALD_ICEBLOOD_TOWER_TAKEN; + else + strId = AV_TEXT_H_HERALD_ICEBLOOD_TOWER_TAKEN; break; case BG_AV_NODES_ICEBLOOD_GRAVE: if (teamId == TEAM_ALLIANCE) diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundAV.h b/src/server/game/Battlegrounds/Zones/BattlegroundAV.h index 57417dd1d..e1e46b9aa 100644 --- a/src/server/game/Battlegrounds/Zones/BattlegroundAV.h +++ b/src/server/game/Battlegrounds/Zones/BattlegroundAV.h @@ -1622,50 +1622,50 @@ enum BG_AV_Objectives enum BG_AV_HERALD { - AV_TEXT_A_HERALD_STORMPIKE_GRAVEYARD_TAKEN = 1, - AV_TEXT_A_HERALD_STORMPIKE_GRAVEYARD_ATTACK = 2, - AV_TEXT_H_HERALD_STORMPIKE_GRAVEYARD_TAKEN = 3, - AV_TEXT_H_HERALD_STORMPIKE_GRAVEYARD_ATTACK = 4, - AV_TEXT_A_HERALD_SNOWFALL_GRAVEYARD_TAKEN = 5, - AV_TEXT_A_HERALD_SNOWFALL_GRAVEYARD_ATTACK = 6, - AV_TEXT_H_HERALD_SNOWFALL_GRAVEYARD_TAKEN = 7, - AV_TEXT_H_HERALD_SNOWFALL_GRAVEYARD_ATTACK = 8, - AV_TEXT_A_HERALD_FROSTWOLF_GRAVEYARD_TAKEN = 9, - AV_TEXT_A_HERALD_FROSTWOLF_GRAVEYARD_ATTACK = 10, - AV_TEXT_H_HERALD_FROSTWOLF_GRAVEYARD_TAKEN = 11, - AV_TEXT_H_HERALD_FROSTWOLF_GRAVEYARD_ATTACK = 12, - AV_TEXT_H_HERALD_DUN_BALDAR_SOUTH_ATTACK = 13, - AV_TEXT_H_HERALD_DUN_BALDAR_SOUTH_TAKEN = 14, - AV_TEXT_A_HERALD_DUN_BALDAR_SOUTH_ATTACK = 15, - AV_TEXT_A_HERALD_DUN_BALDAR_SOUTH_TAKEN = 16, - AV_TEXT_H_HERALD_DUN_BALDAR_NORTH_ATTACK = 17, - AV_TEXT_H_HERALD_DUN_BALDAR_NORTH_TAKEN = 18, - AV_TEXT_A_HERALD_DUN_BALDAR_NORTH_ATTACK = 19, - AV_TEXT_A_HERALD_DUN_BALDAR_NORTH_TAKEN = 20, - AV_TEXT_H_HERALD_ICEWING_BUNKER_ATTACK = 21, - AV_TEXT_H_HERALD_ICEWING_BUNKER_TAKEN = 22, - AV_TEXT_A_HERALD_ICEWING_BUNKER_ATTACK = 23, - AV_TEXT_A_HERALD_ICEWING_BUNKER_TAKEN = 24, - AV_TEXT_H_HERALD_STONEHEARTH_BUNKER_ATTACK = 25, - AV_TEXT_H_HERALD_STONEHEARTH_BUNKER_TAKEN = 26, - AV_TEXT_A_HERALD_STONEHEARTH_BUNKER_ATTACK = 27, - AV_TEXT_A_HERALD_STONEHEARTH_BUNKER_TAKEN = 28, - AV_TEXT_H_HERALD_WEST_FROSTWOLF_TOWER_ATTACK = 29, - AV_TEXT_H_HERALD_WEST_FROSTWOLF_TOWER_TAKEN = 30, - AV_TEXT_A_HERALD_WEST_FROSTWOLF_TOWER_ATTACK = 31, - AV_TEXT_A_HERALD_WEST_FROSTWOLF_TOWER_TAKEN = 32, - AV_TEXT_H_HERALD_EAST_FROSTWOLF_TOWER_ATTACK = 33, - AV_TEXT_H_HERALD_EAST_FROSTWOLF_TOWER_TAKEN = 34, - AV_TEXT_A_HERALD_EAST_FROSTWOLF_TOWER_ATTACK = 35, - AV_TEXT_A_HERALD_EAST_FROSTWOLF_TOWER_TAKEN = 36, - AV_TEXT_H_HERALD_TOWER_POINT_ATTACK = 37, - AV_TEXT_H_HERALD_TOWER_POINT_TAKEN = 38, - AV_TEXT_A_HERALD_TOWER_POINT_ATTACK = 39, - AV_TEXT_A_HERALD_TOWER_POINT_TAKEN = 40, - AV_TEXT_H_HERALD_ICEBLOOD_BUNKER_ATTACK = 41, - AV_TEXT_H_HERALD_ICEBLOOD_BUNKER_TAKEN = 42, - AV_TEXT_A_HERALD_ICEBLOOD_TOWER_ATTACK = 43, - AV_TEXT_A_HERALD_ICEBLOOD_TOWER_TAKEN = 44, + AV_TEXT_A_HERALD_STORMPIKE_GRAVEYARD_TAKEN = 1, + AV_TEXT_A_HERALD_STORMPIKE_GRAVEYARD_ATTACK = 2, + AV_TEXT_H_HERALD_STORMPIKE_GRAVEYARD_TAKEN = 3, + AV_TEXT_H_HERALD_STORMPIKE_GRAVEYARD_ATTACK = 4, + AV_TEXT_A_HERALD_SNOWFALL_GRAVEYARD_TAKEN = 5, + AV_TEXT_A_HERALD_SNOWFALL_GRAVEYARD_ATTACK = 6, + AV_TEXT_H_HERALD_SNOWFALL_GRAVEYARD_TAKEN = 7, + AV_TEXT_H_HERALD_SNOWFALL_GRAVEYARD_ATTACK = 8, + AV_TEXT_A_HERALD_FROSTWOLF_GRAVEYARD_TAKEN = 9, + AV_TEXT_A_HERALD_FROSTWOLF_GRAVEYARD_ATTACK = 10, + AV_TEXT_H_HERALD_FROSTWOLF_GRAVEYARD_TAKEN = 11, + AV_TEXT_H_HERALD_FROSTWOLF_GRAVEYARD_ATTACK = 12, + AV_TEXT_H_HERALD_DUN_BALDAR_SOUTH_ATTACK = 13, + AV_TEXT_H_HERALD_DUN_BALDAR_SOUTH_TAKEN = 14, + AV_TEXT_A_HERALD_DUN_BALDAR_SOUTH_ATTACK = 15, + AV_TEXT_A_HERALD_DUN_BALDAR_SOUTH_TAKEN = 16, + AV_TEXT_H_HERALD_DUN_BALDAR_NORTH_ATTACK = 17, + AV_TEXT_H_HERALD_DUN_BALDAR_NORTH_TAKEN = 18, + AV_TEXT_A_HERALD_DUN_BALDAR_NORTH_ATTACK = 19, + AV_TEXT_A_HERALD_DUN_BALDAR_NORTH_TAKEN = 20, + AV_TEXT_H_HERALD_ICEWING_BUNKER_ATTACK = 21, + AV_TEXT_H_HERALD_ICEWING_BUNKER_TAKEN = 22, + AV_TEXT_A_HERALD_ICEWING_BUNKER_ATTACK = 23, + AV_TEXT_A_HERALD_ICEWING_BUNKER_TAKEN = 24, + AV_TEXT_H_HERALD_STONEHEARTH_BUNKER_ATTACK = 25, + AV_TEXT_H_HERALD_STONEHEARTH_BUNKER_TAKEN = 26, + AV_TEXT_A_HERALD_STONEHEARTH_BUNKER_ATTACK = 27, + AV_TEXT_A_HERALD_STONEHEARTH_BUNKER_TAKEN = 28, + AV_TEXT_H_HERALD_WEST_FROSTWOLF_TOWER_ATTACK = 29, + AV_TEXT_H_HERALD_WEST_FROSTWOLF_TOWER_TAKEN = 30, + AV_TEXT_A_HERALD_WEST_FROSTWOLF_TOWER_ATTACK = 31, + AV_TEXT_A_HERALD_WEST_FROSTWOLF_TOWER_TAKEN = 32, + AV_TEXT_H_HERALD_EAST_FROSTWOLF_TOWER_ATTACK = 33, + AV_TEXT_H_HERALD_EAST_FROSTWOLF_TOWER_TAKEN = 34, + AV_TEXT_A_HERALD_EAST_FROSTWOLF_TOWER_ATTACK = 35, + AV_TEXT_A_HERALD_EAST_FROSTWOLF_TOWER_TAKEN = 36, + AV_TEXT_H_HERALD_TOWER_POINT_ATTACK = 37, + AV_TEXT_H_HERALD_TOWER_POINT_TAKEN = 38, + AV_TEXT_A_HERALD_TOWER_POINT_ATTACK = 39, + AV_TEXT_A_HERALD_TOWER_POINT_TAKEN = 40, + AV_TEXT_H_HERALD_ICEBLOOD_TOWER_ATTACK = 41, + AV_TEXT_H_HERALD_ICEBLOOD_TOWER_TAKEN = 42, + AV_TEXT_A_HERALD_ICEBLOOD_TOWER_ATTACK = 43, + AV_TEXT_A_HERALD_ICEBLOOD_TOWER_TAKEN = 44, AV_TEXT_H_HERALD_STORMPIKE_AID_STATION_TAKEN = 45, AV_TEXT_H_HERALD_STORMPIKE_AID_STATION_ATTACK = 46, AV_TEXT_A_HERALD_STORMPIKE_AID_STATION_TAKEN = 47,