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
Hide whitespace changes
Inline Side-by-side
src/main/java/emu/grasscutter/data/excels/CodexWeaponData.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 = {"WeaponCodexExcelConfigData.json"})
public class CodexWeaponData extends GameResource {
private int Id;
private int weaponId;
private int sortOrder;
public int getSortOrder() {
return sortOrder;
}
public int getWeaponId() {
return weaponId;
}
public int getId() {
return Id;
}
@Override
public void onLoad() {
GameData.getCodexWeaponDataIdMap().put(this.getWeaponId(), this);
}
}
src/main/java/emu/grasscutter/data/excels/CombineData.java 0 → 100644
View file @ a8293102
package emu.grasscutter.data.excels;
import emu.grasscutter.data.GameResource;
import emu.grasscutter.data.ResourceType;
import emu.grasscutter.data.common.ItemParamData;
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<ItemParamData> randomItems;
private List<ItemParamData> materialItems;
private String recipeType;
@Override
public int getId() {
return this.combineId;
}
@Override
public void onLoad() {
super.onLoad();
// clean data
randomItems = randomItems.stream().filter(item -> item.getId() > 0).collect(Collectors.toList());
materialItems = materialItems.stream().filter(item -> item.getId() > 0).collect(Collectors.toList());
}
public int getCombineId() {
return combineId;
}
public int getPlayerLevel() {
return playerLevel;
}
public boolean isDefaultShow() {
return isDefaultShow;
}
public int getCombineType() {
return combineType;
}
public int getSubCombineType() {
return subCombineType;
}
public int getResultItemId() {
return resultItemId;
}
public int getResultItemCount() {
return resultItemCount;
}
public int getScoinCost() {
return scoinCost;
}
public List<ItemParamData> getRandomItems() {
return randomItems;
}
public List<ItemParamData> getMaterialItems() {
return materialItems;
}
public String getRecipeType() {
return recipeType;
}
}
src/main/java/emu/grasscutter/data/def/DailyDungeonData.java → src/main/java/emu/grasscutter/data/excels/DailyDungeonData.java
View file @ a8293102
package emu.grasscutter.data.def;
package emu.grasscutter.data.excels;
import java.util.Calendar;
......@@ -12,14 +12,14 @@ import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
@ResourceType(name = "DailyDungeonConfigData.json")
public class DailyDungeonData extends GameResource {
private int Id;
private int[] Monday;
private int[] Tuesday;
private int[] Wednesday;
private int[] Thursday;
private int[] Friday;
private int[] Saturday;
private int[] Sunday;
private int id;
private int[] monday;
private int[] tuesday;
private int[] wednesday;
private int[] thursday;
private int[] friday;
private int[] saturday;
private int[] sunday;
private static final int[] empty = new int[0];
private final Int2ObjectMap<int[]> map;
......@@ -30,7 +30,7 @@ public class DailyDungeonData extends GameResource {
@Override
public int getId() {
return this.Id;
return this.id;
}
public int[] getDungeonsByDay(int day) {
......@@ -39,12 +39,12 @@ public class DailyDungeonData extends GameResource {
@Override
public void onLoad() {
map.put(Calendar.MONDAY, Monday);
map.put(Calendar.TUESDAY, Tuesday);
map.put(Calendar.WEDNESDAY, Wednesday);
map.put(Calendar.THURSDAY, Thursday);
map.put(Calendar.FRIDAY, Friday);
map.put(Calendar.SATURDAY, Saturday);
map.put(Calendar.SUNDAY, Sunday);
map.put(Calendar.MONDAY, monday);
map.put(Calendar.TUESDAY, tuesday);
map.put(Calendar.WEDNESDAY, wednesday);
map.put(Calendar.THURSDAY, thursday);
map.put(Calendar.FRIDAY, friday);
map.put(Calendar.SATURDAY, saturday);
map.put(Calendar.SUNDAY, sunday);
}
}
src/main/java/emu/grasscutter/data/def/DungeonData.java → src/main/java/emu/grasscutter/data/excels/DungeonData.java
View file @ a8293102
package emu.grasscutter.data.def;
package emu.grasscutter.data.excels;
import emu.grasscutter.data.GameData;
import emu.grasscutter.data.GameResource;
......@@ -8,25 +8,25 @@ import emu.grasscutter.game.props.SceneType;
@ResourceType(name = "DungeonExcelConfigData.json")
public class DungeonData extends GameResource {
private int Id;
private int SceneId;
private int ShowLevel;
private int PassRewardPreviewID;
private String InvolveType; // TODO enum
private int id;
private int sceneId;
private int showLevel;
private int passRewardPreviewID;
private String involveType; // TODO enum
private RewardPreviewData previewData;
@Override
public int getId() {
return this.Id;
return this.id;
}
public int getSceneId() {
return SceneId;
return sceneId;
}
public int getShowLevel() {
return ShowLevel;
return showLevel;
}
public RewardPreviewData getRewardPreview() {
......@@ -35,8 +35,8 @@ public class DungeonData extends GameResource {
@Override
public void onLoad() {
if (this.PassRewardPreviewID > 0) {
this.previewData = GameData.getRewardPreviewDataMap().get(this.PassRewardPreviewID);
if (this.passRewardPreviewID > 0) {
this.previewData = GameData.getRewardPreviewDataMap().get(this.passRewardPreviewID);
}
}
}
src/main/java/emu/grasscutter/data/excels/EnvAnimalGatherConfigData.java 0 → 100644
View file @ a8293102
package emu.grasscutter.data.excels;
import java.util.List;
import emu.grasscutter.data.GameResource;
import emu.grasscutter.data.ResourceType;
@ResourceType(name = "EnvAnimalGatherExcelConfigData.json", loadPriority = ResourceType.LoadPriority.LOW)
public class EnvAnimalGatherConfigData extends GameResource {
private int animalId;
private String entityType;
private List<GatherItem> gatherItemId;
private String excludeWeathers;
private int aliveTime;
private int escapeTime;
private int escapeRadius;
@Override
public int getId() {
return animalId;
}
public int getAnimalId(){
return animalId;
}
public String getEntityType(){
return entityType;
}
public GatherItem gatherItem(){
return gatherItemId.get(0);
}
public static class GatherItem{
private int id;
private int count;
public int getId(){
return id;
}
public int getCount(){
return count;
}
}
}
src/main/java/emu/grasscutter/data/def/EquipAffixData.java → src/main/java/emu/grasscutter/data/excels/EquipAffixData.java
View file @ a8293102
package emu.grasscutter.data.def;
package emu.grasscutter.data.excels;
import java.util.ArrayList;
import emu.grasscutter.data.GameResource;
......@@ -8,41 +8,41 @@ import emu.grasscutter.data.common.FightPropData;
@ResourceType(name = "EquipAffixExcelConfigData.json")
public class EquipAffixData extends GameResource {
private int AffixId;
private int Id;
private int Level;
private long NameTextMapHash;
private String OpenConfig;
private FightPropData[] AddProps;
private float[] ParamList;
private int affixId;
private int id;
private int level;
private long nameTextMapHash;
private String openConfig;
private FightPropData[] addProps;
private float[] paramList;
@Override
public int getId() {
return AffixId;
return affixId;
}
public int getMainId() {
return Id;
return id;
}
public int getLevel() {
return Level;
return level;
}
public long getNameTextMapHash() {
return NameTextMapHash;
return nameTextMapHash;
}
public String getOpenConfig() {
return OpenConfig;
return openConfig;
}
public FightPropData[] getAddProps() {
return AddProps;
return addProps;
}
public float[] getParamList() {
return ParamList;
return paramList;
}
@Override
......@@ -54,6 +54,6 @@ public class EquipAffixData 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/FetterCharacterCardData.java → src/main/java/emu/grasscutter/data/excels/FetterCharacterCardData.java
View file @ a8293102
package emu.grasscutter.data.def;
import emu.grasscutter.data.GameResource;
import emu.grasscutter.data.ResourceType;
import emu.grasscutter.data.ResourceType.LoadPriority;
@ResourceType(name = "FetterCharacterCardExcelConfigData.json", loadPriority = LoadPriority.HIGHEST)
public class FetterCharacterCardData extends GameResource {
private int AvatarId;
private int RewardId;
@Override
public int getId() {
return AvatarId;
}
public int getRewardId() {
return RewardId;
}
@Override
public void onLoad() {
}
}
package emu.grasscutter.data.excels;
import emu.grasscutter.data.GameResource;
import emu.grasscutter.data.ResourceType;
import emu.grasscutter.data.ResourceType.LoadPriority;
@ResourceType(name = "FetterCharacterCardExcelConfigData.json", loadPriority = LoadPriority.HIGHEST)
public class FetterCharacterCardData extends GameResource {
private int avatarId;
private int rewardId;
@Override
public int getId() {
return avatarId;
}
public int getRewardId() {
return rewardId;
}
@Override
public void onLoad() {
}
}
src/main/java/emu/grasscutter/data/def/FetterData.java → src/main/java/emu/grasscutter/data/excels/FetterData.java
View file @ a8293102
package emu.grasscutter.data.def;
import java.util.List;
import emu.grasscutter.data.GameResource;
import emu.grasscutter.data.ResourceType;
import emu.grasscutter.data.ResourceType.LoadPriority;
import emu.grasscutter.data.common.OpenCondData;
@ResourceType(name = {"FetterInfoExcelConfigData.json", "FettersExcelConfigData.json", "FetterStoryExcelConfigData.json", "PhotographExpressionExcelConfigData.json", "PhotographPosenameExcelConfigData.json"}, loadPriority = LoadPriority.HIGHEST)
public class FetterData extends GameResource {
private int AvatarId;
private int FetterId;
private List<OpenCondData> OpenCond;
@Override
public int getId() {
return FetterId;
}
public int getAvatarId() {
return AvatarId;
}
public List<OpenCondData> getOpenConds() {
return OpenCond;
}
@Override
public void onLoad() {
}
}
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.data.common.OpenCondData;
@ResourceType(name = {"FetterInfoExcelConfigData.json", "FettersExcelConfigData.json", "FetterStoryExcelConfigData.json", "PhotographExpressionExcelConfigData.json", "PhotographPosenameExcelConfigData.json"}, loadPriority = LoadPriority.HIGHEST)
public class FetterData extends GameResource {
private int avatarId;
private int fetterId;
private List<OpenCondData> openCond;
@Override
public int getId() {
return fetterId;
}
public int getAvatarId() {
return avatarId;
}
public List<OpenCondData> getOpenConds() {
return openCond;
}
@Override
public void onLoad() {
}
}
src/main/java/emu/grasscutter/data/def/GadgetData.java → src/main/java/emu/grasscutter/data/excels/GadgetData.java
View file @ a8293102
package emu.grasscutter.data.def;
package emu.grasscutter.data.excels;
import emu.grasscutter.data.GameResource;
import emu.grasscutter.data.ResourceType;
......@@ -6,53 +6,53 @@ import emu.grasscutter.game.props.EntityType;
@ResourceType(name = "GadgetExcelConfigData.json")
public class GadgetData extends GameResource {
private int Id;
private int id;
private EntityType Type;
private String JsonName;
private boolean IsInteractive;
private String[] Tags;
private String ItemJsonName;
private String InteeIconName;
private long NameTextMapHash;
private int CampID;
private EntityType type;
private String jsonName;
private boolean isInteractive;
private String[] tags;
private String itemJsonName;
private String inteeIconName;
private long nameTextMapHash;
private int campID;
private String LODPatternName;
@Override
public int getId() {
return this.Id;
return this.id;
}
public EntityType getType() {
return Type;
return type;
}
public String getJsonName() {
return JsonName;
return jsonName;
}
public boolean isInteractive() {
return IsInteractive;
return isInteractive;
}
public String[] getTags() {
return Tags;
return tags;
}
public String getItemJsonName() {
return ItemJsonName;
return itemJsonName;
}
public String getInteeIconName() {
return InteeIconName;
return inteeIconName;
}
public long getNameTextMapHash() {
return NameTextMapHash;
return nameTextMapHash;
}
public int getCampID() {
return CampID;
return campID;
}
public String getLODPatternName() { return LODPatternName; }
......
src/main/java/emu/grasscutter/data/def/ItemData.java → src/main/java/emu/grasscutter/data/excels/ItemData.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.common.ItemUseData;
import emu.grasscutter.game.props.FightProperty;
import it.unimi.dsi.fastutil.ints.IntOpenHashSet;
import it.unimi.dsi.fastutil.ints.IntSet;
......@@ -9,164 +12,170 @@ import it.unimi.dsi.fastutil.ints.IntSet;
@ResourceType(name = {"MaterialExcelConfigData.json", "WeaponExcelConfigData.json", "ReliquaryExcelConfigData.json"})
public class ItemData extends GameResource {
private int Id;
private int StackLimit = 1;
private int MaxUseCount;
private int RankLevel;
private String EffectName;
private int[] SatiationParams;
private int Rank;
private int Weight;
private int GadgetId;
private int[] DestroyReturnMaterial;
private int[] DestroyReturnMaterialCount;
private int id;
private int stackLimit = 1;
private int maxUseCount;
private int rankLevel;
private String effectName;
private int[] satiationParams;
private int rank;
private int weight;
private int gadgetId;
private int[] destroyReturnMaterial;
private int[] destroyReturnMaterialCount;
private List<ItemUseData> itemUse;
// Food
private String FoodQuality;
private String UseTarget;
private String[] UseParam;
private String foodQuality;
private String useTarget;
private String[] iseParam;
// String enums
private String ItemType;
private String MaterialType;
private String EquipType;
private String EffectType;
private String DestroyRule;
private String itemType;
private String materialType;
private String equipType;
private String effectType;
private String destroyRule;
// Relic
private int MainPropDepotId;
private int AppendPropDepotId;
private int AppendPropNum;
private int SetId;
private int[] AddPropLevels;
private int BaseConvExp;
private int MaxLevel;
private int mainPropDepotId;
private int appendPropDepotId;
private int appendPropNum;
private int setId;
private int[] addPropLevels;
private int baseConvExp;
private int maxLevel;
// Weapon
private int WeaponPromoteId;
private int WeaponBaseExp;
private int StoryId;
private int AvatarPromoteId;
private int AwakenMaterial;
private int[] AwakenCosts;
private int[] SkillAffix;
private WeaponProperty[] WeaponProp;
private int weaponPromoteId;
private int weaponBaseExp;
private int storyId;
private int avatarPromoteId;
private int awakenMaterial;
private int[] awakenCosts;
private int[] skillAffix;
private WeaponProperty[] weaponProp;
// Hash
private String Icon;
private long NameTextMapHash;
private String icon;
private long nameTextMapHash;
// Post load
private transient emu.grasscutter.game.inventory.MaterialType materialType;
private transient emu.grasscutter.game.inventory.ItemType itemType;
private transient emu.grasscutter.game.inventory.EquipType equipType;
private transient emu.grasscutter.game.inventory.MaterialType materialEnumType;
private transient emu.grasscutter.game.inventory.ItemType itemEnumType;
private transient emu.grasscutter.game.inventory.EquipType equipEnumType;
private IntSet addPropLevelSet;
@Override
public int getId(){
return this.Id;
return this.id;
}
public String getMaterialTypeString(){
return this.MaterialType;
return this.materialType;
}
public int getStackLimit(){
return this.StackLimit;
return this.stackLimit;
}
public int getMaxUseCount(){
return this.MaxUseCount;
return this.maxUseCount;
}
public String getUseTarget(){
return this.UseTarget;
return this.useTarget;
}
public String[] getUseParam(){
return this.UseParam;
return this.iseParam;
}
public int getRankLevel(){
return this.RankLevel;
return this.rankLevel;
}
public String getFoodQuality(){
return this.FoodQuality;
return this.foodQuality;
}
public String getEffectName(){
return this.EffectName;
return this.effectName;
}
public int[] getSatiationParams(){
return this.SatiationParams;
return this.satiationParams;
}
public int[] getDestroyReturnMaterial(){
return this.DestroyReturnMaterial;
return this.destroyReturnMaterial;
}
public int[] getDestroyReturnMaterialCount(){
return this.DestroyReturnMaterialCount;
return this.destroyReturnMaterialCount;
}
public List<ItemUseData> getItemUse() {
return itemUse;
}
public long getNameTextMapHash(){
return this.NameTextMapHash;
return this.nameTextMapHash;
}
public String getIcon(){
return this.Icon;
return this.icon;
}
public String getItemTypeString(){
return this.ItemType;
return this.itemType;
}
public int getRank(){
return this.Rank;
return this.rank;
}
public int getGadgetId() {
return GadgetId;
return gadgetId;
}
public int getBaseConvExp() {
return BaseConvExp;
return baseConvExp;
}
public int getMainPropDepotId() {
return MainPropDepotId;
return mainPropDepotId;
}
public int getAppendPropDepotId() {
return AppendPropDepotId;
return appendPropDepotId;
}
public int getAppendPropNum() {
return AppendPropNum;
return appendPropNum;
}
public int getSetId() {
return SetId;
return setId;
}
public int getWeaponPromoteId() {
return WeaponPromoteId;
return weaponPromoteId;
}
public int getWeaponBaseExp() {
return WeaponBaseExp;
return weaponBaseExp;
}
public int getAwakenMaterial() {
return AwakenMaterial;
return awakenMaterial;
}
public int[] getAwakenCosts() {
return AwakenCosts;
return awakenCosts;
}
public IntSet getAddPropLevelSet() {
......@@ -174,27 +183,27 @@ public class ItemData extends GameResource {
}
public int[] getSkillAffix() {
return SkillAffix;
return skillAffix;
}
public WeaponProperty[] getWeaponProperties() {
return WeaponProp;
return weaponProp;
}
public int getMaxLevel() {
return MaxLevel;
return maxLevel;
}
public emu.grasscutter.game.inventory.ItemType getItemType() {
return this.itemType;
return this.itemEnumType;
}
public emu.grasscutter.game.inventory.MaterialType getMaterialType() {
return this.materialType;
return this.materialEnumType;
}
public emu.grasscutter.game.inventory.EquipType getEquipType() {
return this.equipType;
return this.equipEnumType;
}
public boolean canAddRelicProp(int level) {
......@@ -202,23 +211,23 @@ public class ItemData extends GameResource {
}
public boolean isEquip() {
return this.itemType == emu.grasscutter.game.inventory.ItemType.ITEM_RELIQUARY || this.itemType == emu.grasscutter.game.inventory.ItemType.ITEM_WEAPON;
return this.itemEnumType == emu.grasscutter.game.inventory.ItemType.ITEM_RELIQUARY || this.itemEnumType == emu.grasscutter.game.inventory.ItemType.ITEM_WEAPON;
}
@Override
public void onLoad() {
this.itemType = emu.grasscutter.game.inventory.ItemType.getTypeByName(getItemTypeString());
this.materialType = emu.grasscutter.game.inventory.MaterialType.getTypeByName(getMaterialTypeString());
this.itemEnumType = emu.grasscutter.game.inventory.ItemType.getTypeByName(getItemTypeString());
this.materialEnumType = emu.grasscutter.game.inventory.MaterialType.getTypeByName(getMaterialTypeString());
if (this.itemType == emu.grasscutter.game.inventory.ItemType.ITEM_RELIQUARY) {
this.equipType = emu.grasscutter.game.inventory.EquipType.getTypeByName(this.EquipType);
if (this.AddPropLevels != null && this.AddPropLevels.length > 0) {
this.addPropLevelSet = new IntOpenHashSet(this.AddPropLevels);
if (this.itemEnumType == emu.grasscutter.game.inventory.ItemType.ITEM_RELIQUARY) {
this.equipEnumType = emu.grasscutter.game.inventory.EquipType.getTypeByName(this.equipType);
if (this.addPropLevels != null && this.addPropLevels.length > 0) {
this.addPropLevelSet = new IntOpenHashSet(this.addPropLevels);
}
} else if (this.itemType == emu.grasscutter.game.inventory.ItemType.ITEM_WEAPON) {
this.equipType = emu.grasscutter.game.inventory.EquipType.EQUIP_WEAPON;
} else if (this.itemEnumType == emu.grasscutter.game.inventory.ItemType.ITEM_WEAPON) {
this.equipEnumType = emu.grasscutter.game.inventory.EquipType.EQUIP_WEAPON;
} else {
this.equipType = emu.grasscutter.game.inventory.EquipType.EQUIP_NONE;
this.equipEnumType = emu.grasscutter.game.inventory.EquipType.EQUIP_NONE;
}
if (this.getWeaponProperties() != null) {
......@@ -230,20 +239,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 +260,7 @@ public class ItemData extends GameResource {
}
public void onLoad() {
this.fightProp = FightProperty.getPropByName(PropType);
this.fightProp = FightProperty.getPropByName(propType);
}
}
......
src/main/java/emu/grasscutter/data/def/MonsterCurveData.java → src/main/java/emu/grasscutter/data/excels/MonsterCurveData.java
View file @ a8293102
package emu.grasscutter.data.def;
package emu.grasscutter.data.excels;
import java.util.HashMap;
import java.util.Map;
......@@ -10,23 +10,23 @@ import emu.grasscutter.data.common.CurveInfo;
@ResourceType(name = "MonsterCurveExcelConfigData.json")
public class MonsterCurveData 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 Level;
return level;
}
public float getMultByProp(String fightProp) {
return curveInfos.getOrDefault(fightProp, 1f);
return curveInfoMap.getOrDefault(fightProp, 1f);
}
@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/MonsterData.java → src/main/java/emu/grasscutter/data/excels/MonsterData.java
View file @ a8293102
package emu.grasscutter.data.def;
package emu.grasscutter.data.excels;
import java.util.List;
......@@ -7,155 +7,157 @@ 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 int id;
private String MonsterName;
private String Type;
private String ServerScript;
private List<Integer> Affix;
private String Ai;
private int[] Equips;
private List<HpDrops> HpDrops;
private int KillDropId;
private String ExcludeWeathers;
private int FeatureTagGroupID;
private int MpPropID;
private String Skin;
private int DescribeId;
private int CombatBGMLevel;
private int EntityBudgetLevel;
private float HpBase;
private float AttackBase;
private float DefenseBase;
private float FireSubHurt;
private float ElecSubHurt;
private float GrassSubHurt;
private float WaterSubHurt;
private float WindSubHurt;
private float RockSubHurt;
private float IceSubHurt;
private float PhysicalSubHurt;
private List<PropGrowCurve> PropGrowCurves;
private long NameTextMapHash;
private int CampID;
private String monsterName;
private MonsterType type;
private String serverScript;
private List<Integer> affix;
private String ai;
private int[] equips;
private List<HpDrops> hpDrops;
private int killDropId;
private String excludeWeathers;
private int featureTagGroupID;
private int mpPropID;
private String skin;
private int describeId;
private int combatBGMLevel;
private int entityBudgetLevel;
private float hpBase;
private float attackBase;
private float defenseBase;
private float fireSubHurt;
private float elecSubHurt;
private float grassSubHurt;
private float waterSubHurt;
private float windSubHurt;
private float rockSubHurt;
private float iceSubHurt;
private float physicalSubHurt;
private List<PropGrowCurve> propGrowCurves;
private long nameTextMapHash;
private int campID;
// Transient
private int weaponId;
private MonsterDescribeData describeData;
@Override
public int getId() {
return this.Id;
return this.id;
}
public String getMonsterName() {
return MonsterName;
return monsterName;
}
public String getType() {
return Type;
public MonsterType getType() {
return type;
}
public String getServerScript() {
return ServerScript;
return serverScript;
}
public List<Integer> getAffix() {
return Affix;
return affix;
}
public String getAi() {
return Ai;
return ai;
}
public int[] getEquips() {
return Equips;
return equips;
}
public List<HpDrops> getHpDrops() {
return HpDrops;
return hpDrops;
}
public int getKillDropId() {
return KillDropId;
return killDropId;
}
public String getExcludeWeathers() {
return ExcludeWeathers;
return excludeWeathers;
}
public int getFeatureTagGroupID() {
return FeatureTagGroupID;
return featureTagGroupID;
}
public int getMpPropID() {
return MpPropID;
return mpPropID;
}
public String getSkin() {
return Skin;
return skin;
}
public int getDescribeId() {
return DescribeId;
return describeId;
}
public int getCombatBGMLevel() {
return CombatBGMLevel;
return combatBGMLevel;
}
public int getEntityBudgetLevel() {
return EntityBudgetLevel;
return entityBudgetLevel;
}
public float getBaseHp() {
return HpBase;
return hpBase;
}
public float getBaseAttack() {
return AttackBase;
return attackBase;
}
public float getBaseDefense() {
return DefenseBase;
return defenseBase;
}
public float getElecSubHurt() {
return ElecSubHurt;
return elecSubHurt;
}
public float getGrassSubHurt() {
return GrassSubHurt;
return grassSubHurt;
}
public float getWaterSubHurt() {
return WaterSubHurt;
return waterSubHurt;
}
public float getWindSubHurt() {
return WindSubHurt;
return windSubHurt;
}
public float getIceSubHurt() {
return IceSubHurt;
return iceSubHurt;
}
public float getPhysicalSubHurt() {
return PhysicalSubHurt;
return physicalSubHurt;
}
public List<PropGrowCurve> getPropGrowCurves() {
return PropGrowCurves;
return propGrowCurves;
}
public long getNameTextMapHash() {
return NameTextMapHash;
return nameTextMapHash;
}
public int getCampID() {
return CampID;
return campID;
}
public MonsterDescribeData getDescribeData() {
......@@ -170,7 +172,7 @@ public class MonsterData extends GameResource {
public void onLoad() {
this.describeData = GameData.getMonsterDescribeDataMap().get(this.getDescribeId());
for (int id : this.Equips) {
for (int id : this.equips) {
if (id == 0) {
continue;
}
......
src/main/java/emu/grasscutter/data/def/MonsterDescribeData.java → src/main/java/emu/grasscutter/data/excels/MonsterDescribeData.java
View file @ a8293102
package emu.grasscutter.data.def;
package emu.grasscutter.data.excels;
import emu.grasscutter.data.GameResource;
import emu.grasscutter.data.ResourceType;
......@@ -6,31 +6,31 @@ import emu.grasscutter.data.ResourceType.LoadPriority;
@ResourceType(name = "MonsterDescribeExcelConfigData.json", loadPriority = LoadPriority.HIGH)
public class MonsterDescribeData extends GameResource {
private int Id;
private long NameTextMapHash;
private int TitleID;
private int SpecialNameLabID;
private String Icon;
private int id;
private long nameTextMapHash;
private int titleID;
private int specialNameLabID;
private String icon;
@Override
public int getId() {
return Id;
return id;
}
public long getNameTextMapHash() {
return NameTextMapHash;
return nameTextMapHash;
}
public int getTitleID() {
return TitleID;
return titleID;
}
public int getSpecialNameLabID() {
return SpecialNameLabID;
return specialNameLabID;
}
public String getIcon() {
return Icon;
return icon;
}
@Override
......
src/main/java/emu/grasscutter/data/def/NpcData.java → src/main/java/emu/grasscutter/data/excels/NpcData.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 = "NpcExcelConfigData.json")
public class NpcData extends GameResource {
private int Id;
private int id;
private String JsonName;
private String Alias;
private String ScriptDataPath;
private String LuaDataPath;
private boolean IsInteractive;
private boolean HasMove;
private String DyePart;
private String BillboardIcon;
private long NameTextMapHash;
private int CampID;
private String jsonName;
private String alias;
private String scriptDataPath;
private String luaDataPath;
private boolean isInteractive;
private boolean hasMove;
private String dyePart;
private String billboardIcon;
private long nameTextMapHash;
private int campID;
@Override
public int getId() {
return this.Id;
return this.id;
}
public String getJsonName() {
return JsonName;
return jsonName;
}
public String getAlias() {
return Alias;
return alias;
}
public String getScriptDataPath() {
return ScriptDataPath;
return scriptDataPath;
}
public String getLuaDataPath() {
return LuaDataPath;
return luaDataPath;
}
public boolean isIsInteractive() {
return IsInteractive;
return isInteractive;
}
public boolean isHasMove() {
return HasMove;
return hasMove;
}
public String getDyePart() {
return DyePart;
return dyePart;
}
public String getBillboardIcon() {
return BillboardIcon;
return billboardIcon;
}
public long getNameTextMapHash() {
return NameTextMapHash;
return nameTextMapHash;
}
public int getCampID() {
return CampID;
return campID;
}
@Override
......
src/main/java/emu/grasscutter/data/def/PlayerLevelData.java → src/main/java/emu/grasscutter/data/excels/PlayerLevelData.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 = "PlayerLevelExcelConfigData.json")
public class PlayerLevelData extends GameResource {
private int Level;
private int Exp;
private int RewardId;
private int UnlockWorldLevel;
private int level;
private int exp;
private int rewardId;
private int unlockWorldLevel;
@Override
public int getId() {
return this.Level;
return this.level;
}
public int getLevel() {
return Level;
return level;
}
public int getExp() {
return Exp;
return exp;
}
public int getRewardId() {
return RewardId;
return rewardId;
}
public int getUnlockWorldLevel() {
return UnlockWorldLevel;
return unlockWorldLevel;
}
}
src/main/java/emu/grasscutter/data/def/ProudSkillData.java → src/main/java/emu/grasscutter/data/excels/ProudSkillData.java
View file @ a8293102
package emu.grasscutter.data.def;
package emu.grasscutter.data.excels;
import java.util.ArrayList;
import java.util.List;
......@@ -11,82 +11,82 @@ import emu.grasscutter.data.common.ItemParamData;
@ResourceType(name = "ProudSkillExcelConfigData.json")
public class ProudSkillData extends GameResource {
private int ProudSkillId;
private int ProudSkillGroupId;
private int Level;
private int CoinCost;
private int BreakLevel;
private int ProudSkillType;
private String OpenConfig;
private List<ItemParamData> CostItems;
private List<String> FilterConds;
private List<String> LifeEffectParams;
private FightPropData[] AddProps;
private float[] ParamList;
private long[] ParamDescList;
private long NameTextMapHash;
private int proudSkillId;
private int proudSkillGroupId;
private int level;
private int coinCost;
private int breakLevel;
private int proudSkillType;
private String openConfig;
private List<ItemParamData> costItems;
private List<String> filterConds;
private List<String> lifeEffectParams;
private FightPropData[] addProps;
private float[] paramList;
private long[] paramDescList;
private long nameTextMapHash;
@Override
public int getId() {
return ProudSkillId;
return proudSkillId;
}
public int getProudSkillGroupId() {
return ProudSkillGroupId;
return proudSkillGroupId;
}
public int getLevel() {
return Level;
return level;
}
public int getCoinCost() {
return CoinCost;
return coinCost;
}
public int getBreakLevel() {
return BreakLevel;
return breakLevel;
}
public int getProudSkillType() {
return ProudSkillType;
return proudSkillType;
}
public String getOpenConfig() {
return OpenConfig;
return openConfig;
}
public List<ItemParamData> getCostItems() {
return CostItems;
return costItems;
}
public List<String> getFilterConds() {
return FilterConds;
return filterConds;
}
public List<String> getLifeEffectParams() {
return LifeEffectParams;
return lifeEffectParams;
}
public FightPropData[] getAddProps() {
return AddProps;
return addProps;
}
public float[] getParamList() {
return ParamList;
return paramList;
}
public long[] getParamDescList() {
return ParamDescList;
return paramDescList;
}
public long getNameTextMapHash() {
return NameTextMapHash;
return nameTextMapHash;
}
@Override
public void onLoad() {
if (this.getOpenConfig() != null & this.getOpenConfig().length() > 0) {
this.OpenConfig = "Avatar_" + this.getOpenConfig();
this.openConfig = "Avatar_" + this.getOpenConfig();
}
// Fight props
ArrayList<FightPropData> parsed = new ArrayList<FightPropData>(getAddProps().length);
......@@ -96,6 +96,6 @@ public class ProudSkillData 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/QuestData.java 0 → 100644
View file @ a8293102
package emu.grasscutter.data.excels;
import java.util.Arrays;
import java.util.List;
import emu.grasscutter.data.GameResource;
import emu.grasscutter.data.ResourceType;
import emu.grasscutter.game.quest.enums.LogicType;
import emu.grasscutter.game.quest.enums.QuestTrigger;
@ResourceType(name = "QuestExcelConfigData.json")
public class QuestData extends GameResource {
private int subId;
private int mainId;
private int order;
private long descTextMapHash;
private boolean finishParent;
private boolean isRewind;
private LogicType acceptCondComb;
private QuestCondition[] acceptConditons;
private LogicType finishCondComb;
private QuestCondition[] finishConditons;
private LogicType failCondComb;
private QuestCondition[] failConditons;
private List<QuestParam> acceptCond;
private List<QuestParam> finishCond;
private List<QuestParam> failCond;
private List<QuestExecParam> beginExec;
private List<QuestExecParam> finishExec;
private List<QuestExecParam> failExec;
public int getId() {
return subId;
}
public int getMainId() {
return mainId;
}
public int getOrder() {
return order;
}
public long getDescTextMapHash() {
return descTextMapHash;
}
public boolean finishParent() {
return finishParent;
}
public boolean isRewind() {
return isRewind;
}
public LogicType getAcceptCondComb() {
return acceptCondComb;
}
public QuestCondition[] getAcceptCond() {
return acceptConditons;
}
public LogicType getFinishCondComb() {
return finishCondComb;
}
public QuestCondition[] getFinishCond() {
return finishConditons;
}
public LogicType getFailCondComb() {
return failCondComb;
}
public QuestCondition[] getFailCond() {
return failConditons;
}
public void onLoad() {
this.acceptConditons = acceptCond.stream().filter(p -> p._type != null).map(QuestCondition::new).toArray(QuestCondition[]::new);
acceptCond = null;
this.finishConditons = finishCond.stream().filter(p -> p._type != null).map(QuestCondition::new).toArray(QuestCondition[]::new);
finishCond = null;
this.failConditons = failCond.stream().filter(p -> p._type != null).map(QuestCondition::new).toArray(QuestCondition[]::new);
failCond = null;
}
public class QuestParam {
QuestTrigger _type;
int[] _param;
String _count;
}
public class QuestExecParam {
QuestTrigger _type;
String[] _param;
String _count;
}
public static class QuestCondition {
private QuestTrigger type;
private int[] param;
private String count;
public QuestCondition(QuestParam param) {
this.type = param._type;
this.param = param._param;
}
public QuestTrigger getType() {
return type;
}
public int[] getParam() {
return param;
}
public String getCount() {
return count;
}
}
}
src/main/java/emu/grasscutter/data/def/ReliquaryAffixData.java → src/main/java/emu/grasscutter/data/excels/ReliquaryAffixData.java
View file @ a8293102
package emu.grasscutter.data.def;
package emu.grasscutter.data.excels;
import emu.grasscutter.data.GameResource;
import emu.grasscutter.data.ResourceType;
......@@ -6,43 +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 String PropType;
private float PropValue;
private int Weight;
private int UpgradeWeight;
private FightProperty fightProp;
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 fightProp;
}
@Override
public void onLoad() {
this.fightProp = FightProperty.getPropByName(this.PropType);
return propType;
}
}
src/main/java/emu/grasscutter/data/def/ReliquaryLevelData.java → src/main/java/emu/grasscutter/data/excels/ReliquaryLevelData.java
View file @ a8293102
package emu.grasscutter.data.def;
package emu.grasscutter.data.excels;
import java.util.List;
......@@ -13,10 +13,10 @@ public class ReliquaryLevelData extends GameResource {
private int id;
private Int2ObjectMap<Float> propMap;
private int Rank;
private int Level;
private int Exp;
private List<RelicLevelProperty> AddProps;
private int rank;
private int level;
private int exp;
private List<RelicLevelProperty> addProps;
@Override
public int getId() {
......@@ -24,15 +24,15 @@ public class ReliquaryLevelData extends GameResource {
}
public int getRank() {
return Rank;
return rank;
}
public int getLevel() {
return Level;
return level;
}
public int getExp() {
return Exp;
return exp;
}
public float getPropValue(FightProperty prop) {
......@@ -45,23 +45,23 @@ public class ReliquaryLevelData extends GameResource {
@Override
public void onLoad() {
this.id = (Rank << 8) + this.getLevel();
this.id = (rank << 8) + this.getLevel();
this.propMap = new Int2ObjectOpenHashMap<>();
for (RelicLevelProperty p : AddProps) {
for (RelicLevelProperty p : addProps) {
this.propMap.put(FightProperty.getPropByName(p.getPropType()).getId(), (Float) p.getValue());
}
}
public class RelicLevelProperty {
private String PropType;
private float Value;
private String propType;
private float value;
public String getPropType() {
return PropType;
return propType;
}
public float getValue() {
return Value;
return value;
}
}
}
src/main/java/emu/grasscutter/data/def/ReliquaryMainPropData.java → src/main/java/emu/grasscutter/data/excels/ReliquaryMainPropData.java
View file @ a8293102
package emu.grasscutter.data.def;
package emu.grasscutter.data.excels;
import emu.grasscutter.data.GameResource;
import emu.grasscutter.data.ResourceType;
......@@ -6,32 +6,26 @@ import emu.grasscutter.game.props.FightProperty;
@ResourceType(name = "ReliquaryMainPropExcelConfigData.json")
public class ReliquaryMainPropData extends GameResource {
private int Id;
private int id;
private int PropDepotId;
private String PropType;
private String AffixName;
private int Weight;
private FightProperty fightProp;
private int propDepotId;
private FightProperty propType;
private int weight;
@Override
public int getId() {
return Id;
return id;
}
public int getPropDepotId() {
return PropDepotId;
return propDepotId;
}
public int getWeight() {
return Weight;
return weight;
}
public FightProperty getFightProp() {
return fightProp;
}
@Override
public void onLoad() {
this.fightProp = FightProperty.getPropByName(this.PropType);
return propType;
}
}
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