add toggling teleporting to lobby option

KamePowerWorld · May 28, 2023 · 0e188d5 · 0e188d5
1 parent 1f4ce0d
commit 0e188d5
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 3 deletions.
diff --git a/src/main/java/quarri6343/overcrafted/core/data/OCVariableData.java b/src/main/java/quarri6343/overcrafted/core/data/OCVariableData.java
@@ -54,4 +54,10 @@ public class OCVariableData {
      */
     @Getter
     private final RangedFloat tipMultiplier = new RangedFloat(0.1f,0.1f,10);
+
+    /**
+     * ゲーム終了時にプレイヤーをロビーに飛ばすかどうか
+     */
+    @Getter @Setter
+    private boolean teleportPlayerWhenGameEnd = true;
 }
diff --git a/src/main/java/quarri6343/overcrafted/core/ui/AdminMenuRow3.java b/src/main/java/quarri6343/overcrafted/core/ui/AdminMenuRow3.java
@@ -54,6 +54,12 @@ public static void addElements(PaginatedGui gui, Player player) {
         GuiItem setTipMultiplierButton = new GuiItem(setTipMultiplierItem,
                 AdminMenuRow3::onSetTipMultiplierButton);
         gui.setItem(24, setTipMultiplierButton);
+
+        ItemStack setTeleportToLobbyItem = new ItemCreator(Material.ENDER_PEARL).setName(Component.text("ゲーム終了時にプレイヤーをロビーに飛ばすかどうか"))
+                .setLore(Component.text("現在: " + (getData().isTeleportPlayerWhenGameEnd() ? "飛ばす" : "飛ばさない")).color(NamedTextColor.WHITE).decoration(TextDecoration.ITALIC, false)).create();
+        GuiItem setTeleportToLobbyButton = new GuiItem(setTeleportToLobbyItem,
+                AdminMenuRow3::onSetTeleportToLobbyButton);
+        gui.setItem(26, setTeleportToLobbyButton);
     }
 
     private static void onSetCraftingTimeButton(InventoryClickEvent event) {
@@ -91,4 +97,9 @@ private static void onSetTipMultiplierButton(InventoryClickEvent event) {
 
         UINumberConfiguration.openUI((Player) event.getWhoClicked(),getData().getTipMultiplier());
     }
+
+    private static void onSetTeleportToLobbyButton(InventoryClickEvent event) {
+        getData().setTeleportPlayerWhenGameEnd(!getData().isTeleportPlayerWhenGameEnd());
+        UIAdminMenu.openUI((Player) event.getWhoClicked());
+    }
 }
diff --git a/src/main/java/quarri6343/overcrafted/impl/OCStages.java b/src/main/java/quarri6343/overcrafted/impl/OCStages.java
@@ -40,15 +40,15 @@ public enum OCStages {
      * ・ステージ3
      * 皿洗いのやり方
      */
-    STAGE1(new OCStage("ステージ3", 420, true,
+    STAGE1(new OCStage("ステージ3", 300, true,
             Arrays.asList((ISubmittableOCItem) OCItems.DISH_IRON_INGOT.get(), (ISubmittableOCItem) OCItems.DISH_FURNACE.get()),
             Arrays.asList((ISupplier) OCItems.IRON_ORE.get(), (ISupplier) OCItems.COBBLESTONE.get()), null)),
 
     /**
      * ・ステージ4
      * (原木->木材->棒 + 原木->木炭)->松明、鉄インゴット、かまど
      */
-    STAGE2(new OCStage("ステージ4", 480, true,
+    STAGE2(new OCStage("ステージ4", 400, true,
             Arrays.asList((ISubmittableOCItem) OCItems.DISH_TORCH.get(), (ISubmittableOCItem) OCItems.DISH_IRON_INGOT.get(),(ISubmittableOCItem) OCItems.DISH_FURNACE.get()),
             Arrays.asList((ISupplier) OCItems.IRON_ORE.get(), (ISupplier) OCItems.COBBLESTONE.get(), (ISupplier) OCItems.WOOD.get()), null)),
 

diff --git a/src/main/java/quarri6343/overcrafted/impl/task/game/GameEndTask.java b/src/main/java/quarri6343/overcrafted/impl/task/game/GameEndTask.java
@@ -25,7 +25,8 @@ public GameEndTask(Runnable additionalAction, boolean isScheduled) {
 
     @Override
     public void run() {
-        getData().getTeams().teleportTeamToLobby();
+        if(getData().isTeleportPlayerWhenGameEnd())
+            getData().getTeams().teleportTeamToLobby();
         getData().getTeams().clearDishPile(getData().getSelectedStage().ordinal());
         if(ScoreBoardHandler.getHighestScore() > getData().getSelectedStage().get().getHighScore())
             getData().getSelectedStage().get().setHighScore(ScoreBoardHandler.getHighestScore());