Merge branch 'development' into dev-quests

proto/AbilityMixinWidgetMpSupport.proto

@@ -0,0 +1,8 @@
+syntax = "proto3";
+
+option java_package = "emu.grasscutter.net.proto";
+
+
+message AbilityMixinWidgetMpSupport {
+	uint32 target_entity_id = 1;
+}

proto/AllWidgetDataNotify.proto

@@ -0,0 +1,29 @@
+syntax = "proto3";
+
+option java_package = "emu.grasscutter.net.proto";
+
+import "LunchBoxData.proto";
+import "AnchorPointData.proto";
+import "OneoffGatherPointDetectorData.proto";
+import "ClientCollectorData.proto";
+import "WidgetCoolDownData.proto";
+import "WidgetSlotData.proto";
+
+message AllWidgetDataNotify {
+	enum CmdId {
+		option allow_alias = true;
+		NONE = 0;
+		ENET_CHANNEL_ID = 0;
+		ENET_IS_RELIABLE = 1;
+		CMD_ID = 4260;
+	}
+
+	repeated AnchorPointData anchor_point_list = 2;
+	uint32 next_anchor_point_usable_time = 3;
+	LunchBoxData lunch_box_data = 5;
+	repeated OneoffGatherPointDetectorData oneoff_gather_point_detector_data_list = 6;
+	repeated ClientCollectorData client_collector_data_list = 7;
+	repeated WidgetCoolDownData cool_down_group_data_list = 8;
+	repeated WidgetCoolDownData normal_cool_down_data_list = 9;
+	repeated WidgetSlotData slot_list = 11;
+}

proto/AnchorPointData.proto

@@ -0,0 +1,12 @@
+syntax = "proto3";
+
+option java_package = "emu.grasscutter.net.proto";
+
+import "Vector.proto";
+
+message AnchorPointData {
+	uint32 anchor_point_id = 1;
+	Vector pos = 2;
+	Vector rot = 3;
+	uint32 end_time = 4;
+}

proto/AnchorPointDataNotify.proto

@@ -0,0 +1,18 @@
+syntax = "proto3";
+
+option java_package = "emu.grasscutter.net.proto";
+
+import "AnchorPointData.proto";
+
+message AnchorPointDataNotify {
+	enum CmdId {
+		option allow_alias = true;
+		NONE = 0;
+		ENET_CHANNEL_ID = 0;
+		ENET_IS_RELIABLE = 1;
+		CMD_ID = 4253;
+	}
+
+	repeated AnchorPointData anchor_point_list = 1;
+	uint32 next_usable_time = 2;
+}

proto/AnchorPointOpReq.proto

@@ -0,0 +1,24 @@
+syntax = "proto3";
+
+option java_package = "emu.grasscutter.net.proto";
+
+
+message AnchorPointOpReq {
+	enum CmdId {
+		option allow_alias = true;
+		ENET_CHANNEL_ID = 0;
+		NONE = 0;
+		ENET_IS_RELIABLE = 1;
+		IS_ALLOW_CLIENT = 1;
+		CMD_ID = 4255;
+	}
+
+	enum AnchorPointOpType {
+		ANCHOR_POINT_OP_NONE = 0;
+		ANCHOR_POINT_OP_TELEPORT = 1;
+		ANCHOR_POINT_OP_REMOVE = 2;
+	}
+
+	uint32 anchor_point_op_type = 1;
+	uint32 anchor_point_id = 2;
+}

proto/AnchorPointOpRsp.proto

@@ -0,0 +1,18 @@
+syntax = "proto3";
+
+option java_package = "emu.grasscutter.net.proto";
+
+
+message AnchorPointOpRsp {
+	enum CmdId {
+		option allow_alias = true;
+		NONE = 0;
+		ENET_CHANNEL_ID = 0;
+		ENET_IS_RELIABLE = 1;
+		CMD_ID = 4274;
+	}
+
+	int32 retcode = 1;
+	uint32 anchor_point_op_type = 2;
+	uint32 anchor_point_id = 3;
+}

proto/ClientCollectorData.proto

