From bd6dcb6e0577f3609c5fedc308a2afb4711a66bc Mon Sep 17 00:00:00 2001
From: pr1n19 <pr1n19@soton.ac.uk>
Date: Sun, 12 Jun 2022 15:38:02 +0100
Subject: [PATCH] Health box fixes

---
 ..._1.xml => Maven__org_openjfx_javafx_base_win_15_0_1.xml} | 4 ++--
 ...ml => Maven__org_openjfx_javafx_controls_win_15_0_1.xml} | 4 ++--
 ...ml => Maven__org_openjfx_javafx_graphics_win_15_0_1.xml} | 4 ++--
 javaFxTest.iml                                              | 6 +++---
 src/main/java/Character/CharacterInterface.java             | 2 +-
 src/main/java/Charms/FormOfGaia.java                        | 4 ++--
 6 files changed, 12 insertions(+), 12 deletions(-)
 rename .idea/libraries/{Maven__org_openjfx_javafx_base_linux_15_0_1.xml => Maven__org_openjfx_javafx_base_win_15_0_1.xml} (80%)
 rename .idea/libraries/{Maven__org_openjfx_javafx_controls_linux_15_0_1.xml => Maven__org_openjfx_javafx_controls_win_15_0_1.xml} (78%)
 rename .idea/libraries/{Maven__org_openjfx_javafx_graphics_linux_15_0_1.xml => Maven__org_openjfx_javafx_graphics_win_15_0_1.xml} (78%)

diff --git a/.idea/libraries/Maven__org_openjfx_javafx_base_linux_15_0_1.xml b/.idea/libraries/Maven__org_openjfx_javafx_base_win_15_0_1.xml
similarity index 80%
rename from .idea/libraries/Maven__org_openjfx_javafx_base_linux_15_0_1.xml
rename to .idea/libraries/Maven__org_openjfx_javafx_base_win_15_0_1.xml
index 86ab9ae..780aefe 100644
--- a/.idea/libraries/Maven__org_openjfx_javafx_base_linux_15_0_1.xml
+++ b/.idea/libraries/Maven__org_openjfx_javafx_base_win_15_0_1.xml
@@ -1,7 +1,7 @@
 <component name="libraryTable">
-  <library name="Maven: org.openjfx:javafx-base:linux:15.0.1">
+  <library name="Maven: org.openjfx:javafx-base:win:15.0.1">
     <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/openjfx/javafx-base/15.0.1/javafx-base-15.0.1-linux.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/openjfx/javafx-base/15.0.1/javafx-base-15.0.1-win.jar!/" />
     </CLASSES>
     <JAVADOC>
       <root url="jar://$MAVEN_REPOSITORY$/org/openjfx/javafx-base/15.0.1/javafx-base-15.0.1-javadoc.jar!/" />
diff --git a/.idea/libraries/Maven__org_openjfx_javafx_controls_linux_15_0_1.xml b/.idea/libraries/Maven__org_openjfx_javafx_controls_win_15_0_1.xml
similarity index 78%
rename from .idea/libraries/Maven__org_openjfx_javafx_controls_linux_15_0_1.xml
rename to .idea/libraries/Maven__org_openjfx_javafx_controls_win_15_0_1.xml
index 08eff80..befcda2 100644
--- a/.idea/libraries/Maven__org_openjfx_javafx_controls_linux_15_0_1.xml
+++ b/.idea/libraries/Maven__org_openjfx_javafx_controls_win_15_0_1.xml
@@ -1,7 +1,7 @@
 <component name="libraryTable">
-  <library name="Maven: org.openjfx:javafx-controls:linux:15.0.1">
+  <library name="Maven: org.openjfx:javafx-controls:win:15.0.1">
     <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/openjfx/javafx-controls/15.0.1/javafx-controls-15.0.1-linux.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/openjfx/javafx-controls/15.0.1/javafx-controls-15.0.1-win.jar!/" />
     </CLASSES>
     <JAVADOC>
       <root url="jar://$MAVEN_REPOSITORY$/org/openjfx/javafx-controls/15.0.1/javafx-controls-15.0.1-javadoc.jar!/" />
diff --git a/.idea/libraries/Maven__org_openjfx_javafx_graphics_linux_15_0_1.xml b/.idea/libraries/Maven__org_openjfx_javafx_graphics_win_15_0_1.xml
similarity index 78%
rename from .idea/libraries/Maven__org_openjfx_javafx_graphics_linux_15_0_1.xml
rename to .idea/libraries/Maven__org_openjfx_javafx_graphics_win_15_0_1.xml
index 0dd2b33..9395ad7 100644
--- a/.idea/libraries/Maven__org_openjfx_javafx_graphics_linux_15_0_1.xml
+++ b/.idea/libraries/Maven__org_openjfx_javafx_graphics_win_15_0_1.xml
@@ -1,7 +1,7 @@
 <component name="libraryTable">
