fix(AbilityModifier.java): Always parse param[1-3] as DynamicFloats

Grasscutters · Sep 28, 2024 · 5b9d386 · 5b9d386
1 parent 5167253
commit 5b9d386
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 4 deletions.
diff --git a/src/main/java/emu/grasscutter/data/binout/AbilityModifier.java b/src/main/java/emu/grasscutter/data/binout/AbilityModifier.java
@@ -345,9 +345,10 @@ public enum Type {
         public DynamicFloat valueRangeMax;
         public String overrideMapKey;
 
-        public int param1;
-        public int param2;
-        public int param3;
+        public DynamicFloat
+            param1 = DynamicFloat.ZERO,
+            param2 = DynamicFloat.ZERO,
+            param3 = DynamicFloat.ZERO;
 
         public String funcName;
         public LuaCallType luaCallType;

diff --git a/src/main/java/emu/grasscutter/data/common/DynamicFloat.java b/src/main/java/emu/grasscutter/data/common/DynamicFloat.java
@@ -57,6 +57,10 @@ public float get(Ability ability) {
         return this.get(ability.getAbilitySpecials(), 0f);
     }
 
+    public int getInt(Ability ability) {
+        return (int) this.get(ability.getAbilitySpecials(), 0f);
+    }
+
     public float get(Object2FloatMap<String> props, float defaultValue) {
         if (!this.dynamic) return constant;
 

diff --git a/src/main/java/emu/grasscutter/game/ability/actions/ActionExecuteGadgetLua.java b/src/main/java/emu/grasscutter/game/ability/actions/ActionExecuteGadgetLua.java
@@ -15,9 +15,13 @@ public boolean execute(
         // Investigate if we need to use target
 
         if (owner.getEntityController() != null) {
+            var param1 = action.param1.getInt(ability);
+            var param2 = action.param2.getInt(ability);
+            var param3 = action.param3.getInt(ability);
+
             owner
                     .getEntityController()
-                    .onClientExecuteRequest(owner, action.param1, action.param2, action.param3);
+                    .onClientExecuteRequest(owner, param1, param2, param3);
             return true;
         }