From 4785aabbf2a92fcf87868df6ac5a87ea8e247207 Mon Sep 17 00:00:00 2001 From: Kitzunu <24550914+Kitzunu@users.noreply.github.com> Date: Sun, 28 Jul 2024 01:44:03 +0200 Subject: [PATCH] fix(Scritps/AV): Use db defined text for Herald (#19486) * fix(Scritps/AV): Use db defined text for Herald * closes https://github.com/azerothcore/azerothcore-wotlk/issues/19483 * indent * Update BattlegroundAV.cpp * fix build * remove from acore_string * Update BattlegroundAV.h --- .../rev_1722073432548496100.sql | 2 + .../Battlegrounds/Zones/BattlegroundAV.cpp | 303 +++++++++++++----- .../game/Battlegrounds/Zones/BattlegroundAV.h | 77 ++++- src/server/game/Miscellaneous/Language.h | 38 +-- 4 files changed, 309 insertions(+), 111 deletions(-) create mode 100644 data/sql/updates/pending_db_world/rev_1722073432548496100.sql diff --git a/data/sql/updates/pending_db_world/rev_1722073432548496100.sql b/data/sql/updates/pending_db_world/rev_1722073432548496100.sql new file mode 100644 index 000000000..5c42e8ad1 --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1722073432548496100.sql @@ -0,0 +1,2 @@ +-- +DELETE FROM `acore_string` WHERE `entry` IN (1300,1301,1302,1303,1304,1305,1306,1307,1308,1309,1310,1311,1312,1313,1314,1315,1316,1317,1318,1319,1320,1321,1322,1323,1324,1325); diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundAV.cpp b/src/server/game/Battlegrounds/Zones/BattlegroundAV.cpp index 7f2c7cb3e..dce3357b5 100644 --- a/src/server/game/Battlegrounds/Zones/BattlegroundAV.cpp +++ b/src/server/game/Battlegrounds/Zones/BattlegroundAV.cpp @@ -120,9 +120,8 @@ void BattlegroundAV::HandleKillUnit(Creature* unit, Player* killer) //spawn destroyed aura for (uint8 i = 0; i <= 9; i++) SpawnBGObject(BG_AV_OBJECT_BURN_BUILDING_ALLIANCE + i, RESPAWN_IMMEDIATELY); - Creature* creature = GetBGCreature(AV_CPLACE_HERALD); - if (creature) - YellToAll(creature, GetAcoreString(LANG_BG_AV_A_CAPTAIN_DEAD), LANG_UNIVERSAL); + if (Creature* creature = GetBGCreature(AV_CPLACE_HERALD)) + creature->AI()->Talk(AV_TEXT_HERALD_STORMPIKE_GENERAL_DEAD); DelCreature(AV_CPLACE_TRIGGER16); } else if (entry == BG_AV_CreatureInfo[AV_NPC_H_CAPTAIN]) @@ -139,9 +138,8 @@ void BattlegroundAV::HandleKillUnit(Creature* unit, Player* killer) //spawn destroyed aura for (uint8 i = 0; i <= 9; i++) SpawnBGObject(BG_AV_OBJECT_BURN_BUILDING_HORDE + i, RESPAWN_IMMEDIATELY); - Creature* creature = GetBGCreature(AV_CPLACE_HERALD); - if (creature) - YellToAll(creature, GetAcoreString(LANG_BG_AV_H_CAPTAIN_DEAD), LANG_UNIVERSAL); + if (Creature* creature = GetBGCreature(AV_CPLACE_HERALD)) + creature->AI()->Talk(AV_TEXT_HERALD_FROSTWOLF_GENERAL_DEAD); DelCreature(AV_CPLACE_TRIGGER18); } else if (entry == BG_AV_CreatureInfo[AV_NPC_N_MINE_N_4] || entry == BG_AV_CreatureInfo[AV_NPC_N_MINE_A_4] || entry == BG_AV_CreatureInfo[AV_NPC_N_MINE_H_4]) @@ -646,16 +644,9 @@ void BattlegroundAV::EventPlayerDestroyedPoint(BG_AV_Nodes node) } } } - //send a nice message to all :) - char buf[256]; - if (IsTower(node)) - snprintf(buf, sizeof(buf), GetAcoreString(LANG_BG_AV_TOWER_TAKEN), GetNodeName(node), (ownerId == TEAM_ALLIANCE) ? GetAcoreString(LANG_BG_AV_ALLY) : GetAcoreString(LANG_BG_AV_HORDE)); - else - snprintf(buf, sizeof(buf), GetAcoreString(LANG_BG_AV_GRAVE_TAKEN), GetNodeName(node), (ownerId == TEAM_ALLIANCE) ? GetAcoreString(LANG_BG_AV_ALLY) : GetAcoreString(LANG_BG_AV_HORDE)); - Creature* creature = GetBGCreature(AV_CPLACE_HERALD); - if (creature) - YellToAll(creature, buf, LANG_UNIVERSAL); + if (Creature* creature = GetBGCreature(AV_CPLACE_HERALD)) + creature->AI()->Talk(GetDefendString(node, ownerId)); } void BattlegroundAV::ChangeMineOwner(uint8 mine, TeamId teamId, bool initial) @@ -727,12 +718,8 @@ void BattlegroundAV::ChangeMineOwner(uint8 mine, TeamId teamId, bool initial) if (teamId == TEAM_ALLIANCE || teamId == TEAM_HORDE) { m_Mine_Reclaim_Timer[mine] = AV_MINE_RECLAIM_TIMER; - char buf[256]; - snprintf(buf, sizeof(buf), GetAcoreString(LANG_BG_AV_MINE_TAKEN), (teamId == TEAM_ALLIANCE) ? GetAcoreString(LANG_BG_AV_ALLY) : GetAcoreString(LANG_BG_AV_HORDE), - GetAcoreString((mine == AV_NORTH_MINE) ? LANG_BG_AV_MINE_NORTH : LANG_BG_AV_MINE_SOUTH)); - Creature* creature = GetBGCreature(AV_CPLACE_HERALD); - if (creature) - YellToAll(creature, buf, LANG_UNIVERSAL); + if (Creature* creature = GetBGCreature(AV_CPLACE_HERALD)) + creature->AI()->Talk(GetMineString(mine, teamId)); } else { @@ -980,18 +967,12 @@ void BattlegroundAV::EventPlayerDefendsPoint(Player* player, uint32 object) SpawnBGObject(((teamId == TEAM_ALLIANCE) ? BG_AV_OBJECT_SNOW_EYECANDY_A : BG_AV_OBJECT_SNOW_EYECANDY_H) + i, RESPAWN_IMMEDIATELY); } } - //send a nice message to all :) - char buf[256]; - snprintf(buf, sizeof(buf), GetAcoreString((IsTower(node)) ? LANG_BG_AV_TOWER_DEFENDED : LANG_BG_AV_GRAVE_DEFENDED), GetNodeName(node), (teamId == TEAM_ALLIANCE) ? GetAcoreString(LANG_BG_AV_ALLY) : GetAcoreString(LANG_BG_AV_HORDE)); - Creature* creature = GetBGCreature(AV_CPLACE_HERALD); - if (creature) - YellToAll(creature, buf, LANG_UNIVERSAL); + + if (Creature* creature = GetBGCreature(AV_CPLACE_HERALD)) + creature->AI()->Talk(GetDefendString(node, teamId)); + //update the statistic for the defending player UpdatePlayerScore(player, (IsTower(node)) ? SCORE_TOWERS_DEFENDED : SCORE_GRAVEYARDS_DEFENDED, 1); - if (IsTower(node)) - PlaySoundToAll(AV_SOUND_BOTH_TOWER_DEFEND); - else - PlaySoundToAll((teamId == TEAM_ALLIANCE) ? AV_SOUND_ALLIANCE_GOOD : AV_SOUND_HORDE_GOOD); } void BattlegroundAV::EventPlayerAssaultsPoint(Player* player, uint32 object) @@ -1092,15 +1073,11 @@ void BattlegroundAV::EventPlayerAssaultsPoint(Player* player, uint32 object) // xinef: change here is too late, AssaultNode(node, team); UpdateNodeWorldState(node); - //send a nice message to all :) - char buf[256]; - snprintf(buf, sizeof(buf), (IsTower(node)) ? GetAcoreString(LANG_BG_AV_TOWER_ASSAULTED) : GetAcoreString(LANG_BG_AV_GRAVE_ASSAULTED), GetNodeName(node), (teamId == TEAM_ALLIANCE) ? GetAcoreString(LANG_BG_AV_ALLY) : GetAcoreString(LANG_BG_AV_HORDE)); - Creature* creature = GetBGCreature(AV_CPLACE_HERALD); - if (creature) - YellToAll(creature, buf, LANG_UNIVERSAL); + if (Creature* creature = GetBGCreature(AV_CPLACE_HERALD)) + creature->AI()->Talk(GetAttackString(node, teamId)); + //update the statistic for the assaulting player UpdatePlayerScore(player, (IsTower(node)) ? SCORE_TOWERS_ASSAULTED : SCORE_GRAVEYARDS_ASSAULTED, 1); - PlaySoundToAll((teamId == TEAM_ALLIANCE) ? AV_SOUND_ALLIANCE_ASSAULTS : AV_SOUND_HORDE_ASSAULTS); player->KilledMonsterCredit((IsTower(node)) ? BG_AV_QUEST_CREDIT_TOWER : BG_AV_QUEST_CREDIT_GRAVEYARD); } @@ -1466,46 +1443,226 @@ bool BattlegroundAV::SetupBattleground() return true; } -char const* BattlegroundAV::GetNodeName(BG_AV_Nodes node) +uint8 BattlegroundAV::GetAttackString(BG_AV_Nodes node, TeamId teamId) { + uint8 strId = 0; switch (node) { - case BG_AV_NODES_FIRSTAID_STATION: - return GetAcoreString(LANG_BG_AV_NODE_GRAVE_STORM_AID); - case BG_AV_NODES_DUNBALDAR_SOUTH: - return GetAcoreString(LANG_BG_AV_NODE_TOWER_DUN_S); - case BG_AV_NODES_DUNBALDAR_NORTH: - return GetAcoreString(LANG_BG_AV_NODE_TOWER_DUN_N); - case BG_AV_NODES_STORMPIKE_GRAVE: - return GetAcoreString(LANG_BG_AV_NODE_GRAVE_STORMPIKE); - case BG_AV_NODES_ICEWING_BUNKER: - return GetAcoreString(LANG_BG_AV_NODE_TOWER_ICEWING); - case BG_AV_NODES_STONEHEART_GRAVE: - return GetAcoreString(LANG_BG_AV_NODE_GRAVE_STONE); - case BG_AV_NODES_STONEHEART_BUNKER: - return GetAcoreString(LANG_BG_AV_NODE_TOWER_STONE); - case BG_AV_NODES_SNOWFALL_GRAVE: - return GetAcoreString(LANG_BG_AV_NODE_GRAVE_SNOW); - case BG_AV_NODES_ICEBLOOD_TOWER: - return GetAcoreString(LANG_BG_AV_NODE_TOWER_ICE); - case BG_AV_NODES_ICEBLOOD_GRAVE: - return GetAcoreString(LANG_BG_AV_NODE_GRAVE_ICE); - case BG_AV_NODES_TOWER_POINT: - return GetAcoreString(LANG_BG_AV_NODE_TOWER_POINT); - case BG_AV_NODES_FROSTWOLF_GRAVE: - return GetAcoreString(LANG_BG_AV_NODE_GRAVE_FROST); - case BG_AV_NODES_FROSTWOLF_ETOWER: - return GetAcoreString(LANG_BG_AV_NODE_TOWER_FROST_E); - case BG_AV_NODES_FROSTWOLF_WTOWER: - return GetAcoreString(LANG_BG_AV_NODE_TOWER_FROST_W); - case BG_AV_NODES_FROSTWOLF_HUT: - return GetAcoreString(LANG_BG_AV_NODE_GRAVE_FROST_HUT); - default: - LOG_ERROR("bg.battleground", "tried to get name for node {}", node); - break; + case BG_AV_NODES_FIRSTAID_STATION: + if (teamId == TEAM_ALLIANCE) + strId = AV_TEXT_A_HERALD_STORMPIKE_AID_STATION_ATTACK; + else + strId = AV_TEXT_H_HERALD_STORMPIKE_AID_STATION_ATTACK; + break; + case BG_AV_NODES_DUNBALDAR_SOUTH: + if (teamId == TEAM_ALLIANCE) + strId = AV_TEXT_A_HERALD_DUN_BALDAR_SOUTH_ATTACK; + else + strId = AV_TEXT_H_HERALD_DUN_BALDAR_SOUTH_ATTACK; + break; + case BG_AV_NODES_DUNBALDAR_NORTH: + if (teamId == TEAM_ALLIANCE) + strId = AV_TEXT_A_HERALD_DUN_BALDAR_NORTH_ATTACK; + else + strId = AV_TEXT_H_HERALD_DUN_BALDAR_NORTH_ATTACK; + break; + case BG_AV_NODES_STORMPIKE_GRAVE: + if (teamId == TEAM_ALLIANCE) + strId = AV_TEXT_A_HERALD_STORMPIKE_GRAVEYARD_ATTACK; + else + strId = AV_TEXT_H_HERALD_STORMPIKE_GRAVEYARD_ATTACK; + break; + case BG_AV_NODES_ICEWING_BUNKER: + if (teamId == TEAM_ALLIANCE) + strId = AV_TEXT_A_HERALD_ICEWING_BUNKER_ATTACK; + else + strId = AV_TEXT_H_HERALD_ICEWING_BUNKER_ATTACK; + break; + case BG_AV_NODES_STONEHEART_GRAVE: + if (teamId == TEAM_ALLIANCE) + strId = AV_TEXT_A_HERALD_STONEHEARTH_GRAVEYARD_ATTACK; + else + strId = AV_TEXT_H_HERALD_STONEHEARTH_GRAVEYARD_ATTACK; + break; + case BG_AV_NODES_STONEHEART_BUNKER: + if (teamId == TEAM_ALLIANCE) + strId = AV_TEXT_A_HERALD_STONEHEARTH_BUNKER_ATTACK; + else + strId = AV_TEXT_H_HERALD_STONEHEARTH_BUNKER_ATTACK; + break; + case BG_AV_NODES_SNOWFALL_GRAVE: + if (teamId == TEAM_ALLIANCE) + strId = AV_TEXT_A_HERALD_SNOWFALL_GRAVEYARD_ATTACK; + else + strId = AV_TEXT_H_HERALD_SNOWFALL_GRAVEYARD_ATTACK; + break; + case BG_AV_NODES_ICEBLOOD_TOWER: + strId = AV_TEXT_A_HERALD_ICEBLOOD_TOWER_ATTACK; + break; + case BG_AV_NODES_ICEBLOOD_GRAVE: + if (teamId == TEAM_ALLIANCE) + strId = AV_TEXT_A_HERALD_ICEBLOOD_GRAVEYARD_ATTACK; + else + strId = AV_TEXT_H_HERALD_ICEBLOOD_GRAVEYARD_ATTACK; + break; + case BG_AV_NODES_TOWER_POINT: + if (teamId == TEAM_ALLIANCE) + strId = AV_TEXT_A_HERALD_TOWER_POINT_ATTACK; + else + strId = AV_TEXT_H_HERALD_TOWER_POINT_ATTACK; + break; + case BG_AV_NODES_FROSTWOLF_GRAVE: + if (teamId == TEAM_ALLIANCE) + strId = AV_TEXT_A_HERALD_FROSTWOLF_GRAVEYARD_ATTACK; + else + strId = AV_TEXT_H_HERALD_FROSTWOLF_GRAVEYARD_ATTACK; + break; + case BG_AV_NODES_FROSTWOLF_ETOWER: + if (teamId == TEAM_ALLIANCE) + strId = AV_TEXT_A_HERALD_EAST_FROSTWOLF_TOWER_ATTACK; + else + strId = AV_TEXT_H_HERALD_EAST_FROSTWOLF_TOWER_ATTACK; + break; + case BG_AV_NODES_FROSTWOLF_WTOWER: + if (teamId == TEAM_ALLIANCE) + strId = AV_TEXT_A_HERALD_WEST_FROSTWOLF_TOWER_ATTACK; + else + strId = AV_TEXT_H_HERALD_WEST_FROSTWOLF_TOWER_ATTACK; + break; + case BG_AV_NODES_FROSTWOLF_HUT: + if (teamId == TEAM_ALLIANCE) + strId = AV_TEXT_A_HERALD_FROSTWOLF_RELIEF_HUT_ATTACK; + else + strId = AV_TEXT_H_HERALD_FROSTWOLF_RELIEF_HUT_ATTACK; + break; + default: + break; } - return "Unknown"; + return strId; +} + +uint8 BattlegroundAV::GetDefendString(BG_AV_Nodes node, TeamId teamId) +{ + uint8 strId = 0; + switch (node) + { + case BG_AV_NODES_FIRSTAID_STATION: + if (teamId == TEAM_ALLIANCE) + strId = AV_TEXT_A_HERALD_STORMPIKE_AID_STATION_TAKEN; + else + strId = AV_TEXT_H_HERALD_STORMPIKE_AID_STATION_TAKEN; + break; + case BG_AV_NODES_DUNBALDAR_SOUTH: + if (teamId == TEAM_ALLIANCE) + strId = AV_TEXT_A_HERALD_DUN_BALDAR_SOUTH_TAKEN; + else + strId = AV_TEXT_H_HERALD_DUN_BALDAR_SOUTH_TAKEN; + break; + case BG_AV_NODES_DUNBALDAR_NORTH: + if (teamId == TEAM_ALLIANCE) + strId = AV_TEXT_A_HERALD_DUN_BALDAR_NORTH_TAKEN; + else + strId = AV_TEXT_H_HERALD_DUN_BALDAR_NORTH_TAKEN; + break; + case BG_AV_NODES_STORMPIKE_GRAVE: + if (teamId == TEAM_ALLIANCE) + strId = AV_TEXT_A_HERALD_STORMPIKE_GRAVEYARD_TAKEN; + else + strId = AV_TEXT_H_HERALD_STORMPIKE_GRAVEYARD_TAKEN; + break; + case BG_AV_NODES_ICEWING_BUNKER: + if (teamId == TEAM_ALLIANCE) + strId = AV_TEXT_A_HERALD_ICEWING_BUNKER_TAKEN; + else + strId = AV_TEXT_H_HERALD_ICEWING_BUNKER_TAKEN; + break; + case BG_AV_NODES_STONEHEART_GRAVE: + if (teamId == TEAM_ALLIANCE) + strId = AV_TEXT_A_HERALD_STONEHEARTH_GRAVEYARD_TAKEN; + else + strId = AV_TEXT_H_HERALD_STONEHEARTH_GRAVEYARD_TAKEN; + break; + case BG_AV_NODES_STONEHEART_BUNKER: + if (teamId == TEAM_ALLIANCE) + strId = AV_TEXT_A_HERALD_STONEHEARTH_BUNKER_TAKEN; + else + strId = AV_TEXT_H_HERALD_STONEHEARTH_BUNKER_TAKEN; + break; + case BG_AV_NODES_SNOWFALL_GRAVE: + if (teamId == TEAM_ALLIANCE) + strId = AV_TEXT_A_HERALD_SNOWFALL_GRAVEYARD_TAKEN; + else + strId = AV_TEXT_H_HERALD_SNOWFALL_GRAVEYARD_TAKEN; + break; + case BG_AV_NODES_ICEBLOOD_TOWER: + strId = AV_TEXT_A_HERALD_ICEBLOOD_TOWER_TAKEN; + break; + case BG_AV_NODES_ICEBLOOD_GRAVE: + if (teamId == TEAM_ALLIANCE) + strId = AV_TEXT_A_HERALD_ICEBLOOD_GRAVEYARD_TAKEN; + else + strId = AV_TEXT_H_HERALD_ICEBLOOD_GRAVEYARD_TAKEN; + break; + case BG_AV_NODES_TOWER_POINT: + if (teamId == TEAM_ALLIANCE) + strId = AV_TEXT_A_HERALD_TOWER_POINT_TAKEN; + else + strId = AV_TEXT_H_HERALD_TOWER_POINT_TAKEN; + break; + case BG_AV_NODES_FROSTWOLF_GRAVE: + if (teamId == TEAM_ALLIANCE) + strId = AV_TEXT_A_HERALD_FROSTWOLF_GRAVEYARD_TAKEN; + else + strId = AV_TEXT_H_HERALD_FROSTWOLF_GRAVEYARD_TAKEN; + break; + case BG_AV_NODES_FROSTWOLF_ETOWER: + if (teamId == TEAM_ALLIANCE) + strId = AV_TEXT_A_HERALD_EAST_FROSTWOLF_TOWER_TAKEN; + else + strId = AV_TEXT_H_HERALD_EAST_FROSTWOLF_TOWER_TAKEN; + break; + case BG_AV_NODES_FROSTWOLF_WTOWER: + if (teamId == TEAM_ALLIANCE) + strId = AV_TEXT_A_HERALD_WEST_FROSTWOLF_TOWER_TAKEN; + else + strId = AV_TEXT_H_HERALD_WEST_FROSTWOLF_TOWER_TAKEN; + break; + case BG_AV_NODES_FROSTWOLF_HUT: + if (teamId == TEAM_ALLIANCE) + strId = AV_TEXT_A_HERALD_FROSTWOLF_RELIEF_HUT_TAKEN; + else + strId = AV_TEXT_H_HERALD_FROSTWOLF_RELIEF_HUT_TAKEN; + break; + default: + break; + } + + return strId; +} + +uint8 BattlegroundAV::GetMineString(uint8 mineId, TeamId teamId) +{ + uint8 strId = 0; + switch (mineId) + { + case AV_NORTH_MINE: + if (teamId == TEAM_ALLIANCE) + strId = AV_TEXT_A_HERALD_IRONDEEP_MINE_TAKEN; + else + strId = AV_TEXT_H_HERALD_IRONDEEP_MINE_TAKEN; + break; + case AV_SOUTH_MINE: + if (teamId == TEAM_ALLIANCE) + strId = AV_TEXT_A_HERALD_COLDTOOTH_MINE_TAKEN; + else + strId = AV_TEXT_H_HERALD_COLDTOOTH_MINE_TAKEN; + break; + default: + break; + } + + return strId; } void BattlegroundAV::AssaultNode(BG_AV_Nodes node, TeamId teamId) diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundAV.h b/src/server/game/Battlegrounds/Zones/BattlegroundAV.h index 7a395bfd0..1d62a96fd 100644 --- a/src/server/game/Battlegrounds/Zones/BattlegroundAV.h +++ b/src/server/game/Battlegrounds/Zones/BattlegroundAV.h @@ -1645,6 +1645,78 @@ enum BG_AV_Objectives AV_OBJECTIVE_DEFEND_GRAVEYARD = 65 }; +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_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, + AV_TEXT_A_HERALD_STORMPIKE_AID_STATION_ATTACK = 48, + AV_TEXT_H_HERALD_FROSTWOLF_RELIEF_HUT_TAKEN = 49, + AV_TEXT_H_HERALD_FROSTWOLF_RELIEF_HUT_ATTACK = 50, + AV_TEXT_A_HERALD_FROSTWOLF_RELIEF_HUT_TAKEN = 51, + AV_TEXT_A_HERALD_FROSTWOLF_RELIEF_HUT_ATTACK = 52, + AV_TEXT_H_HERALD_STONEHEARTH_GRAVEYARD_TAKEN = 53, + AV_TEXT_H_HERALD_STONEHEARTH_GRAVEYARD_ATTACK = 54, + AV_TEXT_A_HERALD_STONEHEARTH_GRAVEYARD_TAKEN = 55, + AV_TEXT_A_HERALD_STONEHEARTH_GRAVEYARD_ATTACK = 56, + AV_TEXT_H_HERALD_ICEBLOOD_GRAVEYARD_TAKEN = 57, + AV_TEXT_H_HERALD_ICEBLOOD_GRAVEYARD_ATTACK = 58, + AV_TEXT_A_HERALD_ICEBLOOD_GRAVEYARD_TAKEN = 59, + AV_TEXT_A_HERALD_ICEBLOOD_GRAVEYARD_ATTACK = 60, + AV_TEXT_A_HERALD_COLDTOOTH_MINE_TAKEN = 61, + AV_TEXT_A_HERALD_IRONDEEP_MINE_TAKEN = 62, + AV_TEXT_H_HERALD_COLDTOOTH_MINE_TAKEN = 63, + AV_TEXT_H_HERALD_IRONDEEP_MINE_TAKEN = 64, + AV_TEXT_HERALD_FROSTWOLF_GENERAL_DEAD = 65, + AV_TEXT_HERALD_STORMPIKE_GENERAL_DEAD = 66, + AV_TEXT_A_HERALD_WIN = 67, + AV_TEXT_H_HERALD_WIN = 68 +}; + struct BG_AV_NodeInfo { BG_AV_States State; @@ -1762,9 +1834,12 @@ private: BG_AV_Nodes GetNodeThroughObject(uint32 object); uint32 GetObjectThroughNode(BG_AV_Nodes node); - char const* GetNodeName(BG_AV_Nodes node); bool IsTower(BG_AV_Nodes node) { return m_Nodes[node].Tower; } + uint8 GetAttackString(BG_AV_Nodes node, TeamId teamId); + uint8 GetDefendString(BG_AV_Nodes node, TeamId teamId); + uint8 GetMineString(uint8 mine, TeamId teamId); + /*mine*/ void ChangeMineOwner(uint8 mine, TeamId teamId, bool initial = false); diff --git a/src/server/game/Miscellaneous/Language.h b/src/server/game/Miscellaneous/Language.h index fca47b32c..d0219e83b 100644 --- a/src/server/game/Miscellaneous/Language.h +++ b/src/server/game/Miscellaneous/Language.h @@ -980,43 +980,7 @@ enum AcoreStrings LANG_DEBUG_AREATRIGGER_OFF = 1203, LANG_DEBUG_AREATRIGGER_REACHED = 1204, - // 1205-1299 - free - - // 1300-1333 - // AV - LANG_BG_AV_ALLY = 1300, - LANG_BG_AV_HORDE = 1301, - LANG_BG_AV_TOWER_TAKEN = 1302, - LANG_BG_AV_TOWER_ASSAULTED = 1303, - LANG_BG_AV_TOWER_DEFENDED = 1304, - LANG_BG_AV_GRAVE_TAKEN = 1305, - LANG_BG_AV_GRAVE_DEFENDED = 1306, - LANG_BG_AV_GRAVE_ASSAULTED = 1307, - - LANG_BG_AV_MINE_TAKEN = 1308, - LANG_BG_AV_MINE_NORTH = 1309, - LANG_BG_AV_MINE_SOUTH = 1310, - - LANG_BG_AV_NODE_GRAVE_STORM_AID = 1311, - LANG_BG_AV_NODE_TOWER_DUN_S = 1312, - LANG_BG_AV_NODE_TOWER_DUN_N = 1313, - LANG_BG_AV_NODE_GRAVE_STORMPIKE = 1314, - LANG_BG_AV_NODE_TOWER_ICEWING = 1315, - LANG_BG_AV_NODE_GRAVE_STONE = 1316, - LANG_BG_AV_NODE_TOWER_STONE = 1317, - LANG_BG_AV_NODE_GRAVE_SNOW = 1318, - LANG_BG_AV_NODE_TOWER_ICE = 1319, - LANG_BG_AV_NODE_GRAVE_ICE = 1320, - LANG_BG_AV_NODE_TOWER_POINT = 1321, - LANG_BG_AV_NODE_GRAVE_FROST = 1322, - LANG_BG_AV_NODE_TOWER_FROST_E = 1323, - LANG_BG_AV_NODE_TOWER_FROST_W = 1324, - LANG_BG_AV_NODE_GRAVE_FROST_HUT = 1325, - - // 1326-1330 - free - - LANG_BG_AV_H_CAPTAIN_DEAD = 1331, - LANG_BG_AV_A_CAPTAIN_DEAD = 1332, + // 1205-1333 - free //Player Ticket Strings LANG_TICKET_CLOSED = 1334,