@@ -0,0 +1,10 @@
+syntax = "proto3";
+
+option java_package = "emu.grasscutter.net.proto";
+
+
+message ClientCollectorData {
+	uint32 material_id = 1;
+	uint32 max_points = 2;
+	uint32 curr_points = 3;
+}

proto/ClientCollectorDataNotify.proto

@@ -0,0 +1,17 @@
+syntax = "proto3";
+
+option java_package = "emu.grasscutter.net.proto";
+
+import "ClientCollectorData.proto";
+
+message ClientCollectorDataNotify {
+	enum CmdId {
+		option allow_alias = true;
+		NONE = 0;
+		ENET_CHANNEL_ID = 0;
+		ENET_IS_RELIABLE = 1;
+		CMD_ID = 4280;
+	}
+
+	repeated ClientCollectorData client_collector_data_list = 1;
+}

proto/GetWidgetSlotReq.proto

@@ -0,0 +1,16 @@
+syntax = "proto3";
+
+option java_package = "emu.grasscutter.net.proto";
+
+
+message GetWidgetSlotReq {
+	enum CmdId {
+		option allow_alias = true;
+		ENET_CHANNEL_ID = 0;
+		NONE = 0;
+		ENET_IS_RELIABLE = 1;
+		IS_ALLOW_CLIENT = 1;
+		CMD_ID = 4285;
+	}
+
+}

proto/GetWidgetSlotRsp.proto

@@ -0,0 +1,18 @@
+syntax = "proto3";
+
+option java_package = "emu.grasscutter.net.proto";
+
+import "WidgetSlotData.proto";
+
+message GetWidgetSlotRsp {
+	enum CmdId {
+		option allow_alias = true;
+		NONE = 0;
+		ENET_CHANNEL_ID = 0;
+		ENET_IS_RELIABLE = 1;
+		CMD_ID = 4291;
+	}
+
+	int32 retcode = 1;
+	repeated WidgetSlotData slot_list = 2;
+}

proto/LunchBoxData.proto

@@ -0,0 +1,8 @@
+syntax = "proto3";
+
+option java_package = "emu.grasscutter.net.proto";
+
+
+message LunchBoxData {
+	map<uint32, uint32> slot_material_map = 1;
+}

proto/LunchBoxSlotType.proto

@@ -0,0 +1,9 @@
+syntax = "proto3";
+
+option java_package = "emu.grasscutter.net.proto";
+
+enum LunchBoxSlotType {
+	LUNCH_BOX_SLOT_NONE = 0;
+	LUNCH_BOX_SLOT_REVIVE = 1;
+	LUNCH_BOX_SLOT_HEAL = 2;
+}

proto/OneoffGatherPointDetectorData.proto

@@ -0,0 +1,15 @@
+syntax = "proto3";
+
+option java_package = "emu.grasscutter.net.proto";
+
+import "Vector.proto";
+
+message OneoffGatherPointDetectorData {
+	uint32 material_id = 1;
+	bool is_all_collected = 2;
+	bool is_hint_valid = 3;
+	Vector hint_center_pos = 4;
+	uint32 hint_radius = 5;
+	uint32 group_id = 6;
+	uint32 config_id = 7;
+}

proto/OneoffGatherPointDetectorDataNotify.proto

@@ -0,0 +1,17 @@
+syntax = "proto3";
+
+option java_package = "emu.grasscutter.net.proto";
+
+import "OneoffGatherPointDetectorData.proto";
+
+message OneoffGatherPointDetectorDataNotify {
+	enum CmdId {
+		option allow_alias = true;
+		NONE = 0;
+		ENET_CHANNEL_ID = 0;
+		ENET_IS_RELIABLE = 1;
+		CMD_ID = 4288;
+	}
+
+	repeated OneoffGatherPointDetectorData oneoff_gather_point_detector_data_list = 1;
+}

proto/QuickUseWidgetReq.proto

