Skip to content

GitLab

Commit a8293102 authored by Melledy's avatar Melledy Committed by GitHub
Browse files

Merge branch 'development' into stable

parents 304b9cb8 ecf7a81a
Show whitespace changes
Inline Side-by-side
src/main/java/emu/grasscutter/data/common/ItemUseData.java 0 → 100644
View file @ a8293102
package emu.grasscutter.data.common;
import java.util.List;
public class ItemUseData {
private String useOp;
private List<String> useParam;
public String getUseOp() {
return useOp;
}
public void setUseOp(String useOp) {
this.useOp = useOp;
}
public List<String> getUseParam() {
return useParam;
}
public void setUseParam(List<String> useParam) {
this.useParam = useParam;
}
}
src/main/java/emu/grasscutter/data/common/OpenCondData.java
View file @ a8293102
......@@ -3,22 +3,22 @@ package emu.grasscutter.data.common;
import java.util.List;
public class OpenCondData {
private String CondType;
private List<Integer> ParamList;
private String condType;
private List<Integer> paramList;
public String getCondType() {
return CondType;
return condType;
}
public void setCondType(String condType) {
CondType = condType;
condType = condType;
}
public List<Integer> getParamList() {
return ParamList;
return paramList;
}
public void setParamList(List<Integer> paramList) {
ParamList = paramList;
paramList = paramList;
}
}
src/main/java/emu/grasscutter/data/common/PointData.java
View file @ a8293102
package emu.grasscutter.data.common;
import com.google.gson.annotations.SerializedName;
import emu.grasscutter.Grasscutter;
import emu.grasscutter.data.GameData;
import emu.grasscutter.data.def.DailyDungeonData;
import emu.grasscutter.data.excels.DailyDungeonData;
import emu.grasscutter.utils.Position;
import it.unimi.dsi.fastutil.ints.IntArrayList;
import it.unimi.dsi.fastutil.ints.IntList;
......@@ -11,7 +13,11 @@ public class PointData {
private int id;
private String $type;
private Position tranPos;
@SerializedName(value="dungeonIds", alternate={"JHHFPGJNMIN"})
private int[] dungeonIds;
@SerializedName(value="dungeonRandomList", alternate={"OIBKFJNBLHO"})
private int[] dungeonRandomList;
private int tranSceneId;
......
src/main/java/emu/grasscutter/data/common/PropGrowCurve.java
View file @ a8293102
package emu.grasscutter.data.common;
public class PropGrowCurve {
private String Type;
private String GrowCurve;
private String type;
private String growCurve;
public String getType(){
return this.Type;
return this.type;
}
public String getGrowCurve(){
return this.GrowCurve;
return this.growCurve;
}
}
src/main/java/emu/grasscutter/data/common/RewardItemData.java deleted 100644 → 0
View file @ 304b9cb8
package emu.grasscutter.data.common;
public class RewardItemData {
private int ItemId;
private int ItemCount;
public int getItemId() {
return ItemId;
}
public void setItemId(int itemId) {
ItemId = itemId;
}
public int getItemCount() {
return ItemCount;
}
public void setItemCount(int itemCount) {
ItemCount = itemCount;
}
}
src/main/java/emu/grasscutter/data/def/CombineData.java deleted 100644 → 0
View file @ 304b9cb8
package emu.grasscutter.data.def;
import emu.grasscutter.data.GameResource;
import emu.grasscutter.data.ResourceType;
import java.util.List;
import java.util.stream.Collectors;
@ResourceType(name = "CombineExcelConfigData.json")
public class CombineData extends GameResource {
private int CombineId;
private int PlayerLevel;
private boolean IsDefaultShow;
private int CombineType;
private int SubCombineType;
private int ResultItemId;
private int ResultItemCount;
private int ScoinCost;
private List<CombineItemPair> RandomItems;
private List<CombineItemPair> MaterialItems;
private long EffectDescTextMapHash;
private String RecipeType;
@Override
public int getId() {
return this.CombineId;
}
@Override
public void onLoad() {
super.onLoad();
// clean data
RandomItems = RandomItems.stream().filter(item -> item.Id > 0).collect(Collectors.toList());
MaterialItems = MaterialItems.stream().filter(item -> item.Id > 0).collect(Collectors.toList());
}
public static class CombineItemPair {
private int Id;
private int Count;
public CombineItemPair(int id, int count) {
Id = id;
Count = count;
}
public int getId() {
return Id;
}
public void setId(int id) {
Id = id;
}
public int getCount() {
return Count;
}
public void setCount(int count) {
Count = count;
}
}
public int getCombineId() {
return CombineId;
}
public void setCombineId(int combineId) {
CombineId = combineId;
}
public int getPlayerLevel() {
return PlayerLevel;
}
public void setPlayerLevel(int playerLevel) {
PlayerLevel = playerLevel;
}
public boolean isDefaultShow() {
return IsDefaultShow;
}
public void setDefaultShow(boolean defaultShow) {
IsDefaultShow = defaultShow;
}
public int getCombineType() {
return CombineType;
}
public void setCombineType(int combineType) {
CombineType = combineType;
}
public int getSubCombineType() {
return SubCombineType;
}
public void setSubCombineType(int subCombineType) {
SubCombineType = subCombineType;
}
public int getResultItemId() {
return ResultItemId;
}
public void setResultItemId(int resultItemId) {
ResultItemId = resultItemId;
}
public int getResultItemCount() {
return ResultItemCount;
}
public void setResultItemCount(int resultItemCount) {
ResultItemCount = resultItemCount;
}
public int getScoinCost() {
return ScoinCost;
}
public void setScoinCost(int scoinCost) {
ScoinCost = scoinCost;
}
public List<CombineItemPair> getRandomItems() {
return RandomItems;
}
public void setRandomItems(List<CombineItemPair> randomItems) {
RandomItems = randomItems;
}
public List<CombineItemPair> getMaterialItems() {
return MaterialItems;
}
public void setMaterialItems(List<CombineItemPair> materialItems) {
MaterialItems = materialItems;
}
public long getEffectDescTextMapHash() {
return EffectDescTextMapHash;
}
public void setEffectDescTextMapHash(long effectDescTextMapHash) {
EffectDescTextMapHash = effectDescTextMapHash;
}
public String getRecipeType() {
return RecipeType;
}
public void setRecipeType(String recipeType) {
RecipeType = recipeType;
}
}
src/main/java/emu/grasscutter/data/def/AvatarCostumeData.java → src/main/java/emu/grasscutter/data/excels/AvatarCostumeData.java
View file @ a8293102
package emu.grasscutter.data.def;
package emu.grasscutter.data.excels;
import emu.grasscutter.data.GameData;
import emu.grasscutter.data.GameResource;
......@@ -6,21 +6,21 @@ import emu.grasscutter.data.ResourceType;
@ResourceType(name = "AvatarCostumeExcelConfigData.json")
public class AvatarCostumeData extends GameResource {
private int CostumeId;
private int ItemId;
private int AvatarId;
private int costumeId;
private int itemId;
private int avatarId;
@Override
public int getId() {
return this.CostumeId;
return this.costumeId;
}
public int getItemId() {
return this.ItemId;
return this.itemId;
}
public int getAvatarId() {
return AvatarId;
return avatarId;
}
@Override
......
src/main/java/emu/grasscutter/data/def/AvatarCurveData.java → src/main/java/emu/grasscutter/data/excels/AvatarCurveData.java
View file @ a8293102
package emu.grasscutter.data.def;
package emu.grasscutter.data.excels;
import java.util.HashMap;
import java.util.Map;
......@@ -10,27 +10,27 @@ import emu.grasscutter.data.common.CurveInfo;
@ResourceType(name = "AvatarCurveExcelConfigData.json")
public class AvatarCurveData extends GameResource {
private int Level;
private CurveInfo[] CurveInfos;
private int level;
private CurveInfo[] curveInfos;
private Map<String, Float> curveInfos;
private Map<String, Float> curveInfoMap;
@Override
public int getId() {
return this.Level;
return this.level;
}
public int getLevel() {
return Level;
return level;
}
public Map<String, Float> getCurveInfos() {
return curveInfos;
return curveInfoMap;
}
@Override
public void onLoad() {
this.curveInfos = new HashMap<>();
Stream.of(this.CurveInfos).forEach(info -> this.curveInfos.put(info.getType(), info.getValue()));
this.curveInfoMap = new HashMap<>();
Stream.of(this.curveInfos).forEach(info -> this.curveInfoMap.put(info.getType(), info.getValue()));
}
}
src/main/java/emu/grasscutter/data/def/AvatarData.java → src/main/java/emu/grasscutter/data/excels/AvatarData.java
View file @ a8293102
package emu.grasscutter.data.def;
package emu.grasscutter.data.excels;
import java.util.List;
......@@ -6,9 +6,10 @@ import emu.grasscutter.data.GameData;
import emu.grasscutter.data.GameResource;
import emu.grasscutter.data.ResourceType;
import emu.grasscutter.data.ResourceType.LoadPriority;
import emu.grasscutter.data.binout.AbilityEmbryoEntry;
import emu.grasscutter.data.common.PropGrowCurve;
import emu.grasscutter.data.custom.AbilityEmbryoEntry;
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;
......@@ -17,37 +18,35 @@ import it.unimi.dsi.fastutil.ints.IntList;
@ResourceType(name = "AvatarExcelConfigData.json", loadPriority = LoadPriority.LOW)
public class AvatarData extends GameResource {
private String iconName;
private String bodyType;
private String qualityType;
private int chargeEfficiency;
private int initialWeapon;
private WeaponType weaponType;
private String imageName;
private int avatarPromoteId;
private String cutsceneShow;
private int skillDepotId;
private int staminaRecoverSpeed;
private List<String> candSkillDepotIds;
private String avatarIdentityType;
private List<Integer> avatarPromoteRewardLevelList;
private List<Integer> avatarPromoteRewardIdList;
private long nameTextMapHash;
private float hpBase;
private float attackBase;
private float defenseBase;
private float critical;
private float criticalHurt;
private List<PropGrowCurve> propGrowCurves;
private int id;
// Transient
private String name;
private String IconName;
private String BodyType;
private String QualityType;
private int ChargeEfficiency;
private int InitialWeapon;
private String WeaponType;
private String ImageName;
private int AvatarPromoteId;
private String CutsceneShow;
private int SkillDepotId;
private int StaminaRecoverSpeed;
private List<String> CandSkillDepotIds;
private long DescTextMapHash;
private String AvatarIdentityType;
private List<Integer> AvatarPromoteRewardLevelList;
private List<Integer> AvatarPromoteRewardIdList;
private int FeatureTagGroupID;
private long NameTextMapHash;
private long GachaImageNameHashSuffix;
private long InfoDescTextMapHash;
private float HpBase;
private float AttackBase;
private float DefenseBase;
private float Critical;
private float CriticalHurt;
private List<PropGrowCurve> PropGrowCurves;
private int Id;
private Int2ObjectMap<String> growthCurveMap;
private float[] hpGrowthCurve;
......@@ -62,7 +61,7 @@ public class AvatarData extends GameResource {
@Override
public int getId(){
return this.Id;
return this.id;
}
public String getName() {
......@@ -70,107 +69,91 @@ public class AvatarData extends GameResource {
}
public String getBodyType(){
return this.BodyType;
return this.bodyType;
}
public String getQualityType(){
return this.QualityType;
return this.qualityType;
}
public int getChargeEfficiency(){
return this.ChargeEfficiency;
return this.chargeEfficiency;
}
public int getInitialWeapon(){
return this.InitialWeapon;
return this.initialWeapon;
}
public String getWeaponType(){
return this.WeaponType;
public WeaponType getWeaponType(){
return this.weaponType;
}
public String getImageName(){
return this.ImageName;
return this.imageName;
}
public int getAvatarPromoteId(){
return this.AvatarPromoteId;
}
public long getGachaImageNameHashSuffix(){
return this.GachaImageNameHashSuffix;
return this.avatarPromoteId;
}
public String getCutsceneShow(){
return this.CutsceneShow;
return this.cutsceneShow;
}
public int getSkillDepotId(){
return this.SkillDepotId;
return this.skillDepotId;
}
public int getStaminaRecoverSpeed(){
return this.StaminaRecoverSpeed;
return this.staminaRecoverSpeed;
}
public List<String> getCandSkillDepotIds(){
return this.CandSkillDepotIds;
}
public long getDescTextMapHash(){
return this.DescTextMapHash;
return this.candSkillDepotIds;
}
public String getAvatarIdentityType(){
return this.AvatarIdentityType;
return this.avatarIdentityType;
}
public List<Integer> getAvatarPromoteRewardLevelList(){
return this.AvatarPromoteRewardLevelList;
return this.avatarPromoteRewardLevelList;
}
public List<Integer> getAvatarPromoteRewardIdList(){
return this.AvatarPromoteRewardIdList;
}
public int getFeatureTagGroupID(){
return this.FeatureTagGroupID;
}
public long getInfoDescTextMapHash(){
return this.InfoDescTextMapHash;
return this.avatarPromoteRewardIdList;
}
public float getBaseHp(int level){
try {
return this.HpBase * this.hpGrowthCurve[level - 1];
return this.hpBase * this.hpGrowthCurve[level - 1];
} catch (Exception e) {
return this.HpBase;
return this.hpBase;
}
}
public float getBaseAttack(int level){
try {
return this.AttackBase * this.attackGrowthCurve[level - 1];
return this.attackBase * this.attackGrowthCurve[level - 1];
} catch (Exception e) {
return this.AttackBase;
return this.attackBase;
}
}
public float getBaseDefense(int level){
try {
return this.DefenseBase * this.defenseGrowthCurve[level - 1];
return this.defenseBase * this.defenseGrowthCurve[level - 1];
} catch (Exception e) {
return this.DefenseBase;
return this.defenseBase;
}
}
public float getBaseCritical(){
return this.Critical;
return this.critical;
}
public float getBaseCriticalHurt(){
return this.CriticalHurt;
return this.criticalHurt;
}
public float getGrowthCurveById(int level, FightProperty prop) {
......@@ -186,7 +169,7 @@ public class AvatarData extends GameResource {
}
public long getNameTextMapHash(){
return this.NameTextMapHash;
return this.nameTextMapHash;
}
public AvatarSkillDepotData getSkillDepot() {
......@@ -211,13 +194,13 @@ public class AvatarData extends GameResource {
@Override
public void onLoad() {
this.skillDepot = GameData.getAvatarSkillDepotDataMap().get(this.SkillDepotId);
this.skillDepot = GameData.getAvatarSkillDepotDataMap().get(this.skillDepotId);
// Get fetters from GameData
this.fetters = GameData.getFetterDataEntries().get(this.Id);
this.fetters = GameData.getFetterDataEntries().get(this.id);
if (GameData.getFetterCharacterCardDataMap().get(this.Id) != null) {
this.nameCardRewardId = GameData.getFetterCharacterCardDataMap().get(this.Id).getRewardId();
if (GameData.getFetterCharacterCardDataMap().get(this.id) != null) {
this.nameCardRewardId = GameData.getFetterCharacterCardDataMap().get(this.id).getRewardId();
}
if (GameData.getRewardDataMap().get(this.nameCardRewardId) != null) {
......@@ -230,7 +213,7 @@ public class AvatarData extends GameResource {
this.defenseGrowthCurve = new float[size];
for (AvatarCurveData curveData : GameData.getAvatarCurveDataMap().values()) {
int level = curveData.getLevel() - 1;
for (PropGrowCurve growCurve : this.PropGrowCurves) {
for (PropGrowCurve growCurve : this.propGrowCurves) {
FightProperty prop = FightProperty.getPropByName(growCurve.getType());
switch (prop) {
case FIGHT_PROP_BASE_HP:
......@@ -256,7 +239,7 @@ public class AvatarData extends GameResource {
*/
// Cache abilities
String[] split = this.IconName.split("_");
String[] split = this.iconName.split("_");
if (split.length > 0) {
this.name = split[split.length - 1];
......
src/main/java/emu/grasscutter/data/def/AvatarFetterLevelData.java → src/main/java/emu/grasscutter/data/excels/AvatarFetterLevelData.java
View file @ a8293102
package emu.grasscutter.data.def;
package emu.grasscutter.data.excels;
import emu.grasscutter.data.GameResource;
import emu.grasscutter.data.ResourceType;
@ResourceType(name = "AvatarFettersLevelExcelConfigData.json")
public class AvatarFetterLevelData extends GameResource {
private int FetterLevel;
private int NeedExp;
private int fetterLevel;
private int needExp;
@Override
public int getId() {
return this.FetterLevel;
return this.fetterLevel;
}
public int getLevel() {
return FetterLevel;
return fetterLevel;
}
public int getExp() {
return NeedExp;
return needExp;
}
}
src/main/java/emu/grasscutter/data/def/AvatarFlycloakData.java → src/main/java/emu/grasscutter/data/excels/AvatarFlycloakData.java
View file @ a8293102
package emu.grasscutter.data.def;
package emu.grasscutter.data.excels;
import emu.grasscutter.data.GameResource;
import emu.grasscutter.data.ResourceType;
@ResourceType(name = "AvatarFlycloakExcelConfigData.json")
public class AvatarFlycloakData extends GameResource {
private int FlycloakId;
private long NameTextMapHash;
private int flycloakId;
private long nameTextMapHash;
@Override
public int getId() {
return this.FlycloakId;
return this.flycloakId;
}
public long getNameTextMapHash() {
return NameTextMapHash;
return nameTextMapHash;
}
@Override
......
src/main/java/emu/grasscutter/data/def/AvatarLevelData.java → src/main/java/emu/grasscutter/data/excels/AvatarLevelData.java
View file @ a8293102
package emu.grasscutter.data.def;
package emu.grasscutter.data.excels;
import emu.grasscutter.data.GameResource;
import emu.grasscutter.data.ResourceType;
@ResourceType(name = "AvatarLevelExcelConfigData.json")
public class AvatarLevelData extends GameResource {
private int Level;
private int Exp;
private int level;
private int exp;
@Override
public int getId() {
return this.Level;
return this.level;
}
public int getLevel() {
return Level;
return level;
}
public int getExp() {
return Exp;
return exp;
}
}
src/main/java/emu/grasscutter/data/def/AvatarPromoteData.java → src/main/java/emu/grasscutter/data/excels/AvatarPromoteData.java
View file @ a8293102
package emu.grasscutter.data.def;
package emu.grasscutter.data.excels;
import java.util.ArrayList;
import emu.grasscutter.data.GameResource;
......@@ -9,45 +9,45 @@ import emu.grasscutter.data.common.ItemParamData;
@ResourceType(name = "AvatarPromoteExcelConfigData.json")
public class AvatarPromoteData extends GameResource {
private int AvatarPromoteId;
private int PromoteLevel;
private int ScoinCost;
private ItemParamData[] CostItems;
private int UnlockMaxLevel;
private FightPropData[] AddProps;
private int RequiredPlayerLevel;
private int avatarPromoteId;
private int promoteLevel;
private int scoinCost;
private ItemParamData[] costItems;
private int unlockMaxLevel;
private FightPropData[] addProps;
private int requiredPlayerLevel;
@Override
public int getId() {
return (AvatarPromoteId << 8) + PromoteLevel;
return (avatarPromoteId << 8) + promoteLevel;
}
public int getAvatarPromoteId() {
return AvatarPromoteId;
return avatarPromoteId;
}
public int getPromoteLevel() {
return PromoteLevel;
return promoteLevel;
}
public ItemParamData[] getCostItems() {
return CostItems;
return costItems;
}
public int getCoinCost() {
return ScoinCost;
return scoinCost;
}
public FightPropData[] getAddProps() {
return AddProps;
return addProps;
}
public int getUnlockMaxLevel() {
return UnlockMaxLevel;
return unlockMaxLevel;
}
public int getRequiredPlayerLevel() {
return RequiredPlayerLevel;
return requiredPlayerLevel;
}
@Override
......@@ -60,7 +60,7 @@ public class AvatarPromoteData extends GameResource {
}
trim.add(itemParam);
}
this.CostItems = trim.toArray(new ItemParamData[trim.size()]);
this.costItems = trim.toArray(new ItemParamData[trim.size()]);
// Trim fight prop data (just in case)
ArrayList<FightPropData> parsed = new ArrayList<>(getAddProps().length);
for (FightPropData prop : getAddProps()) {
......@@ -69,6 +69,6 @@ public class AvatarPromoteData extends GameResource {
parsed.add(prop);
}
}
this.AddProps = parsed.toArray(new FightPropData[parsed.size()]);
this.addProps = parsed.toArray(new FightPropData[parsed.size()]);
}
}
src/main/java/emu/grasscutter/data/def/AvatarSkillData.java → src/main/java/emu/grasscutter/data/excels/AvatarSkillData.java
View file @ a8293102
package emu.grasscutter.data.def;
package emu.grasscutter.data.excels;
import java.util.List;
import emu.grasscutter.data.GameResource;
import emu.grasscutter.data.ResourceType;
import emu.grasscutter.data.ResourceType.LoadPriority;
import emu.grasscutter.game.props.ElementType;
@ResourceType(name = "AvatarSkillExcelConfigData.json", loadPriority = LoadPriority.HIGHEST)
public class AvatarSkillData extends GameResource {
private int Id;
private float CdTime;
private int CostElemVal;
private int MaxChargeNum;
private int TriggerID;
private boolean IsAttackCameraLock;
private int ProudSkillGroupId;
private String CostElemType;
private List<Float> LockWeightParams;
private long NameTextMapHash;
private String AbilityName;
private String LockShape;
private String GlobalValueKey;
private int id;
private float cdTime;
private int costElemVal;
private int maxChargeNum;
private int triggerID;
private boolean isAttackCameraLock;
private int proudSkillGroupId;
private ElementType costElemType;
private List<Float> lockWeightParams;
private long nameTextMapHash;
private String abilityName;
private String lockShape;
private String globalValueKey;
@Override
public int getId(){
return this.Id;
return this.id;
}
public float getCdTime() {
return CdTime;
return cdTime;
}
public int getCostElemVal() {
return CostElemVal;
return costElemVal;
}
public int getMaxChargeNum() {
return MaxChargeNum;
return maxChargeNum;
}
public int getTriggerID() {
return TriggerID;
return triggerID;
}
public boolean isIsAttackCameraLock() {
return IsAttackCameraLock;
return isAttackCameraLock;
}
public int getProudSkillGroupId() {
return ProudSkillGroupId;
return proudSkillGroupId;
}
public String getCostElemType() {
return CostElemType;
public ElementType getCostElemType() {
return costElemType;
}
public List<Float> getLockWeightParams() {
return LockWeightParams;
return lockWeightParams;
}
public long getNameTextMapHash() {
return NameTextMapHash;
return nameTextMapHash;
}
public String getAbilityName() {
return AbilityName;
return abilityName;
}
public String getLockShape() {
return LockShape;
return lockShape;
}
public String getGlobalValueKey() {
return GlobalValueKey;
return globalValueKey;
}
@Override
......
src/main/java/emu/grasscutter/data/def/AvatarSkillDepotData.java → src/main/java/emu/grasscutter/data/excels/AvatarSkillDepotData.java
View file @ a8293102
package emu.grasscutter.data.def;
package emu.grasscutter.data.excels;
import java.util.List;
......@@ -6,7 +6,7 @@ import emu.grasscutter.data.GameData;
import emu.grasscutter.data.GameResource;
import emu.grasscutter.data.ResourceType;
import emu.grasscutter.data.ResourceType.LoadPriority;
import emu.grasscutter.data.custom.AbilityEmbryoEntry;
import emu.grasscutter.data.binout.AbilityEmbryoEntry;
import emu.grasscutter.game.props.ElementType;
import emu.grasscutter.utils.Utils;
import it.unimi.dsi.fastutil.ints.IntArrayList;
......@@ -15,62 +15,63 @@ import it.unimi.dsi.fastutil.ints.IntList;
@ResourceType(name = "AvatarSkillDepotExcelConfigData.json", loadPriority = LoadPriority.HIGH)
public class AvatarSkillDepotData extends GameResource {
private int Id;
private int EnergySkill;
private int AttackModeSkill;
private int id;
private int energySkill;
private int attackModeSkill;
private List<Integer> Skills;
private List<Integer> SubSkills;
private List<String> ExtraAbilities;
private List<Integer> Talents;
private List<InherentProudSkillOpens> InherentProudSkillOpens;
private List<Integer> skills;
private List<Integer> subSkills;
private List<String> extraAbilities;
private List<Integer> talents;
private List<InherentProudSkillOpens> inherentProudSkillOpens;
private String TalentStarName;
private String SkillDepotAbilityGroup;
private String talentStarName;
private String skillDepotAbilityGroup;
// Transient
private AvatarSkillData energySkillData;
private ElementType elementType;
private IntList abilities;
@Override
public int getId(){
return this.Id;
return this.id;
}
public int getEnergySkill(){
return this.EnergySkill;
return this.energySkill;
}
public List<Integer> getSkills(){
return this.Skills;
return this.skills;
}
public List<Integer> getSubSkills(){
return this.SubSkills;
return this.subSkills;
}
public int getAttackModeSkill(){
return this.AttackModeSkill;
return this.attackModeSkill;
}
public List<String> getExtraAbilities(){
return this.ExtraAbilities;
return this.extraAbilities;
}
public List<Integer> getTalents(){
return this.Talents;
return this.talents;
}
public String getTalentStarName(){
return this.TalentStarName;
return this.talentStarName;
}
public List<InherentProudSkillOpens> getInherentProudSkillOpens(){
return this.InherentProudSkillOpens;
return this.inherentProudSkillOpens;
}
public String getSkillDepotAbilityGroup(){
return this.SkillDepotAbilityGroup;
return this.skillDepotAbilityGroup;
}
public AvatarSkillData getEnergySkillData() {
......@@ -94,30 +95,24 @@ public class AvatarSkillDepotData extends GameResource {
@Override
public void onLoad() {
this.energySkillData = GameData.getAvatarSkillDataMap().get(this.EnergySkill);
this.energySkillData = GameData.getAvatarSkillDataMap().get(this.energySkill);
if (getEnergySkillData() != null) {
this.elementType = ElementType.getTypeByName(getEnergySkillData().getCostElemType());
this.elementType = getEnergySkillData().getCostElemType();
} else {
this.elementType = ElementType.None;
}
}
public static class InherentProudSkillOpens {
private int ProudSkillGroupId;
private int proudSkillGroupId;
private int needAvatarPromoteLevel;
private int NeedAvatarPromoteLevel;
public void setProudSkillGroupId(int ProudSkillGroupId){
this.ProudSkillGroupId = ProudSkillGroupId;
}
public int getProudSkillGroupId(){
return this.ProudSkillGroupId;
}
public void setNeedAvatarPromoteLevel(int NeedAvatarPromoteLevel){
this.NeedAvatarPromoteLevel = NeedAvatarPromoteLevel;
return this.proudSkillGroupId;
}
public int getNeedAvatarPromoteLevel(){
return this.NeedAvatarPromoteLevel;
return this.needAvatarPromoteLevel;
}
}
}
src/main/java/emu/grasscutter/data/def/AvatarTalentData.java → src/main/java/emu/grasscutter/data/excels/AvatarTalentData.java
View file @ a8293102
package emu.grasscutter.data.def;
package emu.grasscutter.data.excels;
import java.util.ArrayList;
import emu.grasscutter.data.GameResource;
......@@ -8,51 +8,51 @@ import emu.grasscutter.data.common.FightPropData;
@ResourceType(name = "AvatarTalentExcelConfigData.json", loadPriority = LoadPriority.HIGHEST)
public class AvatarTalentData extends GameResource {
private int TalentId;
private int PrevTalent;
private long NameTextMapHash;
private String Icon;
private int MainCostItemId;
private int MainCostItemCount;
private String OpenConfig;
private FightPropData[] AddProps;
private float[] ParamList;
private int talentId;
private int prevTalent;
private long nameTextMapHash;
private String icon;
private int mainCostItemId;
private int mainCostItemCount;
private String openConfig;
private FightPropData[] addProps;
private float[] paramList;
@Override
public int getId(){
return this.TalentId;
return this.talentId;
}
public int PrevTalent() {
return PrevTalent;
return prevTalent;
}
public long getNameTextMapHash() {
return NameTextMapHash;
return nameTextMapHash;
}
public String getIcon() {
return Icon;
return icon;
}
public int getMainCostItemId() {
return MainCostItemId;
return mainCostItemId;
}
public int getMainCostItemCount() {
return MainCostItemCount;
return mainCostItemCount;
}
public String getOpenConfig() {
return OpenConfig;
return openConfig;
}
public FightPropData[] getAddProps() {
return AddProps;
return addProps;
}
public float[] getParamList() {
return ParamList;
return paramList;
}
@Override
......@@ -64,6 +64,6 @@ public class AvatarTalentData extends GameResource {
parsed.add(prop);
}
}
this.AddProps = parsed.toArray(new FightPropData[parsed.size()]);
this.addProps = parsed.toArray(new FightPropData[parsed.size()]);
}
}
src/main/java/emu/grasscutter/data/excels/CodexAnimalData.java 0 → 100644
View file @ a8293102
package emu.grasscutter.data.excels;
import emu.grasscutter.data.GameResource;
import emu.grasscutter.data.ResourceType;
@ResourceType(name = {"AnimalCodexExcelConfigData.json"})
public class CodexAnimalData extends GameResource {
private int Id;
private String type;
private int describeId;
private int sortOrder;
private CodexAnimalUnlockCondition OCCLHPBCDGL;
@Override
public int getId() {
return Id;
}
public String getType() {
return type;
}
public int getDescribeId() {
return describeId;
}
public int getSortOrder() {
return sortOrder;
}
public CodexAnimalUnlockCondition getUnlockCondition() {
return OCCLHPBCDGL;
}
public enum CodexAnimalUnlockCondition {
CODEX_COUNT_TYPE_KILL,
CODEX_COUNT_TYPE_CAPTURE
}
}
src/main/java/emu/grasscutter/data/excels/CodexMaterialData.java 0 → 100644
View file @ a8293102
package emu.grasscutter.data.excels;
import emu.grasscutter.data.GameData;
import emu.grasscutter.data.GameResource;
import emu.grasscutter.data.ResourceType;
@ResourceType(name = {"MaterialCodexExcelConfigData.json"})
public class CodexMaterialData extends GameResource {
private int Id;
private int materialId;
private int sortOrder;
public int getSortOrder() {
return sortOrder;
}
public int getMaterialId() {
return materialId;
}
public int getId() {
return Id;
}
@Override
public void onLoad() {
GameData.getCodexMaterialDataIdMap().put(this.getMaterialId(), this);
}
}
src/main/java/emu/grasscutter/data/excels/CodexQuestData.java 0 → 100644
View file @ a8293102
package emu.grasscutter.data.excels;
import emu.grasscutter.data.GameData;
import emu.grasscutter.data.GameResource;
import emu.grasscutter.data.ResourceType;
@ResourceType(name = {"QuestCodexExcelConfigData.json"})
public class CodexQuestData extends GameResource {
private int Id;
private int parentQuestId;
private int chapterId;
private int sortOrder;
private boolean isDisuse;
public int getParentQuestId() {
return parentQuestId;
}
public int getId() {
return Id;
}
public int getChapterId() {
return chapterId;
}
public int getSortOrder() {
return sortOrder;
}
public boolean getIsDisuse() {
return isDisuse;
}
@Override
public void onLoad() {
if(!this.getIsDisuse()) {
GameData.getCodexQuestDataIdMap().put(this.getParentQuestId(), this);
}
}
}
src/main/java/emu/grasscutter/data/excels/CodexReliquaryData.java 0 → 100644
View file @ a8293102
package emu.grasscutter.data.excels;
import emu.grasscutter.data.GameData;
import emu.grasscutter.data.GameResource;
import emu.grasscutter.data.ResourceType;
@ResourceType(name = {"ReliquaryCodexExcelConfigData.json"})
public class CodexReliquaryData extends GameResource {
private int Id;
private int suitId;
private int level;
private int cupId;
private int leatherId;
private int capId;
private int flowerId;
private int sandId;
private int sortOrder;
public int getSortOrder() {
return sortOrder;
}
public int getId() {
return Id;
}
public int getSuitId() {
return suitId;
}
public int getLevel() {
return level;
}
public int getCupId() {
return cupId;
}
public int getLeatherId() {
return leatherId;
}
public int getCapId() {
return capId;
}
public int getFlowerId() {
return flowerId;
}
public int getSandId() {
return sandId;
}
@Override
public void onLoad() {
GameData.getcodexReliquaryArrayList().add(this);
GameData.getcodexReliquaryIdMap().put(getSuitId(), this);
}
}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment