Generated packet definition fixes

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 "$<TARGET_PROPERTY:${protogen},PROTOGEN_TEMPLATES_DIR>")
 
     file(GLOB message_jsons CONFIGURE_DEPENDS "${messages_dir}/*.json")

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"],

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"
 }

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" }
 					]

schemas/world/packets/cmsg_char_create.json → 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" },

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" }

schemas/world/packets/smsg_battleground_player_positions_server.json → 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" },

schemas/world/packets/smsg_channel_start_server.json → 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" },

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" }
+	]
+}

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" }
+	]
+}

schemas/world/packets/smsg_inspect_honor_stats_server.json → 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" },

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" }
+	]
+}

schemas/world/packets/smsg_list_stabled_pets_server.json → 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" },

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"
+}

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" }
+	]
+}