Mirror/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2025-12-17 01:15:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Refactor WeaponType and MonsterType into enums

Browse Source
This commit is contained in:
Melledy
2022-05-29 20:16:49 -07:00
parent b9ca4a5dbd
commit ef6e16aaf5
6 changed files with 151 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/emu/grasscutter/data/excels/AvatarData.java
View File

@@ -9,6 +9,7 @@ import emu.grasscutter.data.ResourceType.LoadPriority;
import emu.grasscutter.data.binout.AbilityEmbryoEntry;
import emu.grasscutter.data.common.PropGrowCurve;
import emu.grasscutter.game.props.FightProperty;
import emu.grasscutter.game.props.WeaponType;
import emu.grasscutter.utils.Utils;
import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
import it.unimi.dsi.fastutil.ints.IntArrayList;
@@ -22,7 +23,7 @@ public class AvatarData extends GameResource {
private String qualityType;
private int chargeEfficiency;
private int initialWeapon;
private String weaponType;
private WeaponType weaponType;
private String imageName;
private int avatarPromoteId;
private String cutsceneShow;
@@ -83,7 +84,7 @@ public class AvatarData extends GameResource {
return this.initialWeapon;
}
public String getWeaponType(){
public WeaponType getWeaponType(){
return this.weaponType;
}

5
src/main/java/emu/grasscutter/data/excels/MonsterData.java
View File

@@ -7,13 +7,14 @@ import emu.grasscutter.data.GameResource;
import emu.grasscutter.data.ResourceType;
import emu.grasscutter.data.ResourceType.LoadPriority;
import emu.grasscutter.data.common.PropGrowCurve;
import emu.grasscutter.game.props.MonsterType;
@ResourceType(name = "MonsterExcelConfigData.json", loadPriority = LoadPriority.LOW)
public class MonsterData extends GameResource {
private int id;
private String monsterName;
private String type;
private MonsterType type;
private String serverScript;
private List<Integer> affix;
private String ai;
@@ -55,7 +56,7 @@ public class MonsterData extends GameResource {
return monsterName;
}
public String getType() {
public MonsterType getType() {
return type;
}