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 86ab9aef60031f007929fb29663520a851214e8c..780aefef631317c1a840fb3623982a7cb6a1c1b9 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 08eff80769579047604d1caf1e332115810c12bd..befcda23e38e8a09f0b422d8a6ecd756eeeb1f9c 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 0dd2b33028c0c0aa22a7d3fb55b9f48710ede39b..9395ad734ce29f443d79dcdd9cfeb1c8eda5ec36 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 db8a36093e926815cca45f781d4debfc8f66a6b1..a10dde21b79a539c8204c5cc83eec2c0eb7d75e9 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 9743cb331a9c6901a47f38cbba8ecc75129d1ebf..9178b4fc8e8e7818ec3dfe6d28fbfdc5907559cd 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 d1df27fab3cf92f64113e16800a1002bf0be975d..c0c52a4be83164886d54c289c821147d081834bc 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