@@ -0,0 +1,26 @@
+syntax = "proto3";
+
+option java_package = "emu.grasscutter.net.proto";
+
+import "WidgetCreateLocationInfo.proto";
+import "WidgetCameraInfo.proto";
+import "WidgetCreatorInfo.proto";
+import "WidgetThunderBirdFeatherInfo.proto";
+
+message QuickUseWidgetReq {
+	enum CmdId {
+		option allow_alias = true;
+		ENET_CHANNEL_ID = 0;
+		NONE = 0;
+		ENET_IS_RELIABLE = 1;
+		IS_ALLOW_CLIENT = 1;
+		CMD_ID = 4300;
+	}
+
+	oneof Param {
+		WidgetCreateLocationInfo location_info = 20;
+		WidgetCameraInfo camera_info = 21;
+		WidgetCreatorInfo creator_info = 22;
+		WidgetThunderBirdFeatherInfo thunder_bird_feather_info = 23;
+	}
+}

proto/QuickUseWidgetRsp.proto

@@ -0,0 +1,21 @@
+syntax = "proto3";
+
+option java_package = "emu.grasscutter.net.proto";
+
+import "OneoffGatherPointDetectorData.proto";
+import "ClientCollectorData.proto";
+
+message QuickUseWidgetRsp {
+	enum CmdId {
+		option allow_alias = true;
+		NONE = 0;
+		ENET_CHANNEL_ID = 0;
+		ENET_IS_RELIABLE = 1;
+		CMD_ID = 4258;
+	}
+
+	int32 retcode = 1;
+	uint32 material_id = 2;
+	OneoffGatherPointDetectorData detector_data = 3;
+	ClientCollectorData client_collector_data = 4;
+}

proto/SetUpLunchBoxWidgetReq.proto

@@ -0,0 +1,18 @@
+syntax = "proto3";
+
+option java_package = "emu.grasscutter.net.proto";
+
+import "LunchBoxData.proto";
+
+message SetUpLunchBoxWidgetReq {
+	enum CmdId {
+		option allow_alias = true;
+		ENET_CHANNEL_ID = 0;
+		NONE = 0;
+		ENET_IS_RELIABLE = 1;
+		IS_ALLOW_CLIENT = 1;
+		CMD_ID = 4265;
+	}
+
+	LunchBoxData lunch_box_data = 1;
+}

proto/SetUpLunchBoxWidgetRsp.proto

@@ -0,0 +1,18 @@
+syntax = "proto3";
+
+option java_package = "emu.grasscutter.net.proto";
+
+import "LunchBoxData.proto";
+
+message SetUpLunchBoxWidgetRsp {
+	enum CmdId {
+		option allow_alias = true;
+		NONE = 0;
+		ENET_CHANNEL_ID = 0;
+		ENET_IS_RELIABLE = 1;
+		CMD_ID = 4297;
+	}
+
+	int32 retcode = 1;
+	LunchBoxData lunch_box_data = 2;
+}

proto/SetWidgetSlotReq.proto

@@ -0,0 +1,21 @@
+syntax = "proto3";
+
+option java_package = "emu.grasscutter.net.proto";
+
+import "WidgetSlotOp.proto";
+import "WidgetSlotTag.proto";
+
+message SetWidgetSlotReq {
+	enum CmdId {
+		option allow_alias = true;
+		ENET_CHANNEL_ID = 0;
+		NONE = 0;
+		ENET_IS_RELIABLE = 1;
+		IS_ALLOW_CLIENT = 1;
+		CMD_ID = 4269;
+	}
+
+	WidgetSlotOp op = 2;
+	repeated WidgetSlotTag tag_list = 3;
+	uint32 material_id = 4;
+}

proto/SetWidgetSlotRsp.proto

@@ -0,0 +1,21 @@
+syntax = "proto3";
+
+option java_package = "emu.grasscutter.net.proto";
+
+import "WidgetSlotOp.proto";
+import "WidgetSlotTag.proto";
+
+message SetWidgetSlotRsp {
+	enum CmdId {
+		option allow_alias = true;
+		NONE = 0;
+		ENET_CHANNEL_ID = 0;
+		ENET_IS_RELIABLE = 1;
+		CMD_ID = 4279;
+	}
+
+	int32 retcode = 1;
+	WidgetSlotOp op = 2;
+	repeated WidgetSlotTag tag_list = 3;
+	uint32 material_id = 4;
+}

proto/UseWidgetCreateGadgetReq.proto

