Update map

zelytra · Jul 28, 2021 · 011e4e9 · 011e4e9
1 parent fb9ea33
commit 011e4e9
Show file tree

Hide file tree

Showing 11 changed files with 23 additions and 6 deletions.
diff --git a/resources/DaedalusMap_0.4.zip → resources/DaedalusMap_1.0.zip b/resources/DaedalusMap_0.4.zip → resources/DaedalusMap_1.0.zip
diff --git a/.../java/fr/zelytra/daedalus/events/running/environnement/gods/listener/PoseidonHandler.java b/.../java/fr/zelytra/daedalus/events/running/environnement/gods/listener/PoseidonHandler.java
@@ -56,7 +56,7 @@ public void playerInWater() {
     }
 
     private void vfx(Player player) {
-        Bukkit.broadcastMessage(GameSettings.LANG.textOf("godSpawn.posseidon"));
+        Bukkit.broadcastMessage(GameSettings.LANG.textOf("godSpawn.poseidon"));
         Utils.runTotemDisplay(player);
         for (Player p : Bukkit.getOnlinePlayers()) {
             p.playSound(p.getLocation(), Sound.ENTITY_ILLUSIONER_PREPARE_MIRROR, 10, 0.1f);

diff --git a/.../java/fr/zelytra/daedalus/events/running/environnement/items/listener/HermesCaduceus.java b/.../java/fr/zelytra/daedalus/events/running/environnement/items/listener/HermesCaduceus.java
@@ -72,7 +72,7 @@ public void onItemUse(CustomItemUseEvent e) {
                         ((Player) entity).getInventory().setItem(x, hotBar.get(x));
 
                     ((Player) entity).playSound(entity.getLocation(), Sound.ENTITY_ITEM_PICKUP, 1, 1);
-                    entity.sendMessage(Message.getPlayerPrefixe() + GameSettings.LANG.textOf("god.demeterActive"));
+                    entity.sendMessage(Message.getPlayerPrefixe() + GameSettings.LANG.textOf("god.hermesActive"));
 
                 }
             }

diff --git a/src/main/java/fr/zelytra/daedalus/managers/faction/FactionScoreBoard.java b/src/main/java/fr/zelytra/daedalus/managers/faction/FactionScoreBoard.java
@@ -37,8 +37,8 @@ public void update(TimeManager timeManager) {
         scoreboard.getTeam("episode").setPrefix(GameSettings.LANG.textOf("scoreboard.episode") + timeManager.getEpisode());
         scoreboard.getTeam("timer").setPrefix(GameSettings.LANG.textOf("scoreboard.timer") + timeManager.getTimer());
         scoreboard.getTeam("border").setPrefix(GameSettings.LANG.textOf("scoreboard.border") + (Daedalus.getInstance().getStructureManager().getShrinkManager().getWorkloadThread() == null ? "§cNull" : Daedalus.getInstance().getStructureManager().getShrinkManager().getBorderRadius()));
-        scoreboard.getTeam("stateMino").setPrefix(GameSettings.LANG.textOf("scoreboard.stateMino")+ (DeathListener.hasMinoSpawn ? (isMinotaur() ? GameSettings.LANG.textOf("scoreboard.stateMinoAlive") : GameSettings.LANG.textOf("scoreboard.stateMinoDead")) : "§6§k4269"));
-        scoreboard.getTeam("alive").setPrefix(GameSettings.LANG.textOf("scoreboard.alive") + faction.getAliveCount() + "§6/§a" + faction.getPlayerAmount());
+        scoreboard.getTeam("stateMino").setPrefix(GameSettings.LANG.textOf("scoreboard.stateMino") + (DeathListener.hasMinoSpawn ? (isMinotaur() ? GameSettings.LANG.textOf("scoreboard.stateMinoAlive") : GameSettings.LANG.textOf("scoreboard.stateMinoDead")) : "§6§k4269"));
+        scoreboard.getTeam("alive").setPrefix(GameSettings.LANG.textOf("scoreboard.alive") + getAlivePlayer() + "§6/§a" + getTotalPlayer());
 
         if (faction.getGodsEnum() != null)
             scoreboard.getTeam("divinity").setPrefix("§6• §b" + faction.getGodsEnum().getName());
@@ -148,5 +148,22 @@ private boolean isMinotaur() {
         return false;
     }
 
+    private int getTotalPlayer() {
+        int count = 0;
+        for (Faction faction : Daedalus.getInstance().getGameManager().getFactionManager().getFactionList())
+            count += faction.getPlayerList().size();
+
+        return count;
+
+    }
+
+    private int getAlivePlayer() {
+        int count = 0;
+        for (Faction faction : Daedalus.getInstance().getGameManager().getFactionManager().getFactionList())
+            count += faction.getAliveCount();
+
+        return count;
+    }
+
 
 }
diff --git a/src/main/java/fr/zelytra/daedalus/managers/gods/GodsEnum.java b/src/main/java/fr/zelytra/daedalus/managers/gods/GodsEnum.java
@@ -13,7 +13,7 @@
 public enum GodsEnum {
 
     ZEUS(GameSettings.LANG.textOf("godName.zeus"), false, () -> new Zeus(), CustomMaterial.ZEUS_TOTEM),
-    POSEIDON(GameSettings.LANG.textOf("godName.posseidon"), false, () -> new Poseidon(), CustomMaterial.POSEIDON_TOTEM),
+    POSEIDON(GameSettings.LANG.textOf("godName.poseidon"), false, () -> new Poseidon(), CustomMaterial.POSEIDON_TOTEM),
     HADES(GameSettings.LANG.textOf("godName.hades"), false, () -> new Hades(), CustomMaterial.HADES_TOTEM),
     ARES(GameSettings.LANG.textOf("godName.ares"), false, () -> new Ares(), CustomMaterial.ARES_TOTEM),
     APHRODITE(GameSettings.LANG.textOf("godName.aphrodite"), false, () -> new Aphrodite(), CustomMaterial.APHRODITE_TOTEM),

diff --git a/src/main/java/fr/zelytra/daedalus/managers/setup/StartupManager.java b/src/main/java/fr/zelytra/daedalus/managers/setup/StartupManager.java
@@ -12,7 +12,7 @@
 import java.util.zip.ZipInputStream;
 
 public class StartupManager {
-    private final String mapURL = "https://raw.githubusercontent.com/zelytra/Daedalus/master/resources/DaedalusMap_0.4.zip";
+    private final String mapURL = "https://raw.githubusercontent.com/zelytra/Daedalus/master/resources/DaedalusMap_1.0.zip";
     private final File folder;
     private final File zip;
 

diff --git a/src/main/resources/structures/aphroditeTemple.struct b/src/main/resources/structures/aphroditeTemple.struct
diff --git a/src/main/resources/structures/aresTemple.struct b/src/main/resources/structures/aresTemple.struct
diff --git a/src/main/resources/structures/artemisTemple.struct b/src/main/resources/structures/artemisTemple.struct
diff --git a/src/main/resources/structures/demeterTemple.struct b/src/main/resources/structures/demeterTemple.struct
diff --git a/src/main/resources/structures/dionysosTemple.struct b/src/main/resources/structures/dionysosTemple.struct