From e779646013eb142dcb9a81435c5724627b560e6e Mon Sep 17 00:00:00 2001 From: Chaosvex Date: Tue, 28 Apr 2026 22:18:00 +0100 Subject: [PATCH 1/2] Generated packet definition fixes --- cmake/BuildMessages.cmake | 2 +- schemas/world/message.schema.json | 5 + .../packets/cmsg_auction_hello_client.json | 8 - ..._battleground_player_positions_client.json | 5 - .../packets/cmsg_cancel_growth_aura.json | 2 +- .../packets/cmsg_corpse_query_client.json | 5 - .../cmsg_inspect_honor_stats_client.json | 8 - .../cmsg_list_stabled_pets_client.json | 8 - .../cmsg_looking_for_group_client.json | 5 - schemas/world/packets/cmsg_messagechat.json | 6 +- .../packets/cmsg_move_fall_land_client.json | 8 - .../packets/cmsg_move_set_facing_client.json | 8 - .../packets/cmsg_move_set_pitch_client.json | 8 - .../cmsg_move_set_run_mode_client.json | 8 - .../cmsg_move_set_walk_mode_client.json | 8 - .../cmsg_move_start_backward_client.json | 8 - .../cmsg_move_start_forward_client.json | 8 - .../cmsg_move_start_pitch_down_client.json | 8 - .../cmsg_move_start_pitch_up_client.json | 8 - .../cmsg_move_start_strafe_left_client.json | 8 - .../cmsg_move_start_strafe_right_client.json | 8 - .../packets/cmsg_move_start_swim_client.json | 8 - .../cmsg_move_start_turn_left_client.json | 8 - .../cmsg_move_start_turn_right_client.json | 8 - .../world/packets/cmsg_move_stop_client.json | 8 - .../packets/cmsg_move_stop_pitch_client.json | 8 - .../packets/cmsg_move_stop_strafe_client.json | 8 - .../packets/cmsg_move_stop_swim_client.json | 8 - .../packets/cmsg_move_stop_turn_client.json | 8 - .../packets/cmsg_pvp_log_data_client.json | 5 - .../cmsg_query_next_mail_time_client.json | 5 - .../cmsg_talent_wipe_confirm_client.json | 8 - .../cmsg_char_create.json_} | 2 +- .../smsg_addon_info.json_} | 0 .../smsg_char_enum.json_} | 0 .../investigate/cmsg_accept_level_grant.json | 2 +- ...battleground_player_positions_server.json} | 5 +- ...ver.json => msg_channel_start_server.json} | 5 +- .../packets/msg_channel_update_server.json | 9 + .../msg_inspect_honor_stats_client.json | 9 + ...on => msg_inspect_honor_stats_server.json} | 5 +- .../packets/msg_list_stabled_pets_client.json | 9 + ...json => msg_list_stabled_pets_server.json} | 5 +- .../packets/msg_looking_for_group_client.json | 6 + .../packets/msg_looking_for_group_server.json | 9 + ...ient.json => msg_minimap_ping_client.json} | 5 +- ...rver.json => msg_minimap_ping_server.json} | 5 +- .../packets/msg_move_fall_land_client.json | 9 + ...er.json => msg_move_fall_land_server.json} | 5 +- ...json => msg_move_feather_fall_server.json} | 5 +- .../packets/msg_move_heartbeat_client.json | 9 + .../packets/msg_move_heartbeat_server.json | 10 + ..._client.json => msg_move_jump_client.json} | 5 +- ..._server.json => msg_move_jump_server.json} | 5 +- .../packets/msg_move_set_facing_client.json | 9 + .../packets/msg_move_set_facing_server.json | 10 + .../packets/msg_move_set_pitch_client.json | 9 + ...er.json => msg_move_set_pitch_server.json} | 5 +- .../packets/msg_move_set_run_mode_client.json | 9 + .../packets/msg_move_set_run_mode_server.json | 10 + .../msg_move_set_walk_mode_client.json | 9 + .../msg_move_set_walk_mode_server.json | 10 + .../msg_move_start_backward_client.json | 9 + .../msg_move_start_backward_server.json | 10 + .../msg_move_start_forward_client.json | 9 + .../msg_move_start_forward_server.json | 10 + .../msg_move_start_pitch_down_client.json | 9 + .../msg_move_start_pitch_down_server.json | 10 + .../msg_move_start_pitch_up_client.json | 9 + .../msg_move_start_pitch_up_server.json | 10 + .../msg_move_start_strafe_left_client.json | 9 + .../msg_move_start_strafe_left_server.json | 10 + .../msg_move_start_strafe_right_client.json | 9 + .../msg_move_start_strafe_right_server.json | 10 + .../packets/msg_move_start_swim_client.json | 9 + .../packets/msg_move_start_swim_server.json | 10 + .../msg_move_start_turn_left_client.json | 9 + .../msg_move_start_turn_left_server.json | 10 + .../msg_move_start_turn_right_client.json | 9 + .../msg_move_start_turn_right_server.json | 10 + ..._client.json => msg_move_stop_client.json} | 5 +- .../packets/msg_move_stop_pitch_client.json | 9 + .../packets/msg_move_stop_pitch_server.json | 10 + ..._server.json => msg_move_stop_server.json} | 5 +- .../packets/msg_move_stop_strafe_client.json | 9 + .../packets/msg_move_stop_strafe_server.json | 10 + .../packets/msg_move_stop_swim_client.json | 9 + .../packets/msg_move_stop_swim_server.json | 10 + .../packets/msg_move_stop_turn_client.json | 9 + .../packets/msg_move_stop_turn_server.json | 10 + ...json => msg_move_teleport_ack_client.json} | 5 +- ...json => msg_move_teleport_ack_server.json} | 5 +- ...json => msg_move_time_skipped_server.json} | 5 +- .../packets/msg_pvp_log_data_client.json | 6 + ...rver.json => msg_pvp_log_data_server.json} | 5 +- .../msg_query_next_mail_time_client.json | 6 + .../msg_query_next_mail_time_server.json | 9 + ....json => msg_raid_ready_check_client.json} | 5 +- ....json => msg_raid_ready_check_server.json} | 5 +- ...son => msg_raid_target_update_client.json} | 5 +- ...son => msg_raid_target_update_server.json} | 5 +- ...lient.json => msg_random_roll_client.json} | 5 +- ...erver.json => msg_random_roll_server.json} | 5 +- ...json => msg_save_guild_emblem_client.json} | 5 +- .../packets/msg_save_guild_emblem_server.json | 9 + .../msg_talent_wipe_confirm_client.json | 9 + ...on => msg_talent_wipe_confirm_server.json} | 5 +- .../packets/smsg_auction_hello_server.json | 9 - .../packets/smsg_channel_update_server.json | 8 - .../packets/smsg_corpse_query_server.json | 17 - .../packets/smsg_login_settimespeed.json | 4 +- .../smsg_looking_for_group_server.json | 8 - .../packets/smsg_move_set_pitch_server.json | 9 - .../smsg_move_set_run_mode_server.json | 9 - .../smsg_move_set_walk_mode_server.json | 9 - .../smsg_move_start_backward_server.json | 9 - .../smsg_move_start_forward_server.json | 9 - .../smsg_move_start_pitch_down_server.json | 9 - .../smsg_move_start_pitch_up_server.json | 9 - .../smsg_move_start_strafe_left_server.json | 9 - .../smsg_move_start_strafe_right_server.json | 9 - .../packets/smsg_move_start_swim_server.json | 9 - .../smsg_move_start_turn_left_server.json | 9 - .../smsg_move_start_turn_right_server.json | 9 - .../packets/smsg_move_stop_pitch_server.json | 9 - .../world/packets/smsg_move_stop_server.json | 9 - .../packets/smsg_move_stop_strafe_server.json | 9 - .../packets/smsg_move_stop_swim_server.json | 9 - .../packets/smsg_move_stop_turn_server.json | 9 - .../packets/smsg_name_query_response.json | 4 +- .../smsg_query_next_mail_time_server.json | 8 - .../smsg_save_guild_emblem_server.json | 8 - .../world/packets/smsg_set_proficiency.json | 2 +- schemas/world/packets/smsg_spell_go.json | 2 +- schemas/world/packets/smsg_spell_start.json | 2 +- schemas/world/types.json | 360 +++++++++--------- src/character/CharacterHandler.h | 2 +- src/character/CharacterService.h | 2 +- src/libs/protocol/CMakeLists.txt | 64 +--- src/libs/protocol/include/protocol/Opcodes.h | 67 +++- src/libs/protocol/include/protocol/Packets.h | 112 ------ .../protocol/include/protocol/ResultCodes.h | 11 - .../include/protocol/UnitStandState.h | 32 -- .../include/protocol/client/AuthSession.h | 9 +- .../protocol/client/BattlefieldStatus.h | 1 - .../include/protocol/client/CharacterCreate.h | 9 +- .../include/protocol/client/CharacterDelete.h | 33 -- .../include/protocol/client/CharacterEnum.h | 29 -- .../include/protocol/client/CharacterRename.h | 1 - .../protocol/client/GMTicketGetTicket.h | 29 -- .../include/protocol/client/GenericMove.h | 84 ---- .../include/protocol/client/ItemQuerySingle.h | 1 - .../include/protocol/client/JoinChannel.h | 1 - .../protocol/client/MeetingStoneInfo.h | 1 - .../include/protocol/client/MessageChat.h | 88 ----- .../include/protocol/client/MoveFallLand.h | 84 ---- .../protocol/client/MoveSetRawPosition.h | 36 -- .../include/protocol/client/MoveTimeSkipped.h | 36 -- .../include/protocol/client/NameQuery.h | 1 - .../protocol/include/protocol/client/Ping.h | 1 - .../include/protocol/client/PlayerLogin.h | 1 - .../protocol/client/QueryNextMailTime.h | 27 -- .../include/protocol/client/QueryTime.h | 29 -- .../include/protocol/client/RequestRaidInfo.h | 29 -- .../include/protocol/client/SetActiveMover.h | 34 -- .../protocol/client/StandStateChange.h | 36 -- .../include/protocol/client/TutorialFlag.h | 34 -- .../protocol/client/UpdateAccountData.h | 1 - .../include/protocol/client/WorldTeleport.h | 38 -- .../include/protocol/client/ZoneUpdate.h | 1 - .../protocol/server/AccountDataTimes.h | 34 -- .../include/protocol/server/AddonInfo.h | 11 +- .../include/protocol/server/AuthChallenge.h | 1 - .../include/protocol/server/AuthResponse.h | 1 - .../protocol/server/BattlefieldStatus.h | 1 - .../include/protocol/server/ChannelNotify.h | 5 +- .../include/protocol/server/CharacterCreate.h | 32 -- .../include/protocol/server/CharacterDelete.h | 32 -- .../include/protocol/server/CharacterEnum.h | 7 + .../protocol/server/CharacterLoginFailed.h | 33 -- .../include/protocol/server/CharacterRename.h | 1 - .../include/protocol/server/ChatTypes.h | 12 - .../protocol/server/GMTicketGetTicket.h | 33 -- .../include/protocol/server/GenericMove.h | 88 ----- .../protocol/server/ItemQuerySingleResponse.h | 162 -------- .../protocol/server/LoginVerifyWorld.h | 40 -- .../include/protocol/server/LogoutComplete.h | 32 -- .../protocol/server/MeetingStoneSetQueue.h | 36 -- .../include/protocol/server/MessageChat.h | 1 - .../protocol/include/protocol/server/Motd.h | 36 -- .../include/protocol/server/MoveFallLand.h | 88 ----- .../protocol/server/MoveSetRawPositionAck.h | 29 -- .../include/protocol/server/MoveTimeSkipped.h | 37 -- .../protocol/server/NameQueryResponse.h | 49 --- .../include/protocol/server/NewWorld.h | 40 -- .../include/protocol/server/Notification.h | 33 -- .../protocol/include/protocol/server/Pong.h | 1 - .../protocol/server/QueryNextMailTime.h | 31 -- .../protocol/server/QueryTimeResponse.h | 33 -- .../protocol/server/RaidInstanceInfo.h | 44 --- .../protocol/server/SetLoginTimeSpeed.h | 36 -- .../protocol/server/SplineMoveSetWalkMode.h | 35 -- .../protocol/server/StandStateUpdate.h | 34 -- .../protocol/server/TriggerCinematic.h | 1 - .../include/protocol/server/TutorialFlags.h | 37 -- .../include/protocol/server/UpdateObject.h | 9 +- .../include/protocol/server/Weather.h | 55 --- src/realm/CharacterClient.h | 2 +- src/realm/ClientHandler.cpp | 1 - src/realm/CompressMessage.cpp | 3 +- src/realm/CompressMessage.h | 1 - src/realm/Events.h | 3 +- src/realm/states/Authentication.cpp | 2 +- src/realm/states/AuthenticationContext.h | 4 +- src/realm/states/CharacterList.cpp | 10 +- src/realm/states/WorldEnter.cpp | 67 ++-- src/tools/protogen/Generator.cpp | 10 +- src/tools/protogen/templates/Message.h_ | 2 +- src/tools/protogen/templates/Packets.h_ | 2 +- tests/Protogen.cpp | 14 +- 220 files changed, 862 insertions(+), 2773 deletions(-) delete mode 100644 schemas/world/packets/cmsg_auction_hello_client.json delete mode 100644 schemas/world/packets/cmsg_battleground_player_positions_client.json delete mode 100644 schemas/world/packets/cmsg_corpse_query_client.json delete mode 100644 schemas/world/packets/cmsg_inspect_honor_stats_client.json delete mode 100644 schemas/world/packets/cmsg_list_stabled_pets_client.json delete mode 100644 schemas/world/packets/cmsg_looking_for_group_client.json delete mode 100644 schemas/world/packets/cmsg_move_fall_land_client.json delete mode 100644 schemas/world/packets/cmsg_move_set_facing_client.json delete mode 100644 schemas/world/packets/cmsg_move_set_pitch_client.json delete mode 100644 schemas/world/packets/cmsg_move_set_run_mode_client.json delete mode 100644 schemas/world/packets/cmsg_move_set_walk_mode_client.json delete mode 100644 schemas/world/packets/cmsg_move_start_backward_client.json delete mode 100644 schemas/world/packets/cmsg_move_start_forward_client.json delete mode 100644 schemas/world/packets/cmsg_move_start_pitch_down_client.json delete mode 100644 schemas/world/packets/cmsg_move_start_pitch_up_client.json delete mode 100644 schemas/world/packets/cmsg_move_start_strafe_left_client.json delete mode 100644 schemas/world/packets/cmsg_move_start_strafe_right_client.json delete mode 100644 schemas/world/packets/cmsg_move_start_swim_client.json delete mode 100644 schemas/world/packets/cmsg_move_start_turn_left_client.json delete mode 100644 schemas/world/packets/cmsg_move_start_turn_right_client.json delete mode 100644 schemas/world/packets/cmsg_move_stop_client.json delete mode 100644 schemas/world/packets/cmsg_move_stop_pitch_client.json delete mode 100644 schemas/world/packets/cmsg_move_stop_strafe_client.json delete mode 100644 schemas/world/packets/cmsg_move_stop_swim_client.json delete mode 100644 schemas/world/packets/cmsg_move_stop_turn_client.json delete mode 100644 schemas/world/packets/cmsg_pvp_log_data_client.json delete mode 100644 schemas/world/packets/cmsg_query_next_mail_time_client.json delete mode 100644 schemas/world/packets/cmsg_talent_wipe_confirm_client.json rename schemas/world/packets/{cmsg_char_create.json => disabled/cmsg_char_create.json_} (91%) rename schemas/world/packets/{smsg_addon_info.json => disabled/smsg_addon_info.json_} (100%) rename schemas/world/packets/{smsg_char_enum.json => disabled/smsg_char_enum.json_} (100%) rename schemas/world/packets/{smsg_battleground_player_positions_server.json => msg_battleground_player_positions_server.json} (74%) rename schemas/world/packets/{smsg_channel_start_server.json => msg_channel_start_server.json} (59%) create mode 100644 schemas/world/packets/msg_channel_update_server.json create mode 100644 schemas/world/packets/msg_inspect_honor_stats_client.json rename schemas/world/packets/{smsg_inspect_honor_stats_server.json => msg_inspect_honor_stats_server.json} (91%) create mode 100644 schemas/world/packets/msg_list_stabled_pets_client.json rename schemas/world/packets/{smsg_list_stabled_pets_server.json => msg_list_stabled_pets_server.json} (74%) create mode 100644 schemas/world/packets/msg_looking_for_group_client.json create mode 100644 schemas/world/packets/msg_looking_for_group_server.json rename schemas/world/packets/{cmsg_minimap_ping_client.json => msg_minimap_ping_client.json} (60%) rename schemas/world/packets/{smsg_minimap_ping_server.json => msg_minimap_ping_server.json} (67%) create mode 100644 schemas/world/packets/msg_move_fall_land_client.json rename schemas/world/packets/{smsg_move_jump_server.json => msg_move_fall_land_server.json} (59%) rename schemas/world/packets/{smsg_move_feather_fall_server.json => msg_move_feather_fall_server.json} (58%) create mode 100644 schemas/world/packets/msg_move_heartbeat_client.json create mode 100644 schemas/world/packets/msg_move_heartbeat_server.json rename schemas/world/packets/{cmsg_move_heartbeat_client.json => msg_move_jump_client.json} (53%) rename schemas/world/packets/{smsg_move_fall_land_server.json => msg_move_jump_server.json} (63%) create mode 100644 schemas/world/packets/msg_move_set_facing_client.json create mode 100644 schemas/world/packets/msg_move_set_facing_server.json create mode 100644 schemas/world/packets/msg_move_set_pitch_client.json rename schemas/world/packets/{smsg_move_set_facing_server.json => msg_move_set_pitch_server.json} (59%) create mode 100644 schemas/world/packets/msg_move_set_run_mode_client.json create mode 100644 schemas/world/packets/msg_move_set_run_mode_server.json create mode 100644 schemas/world/packets/msg_move_set_walk_mode_client.json create mode 100644 schemas/world/packets/msg_move_set_walk_mode_server.json create mode 100644 schemas/world/packets/msg_move_start_backward_client.json create mode 100644 schemas/world/packets/msg_move_start_backward_server.json create mode 100644 schemas/world/packets/msg_move_start_forward_client.json create mode 100644 schemas/world/packets/msg_move_start_forward_server.json create mode 100644 schemas/world/packets/msg_move_start_pitch_down_client.json create mode 100644 schemas/world/packets/msg_move_start_pitch_down_server.json create mode 100644 schemas/world/packets/msg_move_start_pitch_up_client.json create mode 100644 schemas/world/packets/msg_move_start_pitch_up_server.json create mode 100644 schemas/world/packets/msg_move_start_strafe_left_client.json create mode 100644 schemas/world/packets/msg_move_start_strafe_left_server.json create mode 100644 schemas/world/packets/msg_move_start_strafe_right_client.json create mode 100644 schemas/world/packets/msg_move_start_strafe_right_server.json create mode 100644 schemas/world/packets/msg_move_start_swim_client.json create mode 100644 schemas/world/packets/msg_move_start_swim_server.json create mode 100644 schemas/world/packets/msg_move_start_turn_left_client.json create mode 100644 schemas/world/packets/msg_move_start_turn_left_server.json create mode 100644 schemas/world/packets/msg_move_start_turn_right_client.json create mode 100644 schemas/world/packets/msg_move_start_turn_right_server.json rename schemas/world/packets/{cmsg_move_jump_client.json => msg_move_stop_client.json} (53%) create mode 100644 schemas/world/packets/msg_move_stop_pitch_client.json create mode 100644 schemas/world/packets/msg_move_stop_pitch_server.json rename schemas/world/packets/{smsg_move_heartbeat_server.json => msg_move_stop_server.json} (63%) create mode 100644 schemas/world/packets/msg_move_stop_strafe_client.json create mode 100644 schemas/world/packets/msg_move_stop_strafe_server.json create mode 100644 schemas/world/packets/msg_move_stop_swim_client.json create mode 100644 schemas/world/packets/msg_move_stop_swim_server.json create mode 100644 schemas/world/packets/msg_move_stop_turn_client.json create mode 100644 schemas/world/packets/msg_move_stop_turn_server.json rename schemas/world/packets/{cmsg_move_teleport_ack_client.json => msg_move_teleport_ack_client.json} (66%) rename schemas/world/packets/{smsg_move_teleport_ack_server.json => msg_move_teleport_ack_server.json} (67%) rename schemas/world/packets/{smsg_move_time_skipped_server.json => msg_move_time_skipped_server.json} (58%) create mode 100644 schemas/world/packets/msg_pvp_log_data_client.json rename schemas/world/packets/{smsg_pvp_log_data_server.json => msg_pvp_log_data_server.json} (83%) create mode 100644 schemas/world/packets/msg_query_next_mail_time_client.json create mode 100644 schemas/world/packets/msg_query_next_mail_time_server.json rename schemas/world/packets/{cmsg_raid_ready_check_client.json => msg_raid_ready_check_client.json} (63%) rename schemas/world/packets/{smsg_raid_ready_check_server.json => msg_raid_ready_check_server.json} (68%) rename schemas/world/packets/{cmsg_raid_target_update_client.json => msg_raid_target_update_client.json} (72%) rename schemas/world/packets/{smsg_raid_target_update_server.json => msg_raid_target_update_server.json} (83%) rename schemas/world/packets/{cmsg_random_roll_client.json => msg_random_roll_client.json} (60%) rename schemas/world/packets/{smsg_random_roll_server.json => msg_random_roll_server.json} (73%) rename schemas/world/packets/{cmsg_save_guild_emblem_client.json => msg_save_guild_emblem_client.json} (77%) create mode 100644 schemas/world/packets/msg_save_guild_emblem_server.json create mode 100644 schemas/world/packets/msg_talent_wipe_confirm_client.json rename schemas/world/packets/{smsg_talent_wipe_confirm_server.json => msg_talent_wipe_confirm_server.json} (57%) delete mode 100644 schemas/world/packets/smsg_auction_hello_server.json delete mode 100644 schemas/world/packets/smsg_channel_update_server.json delete mode 100644 schemas/world/packets/smsg_corpse_query_server.json delete mode 100644 schemas/world/packets/smsg_looking_for_group_server.json delete mode 100644 schemas/world/packets/smsg_move_set_pitch_server.json delete mode 100644 schemas/world/packets/smsg_move_set_run_mode_server.json delete mode 100644 schemas/world/packets/smsg_move_set_walk_mode_server.json delete mode 100644 schemas/world/packets/smsg_move_start_backward_server.json delete mode 100644 schemas/world/packets/smsg_move_start_forward_server.json delete mode 100644 schemas/world/packets/smsg_move_start_pitch_down_server.json delete mode 100644 schemas/world/packets/smsg_move_start_pitch_up_server.json delete mode 100644 schemas/world/packets/smsg_move_start_strafe_left_server.json delete mode 100644 schemas/world/packets/smsg_move_start_strafe_right_server.json delete mode 100644 schemas/world/packets/smsg_move_start_swim_server.json delete mode 100644 schemas/world/packets/smsg_move_start_turn_left_server.json delete mode 100644 schemas/world/packets/smsg_move_start_turn_right_server.json delete mode 100644 schemas/world/packets/smsg_move_stop_pitch_server.json delete mode 100644 schemas/world/packets/smsg_move_stop_server.json delete mode 100644 schemas/world/packets/smsg_move_stop_strafe_server.json delete mode 100644 schemas/world/packets/smsg_move_stop_swim_server.json delete mode 100644 schemas/world/packets/smsg_move_stop_turn_server.json delete mode 100644 schemas/world/packets/smsg_query_next_mail_time_server.json delete mode 100644 schemas/world/packets/smsg_save_guild_emblem_server.json delete mode 100644 src/libs/protocol/include/protocol/Packets.h delete mode 100644 src/libs/protocol/include/protocol/ResultCodes.h delete mode 100644 src/libs/protocol/include/protocol/UnitStandState.h delete mode 100644 src/libs/protocol/include/protocol/client/BattlefieldStatus.h delete mode 100644 src/libs/protocol/include/protocol/client/CharacterDelete.h delete mode 100644 src/libs/protocol/include/protocol/client/CharacterEnum.h delete mode 100644 src/libs/protocol/include/protocol/client/CharacterRename.h delete mode 100644 src/libs/protocol/include/protocol/client/GMTicketGetTicket.h delete mode 100644 src/libs/protocol/include/protocol/client/GenericMove.h delete mode 100644 src/libs/protocol/include/protocol/client/ItemQuerySingle.h delete mode 100644 src/libs/protocol/include/protocol/client/JoinChannel.h delete mode 100644 src/libs/protocol/include/protocol/client/MeetingStoneInfo.h delete mode 100644 src/libs/protocol/include/protocol/client/MessageChat.h delete mode 100644 src/libs/protocol/include/protocol/client/MoveFallLand.h delete mode 100644 src/libs/protocol/include/protocol/client/MoveSetRawPosition.h delete mode 100644 src/libs/protocol/include/protocol/client/MoveTimeSkipped.h delete mode 100644 src/libs/protocol/include/protocol/client/NameQuery.h delete mode 100644 src/libs/protocol/include/protocol/client/Ping.h delete mode 100644 src/libs/protocol/include/protocol/client/PlayerLogin.h delete mode 100644 src/libs/protocol/include/protocol/client/QueryNextMailTime.h delete mode 100644 src/libs/protocol/include/protocol/client/QueryTime.h delete mode 100644 src/libs/protocol/include/protocol/client/RequestRaidInfo.h delete mode 100644 src/libs/protocol/include/protocol/client/SetActiveMover.h delete mode 100644 src/libs/protocol/include/protocol/client/StandStateChange.h delete mode 100644 src/libs/protocol/include/protocol/client/TutorialFlag.h delete mode 100644 src/libs/protocol/include/protocol/client/UpdateAccountData.h delete mode 100644 src/libs/protocol/include/protocol/client/WorldTeleport.h delete mode 100644 src/libs/protocol/include/protocol/client/ZoneUpdate.h delete mode 100644 src/libs/protocol/include/protocol/server/AccountDataTimes.h delete mode 100644 src/libs/protocol/include/protocol/server/AuthChallenge.h delete mode 100644 src/libs/protocol/include/protocol/server/AuthResponse.h delete mode 100644 src/libs/protocol/include/protocol/server/BattlefieldStatus.h delete mode 100644 src/libs/protocol/include/protocol/server/CharacterCreate.h delete mode 100644 src/libs/protocol/include/protocol/server/CharacterDelete.h delete mode 100644 src/libs/protocol/include/protocol/server/CharacterLoginFailed.h delete mode 100644 src/libs/protocol/include/protocol/server/CharacterRename.h delete mode 100644 src/libs/protocol/include/protocol/server/ChatTypes.h delete mode 100644 src/libs/protocol/include/protocol/server/GMTicketGetTicket.h delete mode 100644 src/libs/protocol/include/protocol/server/GenericMove.h delete mode 100644 src/libs/protocol/include/protocol/server/ItemQuerySingleResponse.h delete mode 100644 src/libs/protocol/include/protocol/server/LoginVerifyWorld.h delete mode 100644 src/libs/protocol/include/protocol/server/LogoutComplete.h delete mode 100644 src/libs/protocol/include/protocol/server/MeetingStoneSetQueue.h delete mode 100644 src/libs/protocol/include/protocol/server/MessageChat.h delete mode 100644 src/libs/protocol/include/protocol/server/Motd.h delete mode 100644 src/libs/protocol/include/protocol/server/MoveFallLand.h delete mode 100644 src/libs/protocol/include/protocol/server/MoveSetRawPositionAck.h delete mode 100644 src/libs/protocol/include/protocol/server/MoveTimeSkipped.h delete mode 100644 src/libs/protocol/include/protocol/server/NameQueryResponse.h delete mode 100644 src/libs/protocol/include/protocol/server/NewWorld.h delete mode 100644 src/libs/protocol/include/protocol/server/Notification.h delete mode 100644 src/libs/protocol/include/protocol/server/Pong.h delete mode 100644 src/libs/protocol/include/protocol/server/QueryNextMailTime.h delete mode 100644 src/libs/protocol/include/protocol/server/QueryTimeResponse.h delete mode 100644 src/libs/protocol/include/protocol/server/RaidInstanceInfo.h delete mode 100644 src/libs/protocol/include/protocol/server/SetLoginTimeSpeed.h delete mode 100644 src/libs/protocol/include/protocol/server/SplineMoveSetWalkMode.h delete mode 100644 src/libs/protocol/include/protocol/server/StandStateUpdate.h delete mode 100644 src/libs/protocol/include/protocol/server/TriggerCinematic.h delete mode 100644 src/libs/protocol/include/protocol/server/TutorialFlags.h delete mode 100644 src/libs/protocol/include/protocol/server/Weather.h diff --git a/cmake/BuildMessages.cmake b/cmake/BuildMessages.cmake index 81491fc28..aaf320516 100644 --- a/cmake/BuildMessages.cmake +++ b/cmake/BuildMessages.cmake @@ -19,7 +19,7 @@ function(build_messages message_schema) set(protogen "protogen") - set(output_root "${CMAKE_BINARY_DIR}/generated") + set(output_root "${CMAKE_BINARY_DIR}/protocol") set(templates_dir "$") file(GLOB message_jsons CONFIGURE_DEPENDS "${messages_dir}/*.json") diff --git a/schemas/world/message.schema.json b/schemas/world/message.schema.json index c345b720e..2762c01ad 100644 --- a/schemas/world/message.schema.json +++ b/schemas/world/message.schema.json @@ -20,6 +20,11 @@ "pattern": "^(cmsg|smsg|msg)_[a-z0-9_]+$", "description": "Wire opcode identifier in snake_case (e.g. smsg_login_verify_world)" }, + "alias": { + "type": "string", + "pattern": "^(cmsg|smsg|msg)_[a-z0-9_]+$", + "description": "Alias override to allow for the message name to be differentiated from the opcode" + }, "direction": { "type": "string", "enum": ["client", "server"], diff --git a/schemas/world/packets/cmsg_auction_hello_client.json b/schemas/world/packets/cmsg_auction_hello_client.json deleted file mode 100644 index fcde406eb..000000000 --- a/schemas/world/packets/cmsg_auction_hello_client.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "name": "AuctionHelloClient", - "opcode": "cmsg_auction_hello_client", - "direction": "client", - "fields": [ - { "name": "auctioneer", "type": "uint64" } - ] -} diff --git a/schemas/world/packets/cmsg_battleground_player_positions_client.json b/schemas/world/packets/cmsg_battleground_player_positions_client.json deleted file mode 100644 index 8727a7486..000000000 --- a/schemas/world/packets/cmsg_battleground_player_positions_client.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "name": "BattlegroundPlayerPositionsClient", - "opcode": "cmsg_battleground_player_positions_client", - "direction": "client" -} diff --git a/schemas/world/packets/cmsg_cancel_growth_aura.json b/schemas/world/packets/cmsg_cancel_growth_aura.json index b6228e807..2f286e587 100644 --- a/schemas/world/packets/cmsg_cancel_growth_aura.json +++ b/schemas/world/packets/cmsg_cancel_growth_aura.json @@ -1,5 +1,5 @@ { "name": "CancelGrowthAura", - "opcode": "cmsg_cancel_growthaura", + "opcode": "cmsg_cancel_growth_aura", "direction": "client" } diff --git a/schemas/world/packets/cmsg_corpse_query_client.json b/schemas/world/packets/cmsg_corpse_query_client.json deleted file mode 100644 index c43988dab..000000000 --- a/schemas/world/packets/cmsg_corpse_query_client.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "name": "CorpseQueryClient", - "opcode": "cmsg_corpse_query_client", - "direction": "client" -} diff --git a/schemas/world/packets/cmsg_inspect_honor_stats_client.json b/schemas/world/packets/cmsg_inspect_honor_stats_client.json deleted file mode 100644 index 33bc34356..000000000 --- a/schemas/world/packets/cmsg_inspect_honor_stats_client.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "name": "InspectHonorStatsClient", - "opcode": "cmsg_inspect_honor_stats_client", - "direction": "client", - "fields": [ - { "name": "guid", "type": "uint64" } - ] -} diff --git a/schemas/world/packets/cmsg_list_stabled_pets_client.json b/schemas/world/packets/cmsg_list_stabled_pets_client.json deleted file mode 100644 index 0298e1e0c..000000000 --- a/schemas/world/packets/cmsg_list_stabled_pets_client.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "name": "ListStabledPetsClient", - "opcode": "cmsg_list_stabled_pets_client", - "direction": "client", - "fields": [ - { "name": "npc", "type": "uint64" } - ] -} diff --git a/schemas/world/packets/cmsg_looking_for_group_client.json b/schemas/world/packets/cmsg_looking_for_group_client.json deleted file mode 100644 index c0c6fc35a..000000000 --- a/schemas/world/packets/cmsg_looking_for_group_client.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "name": "LookingForGroupClient", - "opcode": "cmsg_looking_for_group_client", - "direction": "client" -} diff --git a/schemas/world/packets/cmsg_messagechat.json b/schemas/world/packets/cmsg_messagechat.json index 32fa5e1e4..d91aecbe3 100644 --- a/schemas/world/packets/cmsg_messagechat.json +++ b/schemas/world/packets/cmsg_messagechat.json @@ -3,19 +3,19 @@ "opcode": "cmsg_messagechat", "direction": "client", "fields": [ - { "name": "chat_type", "type": "uint32" }, + { "name": "type", "type": "ChatType" }, { "name": "language", "type": "Language" }, { "type": "if_chain", "branches": [ { - "when": { "op": "eq", "field": "chat_type", "value": 6 }, + "when": { "op": "eq", "field": "type", "value": "whisper" }, "fields": [ { "name": "target_player", "type": "CString" } ] }, { - "when": { "op": "eq", "field": "chat_type", "value": 14 }, + "when": { "op": "eq", "field": "type", "value": "channel" }, "fields": [ { "name": "channel", "type": "CString" } ] diff --git a/schemas/world/packets/cmsg_move_fall_land_client.json b/schemas/world/packets/cmsg_move_fall_land_client.json deleted file mode 100644 index b748bc313..000000000 --- a/schemas/world/packets/cmsg_move_fall_land_client.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "name": "MoveFallLandClient", - "opcode": "cmsg_move_fall_land_client", - "direction": "client", - "fields": [ - { "name": "info", "type": "MovementInfo" } - ] -} diff --git a/schemas/world/packets/cmsg_move_set_facing_client.json b/schemas/world/packets/cmsg_move_set_facing_client.json deleted file mode 100644 index 0ad1c14ec..000000000 --- a/schemas/world/packets/cmsg_move_set_facing_client.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "name": "MoveSetFacingClient", - "opcode": "cmsg_move_set_facing_client", - "direction": "client", - "fields": [ - { "name": "info", "type": "MovementInfo" } - ] -} diff --git a/schemas/world/packets/cmsg_move_set_pitch_client.json b/schemas/world/packets/cmsg_move_set_pitch_client.json deleted file mode 100644 index f344f097b..000000000 --- a/schemas/world/packets/cmsg_move_set_pitch_client.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "name": "MoveSetPitchClient", - "opcode": "cmsg_move_set_pitch_client", - "direction": "client", - "fields": [ - { "name": "info", "type": "MovementInfo" } - ] -} diff --git a/schemas/world/packets/cmsg_move_set_run_mode_client.json b/schemas/world/packets/cmsg_move_set_run_mode_client.json deleted file mode 100644 index cdb765de9..000000000 --- a/schemas/world/packets/cmsg_move_set_run_mode_client.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "name": "MoveSetRunModeClient", - "opcode": "cmsg_move_set_run_mode_client", - "direction": "client", - "fields": [ - { "name": "info", "type": "MovementInfo" } - ] -} diff --git a/schemas/world/packets/cmsg_move_set_walk_mode_client.json b/schemas/world/packets/cmsg_move_set_walk_mode_client.json deleted file mode 100644 index 0f320c367..000000000 --- a/schemas/world/packets/cmsg_move_set_walk_mode_client.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "name": "MoveSetWalkModeClient", - "opcode": "cmsg_move_set_walk_mode_client", - "direction": "client", - "fields": [ - { "name": "info", "type": "MovementInfo" } - ] -} diff --git a/schemas/world/packets/cmsg_move_start_backward_client.json b/schemas/world/packets/cmsg_move_start_backward_client.json deleted file mode 100644 index 18efde5a4..000000000 --- a/schemas/world/packets/cmsg_move_start_backward_client.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "name": "MoveStartBackwardClient", - "opcode": "cmsg_move_start_backward_client", - "direction": "client", - "fields": [ - { "name": "info", "type": "MovementInfo" } - ] -} diff --git a/schemas/world/packets/cmsg_move_start_forward_client.json b/schemas/world/packets/cmsg_move_start_forward_client.json deleted file mode 100644 index 041dbd12e..000000000 --- a/schemas/world/packets/cmsg_move_start_forward_client.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "name": "MoveStartForwardClient", - "opcode": "cmsg_move_start_forward_client", - "direction": "client", - "fields": [ - { "name": "info", "type": "MovementInfo" } - ] -} diff --git a/schemas/world/packets/cmsg_move_start_pitch_down_client.json b/schemas/world/packets/cmsg_move_start_pitch_down_client.json deleted file mode 100644 index 870c6cf73..000000000 --- a/schemas/world/packets/cmsg_move_start_pitch_down_client.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "name": "MoveStartPitchDownClient", - "opcode": "cmsg_move_start_pitch_down_client", - "direction": "client", - "fields": [ - { "name": "info", "type": "MovementInfo" } - ] -} diff --git a/schemas/world/packets/cmsg_move_start_pitch_up_client.json b/schemas/world/packets/cmsg_move_start_pitch_up_client.json deleted file mode 100644 index f0179dcac..000000000 --- a/schemas/world/packets/cmsg_move_start_pitch_up_client.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "name": "MoveStartPitchUpClient", - "opcode": "cmsg_move_start_pitch_up_client", - "direction": "client", - "fields": [ - { "name": "info", "type": "MovementInfo" } - ] -} diff --git a/schemas/world/packets/cmsg_move_start_strafe_left_client.json b/schemas/world/packets/cmsg_move_start_strafe_left_client.json deleted file mode 100644 index 7575a1eb5..000000000 --- a/schemas/world/packets/cmsg_move_start_strafe_left_client.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "name": "MoveStartStrafeLeftClient", - "opcode": "cmsg_move_start_strafe_left_client", - "direction": "client", - "fields": [ - { "name": "info", "type": "MovementInfo" } - ] -} diff --git a/schemas/world/packets/cmsg_move_start_strafe_right_client.json b/schemas/world/packets/cmsg_move_start_strafe_right_client.json deleted file mode 100644 index d56f80af0..000000000 --- a/schemas/world/packets/cmsg_move_start_strafe_right_client.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "name": "MoveStartStrafeRightClient", - "opcode": "cmsg_move_start_strafe_right_client", - "direction": "client", - "fields": [ - { "name": "info", "type": "MovementInfo" } - ] -} diff --git a/schemas/world/packets/cmsg_move_start_swim_client.json b/schemas/world/packets/cmsg_move_start_swim_client.json deleted file mode 100644 index f2e12853b..000000000 --- a/schemas/world/packets/cmsg_move_start_swim_client.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "name": "MoveStartSwimClient", - "opcode": "cmsg_move_start_swim_client", - "direction": "client", - "fields": [ - { "name": "info", "type": "MovementInfo" } - ] -} diff --git a/schemas/world/packets/cmsg_move_start_turn_left_client.json b/schemas/world/packets/cmsg_move_start_turn_left_client.json deleted file mode 100644 index d49f79bb7..000000000 --- a/schemas/world/packets/cmsg_move_start_turn_left_client.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "name": "MoveStartTurnLeftClient", - "opcode": "cmsg_move_start_turn_left_client", - "direction": "client", - "fields": [ - { "name": "info", "type": "MovementInfo" } - ] -} diff --git a/schemas/world/packets/cmsg_move_start_turn_right_client.json b/schemas/world/packets/cmsg_move_start_turn_right_client.json deleted file mode 100644 index 5000146c8..000000000 --- a/schemas/world/packets/cmsg_move_start_turn_right_client.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "name": "MoveStartTurnRightClient", - "opcode": "cmsg_move_start_turn_right_client", - "direction": "client", - "fields": [ - { "name": "info", "type": "MovementInfo" } - ] -} diff --git a/schemas/world/packets/cmsg_move_stop_client.json b/schemas/world/packets/cmsg_move_stop_client.json deleted file mode 100644 index af6386623..000000000 --- a/schemas/world/packets/cmsg_move_stop_client.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "name": "MoveStopClient", - "opcode": "cmsg_move_stop_client", - "direction": "client", - "fields": [ - { "name": "info", "type": "MovementInfo" } - ] -} diff --git a/schemas/world/packets/cmsg_move_stop_pitch_client.json b/schemas/world/packets/cmsg_move_stop_pitch_client.json deleted file mode 100644 index dffb28c9e..000000000 --- a/schemas/world/packets/cmsg_move_stop_pitch_client.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "name": "MoveStopPitchClient", - "opcode": "cmsg_move_stop_pitch_client", - "direction": "client", - "fields": [ - { "name": "info", "type": "MovementInfo" } - ] -} diff --git a/schemas/world/packets/cmsg_move_stop_strafe_client.json b/schemas/world/packets/cmsg_move_stop_strafe_client.json deleted file mode 100644 index 35cd5c25d..000000000 --- a/schemas/world/packets/cmsg_move_stop_strafe_client.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "name": "MoveStopStrafeClient", - "opcode": "cmsg_move_stop_strafe_client", - "direction": "client", - "fields": [ - { "name": "info", "type": "MovementInfo" } - ] -} diff --git a/schemas/world/packets/cmsg_move_stop_swim_client.json b/schemas/world/packets/cmsg_move_stop_swim_client.json deleted file mode 100644 index 8ded0cf8f..000000000 --- a/schemas/world/packets/cmsg_move_stop_swim_client.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "name": "MoveStopSwimClient", - "opcode": "cmsg_move_stop_swim_client", - "direction": "client", - "fields": [ - { "name": "info", "type": "MovementInfo" } - ] -} diff --git a/schemas/world/packets/cmsg_move_stop_turn_client.json b/schemas/world/packets/cmsg_move_stop_turn_client.json deleted file mode 100644 index f040110d6..000000000 --- a/schemas/world/packets/cmsg_move_stop_turn_client.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "name": "MoveStopTurnClient", - "opcode": "cmsg_move_stop_turn_client", - "direction": "client", - "fields": [ - { "name": "info", "type": "MovementInfo" } - ] -} diff --git a/schemas/world/packets/cmsg_pvp_log_data_client.json b/schemas/world/packets/cmsg_pvp_log_data_client.json deleted file mode 100644 index ae2fff32e..000000000 --- a/schemas/world/packets/cmsg_pvp_log_data_client.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "name": "PvpLogDataClient", - "opcode": "cmsg_pvp_log_data_client", - "direction": "client" -} diff --git a/schemas/world/packets/cmsg_query_next_mail_time_client.json b/schemas/world/packets/cmsg_query_next_mail_time_client.json deleted file mode 100644 index bd232a6c3..000000000 --- a/schemas/world/packets/cmsg_query_next_mail_time_client.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "name": "QueryNextMailTimeClient", - "opcode": "cmsg_query_next_mail_time_client", - "direction": "client" -} diff --git a/schemas/world/packets/cmsg_talent_wipe_confirm_client.json b/schemas/world/packets/cmsg_talent_wipe_confirm_client.json deleted file mode 100644 index 056bcc39e..000000000 --- a/schemas/world/packets/cmsg_talent_wipe_confirm_client.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "name": "TalentWipeConfirmClient", - "opcode": "cmsg_talent_wipe_confirm_client", - "direction": "client", - "fields": [ - { "name": "wiping_npc", "type": "uint64" } - ] -} diff --git a/schemas/world/packets/cmsg_char_create.json b/schemas/world/packets/disabled/cmsg_char_create.json_ similarity index 91% rename from schemas/world/packets/cmsg_char_create.json rename to schemas/world/packets/disabled/cmsg_char_create.json_ index 1803a5726..2b5d5c40c 100644 --- a/schemas/world/packets/cmsg_char_create.json +++ b/schemas/world/packets/disabled/cmsg_char_create.json_ @@ -5,7 +5,7 @@ "fields": [ { "name": "name", "type": "CString" }, { "name": "race", "type": "Race" }, - { "name": "class", "type": "Class" }, + { "name": "class_", "type": "Class" }, { "name": "gender", "type": "Gender" }, { "name": "skin_color", "type": "uint8" }, { "name": "face", "type": "uint8" }, diff --git a/schemas/world/packets/smsg_addon_info.json b/schemas/world/packets/disabled/smsg_addon_info.json_ similarity index 100% rename from schemas/world/packets/smsg_addon_info.json rename to schemas/world/packets/disabled/smsg_addon_info.json_ diff --git a/schemas/world/packets/smsg_char_enum.json b/schemas/world/packets/disabled/smsg_char_enum.json_ similarity index 100% rename from schemas/world/packets/smsg_char_enum.json rename to schemas/world/packets/disabled/smsg_char_enum.json_ diff --git a/schemas/world/packets/investigate/cmsg_accept_level_grant.json b/schemas/world/packets/investigate/cmsg_accept_level_grant.json index 886871143..8b8f59687 100644 --- a/schemas/world/packets/investigate/cmsg_accept_level_grant.json +++ b/schemas/world/packets/investigate/cmsg_accept_level_grant.json @@ -1,6 +1,6 @@ { "name": "AcceptLevelGrant", - "opcode": "cmsg_accept_level_grants", + "opcode": "cmsg_accept_level_grant", "direction": "client", "fields": [ { "name": "guid", "type": "uint64" } diff --git a/schemas/world/packets/smsg_battleground_player_positions_server.json b/schemas/world/packets/msg_battleground_player_positions_server.json similarity index 74% rename from schemas/world/packets/smsg_battleground_player_positions_server.json rename to schemas/world/packets/msg_battleground_player_positions_server.json index ad64458f7..924c3f783 100644 --- a/schemas/world/packets/smsg_battleground_player_positions_server.json +++ b/schemas/world/packets/msg_battleground_player_positions_server.json @@ -1,6 +1,7 @@ { - "name": "BattlegroundPlayerPositionsServer", - "opcode": "smsg_battleground_player_positions_server", + "name": "BattlegroundPlayerPositions", + "opcode": "msg_battleground_player_positions", + "alias": "msg_battleground_player_positions_s", "direction": "server", "fields": [ { "name": "amount_of_teammates", "type": "uint32" }, diff --git a/schemas/world/packets/smsg_channel_start_server.json b/schemas/world/packets/msg_channel_start_server.json similarity index 59% rename from schemas/world/packets/smsg_channel_start_server.json rename to schemas/world/packets/msg_channel_start_server.json index 9f361f6bd..8b29f10ef 100644 --- a/schemas/world/packets/smsg_channel_start_server.json +++ b/schemas/world/packets/msg_channel_start_server.json @@ -1,6 +1,7 @@ { - "name": "ChannelStartServer", - "opcode": "smsg_channel_start_server", + "name": "ChannelStart", + "opcode": "msg_channel_start", + "alias": "msg_channel_start_s", "direction": "server", "fields": [ { "name": "spell", "type": "uint32" }, diff --git a/schemas/world/packets/msg_channel_update_server.json b/schemas/world/packets/msg_channel_update_server.json new file mode 100644 index 000000000..8b364b663 --- /dev/null +++ b/schemas/world/packets/msg_channel_update_server.json @@ -0,0 +1,9 @@ +{ + "name": "ChannelUpdate", + "opcode": "msg_channel_update", + "alias": "msg_channel_update_s", + "direction": "server", + "fields": [ + { "name": "time", "type": "uint32" } + ] +} diff --git a/schemas/world/packets/msg_inspect_honor_stats_client.json b/schemas/world/packets/msg_inspect_honor_stats_client.json new file mode 100644 index 000000000..ebc653a59 --- /dev/null +++ b/schemas/world/packets/msg_inspect_honor_stats_client.json @@ -0,0 +1,9 @@ +{ + "name": "InspectHonorStats", + "opcode": "msg_inspect_honor_stats", + "alias": "msg_inspect_honor_stats_c", + "direction": "client", + "fields": [ + { "name": "guid", "type": "uint64" } + ] +} diff --git a/schemas/world/packets/smsg_inspect_honor_stats_server.json b/schemas/world/packets/msg_inspect_honor_stats_server.json similarity index 91% rename from schemas/world/packets/smsg_inspect_honor_stats_server.json rename to schemas/world/packets/msg_inspect_honor_stats_server.json index ea895b8c7..ace8dbb38 100644 --- a/schemas/world/packets/smsg_inspect_honor_stats_server.json +++ b/schemas/world/packets/msg_inspect_honor_stats_server.json @@ -1,6 +1,7 @@ { - "name": "InspectHonorStatsServer", - "opcode": "smsg_inspect_honor_stats_server", + "name": "InspectHonorStats", + "opcode": "msg_inspect_honor_stats", + "alias": "msg_inspect_honor_stats_s", "direction": "server", "fields": [ { "name": "guid", "type": "uint64" }, diff --git a/schemas/world/packets/msg_list_stabled_pets_client.json b/schemas/world/packets/msg_list_stabled_pets_client.json new file mode 100644 index 000000000..0c6fa023a --- /dev/null +++ b/schemas/world/packets/msg_list_stabled_pets_client.json @@ -0,0 +1,9 @@ +{ + "name": "ListStabledPets", + "opcode": "msg_list_stabled_pets", + "alias": "msg_list_stabled_pets_c", + "direction": "client", + "fields": [ + { "name": "npc", "type": "uint64" } + ] +} diff --git a/schemas/world/packets/smsg_list_stabled_pets_server.json b/schemas/world/packets/msg_list_stabled_pets_server.json similarity index 74% rename from schemas/world/packets/smsg_list_stabled_pets_server.json rename to schemas/world/packets/msg_list_stabled_pets_server.json index b7afa05e0..dbb9fe369 100644 --- a/schemas/world/packets/smsg_list_stabled_pets_server.json +++ b/schemas/world/packets/msg_list_stabled_pets_server.json @@ -1,6 +1,7 @@ { - "name": "ListStabledPetsServer", - "opcode": "smsg_list_stabled_pets_server", + "name": "ListStabledPets", + "opcode": "msg_list_stabled_pets", + "alias": "msg_list_stabled_pets_s", "direction": "server", "fields": [ { "name": "npc", "type": "uint64" }, diff --git a/schemas/world/packets/msg_looking_for_group_client.json b/schemas/world/packets/msg_looking_for_group_client.json new file mode 100644 index 000000000..886f31ecb --- /dev/null +++ b/schemas/world/packets/msg_looking_for_group_client.json @@ -0,0 +1,6 @@ +{ + "name": "LookingForGroup", + "opcode": "msg_looking_for_group", + "alias": "msg_looking_for_group_c", + "direction": "client" +} diff --git a/schemas/world/packets/msg_looking_for_group_server.json b/schemas/world/packets/msg_looking_for_group_server.json new file mode 100644 index 000000000..d5abb9b82 --- /dev/null +++ b/schemas/world/packets/msg_looking_for_group_server.json @@ -0,0 +1,9 @@ +{ + "name": "LookingForGroup", + "opcode": "msg_looking_for_group", + "alias": "msg_looking_for_group_s", + "direction": "server", + "fields": [ + { "name": "unknown1", "type": "uint32" } + ] +} diff --git a/schemas/world/packets/cmsg_minimap_ping_client.json b/schemas/world/packets/msg_minimap_ping_client.json similarity index 60% rename from schemas/world/packets/cmsg_minimap_ping_client.json rename to schemas/world/packets/msg_minimap_ping_client.json index b1a7308e2..7f835d429 100644 --- a/schemas/world/packets/cmsg_minimap_ping_client.json +++ b/schemas/world/packets/msg_minimap_ping_client.json @@ -1,6 +1,7 @@ { - "name": "MinimapPingClient", - "opcode": "cmsg_minimap_ping_client", + "name": "MinimapPing", + "opcode": "msg_minimap_ping", + "alias": "msg_minimap_ping_c", "direction": "client", "fields": [ { "name": "position_x", "type": "float" }, diff --git a/schemas/world/packets/smsg_minimap_ping_server.json b/schemas/world/packets/msg_minimap_ping_server.json similarity index 67% rename from schemas/world/packets/smsg_minimap_ping_server.json rename to schemas/world/packets/msg_minimap_ping_server.json index d97365b54..d42b58146 100644 --- a/schemas/world/packets/smsg_minimap_ping_server.json +++ b/schemas/world/packets/msg_minimap_ping_server.json @@ -1,6 +1,7 @@ { - "name": "MinimapPingServer", - "opcode": "smsg_minimap_ping_server", + "name": "MinimapPing", + "opcode": "msg_minimap_ping", + "alias": "msg_minimap_ping_s", "direction": "server", "fields": [ { "name": "guid", "type": "uint64" }, diff --git a/schemas/world/packets/msg_move_fall_land_client.json b/schemas/world/packets/msg_move_fall_land_client.json new file mode 100644 index 000000000..9d0c5b5eb --- /dev/null +++ b/schemas/world/packets/msg_move_fall_land_client.json @@ -0,0 +1,9 @@ +{ + "name": "MoveFallLand", + "opcode": "msg_move_fall_land", + "alias": "msg_move_fall_land_c", + "direction": "client", + "fields": [ + { "name": "info", "type": "MovementInfo" } + ] +} \ No newline at end of file diff --git a/schemas/world/packets/smsg_move_jump_server.json b/schemas/world/packets/msg_move_fall_land_server.json similarity index 59% rename from schemas/world/packets/smsg_move_jump_server.json rename to schemas/world/packets/msg_move_fall_land_server.json index ff8e95cdb..6855cf559 100644 --- a/schemas/world/packets/smsg_move_jump_server.json +++ b/schemas/world/packets/msg_move_fall_land_server.json @@ -1,6 +1,7 @@ { - "name": "MoveJumpServer", - "opcode": "smsg_move_jump_server", + "name": "MoveFallLand", + "opcode": "msg_move_fall_land", + "alias": "msg_move_fall_land_s", "direction": "server", "fields": [ { "name": "guid", "type": "PackedGuid" }, diff --git a/schemas/world/packets/smsg_move_feather_fall_server.json b/schemas/world/packets/msg_move_feather_fall_server.json similarity index 58% rename from schemas/world/packets/smsg_move_feather_fall_server.json rename to schemas/world/packets/msg_move_feather_fall_server.json index 56078dbf0..3479164d4 100644 --- a/schemas/world/packets/smsg_move_feather_fall_server.json +++ b/schemas/world/packets/msg_move_feather_fall_server.json @@ -1,6 +1,7 @@ { - "name": "MoveFeatherFallServer", - "opcode": "smsg_move_feather_fall_server", + "name": "MoveFeatherFall", + "opcode": "msg_move_feather_fall", + "alias": "msg_move_heartbeat_s", "direction": "server", "fields": [ { "name": "player", "type": "PackedGuid" }, diff --git a/schemas/world/packets/msg_move_heartbeat_client.json b/schemas/world/packets/msg_move_heartbeat_client.json new file mode 100644 index 000000000..0da2bbfe7 --- /dev/null +++ b/schemas/world/packets/msg_move_heartbeat_client.json @@ -0,0 +1,9 @@ +{ + "name": "MoveHeartbeat", + "opcode": "msg_move_heartbeat", + "alias": "msg_move_heartbeat_c", + "direction": "client", + "fields": [ + { "name": "info", "type": "MovementInfo" } + ] +} diff --git a/schemas/world/packets/msg_move_heartbeat_server.json b/schemas/world/packets/msg_move_heartbeat_server.json new file mode 100644 index 000000000..c324db7ca --- /dev/null +++ b/schemas/world/packets/msg_move_heartbeat_server.json @@ -0,0 +1,10 @@ +{ + "name": "MoveHeartbeat", + "opcode": "msg_move_heartbeat", + "alias": "msg_move_heartbeat_s", + "direction": "server", + "fields": [ + { "name": "guid", "type": "PackedGuid" }, + { "name": "info", "type": "MovementInfo" } + ] +} diff --git a/schemas/world/packets/cmsg_move_heartbeat_client.json b/schemas/world/packets/msg_move_jump_client.json similarity index 53% rename from schemas/world/packets/cmsg_move_heartbeat_client.json rename to schemas/world/packets/msg_move_jump_client.json index 7f910f0be..6a951a139 100644 --- a/schemas/world/packets/cmsg_move_heartbeat_client.json +++ b/schemas/world/packets/msg_move_jump_client.json @@ -1,6 +1,7 @@ { - "name": "MoveHeartbeatClient", - "opcode": "cmsg_move_heartbeat_client", + "name": "MoveJump", + "opcode": "msg_move_jump", + "alias": "msg_move_jump_c", "direction": "client", "fields": [ { "name": "info", "type": "MovementInfo" } diff --git a/schemas/world/packets/smsg_move_fall_land_server.json b/schemas/world/packets/msg_move_jump_server.json similarity index 63% rename from schemas/world/packets/smsg_move_fall_land_server.json rename to schemas/world/packets/msg_move_jump_server.json index 7ae78c1c9..cf6ee020d 100644 --- a/schemas/world/packets/smsg_move_fall_land_server.json +++ b/schemas/world/packets/msg_move_jump_server.json @@ -1,6 +1,7 @@ { - "name": "MoveFallLandServer", - "opcode": "smsg_move_fall_land_server", + "name": "MoveJump", + "opcode": "msg_move_jump", + "alias": "msg_move_jump_s", "direction": "server", "fields": [ { "name": "guid", "type": "PackedGuid" }, diff --git a/schemas/world/packets/msg_move_set_facing_client.json b/schemas/world/packets/msg_move_set_facing_client.json new file mode 100644 index 000000000..a607395a6 --- /dev/null +++ b/schemas/world/packets/msg_move_set_facing_client.json @@ -0,0 +1,9 @@ +{ + "name": "MoveSetFacing", + "opcode": "msg_move_set_facing", + "alias": "msg_move_set_facing_c", + "direction": "client", + "fields": [ + { "name": "info", "type": "MovementInfo" } + ] +} \ No newline at end of file diff --git a/schemas/world/packets/msg_move_set_facing_server.json b/schemas/world/packets/msg_move_set_facing_server.json new file mode 100644 index 000000000..a491a5fa3 --- /dev/null +++ b/schemas/world/packets/msg_move_set_facing_server.json @@ -0,0 +1,10 @@ +{ + "name": "MoveSetFacing", + "opcode": "msg_move_set_facing", + "alias": "msg_move_set_facing_s", + "direction": "server", + "fields": [ + { "name": "guid", "type": "PackedGuid" }, + { "name": "info", "type": "MovementInfo" } + ] +} diff --git a/schemas/world/packets/msg_move_set_pitch_client.json b/schemas/world/packets/msg_move_set_pitch_client.json new file mode 100644 index 000000000..1a6b8e4fc --- /dev/null +++ b/schemas/world/packets/msg_move_set_pitch_client.json @@ -0,0 +1,9 @@ +{ + "name": "MoveSetPitch", + "opcode": "msg_move_set_pitch", + "alias": "msg_move_set_pitch_c", + "direction": "client", + "fields": [ + { "name": "info", "type": "MovementInfo" } + ] +} diff --git a/schemas/world/packets/smsg_move_set_facing_server.json b/schemas/world/packets/msg_move_set_pitch_server.json similarity index 59% rename from schemas/world/packets/smsg_move_set_facing_server.json rename to schemas/world/packets/msg_move_set_pitch_server.json index 019e7cfec..0813b31c2 100644 --- a/schemas/world/packets/smsg_move_set_facing_server.json +++ b/schemas/world/packets/msg_move_set_pitch_server.json @@ -1,6 +1,7 @@ { - "name": "MoveSetFacingServer", - "opcode": "smsg_move_set_facing_server", + "name": "MoveSetPitch", + "opcode": "msg_move_set_pitch", + "alias": "msg_move_set_pitch_s", "direction": "server", "fields": [ { "name": "guid", "type": "PackedGuid" }, diff --git a/schemas/world/packets/msg_move_set_run_mode_client.json b/schemas/world/packets/msg_move_set_run_mode_client.json new file mode 100644 index 000000000..e4fce9f7c --- /dev/null +++ b/schemas/world/packets/msg_move_set_run_mode_client.json @@ -0,0 +1,9 @@ +{ + "name": "MoveSetRunMode", + "opcode": "msg_move_set_run_mode", + "alias": "msg_move_set_run_mode_c", + "direction": "client", + "fields": [ + { "name": "info", "type": "MovementInfo" } + ] +} diff --git a/schemas/world/packets/msg_move_set_run_mode_server.json b/schemas/world/packets/msg_move_set_run_mode_server.json new file mode 100644 index 000000000..d9ffa3ae8 --- /dev/null +++ b/schemas/world/packets/msg_move_set_run_mode_server.json @@ -0,0 +1,10 @@ +{ + "name": "MoveSetRunMode", + "opcode": "msg_move_set_run_mode", + "alias": "msg_move_set_run_mode_s", + "direction": "server", + "fields": [ + { "name": "guid", "type": "PackedGuid" }, + { "name": "info", "type": "MovementInfo" } + ] +} diff --git a/schemas/world/packets/msg_move_set_walk_mode_client.json b/schemas/world/packets/msg_move_set_walk_mode_client.json new file mode 100644 index 000000000..61e16a3db --- /dev/null +++ b/schemas/world/packets/msg_move_set_walk_mode_client.json @@ -0,0 +1,9 @@ +{ + "name": "MoveSetWalkMode", + "opcode": "msg_move_set_walk_mode", + "alias": "msg_move_set_walk_mode_c", + "direction": "client", + "fields": [ + { "name": "info", "type": "MovementInfo" } + ] +} diff --git a/schemas/world/packets/msg_move_set_walk_mode_server.json b/schemas/world/packets/msg_move_set_walk_mode_server.json new file mode 100644 index 000000000..8955762cd --- /dev/null +++ b/schemas/world/packets/msg_move_set_walk_mode_server.json @@ -0,0 +1,10 @@ +{ + "name": "MoveSetWalkMode", + "opcode": "msg_move_set_walk_mode", + "alias": "msg_move_set_walk_mode_s", + "direction": "server", + "fields": [ + { "name": "guid", "type": "PackedGuid" }, + { "name": "info", "type": "MovementInfo" } + ] +} diff --git a/schemas/world/packets/msg_move_start_backward_client.json b/schemas/world/packets/msg_move_start_backward_client.json new file mode 100644 index 000000000..185cad742 --- /dev/null +++ b/schemas/world/packets/msg_move_start_backward_client.json @@ -0,0 +1,9 @@ +{ + "name": "MoveStartBackward", + "opcode": "msg_move_start_backward", + "alias": "msg_move_start_backward_c", + "direction": "client", + "fields": [ + { "name": "info", "type": "MovementInfo" } + ] +} diff --git a/schemas/world/packets/msg_move_start_backward_server.json b/schemas/world/packets/msg_move_start_backward_server.json new file mode 100644 index 000000000..d3c52e1bb --- /dev/null +++ b/schemas/world/packets/msg_move_start_backward_server.json @@ -0,0 +1,10 @@ +{ + "name": "MoveStartBackward", + "opcode": "msg_move_start_backward", + "alias": "msg_move_start_backward_s", + "direction": "server", + "fields": [ + { "name": "guid", "type": "PackedGuid" }, + { "name": "info", "type": "MovementInfo" } + ] +} diff --git a/schemas/world/packets/msg_move_start_forward_client.json b/schemas/world/packets/msg_move_start_forward_client.json new file mode 100644 index 000000000..e6e1944ef --- /dev/null +++ b/schemas/world/packets/msg_move_start_forward_client.json @@ -0,0 +1,9 @@ +{ + "name": "MoveStartForward", + "opcode": "msg_move_start_forward", + "alias": "msg_move_start_forward_c", + "direction": "client", + "fields": [ + { "name": "info", "type": "MovementInfo" } + ] +} diff --git a/schemas/world/packets/msg_move_start_forward_server.json b/schemas/world/packets/msg_move_start_forward_server.json new file mode 100644 index 000000000..d7c20175f --- /dev/null +++ b/schemas/world/packets/msg_move_start_forward_server.json @@ -0,0 +1,10 @@ +{ + "name": "MoveStartForward", + "opcode": "msg_move_start_forward", + "alias": "msg_move_start_forward_s", + "direction": "server", + "fields": [ + { "name": "guid", "type": "PackedGuid" }, + { "name": "info", "type": "MovementInfo" } + ] +} diff --git a/schemas/world/packets/msg_move_start_pitch_down_client.json b/schemas/world/packets/msg_move_start_pitch_down_client.json new file mode 100644 index 000000000..946fb998e --- /dev/null +++ b/schemas/world/packets/msg_move_start_pitch_down_client.json @@ -0,0 +1,9 @@ +{ + "name": "MoveStartPitchDown", + "opcode": "msg_move_start_pitch_down", + "alias": "msg_move_start_pitch_down_c", + "direction": "client", + "fields": [ + { "name": "info", "type": "MovementInfo" } + ] +} diff --git a/schemas/world/packets/msg_move_start_pitch_down_server.json b/schemas/world/packets/msg_move_start_pitch_down_server.json new file mode 100644 index 000000000..cb94a116e --- /dev/null +++ b/schemas/world/packets/msg_move_start_pitch_down_server.json @@ -0,0 +1,10 @@ +{ + "name": "MoveStartPitchDown", + "opcode": "msg_move_start_pitch_down", + "alias": "msg_move_start_pitch_down_s", + "direction": "server", + "fields": [ + { "name": "guid", "type": "PackedGuid" }, + { "name": "info", "type": "MovementInfo" } + ] +} diff --git a/schemas/world/packets/msg_move_start_pitch_up_client.json b/schemas/world/packets/msg_move_start_pitch_up_client.json new file mode 100644 index 000000000..76fa88c03 --- /dev/null +++ b/schemas/world/packets/msg_move_start_pitch_up_client.json @@ -0,0 +1,9 @@ +{ + "name": "MoveStartPitchUp", + "opcode": "msg_move_start_pitch_up", + "alias": "msg_move_start_pitch_up_c", + "direction": "client", + "fields": [ + { "name": "info", "type": "MovementInfo" } + ] +} diff --git a/schemas/world/packets/msg_move_start_pitch_up_server.json b/schemas/world/packets/msg_move_start_pitch_up_server.json new file mode 100644 index 000000000..6c917e60c --- /dev/null +++ b/schemas/world/packets/msg_move_start_pitch_up_server.json @@ -0,0 +1,10 @@ +{ + "name": "MoveStartPitchUp", + "opcode": "msg_move_start_pitch_up", + "alias": "msg_move_start_pitch_up_s", + "direction": "server", + "fields": [ + { "name": "guid", "type": "PackedGuid" }, + { "name": "info", "type": "MovementInfo" } + ] +} diff --git a/schemas/world/packets/msg_move_start_strafe_left_client.json b/schemas/world/packets/msg_move_start_strafe_left_client.json new file mode 100644 index 000000000..3b8924f70 --- /dev/null +++ b/schemas/world/packets/msg_move_start_strafe_left_client.json @@ -0,0 +1,9 @@ +{ + "name": "MoveStartStrafeLeft", + "opcode": "msg_move_start_strafe_left", + "alias": "msg_move_start_strafe_left_c", + "direction": "client", + "fields": [ + { "name": "info", "type": "MovementInfo" } + ] +} diff --git a/schemas/world/packets/msg_move_start_strafe_left_server.json b/schemas/world/packets/msg_move_start_strafe_left_server.json new file mode 100644 index 000000000..857ea245b --- /dev/null +++ b/schemas/world/packets/msg_move_start_strafe_left_server.json @@ -0,0 +1,10 @@ +{ + "name": "MoveStartStrafeLeft", + "opcode": "msg_move_start_strafe_left", + "alias": "msg_move_start_strafe_left_s", + "direction": "server", + "fields": [ + { "name": "guid", "type": "PackedGuid" }, + { "name": "info", "type": "MovementInfo" } + ] +} diff --git a/schemas/world/packets/msg_move_start_strafe_right_client.json b/schemas/world/packets/msg_move_start_strafe_right_client.json new file mode 100644 index 000000000..5ba0c1680 --- /dev/null +++ b/schemas/world/packets/msg_move_start_strafe_right_client.json @@ -0,0 +1,9 @@ +{ + "name": "MoveStartStrafeRight", + "opcode": "msg_move_start_strafe_right", + "alias": "msg_move_start_strafe_right_c", + "direction": "client", + "fields": [ + { "name": "info", "type": "MovementInfo" } + ] +} diff --git a/schemas/world/packets/msg_move_start_strafe_right_server.json b/schemas/world/packets/msg_move_start_strafe_right_server.json new file mode 100644 index 000000000..d59d57478 --- /dev/null +++ b/schemas/world/packets/msg_move_start_strafe_right_server.json @@ -0,0 +1,10 @@ +{ + "name": "MoveStartStrafeRight", + "opcode": "msg_move_start_strafe_right", + "alias": "msg_move_start_strafe_right_s", + "direction": "server", + "fields": [ + { "name": "guid", "type": "PackedGuid" }, + { "name": "info", "type": "MovementInfo" } + ] +} diff --git a/schemas/world/packets/msg_move_start_swim_client.json b/schemas/world/packets/msg_move_start_swim_client.json new file mode 100644 index 000000000..6319e1a67 --- /dev/null +++ b/schemas/world/packets/msg_move_start_swim_client.json @@ -0,0 +1,9 @@ +{ + "name": "MoveStartSwim", + "opcode": "msg_move_start_swim", + "alias": "msg_move_start_swim_c", + "direction": "client", + "fields": [ + { "name": "info", "type": "MovementInfo" } + ] +} diff --git a/schemas/world/packets/msg_move_start_swim_server.json b/schemas/world/packets/msg_move_start_swim_server.json new file mode 100644 index 000000000..f63b7cfc8 --- /dev/null +++ b/schemas/world/packets/msg_move_start_swim_server.json @@ -0,0 +1,10 @@ +{ + "name": "MoveStartSwim", + "opcode": "msg_move_start_swim", + "alias": "msg_move_start_swim_s", + "direction": "server", + "fields": [ + { "name": "guid", "type": "PackedGuid" }, + { "name": "info", "type": "MovementInfo" } + ] +} diff --git a/schemas/world/packets/msg_move_start_turn_left_client.json b/schemas/world/packets/msg_move_start_turn_left_client.json new file mode 100644 index 000000000..06c813421 --- /dev/null +++ b/schemas/world/packets/msg_move_start_turn_left_client.json @@ -0,0 +1,9 @@ +{ + "name": "MoveStartTurnLeft", + "opcode": "msg_move_start_turn_left", + "alias": "msg_move_start_turn_left_c", + "direction": "client", + "fields": [ + { "name": "info", "type": "MovementInfo" } + ] +} diff --git a/schemas/world/packets/msg_move_start_turn_left_server.json b/schemas/world/packets/msg_move_start_turn_left_server.json new file mode 100644 index 000000000..956d7eb15 --- /dev/null +++ b/schemas/world/packets/msg_move_start_turn_left_server.json @@ -0,0 +1,10 @@ +{ + "name": "MoveStartTurnLeft", + "opcode": "msg_move_start_turn_left", + "alias": "msg_move_start_turn_left_s", + "direction": "server", + "fields": [ + { "name": "guid", "type": "PackedGuid" }, + { "name": "info", "type": "MovementInfo" } + ] +} diff --git a/schemas/world/packets/msg_move_start_turn_right_client.json b/schemas/world/packets/msg_move_start_turn_right_client.json new file mode 100644 index 000000000..d6e0a21ae --- /dev/null +++ b/schemas/world/packets/msg_move_start_turn_right_client.json @@ -0,0 +1,9 @@ +{ + "name": "MoveStartTurnRight", + "opcode": "msg_move_start_turn_right", + "alias": "msg_move_start_turn_right_c", + "direction": "client", + "fields": [ + { "name": "info", "type": "MovementInfo" } + ] +} diff --git a/schemas/world/packets/msg_move_start_turn_right_server.json b/schemas/world/packets/msg_move_start_turn_right_server.json new file mode 100644 index 000000000..96522a66d --- /dev/null +++ b/schemas/world/packets/msg_move_start_turn_right_server.json @@ -0,0 +1,10 @@ +{ + "name": "MoveStartTurnRight", + "opcode": "msg_move_start_turn_right", + "opcode": "msg_move_start_turn_right_s", + "direction": "server", + "fields": [ + { "name": "guid", "type": "PackedGuid" }, + { "name": "info", "type": "MovementInfo" } + ] +} diff --git a/schemas/world/packets/cmsg_move_jump_client.json b/schemas/world/packets/msg_move_stop_client.json similarity index 53% rename from schemas/world/packets/cmsg_move_jump_client.json rename to schemas/world/packets/msg_move_stop_client.json index f953ab0da..127f7df87 100644 --- a/schemas/world/packets/cmsg_move_jump_client.json +++ b/schemas/world/packets/msg_move_stop_client.json @@ -1,6 +1,7 @@ { - "name": "MoveJumpClient", - "opcode": "cmsg_move_jump_client", + "name": "MoveStop", + "opcode": "msg_move_stop", + "alias": "msg_move_stop_c", "direction": "client", "fields": [ { "name": "info", "type": "MovementInfo" } diff --git a/schemas/world/packets/msg_move_stop_pitch_client.json b/schemas/world/packets/msg_move_stop_pitch_client.json new file mode 100644 index 000000000..c0bc3561a --- /dev/null +++ b/schemas/world/packets/msg_move_stop_pitch_client.json @@ -0,0 +1,9 @@ +{ + "name": "MoveStopPitch", + "opcode": "msg_move_stop_pitch", + "alias": "msg_move_stop_pitch_c", + "direction": "client", + "fields": [ + { "name": "info", "type": "MovementInfo" } + ] +} diff --git a/schemas/world/packets/msg_move_stop_pitch_server.json b/schemas/world/packets/msg_move_stop_pitch_server.json new file mode 100644 index 000000000..44e239349 --- /dev/null +++ b/schemas/world/packets/msg_move_stop_pitch_server.json @@ -0,0 +1,10 @@ +{ + "name": "MoveStopPitch", + "opcode": "msg_move_stop_pitch", + "alias": "msg_move_stop_pitch_s", + "direction": "server", + "fields": [ + { "name": "guid", "type": "PackedGuid" }, + { "name": "info", "type": "MovementInfo" } + ] +} diff --git a/schemas/world/packets/smsg_move_heartbeat_server.json b/schemas/world/packets/msg_move_stop_server.json similarity index 63% rename from schemas/world/packets/smsg_move_heartbeat_server.json rename to schemas/world/packets/msg_move_stop_server.json index d1534b7a3..aa491dcbb 100644 --- a/schemas/world/packets/smsg_move_heartbeat_server.json +++ b/schemas/world/packets/msg_move_stop_server.json @@ -1,6 +1,7 @@ { - "name": "MoveHeartbeatServer", - "opcode": "smsg_move_heartbeat_server", + "name": "MoveStop", + "opcode": "msg_move_stop", + "alias": "msg_move_stop_s", "direction": "server", "fields": [ { "name": "guid", "type": "PackedGuid" }, diff --git a/schemas/world/packets/msg_move_stop_strafe_client.json b/schemas/world/packets/msg_move_stop_strafe_client.json new file mode 100644 index 000000000..c4d43d11b --- /dev/null +++ b/schemas/world/packets/msg_move_stop_strafe_client.json @@ -0,0 +1,9 @@ +{ + "name": "MoveStopStrafe", + "opcode": "msg_move_stop_strafe", + "alias": "msg_move_stop_strafe_c", + "direction": "client", + "fields": [ + { "name": "info", "type": "MovementInfo" } + ] +} diff --git a/schemas/world/packets/msg_move_stop_strafe_server.json b/schemas/world/packets/msg_move_stop_strafe_server.json new file mode 100644 index 000000000..cd78821ff --- /dev/null +++ b/schemas/world/packets/msg_move_stop_strafe_server.json @@ -0,0 +1,10 @@ +{ + "name": "MoveStopStrafe", + "opcode": "msg_move_stop_strafe", + "alias": "msg_move_stop_strafe_s", + "direction": "server", + "fields": [ + { "name": "guid", "type": "PackedGuid" }, + { "name": "info", "type": "MovementInfo" } + ] +} diff --git a/schemas/world/packets/msg_move_stop_swim_client.json b/schemas/world/packets/msg_move_stop_swim_client.json new file mode 100644 index 000000000..833bb391b --- /dev/null +++ b/schemas/world/packets/msg_move_stop_swim_client.json @@ -0,0 +1,9 @@ +{ + "name": "MoveStopSwim", + "opcode": "msg_move_stop_swim", + "alias": "msg_move_stop_swim_c", + "direction": "client", + "fields": [ + { "name": "info", "type": "MovementInfo" } + ] +} diff --git a/schemas/world/packets/msg_move_stop_swim_server.json b/schemas/world/packets/msg_move_stop_swim_server.json new file mode 100644 index 000000000..5ca963a18 --- /dev/null +++ b/schemas/world/packets/msg_move_stop_swim_server.json @@ -0,0 +1,10 @@ +{ + "name": "MoveStopSwim", + "opcode": "msg_move_stop_swim", + "alias": "msg_move_stop_swim_s", + "direction": "server", + "fields": [ + { "name": "guid", "type": "PackedGuid" }, + { "name": "info", "type": "MovementInfo" } + ] +} diff --git a/schemas/world/packets/msg_move_stop_turn_client.json b/schemas/world/packets/msg_move_stop_turn_client.json new file mode 100644 index 000000000..0765908cf --- /dev/null +++ b/schemas/world/packets/msg_move_stop_turn_client.json @@ -0,0 +1,9 @@ +{ + "name": "MoveStopTurn", + "opcode": "msg_move_stop_turn", + "alias": "msg_move_stop_turn_c", + "direction": "client", + "fields": [ + { "name": "info", "type": "MovementInfo" } + ] +} diff --git a/schemas/world/packets/msg_move_stop_turn_server.json b/schemas/world/packets/msg_move_stop_turn_server.json new file mode 100644 index 000000000..d74a9ef7a --- /dev/null +++ b/schemas/world/packets/msg_move_stop_turn_server.json @@ -0,0 +1,10 @@ +{ + "name": "MoveStopTurn", + "opcode": "msg_move_stop_turn", + "alias": "msg_move_stop_turn_s", + "direction": "server", + "fields": [ + { "name": "guid", "type": "PackedGuid" }, + { "name": "info", "type": "MovementInfo" } + ] +} diff --git a/schemas/world/packets/cmsg_move_teleport_ack_client.json b/schemas/world/packets/msg_move_teleport_ack_client.json similarity index 66% rename from schemas/world/packets/cmsg_move_teleport_ack_client.json rename to schemas/world/packets/msg_move_teleport_ack_client.json index 87f274365..a4db31a3c 100644 --- a/schemas/world/packets/cmsg_move_teleport_ack_client.json +++ b/schemas/world/packets/msg_move_teleport_ack_client.json @@ -1,6 +1,7 @@ { - "name": "MoveTeleportAckClient", - "opcode": "cmsg_move_teleport_ack_client", + "name": "MoveTeleportAck", + "opcode": "msg_move_teleport_ack", + "alias": "msg_move_teleport_ack_c", "direction": "client", "fields": [ { "name": "guid", "type": "PackedGuid" }, diff --git a/schemas/world/packets/smsg_move_teleport_ack_server.json b/schemas/world/packets/msg_move_teleport_ack_server.json similarity index 67% rename from schemas/world/packets/smsg_move_teleport_ack_server.json rename to schemas/world/packets/msg_move_teleport_ack_server.json index 54629b3ba..b82572f32 100644 --- a/schemas/world/packets/smsg_move_teleport_ack_server.json +++ b/schemas/world/packets/msg_move_teleport_ack_server.json @@ -1,6 +1,7 @@ { - "name": "MoveTeleportAckServer", - "opcode": "smsg_move_teleport_ack_server", + "name": "MoveTeleportAck", + "opcode": "msg_move_teleport_ack", + "alias": "msg_move_teleport_ack_s", "direction": "server", "fields": [ { "name": "guid", "type": "PackedGuid" }, diff --git a/schemas/world/packets/smsg_move_time_skipped_server.json b/schemas/world/packets/msg_move_time_skipped_server.json similarity index 58% rename from schemas/world/packets/smsg_move_time_skipped_server.json rename to schemas/world/packets/msg_move_time_skipped_server.json index 706448aa1..b11a535ea 100644 --- a/schemas/world/packets/smsg_move_time_skipped_server.json +++ b/schemas/world/packets/msg_move_time_skipped_server.json @@ -1,6 +1,7 @@ { - "name": "MoveTimeSkippedServer", - "opcode": "smsg_move_time_skipped_server", + "name": "MoveTimeSkipped", + "opcode": "msg_move_time_skipped", + "alias": "msg_move_time_skipped_s", "direction": "server", "fields": [ { "name": "player", "type": "PackedGuid" }, diff --git a/schemas/world/packets/msg_pvp_log_data_client.json b/schemas/world/packets/msg_pvp_log_data_client.json new file mode 100644 index 000000000..447199dd9 --- /dev/null +++ b/schemas/world/packets/msg_pvp_log_data_client.json @@ -0,0 +1,6 @@ +{ + "name": "PvpLogData", + "opcode": "msg_pvp_log_data", + "alias": "msg_pvp_log_data_c", + "direction": "client" +} diff --git a/schemas/world/packets/smsg_pvp_log_data_server.json b/schemas/world/packets/msg_pvp_log_data_server.json similarity index 83% rename from schemas/world/packets/smsg_pvp_log_data_server.json rename to schemas/world/packets/msg_pvp_log_data_server.json index 83bdce2d6..5382f3e71 100644 --- a/schemas/world/packets/smsg_pvp_log_data_server.json +++ b/schemas/world/packets/msg_pvp_log_data_server.json @@ -1,6 +1,7 @@ { - "name": "PvpLogDataServer", - "opcode": "smsg_pvp_log_data_server", + "name": "PvpLogData", + "opcode": "msg_pvp_log_data", + "alias": "msg_pvp_log_data_s", "direction": "server", "fields": [ { "name": "status", "type": "BattlegroundEndStatus" }, diff --git a/schemas/world/packets/msg_query_next_mail_time_client.json b/schemas/world/packets/msg_query_next_mail_time_client.json new file mode 100644 index 000000000..cd96ea843 --- /dev/null +++ b/schemas/world/packets/msg_query_next_mail_time_client.json @@ -0,0 +1,6 @@ +{ + "name": "QueryNextMailTime", + "opcode": "msg_query_next_mail_time", + "alias": "msg_query_next_mail_time_c", + "direction": "client" +} diff --git a/schemas/world/packets/msg_query_next_mail_time_server.json b/schemas/world/packets/msg_query_next_mail_time_server.json new file mode 100644 index 000000000..93ed03444 --- /dev/null +++ b/schemas/world/packets/msg_query_next_mail_time_server.json @@ -0,0 +1,9 @@ +{ + "name": "QueryNextMailTime", + "opcode": "msg_query_next_mail_time", + "alias": "msg_query_next_mail_time_s", + "direction": "server", + "fields": [ + { "name": "next_time", "type": "float" } + ] +} diff --git a/schemas/world/packets/cmsg_raid_ready_check_client.json b/schemas/world/packets/msg_raid_ready_check_client.json similarity index 63% rename from schemas/world/packets/cmsg_raid_ready_check_client.json rename to schemas/world/packets/msg_raid_ready_check_client.json index a7201c1be..a9a7351ae 100644 --- a/schemas/world/packets/cmsg_raid_ready_check_client.json +++ b/schemas/world/packets/msg_raid_ready_check_client.json @@ -1,6 +1,7 @@ { - "name": "RaidReadyCheckClient", - "opcode": "cmsg_raid_ready_check_client", + "name": "RaidReadyCheck", + "opcode": "msg_raid_ready_check", + "alias": "msg_raid_ready_check_c", "direction": "client", "fields": [ { diff --git a/schemas/world/packets/smsg_raid_ready_check_server.json b/schemas/world/packets/msg_raid_ready_check_server.json similarity index 68% rename from schemas/world/packets/smsg_raid_ready_check_server.json rename to schemas/world/packets/msg_raid_ready_check_server.json index 3009808ab..6fc0df492 100644 --- a/schemas/world/packets/smsg_raid_ready_check_server.json +++ b/schemas/world/packets/msg_raid_ready_check_server.json @@ -1,6 +1,7 @@ { - "name": "RaidReadyCheckServer", - "opcode": "smsg_raid_ready_check_server", + "name": "RaidReadyCheck", + "opcode": "msg_raid_ready_check", + "alias": "msg_raid_ready_check_s", "direction": "server", "fields": [ { diff --git a/schemas/world/packets/cmsg_raid_target_update_client.json b/schemas/world/packets/msg_raid_target_update_client.json similarity index 72% rename from schemas/world/packets/cmsg_raid_target_update_client.json rename to schemas/world/packets/msg_raid_target_update_client.json index bb9f7909d..9392d5dbe 100644 --- a/schemas/world/packets/cmsg_raid_target_update_client.json +++ b/schemas/world/packets/msg_raid_target_update_client.json @@ -1,6 +1,7 @@ { - "name": "RaidTargetUpdateClient", - "opcode": "cmsg_raid_target_update_client", + "name": "RaidTargetUpdate", + "opcode": "msg_raid_target_update", + "alias": "msg_raid_target_update_c", "direction": "client", "fields": [ { "name": "target_index", "type": "RaidTargetIndex" }, diff --git a/schemas/world/packets/smsg_raid_target_update_server.json b/schemas/world/packets/msg_raid_target_update_server.json similarity index 83% rename from schemas/world/packets/smsg_raid_target_update_server.json rename to schemas/world/packets/msg_raid_target_update_server.json index 07c755873..edb2d4f38 100644 --- a/schemas/world/packets/smsg_raid_target_update_server.json +++ b/schemas/world/packets/msg_raid_target_update_server.json @@ -1,6 +1,7 @@ { - "name": "RaidTargetUpdateServer", - "opcode": "smsg_raid_target_update_server", + "name": "RaidTargetUpdate", + "opcode": "msg_raid_target_update", + "alias": "msg_raid_target_update_s", "direction": "server", "fields": [ { "name": "update_type", "type": "RaidTargetUpdateType" }, diff --git a/schemas/world/packets/cmsg_random_roll_client.json b/schemas/world/packets/msg_random_roll_client.json similarity index 60% rename from schemas/world/packets/cmsg_random_roll_client.json rename to schemas/world/packets/msg_random_roll_client.json index 18a62e4e5..7842bdae9 100644 --- a/schemas/world/packets/cmsg_random_roll_client.json +++ b/schemas/world/packets/msg_random_roll_client.json @@ -1,6 +1,7 @@ { - "name": "RandomRollClient", - "opcode": "cmsg_random_roll_client", + "name": "RandomRoll", + "opcode": "msg_random_roll", + "alias": "msg_random_roll_c", "direction": "client", "fields": [ { "name": "minimum", "type": "uint32" }, diff --git a/schemas/world/packets/smsg_random_roll_server.json b/schemas/world/packets/msg_random_roll_server.json similarity index 73% rename from schemas/world/packets/smsg_random_roll_server.json rename to schemas/world/packets/msg_random_roll_server.json index 96586e6e7..748ff8b0b 100644 --- a/schemas/world/packets/smsg_random_roll_server.json +++ b/schemas/world/packets/msg_random_roll_server.json @@ -1,6 +1,7 @@ { - "name": "RandomRollServer", - "opcode": "smsg_random_roll_server", + "name": "RandomRoll", + "opcode": "msg_random_roll", + "alias": "msg_random_roll_s", "direction": "server", "fields": [ { "name": "minimum", "type": "uint32" }, diff --git a/schemas/world/packets/cmsg_save_guild_emblem_client.json b/schemas/world/packets/msg_save_guild_emblem_client.json similarity index 77% rename from schemas/world/packets/cmsg_save_guild_emblem_client.json rename to schemas/world/packets/msg_save_guild_emblem_client.json index 91f1c2826..7b21425b7 100644 --- a/schemas/world/packets/cmsg_save_guild_emblem_client.json +++ b/schemas/world/packets/msg_save_guild_emblem_client.json @@ -1,6 +1,7 @@ { - "name": "SaveGuildEmblemClient", - "opcode": "cmsg_save_guild_emblem_client", + "name": "SaveGuildEmblem", + "opcode": "msg_save_guild_emblem", + "alias": "msg_save_guild_emblem_c", "direction": "client", "fields": [ { "name": "vendor", "type": "uint64" }, diff --git a/schemas/world/packets/msg_save_guild_emblem_server.json b/schemas/world/packets/msg_save_guild_emblem_server.json new file mode 100644 index 000000000..1793d3e04 --- /dev/null +++ b/schemas/world/packets/msg_save_guild_emblem_server.json @@ -0,0 +1,9 @@ +{ + "name": "SaveGuildEmblem", + "opcode": "msg_save_guild_emblem", + "alias": "msg_save_guild_emblem_s", + "direction": "server", + "fields": [ + { "name": "result", "type": "GuildEmblemResult" } + ] +} diff --git a/schemas/world/packets/msg_talent_wipe_confirm_client.json b/schemas/world/packets/msg_talent_wipe_confirm_client.json new file mode 100644 index 000000000..11ac4c797 --- /dev/null +++ b/schemas/world/packets/msg_talent_wipe_confirm_client.json @@ -0,0 +1,9 @@ +{ + "name": "TalentWipeConfirm", + "opcode": "msg_talent_wipe_confirm", + "alias": "msg_talent_wipe_confirm_c", + "direction": "client", + "fields": [ + { "name": "wiping_npc", "type": "uint64" } + ] +} diff --git a/schemas/world/packets/smsg_talent_wipe_confirm_server.json b/schemas/world/packets/msg_talent_wipe_confirm_server.json similarity index 57% rename from schemas/world/packets/smsg_talent_wipe_confirm_server.json rename to schemas/world/packets/msg_talent_wipe_confirm_server.json index 26a05999d..3ba2b7468 100644 --- a/schemas/world/packets/smsg_talent_wipe_confirm_server.json +++ b/schemas/world/packets/msg_talent_wipe_confirm_server.json @@ -1,6 +1,7 @@ { - "name": "TalentWipeConfirmServer", - "opcode": "smsg_talent_wipe_confirm_server", + "name": "TalentWipeConfirm", + "opcode": "msg_talent_wipe_confirm", + "alias": "msg_talent_wipe_confirm_s", "direction": "server", "fields": [ { "name": "wiping_npc", "type": "uint64" }, diff --git a/schemas/world/packets/smsg_auction_hello_server.json b/schemas/world/packets/smsg_auction_hello_server.json deleted file mode 100644 index f08e95da7..000000000 --- a/schemas/world/packets/smsg_auction_hello_server.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "name": "AuctionHelloServer", - "opcode": "smsg_auction_hello_server", - "direction": "server", - "fields": [ - { "name": "auctioneer", "type": "uint64" }, - { "name": "auction_house", "type": "AuctionHouse" } - ] -} diff --git a/schemas/world/packets/smsg_channel_update_server.json b/schemas/world/packets/smsg_channel_update_server.json deleted file mode 100644 index 0b6d4b8ae..000000000 --- a/schemas/world/packets/smsg_channel_update_server.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "name": "ChannelUpdateServer", - "opcode": "smsg_channel_update_server", - "direction": "server", - "fields": [ - { "name": "time", "type": "uint32" } - ] -} diff --git a/schemas/world/packets/smsg_corpse_query_server.json b/schemas/world/packets/smsg_corpse_query_server.json deleted file mode 100644 index 6a5ff6808..000000000 --- a/schemas/world/packets/smsg_corpse_query_server.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "name": "CorpseQueryServer", - "opcode": "smsg_corpse_query_server", - "direction": "server", - "fields": [ - { "name": "result", "type": "CorpseQueryResult" }, - { - "type": "group", - "when": { "op": "eq", "field": "result", "value": "found" }, - "fields": [ - { "name": "map", "type": "Map" }, - { "name": "position", "type": "Vector3" }, - { "name": "corpse_map", "type": "Map" } - ] - } - ] -} diff --git a/schemas/world/packets/smsg_login_settimespeed.json b/schemas/world/packets/smsg_login_settimespeed.json index 10dfd235a..d91ab340e 100644 --- a/schemas/world/packets/smsg_login_settimespeed.json +++ b/schemas/world/packets/smsg_login_settimespeed.json @@ -3,7 +3,7 @@ "opcode": "smsg_login_settimespeed", "direction": "server", "fields": [ - { "name": "datetime", "type": "uint32" }, - { "name": "timescale", "type": "float" } + { "name": "time", "type": "uint32" }, + { "name": "speed", "type": "float" } ] } diff --git a/schemas/world/packets/smsg_looking_for_group_server.json b/schemas/world/packets/smsg_looking_for_group_server.json deleted file mode 100644 index a87d56cb4..000000000 --- a/schemas/world/packets/smsg_looking_for_group_server.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "name": "LookingForGroupServer", - "opcode": "smsg_looking_for_group_server", - "direction": "server", - "fields": [ - { "name": "unknown1", "type": "uint32" } - ] -} diff --git a/schemas/world/packets/smsg_move_set_pitch_server.json b/schemas/world/packets/smsg_move_set_pitch_server.json deleted file mode 100644 index 791ac13f2..000000000 --- a/schemas/world/packets/smsg_move_set_pitch_server.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "name": "MoveSetPitchServer", - "opcode": "smsg_move_set_pitch_server", - "direction": "server", - "fields": [ - { "name": "guid", "type": "PackedGuid" }, - { "name": "info", "type": "MovementInfo" } - ] -} diff --git a/schemas/world/packets/smsg_move_set_run_mode_server.json b/schemas/world/packets/smsg_move_set_run_mode_server.json deleted file mode 100644 index ea062c2ba..000000000 --- a/schemas/world/packets/smsg_move_set_run_mode_server.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "name": "MoveSetRunModeServer", - "opcode": "smsg_move_set_run_mode_server", - "direction": "server", - "fields": [ - { "name": "guid", "type": "PackedGuid" }, - { "name": "info", "type": "MovementInfo" } - ] -} diff --git a/schemas/world/packets/smsg_move_set_walk_mode_server.json b/schemas/world/packets/smsg_move_set_walk_mode_server.json deleted file mode 100644 index b4cf3c32f..000000000 --- a/schemas/world/packets/smsg_move_set_walk_mode_server.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "name": "MoveSetWalkModeServer", - "opcode": "smsg_move_set_walk_mode_server", - "direction": "server", - "fields": [ - { "name": "guid", "type": "PackedGuid" }, - { "name": "info", "type": "MovementInfo" } - ] -} diff --git a/schemas/world/packets/smsg_move_start_backward_server.json b/schemas/world/packets/smsg_move_start_backward_server.json deleted file mode 100644 index e9b6c9deb..000000000 --- a/schemas/world/packets/smsg_move_start_backward_server.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "name": "MoveStartBackwardServer", - "opcode": "smsg_move_start_backward_server", - "direction": "server", - "fields": [ - { "name": "guid", "type": "PackedGuid" }, - { "name": "info", "type": "MovementInfo" } - ] -} diff --git a/schemas/world/packets/smsg_move_start_forward_server.json b/schemas/world/packets/smsg_move_start_forward_server.json deleted file mode 100644 index a32115e4d..000000000 --- a/schemas/world/packets/smsg_move_start_forward_server.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "name": "MoveStartForwardServer", - "opcode": "smsg_move_start_forward_server", - "direction": "server", - "fields": [ - { "name": "guid", "type": "PackedGuid" }, - { "name": "info", "type": "MovementInfo" } - ] -} diff --git a/schemas/world/packets/smsg_move_start_pitch_down_server.json b/schemas/world/packets/smsg_move_start_pitch_down_server.json deleted file mode 100644 index dde9db169..000000000 --- a/schemas/world/packets/smsg_move_start_pitch_down_server.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "name": "MoveStartPitchDownServer", - "opcode": "smsg_move_start_pitch_down_server", - "direction": "server", - "fields": [ - { "name": "guid", "type": "PackedGuid" }, - { "name": "info", "type": "MovementInfo" } - ] -} diff --git a/schemas/world/packets/smsg_move_start_pitch_up_server.json b/schemas/world/packets/smsg_move_start_pitch_up_server.json deleted file mode 100644 index 5a88563c9..000000000 --- a/schemas/world/packets/smsg_move_start_pitch_up_server.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "name": "MoveStartPitchUpServer", - "opcode": "smsg_move_start_pitch_up_server", - "direction": "server", - "fields": [ - { "name": "guid", "type": "PackedGuid" }, - { "name": "info", "type": "MovementInfo" } - ] -} diff --git a/schemas/world/packets/smsg_move_start_strafe_left_server.json b/schemas/world/packets/smsg_move_start_strafe_left_server.json deleted file mode 100644 index 34c0b94dd..000000000 --- a/schemas/world/packets/smsg_move_start_strafe_left_server.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "name": "MoveStartStrafeLeftServer", - "opcode": "smsg_move_start_strafe_left_server", - "direction": "server", - "fields": [ - { "name": "guid", "type": "PackedGuid" }, - { "name": "info", "type": "MovementInfo" } - ] -} diff --git a/schemas/world/packets/smsg_move_start_strafe_right_server.json b/schemas/world/packets/smsg_move_start_strafe_right_server.json deleted file mode 100644 index 101d51b72..000000000 --- a/schemas/world/packets/smsg_move_start_strafe_right_server.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "name": "MoveStartStrafeRightServer", - "opcode": "smsg_move_start_strafe_right_server", - "direction": "server", - "fields": [ - { "name": "guid", "type": "PackedGuid" }, - { "name": "info", "type": "MovementInfo" } - ] -} diff --git a/schemas/world/packets/smsg_move_start_swim_server.json b/schemas/world/packets/smsg_move_start_swim_server.json deleted file mode 100644 index 812635747..000000000 --- a/schemas/world/packets/smsg_move_start_swim_server.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "name": "MoveStartSwimServer", - "opcode": "smsg_move_start_swim_server", - "direction": "server", - "fields": [ - { "name": "guid", "type": "PackedGuid" }, - { "name": "info", "type": "MovementInfo" } - ] -} diff --git a/schemas/world/packets/smsg_move_start_turn_left_server.json b/schemas/world/packets/smsg_move_start_turn_left_server.json deleted file mode 100644 index fb4d9ffd6..000000000 --- a/schemas/world/packets/smsg_move_start_turn_left_server.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "name": "MoveStartTurnLeftServer", - "opcode": "smsg_move_start_turn_left_server", - "direction": "server", - "fields": [ - { "name": "guid", "type": "PackedGuid" }, - { "name": "info", "type": "MovementInfo" } - ] -} diff --git a/schemas/world/packets/smsg_move_start_turn_right_server.json b/schemas/world/packets/smsg_move_start_turn_right_server.json deleted file mode 100644 index 8c29f7307..000000000 --- a/schemas/world/packets/smsg_move_start_turn_right_server.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "name": "MoveStartTurnRightServer", - "opcode": "smsg_move_start_turn_right_server", - "direction": "server", - "fields": [ - { "name": "guid", "type": "PackedGuid" }, - { "name": "info", "type": "MovementInfo" } - ] -} diff --git a/schemas/world/packets/smsg_move_stop_pitch_server.json b/schemas/world/packets/smsg_move_stop_pitch_server.json deleted file mode 100644 index 06a1561bd..000000000 --- a/schemas/world/packets/smsg_move_stop_pitch_server.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "name": "MoveStopPitchServer", - "opcode": "smsg_move_stop_pitch_server", - "direction": "server", - "fields": [ - { "name": "guid", "type": "PackedGuid" }, - { "name": "info", "type": "MovementInfo" } - ] -} diff --git a/schemas/world/packets/smsg_move_stop_server.json b/schemas/world/packets/smsg_move_stop_server.json deleted file mode 100644 index 2162c2845..000000000 --- a/schemas/world/packets/smsg_move_stop_server.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "name": "MoveStopServer", - "opcode": "smsg_move_stop_server", - "direction": "server", - "fields": [ - { "name": "guid", "type": "PackedGuid" }, - { "name": "info", "type": "MovementInfo" } - ] -} diff --git a/schemas/world/packets/smsg_move_stop_strafe_server.json b/schemas/world/packets/smsg_move_stop_strafe_server.json deleted file mode 100644 index cdc4f28af..000000000 --- a/schemas/world/packets/smsg_move_stop_strafe_server.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "name": "MoveStopStrafeServer", - "opcode": "smsg_move_stop_strafe_server", - "direction": "server", - "fields": [ - { "name": "guid", "type": "PackedGuid" }, - { "name": "info", "type": "MovementInfo" } - ] -} diff --git a/schemas/world/packets/smsg_move_stop_swim_server.json b/schemas/world/packets/smsg_move_stop_swim_server.json deleted file mode 100644 index 762d685ff..000000000 --- a/schemas/world/packets/smsg_move_stop_swim_server.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "name": "MoveStopSwimServer", - "opcode": "smsg_move_stop_swim_server", - "direction": "server", - "fields": [ - { "name": "guid", "type": "PackedGuid" }, - { "name": "info", "type": "MovementInfo" } - ] -} diff --git a/schemas/world/packets/smsg_move_stop_turn_server.json b/schemas/world/packets/smsg_move_stop_turn_server.json deleted file mode 100644 index ea03376e4..000000000 --- a/schemas/world/packets/smsg_move_stop_turn_server.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "name": "MoveStopTurnServer", - "opcode": "smsg_move_stop_turn_server", - "direction": "server", - "fields": [ - { "name": "guid", "type": "PackedGuid" }, - { "name": "info", "type": "MovementInfo" } - ] -} diff --git a/schemas/world/packets/smsg_name_query_response.json b/schemas/world/packets/smsg_name_query_response.json index 6da27b862..c8933ea81 100644 --- a/schemas/world/packets/smsg_name_query_response.json +++ b/schemas/world/packets/smsg_name_query_response.json @@ -4,10 +4,10 @@ "direction": "server", "fields": [ { "name": "guid", "type": "uint64" }, - { "name": "character_name", "type": "CString" }, + { "name": "name", "type": "CString" }, { "name": "realm_name", "type": "CString" }, { "name": "race", "type": "uint32" }, { "name": "gender", "type": "uint32" }, - { "name": "class", "type": "uint32" } + { "name": "class_", "type": "uint32" } ] } diff --git a/schemas/world/packets/smsg_query_next_mail_time_server.json b/schemas/world/packets/smsg_query_next_mail_time_server.json deleted file mode 100644 index c7fa159eb..000000000 --- a/schemas/world/packets/smsg_query_next_mail_time_server.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "name": "QueryNextMailTimeServer", - "opcode": "smsg_query_next_mail_time_server", - "direction": "server", - "fields": [ - { "name": "unread_mails", "type": "float" } - ] -} diff --git a/schemas/world/packets/smsg_save_guild_emblem_server.json b/schemas/world/packets/smsg_save_guild_emblem_server.json deleted file mode 100644 index d2213c01c..000000000 --- a/schemas/world/packets/smsg_save_guild_emblem_server.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "name": "SaveGuildEmblemServer", - "opcode": "smsg_save_guild_emblem_server", - "direction": "server", - "fields": [ - { "name": "result", "type": "GuildEmblemResult" } - ] -} diff --git a/schemas/world/packets/smsg_set_proficiency.json b/schemas/world/packets/smsg_set_proficiency.json index 09e038e60..9c0220fe7 100644 --- a/schemas/world/packets/smsg_set_proficiency.json +++ b/schemas/world/packets/smsg_set_proficiency.json @@ -3,7 +3,7 @@ "opcode": "smsg_set_proficiency", "direction": "server", "fields": [ - { "name": "class", "type": "uint8", "as": "ItemClass" }, + { "name": "class_", "type": "uint8", "as": "ItemClass" }, { "name": "item_sub_class_mask", "type": "uint32" } ] } diff --git a/schemas/world/packets/smsg_spell_go.json b/schemas/world/packets/smsg_spell_go.json index 90f0e1369..a9b65123d 100644 --- a/schemas/world/packets/smsg_spell_go.json +++ b/schemas/world/packets/smsg_spell_go.json @@ -14,7 +14,7 @@ { "name": "targets", "type": "SpellCastTargets" }, { "type": "group", - "when": { "op": "has_flag", "field": "flags", "value": "ammo" }, + "when": { "op": "has_flag", "field": "flags", "value": "cf_ammo" }, "fields": [ { "name": "ammo_display_id", "type": "uint32" }, { "name": "ammo_inventory_type", "type": "uint32" } diff --git a/schemas/world/packets/smsg_spell_start.json b/schemas/world/packets/smsg_spell_start.json index d814e9745..ed3a2a660 100644 --- a/schemas/world/packets/smsg_spell_start.json +++ b/schemas/world/packets/smsg_spell_start.json @@ -11,7 +11,7 @@ { "name": "targets", "type": "SpellCastTargets" }, { "type": "group", - "when": { "op": "has_flag", "field": "flags", "value": "ammo" }, + "when": { "op": "has_flag", "field": "flags", "value": "cf_ammo" }, "fields": [ { "name": "ammo_display_id", "type": "uint32" }, { "name": "ammo_inventory_type", "type": "uint32" } diff --git a/schemas/world/types.json b/schemas/world/types.json index b45493f95..33541e0a2 100644 --- a/schemas/world/types.json +++ b/schemas/world/types.json @@ -94,31 +94,31 @@ "underlying": "uint32", "cpp_namespace": "ember::protocol", "values": { - "none": 0, - "forward": 1, - "backward": 2, - "strafe_left": 4, - "strafe_right": 8, - "turn_left": 16, - "turn_right": 32, - "pitch_up": 64, - "pitch_down": 128, - "walk_mode": 256, - "on_transport": 512, - "levitating": 1024, - "fixed_z": 2048, - "root": 4096, - "jumping": 8192, - "fallingfar": 16384, - "swimming": 2097152, - "spline_enabled": 4194304, - "can_fly": 8388608, - "flying": 16777216, - "ontransport": 33554432, - "spline_elevation": 67108864, - "waterwalking": 268435456, - "safe_fall": 536870912, - "hover": 1073741824 + "mf_none": 0, + "mf_forward": 1, + "mf_backward": 2, + "mf_strafe_left": 4, + "mf_strafe_right": 8, + "mf_turn_left": 16, + "mf_turn_right": 32, + "mf_pitch_up": 64, + "mf_pitch_down": 128, + "mf_walk_mode": 256, + "mf_on_transport": 512, + "mf_levitating": 1024, + "mf_fixed_z": 2048, + "mf_root": 4096, + "mf_jumping": 8192, + "mf_fallingfar": 16384, + "mf_swimming": 2097152, + "mf_spline_enabled": 4194304, + "mf_can_fly": 8388608, + "mf_flying": 16777216, + "mf_ontransport": 33554432, + "mf_spline_elevation": 67108864, + "mf_waterwalking": 268435456, + "mf_safe_fall": 536870912, + "mf_hover": 1073741824 } }, "ChatType": { @@ -188,7 +188,7 @@ }, "CinematicSequence": { "kind": "external", - "include": "dbcs/MemoryDefs.h", + "include": "dbcreader/MemoryDefs.h", "cpp_namespace": "ember::dbc", "cpp_type_name": "CinematicSequences", "underlying": "uint32" @@ -236,14 +236,14 @@ { "name": "orientation", "type": "float" }, { "type": "group", - "when": { "op": "has_flag", "field": "flags", "value": "on_transport" }, + "when": { "op": "has_flag", "field": "flags", "value": "mf_on_transport" }, "fields": [ { "name": "transport", "type": "TransportInfo" } ] }, { "type": "group", - "when": { "op": "has_flag", "field": "flags", "value": "swimming" }, + "when": { "op": "has_flag", "field": "flags", "value": "mf_swimming" }, "fields": [ { "name": "pitch", "type": "float" } ] @@ -251,7 +251,7 @@ { "name": "fall_time", "type": "float" }, { "type": "group", - "when": { "op": "has_flag", "field": "flags", "value": "jumping" }, + "when": { "op": "has_flag", "field": "flags", "value": "mf_jumping" }, "fields": [ { "name": "z_speed", "type": "float" }, { "name": "cos_angle", "type": "float" }, @@ -261,7 +261,7 @@ }, { "type": "group", - "when": { "op": "has_flag", "field": "flags", "value": "spline_elevation" }, + "when": { "op": "has_flag", "field": "flags", "value": "mf_spline_elevation" }, "fields": [ { "name": "spline_elevation", "type": "float" } ] @@ -326,14 +326,14 @@ }, "Race": { "kind": "external", - "include": "dbcs/MemoryDefs.h", + "include": "dbcreader/MemoryDefs.h", "cpp_namespace": "ember::dbc", "cpp_type_name": "ChrRaces", "underlying": "uint8" }, "Class": { "kind": "external", - "include": "dbcs/MemoryDefs.h", + "include": "dbcreader/MemoryDefs.h", "cpp_namespace": "ember::dbc", "cpp_type_name": "ChrClasses", "underlying": "uint8" @@ -350,14 +350,14 @@ }, "Area": { "kind": "external", - "include": "dbcs/MemoryDefs.h", + "include": "dbcreader/MemoryDefs.h", "cpp_namespace": "ember::dbc", "cpp_type_name": "AreaTable", "underlying": "uint32" }, "Map": { "kind": "external", - "include": "dbcs/MemoryDefs.h", + "include": "dbcreader/MemoryDefs.h", "cpp_namespace": "ember::dbc", "underlying": "uint32" }, @@ -366,12 +366,12 @@ "underlying": "uint32", "cpp_namespace": "ember::protocol", "values": { - "none": 0, - "locked_for_transfer": 4, - "hide_helm": 1024, - "hide_cloak": 2048, - "ghost": 8192, - "rename": 16384 + "chf_none": 0, + "chf_locked_for_transfer": 4, + "chf_hide_helm": 1024, + "chf_hide_cloak": 2048, + "chf_ghost": 8192, + "chf_rename": 16384 } }, "InventoryType": { @@ -423,14 +423,14 @@ "underlying": "uint8", "cpp_namespace": "ember::protocol", "values": { - "none": 0, - "custom": 1, - "trade": 4, - "not_lfg": 8, - "general": 16, - "city": 32, - "lfg": 64, - "voice": 128 + "cflag_none": 0, + "cflag_custom": 1, + "cflag_trade": 4, + "cflag_not_lfg": 8, + "cflag_general": 16, + "cflag_city": 32, + "cflag_lfg": 64, + "cflag_voice": 128 } }, "ChannelMemberFlags": { @@ -438,13 +438,13 @@ "underlying": "uint8", "cpp_namespace": "ember::protocol", "values": { - "none": 0, - "owner": 1, - "moderator": 4, - "voiced": 8, - "muted": 16, - "custom": 32, - "microphone_mute": 64 + "cmflag_none": 0, + "cmflag_owner": 1, + "cmflag_moderator": 4, + "cmflag_voiced": 8, + "cmflag_muted": 16, + "cmflag_custom": 32, + "cmflag_microphone_mute": 64 } }, "ChannelMember": { @@ -611,7 +611,7 @@ { "name": "name", "type": "CString" }, { "name": "rank", "type": "uint32" }, { "name": "level", "type": "uint8" }, - { "name": "class", "type": "Class" }, + { "name": "class_", "type": "Class" }, { "name": "area", "type": "Area" }, { "type": "group", @@ -978,39 +978,39 @@ "underlying": "uint32", "cpp_namespace": "ember::protocol", "values": { - "none": 0, - "done": 1, - "falling": 2, - "unknown3": 4, - "unknown4": 8, - "unknown5": 16, - "unknown6": 32, - "unknown7": 64, - "unknown8": 128, - "run_mode": 256, - "flying": 512, - "no_spline": 1024, - "unknown12": 2048, - "unknown13": 4096, - "unknown14": 8192, - "unknown15": 16384, - "unknown16": 32768, - "final_point": 65536, - "final_target": 131072, - "final_angle": 262144, - "unknown19": 524288, - "cyclic": 1048576, - "enter_cycle": 2097152, - "frozen": 4194304, - "unknown23": 8388608, - "unknown24": 16777216, - "unknown25": 33554432, - "unknown26": 67108864, - "unknown27": 134217728, - "unknown28": 268435456, - "unknown29": 536870912, - "unknown30": 1073741824, - "unknown31": 2147483648 + "sf_none": 0, + "sf_done": 1, + "sf_falling": 2, + "sf_unknown3": 4, + "sf_unknown4": 8, + "sf_unknown5": 16, + "sf_unknown6": 32, + "sf_unknown7": 64, + "sf_unknown8": 128, + "sf_run_mode": 256, + "sf_flying": 512, + "sf_no_spline": 1024, + "sf_unknown12": 2048, + "sf_unknown13": 4096, + "sf_unknown14": 8192, + "sf_unknown15": 16384, + "sf_unknown16": 32768, + "sf_final_point": 65536, + "sf_final_target": 131072, + "sf_final_angle": 262144, + "sf_unknown19": 524288, + "sf_cyclic": 1048576, + "sf_enter_cycle": 2097152, + "sf_frozen": 4194304, + "sf_unknown23": 8388608, + "sf_unknown24": 16777216, + "sf_unknown25": 33554432, + "sf_unknown26": 67108864, + "sf_unknown27": 134217728, + "sf_unknown28": 268435456, + "sf_unknown29": 536870912, + "sf_unknown30": 1073741824, + "sf_unknown31": 2147483648 } }, "StabledPet": { @@ -1181,23 +1181,23 @@ "underlying": "uint32", "cpp_namespace": "ember::protocol", "values": { - "none": 0, - "no_pickup": 1, - "conjured": 2, - "lootable": 4, - "deprecated": 16, - "indestructible": 32, - "player_cast": 64, - "no_equip_cooldown": 128, - "int_bonus_instead": 256, - "wrapper": 512, - "ignore_bag_space": 1024, - "party_loot": 2048, - "charter": 8192, - "has_text": 16384, - "no_disenchant": 32768, - "real_duration": 65536, - "no_creator": 131072 + "if_none": 0, + "if_no_pickup": 1, + "if_conjured": 2, + "if_lootable": 4, + "if_deprecated": 16, + "if_indestructible": 32, + "if_player_cast": 64, + "if_no_equip_cooldown": 128, + "if_int_bonus_instead": 256, + "if_wrapper": 512, + "if_ignore_bag_space": 1024, + "if_party_loot": 2048, + "if_charter": 8192, + "if_has_text": 16384, + "if_no_disenchant": 32768, + "if_real_duration": 65536, + "if_no_creator": 131072 } }, "AllowedClass": { @@ -1205,16 +1205,16 @@ "underlying": "uint32", "cpp_namespace": "ember::protocol", "values": { - "all": 0, - "warrior": 1, - "paladin": 2, - "hunter": 4, - "rogue": 8, - "priest": 16, - "shaman": 64, - "mage": 128, - "warlock": 256, - "druid": 1024 + "ac_all": 0, + "ac_warrior": 1, + "ac_paladin": 2, + "ac_hunter": 4, + "ac_rogue": 8, + "ac_priest": 16, + "ac_shaman": 64, + "ac_mage": 128, + "ac_warlock": 256, + "ac_druid": 1024 } }, "AllowedRace": { @@ -1349,9 +1349,9 @@ "type": "group", "when": { "op": "neq", "field": "status", "value": "offline" }, "fields": [ - { "name": "area", "type": "Area" }, - { "name": "level", "type": "uint32" }, - { "name": "class", "type": "uint32" } + { "name": "area", "type": "Area" }, + { "name": "level", "type": "uint32" }, + { "name": "class_", "type": "uint32" } ] } ] @@ -1406,29 +1406,29 @@ "underlying": "uint32", "cpp_namespace": "ember::protocol", "values": { - "none": 0, - "status": 1, - "cur_hp": 2, - "max_hp": 4, - "power_type": 8, - "cur_power": 16, - "max_power": 32, - "level": 64, - "zone": 128, - "position": 256, - "auras": 512, - "auras_2": 1024, - "pet_guid": 2048, - "pet_name": 4096, - "pet_model_id": 8192, - "pet_cur_hp": 16384, - "pet_max_hp": 32768, - "pet_power_type": 65536, - "pet_cur_power": 131072, - "pet_max_power": 262144, - "pet_auras": 524288, - "pet_auras_2": 1048576, - "mode_offline": 268435456 + "guf_none": 0, + "guf_status": 1, + "guf_cur_hp": 2, + "guf_max_hp": 4, + "guf_power_type": 8, + "guf_cur_power": 16, + "guf_max_power": 32, + "guf_level": 64, + "guf_zone": 128, + "guf_position": 256, + "guf_auras": 512, + "guf_auras_2": 1024, + "guf_pet_guid": 2048, + "guf_pet_name": 4096, + "guf_pet_model_id": 8192, + "guf_pet_cur_hp": 16384, + "guf_pet_max_hp": 32768, + "guf_pet_power_type": 65536, + "guf_pet_cur_power": 131072, + "guf_pet_max_power": 262144, + "guf_pet_auras": 524288, + "guf_pet_auras_2": 1048576, + "guf_mode_offline": 268435456 } }, "GroupMemberOnlineStatus": { @@ -1436,20 +1436,20 @@ "underlying": "uint8", "cpp_namespace": "ember::protocol", "values": { - "offline": 0, - "online": 1, - "pvp": 2, - "dead": 4, - "ghost": 8, - "pvp_ffa": 16, - "zone_out": 32, - "afk": 64, - "dnd": 128 + "status_offline": 0, + "status_online": 1, + "status_pvp": 2, + "status_dead": 4, + "status_ghost": 8, + "status_pvp_ffa": 16, + "status_zone_out": 32, + "status_afk": 64, + "status_dnd": 128 } }, "Power": { "kind": "external", - "include": "dbcs/MemoryDefs.h", + "include": "dbcreader/MemoryDefs.h", "cpp_namespace": "ember::dbc::ChrClasses", "cpp_type_name": "PowerType", "underlying": "int32" @@ -1458,12 +1458,12 @@ "kind": "struct", "cpp_namespace": "ember::protocol", "fields": [ - { "name": "name", "type": "CString" }, - { "name": "guild", "type": "CString" }, - { "name": "level", "type": "uint32" }, - { "name": "class", "type": "uint32" }, - { "name": "race", "type": "uint32" }, - { "name": "area", "type": "Area" } + { "name": "name", "type": "CString" }, + { "name": "guild", "type": "CString" }, + { "name": "level", "type": "uint32" }, + { "name": "class_", "type": "uint32" }, + { "name": "race", "type": "uint32" }, + { "name": "area", "type": "Area" } ] }, "InitialSpell": { @@ -1996,16 +1996,16 @@ "underlying": "uint16", "cpp_namespace": "ember::protocol", "values": { - "none": 0, - "hidden_combatlog": 1, - "unknown2": 2, - "unknown3": 4, - "unknown4": 8, - "unknown5": 16, - "ammo": 32, - "unknown7": 64, - "unknown8": 128, - "unknown9": 256 + "cf_none": 0, + "cf_hidden_combatlog": 1, + "cf_unknown2": 2, + "cf_unknown3": 4, + "cf_unknown4": 8, + "cf_unknown5": 16, + "cf_ammo": 32, + "cf_unknown7": 64, + "cf_unknown8": 128, + "cf_unknown9": 256 } }, "SpellMiss": { @@ -2071,7 +2071,7 @@ }, "CreatureFamily": { "kind": "external", - "include": "dbcs/MemoryDefs.h", + "include": "dbcreader/MemoryDefs.h", "cpp_namespace": "ember::dbc", "underlying": "uint8" }, @@ -2082,7 +2082,7 @@ { "name": "guid", "type": "uint64" }, { "name": "name", "type": "CString" }, { "name": "race", "type": "Race" }, - { "name": "class", "type": "Class" }, + { "name": "class_", "type": "Class" }, { "name": "gender", "type": "Gender" }, { "name": "skin", "type": "uint8" }, { "name": "face", "type": "uint8" }, @@ -2106,7 +2106,7 @@ }, "Language": { "kind": "external", - "include": "dbcs/MemoryDefs.h", + "include": "dbcreader/MemoryDefs.h", "cpp_namespace": "ember::dbc", "cpp_type_name": "Languages", "underlying": "uint32" @@ -2167,7 +2167,7 @@ }, "PageTextMaterial": { "kind": "external", - "include": "dbcs/MemoryDefs.h", + "include": "dbcreader/MemoryDefs.h", "cpp_namespace": "ember::dbc", "underlying": "uint8" }, @@ -2188,7 +2188,7 @@ }, "ItemSet": { "kind": "external", - "include": "dbcs/MemoryDefs.h", + "include": "dbcreader/MemoryDefs.h", "cpp_namespace": "ember::dbc", "underlying": "uint16" }, @@ -2221,7 +2221,7 @@ }, "AuctionHouse": { "kind": "external", - "include": "dbcs/MemoryDefs.h", + "include": "dbcreader/MemoryDefs.h", "cpp_namespace": "ember::dbc", "underlying": "uint32" }, @@ -2365,7 +2365,7 @@ }, "Emote": { "kind": "external", - "include": "dbcs/MemoryDefs.h", + "include": "dbcreader/MemoryDefs.h", "cpp_namespace": "ember::dbc", "cpp_type_name": "Emotes", "underlying": "uint32" @@ -2653,8 +2653,8 @@ "underlying": "uint8", "cpp_namespace": "ember::protocol", "values": { - "default": 0, - "debug": 1 + "default_fmt": 0, + "debug": 1 } }, "DuelWinnerReason": { @@ -2696,7 +2696,7 @@ "values": { "db_error": 0, "has_text": 6, - "default": 10 + "default_status": 10 } }, "GmTicketEscalationStatus": { @@ -3019,7 +3019,7 @@ }, "ItemClass": { "kind": "external", - "include": "dbcs/MemoryDefs.h", + "include": "dbcreader/MemoryDefs.h", "cpp_namespace": "ember::dbc::ItemClass", "cpp_type_name": "Class", "underlying": "int32" @@ -3586,7 +3586,7 @@ }, "Talent": { "kind": "external", - "include": "dbcs/MemoryDefs.h", + "include": "dbcreader/MemoryDefs.h", "cpp_namespace": "ember::dbc", "underlying": "uint32" }, diff --git a/src/character/CharacterHandler.h b/src/character/CharacterHandler.h index 32e8b08fd..aa59f0a04 100644 --- a/src/character/CharacterHandler.h +++ b/src/character/CharacterHandler.h @@ -11,7 +11,7 @@ #include "Config.h" #include #include -#include +#include #include #include #include diff --git a/src/character/CharacterService.h b/src/character/CharacterService.h index f1255f57d..64acff99a 100644 --- a/src/character/CharacterService.h +++ b/src/character/CharacterService.h @@ -9,7 +9,7 @@ #pragma once #include -#include +#include #include #include diff --git a/src/libs/protocol/CMakeLists.txt b/src/libs/protocol/CMakeLists.txt index 79e64093e..a391fb9ad 100644 --- a/src/libs/protocol/CMakeLists.txt +++ b/src/libs/protocol/CMakeLists.txt @@ -9,70 +9,13 @@ set(LIBRARY_NAME protocol) set(CLIENT_MESSAGES include/protocol/client/AuthSession.h include/protocol/client/CharacterCreate.h - include/protocol/client/CharacterDelete.h - include/protocol/client/CharacterEnum.h - include/protocol/client/CharacterRename.h - include/protocol/client/Ping.h - include/protocol/client/PlayerLogin.h - include/protocol/client/NameQuery.h - include/protocol/client/SetActiveMover.h - include/protocol/client/QueryTime.h - include/protocol/client/ItemQuerySingle.h - include/protocol/client/QueryNextMailTime.h - include/protocol/client/BattlefieldStatus.h - include/protocol/client/MeetingStoneInfo.h - include/protocol/client/MoveTimeSkipped.h - include/protocol/client/MoveFallLand.h - include/protocol/client/ZoneUpdate.h - include/protocol/client/UpdateAccountData.h - include/protocol/client/JoinChannel.h - include/protocol/client/GenericMove.h - include/protocol/client/MessageChat.h - include/protocol/client/TutorialFlag.h - include/protocol/client/RequestRaidInfo.h - include/protocol/client/GMTicketGetTicket.h - include/protocol/client/StandStateChange.h - include/protocol/client/WorldTeleport.h - include/protocol/client/MoveSetRawPosition.h ) set(SERVER_MESSAGES - include/protocol/server/AuthChallenge.h - include/protocol/server/AuthResponse.h - include/protocol/server/CharacterCreate.h - include/protocol/server/CharacterDelete.h include/protocol/server/CharacterEnum.h - include/protocol/server/CharacterRename.h - include/protocol/server/Pong.h include/protocol/server/AddonInfo.h - include/protocol/server/LogoutComplete.h - include/protocol/server/CharacterLoginFailed.h - include/protocol/server/LoginVerifyWorld.h - include/protocol/server/TutorialFlags.h include/protocol/server/UpdateObject.h - include/protocol/server/NameQueryResponse.h - include/protocol/server/SplineMoveSetWalkMode.h - include/protocol/server/QueryTimeResponse.h - include/protocol/server/SetLoginTimeSpeed.h - include/protocol/server/RaidInstanceInfo.h - include/protocol/server/ItemQuerySingleResponse.h - include/protocol/server/QueryNextMailTime.h - include/protocol/server/BattlefieldStatus.h - include/protocol/server/MeetingStoneSetQueue.h - include/protocol/server/Motd.h - include/protocol/server/MoveTimeSkipped.h - include/protocol/server/MoveFallLand.h - include/protocol/server/Weather.h - include/protocol/server/AccountDataTimes.h - include/protocol/server/GenericMove.h - include/protocol/server/MessageChat.h - include/protocol/server/TriggerCinematic.h - include/protocol/server/GMTicketGetTicket.h include/protocol/server/ChannelNotify.h - include/protocol/server/StandStateUpdate.h - include/protocol/server/Notification.h - include/protocol/server/MoveSetRawPositionAck.h - include/protocol/server/NewWorld.h ) set(TYPE_HEADERS @@ -83,14 +26,10 @@ set(CORE_HEADERS include/protocol/Deserialise.h include/protocol/Opcodes.h include/protocol/Packet.h - include/protocol/Packets.h - include/protocol/ResultCodes.h include/protocol/PacketHeaders.h include/protocol/MessageView.h include/protocol/Concepts.h include/protocol/StreamResult.h - include/protocol/MovementInfo.h - include/protocol/UnitStandState.h ) set(HEADERS @@ -108,10 +47,11 @@ add_library(${LIBRARY_NAME} INTERFACE) add_dependencies(${LIBRARY_NAME} PROTOGEN_GENERATE) target_sources(${LIBRARY_NAME} INTERFACE ${HEADERS}) + target_include_directories(${LIBRARY_NAME} INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/include ${PROTOGEN_GENERATED_DIR} ) -target_link_libraries(${LIBRARY_NAME} INTERFACE shared spark ${Boost_LIBRARIES}) +target_link_libraries(${LIBRARY_NAME} INTERFACE dbcreader shared spark ${Boost_LIBRARIES}) set_target_properties(${LIBRARY_NAME} PROPERTIES FOLDER "Common Libraries") \ No newline at end of file diff --git a/src/libs/protocol/include/protocol/Opcodes.h b/src/libs/protocol/include/protocol/Opcodes.h index c5177e296..7d7706515 100644 --- a/src/libs/protocol/include/protocol/Opcodes.h +++ b/src/libs/protocol/include/protocol/Opcodes.h @@ -108,7 +108,7 @@ smart_enum_class(ServerOpcode, std::uint16_t, smsg_initial_spells = 0x12a, smsg_learned_spell = 0x12b, smsg_superceded_spell = 0x12c, - smsg_cast_failed = 0x130, + smsg_cast_result = 0x130, smsg_spell_start = 0x131, smsg_spell_go = 0x132, smsg_spell_failure = 0x133, @@ -224,7 +224,7 @@ smart_enum_class(ServerOpcode, std::uint16_t, smsg_compressed_update_object = 0x1f6, smsg_play_spell_impact = 0x1f7, smsg_exploration_experience = 0x1f8, - smsg_environmentaldamagelog = 0x1fc, + smsg_environmental_damage_log = 0x1fc, smsg_rwhois = 0x1fe, smsg_removed_spell = 0x203, smsg_gmticket_create = 0x206, @@ -234,7 +234,7 @@ smart_enum_class(ServerOpcode, std::uint16_t, smsg_clear_far_sight_immediate = 0x20d, smsg_powergainlog_obsolete = 0x20e, smsg_gmticket_getticket = 0x212, - smsg_gameobject_spawn_anim_obsolete = 0x214, + smsg_gameobject_spawn_anim = 0x214, smsg_gameobject_despawn_anim = 0x215, smsg_gmticket_deleteticket = 0x218, smsg_chat_wrong_faction = 0x219, @@ -413,9 +413,68 @@ smart_enum_class(ServerOpcode, std::uint16_t, smsg_summon_cancel = 0x423, msg_query_next_mail_time = 0x284, msg_move_time_skipped = 0x319, + msg_inspect_honor_stats = 0x2d6, + msg_list_stabled_pets = 0x26f, + msg_battleground_player_positions = 0x2e9, + msg_channel_start = 0x139, + msg_channel_update = 0x13a, + msg_looking_for_group = 0x1ff, + msg_move_start_forward = 0x0b5, + msg_move_start_backward = 0x0b6, + msg_move_stop = 0x0b7, + msg_move_start_strafe_left = 0x0b8, + msg_move_start_strafe_right = 0x0b9, + msg_move_stop_strafe = 0x0ba, + msg_move_jump = 0x0bb, + msg_move_start_turn_left = 0x0bc, + msg_move_start_turn_right = 0x0bd, + msg_move_stop_turn = 0x0be, + msg_move_start_pitch_up = 0x0bf, + msg_move_start_pitch_down = 0x0c0, + msg_move_stop_pitch = 0x0c1, + msg_move_set_run_mode = 0x0c2, + msg_move_set_walk_mode = 0x0c3, + msg_move_toggle_logging = 0x0c4, + msg_move_teleport = 0x0c5, + msg_move_teleport_cheat = 0x0c6, + msg_move_teleport_ack = 0x0c7, + msg_move_toggle_fall_logging = 0x0c8, msg_move_fall_land = 0x0c9, + msg_move_start_swim = 0x0ca, + msg_move_stop_swim = 0x0cb, + msg_move_set_run_speed_cheat = 0x0cc, + msg_move_set_run_speed = 0x0cd, + msg_move_set_run_back_speed_cheat = 0x0ce, + msg_move_set_run_back_speed = 0x0cf, + msg_move_set_walk_speed_cheat = 0x0d0, + msg_move_set_walk_speed = 0x0d1, + msg_move_set_swim_speed_cheat = 0x0d2, + msg_move_set_swim_speed = 0x0d3, + msg_move_set_swim_back_speed_cheat = 0x0d4, + msg_move_set_swim_back_speed = 0x0d5, + msg_move_set_all_speed_cheat = 0x0d6, + msg_move_set_turn_rate_cheat = 0x0d7, + msg_move_set_turn_rate = 0x0d8, + msg_move_toggle_collision_cheat = 0x0d9, msg_move_set_facing = 0x0da, - msg_move_set_raw_position_ack = 0x0e0, + msg_move_set_pitch = 0x0db, + msg_move_worldport_ack = 0x0dc, + msg_minimap_ping = 0x1d5, + msg_save_guild_emblem = 0x1f1, + msg_tabardvendor_activate = 0x1f2, + msg_move_root = 0x0ec, + msg_move_unroot = 0x0ed, + msg_move_heartbeat = 0x0ee, + msg_move_knock_back = 0x0f1, + msg_move_hover = 0x0f7, + msg_pvp_log_data = 0x2e0, + msg_raid_ready_check = 0x322, + msg_raid_ready_check_confirm = 0x3ae, + msg_raid_ready_check_finished = 0x3c5, + msg_guild_permissions = 0x3fc, + msg_raid_target_update = 0x321, + msg_random_roll = 0x1fb, + msg_talent_wipe_confirm = 0x2aa, ) smart_enum_class(ClientOpcode, std::uint32_t, diff --git a/src/libs/protocol/include/protocol/Packets.h b/src/libs/protocol/include/protocol/Packets.h deleted file mode 100644 index 012b2b5eb..000000000 --- a/src/libs/protocol/include/protocol/Packets.h +++ /dev/null @@ -1,112 +0,0 @@ -/* - * Copyright (c) 2016 - 2026 Ember - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - */ - -#pragma once - -#include "Packet.h" -#include "Opcodes.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -namespace ember::protocol { - -using smsg_addon_info = ServerPacket; -using smsg_char_enum = ServerPacket; -using smsg_char_create = ServerPacket; -using smsg_char_delete = ServerPacket; -using smsg_character_login_failed = ServerPacket; -using smsg_logout_complete = ServerPacket; -using smsg_login_verify_world = ServerPacket; -using smsg_tutorial_flags = ServerPacket; -using smsg_update_object = ServerPacket; -using smsg_name_query_response = ServerPacket; -using smsg_spline_move_set_walk_mode = ServerPacket; -using smsg_query_time_response = ServerPacket; -using smsg_login_settimespeed = ServerPacket; -using smsg_raid_instance_info = ServerPacket; -using smsg_item_query_single_response = ServerPacket; -using msg_query_next_mail_time_s = ServerPacket; -using smsg_gmticket_getticket = ServerPacket; -using smsg_meetingstone_setqueue = ServerPacket; -using smsg_motd = ServerPacket; -using move_time_skipped_s = ServerPacket; -using move_fall_land_s = ServerPacket; -using smsg_weather = ServerPacket; -using smsg_account_data_times = ServerPacket; -using smsg_channel_notify = ServerPacket; -using msg_move_set_facing_s = ServerPacket; -using smsg_trigger_cinematic = ServerPacket; -using smsg_standstate_update = ServerPacket; -using smsg_notification = ServerPacket; -using msg_move_set_raw_position_ack = ServerPacket; -using smsg_new_world = ServerPacket; - -using cmsg_auth_session = ClientPacket; -using cmsg_char_create = ClientPacket; -using cmsg_char_delete = ClientPacket; -using cmsg_char_enum = ClientPacket; -using cmsg_set_active_mover = ClientPacket; -using cmsg_query_time = ClientPacket; -using cmsg_request_raid_info = ClientPacket; -using msg_query_next_mail_time_c = ClientPacket; -using cmsg_meetingstone_info = ClientPacket; -using cmsg_move_time_skipped = ClientPacket; -using move_fall_land_c = ClientPacket; -using move_set_facing_c = ClientPacket; -using cmsg_tutorial_flag = ClientPacket; -using cmsg_messagechat = ClientPacket; -using cmsg_standstatechange = ClientPacket; -using cmsg_move_set_raw_position = ClientPacket; -using cmsg_world_teleport = ClientPacket; - -} // protocol, ember \ No newline at end of file diff --git a/src/libs/protocol/include/protocol/ResultCodes.h b/src/libs/protocol/include/protocol/ResultCodes.h deleted file mode 100644 index 6edc06541..000000000 --- a/src/libs/protocol/include/protocol/ResultCodes.h +++ /dev/null @@ -1,11 +0,0 @@ -/* - * Copyright (c) 2016 - 2026 Ember - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - */ - -#pragma once - -#include diff --git a/src/libs/protocol/include/protocol/UnitStandState.h b/src/libs/protocol/include/protocol/UnitStandState.h deleted file mode 100644 index 4186bea08..000000000 --- a/src/libs/protocol/include/protocol/UnitStandState.h +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Copyright (c) 2026 Ember - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - */ - -#pragma once - -#include -#include -#include -#include -#include - -namespace ember::protocol { - -smart_enum(UnitStandState, std::uint8_t, - stand = 0, - sit = 1, - sit_chair = 2, - sleep = 3, - sit_low_chair = 4, - sit_medium_chair = 5, - sit_high_chair = 6, - dead = 7, - kneel = 8, - custom = 9 -); - -} // protocol, ember \ No newline at end of file diff --git a/src/libs/protocol/include/protocol/client/AuthSession.h b/src/libs/protocol/include/protocol/client/AuthSession.h index 07c896866..445fc2284 100644 --- a/src/libs/protocol/include/protocol/client/AuthSession.h +++ b/src/libs/protocol/include/protocol/client/AuthSession.h @@ -9,6 +9,7 @@ #pragma once #include +#include #include #include #include @@ -115,4 +116,10 @@ struct AuthSession final { } }; -} // client, protocol, ember \ No newline at end of file +} // client, protocol, ember + +namespace ember::protocol { + +using cmsg_auth_session = ClientPacket; + +} // protocol, ember \ No newline at end of file diff --git a/src/libs/protocol/include/protocol/client/BattlefieldStatus.h b/src/libs/protocol/include/protocol/client/BattlefieldStatus.h deleted file mode 100644 index e493fbf12..000000000 --- a/src/libs/protocol/include/protocol/client/BattlefieldStatus.h +++ /dev/null @@ -1 +0,0 @@ -#include \ No newline at end of file diff --git a/src/libs/protocol/include/protocol/client/CharacterCreate.h b/src/libs/protocol/include/protocol/client/CharacterCreate.h index c2afbcb0c..5636e94ab 100644 --- a/src/libs/protocol/include/protocol/client/CharacterCreate.h +++ b/src/libs/protocol/include/protocol/client/CharacterCreate.h @@ -9,6 +9,7 @@ #pragma once #include +#include #include #include #include @@ -52,4 +53,10 @@ struct CharacterCreate final { } }; -} // client, protocol, ember \ No newline at end of file +} // client, protocol, ember + +namespace ember::protocol { + +using cmsg_char_create = ClientPacket; + +} // protocol, ember \ No newline at end of file diff --git a/src/libs/protocol/include/protocol/client/CharacterDelete.h b/src/libs/protocol/include/protocol/client/CharacterDelete.h deleted file mode 100644 index 429670918..000000000 --- a/src/libs/protocol/include/protocol/client/CharacterDelete.h +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Copyright (c) 2016 - 2025 Ember - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - */ - -#pragma once - -#include -#include -#include -#include -#include - -namespace ember::protocol::client { - -struct CharacterDelete final { - std::uint64_t id; - - StreamResult read_from_stream(le_stream auto& stream) { - stream >> id; - return stream? StreamResult::success : StreamResult::stream_error; - } - - StreamResult write_to_stream(le_stream auto& stream) const { - stream << id; - return stream? StreamResult::success : StreamResult::stream_error; - } -}; - -} // client, protocol, ember diff --git a/src/libs/protocol/include/protocol/client/CharacterEnum.h b/src/libs/protocol/include/protocol/client/CharacterEnum.h deleted file mode 100644 index a589f183c..000000000 --- a/src/libs/protocol/include/protocol/client/CharacterEnum.h +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Copyright (c) 2016 - 2025 Ember - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - */ - -#pragma once - -#include -#include -#include -#include -#include - -namespace ember::protocol::client { - -struct CharacterEnum final { - StreamResult read_from_stream(le_stream auto& stream) { - return stream? StreamResult::success : StreamResult::stream_error; - } - - StreamResult write_to_stream(le_stream auto& stream) const { - return stream? StreamResult::success : StreamResult::stream_error; - } -}; - -} // client, protocol, ember diff --git a/src/libs/protocol/include/protocol/client/CharacterRename.h b/src/libs/protocol/include/protocol/client/CharacterRename.h deleted file mode 100644 index 3de049e83..000000000 --- a/src/libs/protocol/include/protocol/client/CharacterRename.h +++ /dev/null @@ -1 +0,0 @@ -#include \ No newline at end of file diff --git a/src/libs/protocol/include/protocol/client/GMTicketGetTicket.h b/src/libs/protocol/include/protocol/client/GMTicketGetTicket.h deleted file mode 100644 index 526700c35..000000000 --- a/src/libs/protocol/include/protocol/client/GMTicketGetTicket.h +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Copyright (c) 2026 Ember - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - */ - -#pragma once - -#include -#include -#include -#include -#include - -namespace ember::protocol::client { - -struct GMTicketGetTicket final { - StreamResult read_from_stream(le_stream auto& stream) { - return stream? StreamResult::success : StreamResult::failed; - } - - StreamResult write_to_stream(le_stream auto& stream) const { - return stream? StreamResult::success : StreamResult::failed; - } -}; - -} // client, protocol, ember diff --git a/src/libs/protocol/include/protocol/client/GenericMove.h b/src/libs/protocol/include/protocol/client/GenericMove.h deleted file mode 100644 index c5d7c5d6a..000000000 --- a/src/libs/protocol/include/protocol/client/GenericMove.h +++ /dev/null @@ -1,84 +0,0 @@ -/* - * Copyright (c) 2026 Ember - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - */ - -#pragma once - -#include -#include -#include -#include -#include -#include - -namespace ember::protocol::client { - -struct GenericMove final { - MovementInfo info; - - StreamResult read_from_stream(le_stream auto& stream) { - stream >> info.flags; - stream >> info.timestamp; - stream >> info.position; - stream >> info.orientation; - - if(info.flags & MovementFlags::on_transport) { - throw std::runtime_error("Not implemented, at all"); - } - - if(info.flags & MovementFlags::swimming) { - stream >> info.pitch; - } - - stream >> info.fall_time; - - if(info.flags & MovementFlags::jumping) { - stream >> info.z_speed; - stream >> info.cos_angle; - stream >> info.sin_angle; - stream >> info.xy_speed; - } - - if(info.flags & MovementFlags::spline_elevation) { - stream >> info.spline_elevation; - } - - return stream? StreamResult::success : StreamResult::failed; - } - - StreamResult write_to_stream(le_stream auto& stream) const { - stream << info.flags; - stream << info.timestamp; - stream << info.position; - stream << info.orientation; - - if(info.flags & MovementFlags::on_transport) { - throw std::runtime_error("Not implemented, at all"); - } - - if(info.flags & MovementFlags::swimming) { - stream << info.pitch; - } - - stream << info.fall_time; - - if(info.flags & MovementFlags::jumping) { - stream << info.z_speed; - stream << info.cos_angle; - stream << info.sin_angle; - stream << info.xy_speed; - } - - if(info.flags & MovementFlags::spline_elevation) { - stream << info.spline_elevation; - } - - return stream? StreamResult::success : StreamResult::failed; - } -}; - -} // client, protocol, ember diff --git a/src/libs/protocol/include/protocol/client/ItemQuerySingle.h b/src/libs/protocol/include/protocol/client/ItemQuerySingle.h deleted file mode 100644 index 53ba568a0..000000000 --- a/src/libs/protocol/include/protocol/client/ItemQuerySingle.h +++ /dev/null @@ -1 +0,0 @@ -#include \ No newline at end of file diff --git a/src/libs/protocol/include/protocol/client/JoinChannel.h b/src/libs/protocol/include/protocol/client/JoinChannel.h deleted file mode 100644 index c2afb4a79..000000000 --- a/src/libs/protocol/include/protocol/client/JoinChannel.h +++ /dev/null @@ -1 +0,0 @@ -#include \ No newline at end of file diff --git a/src/libs/protocol/include/protocol/client/MeetingStoneInfo.h b/src/libs/protocol/include/protocol/client/MeetingStoneInfo.h deleted file mode 100644 index 955f91e70..000000000 --- a/src/libs/protocol/include/protocol/client/MeetingStoneInfo.h +++ /dev/null @@ -1 +0,0 @@ -#include \ No newline at end of file diff --git a/src/libs/protocol/include/protocol/client/MessageChat.h b/src/libs/protocol/include/protocol/client/MessageChat.h deleted file mode 100644 index 90ce55c5e..000000000 --- a/src/libs/protocol/include/protocol/client/MessageChat.h +++ /dev/null @@ -1,88 +0,0 @@ -/* - * Copyright (c) 2026 Ember - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - */ - -#pragma once - -#include -#include -#include -#include -#include - -namespace ember::protocol::client { - -enum ChatType : std::uint32_t { - SAY = 0x00, - PARTY = 0x01, - RAID = 0x02, - GUILD = 0x03, - OFFICER = 0x04, - YELL = 0x05, - WHISPER = 0x06, - WHISPER_INFORM = 0x07, - EMOTE = 0x08, - TEXT_EMOTE = 0x09, - SYSTEM = 0x0A, - MONSTER_SAY = 0x0B, - MONSTER_YELL = 0x0C, - MONSTER_EMOTE = 0x0D, - CHANNEL = 0x0E, - CHANNEL_JOIN = 0x0F, - CHANNEL_LEAVE = 0x10, - CHANNEL_LIST = 0x11, - CHANNEL_NOTICE = 0x12, - CHANNEL_NOTICE_USER = 0x13, - AFK = 0x14, - DND = 0x15, - IGNORED = 0x16, - SKILL = 0x17, - LOOT = 0x18, - MONSTER_WHISPER = 0x1A, - BG_SYSTEM_NEUTRAL = 0x52, - BG_SYSTEM_ALLIANCE = 0x53, - BG_SYSTEM_HORDE = 0x54, - RAID_LEADER = 0x57, - RAID_WARNING = 0x58, - RAID_BOSS_WHISPER = 0x59, - RAID_BOSS_EMOTE = 0x5A, - BATTLEGROUND = 0x5C, - BATTLEGROUND_LEADER = 0x5D, -}; - -struct MessageChat final { - ChatType type; - std::uint32_t language; - std::string destination; - std::string message; - - StreamResult read_from_stream(le_stream auto& stream) { - stream >> type; - stream >> language; - - if(type == WHISPER || type == CHANNEL) { - stream >> spark::io::null_terminated(destination); - } - - stream >> spark::io::null_terminated(message); - return stream? StreamResult::success : StreamResult::failed; - } - - StreamResult write_to_stream(le_stream auto& stream) const { - stream << type; - stream << language; - - if(type == WHISPER) { - stream << spark::io::null_terminated(destination); - } - - stream << spark::io::null_terminated(message); - return stream? StreamResult::success : StreamResult::failed; - } -}; - -} // client, protocol, ember diff --git a/src/libs/protocol/include/protocol/client/MoveFallLand.h b/src/libs/protocol/include/protocol/client/MoveFallLand.h deleted file mode 100644 index 26f99d7ef..000000000 --- a/src/libs/protocol/include/protocol/client/MoveFallLand.h +++ /dev/null @@ -1,84 +0,0 @@ -/* - * Copyright (c) 2026 Ember - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - */ - -#pragma once - -#include -#include -#include -#include -#include -#include - -namespace ember::protocol::client { - -struct MoveFallLand final { - MovementInfo info; - - StreamResult read_from_stream(le_stream auto& stream) { - stream >> info.flags; - stream >> info.timestamp; - stream >> info.position; - stream >> info.orientation; - - if(info.flags & MovementFlags::on_transport) { - throw std::runtime_error("Not implemented, at all"); - } - - if(info.flags & MovementFlags::swimming) { - stream >> info.pitch; - } - - stream >> info.fall_time; - - if(info.flags & MovementFlags::jumping) { - stream >> info.z_speed; - stream >> info.cos_angle; - stream >> info.sin_angle; - stream >> info.xy_speed; - } - - if(info.flags & MovementFlags::spline_elevation) { - stream >> info.spline_elevation; - } - - return stream? StreamResult::success : StreamResult::failed; - } - - StreamResult write_to_stream(le_stream auto& stream) const { - stream << info.flags; - stream << info.timestamp; - stream << info.position; - stream << info.orientation; - - if(info.flags & MovementFlags::on_transport) { - throw std::runtime_error("Not implemented, at all"); - } - - if(info.flags & MovementFlags::swimming) { - stream << info.pitch; - } - - stream << info.fall_time; - - if(info.flags & MovementFlags::jumping) { - stream << info.z_speed; - stream << info.cos_angle; - stream << info.sin_angle; - stream << info.xy_speed; - } - - if(info.flags & MovementFlags::spline_elevation) { - stream << info.spline_elevation; - } - - return stream? StreamResult::success : StreamResult::failed; - } -}; - -} // client, protocol, ember diff --git a/src/libs/protocol/include/protocol/client/MoveSetRawPosition.h b/src/libs/protocol/include/protocol/client/MoveSetRawPosition.h deleted file mode 100644 index 42630e4b0..000000000 --- a/src/libs/protocol/include/protocol/client/MoveSetRawPosition.h +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Copyright (c) 2026 Ember - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - */ - -#pragma once - -#include -#include -#include -#include -#include - -namespace ember::protocol::client { - -struct MoveSetRawPosition final { - float x; - float y; - float z; - float o; - - StreamResult read_from_stream(le_stream auto& stream) { - stream >> x >> y >> z >> o; - return stream? StreamResult::success : StreamResult::stream_error; - } - - StreamResult write_to_stream(le_stream auto& stream) const { - stream << x << y << z << o; - return stream? StreamResult::success : StreamResult::stream_error; - } -}; - -} // client, protocol, ember diff --git a/src/libs/protocol/include/protocol/client/MoveTimeSkipped.h b/src/libs/protocol/include/protocol/client/MoveTimeSkipped.h deleted file mode 100644 index de036dd92..000000000 --- a/src/libs/protocol/include/protocol/client/MoveTimeSkipped.h +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Copyright (c) 2026 Ember - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - */ - -#pragma once - -#include -#include -#include -#include -#include - -namespace ember::protocol::client { - -struct MoveTimeSkipped final { - std::uint64_t guid; - std::uint32_t lag; - - StreamResult read_from_stream(le_stream auto& stream) { - stream >> guid; - stream >> lag; - return StreamResult::success; - } - - StreamResult write_to_stream(le_stream auto& stream) const { - stream << guid; - stream << lag; - return StreamResult::success; - } -}; - -} // client, protocol, ember diff --git a/src/libs/protocol/include/protocol/client/NameQuery.h b/src/libs/protocol/include/protocol/client/NameQuery.h deleted file mode 100644 index 89d9e2367..000000000 --- a/src/libs/protocol/include/protocol/client/NameQuery.h +++ /dev/null @@ -1 +0,0 @@ -#include \ No newline at end of file diff --git a/src/libs/protocol/include/protocol/client/Ping.h b/src/libs/protocol/include/protocol/client/Ping.h deleted file mode 100644 index 34b9e233f..000000000 --- a/src/libs/protocol/include/protocol/client/Ping.h +++ /dev/null @@ -1 +0,0 @@ -#include \ No newline at end of file diff --git a/src/libs/protocol/include/protocol/client/PlayerLogin.h b/src/libs/protocol/include/protocol/client/PlayerLogin.h deleted file mode 100644 index e62432c55..000000000 --- a/src/libs/protocol/include/protocol/client/PlayerLogin.h +++ /dev/null @@ -1 +0,0 @@ -#include \ No newline at end of file diff --git a/src/libs/protocol/include/protocol/client/QueryNextMailTime.h b/src/libs/protocol/include/protocol/client/QueryNextMailTime.h deleted file mode 100644 index 0ff270b2c..000000000 --- a/src/libs/protocol/include/protocol/client/QueryNextMailTime.h +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Copyright (c) 2026 Ember - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - */ - -#pragma once - -#include -#include -#include - -namespace ember::protocol::client { - -struct QueryNextMailTime final { - StreamResult read_from_stream(le_stream auto& stream) { - return stream? StreamResult::success : StreamResult::failed; - } - - StreamResult write_to_stream(le_stream auto& stream) const { - return stream? StreamResult::success : StreamResult::failed; - } -}; - -} // client, protocol, ember diff --git a/src/libs/protocol/include/protocol/client/QueryTime.h b/src/libs/protocol/include/protocol/client/QueryTime.h deleted file mode 100644 index e9cfa1397..000000000 --- a/src/libs/protocol/include/protocol/client/QueryTime.h +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Copyright (c) 2026 Ember - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - */ - -#pragma once - -#include -#include -#include -#include -#include - -namespace ember::protocol::client { - -struct QueryTime final { - StreamResult read_from_stream(le_stream auto& stream) { - return StreamResult::success; - } - - StreamResult write_to_stream(le_stream auto& stream) const { - return StreamResult::success; - } -}; - -} // client, protocol, ember diff --git a/src/libs/protocol/include/protocol/client/RequestRaidInfo.h b/src/libs/protocol/include/protocol/client/RequestRaidInfo.h deleted file mode 100644 index 29d5b2674..000000000 --- a/src/libs/protocol/include/protocol/client/RequestRaidInfo.h +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Copyright (c) 2026 Ember - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - */ - -#pragma once - -#include -#include -#include -#include -#include - -namespace ember::protocol::client { - -struct RequestRaidInfo final { - StreamResult read_from_stream(le_stream auto& stream) { - return StreamResult::success; - } - - StreamResult write_to_stream(le_stream auto& stream) const { - return StreamResult::success; - } -}; - -} // client, protocol, ember diff --git a/src/libs/protocol/include/protocol/client/SetActiveMover.h b/src/libs/protocol/include/protocol/client/SetActiveMover.h deleted file mode 100644 index cc1cd20fb..000000000 --- a/src/libs/protocol/include/protocol/client/SetActiveMover.h +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Copyright (c) 2026 Ember - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - */ - -#pragma once - -#include -#include -#include -#include -#include -#include - -namespace ember::protocol::client { - -struct SetActiveMover final { - std::uint64_t guid; - - StreamResult read_from_stream(le_stream auto& stream) { - stream >> guid; - return stream? StreamResult::success : StreamResult::failed; - } - - StreamResult write_to_stream(le_stream auto& stream) const { - stream << guid; - return stream? StreamResult::success : StreamResult::failed; - } -}; - -} // client, protocol, ember diff --git a/src/libs/protocol/include/protocol/client/StandStateChange.h b/src/libs/protocol/include/protocol/client/StandStateChange.h deleted file mode 100644 index db1d98902..000000000 --- a/src/libs/protocol/include/protocol/client/StandStateChange.h +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Copyright (c) 2026 Ember - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - */ - -#pragma once - -#include -#include -#include -#include -#include -#include - -namespace ember::protocol::client { - -struct StandStateChange final { - UnitStandState state; - - StreamResult read_from_stream(le_stream auto& stream) { - std::uint32_t _state; - stream >> _state; - state = static_cast(_state); - return stream? StreamResult::success : StreamResult::failed; - } - - StreamResult write_to_stream(le_stream auto& stream) const { - stream << std::uint32_t(state); - return stream? StreamResult::success : StreamResult::failed; - } -}; - -} // client, protocol, ember diff --git a/src/libs/protocol/include/protocol/client/TutorialFlag.h b/src/libs/protocol/include/protocol/client/TutorialFlag.h deleted file mode 100644 index 4c3d45e43..000000000 --- a/src/libs/protocol/include/protocol/client/TutorialFlag.h +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Copyright (c) 2026 Ember - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - */ - -#pragma once - -#include -#include -#include -#include -#include -#include - -namespace ember::protocol::client { - -struct TutorialFlag final { - std::uint32_t flag; - - StreamResult read_from_stream(le_stream auto& stream) { - stream >> flag; - return stream? StreamResult::success : StreamResult::failed; - } - - StreamResult write_to_stream(le_stream auto& stream) const { - stream << flag; - return stream? StreamResult::success : StreamResult::failed; - } -}; - -} // client, protocol, ember diff --git a/src/libs/protocol/include/protocol/client/UpdateAccountData.h b/src/libs/protocol/include/protocol/client/UpdateAccountData.h deleted file mode 100644 index 5bed9df26..000000000 --- a/src/libs/protocol/include/protocol/client/UpdateAccountData.h +++ /dev/null @@ -1 +0,0 @@ -#include \ No newline at end of file diff --git a/src/libs/protocol/include/protocol/client/WorldTeleport.h b/src/libs/protocol/include/protocol/client/WorldTeleport.h deleted file mode 100644 index 05862c98e..000000000 --- a/src/libs/protocol/include/protocol/client/WorldTeleport.h +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Copyright (c) 2026 Ember - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - */ - -#pragma once - -#include -#include -#include -#include -#include - -namespace ember::protocol::client { - -struct WorldTeleport final { - std::uint32_t time; - std::uint32_t map; - float x; - float y; - float z; - float o; - - StreamResult read_from_stream(le_stream auto& stream) { - stream >> time >> map >> x >> y >> z >> o; - return stream? StreamResult::success : StreamResult::stream_error; - } - - StreamResult write_to_stream(le_stream auto& stream) const { - stream << time << map << x << y << z << o; - return stream? StreamResult::success : StreamResult::stream_error; - } -}; - -} // client, protocol, ember diff --git a/src/libs/protocol/include/protocol/client/ZoneUpdate.h b/src/libs/protocol/include/protocol/client/ZoneUpdate.h deleted file mode 100644 index 4bf1ac0e9..000000000 --- a/src/libs/protocol/include/protocol/client/ZoneUpdate.h +++ /dev/null @@ -1 +0,0 @@ -#include \ No newline at end of file diff --git a/src/libs/protocol/include/protocol/server/AccountDataTimes.h b/src/libs/protocol/include/protocol/server/AccountDataTimes.h deleted file mode 100644 index 3e3463567..000000000 --- a/src/libs/protocol/include/protocol/server/AccountDataTimes.h +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Copyright (c) 2026 Ember - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - */ - -#pragma once - -#include -#include -#include -#include -#include -#include - -namespace ember::protocol::server { - -struct AccountDataTimes final { - std::array data{}; - - StreamResult read_from_stream(le_stream auto& stream) { - stream >> data; - return StreamResult::success; - } - - StreamResult write_to_stream(le_stream auto& stream) const { - stream << data; - return StreamResult::success; - } -}; - -} // server, protocol, ember diff --git a/src/libs/protocol/include/protocol/server/AddonInfo.h b/src/libs/protocol/include/protocol/server/AddonInfo.h index febda9d3b..7a95bc52b 100644 --- a/src/libs/protocol/include/protocol/server/AddonInfo.h +++ b/src/libs/protocol/include/protocol/server/AddonInfo.h @@ -9,8 +9,9 @@ #pragma once #include +#include #include -#include +#include #include #include #include @@ -90,4 +91,10 @@ struct AddonInfo final { } }; -} // server, protocol, ember \ No newline at end of file +} // server, protocol, ember + +namespace ember::protocol { + +using smsg_addon_info = ServerPacket; + +} // protocol, ember \ No newline at end of file diff --git a/src/libs/protocol/include/protocol/server/AuthChallenge.h b/src/libs/protocol/include/protocol/server/AuthChallenge.h deleted file mode 100644 index 39f40616e..000000000 --- a/src/libs/protocol/include/protocol/server/AuthChallenge.h +++ /dev/null @@ -1 +0,0 @@ -#include \ No newline at end of file diff --git a/src/libs/protocol/include/protocol/server/AuthResponse.h b/src/libs/protocol/include/protocol/server/AuthResponse.h deleted file mode 100644 index becd46e2c..000000000 --- a/src/libs/protocol/include/protocol/server/AuthResponse.h +++ /dev/null @@ -1 +0,0 @@ -#include \ No newline at end of file diff --git a/src/libs/protocol/include/protocol/server/BattlefieldStatus.h b/src/libs/protocol/include/protocol/server/BattlefieldStatus.h deleted file mode 100644 index ae0439c58..000000000 --- a/src/libs/protocol/include/protocol/server/BattlefieldStatus.h +++ /dev/null @@ -1 +0,0 @@ -#include \ No newline at end of file diff --git a/src/libs/protocol/include/protocol/server/ChannelNotify.h b/src/libs/protocol/include/protocol/server/ChannelNotify.h index 1028a8627..a257f8e9f 100644 --- a/src/libs/protocol/include/protocol/server/ChannelNotify.h +++ b/src/libs/protocol/include/protocol/server/ChannelNotify.h @@ -9,14 +9,15 @@ #pragma once #include +#include #include -#include +#include #include #include namespace ember::protocol::server { -struct ChannelNotify final { +struct ChannelNotify_Temp final { enum ChatNotify : std::uint8_t { /// %s joined channel, JOINED_NOTICE = 0x00, diff --git a/src/libs/protocol/include/protocol/server/CharacterCreate.h b/src/libs/protocol/include/protocol/server/CharacterCreate.h deleted file mode 100644 index 0c7e43177..000000000 --- a/src/libs/protocol/include/protocol/server/CharacterCreate.h +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Copyright (c) 2016 - 2025 Ember - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - */ - -#pragma once - -#include -#include -#include -#include - -namespace ember::protocol::server { - -struct CharacterCreate final{ - Result result; - - StreamResult read_from_stream(le_stream auto& stream) { - stream >> result; - return stream? StreamResult::success : StreamResult::failed; - } - - StreamResult write_to_stream(le_stream auto& stream) const { - stream << result; - return stream? StreamResult::success : StreamResult::failed; - } -}; - -} // server, protocol, ember diff --git a/src/libs/protocol/include/protocol/server/CharacterDelete.h b/src/libs/protocol/include/protocol/server/CharacterDelete.h deleted file mode 100644 index ba24f3d9a..000000000 --- a/src/libs/protocol/include/protocol/server/CharacterDelete.h +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Copyright (c) 2016 - 2025 Ember - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - */ - -#pragma once - -#include -#include -#include -#include - -namespace ember::protocol::server { - -struct CharacterDelete final { - Result result; - - StreamResult read_from_stream(le_stream auto& stream) { - stream >> result; - return stream? StreamResult::success : StreamResult::failed; - } - - StreamResult write_to_stream(le_stream auto& stream) const { - stream << result; - return stream? StreamResult::success : StreamResult::failed; - } -}; - -} // server, protocol, ember diff --git a/src/libs/protocol/include/protocol/server/CharacterEnum.h b/src/libs/protocol/include/protocol/server/CharacterEnum.h index 2d17cc702..b9da96c32 100644 --- a/src/libs/protocol/include/protocol/server/CharacterEnum.h +++ b/src/libs/protocol/include/protocol/server/CharacterEnum.h @@ -9,6 +9,7 @@ #pragma once #include +#include #include #include #include @@ -100,3 +101,9 @@ struct CharacterEnum final { }; } // server, protocol, ember + +namespace ember::protocol { + +using smsg_char_enum = ServerPacket; + +} // protocol, ember \ No newline at end of file diff --git a/src/libs/protocol/include/protocol/server/CharacterLoginFailed.h b/src/libs/protocol/include/protocol/server/CharacterLoginFailed.h deleted file mode 100644 index 443df6fe6..000000000 --- a/src/libs/protocol/include/protocol/server/CharacterLoginFailed.h +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Copyright (c) 2016 - 2025 Ember - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - */ - -#pragma once - -#include -#include -#include -#include -#include - -namespace ember::protocol::server { - -struct CharacterLoginFailed final { - Result reason; - - StreamResult read_from_stream(le_stream auto& stream) { - stream >> reason; - return stream? StreamResult::success : StreamResult::failed; - } - - StreamResult write_to_stream(le_stream auto& stream) const { - stream << reason; - return stream? StreamResult::success : StreamResult::failed; - } -}; - -} // server, protocol, ember diff --git a/src/libs/protocol/include/protocol/server/CharacterRename.h b/src/libs/protocol/include/protocol/server/CharacterRename.h deleted file mode 100644 index d82b992e4..000000000 --- a/src/libs/protocol/include/protocol/server/CharacterRename.h +++ /dev/null @@ -1 +0,0 @@ -#include \ No newline at end of file diff --git a/src/libs/protocol/include/protocol/server/ChatTypes.h b/src/libs/protocol/include/protocol/server/ChatTypes.h deleted file mode 100644 index f24e8dc25..000000000 --- a/src/libs/protocol/include/protocol/server/ChatTypes.h +++ /dev/null @@ -1,12 +0,0 @@ -/* - * Copyright (c) 2026 Ember - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - */ - -#pragma once - -#include -#include diff --git a/src/libs/protocol/include/protocol/server/GMTicketGetTicket.h b/src/libs/protocol/include/protocol/server/GMTicketGetTicket.h deleted file mode 100644 index fbaa3edec..000000000 --- a/src/libs/protocol/include/protocol/server/GMTicketGetTicket.h +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Copyright (c) 2026 Ember - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - */ - -#pragma once - -#include -#include -#include -#include -#include - -namespace ember::protocol::server { - -struct GMTicketGetTicket final { - std::uint32_t status; - - StreamResult read_from_stream(le_stream auto& stream) { - stream >> status; - return stream? StreamResult::success : StreamResult::failed; - } - - StreamResult write_to_stream(le_stream auto& stream) const { - stream << status; - return stream? StreamResult::success : StreamResult::failed; - } -}; - -} // server, protocol, ember diff --git a/src/libs/protocol/include/protocol/server/GenericMove.h b/src/libs/protocol/include/protocol/server/GenericMove.h deleted file mode 100644 index a074dac24..000000000 --- a/src/libs/protocol/include/protocol/server/GenericMove.h +++ /dev/null @@ -1,88 +0,0 @@ -/* - * Copyright (c) 2026 Ember - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - */ - -#pragma once - -#include -#include -#include -#include -#include -#include -#include - -namespace ember::protocol::server { - -struct GenericMove final { - PackedGuid guid; - MovementInfo info; - - StreamResult read_from_stream(le_stream auto& stream) { - stream >> guid; - stream >> info.flags; - stream >> info.timestamp; - stream >> info.position; - stream >> info.orientation; - - if(info.flags & MovementFlags::on_transport) { - throw std::runtime_error("Not implemented, at all"); - } - - if(info.flags & MovementFlags::swimming) { - stream >> info.pitch; - } - - stream >> info.fall_time; - - if(info.flags & MovementFlags::jumping) { - stream >> info.z_speed; - stream >> info.cos_angle; - stream >> info.sin_angle; - stream >> info.xy_speed; - } - - if(info.flags & MovementFlags::spline_elevation) { - stream >> info.spline_elevation; - } - - return stream? StreamResult::success : StreamResult::failed; - } - - StreamResult write_to_stream(le_stream auto& stream) const { - stream << guid; - stream << info.flags; - stream << info.timestamp; - stream << info.position; - stream << info.orientation; - - if(info.flags & MovementFlags::on_transport) { - throw std::runtime_error("Not implemented, at all"); - } - - if(info.flags & MovementFlags::swimming) { - stream << info.pitch; - } - - stream << info.fall_time; - - if(info.flags & MovementFlags::jumping) { - stream << info.z_speed; - stream << info.cos_angle; - stream << info.sin_angle; - stream << info.xy_speed; - } - - if(info.flags & MovementFlags::spline_elevation) { - stream << info.spline_elevation; - } - - return stream? StreamResult::success : StreamResult::failed; - } -}; - -} // server, protocol, ember diff --git a/src/libs/protocol/include/protocol/server/ItemQuerySingleResponse.h b/src/libs/protocol/include/protocol/server/ItemQuerySingleResponse.h deleted file mode 100644 index d035a20ac..000000000 --- a/src/libs/protocol/include/protocol/server/ItemQuerySingleResponse.h +++ /dev/null @@ -1,162 +0,0 @@ -/* - * Copyright (c) 2026 Ember - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - */ - -#pragma once - -#include -#include -#include -#include -#include -#include - -namespace ember::protocol::server { - -struct ItemQuerySingleResponse final { - std::uint32_t item; - std::array data { - 1, 224, // size - 88, 0, // opcode (88) - 62, 28, 0, 0, // item: Item - // Optional found - 2, 0, 0, 0, 5, 0, 0, 0, // class_and_sub_class: ItemClassAndSubClass TWO_HANDED_MACE (0x0000000500000002) - 83, 109, 105, 116, 101, 39, 115, 32, 77, 105, 103, 104, 116, 121, 32, 72, 97, 109, 109, 101, 114, 0, // name1: CString - 0, // name2: CString - 0, // name3: CString - 0, // name4: CString - 154, 76, 0, 0, // display_id: u32 - 3, 0, 0, 0, // quality: ItemQuality RARE (3) - 0, 0, 0, 0, // flags: ItemFlag NONE (0) - 155, 60, 0, 0, // buy_price: Gold - 31, 12, 0, 0, // sell_price: Gold - 17, 0, 0, 0, // inventory_type: InventoryType TWO_HANDED_WEAPON (17) - 223, 5, 0, 0, // allowed_class: AllowedClass WARRIOR| PALADIN| HUNTER| ROGUE| PRIEST| SHAMAN| MAGE| WARLOCK| DRUID (1503) - 255, 1, 0, 0, // allowed_race: AllowedRace HUMAN| ORC| DWARF| NIGHT_ELF| UNDEAD| TAUREN| GNOME| TROLL| GOBLIN (511) - 23, 0, 0, 0, // item_level: Level32 - 18, 0, 0, 0, // required_level: Level32 - 0, 0, 0, 0, // required_skill: Skill NONE (0) - 0, 0, 0, 0, // required_skill_rank: u32 - 0, 0, 0, 0, // required_spell: Spell - 0, 0, 0, 0, // required_honor_rank: u32 - 0, 0, 0, 0, // required_city_rank: u32 - 0, 0, 0, 0, // required_faction: Faction NONE (0) - 0, 0, 0, 0, // required_faction_rank: u32 - 0, 0, 0, 0, // max_count: u32 - 1, 0, 0, 0, // stackable: u32 - 0, 0, 0, 0, // container_slots: u32 - 0, 0, 0, 0, // [0].ItemStat.stat_type: ItemStatType MANA (0) - 0, 0, 0, 0, // [0].ItemStat.value: i32 - 1, 0, 0, 0, // [1].ItemStat.stat_type: ItemStatType HEALTH (1) - 0, 0, 0, 0, // [1].ItemStat.value: i32 - 4, 0, 0, 0, // [2].ItemStat.stat_type: ItemStatType STRENGTH (4) - 11, 0, 0, 0, // [2].ItemStat.value: i32 - 3, 0, 0, 0, // [3].ItemStat.stat_type: ItemStatType AGILITY (3) - 4, 0, 0, 0, // [3].ItemStat.value: i32 - 7, 0, 0, 0, // [4].ItemStat.stat_type: ItemStatType STAMINA (7) - 0, 0, 0, 0, // [4].ItemStat.value: i32 - 5, 0, 0, 0, // [5].ItemStat.stat_type: ItemStatType INTELLECT (5) - 0, 0, 0, 0, // [5].ItemStat.value: i32 - 6, 0, 0, 0, // [6].ItemStat.stat_type: ItemStatType SPIRIT (6) - 0, 0, 0, 0, // [6].ItemStat.value: i32 - 0, 0, 0, 0, // [7].ItemStat.stat_type: ItemStatType MANA (0) - 0, 0, 0, 0, // [7].ItemStat.value: i32 - 0, 0, 0, 0, // [8].ItemStat.stat_type: ItemStatType MANA (0) - 0, 0, 0, 0, // [8].ItemStat.value: i32 - 0, 0, 0, 0, // [9].ItemStat.stat_type: ItemStatType MANA (0) - 0, 0, 0, 0, // [9].ItemStat.value: i32 - // stats: ItemStat[10] - 0, 0, 92, 66, // [0].ItemDamageType.damage_minimum: f32 - 0, 0, 166, 66, // [0].ItemDamageType.damage_maximum: f32 - 0, 0, 0, 0, // [0].ItemDamageType.school: SpellSchool NORMAL (0) - 0, 0, 0, 0, // [1].ItemDamageType.damage_minimum: f32 - 0, 0, 0, 0, // [1].ItemDamageType.damage_maximum: f32 - 0, 0, 0, 0, // [1].ItemDamageType.school: SpellSchool NORMAL (0) - 0, 0, 0, 0, // [2].ItemDamageType.damage_minimum: f32 - 0, 0, 0, 0, // [2].ItemDamageType.damage_maximum: f32 - 0, 0, 0, 0, // [2].ItemDamageType.school: SpellSchool NORMAL (0) - 0, 0, 0, 0, // [3].ItemDamageType.damage_minimum: f32 - 0, 0, 0, 0, // [3].ItemDamageType.damage_maximum: f32 - 0, 0, 0, 0, // [3].ItemDamageType.school: SpellSchool NORMAL (0) - 0, 0, 0, 0, // [4].ItemDamageType.damage_minimum: f32 - 0, 0, 0, 0, // [4].ItemDamageType.damage_maximum: f32 - 0, 0, 0, 0, // [4].ItemDamageType.school: SpellSchool NORMAL (0) - // damages: ItemDamageType[5] - 0, 0, 0, 0, // armor: i32 - 0, 0, 0, 0, // holy_resistance: i32 - 0, 0, 0, 0, // fire_resistance: i32 - 0, 0, 0, 0, // nature_resistance: i32 - 0, 0, 0, 0, // frost_resistance: i32 - 0, 0, 0, 0, // shadow_resistance: i32 - 0, 0, 0, 0, // arcane_resistance: i32 - 172, 13, 0, 0, // delay: u32 - 0, 0, 0, 0, // ammo_type: u32 - 0, 0, 0, 0, // ranged_range_modification: f32 - 0, 0, 0, 0, // [0].ItemSpells.spell: Spell - 0, 0, 0, 0, // [0].ItemSpells.spell_trigger: SpellTriggerType ON_USE (0) - 0, 0, 0, 0, // [0].ItemSpells.spell_charges: i32 - 0, 0, 0, 0, // [0].ItemSpells.spell_cooldown: i32 - 0, 0, 0, 0, // [0].ItemSpells.spell_category: u32 - 0, 0, 0, 0, // [0].ItemSpells.spell_category_cooldown: i32 - 0, 0, 0, 0, // [1].ItemSpells.spell: Spell - 0, 0, 0, 0, // [1].ItemSpells.spell_trigger: SpellTriggerType ON_USE (0) - 0, 0, 0, 0, // [1].ItemSpells.spell_charges: i32 - 0, 0, 0, 0, // [1].ItemSpells.spell_cooldown: i32 - 0, 0, 0, 0, // [1].ItemSpells.spell_category: u32 - 0, 0, 0, 0, // [1].ItemSpells.spell_category_cooldown: i32 - 0, 0, 0, 0, // [2].ItemSpells.spell: Spell - 0, 0, 0, 0, // [2].ItemSpells.spell_trigger: SpellTriggerType ON_USE (0) - 0, 0, 0, 0, // [2].ItemSpells.spell_charges: i32 - 0, 0, 0, 0, // [2].ItemSpells.spell_cooldown: i32 - 0, 0, 0, 0, // [2].ItemSpells.spell_category: u32 - 0, 0, 0, 0, // [2].ItemSpells.spell_category_cooldown: i32 - 0, 0, 0, 0, // [3].ItemSpells.spell: Spell - 0, 0, 0, 0, // [3].ItemSpells.spell_trigger: SpellTriggerType ON_USE (0) - 0, 0, 0, 0, // [3].ItemSpells.spell_charges: i32 - 0, 0, 0, 0, // [3].ItemSpells.spell_cooldown: i32 - 0, 0, 0, 0, // [3].ItemSpells.spell_category: u32 - 0, 0, 0, 0, // [3].ItemSpells.spell_category_cooldown: i32 - 0, 0, 0, 0, // [4].ItemSpells.spell: Spell - 0, 0, 0, 0, // [4].ItemSpells.spell_trigger: SpellTriggerType ON_USE (0) - 0, 0, 0, 0, // [4].ItemSpells.spell_charges: i32 - 0, 0, 0, 0, // [4].ItemSpells.spell_cooldown: i32 - 0, 0, 0, 0, // [4].ItemSpells.spell_category: u32 - 0, 0, 0, 0, // [4].ItemSpells.spell_category_cooldown: i32 - // spells: ItemSpells[5] - 1, 0, 0, 0, // bonding: Bonding PICK_UP (1) - 0, // description: CString - 0, 0, 0, 0, // page_text: u32 - 0, 0, 0, 0, // language: Language UNIVERSAL (0) - 0, 0, 0, 0, // page_text_material: PageTextMaterial NONE (0) - 0, 0, 0, 0, // start_quest: u32 - 0, 0, 0, 0, // lock_id: u32 - 2, 0, 0, 0, // material: u32 - 1, 0, 0, 0, // sheathe_type: SheatheType MAIN_HAND (1) - 0, 0, 0, 0, // random_property: u32 - 0, 0, 0, 0, // block: u32 - 0, 0, 0, 0, // item_set: ItemSet NONE (0) - 80, 0, 0, 0, // max_durability: u32 - 0, 0, 0, 0, // area: Area NONE (0) - 0, 0, 0, 0, // map: Map EASTERN_KINGDOMS (0) - 0, 0, 0, 0, // bag_family: BagFamily NONE (0) - }; - - StreamResult read_from_stream(le_stream auto& stream) { - stream >> item; - stream >> data; - return stream? StreamResult::success : StreamResult::failed; - } - - StreamResult write_to_stream(le_stream auto& stream) const { - stream << item; - stream << data; - return stream? StreamResult::success : StreamResult::failed; - } - -}; - -} // server, protocol, ember diff --git a/src/libs/protocol/include/protocol/server/LoginVerifyWorld.h b/src/libs/protocol/include/protocol/server/LoginVerifyWorld.h deleted file mode 100644 index 24167d672..000000000 --- a/src/libs/protocol/include/protocol/server/LoginVerifyWorld.h +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Copyright (c) 2026 Ember - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - */ - -#pragma once - -#include -#include -#include -#include -#include - -namespace ember::protocol::server { - -struct LoginVerifyWorld final { - std::uint32_t map_id; - - struct Vector { - float x, y, z, o; - } position; - - StreamResult read_from_stream(le_stream auto& stream) { - stream >> map_id; - stream >> position; - return stream? StreamResult::success : StreamResult::failed; - } - - StreamResult write_to_stream(le_stream auto& stream) const - { - stream << map_id; - stream << position; - return stream? StreamResult::success : StreamResult::failed; - } -}; - -} // server, protocol, ember diff --git a/src/libs/protocol/include/protocol/server/LogoutComplete.h b/src/libs/protocol/include/protocol/server/LogoutComplete.h deleted file mode 100644 index d10c6842f..000000000 --- a/src/libs/protocol/include/protocol/server/LogoutComplete.h +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Copyright (c) 2016 - 2025 Ember - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - */ - -#pragma once - -#include -#include -#include -#include - -namespace ember::protocol::server { - -struct LogoutComplete final { - Result result; - - StreamResult read_from_stream(le_stream auto& stream) { - stream >> result; - return stream? StreamResult::success : StreamResult::failed; - } - - StreamResult write_to_stream(le_stream auto& stream) const { - stream << result; - return stream? StreamResult::success : StreamResult::failed; - } -}; - -} // server, protocol, ember diff --git a/src/libs/protocol/include/protocol/server/MeetingStoneSetQueue.h b/src/libs/protocol/include/protocol/server/MeetingStoneSetQueue.h deleted file mode 100644 index 6acfc6e75..000000000 --- a/src/libs/protocol/include/protocol/server/MeetingStoneSetQueue.h +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Copyright (c) 2026 Ember - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - */ - -#pragma once - -#include -#include -#include -#include -#include - -namespace ember::protocol::server { - -struct MeetingStoneSetQueue final { - std::uint32_t area; - std::uint8_t status; - - StreamResult read_from_stream(le_stream auto& stream) { - stream >> area; - stream >> status; - return StreamResult::success; - } - - StreamResult write_to_stream(le_stream auto& stream) const { - stream << area; - stream << status; - return StreamResult::success; - } -}; - -} // server, protocol, ember diff --git a/src/libs/protocol/include/protocol/server/MessageChat.h b/src/libs/protocol/include/protocol/server/MessageChat.h deleted file mode 100644 index a574c5f2a..000000000 --- a/src/libs/protocol/include/protocol/server/MessageChat.h +++ /dev/null @@ -1 +0,0 @@ -#include \ No newline at end of file diff --git a/src/libs/protocol/include/protocol/server/Motd.h b/src/libs/protocol/include/protocol/server/Motd.h deleted file mode 100644 index c94d88087..000000000 --- a/src/libs/protocol/include/protocol/server/Motd.h +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Copyright (c) 2026 Ember - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - */ - -#pragma once - -#include -#include -#include -#include -#include - -namespace ember::protocol::server { - -struct Motd final { - std::uint32_t count; - std::string motd; - - StreamResult read_from_stream(le_stream auto& stream) { - stream >> count; - stream >> spark::io::null_terminated(motd); - return StreamResult::success; - } - - StreamResult write_to_stream(le_stream auto& stream) const { - stream << count; - stream << spark::io::null_terminated(motd); - return StreamResult::success; - } -}; - -} // server, protocol, ember diff --git a/src/libs/protocol/include/protocol/server/MoveFallLand.h b/src/libs/protocol/include/protocol/server/MoveFallLand.h deleted file mode 100644 index f08a4e641..000000000 --- a/src/libs/protocol/include/protocol/server/MoveFallLand.h +++ /dev/null @@ -1,88 +0,0 @@ -/* - * Copyright (c) 2026 Ember - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - */ - -#pragma once - -#include -#include -#include -#include -#include -#include -#include - -namespace ember::protocol::server { - -struct MoveFallLand final { - PackedGuid guid; - MovementInfo info; - - StreamResult read_from_stream(le_stream auto& stream) { - stream >> guid; - stream >> info.flags; - stream >> info.timestamp; - stream >> info.position; - stream >> info.orientation; - - if(info.flags & MovementFlags::on_transport) { - throw std::runtime_error("Not implemented, at all"); - } - - if(info.flags & MovementFlags::swimming) { - stream >> info.pitch; - } - - stream >> info.fall_time; - - if(info.flags & MovementFlags::jumping) { - stream >> info.z_speed; - stream >> info.cos_angle; - stream >> info.sin_angle; - stream >> info.xy_speed; - } - - if(info.flags & MovementFlags::spline_elevation) { - stream >> info.spline_elevation; - } - - return stream? StreamResult::success : StreamResult::failed; - } - - StreamResult write_to_stream(le_stream auto& stream) const { - stream << guid; - stream << info.flags; - stream << info.timestamp; - stream << info.position; - stream << info.orientation; - - if(info.flags & MovementFlags::on_transport) { - throw std::runtime_error("Not implemented, at all"); - } - - if(info.flags & MovementFlags::swimming) { - stream << info.pitch; - } - - stream << info.fall_time; - - if(info.flags & MovementFlags::jumping) { - stream << info.z_speed; - stream << info.cos_angle; - stream << info.sin_angle; - stream << info.xy_speed; - } - - if(info.flags & MovementFlags::spline_elevation) { - stream << info.spline_elevation; - } - - return stream? StreamResult::success : StreamResult::failed; - } -}; - -} // server, protocol, ember diff --git a/src/libs/protocol/include/protocol/server/MoveSetRawPositionAck.h b/src/libs/protocol/include/protocol/server/MoveSetRawPositionAck.h deleted file mode 100644 index 68bfa15f9..000000000 --- a/src/libs/protocol/include/protocol/server/MoveSetRawPositionAck.h +++ /dev/null @@ -1,29 +0,0 @@ -/* -* Copyright (c) 2026 Ember -* -* This Source Code Form is subject to the terms of the Mozilla Public -* License, v. 2.0. If a copy of the MPL was not distributed with this -* file, You can obtain one at http://mozilla.org/MPL/2.0/. -*/ - -#pragma once - -#include -#include -#include -#include -#include - -namespace ember::protocol::server { - -struct MoveSetRawPositionAck final { // no handler? - StreamResult read_from_stream(le_stream auto& stream) { - return StreamResult::success; - } - - StreamResult write_to_stream(le_stream auto& stream) const { - return StreamResult::success; - } -}; - -} // server, protocol, ember diff --git a/src/libs/protocol/include/protocol/server/MoveTimeSkipped.h b/src/libs/protocol/include/protocol/server/MoveTimeSkipped.h deleted file mode 100644 index d4e8c12a3..000000000 --- a/src/libs/protocol/include/protocol/server/MoveTimeSkipped.h +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Copyright (c) 2026 Ember - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - */ - -#pragma once - -#include -#include -#include -#include -#include -#include - -namespace ember::protocol::server { - -struct MoveTimeSkipped final { - PackedGuid guid; - std::uint32_t lag; - - StreamResult read_from_stream(le_stream auto& stream) { - stream >> guid; - stream >> lag; - return StreamResult::success; - } - - StreamResult write_to_stream(le_stream auto& stream) const { - stream << guid; - stream << lag; - return StreamResult::success; - } -}; - -} // server, protocol, ember diff --git a/src/libs/protocol/include/protocol/server/NameQueryResponse.h b/src/libs/protocol/include/protocol/server/NameQueryResponse.h deleted file mode 100644 index be07bb66b..000000000 --- a/src/libs/protocol/include/protocol/server/NameQueryResponse.h +++ /dev/null @@ -1,49 +0,0 @@ -/* - * Copyright (c) 2026 Ember - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - */ - -#pragma once - -#include -#include -#include -#include -#include -#include - -namespace ember::protocol::server { - -struct NameQueryResponse final { - std::uint64_t guid; - std::string name; - std::string realm; - std::uint32_t race; - std::uint32_t gender; - std::uint32_t _class; - - StreamResult read_from_stream(le_stream auto& stream) { - stream >> guid; - stream >> spark::io::null_terminated(name); - stream >> spark::io::null_terminated(realm); - stream >> race; - stream >> gender; - stream >> _class; - return stream? StreamResult::success : StreamResult::failed; - } - - StreamResult write_to_stream(le_stream auto& stream) const { - stream << guid; - stream << spark::io::null_terminated(name); - stream << spark::io::null_terminated(realm); - stream << race; - stream << gender; - stream << _class; - return stream? StreamResult::success : StreamResult::failed; - } -}; - -} // server, protocol, ember diff --git a/src/libs/protocol/include/protocol/server/NewWorld.h b/src/libs/protocol/include/protocol/server/NewWorld.h deleted file mode 100644 index c65962c6f..000000000 --- a/src/libs/protocol/include/protocol/server/NewWorld.h +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Copyright (c) 2026 Ember - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - */ - -#pragma once - -#include -#include -#include -#include -#include - -namespace ember::protocol::server { - -struct NewWorld final { - std::uint32_t map_id; - - struct Vector { - float x, y, z, o; - } position; - - StreamResult read_from_stream(le_stream auto& stream) { - stream >> map_id; - stream >> position; - return stream? StreamResult::success : StreamResult::failed; - } - - StreamResult write_to_stream(le_stream auto& stream) const - { - stream << map_id; - stream << position; - return stream? StreamResult::success : StreamResult::failed; - } -}; - -} // server, protocol, ember diff --git a/src/libs/protocol/include/protocol/server/Notification.h b/src/libs/protocol/include/protocol/server/Notification.h deleted file mode 100644 index 3dc96bdf9..000000000 --- a/src/libs/protocol/include/protocol/server/Notification.h +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Copyright (c) 2026 Ember - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - */ - -#pragma once - -#include -#include -#include -#include -#include - -namespace ember::protocol::server { - -struct Notification final { - std::string console; - - StreamResult read_from_stream(le_stream auto& stream) { - stream >> spark::io::null_terminated(console); - return stream? StreamResult::success : StreamResult::failed; - } - - StreamResult write_to_stream(le_stream auto& stream) const { - stream << spark::io::null_terminated(console); - return stream? StreamResult::success : StreamResult::failed; - } -}; - -} // server, protocol, ember diff --git a/src/libs/protocol/include/protocol/server/Pong.h b/src/libs/protocol/include/protocol/server/Pong.h deleted file mode 100644 index 696d854e4..000000000 --- a/src/libs/protocol/include/protocol/server/Pong.h +++ /dev/null @@ -1 +0,0 @@ -#include \ No newline at end of file diff --git a/src/libs/protocol/include/protocol/server/QueryNextMailTime.h b/src/libs/protocol/include/protocol/server/QueryNextMailTime.h deleted file mode 100644 index 650575559..000000000 --- a/src/libs/protocol/include/protocol/server/QueryNextMailTime.h +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright (c) 2026 Ember - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - */ - -#pragma once - -#include -#include -#include - -namespace ember::protocol::server { - -struct QueryNextMailTime final { - float next_time; - - StreamResult read_from_stream(le_stream auto& stream) { - stream >> next_time; - return stream? StreamResult::success : StreamResult::failed; - } - - StreamResult write_to_stream(le_stream auto& stream) const { - stream << next_time; - return stream? StreamResult::success : StreamResult::failed; - } -}; - -} // server, protocol, ember diff --git a/src/libs/protocol/include/protocol/server/QueryTimeResponse.h b/src/libs/protocol/include/protocol/server/QueryTimeResponse.h deleted file mode 100644 index e2b426ee0..000000000 --- a/src/libs/protocol/include/protocol/server/QueryTimeResponse.h +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Copyright (c) 2026 Ember - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - */ - -#pragma once - -#include -#include -#include -#include -#include - -namespace ember::protocol::server { - -struct QueryTimeResponse final { - std::uint32_t time; - - StreamResult read_from_stream(le_stream auto& stream) { - stream >> time; - return stream? StreamResult::success : StreamResult::failed; - } - - StreamResult write_to_stream(le_stream auto& stream) const { - stream << time; - return stream? StreamResult::success : StreamResult::failed; - } -}; - -} // server, protocol, ember diff --git a/src/libs/protocol/include/protocol/server/RaidInstanceInfo.h b/src/libs/protocol/include/protocol/server/RaidInstanceInfo.h deleted file mode 100644 index 690784da4..000000000 --- a/src/libs/protocol/include/protocol/server/RaidInstanceInfo.h +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Copyright (c) 2026 Ember - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - */ - -#pragma once - -#include -#include -#include -#include -#include -#include - -namespace ember::protocol::server { - -struct RaidInstanceInfo final { - struct RaidInfo { - std::uint32_t map; - std::uint32_t reset_time; - std::uint32_t instance_id; - }; - - std::vector info; - - StreamResult read_from_stream(le_stream auto& stream) { - std::uint32_t count; - stream >> count; - return stream? StreamResult::success : StreamResult::failed; - } - - StreamResult write_to_stream(le_stream auto& stream) const { - stream << std::uint32_t(1); - stream << std::uint32_t(369); - stream << std::uint32_t(-1); - stream << std::uint32_t(101920); - return stream? StreamResult::success : StreamResult::failed; - } -}; - -} // server, protocol, ember diff --git a/src/libs/protocol/include/protocol/server/SetLoginTimeSpeed.h b/src/libs/protocol/include/protocol/server/SetLoginTimeSpeed.h deleted file mode 100644 index 9bb0f4d6a..000000000 --- a/src/libs/protocol/include/protocol/server/SetLoginTimeSpeed.h +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Copyright (c) 2026 Ember - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - */ - -#pragma once - -#include -#include -#include -#include -#include - -namespace ember::protocol::server { - -struct SetLoginTimeSpeed final { - std::uint32_t time; - float speed; - - StreamResult read_from_stream(le_stream auto& stream) { - stream >> time; - stream >> speed; - return stream? StreamResult::success : StreamResult::failed; - } - - StreamResult write_to_stream(le_stream auto& stream) const { - stream << time; - stream << speed; - return stream? StreamResult::success : StreamResult::failed; - } -}; - -} // server, protocol, ember diff --git a/src/libs/protocol/include/protocol/server/SplineMoveSetWalkMode.h b/src/libs/protocol/include/protocol/server/SplineMoveSetWalkMode.h deleted file mode 100644 index 906e42fa9..000000000 --- a/src/libs/protocol/include/protocol/server/SplineMoveSetWalkMode.h +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright (c) 2026 Ember - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - */ - -#pragma once - -#include -#include -#include -#include -#include -#include -#include - -namespace ember::protocol::server { - -struct SplineMoveSetWalkMode final { - PackedGuid guid; - - StreamResult read_from_stream(le_stream auto& stream) { - stream >> guid; - return stream? StreamResult::success : StreamResult::failed; - } - - StreamResult write_to_stream(le_stream auto& stream) const { - stream << guid; - return stream? StreamResult::success : StreamResult::failed; - } -}; - -} // server, protocol, ember diff --git a/src/libs/protocol/include/protocol/server/StandStateUpdate.h b/src/libs/protocol/include/protocol/server/StandStateUpdate.h deleted file mode 100644 index c1198201d..000000000 --- a/src/libs/protocol/include/protocol/server/StandStateUpdate.h +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Copyright (c) 2026 Ember - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - */ - -#pragma once - -#include -#include -#include -#include -#include -#include - -namespace ember::protocol::server { - -struct StandStateUpdate final { - UnitStandState state; - - StreamResult read_from_stream(le_stream auto& stream) { - stream >> state; - return stream? StreamResult::success : StreamResult::failed; - } - - StreamResult write_to_stream(le_stream auto& stream) const { - stream << state; - return stream? StreamResult::success : StreamResult::failed; - } -}; - -} // server, protocol, ember diff --git a/src/libs/protocol/include/protocol/server/TriggerCinematic.h b/src/libs/protocol/include/protocol/server/TriggerCinematic.h deleted file mode 100644 index 693e1a5c9..000000000 --- a/src/libs/protocol/include/protocol/server/TriggerCinematic.h +++ /dev/null @@ -1 +0,0 @@ -#include \ No newline at end of file diff --git a/src/libs/protocol/include/protocol/server/TutorialFlags.h b/src/libs/protocol/include/protocol/server/TutorialFlags.h deleted file mode 100644 index 11267c058..000000000 --- a/src/libs/protocol/include/protocol/server/TutorialFlags.h +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Copyright (c) 2026 Ember - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - */ - -#pragma once - -#include -#include -#include -#include -#include -#include - -namespace ember::protocol::server { - -struct TutorialFlags final { - std::array flags { - 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, - 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff - }; - - StreamResult read_from_stream(le_stream auto& stream) { - stream >> flags; - return stream? StreamResult::success : StreamResult::failed; - } - - StreamResult write_to_stream(le_stream auto& stream) const { - stream << flags; - return stream? StreamResult::success : StreamResult::failed; - } -}; - -} // server, protocol, ember diff --git a/src/libs/protocol/include/protocol/server/UpdateObject.h b/src/libs/protocol/include/protocol/server/UpdateObject.h index c9b2fa01b..5ac1385fc 100644 --- a/src/libs/protocol/include/protocol/server/UpdateObject.h +++ b/src/libs/protocol/include/protocol/server/UpdateObject.h @@ -9,8 +9,9 @@ #pragma once #include +#include #include -#include +#include #include #include #include @@ -71,3 +72,9 @@ struct UpdateObject final { }; } // server, protocol, ember + +namespace ember::protocol { + +using smsg_update_object = ServerPacket; + +} // protocol, ember \ No newline at end of file diff --git a/src/libs/protocol/include/protocol/server/Weather.h b/src/libs/protocol/include/protocol/server/Weather.h deleted file mode 100644 index ec3565c33..000000000 --- a/src/libs/protocol/include/protocol/server/Weather.h +++ /dev/null @@ -1,55 +0,0 @@ -/* - * Copyright (c) 2026 Ember - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - */ - -#pragma once - -#include -#include -#include -#include -#include -#include - -namespace ember::protocol::server { - -struct Weather final { - enum WeatherType : std::uint32_t { - FINE = 0, - RAIN = 1, - SNOW = 2, - STORM = 3 - }; - - enum WeatherChangeType : std::uint32_t { - SMOOTH = 0, - INSTANT = 1 - }; - - WeatherType type; - float grade; - std::uint32_t sound_id; - WeatherChangeType change; - - StreamResult read_from_stream(le_stream auto& stream) { - stream >> type; - stream >> grade; - stream >> sound_id; - stream >> change; - return stream? StreamResult::success : StreamResult::failed; - } - - StreamResult write_to_stream(le_stream auto& stream) const { - stream << type; - stream << grade; - stream << sound_id; - stream << change; - return stream? StreamResult::success : StreamResult::failed; - } -}; - -} // server, protocol, ember diff --git a/src/realm/CharacterClient.h b/src/realm/CharacterClient.h index c0f44e3ba..512ee76e8 100644 --- a/src/realm/CharacterClient.h +++ b/src/realm/CharacterClient.h @@ -11,7 +11,7 @@ #include "ConfigStore.h" #include #include -#include +#include #include namespace ember::realm { diff --git a/src/realm/ClientHandler.cpp b/src/realm/ClientHandler.cpp index c64f949aa..66cb4ba6a 100644 --- a/src/realm/ClientHandler.cpp +++ b/src/realm/ClientHandler.cpp @@ -15,7 +15,6 @@ #include "states/StateJumpTables.h" #include #include -#include #include #include #include diff --git a/src/realm/CompressMessage.cpp b/src/realm/CompressMessage.cpp index 374d23507..570276817 100644 --- a/src/realm/CompressMessage.cpp +++ b/src/realm/CompressMessage.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018 Ember + * Copyright (c) 2018 - 2026 Ember * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this @@ -7,6 +7,7 @@ */ #include "CompressMessage.h" +#include #include #include #include diff --git a/src/realm/CompressMessage.h b/src/realm/CompressMessage.h index c133f93cf..4579edb8e 100644 --- a/src/realm/CompressMessage.h +++ b/src/realm/CompressMessage.h @@ -8,7 +8,6 @@ #pragma once -#include #include namespace ember::realm { diff --git a/src/realm/Events.h b/src/realm/Events.h index c0a4c730c..1abf93d2c 100644 --- a/src/realm/Events.h +++ b/src/realm/Events.h @@ -11,8 +11,7 @@ #include "Event.h" #include "Account_generated.h" #include "Character_generated.h" -#include -#include +#include #include #include #include diff --git a/src/realm/states/Authentication.cpp b/src/realm/states/Authentication.cpp index a1cb1a57f..9bc23eeae 100644 --- a/src/realm/states/Authentication.cpp +++ b/src/realm/states/Authentication.cpp @@ -20,8 +20,8 @@ #include #include #include +#include #include -#include #include #include #include diff --git a/src/realm/states/AuthenticationContext.h b/src/realm/states/AuthenticationContext.h index 4e1a7d0dc..873cd13dd 100644 --- a/src/realm/states/AuthenticationContext.h +++ b/src/realm/states/AuthenticationContext.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 Ember + * Copyright (c) 2020 - 2026 Ember * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this @@ -8,7 +8,7 @@ #pragma once -#include +#include #include namespace ember::realm::authentication { diff --git a/src/realm/states/CharacterList.cpp b/src/realm/states/CharacterList.cpp index 81789aa39..5f6ca8353 100644 --- a/src/realm/states/CharacterList.cpp +++ b/src/realm/states/CharacterList.cpp @@ -22,10 +22,8 @@ #include #include #include -#include -#include -#include -#include +#include +#include #include #include #include @@ -151,7 +149,7 @@ void character_delete(ClientContext& ctx) { const auto& uuid = ctx.handler().uuid(); auto& dispatcher = ctx.dispatcher; - ctx.character_rpc.delete_character(ctx.account->id, packet->id, [dispatcher, uuid](auto result) { + ctx.character_rpc.delete_character(ctx.account->id, packet->guid, [dispatcher, uuid](auto result) { dispatcher.post(uuid, CharDeleteResponse(result)); }); } @@ -193,7 +191,7 @@ void enter(ClientContext& ctx) { void offline_response(ClientContext& ctx, protocol::ClientOpcode opcode) { if(opcode == protocol::ClientOpcode::cmsg_player_login) { protocol::smsg_character_login_failed response; - response->reason = protocol::Result::char_login_no_world; + response->result = protocol::Result::char_login_no_world; ctx.send(response); } else if(opcode != protocol::ClientOpcode::cmsg_cancel_trade) { protocol::smsg_auth_response response; diff --git a/src/realm/states/WorldEnter.cpp b/src/realm/states/WorldEnter.cpp index 7feb93114..97de87121 100644 --- a/src/realm/states/WorldEnter.cpp +++ b/src/realm/states/WorldEnter.cpp @@ -15,14 +15,7 @@ #include #include #include -#include -#include -#include -#include -#include -#include -#include -#include +#include #include #include #include @@ -64,11 +57,11 @@ void initiate_player_login(ClientContext& ctx, const PlayerLogin& event) { ctx.send(cinematic); protocol::smsg_login_verify_world verify_world; - verify_world->map_id = 0; + verify_world->map = 0; verify_world->position.x = -6240.32f; verify_world->position.y = 331.033f; verify_world->position.z = 382.758; - verify_world->position.o = 0.f; + verify_world->orientation = 0.f; ctx.send(verify_world); protocol::smsg_tutorial_flags tutorial_flags; @@ -146,6 +139,7 @@ void handle_request_raid_info(ClientContext& ctx) { } protocol::smsg_raid_instance_info response; + response->amount_of_raid_infos = 0; ctx.send(response); } @@ -181,7 +175,7 @@ void handle_gmticket_getticket(ClientContext& ctx) { } protocol::smsg_gmticket_getticket response; - response->status = 0; + response->status = protocol::GmTicketStatus::default_status; ctx.send(response); } @@ -207,7 +201,7 @@ void handle_meetingstone_info(ClientContext& ctx) { protocol::smsg_meetingstone_setqueue response; response->area = 0; - response->status = 5; + response->status = protocol::MeetingStoneStatus::none; ctx.send(response); } @@ -222,15 +216,10 @@ void handle_move_time_skipped(ClientContext& ctx) { // squirrel this away :) packed_guid = packet->guid; - - protocol::move_time_skipped_s response; - response->guid = packet->guid; - response->lag = packet->lag; - ctx.send(response); } void handle_move_fall_land(ClientContext& ctx) { - protocol::move_fall_land_c packet; + protocol::msg_move_fall_land_c packet; if(auto result = protocol::deserialise(packet, ctx.stream()); !result) { return ctx.stream_err(result); @@ -238,7 +227,7 @@ void handle_move_fall_land(ClientContext& ctx) { } void handle_move_set_facing(ClientContext& ctx) { - protocol::move_set_facing_c packet; + protocol::msg_move_set_facing_c packet; if(auto result = protocol::deserialise(packet, ctx.stream()); !result) { return ctx.stream_err(result); @@ -269,11 +258,11 @@ void handle_join_channel(ClientContext& ctx) { } protocol::smsg_channel_notify response; - response->type = response->YOU_JOINED_NOTICE; - response->name = packet->name; + response->notify_type = protocol::ChatNotify::you_joined_notice; + response->channel_name = packet->name; ctx.send(response); - LOG_DEBUG(ctx.logger, "{}", response->name); + LOG_DEBUG(ctx.logger, "{}", response->channel_name); } void handle_tutorial_flag(ClientContext& ctx) { @@ -370,8 +359,8 @@ bool handle_command(ClientContext& ctx, std::string_view message) try { ctx.handler().log_redirect(type, severity); } else { protocol::smsg_notification resp; - resp->console = "Disable packet logging for yourself first - " - "this would wipe out time, forwards and backwards"; + resp->notification = "Disable packet logging for yourself first - " + "this would wipe out time, forwards and backwards"; ctx.send(resp); return false; } @@ -385,18 +374,18 @@ bool handle_command(ClientContext& ctx, std::string_view message) try { } void handle_messagechat(ClientContext& ctx) { - message_view packet; + protocol::cmsg_messagechat packet; if(auto result = protocol::deserialise(packet, ctx.stream()); !result) { return ctx.stream_err(result); } - LOG_DEBUG(ctx.logger, "{}: {}", packet->destination, packet->message); + LOG_DEBUG(ctx.logger, "{}: {}", packet->channel, packet->message); if(packet->message.starts_with(".")) { if(!handle_command(ctx, packet->message)) { protocol::smsg_notification resp; - resp->console = "Could not execute command"; + resp->notification = "Could not execute command"; ctx.send(resp); } @@ -410,8 +399,8 @@ void handle_messagechat(ClientContext& ctx) { response->player_guid = packed_guid; response->player_tag = protocol::PlayerChatTag::tag_gm; - if(packet->type == protocol::client::CHANNEL) { - response->channel_name = packet->destination; + if(packet->type == protocol::ChatType::channel) { + response->channel_name = packet->target_player; response->player_rank = 14; } else { response->player_guid = packed_guid; @@ -424,7 +413,7 @@ void handle_messagechat(ClientContext& ctx) { void handle_logout_request(ClientContext& ctx) { protocol::smsg_character_login_failed response; - response->reason = protocol::Result::char_login_no_world; + response->result= protocol::Result::char_login_no_world; ctx.send(response); ctx.state_update(ClientState::cs_character_list); } @@ -445,14 +434,14 @@ void handle_world_teleport(ClientContext& ctx) { } LOG_DEBUG(ctx.logger, "Worldport, map: {}, x: {}, y: {}, z: {}, o: {}", - packet->map, packet->x, packet->y, packet->z, packet->o); + packet->map, packet->position.x, packet->position.y, packet->position.z, packet->orientation); protocol::smsg_new_world response; - response->map_id = packet->map; - response->position.x = packet->x; - response->position.y = packet->y; - response->position.z = packet->z; - response->position.o = packet->o; + response->map = packet->map; + response->position.x = packet->position.x; + response->position.y = packet->position.y; + response->position.z = packet->position.z; + response->orientation = packet->orientation; ctx.send(response); protocol::smsg_update_object update_object; @@ -467,8 +456,8 @@ void handle_move_set_raw_position(ClientContext& ctx) { return ctx.stream_err(result); } - protocol::msg_move_set_raw_position_ack response; - ctx.send(response); + //protocol::msg_move_set_raw_position_ack response; + //ctx.send(response); } // everything in this file is for testing only @@ -546,7 +535,7 @@ void handle_packet(ClientContext& ctx, protocol::ClientOpcode opcode) { void system_notification(ClientContext& ctx, std::string_view message) { protocol::smsg_notification packet; - packet->console = message; + packet->notification = message; ctx.send(packet); } diff --git a/src/tools/protogen/Generator.cpp b/src/tools/protogen/Generator.cpp index d7e454b09..5327e1380 100644 --- a/src/tools/protogen/Generator.cpp +++ b/src/tools/protogen/Generator.cpp @@ -104,7 +104,7 @@ void add_type_include(const std::string& type, const TypeRegistry& reg, std::set const auto kind = kind_of(*def); if(is_enum_kind(kind) || kind == "flags" || kind == "struct") { - out.emplace(std::format("generated/types/{}.h", type)); + out.emplace(std::format("protocol/types/{}.h", type)); } else if(kind == "external") { out.emplace((*def)["include"].as()); } @@ -734,6 +734,11 @@ GeneratedFile generate_message(const jsoncons::json& message, const auto name = message["name"].as(); const auto opcode = message["opcode"].as(); const auto direction = message["direction"].as(); + auto alias = opcode; + + if(message.contains("alias")) { + alias = message["alias"].as(); + } WalkState state; std::vector scope; @@ -752,6 +757,7 @@ GeneratedFile generate_message(const jsoncons::json& message, data["members"] = join_lines(state.members); data["read_body"] = join_lines(state.read_ops); data["write_body"] = join_lines(state.write_ops); + data["alias"] = alias; auto includes_json = nlohmann::json::array(); @@ -854,7 +860,7 @@ void collect_struct_members(const jsoncons::json& fields, const TypeRegistry& re } else if(kind == "external") { includes.emplace((*def)["include"].as()); } else { - includes.emplace(std::format("generated/types/{}.h", ty)); + includes.emplace(std::format("protocol/types/{}.h", ty)); } }; register_include_for(effective); diff --git a/src/tools/protogen/templates/Message.h_ b/src/tools/protogen/templates/Message.h_ index 8916b064b..7c2036e08 100644 --- a/src/tools/protogen/templates/Message.h_ +++ b/src/tools/protogen/templates/Message.h_ @@ -45,6 +45,6 @@ struct {{ name }} final { namespace ember::protocol { -using {{ opcode }} = {{ packet_template }}<{{ opcode_enum }}::{{ opcode }}, {{ direction }}::{{ name }}>; +using {{ alias }} = {{ packet_template }}<{{ opcode_enum }}::{{ opcode }}, {{ direction }}::{{ name }}>; } // protocol, ember diff --git a/src/tools/protogen/templates/Packets.h_ b/src/tools/protogen/templates/Packets.h_ index 87571a01c..bab907493 100644 --- a/src/tools/protogen/templates/Packets.h_ +++ b/src/tools/protogen/templates/Packets.h_ @@ -15,5 +15,5 @@ #pragma once ## for header in headers -#include +#include ## endfor diff --git a/tests/Protogen.cpp b/tests/Protogen.cpp index f171164f7..c853638a2 100644 --- a/tests/Protogen.cpp +++ b/tests/Protogen.cpp @@ -694,8 +694,8 @@ TEST_F(Protogen, StructPullsInGeneratedHeadersForCustomMembers) { } ASSERT_NE(outer, nullptr); - EXPECT_NE(outer->content.find("#include "), std::string::npos) << outer->content; - EXPECT_NE(outer->content.find("#include "), std::string::npos) << outer->content; + EXPECT_NE(outer->content.find("#include "), std::string::npos) << outer->content; + EXPECT_NE(outer->content.find("#include "), std::string::npos) << outer->content; } TEST_F(Protogen, QualifiesEnumAndMemberWithCppNamespace) { @@ -742,7 +742,7 @@ TEST_F(Protogen, AggregatorIncludesEachHeader) { const auto out = protogen::generate_aggregator(headers, templates_dir); for(const auto& h : headers) { - EXPECT_NE(out.find(std::string("#include "), std::string::npos) << out; + EXPECT_NE(out.find(std::string("#include "), std::string::npos) << out; } } @@ -1436,7 +1436,7 @@ TEST_F(Protogen, ExternalWithUnderlyingAcceptsAsCast) { "types": { "DbcEnum": { "kind": "external", - "include": "dbcs/MemoryDefs.h", + "include": "dbcreader/MemoryDefs.h", "cpp_namespace": "ember::dbc::Owner", "cpp_type_name": "Kind", "underlying": "int32" @@ -1462,7 +1462,7 @@ TEST_F(Protogen, ExternalWithUnderlyingUsedAsTypeIsAnAlias) { "types": { "Map": { "kind": "external", - "include": "dbcs/MemoryDefs.h", + "include": "dbcreader/MemoryDefs.h", "cpp_namespace": "ember::dbc", "underlying": "uint32" } @@ -1481,7 +1481,7 @@ TEST_F(Protogen, ExternalWithUnderlyingUsedAsTypeIsAnAlias) { EXPECT_NE(out.content.find("std::uint32_t map;"), std::string::npos) << out.content; EXPECT_EQ(out.content.find("ember::dbc::Map"), std::string::npos) << out.content; - EXPECT_EQ(out.content.find("#include "), std::string::npos) << out.content; + EXPECT_EQ(out.content.find("#include "), std::string::npos) << out.content; EXPECT_NE(out.content.find("stream >> map;"), std::string::npos) << out.content; EXPECT_NE(out.content.find("stream << map;"), std::string::npos) << out.content; } @@ -1493,7 +1493,7 @@ TEST_F(Protogen, AliasExternalUsableInCondition) { "types": { "Map": { "kind": "external", - "include": "dbcs/MemoryDefs.h", + "include": "dbcreader/MemoryDefs.h", "cpp_namespace": "ember::dbc", "underlying": "uint32" } From 2a6e9d8ed496c26a81f958b12e54b737bf1d7bab Mon Sep 17 00:00:00 2001 From: Chaosvex Date: Tue, 28 Apr 2026 22:43:50 +0100 Subject: [PATCH 2/2] Remove Packets.h usage --- src/realm/states/CharacterList.cpp | 10 +++++++- src/realm/states/WorldEnter.cpp | 40 +++++++++++++++++++++++++++++- 2 files changed, 48 insertions(+), 2 deletions(-) diff --git a/src/realm/states/CharacterList.cpp b/src/realm/states/CharacterList.cpp index 5f6ca8353..93641a6d3 100644 --- a/src/realm/states/CharacterList.cpp +++ b/src/realm/states/CharacterList.cpp @@ -21,9 +21,17 @@ #include "../RealmQueue.h" #include #include -#include +#include #include +#include +#include +#include #include +#include +#include +#include +#include +#include #include #include #include diff --git a/src/realm/states/WorldEnter.cpp b/src/realm/states/WorldEnter.cpp index 97de87121..360201f27 100644 --- a/src/realm/states/WorldEnter.cpp +++ b/src/realm/states/WorldEnter.cpp @@ -14,8 +14,46 @@ #include #include #include -#include +#include +#include +#include +#include +#include #include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include