@@ -0,0 +1,20 @@
+syntax = "proto3";
+
+option java_package = "emu.grasscutter.net.proto";
+
+import "Vector.proto";
+
+message UseWidgetCreateGadgetReq {
+	enum CmdId {
+		option allow_alias = true;
+		ENET_CHANNEL_ID = 0;
+		NONE = 0;
+		ENET_IS_RELIABLE = 1;
+		IS_ALLOW_CLIENT = 1;
+		CMD_ID = 4276;
+	}
+
+	uint32 material_id = 1;
+	Vector pos = 2;
+	Vector rot = 3;
+}

proto/UseWidgetCreateGadgetRsp.proto

@@ -0,0 +1,17 @@
+syntax = "proto3";
+
+option java_package = "emu.grasscutter.net.proto";
+
+
+message UseWidgetCreateGadgetRsp {
+	enum CmdId {
+		option allow_alias = true;
+		NONE = 0;
+		ENET_CHANNEL_ID = 0;
+		ENET_IS_RELIABLE = 1;
+		CMD_ID = 4270;
+	}
+
+	int32 retcode = 1;
+	uint32 material_id = 2;
+}

proto/UseWidgetRetractGadgetReq.proto

@@ -0,0 +1,17 @@
+syntax = "proto3";
+
+option java_package = "emu.grasscutter.net.proto";
+
+
+message UseWidgetRetractGadgetReq {
+	enum CmdId {
+		option allow_alias = true;
+		ENET_CHANNEL_ID = 0;
+		NONE = 0;
+		ENET_IS_RELIABLE = 1;
+		IS_ALLOW_CLIENT = 1;
+		CMD_ID = 4273;
+	}
+
+	uint32 entity_id = 1;
+}

proto/UseWidgetRetractGadgetRsp.proto

@@ -0,0 +1,18 @@
+syntax = "proto3";
+
+option java_package = "emu.grasscutter.net.proto";
+
+
+message UseWidgetRetractGadgetRsp {
+	enum CmdId {
+		option allow_alias = true;
+		ENET_CHANNEL_ID = 0;
+		NONE = 0;
+		ENET_IS_RELIABLE = 1;
+		IS_ALLOW_CLIENT = 1;
+		CMD_ID = 4266;
+	}
+
+	int32 retcode = 1;
+	uint32 entity_id = 2;
+}

proto/WidgetActiveChangeNotify.proto

@@ -0,0 +1,17 @@
+syntax = "proto3";
+
+option java_package = "emu.grasscutter.net.proto";
+
+import "WidgetSlotData.proto";
+
+message WidgetActiveChangeNotify {
+	enum CmdId {
+		option allow_alias = true;
+		NONE = 0;
+		ENET_CHANNEL_ID = 0;
+		ENET_IS_RELIABLE = 1;
+		CMD_ID = 4264;
+	}
+
+	repeated WidgetSlotData widget_data_list = 1;
+}

proto/WidgetCameraInfo.proto

@@ -0,0 +1,8 @@
+syntax = "proto3";
+
+option java_package = "emu.grasscutter.net.proto";
+
+
+message WidgetCameraInfo {
+	uint32 target_entity_id = 1;
+}

proto/WidgetCoolDownData.proto

@@ -0,0 +1,10 @@
+syntax = "proto3";
+
+option java_package = "emu.grasscutter.net.proto";
+
+
+message WidgetCoolDownData {
+	uint32 id = 1;
+	uint64 cool_down_time = 2;
+	bool is_success = 3;
+}

proto/WidgetCoolDownNotify.proto

@@ -0,0 +1,18 @@
+syntax = "proto3";
+
+option java_package = "emu.grasscutter.net.proto";
+
+import "WidgetCoolDownData.proto";
+
+message WidgetCoolDownNotify {
+	enum CmdId {
+		option allow_alias = true;
+		NONE = 0;
+		ENET_CHANNEL_ID = 0;
+		ENET_IS_RELIABLE = 1;
+		CMD_ID = 4298;
+	}
+
+	repeated WidgetCoolDownData group_cool_down_data_list = 1;
+	repeated WidgetCoolDownData normal_cool_down_data_list = 2;
+}

proto/WidgetCreateLocationInfo.proto

