Campaign fixes & balance

2020-11-23 10:36:41 -05:00
parent 075be1a862
commit dcbe06229c
9 changed files with 26 additions and 22 deletions
@@ -48,7 +48,8 @@ public class Objectives{
        }
    }

-    public static class SectorComplete extends SectorObjective{
+    public static class SectorComplete implements Objective{
+        public SectorPreset preset;

        public SectorComplete(SectorPreset zone){
            this.preset = zone;
@@ -67,11 +68,6 @@ public class Objectives{
        }
    }

-    //TODO merge
-    public abstract static class SectorObjective implements Objective{
-        public SectorPreset preset;
-    }
-
    /** Defines a specific objective for a game. */
    public interface Objective{

@@ -86,9 +82,5 @@ public class Objectives{
        default void build(Table table){

        }
-
-        default SectorPreset zone(){
-            return this instanceof SectorObjective ? ((SectorObjective)this).preset : null;
-        }
    }
 }