diff options
Diffstat (limited to 'src/server')
| -rw-r--r-- | src/server/game/Entities/Player/Player.h | 1 | ||||
| -rw-r--r-- | src/server/game/Handlers/TokenHandler.cpp | 9 | ||||
| -rw-r--r-- | src/server/game/Miscellaneous/SharedDefines.h | 21 | ||||
| -rw-r--r-- | src/server/game/Movement/Spline/MoveSpline.cpp | 10 | ||||
| -rw-r--r-- | src/server/game/Server/Packets/TokenPackets.cpp | 6 | ||||
| -rw-r--r-- | src/server/game/Server/Packets/TokenPackets.h | 8 | ||||
| -rw-r--r-- | src/server/game/Server/Protocol/Opcodes.cpp | 52 | ||||
| -rw-r--r-- | src/server/game/Server/Protocol/Opcodes.h | 3 | ||||
| -rw-r--r-- | src/server/game/Server/WorldSession.cpp | 2 | ||||
| -rw-r--r-- | src/server/scripts/Battlegrounds/HookPoint/arena_hook_point.cpp | 384 | ||||
| -rw-r--r-- | src/server/scripts/Battlegrounds/battlegrounds_script_loader.cpp | 2 |
11 files changed, 442 insertions, 56 deletions
diff --git a/src/server/game/Entities/Player/Player.h b/src/server/game/Entities/Player/Player.h index d6abd1c4104..28ba159b228 100644 --- a/src/server/game/Entities/Player/Player.h +++ b/src/server/game/Entities/Player/Player.h @@ -518,6 +518,7 @@ enum PlayerFlagsEx PLAYER_FLAGS_EX_REAGENT_BANK_UNLOCKED = 0x0001, PLAYER_FLAGS_EX_MERCENARY_MODE = 0x0002, PLAYER_FLAGS_EX_ARTIFACT_FORGE_CHEAT = 0x0004, + PLAYER_FLAGS_EX_ITEM_LEVEL_SQUISH = 0x0020, // Uses ItemLevelSquish gametable PLAYER_FLAGS_EX_IN_PVP_COMBAT = 0x0040, // Forbids /follow PLAYER_FLAGS_EX_MENTOR = 0x0080, PLAYER_FLAGS_EX_NEWCOMER = 0x0100, diff --git a/src/server/game/Handlers/TokenHandler.cpp b/src/server/game/Handlers/TokenHandler.cpp index de58aac4905..dae2aec41b2 100644 --- a/src/server/game/Handlers/TokenHandler.cpp +++ b/src/server/game/Handlers/TokenHandler.cpp @@ -22,9 +22,8 @@ void WorldSession::HandleCommerceTokenGetLog(WorldPackets::Token::CommerceTokenG { WorldPackets::Token::CommerceTokenGetLogResponse response; - /// @todo: 6.x fix implementation response.ClientToken = commerceTokenGetLog.ClientToken; - response.Result = TOKEN_RESULT_SUCCESS; + response.Result = TOKEN_RESULT_ERROR_DISABLED; SendPacket(response.Write()); } @@ -33,11 +32,9 @@ void WorldSession::HandleCommerceTokenGetMarketPrice(WorldPackets::Token::Commer { WorldPackets::Token::CommerceTokenGetMarketPriceResponse response; - /// @todo: 6.x fix implementation - response.PriceGuarantee = 300000000; + response.Price = 0; response.ClientToken = commerceTokenGetMarketPrice.ClientToken; - response.ServerToken = TOKEN_RESULT_SUCCESS; - //packet.ReadUInt32("UnkInt32"); + response.Result = TOKEN_RESULT_ERROR_DISABLED; SendPacket(response.Write()); } diff --git a/src/server/game/Miscellaneous/SharedDefines.h b/src/server/game/Miscellaneous/SharedDefines.h index 26dcc9f7fdc..5695f70a322 100644 --- a/src/server/game/Miscellaneous/SharedDefines.h +++ b/src/server/game/Miscellaneous/SharedDefines.h @@ -7280,15 +7280,18 @@ enum LineOfSightChecks : uint8 enum TokenResult { - TOKEN_RESULT_SUCCESS = 0, - TOKEN_RESULT_ERROR_DISABLED = 1, - TOKEN_RESULT_ERROR_OTHER = 2, - TOKEN_RESULT_ERROR_NONE_FOR_SALE = 3, - TOKEN_RESULT_ERROR_TOO_MANY_TOKENS = 4, - TOKEN_RESULT_SUCCESS_NO = 5, - TOKEN_RESULT_ERROR_TRANSACTION_IN_PROGRESS = 6, - TOKEN_RESULT_ERROR_AUCTIONABLE_TOKEN_OWNED = 7, - TOKEN_RESULT_ERROR_TRIAL_RESTRICTED = 8 + TOKEN_RESULT_SUCCESS = 0, + TOKEN_RESULT_ERROR_DISABLED = 1, + TOKEN_RESULT_ERROR_OTHER = 2, + TOKEN_RESULT_ERROR_NONE_FOR_SALE = 3, + TOKEN_RESULT_ERROR_TOO_MANY_TOKENS = 4, + TOKEN_RESULT_SUCCESS_NO = 5, + TOKEN_RESULT_ERROR_TRANSACTION_IN_PROGRESS = 6, + TOKEN_RESULT_ERROR_AUCTIONABLE_TOKEN_OWNED = 7, + TOKEN_RESULT_ERROR_TRIAL_RESTRICTED = 8, + TOKEN_RESULT_ERROR_BALANCE_NEAR_CAP = 9, + TOKEN_RESULT_ERROR_NOT_ENOUGH_PURCHASED_GAME_TIME = 10, + TOKEN_RESULT_ERROR_THROTTLE_TOKENS = 11 }; enum TutorialAction : uint8 diff --git a/src/server/game/Movement/Spline/MoveSpline.cpp b/src/server/game/Movement/Spline/MoveSpline.cpp index e5d9fb3d60b..39118263388 100644 --- a/src/server/game/Movement/Spline/MoveSpline.cpp +++ b/src/server/game/Movement/Spline/MoveSpline.cpp @@ -269,22 +269,18 @@ bool MoveSplineInitArgs::Validate(Unit const* unit) // check path lengths - why are we even starting such short movement? bool MoveSplineInitArgs::_checkPathLengths() { - constexpr float MIN_XY_OFFSET = -(1 << 11) / 4.0f; - constexpr float MIN_Z_OFFSET = -(1 << 10) / 4.0f; - - // positive values have 1 less bit limit (if the highest bit was set, value would be sign extended into negative when decompressing) constexpr float MAX_XY_OFFSET = (1 << 10) / 4.0f; constexpr float MAX_Z_OFFSET = (1 << 9) / 4.0f; - auto isValidPackedXYOffset = [](float coord) -> bool { return coord > MIN_XY_OFFSET && coord < MAX_XY_OFFSET; }; - auto isValidPackedZOffset = [](float coord) -> bool { return coord > MIN_Z_OFFSET && coord < MAX_Z_OFFSET; }; + auto isValidPackedXYOffset = [](float coord) -> bool { return coord > -MAX_XY_OFFSET && coord < MAX_XY_OFFSET; }; + auto isValidPackedZOffset = [](float coord) -> bool { return coord > -MAX_Z_OFFSET && coord < MAX_Z_OFFSET; }; if (path.size() > 2) { Vector3 middle = (path.front() + path.back()) / 2; for (uint32 i = 1; i < path.size() - 1; ++i) { - if ((path[i + 1] - path[i]).length() < 0.1f) + if ((path[i + 1] - path[i]).squaredLength() < 0.01f) return false; // when compression is enabled, each point coord is packed into 11 bits (10 for Z) diff --git a/src/server/game/Server/Packets/TokenPackets.cpp b/src/server/game/Server/Packets/TokenPackets.cpp index db0b35c9ea6..2d94b849421 100644 --- a/src/server/game/Server/Packets/TokenPackets.cpp +++ b/src/server/game/Server/Packets/TokenPackets.cpp @@ -50,9 +50,9 @@ void CommerceTokenGetMarketPrice::Read() WorldPacket const* CommerceTokenGetMarketPriceResponse::Write() { _worldPacket << ClientToken; - _worldPacket << ServerToken; - _worldPacket << PriceGuarantee; - _worldPacket << PriceLockDurationSeconds; + _worldPacket << Result; + _worldPacket << Price; + _worldPacket << ExpectedSecondsUntilSold; return &_worldPacket; } diff --git a/src/server/game/Server/Packets/TokenPackets.h b/src/server/game/Server/Packets/TokenPackets.h index d6844d37bb2..0a1c8dbfc13 100644 --- a/src/server/game/Server/Packets/TokenPackets.h +++ b/src/server/game/Server/Packets/TokenPackets.h @@ -73,10 +73,10 @@ namespace WorldPackets WorldPacket const* Write() override; - uint32 ClientToken = 0; - uint32 ServerToken = 0; - uint64 PriceGuarantee = 0; - uint32 PriceLockDurationSeconds = 0; // preset auction duration enum + uint32 ClientToken = 0; + int32 Result = 0; + uint64 Price = 0; + uint32 ExpectedSecondsUntilSold = 0; }; } } diff --git a/src/server/game/Server/Protocol/Opcodes.cpp b/src/server/game/Server/Protocol/Opcodes.cpp index ba343184245..df54c7f484a 100644 --- a/src/server/game/Server/Protocol/Opcodes.cpp +++ b/src/server/game/Server/Protocol/Opcodes.cpp @@ -174,8 +174,8 @@ void OpcodeTable::InitializeClientOpcodes() DEFINE_HANDLER(CMSG_ASSIGN_EQUIPMENT_SET_SPEC, STATUS_UNHANDLED, PROCESS_INPLACE, &WorldSession::Handle_NULL); DEFINE_HANDLER(CMSG_ATTACK_STOP, STATUS_LOGGEDIN, PROCESS_INPLACE, &WorldSession::HandleAttackStopOpcode); DEFINE_HANDLER(CMSG_ATTACK_SWING, STATUS_LOGGEDIN, PROCESS_INPLACE, &WorldSession::HandleAttackSwingOpcode); - DEFINE_HANDLER(CMSG_AUCTIONABLE_TOKEN_SELL, STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::Handle_NULL); - DEFINE_HANDLER(CMSG_AUCTIONABLE_TOKEN_SELL_AT_MARKET_PRICE, STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::Handle_NULL); + DEFINE_HANDLER(CMSG_AUCTIONABLE_TOKEN_SELL, STATUS_IGNORED, PROCESS_THREADUNSAFE, &WorldSession::Handle_NULL); + DEFINE_HANDLER(CMSG_AUCTIONABLE_TOKEN_SELL_AT_MARKET_PRICE, STATUS_IGNORED, PROCESS_THREADUNSAFE, &WorldSession::Handle_NULL); DEFINE_HANDLER(CMSG_AUCTION_BROWSE_QUERY, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleAuctionBrowseQuery); DEFINE_HANDLER(CMSG_AUCTION_CANCEL_COMMODITIES_PURCHASE, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleAuctionCancelCommoditiesPurchase); DEFINE_HANDLER(CMSG_AUCTION_CONFIRM_COMMODITIES_PURCHASE, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleAuctionConfirmCommoditiesPurchase); @@ -220,17 +220,17 @@ void OpcodeTable::InitializeClientOpcodes() DEFINE_HANDLER(CMSG_BATTLEMASTER_JOIN_SKIRMISH, STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::Handle_NULL); DEFINE_HANDLER(CMSG_BATTLENET_CHALLENGE_RESPONSE, STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::Handle_NULL); DEFINE_HANDLER(CMSG_BATTLENET_REQUEST, STATUS_AUTHED, PROCESS_THREADUNSAFE, &WorldSession::HandleBattlenetRequest); - DEFINE_HANDLER(CMSG_BATTLE_PAY_ACK_FAILED_RESPONSE, STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::Handle_NULL); - DEFINE_HANDLER(CMSG_BATTLE_PAY_CANCEL_OPEN_CHECKOUT, STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::Handle_NULL); - DEFINE_HANDLER(CMSG_BATTLE_PAY_CONFIRM_PURCHASE_RESPONSE, STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::Handle_NULL); - DEFINE_HANDLER(CMSG_BATTLE_PAY_DISTRIBUTION_ASSIGN_TO_TARGET, STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::Handle_NULL); - DEFINE_HANDLER(CMSG_BATTLE_PAY_DISTRIBUTION_ASSIGN_VAS, STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::Handle_NULL); - DEFINE_HANDLER(CMSG_BATTLE_PAY_GET_PRODUCT_LIST, STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::Handle_NULL); - DEFINE_HANDLER(CMSG_BATTLE_PAY_GET_PURCHASE_LIST, STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::Handle_NULL); - DEFINE_HANDLER(CMSG_BATTLE_PAY_OPEN_CHECKOUT, STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::Handle_NULL); - DEFINE_HANDLER(CMSG_BATTLE_PAY_REQUEST_PRICE_INFO, STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::Handle_NULL); - DEFINE_HANDLER(CMSG_BATTLE_PAY_START_PURCHASE, STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::Handle_NULL); - DEFINE_HANDLER(CMSG_BATTLE_PAY_START_VAS_PURCHASE, STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::Handle_NULL); + DEFINE_HANDLER(CMSG_BATTLE_PAY_ACK_FAILED_RESPONSE, STATUS_IGNORED, PROCESS_THREADUNSAFE, &WorldSession::Handle_NULL); + DEFINE_HANDLER(CMSG_BATTLE_PAY_CANCEL_OPEN_CHECKOUT, STATUS_IGNORED, PROCESS_THREADUNSAFE, &WorldSession::Handle_NULL); + DEFINE_HANDLER(CMSG_BATTLE_PAY_CONFIRM_PURCHASE_RESPONSE, STATUS_IGNORED, PROCESS_THREADUNSAFE, &WorldSession::Handle_NULL); + DEFINE_HANDLER(CMSG_BATTLE_PAY_DISTRIBUTION_ASSIGN_TO_TARGET, STATUS_IGNORED, PROCESS_THREADUNSAFE, &WorldSession::Handle_NULL); + DEFINE_HANDLER(CMSG_BATTLE_PAY_DISTRIBUTION_ASSIGN_VAS, STATUS_IGNORED, PROCESS_THREADUNSAFE, &WorldSession::Handle_NULL); + DEFINE_HANDLER(CMSG_BATTLE_PAY_GET_PRODUCT_LIST, STATUS_IGNORED, PROCESS_THREADUNSAFE, &WorldSession::Handle_NULL); + DEFINE_HANDLER(CMSG_BATTLE_PAY_GET_PURCHASE_LIST, STATUS_IGNORED, PROCESS_THREADUNSAFE, &WorldSession::Handle_NULL); + DEFINE_HANDLER(CMSG_BATTLE_PAY_OPEN_CHECKOUT, STATUS_IGNORED, PROCESS_THREADUNSAFE, &WorldSession::Handle_NULL); + DEFINE_HANDLER(CMSG_BATTLE_PAY_REQUEST_PRICE_INFO, STATUS_IGNORED, PROCESS_THREADUNSAFE, &WorldSession::Handle_NULL); + DEFINE_HANDLER(CMSG_BATTLE_PAY_START_PURCHASE, STATUS_IGNORED, PROCESS_THREADUNSAFE, &WorldSession::Handle_NULL); + DEFINE_HANDLER(CMSG_BATTLE_PAY_START_VAS_PURCHASE, STATUS_IGNORED, PROCESS_THREADUNSAFE, &WorldSession::Handle_NULL); DEFINE_HANDLER(CMSG_BATTLE_PET_CLEAR_FANFARE, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleBattlePetClearFanfare); DEFINE_HANDLER(CMSG_BATTLE_PET_DELETE_PET, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleBattlePetDeletePet); DEFINE_HANDLER(CMSG_BATTLE_PET_DELETE_PET_CHEAT, STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::Handle_NULL); @@ -281,7 +281,7 @@ void OpcodeTable::InitializeClientOpcodes() DEFINE_HANDLER(CMSG_CANCEL_TEMP_ENCHANTMENT, STATUS_LOGGEDIN, PROCESS_INPLACE, &WorldSession::HandleCancelTempEnchantmentOpcode); DEFINE_HANDLER(CMSG_CANCEL_TRADE, STATUS_LOGGEDIN_OR_RECENTLY_LOGGOUT, PROCESS_THREADUNSAFE, &WorldSession::HandleCancelTradeOpcode); DEFINE_HANDLER(CMSG_CAN_DUEL, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleCanDuel); - DEFINE_HANDLER(CMSG_CAN_REDEEM_TOKEN_FOR_BALANCE, STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::Handle_NULL); + DEFINE_HANDLER(CMSG_CAN_REDEEM_TOKEN_FOR_BALANCE, STATUS_IGNORED, PROCESS_THREADUNSAFE, &WorldSession::Handle_NULL); DEFINE_HANDLER(CMSG_CAST_SPELL, STATUS_LOGGEDIN, PROCESS_THREADSAFE, &WorldSession::HandleCastSpellOpcode); DEFINE_HANDLER(CMSG_CHALLENGE_MODE_REQUEST_LEADERS, STATUS_UNHANDLED, PROCESS_INPLACE, &WorldSession::Handle_NULL); DEFINE_HANDLER(CMSG_CHANGE_BAG_SLOT_FLAG, STATUS_LOGGEDIN, PROCESS_INPLACE, &WorldSession::HandleChangeBagSlotFlag); @@ -379,7 +379,7 @@ void OpcodeTable::InitializeClientOpcodes() DEFINE_HANDLER(CMSG_COMMENTATOR_GET_PLAYER_COOLDOWNS, STATUS_UNHANDLED, PROCESS_INPLACE, &WorldSession::Handle_NULL); DEFINE_HANDLER(CMSG_COMMENTATOR_GET_PLAYER_INFO, STATUS_UNHANDLED, PROCESS_INPLACE, &WorldSession::Handle_NULL); DEFINE_HANDLER(CMSG_COMMENTATOR_START_WARGAME, STATUS_UNHANDLED, PROCESS_INPLACE, &WorldSession::Handle_NULL); - DEFINE_HANDLER(CMSG_COMMERCE_TOKEN_GET_COUNT, STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::Handle_NULL); + DEFINE_HANDLER(CMSG_COMMERCE_TOKEN_GET_COUNT, STATUS_IGNORED, PROCESS_THREADUNSAFE, &WorldSession::Handle_NULL); DEFINE_HANDLER(CMSG_COMMERCE_TOKEN_GET_LOG, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleCommerceTokenGetLog); DEFINE_HANDLER(CMSG_COMMERCE_TOKEN_GET_MARKET_PRICE, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleCommerceTokenGetMarketPrice); DEFINE_HANDLER(CMSG_COMPLAINT, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleComplaint); @@ -389,11 +389,11 @@ void OpcodeTable::InitializeClientOpcodes() DEFINE_HANDLER(CMSG_CONFIRM_PROFESSION_RESPEC, STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::Handle_NULL); DEFINE_HANDLER(CMSG_CONFIRM_RESPEC_WIPE, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleConfirmRespecWipeOpcode); DEFINE_HANDLER(CMSG_CONNECT_TO_FAILED, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_EarlyProccess); - DEFINE_HANDLER(CMSG_CONSUMABLE_TOKEN_BUY, STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::Handle_NULL); - DEFINE_HANDLER(CMSG_CONSUMABLE_TOKEN_BUY_AT_MARKET_PRICE, STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::Handle_NULL); - DEFINE_HANDLER(CMSG_CONSUMABLE_TOKEN_CAN_VETERAN_BUY, STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::Handle_NULL); - DEFINE_HANDLER(CMSG_CONSUMABLE_TOKEN_REDEEM, STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::Handle_NULL); - DEFINE_HANDLER(CMSG_CONSUMABLE_TOKEN_REDEEM_CONFIRMATION, STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::Handle_NULL); + DEFINE_HANDLER(CMSG_CONSUMABLE_TOKEN_BUY, STATUS_IGNORED, PROCESS_THREADUNSAFE, &WorldSession::Handle_NULL); + DEFINE_HANDLER(CMSG_CONSUMABLE_TOKEN_BUY_AT_MARKET_PRICE, STATUS_IGNORED, PROCESS_THREADUNSAFE, &WorldSession::Handle_NULL); + DEFINE_HANDLER(CMSG_CONSUMABLE_TOKEN_CAN_VETERAN_BUY, STATUS_IGNORED, PROCESS_THREADUNSAFE, &WorldSession::Handle_NULL); + DEFINE_HANDLER(CMSG_CONSUMABLE_TOKEN_REDEEM, STATUS_IGNORED, PROCESS_THREADUNSAFE, &WorldSession::Handle_NULL); + DEFINE_HANDLER(CMSG_CONSUMABLE_TOKEN_REDEEM_CONFIRMATION, STATUS_IGNORED, PROCESS_THREADUNSAFE, &WorldSession::Handle_NULL); DEFINE_HANDLER(CMSG_CONTENT_TRACKING_START_TRACKING, STATUS_UNHANDLED, PROCESS_INPLACE, &WorldSession::Handle_NULL); DEFINE_HANDLER(CMSG_CONTENT_TRACKING_STOP_TRACKING, STATUS_UNHANDLED, PROCESS_INPLACE, &WorldSession::Handle_NULL); DEFINE_HANDLER(CMSG_CONTRIBUTION_CONTRIBUTE, STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::Handle_NULL); @@ -494,8 +494,8 @@ void OpcodeTable::InitializeClientOpcodes() DEFINE_HANDLER(CMSG_GET_REMAINING_GAME_TIME, STATUS_UNHANDLED, PROCESS_INPLACE, &WorldSession::Handle_NULL); DEFINE_HANDLER(CMSG_GET_TROPHY_LIST, STATUS_UNHANDLED, PROCESS_INPLACE, &WorldSession::Handle_NULL); DEFINE_HANDLER(CMSG_GET_UNDELETE_CHARACTER_COOLDOWN_STATUS, STATUS_AUTHED, PROCESS_THREADUNSAFE, &WorldSession::HandleGetUndeleteCooldownStatus); - DEFINE_HANDLER(CMSG_GET_VAS_ACCOUNT_CHARACTER_LIST, STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::Handle_NULL); - DEFINE_HANDLER(CMSG_GET_VAS_TRANSFER_TARGET_REALM_LIST, STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::Handle_NULL); + DEFINE_HANDLER(CMSG_GET_VAS_ACCOUNT_CHARACTER_LIST, STATUS_IGNORED, PROCESS_THREADUNSAFE, &WorldSession::Handle_NULL); + DEFINE_HANDLER(CMSG_GET_VAS_TRANSFER_TARGET_REALM_LIST, STATUS_IGNORED, PROCESS_THREADUNSAFE, &WorldSession::Handle_NULL); DEFINE_HANDLER(CMSG_GM_TICKET_ACKNOWLEDGE_SURVEY, STATUS_UNHANDLED, PROCESS_INPLACE, &WorldSession::Handle_NULL); DEFINE_HANDLER(CMSG_GM_TICKET_GET_CASE_STATUS, STATUS_LOGGEDIN, PROCESS_INPLACE, &WorldSession::HandleGMTicketGetCaseStatusOpcode); DEFINE_HANDLER(CMSG_GM_TICKET_GET_SYSTEM_STATUS, STATUS_LOGGEDIN, PROCESS_INPLACE, &WorldSession::HandleGMTicketSystemStatusOpcode); @@ -1016,7 +1016,7 @@ void OpcodeTable::InitializeClientOpcodes() DEFINE_HANDLER(CMSG_UPDATE_MISSILE_TRAJECTORY, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleUpdateMissileTrajectory); DEFINE_HANDLER(CMSG_UPDATE_RAID_TARGET, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleUpdateRaidTargetOpcode); DEFINE_HANDLER(CMSG_UPDATE_SPELL_VISUAL, STATUS_LOGGEDIN, PROCESS_INPLACE, &WorldSession::HandleUpdateAuraVisual); - DEFINE_HANDLER(CMSG_UPDATE_VAS_PURCHASE_STATES, STATUS_UNHANDLED, PROCESS_INPLACE, &WorldSession::Handle_NULL); + DEFINE_HANDLER(CMSG_UPDATE_VAS_PURCHASE_STATES, STATUS_IGNORED, PROCESS_INPLACE, &WorldSession::Handle_NULL); DEFINE_HANDLER(CMSG_UPGRADE_GARRISON, STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::Handle_NULL); DEFINE_HANDLER(CMSG_UPGRADE_RUNEFORGE_LEGENDARY, STATUS_UNHANDLED, PROCESS_INPLACE, &WorldSession::Handle_NULL); DEFINE_HANDLER(CMSG_USED_FOLLOW, STATUS_UNHANDLED, PROCESS_INPLACE, &WorldSession::Handle_NULL); @@ -1024,9 +1024,9 @@ void OpcodeTable::InitializeClientOpcodes() DEFINE_HANDLER(CMSG_USE_EQUIPMENT_SET, STATUS_LOGGEDIN, PROCESS_INPLACE, &WorldSession::HandleUseEquipmentSet); DEFINE_HANDLER(CMSG_USE_ITEM, STATUS_LOGGEDIN, PROCESS_INPLACE, &WorldSession::HandleUseItemOpcode); DEFINE_HANDLER(CMSG_USE_TOY, STATUS_LOGGEDIN, PROCESS_INPLACE, &WorldSession::HandleUseToy); - DEFINE_HANDLER(CMSG_VAS_CHECK_TRANSFER_OK, STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::Handle_NULL); - DEFINE_HANDLER(CMSG_VAS_GET_QUEUE_MINUTES, STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::Handle_NULL); - DEFINE_HANDLER(CMSG_VAS_GET_SERVICE_STATUS, STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::Handle_NULL); + DEFINE_HANDLER(CMSG_VAS_CHECK_TRANSFER_OK, STATUS_IGNORED, PROCESS_THREADUNSAFE, &WorldSession::Handle_NULL); + DEFINE_HANDLER(CMSG_VAS_GET_QUEUE_MINUTES, STATUS_IGNORED, PROCESS_THREADUNSAFE, &WorldSession::Handle_NULL); + DEFINE_HANDLER(CMSG_VAS_GET_SERVICE_STATUS, STATUS_IGNORED, PROCESS_THREADUNSAFE, &WorldSession::Handle_NULL); DEFINE_HANDLER(CMSG_VIOLENCE_LEVEL, STATUS_AUTHED, PROCESS_INPLACE, &WorldSession::HandleViolenceLevel); DEFINE_HANDLER(CMSG_VOICE_CHANNEL_STT_TOKEN_REQUEST, STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::Handle_NULL); DEFINE_HANDLER(CMSG_VOICE_CHAT_JOIN_CHANNEL, STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::Handle_NULL); diff --git a/src/server/game/Server/Protocol/Opcodes.h b/src/server/game/Server/Protocol/Opcodes.h index a4da8df05f8..a385c379ab1 100644 --- a/src/server/game/Server/Protocol/Opcodes.h +++ b/src/server/game/Server/Protocol/Opcodes.h @@ -2262,7 +2262,8 @@ enum SessionStatus STATUS_TRANSFER, // Player transferring to another map (_player != NULL, m_GUID == _player->GetGUID(), !inWorld()) STATUS_LOGGEDIN_OR_RECENTLY_LOGGOUT, // _player != NULL or _player == NULL && m_playerRecentlyLogout && m_playerLogout, m_GUID store last _player guid) STATUS_NEVER, // Opcode not accepted from client (deprecated or server side only) - STATUS_UNHANDLED // Opcode not handled yet + STATUS_UNHANDLED, // Opcode not handled yet + STATUS_IGNORED // Opcode not handled - and no plans to handle it }; enum PacketProcessing diff --git a/src/server/game/Server/WorldSession.cpp b/src/server/game/Server/WorldSession.cpp index e0daa6751d5..652d912ca15 100644 --- a/src/server/game/Server/WorldSession.cpp +++ b/src/server/game/Server/WorldSession.cpp @@ -452,6 +452,8 @@ bool WorldSession::Update(uint32 diff, PacketFilter& updater) TC_LOG_ERROR("network.opcode", "Received not handled opcode {} from {}", GetOpcodeNameForLogging(static_cast<OpcodeClient>(packet->GetOpcode())) , GetPlayerInfo()); break; + case STATUS_IGNORED: + break; } } catch (WorldPackets::InvalidHyperlinkException const& ihe) diff --git a/src/server/scripts/Battlegrounds/HookPoint/arena_hook_point.cpp b/src/server/scripts/Battlegrounds/HookPoint/arena_hook_point.cpp new file mode 100644 index 00000000000..bc30f3eb8b6 --- /dev/null +++ b/src/server/scripts/Battlegrounds/HookPoint/arena_hook_point.cpp @@ -0,0 +1,384 @@ +/* + * This file is part of the TrinityCore Project. See AUTHORS file for Copyright information + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or (at your + * option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see <http://www.gnu.org/licenses/>. + */ + +#include "Battleground.h" +#include "BattlegroundScript.h" +#include "Conversation.h" +#include "Creature.h" +#include "CreatureAI.h" +#include "GameObject.h" +#include "Map.h" +#include "MotionMaster.h" +#include "Player.h" +#include "ScriptMgr.h" +#include "SpellScript.h" +#include "TaskScheduler.h" + +namespace HookPoint +{ + namespace Actions + { + static constexpr uint32 ReactionTrigger = 1; + static constexpr uint32 ReactionDead = 2; + static constexpr uint32 ReactionCheer = 3; + static constexpr uint32 PennyMove = 4; + } + + namespace BouncerPaths + { + static constexpr uint64 Path1 = 14324500; + static constexpr uint64 Path2 = 14324501; + static constexpr uint64 Path3 = 14324502; + static constexpr uint64 Path4 = 14324503; + } + + namespace Conversations + { + static constexpr uint32 Prepare = 9450; + } + + namespace Creatures + { + static constexpr uint32 DanielPoole = 137530; + static constexpr uint32 Bouncer = 143245; + static constexpr uint32 Penny = 143121; + } + + namespace GameObjects + { + static constexpr uint32 InvisWall = 296728; + static constexpr uint32 SlideDoor = 297144; + } + + namespace MapIds + { + static constexpr uint32 HookPoint = 1825; + } + + namespace Spells + { + static constexpr uint32 KulTirasArenaVOCooldownAura = 275002; + static constexpr uint32 ArenaReactionTrigger = 278776; + static constexpr uint32 KulTirasArenaCrowdCheers = 278937; + static constexpr uint32 ArenaLowHealthDyingTrigger = 279047; + static constexpr uint32 KulTirasArenaCrowdBoos = 278926; + } + + namespace StringIds + { + static constexpr std::string_view Bouncer1 = "hook_point_bouncer_1"sv; + static constexpr std::string_view Bouncer2 = "hook_point_bouncer_2"sv; + static constexpr std::string_view Bouncer3 = "hook_point_bouncer_3"sv; + static constexpr std::string_view Bouncer4 = "hook_point_bouncer_4"sv; + } + + namespace Texts + { + namespace DanielPoole + { + static constexpr uint8 Start = 0; + static constexpr uint8 ReactionLowHealth = 1; + static constexpr uint8 ReactionKill = 2; + } + } +} + +struct arena_hook_point : ArenaScript +{ + explicit arena_hook_point(BattlegroundMap* map) : ArenaScript(map) { } + + void OnStart() override + { + for (ObjectGuid const& guid : _doorGUIDs) + { + if (GameObject* door = battlegroundMap->GetGameObject(guid)) + { + door->UseDoorOrButton(); + door->DespawnOrUnsummon(5s); + } + } + + if (Creature const* creature = battlegroundMap->GetCreature(_danielPooleGUID)) + creature->AI()->Talk(HookPoint::Texts::DanielPoole::Start); + + for (ObjectGuid const& guid : _bouncerGUIDs) + { + if (Creature* bouncer = battlegroundMap->GetCreature(guid)) + { + bouncer->SetAIAnimKitId(0); + if (bouncer->HasStringId(HookPoint::StringIds::Bouncer1)) + bouncer->GetMotionMaster()->MovePath(HookPoint::BouncerPaths::Path1, false, {}, {}, MovementWalkRunSpeedSelectionMode::Default, {}, {}, {}, true, false); + else if (bouncer->HasStringId(HookPoint::StringIds::Bouncer2)) + { + bouncer->m_Events.AddEventAtOffset([bouncer]() + { + bouncer->GetMotionMaster()->MovePath(HookPoint::BouncerPaths::Path2, false, {}, {}, MovementWalkRunSpeedSelectionMode::Default, {}, {}, {}, true, false); + }, 500ms); + } + else if (bouncer->HasStringId(HookPoint::StringIds::Bouncer3)) + bouncer->GetMotionMaster()->MovePath(HookPoint::BouncerPaths::Path3, false, {}, {}, MovementWalkRunSpeedSelectionMode::Default, {}, {}, {}, true, false); + else if (bouncer->HasStringId(HookPoint::StringIds::Bouncer4)) + { + bouncer->m_Events.AddEventAtOffset([bouncer]() + { + bouncer->GetMotionMaster()->MovePath(HookPoint::BouncerPaths::Path4, false, {}, {}, MovementWalkRunSpeedSelectionMode::Default, {}, {}, {}, true, false); + }, 500ms); + } + } + } + + if (Creature* creature = battlegroundMap->GetCreature(_pennyGUID)) + { + creature->SetAIAnimKitId(0); + creature->AI()->DoAction(HookPoint::Actions::PennyMove); + } + } + + void OnUpdate(uint32 diff) override + { + _scheduler.Update(diff); + } + + void OnPrepareStage1() override + { + _scheduler.Schedule(20s, [&](TaskContext) + { + if (GameObject* slideDoor = battlegroundMap->GetGameObject(_slideDoorGUID)) + slideDoor->UseDoorOrButton(); + + if (Creature* creature = battlegroundMap->GetCreature(_danielPooleGUID)) + Conversation::CreateConversation(HookPoint::Conversations::Prepare, creature, creature->GetPosition(), ObjectGuid::Empty); + }); + } + + void DoAction(uint32 actionId, WorldObject* source, WorldObject* target) override + { + switch (actionId) + { + case HookPoint::Actions::ReactionTrigger: + HandleReactionLowHealth(Object::ToPlayer(source)); + break; + case HookPoint::Actions::ReactionCheer: + HandleReactionCheer(Object::ToPlayer(source)); + break; + case HookPoint::Actions::ReactionDead: + HandleKill(Object::ToPlayer(target)); + break; + default: + break; + } + } + + void OnCreatureCreate(Creature* creature) override + { + switch (creature->GetEntry()) + { + case HookPoint::Creatures::DanielPoole: + _danielPooleGUID = creature->GetGUID(); + break; + case HookPoint::Creatures::Bouncer: + _bouncerGUIDs.emplace_back(creature->GetGUID()); + break; + case HookPoint::Creatures::Penny: + _pennyGUID = creature->GetGUID(); + break; + default: + break; + } + } + + void OnGameObjectCreate(GameObject* gameobject) override + { + switch (gameobject->GetEntry()) + { + case HookPoint::GameObjects::InvisWall: + _doorGUIDs.emplace_back(gameobject->GetGUID()); + break; + case HookPoint::GameObjects::SlideDoor: + _slideDoorGUID = gameobject->GetGUID(); + break; + default: + break; + } + } + + void OnPlayerJoined(Player* player, bool /*inBattleground*/) override + { + player->CastSpell(nullptr, HookPoint::Spells::ArenaReactionTrigger, CastSpellExtraArgsInit{ + .TriggerFlags = TRIGGERED_IGNORE_CAST_IN_PROGRESS | TRIGGERED_DONT_REPORT_CAST_ERROR + }); + } + + void HandleKill(Player const* victim) const + { + if (!victim) + return; + + if (Creature* creature = battlegroundMap->GetCreature(_danielPooleGUID)) + { + if (creature->HasAura(HookPoint::Spells::KulTirasArenaVOCooldownAura)) + return; + + creature->AI()->Talk(HookPoint::Texts::DanielPoole::ReactionKill, victim); + + creature->CastSpell(nullptr, HookPoint::Spells::KulTirasArenaVOCooldownAura, CastSpellExtraArgsInit{ + .TriggerFlags = TRIGGERED_IGNORE_CAST_IN_PROGRESS | TRIGGERED_DONT_REPORT_CAST_ERROR + }); + } + } + + void HandleReactionCheer(Player const* victim) const + { + if (!victim) + return; + + Team const otherTeam = GetOtherTeam(victim->GetBGTeam()); + + battlegroundMap->DoOnPlayers([&](Player* player) + { + if (player->GetBGTeam() == otherTeam) + { + player->CastSpell(nullptr, HookPoint::Spells::KulTirasArenaCrowdCheers, CastSpellExtraArgsInit{ + .TriggerFlags = TRIGGERED_IGNORE_CAST_IN_PROGRESS | TRIGGERED_DONT_REPORT_CAST_ERROR + }); + } + }); + } + + void HandleReactionLowHealth(Player const* victim) const + { + if (!victim) + return; + + Team const victimTeam = victim->GetBGTeam(); + battlegroundMap->DoOnPlayers([&](Player* player) + { + if (player->GetBGTeam() == victimTeam) + { + player->CastSpell(nullptr, HookPoint::Spells::KulTirasArenaCrowdBoos, CastSpellExtraArgsInit{ + .TriggerFlags = TRIGGERED_IGNORE_CAST_IN_PROGRESS | TRIGGERED_DONT_REPORT_CAST_ERROR + }); + } + }); + + if (Creature* creature = battlegroundMap->GetCreature(_danielPooleGUID)) + { + if (creature->HasAura(HookPoint::Spells::KulTirasArenaVOCooldownAura)) + return; + + creature->AI()->Talk(HookPoint::Texts::DanielPoole::ReactionLowHealth, victim); + + creature->CastSpell(nullptr, HookPoint::Spells::KulTirasArenaVOCooldownAura, CastSpellExtraArgsInit{ + .TriggerFlags = TRIGGERED_IGNORE_CAST_IN_PROGRESS | TRIGGERED_DONT_REPORT_CAST_ERROR + }); + } + } + +private: + GuidVector _doorGUIDs; + GuidVector _bouncerGUIDs; + ObjectGuid _slideDoorGUID; + ObjectGuid _danielPooleGUID; + ObjectGuid _pennyGUID; + + TaskScheduler _scheduler; +}; + +// 278775 - Arena Reaction Trigger - Low Health +class spell_arena_reaction_trigger_low_health : public SpellScript +{ + bool Load() override + { + return GetCaster()->GetMapId() == HookPoint::MapIds::HookPoint; + } + + bool Validate(SpellInfo const* /*spellInfo*/) override + { + return ValidateSpellInfo({ HookPoint::Spells::ArenaLowHealthDyingTrigger }); + } + + void HandleHit(SpellEffIndex /*effIndex*/) const + { + Unit* target = GetHitUnit(); + target->CastSpell(nullptr, HookPoint::Spells::ArenaLowHealthDyingTrigger, CastSpellExtraArgsInit{ + .TriggerFlags = TRIGGERED_IGNORE_CAST_IN_PROGRESS | TRIGGERED_DONT_REPORT_CAST_ERROR + }); + + if (ZoneScript* zoneScript = target->FindZoneScript()) + zoneScript->DoAction(HookPoint::Actions::ReactionCheer, GetCaster(), target); + } + + void Register() override + { + OnEffectHitTarget += SpellEffectFn(spell_arena_reaction_trigger_low_health::HandleHit, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + } +}; + +// 278776 - Arena Reaction Trigger +class spell_arena_reaction_trigger : public AuraScript +{ + bool Load() override + { + return GetOwner()->GetMapId() == HookPoint::MapIds::HookPoint; + } + + void HandleProc(ProcEventInfo const& eventInfo) const + { + if (ZoneScript* zonescript = GetTarget()->FindZoneScript()) + zonescript->DoAction(HookPoint::Actions::ReactionDead, eventInfo.GetActor(), eventInfo.GetProcTarget()); + } + + void Register() override + { + OnProc += AuraProcFn(spell_arena_reaction_trigger::HandleProc); + } +}; + +// 279047 - Arena Low Health Dying Trigger +class spell_arena_low_health_dying_trigger : public AuraScript +{ + bool Load() override + { + return GetOwner()->GetMapId() == HookPoint::MapIds::HookPoint; + } + + bool Validate(SpellInfo const* /*spellInfo*/) override + { + return ValidateSpellInfo({HookPoint::Spells::ArenaLowHealthDyingTrigger }); + } + + void HandleRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) const + { + Unit* target = GetTarget(); + + if (ZoneScript* zoneScript = target->FindZoneScript()) + zoneScript->DoAction(HookPoint::Actions::ReactionTrigger, GetCaster(), target); + } + + void Register() override + { + AfterEffectRemove += AuraEffectRemoveFn(spell_arena_low_health_dying_trigger::HandleRemove, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY, AURA_EFFECT_HANDLE_REAL); + } +}; + +void AddSC_arena_hook_point() +{ + RegisterBattlegroundMapScript(arena_hook_point, HookPoint::MapIds::HookPoint); + RegisterSpellScript(spell_arena_reaction_trigger_low_health); + RegisterSpellScript(spell_arena_reaction_trigger); + RegisterSpellScript(spell_arena_low_health_dying_trigger); +} diff --git a/src/server/scripts/Battlegrounds/battlegrounds_script_loader.cpp b/src/server/scripts/Battlegrounds/battlegrounds_script_loader.cpp index 1e84e622ffc..56a61a43c71 100644 --- a/src/server/scripts/Battlegrounds/battlegrounds_script_loader.cpp +++ b/src/server/scripts/Battlegrounds/battlegrounds_script_loader.cpp @@ -66,6 +66,7 @@ void AddSC_battleground_deephaul_ravine(); void AddSC_arena_blades_edge_legion(); void AddSC_arena_mugambala(); +void AddSC_arena_hook_point(); void AddSC_arena_the_robodrome(); void AddSC_arena_maldraxxus_coliseum(); @@ -126,6 +127,7 @@ void AddBattlegroundsScripts() AddSC_arena_blades_edge_legion(); AddSC_arena_mugambala(); + AddSC_arena_hook_point(); AddSC_arena_the_robodrome(); AddSC_arena_maldraxxus_coliseum(); |