From 2180b41c22c16eef7b8b9022a8540b6f377c027b Mon Sep 17 00:00:00 2001 From: Akbar Yahya Date: Mon, 20 Feb 2023 13:07:33 +0800 Subject: [PATCH] Add proto AbilityMetaReInitOverrideMap > This is the fix heal that comes from Ability. Add proto AbilityMetaModifierChange > This fixes `crushing rocks`. Add miss proto ModifierProperty,ModifierAction --- proto/AbilityAppliedModifier.proto | 2 -- proto/AbilityMetaModifierChange.proto | 21 +++++++++++++++++++++ proto/AbilityMetaReInitOverrideMap.proto | 8 ++++++++ proto/ModifierAction.proto | 7 +++++++ proto/ModifierProperty.proto | 10 ++++++++++ 5 files changed, 46 insertions(+), 2 deletions(-) create mode 100644 proto/AbilityMetaModifierChange.proto create mode 100644 proto/AbilityMetaReInitOverrideMap.proto create mode 100644 proto/ModifierAction.proto create mode 100644 proto/ModifierProperty.proto diff --git a/proto/AbilityAppliedModifier.proto b/proto/AbilityAppliedModifier.proto index fd2bce56..caddff84 100644 --- a/proto/AbilityAppliedModifier.proto +++ b/proto/AbilityAppliedModifier.proto @@ -2,8 +2,6 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - - import "AbilityString.proto"; import "AbilityAttachedModifier.proto"; import "ModifierDurability.proto"; diff --git a/proto/AbilityMetaModifierChange.proto b/proto/AbilityMetaModifierChange.proto new file mode 100644 index 00000000..31fe91df --- /dev/null +++ b/proto/AbilityMetaModifierChange.proto @@ -0,0 +1,21 @@ +syntax = "proto3"; +option java_package = "emu.grasscutter.net.proto"; + +import "AbilityAttachedModifier.proto"; +import "AbilityString.proto"; +import "ModifierAction.proto"; +import "ModifierProperty.proto"; + +message AbilityMetaModifierChange { + uint32 applyEntityId = 8; + AbilityAttachedModifier attachedInstancedModifier = 7; + bool is_durability_zero = 1; + repeated ModifierProperty properties = 13; + AbilityString parentAbilityName = 10; + AbilityString parentAbilityOverride = 5; + bool is_mute_remote = 11; + bool isAttachedParentAbility = 3; + uint32 serverBuffUid = 9; + int32 modifierLocalId = 6; + ModifierAction action = 2; +} diff --git a/proto/AbilityMetaReInitOverrideMap.proto b/proto/AbilityMetaReInitOverrideMap.proto new file mode 100644 index 00000000..e5045afb --- /dev/null +++ b/proto/AbilityMetaReInitOverrideMap.proto @@ -0,0 +1,8 @@ +syntax = "proto3"; +option java_package = "emu.grasscutter.net.proto"; + +import "AbilityScalarValueEntry.proto"; + +message AbilityMetaReInitOverrideMap { + repeated AbilityScalarValueEntry overrideMap = 2; +} \ No newline at end of file diff --git a/proto/ModifierAction.proto b/proto/ModifierAction.proto new file mode 100644 index 00000000..13b3d3e0 --- /dev/null +++ b/proto/ModifierAction.proto @@ -0,0 +1,7 @@ +syntax = "proto3"; +option java_package = "emu.grasscutter.net.proto"; + +enum ModifierAction { + MODIFIER_ACTION_ADDED = 0; + MODIFIER_ACTION_REMOVED = 1; +} diff --git a/proto/ModifierProperty.proto b/proto/ModifierProperty.proto new file mode 100644 index 00000000..28c86dba --- /dev/null +++ b/proto/ModifierProperty.proto @@ -0,0 +1,10 @@ +syntax = "proto3"; + +import "AbilityString.proto"; + +option java_package = "emu.grasscutter.net.proto"; + +message ModifierProperty { + AbilityString key = 8; + float value = 14; +}