diff --git a/resources/DaedalusMap_0.4.zip b/resources/DaedalusMap_1.0.zip similarity index 84% rename from resources/DaedalusMap_0.4.zip rename to resources/DaedalusMap_1.0.zip index cb0d7c1..3a7a6b9 100644 Binary files a/resources/DaedalusMap_0.4.zip and b/resources/DaedalusMap_1.0.zip differ diff --git a/src/main/java/fr/zelytra/daedalus/events/running/environnement/gods/listener/PoseidonHandler.java b/src/main/java/fr/zelytra/daedalus/events/running/environnement/gods/listener/PoseidonHandler.java index 0a27cf2..18dd7fb 100644 --- a/src/main/java/fr/zelytra/daedalus/events/running/environnement/gods/listener/PoseidonHandler.java +++ b/src/main/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/src/main/java/fr/zelytra/daedalus/events/running/environnement/items/listener/HermesCaduceus.java b/src/main/java/fr/zelytra/daedalus/events/running/environnement/items/listener/HermesCaduceus.java index 6e37706..a723c41 100644 --- a/src/main/java/fr/zelytra/daedalus/events/running/environnement/items/listener/HermesCaduceus.java +++ b/src/main/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 index 054607b..f065c73 100644 --- 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 index 644d48f..f779e7c 100644 --- 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 index 04fed8a..fac11a5 100644 --- 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 index 6ed3b1d..ae8dab0 100644 Binary files a/src/main/resources/structures/aphroditeTemple.struct and b/src/main/resources/structures/aphroditeTemple.struct differ diff --git a/src/main/resources/structures/aresTemple.struct b/src/main/resources/structures/aresTemple.struct index 58152b7..3a75c89 100644 Binary files a/src/main/resources/structures/aresTemple.struct and b/src/main/resources/structures/aresTemple.struct differ diff --git a/src/main/resources/structures/artemisTemple.struct b/src/main/resources/structures/artemisTemple.struct index 9b7bf2d..df3c96f 100644 Binary files a/src/main/resources/structures/artemisTemple.struct and b/src/main/resources/structures/artemisTemple.struct differ diff --git a/src/main/resources/structures/demeterTemple.struct b/src/main/resources/structures/demeterTemple.struct index 2866f17..3c726df 100644 Binary files a/src/main/resources/structures/demeterTemple.struct and b/src/main/resources/structures/demeterTemple.struct differ diff --git a/src/main/resources/structures/dionysosTemple.struct b/src/main/resources/structures/dionysosTemple.struct index 926d559..2c759b1 100644 Binary files a/src/main/resources/structures/dionysosTemple.struct and b/src/main/resources/structures/dionysosTemple.struct differ