sync proto ability lunagc

proto/AbilityActionGenerateElemBall.proto

@@ -3,9 +3,10 @@ option java_package = "emu.grasscutter.net.proto";
 
 import "Vector.proto";
 
-// 4.6.0
+// 4.7.0
+//AbilityActionGenerateElemBall or AbilityActionCreateGadget
 message AbilityActionGenerateElemBall {
-	uint32 room_id = 6;
+	Vector pos = 6;
-	Vector rot = 10;
+	Vector rot = 8;
-	Vector pos = 14;
+	uint32 room_id = 15;
 }

proto/AbilityActionSetCrashDamage.proto

@@ -0,0 +1,10 @@
+syntax = "proto3";
+option java_package = "emu.grasscutter.net.proto";
+
+import "Vector.proto";
+
+// 4.7.0
+message AbilityActionSetCrashDamage {
+	Vector hit_pos = 4;
+	float damage = 12;
+}

proto/AbilityAppliedAbility.proto

@@ -4,7 +4,7 @@ option java_package = "emu.grasscutter.net.proto";
 import "AbilityString.proto";
 import "AbilityScalarValueEntry.proto";
 
-// 4.6.0
+// 4.7.0
 message AbilityAppliedAbility {
 	AbilityString ability_name = 1;
 	AbilityString ability_override = 2;

proto/AbilityAppliedModifier.proto

@@ -5,8 +5,7 @@ import "AbilityString.proto";
 import "AbilityAttachedModifier.proto";
 import "ModifierDurability.proto";
 
-
+// 4.7.0
-// 4.6.0
 message AbilityAppliedModifier {
 	int32 modifier_local_id = 1;
 	uint32 parent_ability_entity_id = 2;
@@ -21,5 +20,5 @@ message AbilityAppliedModifier {
 	ModifierDurability modifier_durability = 11;
 	uint32 sbuff_uid = 12;
 	bool is_serverbuff_modifier = 13;
-	bool IAPDOPJIGFF = 14;
+	bool IILBHFODNKJ = 14;
 }

proto/AbilityAttachedModifier.proto

@@ -1,7 +1,7 @@
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
 
-// 4.6.0
+// 4.7.0
 message AbilityAttachedModifier {
 	bool is_invalid = 1;
 	uint32 owner_entity_id = 2;

proto/AbilityBornType.proto

@@ -3,9 +3,9 @@ option java_package = "emu.grasscutter.net.proto";
 
 import "Vector.proto";
 
-// 4.6.0
+// 4.7.0
 message AbilityBornType {
-	Vector rot = 7;
+	Vector move_dir = 5;
-	Vector move_dir = 10;
+	Vector rot = 12;
-	Vector pos = 13;
+	Vector pos = 15;
 }

proto/AbilityControlBlock.proto

@@ -1,7 +1,8 @@
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
 import "AbilityEmbryo.proto";
-// Obf: GGPHMELJCOL
+
+// 4.7.0
 message AbilityControlBlock {
 	repeated AbilityEmbryo ability_embryo_list = 1;
 }

proto/AbilityEmbryo.proto

@@ -1,6 +1,6 @@
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
-// Obf: PLELJEGMEOD
+// 4.7.0
 message AbilityEmbryo {
 	uint32 ability_id = 1;
 	fixed32 ability_name_hash = 2;

proto/AbilityGadgetInfo.proto

@@ -1,6 +1,6 @@
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
-// Obf: AHHOEHNNEIN
+// 4.7.0
 message AbilityGadgetInfo {
 	uint32 camp_id = 1;
 	uint32 camp_target_type = 2;

proto/AbilityInvocationsNotify.proto

@@ -4,7 +4,8 @@ option java_package = "emu.grasscutter.net.proto";
 
 import "AbilityInvokeEntry.proto";
 
-// 4.7
+// 4.7.0
-message AbilityInvocationsNotify { 
+// CmdId: 3901
-  repeated AbilityInvokeEntry invokes = 9; 
+message AbilityInvocationsNotify {
+	repeated AbilityInvokeEntry invokes = 9;
 }

proto/AbilityInvokeArgument.proto

@@ -1,7 +1,7 @@
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
 
-// 4.6.0
+// 4.7.0
 enum AbilityInvokeArgument {
 	ABILITY_INVOKE_ARGUMENT_NONE = 0;
 	ABILITY_INVOKE_ARGUMENT_META_MODIFIER_CHANGE = 1;
@@ -76,6 +76,6 @@ enum AbilityInvokeArgument {
 	ABILITY_INVOKE_ARGUMENT_MIXIN_ROTATION_FOLLOW_CAMERA = 128;
 	ABILITY_INVOKE_ARGUMENT_MIXIN_BUOYANT_FORCE = 129;
 	ABILITY_INVOKE_ARGUMENT_MIXIN_FILMFEST_BALL_GAME = 130;
-	AABILITY_INVOKE_ARGUMENT_MIXIN_CHECK_SCAN_ENTITY = 131;
+	ABILITY_INVOKE_ARGUMENT_MIXIN_CHECK_SCAN_ENTITY = 131;
 	ABILITY_INVOKE_ARGUMENT_MIXIN_TIME_TRACK_PLAYER = 133;
 }

proto/AbilityInvokeEntry.proto

@@ -1,20 +1,19 @@
 syntax = "proto3";
-
 option java_package = "emu.grasscutter.net.proto";
 
 import "AbilityInvokeEntryHead.proto";
-import "AbilityInvokeArgument.proto";
 import "ForwardType.proto";
+import "AbilityInvokeArgument.proto";
 
-// 4.7
+// 4.7.0
 message AbilityInvokeEntry {
-  uint32 entity_id = 11;
+	uint32 event_id = 1;
-  AbilityInvokeEntryHead head = 10;
+	uint32 forward_peer = 2;
-  bytes ability_data = 12;
+	bool is_ignore_auth = 4;
-  AbilityInvokeArgument argument_type = 15;
+	double total_tick_time = 7;
-  ForwardType forward_type = 13;
+	AbilityInvokeEntryHead head = 10;
-  uint32 forward_peer = 2;
+	uint32 entity_id = 11;
-  uint32 event_id = 1;
+	bytes ability_data = 12;
-  bool is_ignore_auth = 4;
+	ForwardType forward_type = 13;
-  double total_tick_time = 7;
+	AbilityInvokeArgument argument_type = 15;
 }

proto/AbilityInvokeEntryHead.proto

@@ -1,14 +1,13 @@
 syntax = "proto3";
-
 option java_package = "emu.grasscutter.net.proto";
 
 // 4.7.0
 message AbilityInvokeEntryHead {
-  uint32 instanced_ability_id = 8;
+	uint32 target_id = 3;
-  uint32 instanced_modifier_id = 7;
+	uint32 instanced_modifier_id = 7;
-  uint32 server_buff_uid = 14;
+	uint32 instanced_ability_id = 8;
-  int32 modifier_config_local_id = 13;
+	bool is_serverbuff_modifier = 9;
-  int32 local_id = 15;
+	int32 modifier_config_local_id = 13;
-  uint32 target_id = 3;
+	uint32 server_buff_uid = 14;
-  bool is_serverbuff_modifier = 9;
+	int32 local_id = 15;
 }

proto/AbilityMetaAddAbility.proto

@@ -2,7 +2,8 @@ syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
 
 import "AbilityAppliedAbility.proto";
-// 4.6.0
+
+// 4.7.0
 message AbilityMetaAddAbility {
-	AbilityAppliedAbility ability = 12;
+	AbilityAppliedAbility ability = 7;
 }

proto/AbilityMetaModifierChange.proto

@@ -1,36 +1,24 @@
-// https://github.com/SlushinPS/beach-simulator
-// Copyright (C) 2023 Slushy Team
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Affero General Public License as
-// published by the Free Software Foundation, either version 3 of the
-// License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Affero General Public License for more details.
-//
-// You should have received a copy of the GNU Affero General Public License
-// along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
-import "AbilityAttachedModifier.proto";
+
-import "ModifierProperty.proto";
-import "ModifierAction.proto";
 import "AbilityString.proto";
-// Obf: FFBMKELHDNF
+import "ModifierProperty.proto";
+import "AbilityAttachedModifier.proto";
+import "ModifierAction.proto";
+
+// 4.7.0
 message AbilityMetaModifierChange {
-	AbilityAttachedModifier attached_instanced_modifier = 15;
+	uint32 server_buff_uid = 2;
-	uint32 server_buff_uid = 5;
+	AbilityString parent_ability_override = 3;
-	repeated ModifierProperty properties = 6;
+	repeated ModifierProperty properties = 4;
-	bool BNMCKEBPDGI = 11;
+	uint32 apply_entity_id = 5;
-	bool is_attached_parent_ability = 2;
+	AbilityAttachedModifier attached_instanced_modifier = 6;
-	uint32 apply_entity_id = 9;
-	ModifierAction action = 1;
-	bool HEDGMMNKADC = 10;
 	AbilityString parent_ability_name = 7;
-	AbilityString parent_ability_override = 8;
+	int32 modifier_local_id = 8;
-	int32 modifier_local_id = 14;
+	bool is_attached_parent_ability = 10;
-}
+	bool EFONMKFIJNA = 11;
+	bool MAPJDCOAIMG = 12;
+	float KKAAMMJBABH = 13;
+	uint64 KKFHAIPCCFA = 14;
+	ModifierAction action = 15;
+}

proto/AbilityMetaReInitOverrideMap.proto

@@ -3,7 +3,7 @@ option java_package = "emu.grasscutter.net.proto";
 
 import "AbilityScalarValueEntry.proto";
 
-// 4.6.0
+// 4.7.0
 message AbilityMetaReInitOverrideMap {
-	repeated AbilityScalarValueEntry override_map = 15;
+	repeated AbilityScalarValueEntry override_map = 10;
 }

proto/AbilityMetaSetPoseParameter.proto

@@ -1,26 +1,9 @@
-// https://github.com/SlushinPS/beach-simulator
-// Copyright (C) 2023 Slushy Team
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Affero General Public License as
-// published by the Free Software Foundation, either version 3 of the
-// License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Affero General Public License for more details.
-//
-// You should have received a copy of the GNU Affero General Public License
-// along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
 syntax = "proto3";
-
 option java_package = "emu.grasscutter.net.proto";
 
-
 import "AnimatorParameterValueInfoPair.proto";
-// Obf: AFDPLNIIALH
+
+// 4.7.0
 message AbilityMetaSetPoseParameter {
-	AnimatorParameterValueInfoPair value = 1;
+	AnimatorParameterValueInfoPair value = 3;
-}
+}

proto/AbilityMixinRecoverInfo.proto

@@ -3,16 +3,18 @@ option java_package = "emu.grasscutter.net.proto";
 
 import "MassivePropSyncInfo.proto";
 import "BreakoutSnapShot.proto";
+//import "DPJAFMMGPCK.proto";
 
-// 4.6.0
+// 4.7.0
 message AbilityMixinRecoverInfo {
-	oneof source {
-		uint32 instanced_ability_id = 1;
-		uint32 instanced_modifier_id = 2;
-	}
 	uint32 local_id = 3;
 	repeated uint32 data_list = 4;
 	bool is_serverbuff_modifier = 5;
 	repeated MassivePropSyncInfo massive_prop_list = 6;
 	BreakoutSnapShot breakout_snap_shot = 7;
+	//DPJAFMMGPCK IKBDKGFHKMA = 8;
+	oneof Source {
+		uint32 instanced_ability_id = 1;
+		uint32 instanced_modifier_id = 2;
+	}
 }

proto/AbilityMixinScenePropSync.proto

@@ -0,0 +1,11 @@
+syntax = "proto3";
+option java_package = "emu.grasscutter.net.proto";
+
+import "MassivePropSyncInfo.proto";
+
+// 4.7.0
+message AbilityMixinScenePropSync {
+	bool is_clear_all = 1;
+	repeated int64 delete_id_list = 2;
+	repeated MassivePropSyncInfo massive_prop_list = 9;
+}

proto/AbilityMixinWindSeedSpawner.proto

@@ -0,0 +1,24 @@
+syntax = "proto3";
+option java_package = "emu.grasscutter.net.proto";
+
+import "Vector.proto";
+
+// 4.7.0
+message AbilityMixinWindSeedSpawner {
+	message AddSignal {
+	}
+
+	message RefreshSeed {
+		repeated Vector pos_list = 11;
+	}
+
+	message CatchSeed {
+		uint32 entity_id = 15;
+	}
+
+	oneof cmd {
+		AddSignal add_signal = 11;
+		RefreshSeed refresh_seed = 9;
+		CatchSeed catch_seed = 2;
+	}
+}

proto/AbilityScalarType.proto

@@ -1,6 +1,7 @@
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
-// Obf: HOIECOCMCMI
+
+// 4.7.0
 enum AbilityScalarType {
 	ABILITY_SCALAR_TYPE_UNKNOW = 0;
 	ABILITY_SCALAR_TYPE_FLOAT = 1;
@@ -9,4 +10,4 @@ enum AbilityScalarType {
 	ABILITY_SCALAR_TYPE_TRIGGER = 4;
 	ABILITY_SCALAR_TYPE_STRING = 5;
 	ABILITY_SCALAR_TYPE_UINT = 6;
-}
+}

proto/AbilityScalarValueEntry.proto

@@ -4,7 +4,7 @@ option java_package = "emu.grasscutter.net.proto";
 import "AbilityString.proto";
 import "AbilityScalarType.proto";
 
-// 4.6.0
+// 4.7.0
 message AbilityScalarValueEntry {
 	AbilityString key = 1;
 	AbilityScalarType value_type = 2;
@@ -14,4 +14,10 @@ message AbilityScalarValueEntry {
 		int32 int_value = 5;
 		uint32 uint_value = 6;
 	}
-}
+}
+/*
+message AbilityScalarValueEntry {
+	AbilityString key = 1;
+	float float_value = 3;
+}
+*/

proto/AbilityString.proto

@@ -1,7 +1,7 @@
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
 
-// 4.6.0
+// 4.7.0
 message AbilityString {
 	oneof type {
 		string str = 1;

proto/AbilitySyncStateInfo.proto

@@ -1,5 +1,4 @@
 syntax = "proto3";
-
 option java_package = "emu.grasscutter.net.proto";
 
 import "AbilityScalarValueEntry.proto";
@@ -7,6 +6,7 @@ import "AbilityAppliedAbility.proto";
 import "AbilityAppliedModifier.proto";
 import "AbilityMixinRecoverInfo.proto";
 
+// 4.7.0
 message AbilitySyncStateInfo {
 	bool is_inited = 1;
 	repeated AbilityScalarValueEntry dynamic_value_map = 2;
@@ -14,4 +14,4 @@ message AbilitySyncStateInfo {
 	repeated AbilityAppliedModifier applied_modifiers = 4;
 	repeated AbilityMixinRecoverInfo mixin_recover_infos = 5;
 	repeated AbilityScalarValueEntry sgv_dynamic_value_map = 6;
-}
+}

proto/ModifierProperty.proto

@@ -1,24 +1,9 @@
-// https://github.com/SlushinPS/beach-simulator
-// Copyright (C) 2023 Slushy Team
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Affero General Public License as
-// published by the Free Software Foundation, either version 3 of the
-// License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Affero General Public License for more details.
-//
-// You should have received a copy of the GNU Affero General Public License
-// along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
 import "AbilityString.proto";
-// Obf: HFHFECKAJGB
+
+// 4.7.0
 message ModifierProperty {
-	AbilityString key = 10;
+	AbilityString key = 11;
-	float value = 14;
+	float value = 1;
 }