refact: take advantage of method overloading

RPG-IO · Jun 4, 2022 · dde3b6c · dde3b6c
1 parent 86a95f7
commit dde3b6c
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 6 deletions.
diff --git a/src/main/java/io/rpg/model/actions/condition/ConditionEngine.java b/src/main/java/io/rpg/model/actions/condition/ConditionEngine.java
@@ -4,14 +4,14 @@
 
 import java.lang.ref.WeakReference;
 
-public class ConditionEngine {
+public final class ConditionEngine {
   private final WeakReference<Controller> weakRefController;
 
   public ConditionEngine(final Controller controller) {
     this.weakRefController = new WeakReference<>(controller);
   }
 
-  public boolean evaluateItemRequiredCondition(ItemRequiredCondition condition) {
+  public boolean evaluate(ItemRequiredCondition condition) {
     // TODO: Implement this when the inventory gets implemented.
     // Scheme:
 //    return weakRefControler
@@ -24,12 +24,23 @@ public boolean evaluateItemRequiredCondition(ItemRequiredCondition condition) {
     return true;
   }
 
-  public boolean evaluateDefeatOpponentCondition(DefeatOpponentCondition condition) {
+  public boolean evaluate(DefeatOpponentCondition condition) {
     return weakRefController
         .get()
         .getPlayerController()
         .getPlayer()
         .getDefeatedOpponents()
         .contains(condition.getOpponentTag());
   }
+
+  public boolean evaluate(LevelRequiredCondition condition) {
+    // TODO: Implement this when the level system is implemented.
+    // For now I just return true.
+//    return weakRefController
+//        .get()
+//        .getPlayerController()
+//        .getPlayer()
+//        .getLevel() >= condition.getLevel();
+    return true;
+  }
 }
diff --git a/src/main/java/io/rpg/model/actions/condition/ConditionFactory.java b/src/main/java/io/rpg/model/actions/condition/ConditionFactory.java
@@ -3,7 +3,7 @@
 import io.rpg.config.model.ConditionConfigBundle;
 import org.jetbrains.annotations.Nullable;
 
-public class ConditionFactory {
+public final class ConditionFactory {
   @Nullable
   public static Condition fromConfig(ConditionConfigBundle config) {
     if (config == null) {

diff --git a/src/main/java/io/rpg/model/actions/condition/DefeatOpponentCondition.java b/src/main/java/io/rpg/model/actions/condition/DefeatOpponentCondition.java
@@ -15,7 +15,7 @@ public DefeatOpponentCondition(@NotNull final String tag) {
 
   @Override
   public boolean acceptEngine(ConditionEngine engine) {
-    return engine.evaluateDefeatOpponentCondition(this);
+    return engine.evaluate(this);
   }
 
   @NotNull

diff --git a/src/main/java/io/rpg/model/actions/condition/ItemRequiredCondition.java b/src/main/java/io/rpg/model/actions/condition/ItemRequiredCondition.java
@@ -15,7 +15,7 @@ public ItemRequiredCondition(@NotNull final String tag) {
 
   @Override
   public boolean acceptEngine(ConditionEngine engine) {
-    return engine.evaluateItemRequiredCondition(this);
+    return engine.evaluate(this);
   }
 
   @NotNull