diff --git a/src/main/java/emu/grasscutter/data/excels/TowerFloorData.java b/src/main/java/emu/grasscutter/data/excels/TowerFloorData.java index 8ce26d0fb..6cb3008f0 100644 --- a/src/main/java/emu/grasscutter/data/excels/TowerFloorData.java +++ b/src/main/java/emu/grasscutter/data/excels/TowerFloorData.java @@ -8,7 +8,7 @@ public class TowerFloorData extends GameResource { private int floorId; private int floorIndex; - private int levelId; + private int levelGroupId; private int overrideMonsterLevel; private int teamNum; private int floorLevelConfigId; @@ -31,8 +31,8 @@ public class TowerFloorData extends GameResource { return floorIndex; } - public int getLevelId() { - return levelId; + public int getLevelGroupId() { + return levelGroupId; } public int getOverrideMonsterLevel() { diff --git a/src/main/java/emu/grasscutter/data/excels/TowerLevelData.java b/src/main/java/emu/grasscutter/data/excels/TowerLevelData.java index f5a48c132..5bfcc61fb 100644 --- a/src/main/java/emu/grasscutter/data/excels/TowerLevelData.java +++ b/src/main/java/emu/grasscutter/data/excels/TowerLevelData.java @@ -8,6 +8,7 @@ public class TowerLevelData extends GameResource { private int levelId; private int levelIndex; + private int levelGroupId; private int dungeonId; @Override @@ -19,6 +20,10 @@ public class TowerLevelData extends GameResource { return levelId; } + public int getLevelGroupId() { + return levelGroupId; + } + public int getLevelIndex() { return levelIndex; } diff --git a/src/main/java/emu/grasscutter/game/tower/TowerManager.java b/src/main/java/emu/grasscutter/game/tower/TowerManager.java index df9292566..ab5e1cf0c 100644 --- a/src/main/java/emu/grasscutter/game/tower/TowerManager.java +++ b/src/main/java/emu/grasscutter/game/tower/TowerManager.java @@ -71,7 +71,7 @@ public class TowerManager { this.currentFloorId = floorData.getFloorId(); this.currentLevel = 0; this.currentLevelId = GameData.getTowerLevelDataMap().values().stream() - .filter(x -> x.getLevelId() == floorData.getLevelId() && x.getLevelIndex() == 1) + .filter(x -> x.getLevelGroupId() == floorData.getLevelGroupId() && x.getLevelIndex() == 1) .findFirst() .map(TowerLevelData::getId) .orElse(0);