From 03eae3ecc995a93fb923add83295cd8686a6c6e4 Mon Sep 17 00:00:00 2001 From: Mathieu Strypsteen Date: Mon, 23 Sep 2024 11:02:33 +0200 Subject: [PATCH] Tweak difficulty --- .../gent/zeus/mc13dtl/events/catalog/EndEvent.java | 10 +++++++++- .../gent/zeus/mc13dtl/events/catalog/FallEvent.java | 2 +- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/main/java/gent/zeus/mc13dtl/events/catalog/EndEvent.java b/src/main/java/gent/zeus/mc13dtl/events/catalog/EndEvent.java index 37ac4cf..6e557ec 100644 --- a/src/main/java/gent/zeus/mc13dtl/events/catalog/EndEvent.java +++ b/src/main/java/gent/zeus/mc13dtl/events/catalog/EndEvent.java @@ -21,7 +21,7 @@ import net.kyori.adventure.text.format.NamedTextColor; public class EndEvent extends Event { private PotionEffectType[] effects; - private int livesLeft = 5; + private int livesLeft; public EndEvent(Team team, Difficulty difficulty, int scoreOnSuccess) { super(team, difficulty, scoreOnSuccess); @@ -33,6 +33,14 @@ public class EndEvent extends Event { case SWEAT -> new PotionEffectType[] { PotionEffectType.HUNGER }; case IMPOSSIBLE -> new PotionEffectType[] { PotionEffectType.HUNGER, PotionEffectType.WEAKNESS }; }; + livesLeft = switch (difficulty) { + case BABY -> 50; + case EASY -> 20; + case MEDIUM -> 10; + case HARD -> 5; + case SWEAT -> 3; + case IMPOSSIBLE -> 1; + }; } @Override diff --git a/src/main/java/gent/zeus/mc13dtl/events/catalog/FallEvent.java b/src/main/java/gent/zeus/mc13dtl/events/catalog/FallEvent.java index e6bd652..eeeea2e 100644 --- a/src/main/java/gent/zeus/mc13dtl/events/catalog/FallEvent.java +++ b/src/main/java/gent/zeus/mc13dtl/events/catalog/FallEvent.java @@ -36,7 +36,7 @@ public class FallEvent extends Event { Player player = MC13DTL.board.getPlayers(team).getFirst(); Location location = player.getLocation(); location.setX(((int) location.getX()) + 0.5); - location.setZ(((int) location.getX()) + 0.5); + location.setZ(((int) location.getZ()) + 0.5); World world = player.getWorld(); location.setY(world.getHighestBlockYAt(location)); targetHeight = (int) location.getY() + 5;