mirror of
https://github.com/Grasscutters/Grasscutter.git
synced 2026-02-07 18:46:49 +01:00
Merge pull request Grasscutter-Quests#53
'Updated with how talks are handle' by `mjolsic`
This commit is contained in:
@@ -12,6 +12,7 @@ import emu.grasscutter.data.excels.avatar.*;
|
||||
import emu.grasscutter.data.excels.codex.*;
|
||||
import emu.grasscutter.data.excels.dungeon.*;
|
||||
import emu.grasscutter.data.excels.monster.*;
|
||||
import emu.grasscutter.data.excels.quest.*;
|
||||
import emu.grasscutter.data.excels.reliquary.*;
|
||||
import emu.grasscutter.data.excels.tower.*;
|
||||
import emu.grasscutter.data.excels.trial.*;
|
||||
@@ -296,7 +297,12 @@ public final class GameData {
|
||||
new Int2ObjectOpenHashMap<>();
|
||||
|
||||
@Getter
|
||||
private static final Int2ObjectMap<QuestData> questDataMap = new Int2ObjectOpenHashMap<>();
|
||||
private static final Int2ObjectMap<QuestData> questDataMap =
|
||||
new Int2ObjectOpenHashMap<>();
|
||||
|
||||
@Getter
|
||||
private static final Int2ObjectMap<QuestGlobalVarData> questGlobalVarDataMap =
|
||||
new Int2ObjectOpenHashMap<>();
|
||||
|
||||
@Getter
|
||||
private static final Int2ObjectMap<ReliquaryAffixData> reliquaryAffixDataMap =
|
||||
@@ -318,7 +324,12 @@ public final class GameData {
|
||||
new Int2ObjectOpenHashMap<>();
|
||||
|
||||
@Getter
|
||||
private static final Int2ObjectMap<SceneData> sceneDataMap = new Int2ObjectLinkedOpenHashMap<>();
|
||||
private static final Int2ObjectMap<SceneData> sceneDataMap =
|
||||
new Int2ObjectLinkedOpenHashMap<>();
|
||||
|
||||
@Getter
|
||||
private static final Int2ObjectMap<TalkConfigData> talkConfigDataMap =
|
||||
new Int2ObjectOpenHashMap<>();
|
||||
|
||||
@Getter
|
||||
private static final Int2ObjectMap<TowerFloorData> towerFloorDataMap =
|
||||
|
||||
@@ -0,0 +1,29 @@
|
||||
package emu.grasscutter.data.excels;
|
||||
|
||||
import emu.grasscutter.data.GameResource;
|
||||
import emu.grasscutter.data.ResourceType;
|
||||
import emu.grasscutter.game.talk.TalkExec;
|
||||
import lombok.*;
|
||||
import com.google.gson.annotations.SerializedName;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@ResourceType(name = "TalkExcelConfigData.json")
|
||||
@EqualsAndHashCode(callSuper=false)
|
||||
@Data
|
||||
public final class TalkConfigData extends GameResource {
|
||||
@SerializedName(value="id", alternate={"_id"})
|
||||
private int id;
|
||||
@SerializedName(value="finishExec", alternate={"_finishExec"})
|
||||
private List<TalkExecParam> finishExec;
|
||||
@SerializedName(value="questId", alternate={"_questId"})
|
||||
private int questId;
|
||||
|
||||
@Data
|
||||
public static class TalkExecParam {
|
||||
@SerializedName(value="type", alternate={"_type"})
|
||||
private TalkExec type;
|
||||
@SerializedName(value="param", alternate={"_param"})
|
||||
private String[] param;
|
||||
}
|
||||
}
|
||||
@@ -1,4 +1,4 @@
|
||||
package emu.grasscutter.data.excels;
|
||||
package emu.grasscutter.data.excels.quest;
|
||||
|
||||
import com.google.gson.annotations.SerializedName;
|
||||
import emu.grasscutter.Grasscutter;
|
||||
@@ -0,0 +1,15 @@
|
||||
package emu.grasscutter.data.excels.quest;
|
||||
|
||||
import emu.grasscutter.data.GameResource;
|
||||
import emu.grasscutter.data.ResourceType;
|
||||
import lombok.*;
|
||||
import lombok.experimental.FieldDefaults;
|
||||
|
||||
@ResourceType(name = "QuestGlobalVarConfigData.json")
|
||||
@EqualsAndHashCode(callSuper=false)
|
||||
@Data
|
||||
@FieldDefaults(level = AccessLevel.PRIVATE)
|
||||
public final class QuestGlobalVarData extends GameResource {
|
||||
int id;
|
||||
int defaultValue;
|
||||
}
|
||||
Reference in New Issue
Block a user