From b5b1d500c237623e6d7821190b0fb69bbcb04042 Mon Sep 17 00:00:00 2001
From: Xander <xander@biltopia.org>
Date: Sun, 15 Sep 2024 21:40:06 +0200
Subject: [PATCH] use score based on current day

---
 .../java/gent/zeus/mc13dtl/events/Event.java  |  9 ++---
 .../gent/zeus/mc13dtl/events/EventRunner.java |  8 ++---
 .../mc13dtl/events/catalog/TestEvent.java     | 34 ++++++++-----------
 .../mc13dtl/events/catalog/TestEvent2.java    | 10 ++----
 4 files changed, 26 insertions(+), 35 deletions(-)

diff --git a/src/main/java/gent/zeus/mc13dtl/events/Event.java b/src/main/java/gent/zeus/mc13dtl/events/Event.java
index 430e153..931ebc0 100644
--- a/src/main/java/gent/zeus/mc13dtl/events/Event.java
+++ b/src/main/java/gent/zeus/mc13dtl/events/Event.java
@@ -16,10 +16,13 @@ public abstract class Event implements Listener, Runnable {
     protected Team team;
     private int taskId;
     protected final Difficulty difficulty;
+    private final int scoreOnSuccess;
 
-    public Event(Team team, Difficulty difficulty) {
+    public Event(Team team, Difficulty difficulty, int scoreOnSuccess) {
         this.team = team;
         this.difficulty = difficulty;
+        this.scoreOnSuccess = scoreOnSuccess;
+
         MC13DTL.board.sendMessageToTeam(team, Component.text("Difficulty is " + this.difficulty.toString()));
         MC13DTL.board.sendMessageToTeam(team, Component.text(getMessage()).color(NamedTextColor.GRAY).decorate(TextDecoration.ITALIC));
         MC13DTL.instance.getServer().getPluginManager().registerEvents(this, MC13DTL.instance);
@@ -39,7 +42,7 @@ public abstract class Event implements Listener, Runnable {
 
     protected void eventSuccess() {
         MC13DTL.board.sendMessageToTeam(team, Component.text("Congratulations! You survived this event").color(NamedTextColor.GREEN));
-        MC13DTL.board.addScore(team, scoreAwarded());
+        MC13DTL.board.addScore(team, scoreOnSuccess);
         eventFinished();
     }
 
@@ -60,6 +63,4 @@ public abstract class Event implements Listener, Runnable {
     }
 
     protected abstract String getMessage();
-
-    protected abstract int scoreAwarded();
 }
diff --git a/src/main/java/gent/zeus/mc13dtl/events/EventRunner.java b/src/main/java/gent/zeus/mc13dtl/events/EventRunner.java
index b6b158e..e4aa46f 100644
--- a/src/main/java/gent/zeus/mc13dtl/events/EventRunner.java
+++ b/src/main/java/gent/zeus/mc13dtl/events/EventRunner.java
@@ -39,16 +39,16 @@ public class EventRunner implements Runnable {
                 Team team = teams.get(i);
                 Difficulty difficulty = difficulties.get(i);
                 switch ((int) day) {
-                    case 0 -> new TestEvent(team, difficulty);
-                    case 1 -> new TestEvent2(team, difficulty);
+                    case 0 -> new TestEvent(team, difficulty, getDayScore());
+                    case 1 -> new TestEvent2(team, difficulty, getDayScore());
                 }
             }
             world.getPersistentDataContainer().set(eventKey, PersistentDataType.LONG, day);
         }
     }
 
-    private long getDayScore() {
-        return this.day * 10 + 1;
+    private int getDayScore() {
+        return (int) Math.pow(2, this.day);
     }
 
     private List<Difficulty> getDifficulties(List<Team> teams) {
diff --git a/src/main/java/gent/zeus/mc13dtl/events/catalog/TestEvent.java b/src/main/java/gent/zeus/mc13dtl/events/catalog/TestEvent.java
index 31552ac..5025de3 100644
--- a/src/main/java/gent/zeus/mc13dtl/events/catalog/TestEvent.java
+++ b/src/main/java/gent/zeus/mc13dtl/events/catalog/TestEvent.java
@@ -8,25 +8,21 @@ import org.bukkit.scoreboard.Team;
 import gent.zeus.mc13dtl.events.Event;
 
 public class TestEvent extends Event {
-  public TestEvent(Team team, Difficulty difficulty) {
-    super(team, difficulty);
-  }
-
-  @Override
-  protected String getMessage() {
-    return "test";
-  }
-
-  @EventHandler
-  public void onPlayerInteract(PlayerInteractEvent event) {
-    if (event.getPlayer() == null) {
-      return;
+    public TestEvent(Team team, Difficulty difficulty, int scoreOnSuccess) {
+        super(team, difficulty, scoreOnSuccess);
+    }
+
+    @Override
+    protected String getMessage() {
+        return "test";
+    }
+
+    @EventHandler
+    public void onPlayerInteract(PlayerInteractEvent event) {
+        if (event.getPlayer() == null) {
+            return;
+        }
+        eventSuccess();
     }
-    eventSuccess();
-  }
 
-  @Override
-  protected int scoreAwarded() {
-    return 20;
-  }
 }
diff --git a/src/main/java/gent/zeus/mc13dtl/events/catalog/TestEvent2.java b/src/main/java/gent/zeus/mc13dtl/events/catalog/TestEvent2.java
index 5bed8ca..0e85ed5 100644
--- a/src/main/java/gent/zeus/mc13dtl/events/catalog/TestEvent2.java
+++ b/src/main/java/gent/zeus/mc13dtl/events/catalog/TestEvent2.java
@@ -8,8 +8,8 @@ import org.bukkit.scoreboard.Team;
 import gent.zeus.mc13dtl.events.Event;
 
 public class TestEvent2 extends Event {
-    public TestEvent2(Team team, Difficulty difficulty) {
-        super(team, difficulty);
+    public TestEvent2(Team team, Difficulty difficulty, int scoreOnSuccess) {
+        super(team, difficulty, scoreOnSuccess);
     }
 
     @Override
@@ -24,10 +24,4 @@ public class TestEvent2 extends Event {
         }
         eventSuccess();
     }
-
-    @Override
-    protected int scoreAwarded() {
-        return 200;
-    }
-
 }