From e9a7032c4d00dabed35d6883c0e98984632f8012 Mon Sep 17 00:00:00 2001 From: Melledy <52122272+Melledy@users.noreply.github.com> Date: Sun, 29 May 2022 20:39:42 -0700 Subject: [PATCH] Fix weapon curve excels and camel case relic affix ecels --- .../emu/grasscutter/data/excels/ItemData.java | 14 +++++----- .../data/excels/ReliquaryAffixData.java | 28 +++++++++---------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/src/main/java/emu/grasscutter/data/excels/ItemData.java b/src/main/java/emu/grasscutter/data/excels/ItemData.java index 11a593edc..adeec4357 100644 --- a/src/main/java/emu/grasscutter/data/excels/ItemData.java +++ b/src/main/java/emu/grasscutter/data/excels/ItemData.java @@ -230,20 +230,20 @@ public class ItemData extends GameResource { public static class WeaponProperty { private FightProperty fightProp; - private String PropType; - private float InitValue; - private String Type; + private String propType; + private float initValue; + private String type; public String getPropType(){ - return this.PropType; + return this.propType; } public float getInitValue(){ - return this.InitValue; + return this.initValue; } public String getType(){ - return this.Type; + return this.type; } public FightProperty getFightProp() { @@ -251,7 +251,7 @@ public class ItemData extends GameResource { } public void onLoad() { - this.fightProp = FightProperty.getPropByName(PropType); + this.fightProp = FightProperty.getPropByName(propType); } } diff --git a/src/main/java/emu/grasscutter/data/excels/ReliquaryAffixData.java b/src/main/java/emu/grasscutter/data/excels/ReliquaryAffixData.java index 8aa228fa4..cd4a04497 100644 --- a/src/main/java/emu/grasscutter/data/excels/ReliquaryAffixData.java +++ b/src/main/java/emu/grasscutter/data/excels/ReliquaryAffixData.java @@ -6,41 +6,41 @@ import emu.grasscutter.game.props.FightProperty; @ResourceType(name = "ReliquaryAffixExcelConfigData.json") public class ReliquaryAffixData extends GameResource { - private int Id; + private int id; - private int DepotId; - private int GroupId; - private FightProperty PropType; - private float PropValue; - private int Weight; - private int UpgradeWeight; + private int depotId; + private int groupId; + private FightProperty propType; + private float propValue; + private int weight; + private int upgradeWeight; @Override public int getId() { - return Id; + return id; } public int getDepotId() { - return DepotId; + return depotId; } public int getGroupId() { - return GroupId; + return groupId; } public float getPropValue() { - return PropValue; + return propValue; } public int getWeight() { - return Weight; + return weight; } public int getUpgradeWeight() { - return UpgradeWeight; + return upgradeWeight; } public FightProperty getFightProp() { - return PropType; + return propType; } }