Merge remote-tracking branch 'origin/development' into development

This commit is contained in:
KingRainbow44 2023-09-16 18:59:02 -04:00
commit 30f7580184
No known key found for this signature in database
GPG Key ID: FC2CB64B00D257BE

View File

@ -3,9 +3,8 @@ package emu.grasscutter.data.binout;
import com.google.gson.annotations.SerializedName; import com.google.gson.annotations.SerializedName;
import emu.grasscutter.data.common.DynamicFloat; import emu.grasscutter.data.common.DynamicFloat;
import emu.grasscutter.game.props.ElementType; import emu.grasscutter.game.props.ElementType;
import lombok.ToString;
import java.io.Serializable; import java.io.Serializable;
import lombok.ToString;
public class AbilityModifier implements Serializable { public class AbilityModifier implements Serializable {
private static final long serialVersionUID = -2001232313615923575L; private static final long serialVersionUID = -2001232313615923575L;
@ -278,8 +277,8 @@ public class AbilityModifier implements Serializable {
public DynamicFloat amount = DynamicFloat.ZERO; public DynamicFloat amount = DynamicFloat.ZERO;
@SerializedName( @SerializedName(
value = "amountByTargetCurrentHPRatio", value = "amountByTargetCurrentHPRatio",
alternate = {"GMFELAKANEF"}) alternate = {"GMFELAKANEF"})
public DynamicFloat amountByCasterAttackRatio = DynamicFloat.ZERO; public DynamicFloat amountByCasterAttackRatio = DynamicFloat.ZERO;
@SerializedName(value = "unknown2") @SerializedName(value = "unknown2")