@@ -0,0 +1,10 @@
+syntax = "proto3";
+
+option java_package = "emu.grasscutter.net.proto";
+
+import "Vector.proto";
+
+message WidgetCreateLocationInfo {
+	Vector pos = 1;
+	Vector rot = 2;
+}

proto/WidgetCreatorInfo.proto

@@ -0,0 +1,12 @@
+syntax = "proto3";
+
+option java_package = "emu.grasscutter.net.proto";
+
+import "WidgetCreatorOpType.proto";
+import "WidgetCreateLocationInfo.proto";
+
+message WidgetCreatorInfo {
+	WidgetCreatorOpType op_type = 1;
+	uint32 entity_id = 2;
+	WidgetCreateLocationInfo location_info = 3;
+}

proto/WidgetCreatorOpType.proto

@@ -0,0 +1,9 @@
+syntax = "proto3";
+
+option java_package = "emu.grasscutter.net.proto";
+
+enum WidgetCreatorOpType {
+	WIDGET_CREATOR_TYPE_NONE = 0;
+	WIDGET_CREATOR_TYPE_RETRACT = 1;
+	WIDGET_CREATOR_TYPE_RETRACT_AND_CREATE = 2;
+}

proto/WidgetDoBagReq.proto

@@ -0,0 +1,23 @@
+syntax = "proto3";
+
+option java_package = "emu.grasscutter.net.proto";
+
+import "WidgetCreateLocationInfo.proto";
+import "WidgetCreatorInfo.proto";
+
+message WidgetDoBagReq {
+	enum CmdId {
+		option allow_alias = true;
+		ENET_CHANNEL_ID = 0;
+		NONE = 0;
+		ENET_IS_RELIABLE = 1;
+		IS_ALLOW_CLIENT = 1;
+		CMD_ID = 4290;
+	}
+
+	oneof OpInfo {
+		WidgetCreateLocationInfo location_info = 20;
+		WidgetCreatorInfo widget_creator_info = 21;
+	}
+	uint32 material_id = 1;
+}

proto/WidgetDoBagRsp.proto

@@ -0,0 +1,17 @@
+syntax = "proto3";
+
+option java_package = "emu.grasscutter.net.proto";
+
+
+message WidgetDoBagRsp {
+	enum CmdId {
+		option allow_alias = true;
+		NONE = 0;
+		ENET_CHANNEL_ID = 0;
+		ENET_IS_RELIABLE = 1;
+		CMD_ID = 4271;
+	}
+
+	int32 retcode = 1;
+	uint32 material_id = 2;
+}

proto/WidgetGadgetAllDataNotify.proto

@@ -0,0 +1,17 @@
+syntax = "proto3";
+
+option java_package = "emu.grasscutter.net.proto";
+
+import "WidgetGadgetData.proto";
+
+message WidgetGadgetAllDataNotify {
+	enum CmdId {
+		option allow_alias = true;
+		NONE = 0;
+		ENET_CHANNEL_ID = 0;
+		ENET_IS_RELIABLE = 1;
+		CMD_ID = 4262;
+	}
+
+	repeated WidgetGadgetData widget_gadget_data = 1;
+}

proto/WidgetGadgetData.proto

@@ -0,0 +1,9 @@
+syntax = "proto3";
+
+option java_package = "emu.grasscutter.net.proto";
+
+
+message WidgetGadgetData {
+	uint32 gadget_id = 1;
+	repeated uint32 gadget_entity_id_list = 3;
+}

proto/WidgetGadgetDataNotify.proto

@@ -0,0 +1,17 @@
+syntax = "proto3";
+
+option java_package = "emu.grasscutter.net.proto";
+
+import "WidgetGadgetData.proto";
+
+message WidgetGadgetDataNotify {
+	enum CmdId {
+		option allow_alias = true;
+		NONE = 0;
+		ENET_CHANNEL_ID = 0;
+		ENET_IS_RELIABLE = 1;
+		CMD_ID = 4256;
+	}
+
+	WidgetGadgetData widget_gadget_data = 1;
+}

proto/WidgetGadgetDestroyNotify.proto

