mirror of
https://github.com/Grasscutters/Grasscutter.git
synced 2026-05-22 23:40:54 +08:00
Fix ore dropping and implement subfields
This commit is contained in:
committed by
KingRainbow44
Unverified
parent
9dae3cbcc7
commit
56f09e87a1
@@ -37,8 +37,11 @@ import emu.grasscutter.data.excels.world.WeatherData;
|
||||
import emu.grasscutter.data.excels.world.WorldAreaData;
|
||||
import emu.grasscutter.data.excels.world.WorldLevelData;
|
||||
import emu.grasscutter.data.server.ActivityCondGroup;
|
||||
import emu.grasscutter.data.server.DropSubfieldMapping;
|
||||
import emu.grasscutter.data.server.DropTableExcelConfigData;
|
||||
import emu.grasscutter.data.server.GadgetMapping;
|
||||
import emu.grasscutter.data.server.MonsterMapping;
|
||||
import emu.grasscutter.data.server.SubfieldMapping;
|
||||
import emu.grasscutter.game.dungeons.DungeonDropEntry;
|
||||
import emu.grasscutter.game.quest.QuestEncryptionKey;
|
||||
import emu.grasscutter.game.quest.RewindData;
|
||||
@@ -451,6 +454,10 @@ public final class GameData {
|
||||
private static final Int2ObjectMap<GadgetMapping> gadgetMappingMap =
|
||||
new Int2ObjectOpenHashMap<>();
|
||||
|
||||
@Getter private static final Int2ObjectMap<SubfieldMapping> subfieldMappingMap = new Int2ObjectOpenHashMap<>();
|
||||
@Getter private static final Int2ObjectMap<DropSubfieldMapping> dropSubfieldMappingMap = new Int2ObjectOpenHashMap<>();
|
||||
@Getter private static final Int2ObjectMap<DropTableExcelConfigData> dropTableExcelConfigDataMap = new Int2ObjectOpenHashMap<>();
|
||||
|
||||
@Getter
|
||||
private static final Int2ObjectMap<MonsterMapping> monsterMappingMap =
|
||||
new Int2ObjectOpenHashMap<>();
|
||||
|
||||
@@ -116,6 +116,7 @@ public final class ResourceLoader {
|
||||
loadConfigLevelEntityData();
|
||||
loadQuestShareConfig();
|
||||
loadGadgetMappings();
|
||||
loadSubfieldMappings();
|
||||
loadMonsterMappings();
|
||||
loadActivityCondGroups();
|
||||
loadGroupReplacements();
|
||||
@@ -805,6 +806,38 @@ public final class ResourceLoader {
|
||||
}
|
||||
}
|
||||
|
||||
private static void loadSubfieldMappings() {
|
||||
try {
|
||||
val subfieldMap = GameData.getSubfieldMappingMap();
|
||||
try {
|
||||
JsonUtils.loadToList(getResourcePath("Server/SubfieldMapping.json"), SubfieldMapping.class).forEach(entry -> subfieldMap.put(entry.getEntityId(), entry));;
|
||||
} catch (IOException | NullPointerException ignored) {}
|
||||
Grasscutter.getLogger().debug("Loaded {} subfield mappings.", subfieldMap.size());
|
||||
} catch (Exception e) {
|
||||
Grasscutter.getLogger().error("Unable to load subfield mappings.", e);
|
||||
}
|
||||
|
||||
try {
|
||||
val dropSubfieldMap = GameData.getDropSubfieldMappingMap();
|
||||
try {
|
||||
JsonUtils.loadToList(getResourcePath("Server/DropSubfieldMapping.json"), DropSubfieldMapping.class).forEach(entry -> dropSubfieldMap.put(entry.getDropId(), entry));;
|
||||
} catch (IOException | NullPointerException ignored) {}
|
||||
Grasscutter.getLogger().debug("Loaded {} drop subfield mappings.", dropSubfieldMap.size());
|
||||
} catch (Exception e) {
|
||||
Grasscutter.getLogger().error("Unable to load drop subfield mappings.", e);
|
||||
}
|
||||
|
||||
try {
|
||||
val dropTableExcelConfigDataMap = GameData.getDropTableExcelConfigDataMap();
|
||||
try {
|
||||
JsonUtils.loadToList(getResourcePath("Server/DropTableExcelConfigData.json"), DropTableExcelConfigData.class).forEach(entry -> dropTableExcelConfigDataMap.put(entry.getId(), entry));;
|
||||
} catch (IOException | NullPointerException ignored) {}
|
||||
Grasscutter.getLogger().debug("Loaded {} drop table configs.", dropTableExcelConfigDataMap.size());
|
||||
} catch (Exception e) {
|
||||
Grasscutter.getLogger().error("Unable to load drop table config data.", e);
|
||||
}
|
||||
}
|
||||
|
||||
private static void loadMonsterMappings() {
|
||||
try {
|
||||
var monsterMap = GameData.getMonsterMappingMap();
|
||||
|
||||
@@ -0,0 +1,10 @@
|
||||
package emu.grasscutter.data.server;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class DropSubfieldMapping {
|
||||
private int dropId;
|
||||
private int levelLimit;
|
||||
private int itemId;
|
||||
}
|
||||
@@ -0,0 +1,24 @@
|
||||
package emu.grasscutter.data.server;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class DropTableExcelConfigData {
|
||||
private int id;
|
||||
private int randomType;
|
||||
private int dropLevel;
|
||||
private DropVectorEntry[] dropVec;
|
||||
private int nodeType;
|
||||
private boolean fallToGround;
|
||||
private int sourceType;
|
||||
private int everydayLimit;
|
||||
private int historyLimit;
|
||||
private int activityLimit;
|
||||
|
||||
@Data
|
||||
public class DropVectorEntry {
|
||||
private int itemId;
|
||||
private String countRange;
|
||||
private int weight;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,15 @@
|
||||
package emu.grasscutter.data.server;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class SubfieldMapping {
|
||||
private int entityId;
|
||||
private SubfieldMappingEntry[] subfields;
|
||||
|
||||
@Data
|
||||
public class SubfieldMappingEntry {
|
||||
private String subfieldName;
|
||||
private int drop_id;
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user