Mirror/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2026-02-06 18:17:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

[BREAKING] Deobfuscate codex field, slight refactor (#1809)

Browse Source 
* Deobfuscate codex field, slight refactor

* Fix relic sets in codex
This commit is contained in:
Luke H-W
2022-09-28 16:28:15 +09:30
committed by GitHub
parent 5ffc07cf59
commit c2e620bf7c
4 changed files with 110 additions and 170 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/main/java/emu/grasscutter/data/excels/CodexAnimalData.java
View File

@@ -1,38 +1,26 @@
package emu.grasscutter.data.excels;
import com.google.gson.annotations.SerializedName;
import emu.grasscutter.data.GameResource;
import emu.grasscutter.data.ResourceType;
import lombok.Getter;
@ResourceType(name = {"AnimalCodexExcelConfigData.json"})
public class CodexAnimalData extends GameResource {
private int Id;
private String type;
private int describeId;
private int sortOrder;
private CodexAnimalUnlockCondition OCCLHPBCDGL;
@Getter private String type;
@Getter private int describeId;
@Getter private int sortOrder;
@SerializedName(value="countType", alternate={"OCCLHPBCDGL"})
@Getter private CountType countType;
@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 {
public enum CountType {
CODEX_COUNT_TYPE_KILL,
CODEX_COUNT_TYPE_CAPTURE
}

69
src/main/java/emu/grasscutter/data/excels/CodexReliquaryData.java
View File

@@ -3,57 +3,44 @@ package emu.grasscutter.data.excels;
import emu.grasscutter.data.GameData;
import emu.grasscutter.data.GameResource;
import emu.grasscutter.data.ResourceType;
import it.unimi.dsi.fastutil.ints.IntCollection;
import it.unimi.dsi.fastutil.ints.IntList;
import lombok.Getter;
@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;
@Getter private int Id;
@Getter private int suitId;
@Getter private int level;
@Getter private int cupId;
@Getter private int leatherId;
@Getter private int capId;
@Getter private int flowerId;
@Getter private int sandId;
@Getter private int sortOrder;
private transient IntCollection ids;
public int getSortOrder() {
return sortOrder;
public boolean containsId(int id) {
return getIds().contains(id);
}
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;
public IntCollection getIds() {
if (this.ids == null) {
int[] idsArr = {cupId, leatherId, capId, flowerId, sandId};
this.ids = IntList.of(idsArr);
}
return this.ids;
}
@Override
public void onLoad() {
// Normalize all itemIds to the 0-substat form
cupId = (cupId/10) * 10;
leatherId = (leatherId/10) * 10;
capId = (capId/10) * 10;
flowerId = (flowerId/10) * 10;
sandId = (sandId/10) * 10;
GameData.getcodexReliquaryArrayList().add(this);
GameData.getcodexReliquaryIdMap().put(getSuitId(), this);
}