-  <library name="Maven: org.openjfx:javafx-graphics:linux:15.0.1">
+  <library name="Maven: org.openjfx:javafx-graphics:win:15.0.1">
     <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/openjfx/javafx-graphics/15.0.1/javafx-graphics-15.0.1-linux.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/openjfx/javafx-graphics/15.0.1/javafx-graphics-15.0.1-win.jar!/" />
     </CLASSES>
     <JAVADOC>
       <root url="jar://$MAVEN_REPOSITORY$/org/openjfx/javafx-graphics/15.0.1/javafx-graphics-15.0.1-javadoc.jar!/" />
diff --git a/javaFxTest.iml b/javaFxTest.iml
index db8a360..a10dde2 100644
--- a/javaFxTest.iml
+++ b/javaFxTest.iml
@@ -11,10 +11,10 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="Maven: org.openjfx:javafx-controls:15.0.1" level="project" />
-    <orderEntry type="library" name="Maven: org.openjfx:javafx-controls:linux:15.0.1" level="project" />
+    <orderEntry type="library" name="Maven: org.openjfx:javafx-controls:win:15.0.1" level="project" />
     <orderEntry type="library" name="Maven: org.openjfx:javafx-graphics:15.0.1" level="project" />
-    <orderEntry type="library" name="Maven: org.openjfx:javafx-graphics:linux:15.0.1" level="project" />
+    <orderEntry type="library" name="Maven: org.openjfx:javafx-graphics:win:15.0.1" level="project" />
     <orderEntry type="library" name="Maven: org.openjfx:javafx-base:15.0.1" level="project" />
-    <orderEntry type="library" name="Maven: org.openjfx:javafx-base:linux:15.0.1" level="project" />
+    <orderEntry type="library" name="Maven: org.openjfx:javafx-base:win:15.0.1" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/src/main/java/Character/CharacterInterface.java b/src/main/java/Character/CharacterInterface.java
index 9743cb3..9178b4f 100644
--- a/src/main/java/Character/CharacterInterface.java
+++ b/src/main/java/Character/CharacterInterface.java
@@ -9,7 +9,7 @@ public class CharacterInterface {
     private static final Attributes attributes = new Attributes(new int[]{7,1,7, 20,1,11, 1,1,5});
     private static final Abilities abilities = new Abilities(new int[]{10,10,10,10,10,10,10,10,10,10}, new int[]{10,10,10,10,10,10,10,10,10,10}, new int[]{10,10,10,10,10});
     private static final Motes motes = new Motes(10, 5, 40, 3, 8);
-    private static final Health health = new Health(new int[]{0,0,0,-1,-1,-2}, new int[]{-2, -2, -2, -4}, 5);
+    private static final Health health = new Health(new int[]{0,0,0,0,0,-1,-1,-1,-1,-1,-1,-2,-2,-2,-2,-2,-999}, new int[]{-2, -2, -2, -4}, 5);
     private static final Soak soak = new Soak();
     private static final KnownCharms knownCharms = new KnownCharms();
     private static final Willpower willpower = new Willpower(1, 2, 3, 4);
diff --git a/src/main/java/Charms/FormOfGaia.java b/src/main/java/Charms/FormOfGaia.java
index d1df27f..c0c52a4 100644
--- a/src/main/java/Charms/FormOfGaia.java
+++ b/src/main/java/Charms/FormOfGaia.java
@@ -36,7 +36,7 @@ public class FormOfGaia extends Charm implements Supplemental {
         CharacterInterface.getSoak().removeBonus("Form of Gaia");
         CharacterInterface.getSoak().recalculateNaturalSoak();
         //Lose extra health boxes
-        CharacterInterface.getHealth().loseMaxHealth(new int[]{0,0,1,1,1,1,2,2,2,2});
+        CharacterInterface.getHealth().loseMaxHealth(new int[]{0,0,-1,-1,-1,-1,-2,-2,-2,-2});
     }
 
     /**
@@ -50,7 +50,7 @@ public class FormOfGaia extends Charm implements Supplemental {
         CharacterInterface.getSoak().increaseSoak("Form of Gaia", 12, 12, 0);
         CharacterInterface.getSoak().recalculateNaturalSoak();
         //Gain extra health boxes
-        CharacterInterface.getHealth().gainMaxHealth(new int[]{0,0,1,1,1,1,2,2,2,2});
+        CharacterInterface.getHealth().gainMaxHealth(new int[]{0,0,-1,-1,-1,-1,-2,-2,-2,-2});
     }
 
     @Override
-- 
GitLab