Add Time config option

NucleoidMC · Jan 22, 2024 · fed387c · fed387c
1 parent 218acbd
commit fed387c
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 3 deletions.
diff --git a/src/main/java/me/ellieis/Sabotage/game/config/SabotageConfig.java b/src/main/java/me/ellieis/Sabotage/game/config/SabotageConfig.java
@@ -6,10 +6,11 @@
 import xyz.nucleoid.fantasy.Fantasy;
 import xyz.nucleoid.plasmid.game.common.config.PlayerConfig;
 
-public record SabotageConfig(Identifier map, Identifier dimension, int countdownTime, int gracePeriod, int timeLimit, int endDelay, int chestCount, InnocentConfig innocentConfig, DetectiveConfig detectiveConfig, SaboteurConfig saboteurConfig, PlayerConfig playerConfig) {
+public record SabotageConfig(Identifier map, int time, Identifier dimension, int countdownTime, int gracePeriod, int timeLimit, int endDelay, int chestCount, InnocentConfig innocentConfig, DetectiveConfig detectiveConfig, SaboteurConfig saboteurConfig, PlayerConfig playerConfig) {
     public static final Codec<SabotageConfig> CODEC = RecordCodecBuilder.create(instance ->
         instance.group(
                 Identifier.CODEC.fieldOf("map").forGetter(SabotageConfig::map),
+                Codec.INT.optionalFieldOf("time", 6000).forGetter(SabotageConfig::time),
                 Identifier.CODEC.optionalFieldOf("dimension", Fantasy.DEFAULT_DIM_TYPE.getValue()).forGetter(SabotageConfig::dimension),
                 Codec.INT.optionalFieldOf("countdown_time", 5).forGetter(SabotageConfig::countdownTime),
                 Codec.INT.optionalFieldOf("grace_period", 15).forGetter(SabotageConfig::gracePeriod),

diff --git a/src/main/java/me/ellieis/Sabotage/game/phase/SabotageWaiting.java b/src/main/java/me/ellieis/Sabotage/game/phase/SabotageWaiting.java
@@ -55,8 +55,7 @@ public static GameOpenProcedure Open(GameOpenContext<SabotageConfig> context) {
         RuntimeWorldConfig worldConfig = new RuntimeWorldConfig()
                 .setGenerator(map.asChunkGenerator(server))
                 .setDimensionType(RegistryKey.of(RegistryKeys.DIMENSION_TYPE, config.dimension()))
-                .setTimeOfDay(6000);
-
+                .setTimeOfDay(config.time());
         return context.openWithWorld(worldConfig, (activity, world) -> {
             SabotageWaiting game = new SabotageWaiting(config, activity.getGameSpace(), map, world);
             GameWaitingLobby.addTo(activity, config.playerConfig());

diff --git a/src/main/resources/data/sabotage/games/skybound.json b/src/main/resources/data/sabotage/games/skybound.json
@@ -1,6 +1,7 @@
 {
   "type": "sabotage:sabotage",
   "map": "sabotage:skybound",
+  "time": 15000,
   "chest_count": 75,
   "players": {
     "min": 1,

diff --git a/src/main/resources/data/sabotage/games/village.json b/src/main/resources/data/sabotage/games/village.json
@@ -1,6 +1,7 @@
 {
   "type": "sabotage:sabotage",
   "map": "sabotage:village",
+  "time": 0,
   "chest_count": 125,
   "players": {
     "min": 1,

diff --git a/src/main/resources/data/sabotage/map_templates/skybound.nbt b/src/main/resources/data/sabotage/map_templates/skybound.nbt