@@ -0,0 +1,16 @@
+syntax = "proto3";
+
+option java_package = "emu.grasscutter.net.proto";
+
+
+message WidgetGadgetDestroyNotify {
+	enum CmdId {
+		option allow_alias = true;
+		NONE = 0;
+		ENET_CHANNEL_ID = 0;
+		ENET_IS_RELIABLE = 1;
+		CMD_ID = 4268;
+	}
+
+	uint32 entity_id = 1;
+}

proto/WidgetReportReq.proto

@@ -0,0 +1,19 @@
+syntax = "proto3";
+
+option java_package = "emu.grasscutter.net.proto";
+
+
+message WidgetReportReq {
+	enum CmdId {
+		option allow_alias = true;
+		ENET_CHANNEL_ID = 0;
+		NONE = 0;
+		ENET_IS_RELIABLE = 1;
+		IS_ALLOW_CLIENT = 1;
+		CMD_ID = 4294;
+	}
+
+	uint32 material_id = 1;
+	bool is_clear_hint = 2;
+	bool is_client_collect = 3;
+}

proto/WidgetReportRsp.proto

@@ -0,0 +1,17 @@
+syntax = "proto3";
+
+option java_package = "emu.grasscutter.net.proto";
+
+
+message WidgetReportRsp {
+	enum CmdId {
+		option allow_alias = true;
+		NONE = 0;
+		ENET_CHANNEL_ID = 0;
+		ENET_IS_RELIABLE = 1;
+		CMD_ID = 4259;
+	}
+
+	int32 retcode = 1;
+	uint32 material_id = 2;
+}

proto/WidgetSlotChangeNotify.proto

@@ -0,0 +1,19 @@
+syntax = "proto3";
+
+option java_package = "emu.grasscutter.net.proto";
+
+import "WidgetSlotOp.proto";
+import "WidgetSlotData.proto";
+
+message WidgetSlotChangeNotify {
+	enum CmdId {
+		option allow_alias = true;
+		NONE = 0;
+		ENET_CHANNEL_ID = 0;
+		ENET_IS_RELIABLE = 1;
+		CMD_ID = 4289;
+	}
+
+	WidgetSlotOp op = 1;
+	WidgetSlotData slot = 2;
+}

proto/WidgetSlotData.proto

@@ -0,0 +1,12 @@
+syntax = "proto3";
+
+option java_package = "emu.grasscutter.net.proto";
+
+import "WidgetSlotTag.proto";
+
+message WidgetSlotData {
+	WidgetSlotTag tag = 1;
+	uint32 material_id = 2;
+	uint32 cd_over_time = 3;
+	bool is_active = 4;
+}

proto/WidgetSlotOp.proto

@@ -0,0 +1,8 @@
+syntax = "proto3";
+
+option java_package = "emu.grasscutter.net.proto";
+
+enum WidgetSlotOp {
+	ATTACH = 0;
+	DETACH = 1;
+}

proto/WidgetSlotTag.proto

@@ -0,0 +1,8 @@
+syntax = "proto3";
+
+option java_package = "emu.grasscutter.net.proto";
+
+enum WidgetSlotTag {
+	WIDGET_SLOT_QUICK_USE = 0;
+	WIDGET_SLOT_ATTACH_AVATAR = 1;
+}

proto/WidgetSlotTagComparer.proto

@@ -0,0 +1,7 @@
+syntax = "proto3";
+
+option java_package = "emu.grasscutter.net.proto";
+
+
+message WidgetSlotTagComparer {
+}

proto/WidgetThunderBirdFeatherInfo.proto

@@ -0,0 +1,8 @@
+syntax = "proto3";
+
+option java_package = "emu.grasscutter.net.proto";
+
+
+message WidgetThunderBirdFeatherInfo {
+	repeated uint32 entity_id_list = 1;
+}

proto/WidgetUseAttachAbilityGroupChangeNotify.proto

@@ -0,0 +1,17 @@
+syntax = "proto3";
+
+option java_package = "emu.grasscutter.net.proto";
+
+
+message WidgetUseAttachAbilityGroupChangeNotify {
+	enum CmdId {
+		option allow_alias = true;
+		NONE = 0;
+		ENET_CHANNEL_ID = 0;
+		ENET_IS_RELIABLE = 1;
+		CMD_ID = 4292;
+	}
+
+	uint32 material_id = 1;
+	bool is_attach = 2;
+}