Updated charm infrastructure & baggage

src/main/java/Character/CharacterInterface.java

@@ -21,6 +21,7 @@ public class CharacterInterface {
     /**
      * Spend the cost of a charm
      * motes, willpower, bashing health, lethal health, agg health
+     * True if personal
      */
     public static void spendCost(int[] cost, boolean personal){
         //Spend the motes
@@ -57,7 +58,8 @@ public class CharacterInterface {
     public static CharmList getCharmList() {
         return charmList;
     }
-
-
+    public static StaticValues getStaticValues() {
+        return staticValues;
+    }
 
 }

src/main/java/Character/CharmList.java

@@ -2,6 +2,7 @@ package Character;
 
 import CharmBaggage.Charm;
 import CharmBaggage.Supplemental;
+import Charms.CrossedWingsDenial;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -20,7 +21,7 @@ public class CharmList {
     }
 
     /**
-     * Create array list for each ability
+     * Create array list for each ability & static value
      */
     private void setUpSupplementalList() {
         //Add all list
@@ -37,6 +38,11 @@ public class CharmList {
         for(String ability: CharacterInterface.getAbilities().getWisdomNames()) {
             supplementalCharms.put(ability, new ArrayList<>());
         }
+        //Add Static Lists
+        supplementalCharms.put("Parry", new ArrayList<>());
+        supplementalCharms.put("Dodge", new ArrayList<>());
+        supplementalCharms.put("MentalParry", new ArrayList<>());
+        supplementalCharms.put("MentalDodge", new ArrayList<>());
     }
 
     /**
@@ -50,6 +56,6 @@ public class CharmList {
      * Add to other charm list
      */
     private void addOtherCharms() {
-
+        charms.add(new CrossedWingsDenial());
     }
 }

src/main/java/Character/StaticValues.java

@@ -16,4 +16,6 @@ public class StaticValues {
 
     }
 
+
+
 }

src/main/java/Character/Willpower.java

@@ -3,11 +3,13 @@ package Character;
 import javafx.beans.property.SimpleIntegerProperty;
 
 public class Willpower {
+    private final SimpleIntegerProperty maximumWillpower;
     private final SimpleIntegerProperty willpower;
     private final int[] virtues;
 
     public Willpower(int compassion, int conviction, int temperance, int valour) {
-        willpower = new SimpleIntegerProperty(10);
+        maximumWillpower = new SimpleIntegerProperty(10);
+        willpower = new SimpleIntegerProperty(maximumWillpower.getValue());
         virtues = new int[]{compassion, conviction, temperance, valour};
     }
 

src/main/java/CharmBaggage/Charm.java

@@ -6,10 +6,12 @@ public abstract class Charm {
     protected final String name;
     //motes, willpower, bashing health, lethal health, agg health
     protected final int[] cost;
-    //0:Instant, 1:Action, 2:Scene, 3:Indefinite
+    //0:Instant, 1:Short, 2:Scene, 3:Indefinite
     protected final int duration;
     //True if combo okay, false otherwise
     protected final boolean comboOkay;
+    //Single line of text about the charm
+    protected String note;
 
 
     public Charm(String charmName, int[] charmCost, int charmDuration, boolean charmComboOkay) {
@@ -37,4 +39,12 @@ public abstract class Charm {
     public int[] getCost() {
         return cost;
     }
+
+    /**
+     * Get note from charm
+     */
+    public String getNote() {
+        return note;
+    }
+
 }

src/main/java/CharmBaggage/Counter.java

+package CharmBaggage;
+
+/**
+ * For charms which are used in response to attacks
+ */
+public interface Counter {
+
+
+
+}

src/main/java/CharmBaggage/Supplemental.java

 package CharmBaggage;
 
+/**
+ * For charms which apply to ability checks & static values
+ */
 public interface Supplemental {
 
 }

src/main/java/Charms/CrossedWingsDenial.java

@@ -6,6 +6,7 @@ public class CrossedWingsDenial extends Charm {
 
     public CrossedWingsDenial() {
         super("Crossed Wings Denial", new int[]{0,0,0, 0,0}, 0, true);
+        note = "Perfect Parry, Step 2, No physical attacks next action";
     }
 
     /**