Merge changes from hamusuke (#1)

src/main/java/emu/grasscutter/data/GameData.java

@@ -15,6 +15,7 @@ import emu.grasscutter.data.excels.giving.*;
 import emu.grasscutter.data.excels.monster.*;
 import emu.grasscutter.data.excels.quest.*;
 import emu.grasscutter.data.excels.reliquary.*;
+import emu.grasscutter.data.excels.scene.*;
 import emu.grasscutter.data.excels.tower.*;
 import emu.grasscutter.data.excels.trial.*;
 import emu.grasscutter.data.excels.weapon.*;
@@ -269,7 +270,14 @@ public final class GameData {
     private static final Int2ObjectMap<InvestigationMonsterData> investigationMonsterDataMap =
             new Int2ObjectOpenHashMap<>();
 
-    @Getter private static final Int2ObjectMap<ItemData> itemDataMap = new Int2ObjectOpenHashMap<>();
+    @Getter
+    private static final Int2ObjectMap<ItemData> itemDataMap = new Int2ObjectOpenHashMap<>();
+
+    @Getter
+    private static final Int2ObjectMap<MapLayerData> mapLayerDataMap = new Int2ObjectOpenHashMap<>();
+
+    @Getter
+    private static final Int2ObjectMap<MapLayerGroupData> mapLayerGroupDataMap = new Int2ObjectOpenHashMap<>();
 
     @Getter
     private static final Int2ObjectMap<MonsterCurveData> monsterCurveDataMap =
@@ -336,14 +344,16 @@ public final class GameData {
 
     @Getter
     private static final Int2ObjectMap<SceneData> sceneDataMap = new Int2ObjectLinkedOpenHashMap<>();
+    @Getter
+    private static final Int2ObjectMap<SceneTagData> sceneTagDataMap = new Int2ObjectLinkedOpenHashMap<>();
 
     @Getter
     private static final Int2ObjectMap<TalkConfigData> talkConfigDataMap =
-            new Int2ObjectOpenHashMap<>();
+        new Int2ObjectOpenHashMap<>();
 
     @Getter
     private static final Int2ObjectMap<TowerFloorData> towerFloorDataMap =
-            new Int2ObjectOpenHashMap<>();
+        new Int2ObjectOpenHashMap<>();
 
     @Getter
     private static final Int2ObjectMap<TowerLevelData> towerLevelDataMap =

src/main/java/emu/grasscutter/data/excels/scene/MapLayerData.java

@@ -0,0 +1,19 @@
+package emu.grasscutter.data.excels.scene;
+
+import com.google.gson.annotations.SerializedName;
+import emu.grasscutter.data.GameResource;
+import emu.grasscutter.data.ResourceType;
+import lombok.Getter;
+
+@ResourceType(name = "MapLayerExcelConfigData.json")
+@Getter
+public final class MapLayerData extends GameResource {
+    @Getter(onMethod_ = @Override)
+    private int id;
+
+    @SerializedName("NLPFIGAEBFP")
+    private int idk1;
+    @SerializedName("GCBPOOPNLLD")
+    private float level;    //how deep thoronium is in me
+
+}

src/main/java/emu/grasscutter/data/excels/scene/MapLayerGroupData.java

@@ -0,0 +1,21 @@
+package emu.grasscutter.data.excels.scene;
+
+import com.google.gson.annotations.SerializedName;
+import emu.grasscutter.data.GameResource;
+import emu.grasscutter.data.ResourceType;
+import lombok.Getter;
+
+import java.util.List;
+
+@ResourceType(name = "MapLayerGroupExcelConfigData.json")
+@Getter
+public final class MapLayerGroupData extends GameResource {
+    @Getter(onMethod_ = @Override)
+    private int id;
+
+    @SerializedName("FIIAHPKBCDE")
+    private List<Integer> areaIds;
+    @SerializedName("ODEFCAMHKNK")
+    private float mapFloorId;    //MapLayerFloorExcel (first level of the maplayer)
+
+}

src/main/java/emu/grasscutter/data/excels/scene/SceneData.java

@@ -1,15 +1,15 @@
-package emu.grasscutter.data.excels;
+package emu.grasscutter.data.excels.scene;
 
 import com.google.gson.annotations.SerializedName;
-import emu.grasscutter.data.GameResource;
-import emu.grasscutter.data.ResourceType;
+import emu.grasscutter.data.*;
 import emu.grasscutter.game.props.SceneType;
-import java.util.List;
 import lombok.Getter;
 
+import java.util.List;
+
 @ResourceType(name = "SceneExcelConfigData.json")
 @Getter
-public class SceneData extends GameResource {
+public final class SceneData extends GameResource {
     @Getter(onMethod_ = @Override)
     private int id;
 

src/main/java/emu/grasscutter/data/excels/scene/SceneTagData.java

@@ -0,0 +1,40 @@
+package emu.grasscutter.data.excels.scene;
+
+import com.google.gson.annotations.SerializedName;
+import emu.grasscutter.data.GameResource;
+import emu.grasscutter.data.ResourceType;
+import lombok.Getter;
+
+import java.util.List;
+
+@ResourceType(name = "SceneTagConfigData.json")
+@Getter
+public final class SceneTagData extends GameResource {
+    @Getter(onMethod_ = @Override)
+    private int id;
+
+    @SerializedName("DJCOAOBDIHP")
+    private boolean idk1;
+    @SerializedName("LOLNNMPKHIB")
+    private boolean idk2;
+
+    private boolean isDefaultValid; // shld be there by default
+
+    private String sceneTagName;
+    private int sceneId;
+    private List<SceneTagCondition> cond;
+
+    @Getter
+    public static class SceneTagCondition {
+        private CondType condType;
+        private int param1;
+        private int param2;
+
+        public enum CondType {
+            SCENE_TAG_COND_TYPE_ACTIVITY_CONTENT_OPEN,
+            SCENE_TAG_COND_TYPE_QUEST_FINISH,
+            SCENE_TAG_COND_TYPE_QUEST_GLOBAL_VAR_EQUAL,
+            SCENE_TAG_COND_TYPE_SPECIFIC_ACTIVITY_OPEN
+        }
+    }
+}