diff options
| author | Shauren <shauren.trinity@gmail.com> | 2022-07-10 18:59:29 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2022-07-10 18:59:29 +0200 |
| commit | 5dbfaecd5c020fd4c3b3dfc235580849c39ce7db (patch) | |
| tree | 144b55215757a8174969a90967debd809119fc55 /src/server/game/Entities | |
| parent | 377799fd3cd8d129b1b6afc146d7c40b70160ad9 (diff) | |
Core/WorldStates: Migrate battleground worldstates to new system
Diffstat (limited to 'src/server/game/Entities')
| -rw-r--r-- | src/server/game/Entities/Player/Player.cpp | 306 |
1 files changed, 0 insertions, 306 deletions
diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index 00750ba6501..f243ae0beda 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -9203,7 +9203,6 @@ void Player::SendUpdateWorldState(uint32 variable, uint32 value, bool hidden /*= void Player::SendInitWorldStates(uint32 zoneId, uint32 areaId) { uint32 mapId = GetMapId(); - Battleground* battleground = GetBattleground(); OutdoorPvP* outdoorPvP = sOutdoorPvPMgr->GetOutdoorPvPToZoneId(zoneId); TC_LOG_DEBUG("network", "Player::SendInitWorldStates: Sending SMSG_INIT_WORLD_STATES for Map: %u, Zone: %u", mapId, zoneId); @@ -9268,182 +9267,6 @@ void Player::SendInitWorldStates(uint32 zoneId, uint32 areaId) packet.Worldstates.emplace_back(2324, 0); // AQ_SANDWORM_SW packet.Worldstates.emplace_back(2325, 0); // AQ_SANDWORM_E break; - case 2597: // Alterac Valley - if (battleground && battleground->GetTypeID(true) == BATTLEGROUND_AV) - battleground->FillInitialWorldStates(packet); - else - { - packet.Worldstates.emplace_back(1966, 1); // AV_SNOWFALL_N - packet.Worldstates.emplace_back(1330, 1); // AV_FROSTWOLFHUT_H_C - packet.Worldstates.emplace_back(1329, 0); // AV_FROSTWOLFHUT_A_C - packet.Worldstates.emplace_back(1326, 0); // AV_AID_A_A - packet.Worldstates.emplace_back(1393, 0); // East Frostwolf Tower Horde Assaulted - UNUSED - packet.Worldstates.emplace_back(1392, 0); // West Frostwolf Tower Horde Assaulted - UNUSED - packet.Worldstates.emplace_back(1383, 1); // AV_FROSTWOLFE_CONTROLLED - packet.Worldstates.emplace_back(1382, 1); // AV_FROSTWOLFW_CONTROLLED - packet.Worldstates.emplace_back(1360, 1); // AV_N_MINE_N - packet.Worldstates.emplace_back(1348, 0); // AV_ICEBLOOD_A_A - packet.Worldstates.emplace_back(1334, 0); // AV_PIKEGRAVE_H_C - packet.Worldstates.emplace_back(1333, 1); // AV_PIKEGRAVE_A_C - packet.Worldstates.emplace_back(1304, 0); // AV_STONEHEART_A_A - packet.Worldstates.emplace_back(1303, 0); // AV_STONEHEART_H_A - packet.Worldstates.emplace_back(1396, 0); // unk - packet.Worldstates.emplace_back(1395, 0); // Iceblood Tower Horde Assaulted - UNUSED - packet.Worldstates.emplace_back(1394, 0); // Towerpoint Horde Assaulted - UNUSED - packet.Worldstates.emplace_back(1391, 0); // unk - packet.Worldstates.emplace_back(1390, 0); // AV_ICEBLOOD_ASSAULTED - packet.Worldstates.emplace_back(1389, 0); // AV_TOWERPOINT_ASSAULTED - packet.Worldstates.emplace_back(1388, 0); // AV_FROSTWOLFE_ASSAULTED - packet.Worldstates.emplace_back(1387, 0); // AV_FROSTWOLFW_ASSAULTED - packet.Worldstates.emplace_back(1386, 1); // unk - packet.Worldstates.emplace_back(1385, 1); // AV_ICEBLOOD_CONTROLLED - packet.Worldstates.emplace_back(1384, 1); // AV_TOWERPOINT_CONTROLLED - packet.Worldstates.emplace_back(1381, 0); // AV_STONEH_ASSAULTED - packet.Worldstates.emplace_back(1380, 0); // AV_ICEWING_ASSAULTED - packet.Worldstates.emplace_back(1379, 0); // AV_DUNN_ASSAULTED - packet.Worldstates.emplace_back(1378, 0); // AV_DUNS_ASSAULTED - packet.Worldstates.emplace_back(1377, 0); // Stoneheart Bunker Alliance Assaulted - UNUSED - packet.Worldstates.emplace_back(1376, 0); // Icewing Bunker Alliance Assaulted - UNUSED - packet.Worldstates.emplace_back(1375, 0); // Dunbaldar South Alliance Assaulted - UNUSED - packet.Worldstates.emplace_back(1374, 0); // Dunbaldar North Alliance Assaulted - UNUSED - packet.Worldstates.emplace_back(1373, 0); // AV_STONEH_DESTROYED - packet.Worldstates.emplace_back(966, 0); // AV_UNK_02 - packet.Worldstates.emplace_back(964, 0); // AV_UNK_01 - packet.Worldstates.emplace_back(962, 0); // AV_STORMPIKE_COMMANDERS - packet.Worldstates.emplace_back(1302, 1); // AV_STONEHEART_A_C - packet.Worldstates.emplace_back(1301, 0); // AV_STONEHEART_H_C - packet.Worldstates.emplace_back(950, 0); // AV_STORMPIKE_LIEUTENANTS - packet.Worldstates.emplace_back(1372, 0); // AV_ICEWING_DESTROYED - packet.Worldstates.emplace_back(1371, 0); // AV_DUNN_DESTROYED - packet.Worldstates.emplace_back(1370, 0); // AV_DUNS_DESTROYED - packet.Worldstates.emplace_back(1369, 0); // unk - packet.Worldstates.emplace_back(1368, 0); // AV_ICEBLOOD_DESTROYED - packet.Worldstates.emplace_back(1367, 0); // AV_TOWERPOINT_DESTROYED - packet.Worldstates.emplace_back(1366, 0); // AV_FROSTWOLFE_DESTROYED - packet.Worldstates.emplace_back(1365, 0); // AV_FROSTWOLFW_DESTROYED - packet.Worldstates.emplace_back(1364, 1); // AV_STONEH_CONTROLLED - packet.Worldstates.emplace_back(1363, 1); // AV_ICEWING_CONTROLLED - packet.Worldstates.emplace_back(1362, 1); // AV_DUNN_CONTROLLED - packet.Worldstates.emplace_back(1361, 1); // AV_DUNS_CONTROLLED - packet.Worldstates.emplace_back(1359, 0); // AV_N_MINE_H - packet.Worldstates.emplace_back(1358, 0); // AV_N_MINE_A - packet.Worldstates.emplace_back(1357, 1); // AV_S_MINE_N - packet.Worldstates.emplace_back(1356, 0); // AV_S_MINE_H - packet.Worldstates.emplace_back(1355, 0); // AV_S_MINE_A - packet.Worldstates.emplace_back(1349, 0); // AV_ICEBLOOD_H_A - packet.Worldstates.emplace_back(1347, 1); // AV_ICEBLOOD_H_C - packet.Worldstates.emplace_back(1346, 0); // AV_ICEBLOOD_A_C - packet.Worldstates.emplace_back(1344, 0); // AV_SNOWFALL_H_A - packet.Worldstates.emplace_back(1343, 0); // AV_SNOWFALL_A_A - packet.Worldstates.emplace_back(1342, 0); // AV_SNOWFALL_H_C - packet.Worldstates.emplace_back(1341, 0); // AV_SNOWFALL_A_C - packet.Worldstates.emplace_back(1340, 0); // AV_FROSTWOLF_H_A - packet.Worldstates.emplace_back(1339, 0); // AV_FROSTWOLF_A_A - packet.Worldstates.emplace_back(1338, 1); // AV_FROSTWOLF_H_C - packet.Worldstates.emplace_back(1337, 0); // AV_FROSTWOLF_A_C - packet.Worldstates.emplace_back(1336, 0); // AV_PIKEGRAVE_H_A - packet.Worldstates.emplace_back(1335, 0); // AV_PIKEGRAVE_A_A - packet.Worldstates.emplace_back(1332, 0); // AV_FROSTWOLFHUT_H_A - packet.Worldstates.emplace_back(1331, 0); // AV_FROSTWOLFHUT_A_A - packet.Worldstates.emplace_back(1328, 0); // AV_AID_H_A - packet.Worldstates.emplace_back(1327, 0); // AV_AID_H_C - packet.Worldstates.emplace_back(1325, 1); // AV_AID_A_C - } - break; - case 3277: // Warsong Gulch - if (battleground && battleground->GetTypeID(true) == BATTLEGROUND_WS) - battleground->FillInitialWorldStates(packet); - else - { - packet.Worldstates.emplace_back(1581, 0); // alliance flag captures - packet.Worldstates.emplace_back(1582, 0); // horde flag captures - packet.Worldstates.emplace_back(1545, 0); // unk, set to 1 on alliance flag pickup... - packet.Worldstates.emplace_back(1546, 0); // unk, set to 1 on horde flag pickup, after drop it's -1 - packet.Worldstates.emplace_back(1547, 2); // unk - packet.Worldstates.emplace_back(1601, 3); // unk (max flag captures?) - packet.Worldstates.emplace_back(2338, 1); // horde (0 - hide, 1 - flag ok, 2 - flag picked up (flashing), 3 - flag picked up (not flashing) - packet.Worldstates.emplace_back(2339, 1); // alliance (0 - hide, 1 - flag ok, 2 - flag picked up (flashing), 3 - flag picked up (not flashing) - } - break; - case 3358: // Arathi Basin - if (battleground && (battleground->GetTypeID(true) == BATTLEGROUND_AB || battleground->GetTypeID(true) == BATTLEGROUND_DOM_AB)) - battleground->FillInitialWorldStates(packet); - else - { - packet.Worldstates.emplace_back(1767, 0); // stables alliance - packet.Worldstates.emplace_back(1768, 0); // stables horde - packet.Worldstates.emplace_back(1769, 0); // stables alliance controlled - packet.Worldstates.emplace_back(1770, 0); // stables horde controlled - packet.Worldstates.emplace_back(1772, 0); // farm alliance - packet.Worldstates.emplace_back(1773, 0); // farm horde - packet.Worldstates.emplace_back(1774, 0); // farm alliance controlled - packet.Worldstates.emplace_back(1775, 0); // farm horde controlled - packet.Worldstates.emplace_back(1776, 0); // alliance resources - packet.Worldstates.emplace_back(1777, 0); // horde resources - packet.Worldstates.emplace_back(1778, 0); // horde bases - packet.Worldstates.emplace_back(1779, 0); // alliance bases - packet.Worldstates.emplace_back(1780, 2000); // max resources (2000) - packet.Worldstates.emplace_back(1782, 0); // blacksmith alliance - packet.Worldstates.emplace_back(1783, 0); // blacksmith horde - packet.Worldstates.emplace_back(1784, 0); // blacksmith alliance controlled - packet.Worldstates.emplace_back(1785, 0); // blacksmith horde controlled - packet.Worldstates.emplace_back(1787, 0); // gold mine alliance - packet.Worldstates.emplace_back(1788, 0); // gold mine horde - packet.Worldstates.emplace_back(1789, 0); // gold mine alliance controlled - packet.Worldstates.emplace_back(1790, 0); // gold mine horde controlled - packet.Worldstates.emplace_back(1792, 0); // lumber mill alliance - packet.Worldstates.emplace_back(1793, 0); // lumber mill horde - packet.Worldstates.emplace_back(1794, 0); // lumber mill alliance controlled - packet.Worldstates.emplace_back(1795, 0); // lumber mill horde controlled - packet.Worldstates.emplace_back(1842, 1); // stables (1 - uncontrolled) - packet.Worldstates.emplace_back(1843, 1); // gold mine (1 - uncontrolled) - packet.Worldstates.emplace_back(1844, 1); // lumber mill (1 - uncontrolled) - packet.Worldstates.emplace_back(1845, 1); // farm (1 - uncontrolled) - packet.Worldstates.emplace_back(1846, 1); // blacksmith (1 - uncontrolled) - packet.Worldstates.emplace_back(1861, 2); // unk - packet.Worldstates.emplace_back(1955, 1800); // warning limit (1800) - } - break; - case 3820: // Eye of the Storm - if (battleground && battleground->GetTypeID(true) == BATTLEGROUND_EY) - battleground->FillInitialWorldStates(packet); - else - { - packet.Worldstates.emplace_back(2753, 0); // Horde Bases - packet.Worldstates.emplace_back(2752, 0); // Alliance Bases - packet.Worldstates.emplace_back(2742, 0); // Mage Tower - Horde conflict - packet.Worldstates.emplace_back(2741, 0); // Mage Tower - Alliance conflict - packet.Worldstates.emplace_back(2740, 0); // Fel Reaver - Horde conflict - packet.Worldstates.emplace_back(2739, 0); // Fel Reaver - Alliance conflict - packet.Worldstates.emplace_back(2738, 0); // Draenei - Alliance conflict - packet.Worldstates.emplace_back(2737, 0); // Draenei - Horde conflict - packet.Worldstates.emplace_back(2736, 0); // unk (0 at start) - packet.Worldstates.emplace_back(2735, 0); // unk (0 at start) - packet.Worldstates.emplace_back(2733, 0); // Draenei - Horde control - packet.Worldstates.emplace_back(2732, 0); // Draenei - Alliance control - packet.Worldstates.emplace_back(2731, 1); // Draenei uncontrolled (1 - yes, 0 - no) - packet.Worldstates.emplace_back(2730, 0); // Mage Tower - Alliance control - packet.Worldstates.emplace_back(2729, 0); // Mage Tower - Horde control - packet.Worldstates.emplace_back(2728, 1); // Mage Tower uncontrolled (1 - yes, 0 - no) - packet.Worldstates.emplace_back(2727, 0); // Fel Reaver - Horde control - packet.Worldstates.emplace_back(2726, 0); // Fel Reaver - Alliance control - packet.Worldstates.emplace_back(2725, 1); // Fel Reaver uncontrolled (1 - yes, 0 - no) - packet.Worldstates.emplace_back(2724, 0); // Boold Elf - Horde control - packet.Worldstates.emplace_back(2723, 0); // Boold Elf - Alliance control - packet.Worldstates.emplace_back(2722, 1); // Boold Elf uncontrolled (1 - yes, 0 - no) - packet.Worldstates.emplace_back(2757, 1); // Flag (1 - show, 0 - hide) - doesn't work exactly this way! - packet.Worldstates.emplace_back(2770, 1); // Horde top-stats (1 - show, 0 - hide) // 02 -> horde picked up the flag - packet.Worldstates.emplace_back(2769, 1); // Alliance top-stats (1 - show, 0 - hide) // 02 -> alliance picked up the flag - packet.Worldstates.emplace_back(2750, 0); // Horde resources - packet.Worldstates.emplace_back(2749, 0); // Alliance resources - packet.Worldstates.emplace_back(2565, 142); // unk, constant? - packet.Worldstates.emplace_back(2720, 0); // Capturing progress-bar (100 -> empty (only grey), 0 -> blue|red (no grey), default 0) - packet.Worldstates.emplace_back(2719, 0); // Capturing progress-bar (0 - left, 100 - right) - packet.Worldstates.emplace_back(2718, 0); // Capturing progress-bar (1 - show, 0 - hide) - packet.Worldstates.emplace_back(3085, 379); // unk, constant? - // missing unknowns - } - break; case 3483: // Hellfire Peninsula if (outdoorPvP && outdoorPvP->GetTypeId() == OUTDOOR_PVP_HP) outdoorPvP->FillInitialWorldStates(packet); @@ -9570,135 +9393,6 @@ void Player::SendInitWorldStates(uint32 zoneId, uint32 areaId) packet.Worldstates.emplace_back(2655, 0); // ZM_MAP_ALLIANCE_FLAG_READY } break; - case 3698: // Nagrand Arena - if (battleground && battleground->GetTypeID(true) == BATTLEGROUND_NA) - battleground->FillInitialWorldStates(packet); - else - { - packet.Worldstates.emplace_back(2575, 0); // BATTLEGROUND_NAGRAND_ARENA_GOLD - packet.Worldstates.emplace_back(2576, 0); // BATTLEGROUND_NAGRAND_ARENA_GREEN - packet.Worldstates.emplace_back(2577, 0); // BATTLEGROUND_NAGRAND_ARENA_SHOW - } - break; - case 3702: // Blade's Edge Arena - if (battleground && battleground->GetTypeID(true) == BATTLEGROUND_BE) - battleground->FillInitialWorldStates(packet); - else - { - packet.Worldstates.emplace_back(2544, 0); // BATTLEGROUND_BLADES_EDGE_ARENA_GOLD - packet.Worldstates.emplace_back(2545, 0); // BATTLEGROUND_BLADES_EDGE_ARENA_GREEN - packet.Worldstates.emplace_back(2547, 0); // BATTLEGROUND_BLADES_EDGE_ARENA_SHOW - } - break; - case 3968: // Ruins of Lordaeron - if (battleground && battleground->GetTypeID(true) == BATTLEGROUND_RL) - battleground->FillInitialWorldStates(packet); - else - { - packet.Worldstates.emplace_back(3000, 0); // BATTELGROUND_RUINS_OF_LORDAERNON_GOLD - packet.Worldstates.emplace_back(3001, 0); // BATTELGROUND_RUINS_OF_LORDAERNON_GREEN - packet.Worldstates.emplace_back(3002, 0); // BATTELGROUND_RUINS_OF_LORDAERNON_SHOW - } - break; - case 4378: // Dalaran Sewers - if (battleground && battleground->GetTypeID(true) == BATTLEGROUND_DS) - battleground->FillInitialWorldStates(packet); - else - { - packet.Worldstates.emplace_back(3601, 0); // ARENA_WORLD_STATE_ALIVE_PLAYERS_GOLD - packet.Worldstates.emplace_back(3600, 0); // ARENA_WORLD_STATE_ALIVE_PLAYERS_GREEN - packet.Worldstates.emplace_back(3610, 0); // ARENA_WORLD_STATE_ALIVE_PLAYERS_SHOW - } - break; - case 4384: // Strand of the Ancients - if (battleground && battleground->GetTypeID(true) == BATTLEGROUND_SA) - battleground->FillInitialWorldStates(packet); - else - { - packet.Worldstates.emplace_back(3849, 0); // Gate of Temple - packet.Worldstates.emplace_back(3638, 0); // Gate of Yellow Moon - packet.Worldstates.emplace_back(3623, 0); // Gate of Green Emerald - packet.Worldstates.emplace_back(3620, 0); // Gate of Blue Sapphire - packet.Worldstates.emplace_back(3617, 0); // Gate of Red Sun - packet.Worldstates.emplace_back(3614, 0); // Gate of Purple Ametyst - packet.Worldstates.emplace_back(3571, 0); // bonus timer (1 - on, 0 - off) - packet.Worldstates.emplace_back(3565, 0); // Horde Attacker - packet.Worldstates.emplace_back(3564, 0); // Alliance Attacker - - // End Round timer, example: 19:59 -> A:BC - packet.Worldstates.emplace_back(3561, 0); // C - packet.Worldstates.emplace_back(3560, 0); // B - packet.Worldstates.emplace_back(3559, 0); // A - - packet.Worldstates.emplace_back(3637, 0); // BG_SA_CENTER_GY_ALLIANCE - packet.Worldstates.emplace_back(3636, 0); // BG_SA_RIGHT_GY_ALLIANCE - packet.Worldstates.emplace_back(3635, 0); // BG_SA_LEFT_GY_ALLIANCE - packet.Worldstates.emplace_back(3634, 0); // BG_SA_CENTER_GY_HORDE - packet.Worldstates.emplace_back(3633, 0); // BG_SA_LEFT_GY_HORDE - packet.Worldstates.emplace_back(3632, 0); // BG_SA_RIGHT_GY_HORDE - packet.Worldstates.emplace_back(3631, 0); // BG_SA_HORDE_DEFENCE_TOKEN - packet.Worldstates.emplace_back(3630, 0); // BG_SA_ALLIANCE_DEFENCE_TOKEN - packet.Worldstates.emplace_back(3629, 0); // BG_SA_LEFT_ATT_TOKEN_HRD - packet.Worldstates.emplace_back(3628, 0); // BG_SA_RIGHT_ATT_TOKEN_HRD - packet.Worldstates.emplace_back(3627, 0); // BG_SA_RIGHT_ATT_TOKEN_ALL - packet.Worldstates.emplace_back(3626, 0); // BG_SA_LEFT_ATT_TOKEN_ALL - // missing unknowns - } - break; - case 4406: // Ring of Valor - if (battleground && battleground->GetTypeID(true) == BATTLEGROUND_RV) - battleground->FillInitialWorldStates(packet); - else - { - packet.Worldstates.emplace_back(3600, 0); // ARENA_WORLD_STATE_ALIVE_PLAYERS_GREEN - packet.Worldstates.emplace_back(3601, 0); // ARENA_WORLD_STATE_ALIVE_PLAYERS_GOLD - packet.Worldstates.emplace_back(3610, 0); // ARENA_WORLD_STATE_ALIVE_PLAYERS_SHOW - } - break; - case 4710: // Isle of Conquest - if (battleground && battleground->GetTypeID(true) == BATTLEGROUND_IC) - battleground->FillInitialWorldStates(packet); - else - { - packet.Worldstates.emplace_back(4221, 1); // BG_IC_ALLIANCE_RENFORT_SET - packet.Worldstates.emplace_back(4222, 1); // BG_IC_HORDE_RENFORT_SET - packet.Worldstates.emplace_back(4226, 300); // BG_IC_ALLIANCE_RENFORT - packet.Worldstates.emplace_back(4227, 300); // BG_IC_HORDE_RENFORT - packet.Worldstates.emplace_back(4322, 1); // BG_IC_GATE_FRONT_H_WS_OPEN - packet.Worldstates.emplace_back(4321, 1); // BG_IC_GATE_WEST_H_WS_OPEN - packet.Worldstates.emplace_back(4320, 1); // BG_IC_GATE_EAST_H_WS_OPEN - packet.Worldstates.emplace_back(4323, 1); // BG_IC_GATE_FRONT_A_WS_OPEN - packet.Worldstates.emplace_back(4324, 1); // BG_IC_GATE_WEST_A_WS_OPEN - packet.Worldstates.emplace_back(4325, 1); // BG_IC_GATE_EAST_A_WS_OPEN - packet.Worldstates.emplace_back(4317, 1); // unk - packet.Worldstates.emplace_back(4301, 1); // BG_IC_DOCKS_UNCONTROLLED - packet.Worldstates.emplace_back(4296, 1); // BG_IC_HANGAR_UNCONTROLLED - packet.Worldstates.emplace_back(4306, 1); // BG_IC_QUARRY_UNCONTROLLED - packet.Worldstates.emplace_back(4311, 1); // BG_IC_REFINERY_UNCONTROLLED - packet.Worldstates.emplace_back(4294, 1); // BG_IC_WORKSHOP_UNCONTROLLED - packet.Worldstates.emplace_back(4243, 1); // unk - packet.Worldstates.emplace_back(4345, 1); // unk - } - break; - case 5031: // Twin Peaks - if (battleground && battleground->GetTypeID(true) == BATTLEGROUND_TP) - battleground->FillInitialWorldStates(packet); - else - { - packet.Worldstates.emplace_back(1581, 0x0); // alliance flag captures - packet.Worldstates.emplace_back(1582, 0x0); // horde flag captures - packet.Worldstates.emplace_back(1545, 0x0); // unk - packet.Worldstates.emplace_back(1546, 0x0); // unk - packet.Worldstates.emplace_back(1547, 0x2); // unk - packet.Worldstates.emplace_back(1601, 0x3); // unk - packet.Worldstates.emplace_back(2338, 0x1); // horde (0 - hide, 1 - flag ok, 2 - flag picked up (flashing), 3 - flag picked up (not flashing) - packet.Worldstates.emplace_back(2339, 0x1); // alliance (0 - hide, 1 - flag ok, 2 - flag picked up (flashing), 3 - flag picked up (not flashing) - } - break; - case 5449: // Battle for Gilneas - if (battleground && battleground->GetTypeID(true) == BATTLEGROUND_BFG) - battleground->FillInitialWorldStates(packet); - break; default: break; } |
