Skip to content
Snippets Groups Projects
Commit 930d36ef authored by pr1n19's avatar pr1n19
Browse files

Minor UI updates (Health colour & charm costs)

parent bd0670b8
No related branches found
No related tags found
No related merge requests found
<component name="libraryTable">
<library name="Maven: org.openjfx:javafx-base:win:15.0.1">
<library name="Maven: org.openjfx:javafx-base:linux:15.0.1">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/openjfx/javafx-base/15.0.1/javafx-base-15.0.1-win.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/openjfx/javafx-base/15.0.1/javafx-base-15.0.1-linux.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/org/openjfx/javafx-base/15.0.1/javafx-base-15.0.1-javadoc.jar!/" />
......
<component name="libraryTable">
<library name="Maven: org.openjfx:javafx-controls:win:15.0.1">
<library name="Maven: org.openjfx:javafx-controls:linux:15.0.1">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/openjfx/javafx-controls/15.0.1/javafx-controls-15.0.1-win.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/openjfx/javafx-controls/15.0.1/javafx-controls-15.0.1-linux.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/org/openjfx/javafx-controls/15.0.1/javafx-controls-15.0.1-javadoc.jar!/" />
......
<component name="libraryTable">
<library name="Maven: org.openjfx:javafx-graphics:win:15.0.1">
<library name="Maven: org.openjfx:javafx-graphics:linux:15.0.1">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/openjfx/javafx-graphics/15.0.1/javafx-graphics-15.0.1-win.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/openjfx/javafx-graphics/15.0.1/javafx-graphics-15.0.1-linux.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/org/openjfx/javafx-graphics/15.0.1/javafx-graphics-15.0.1-javadoc.jar!/" />
......
......@@ -7,5 +7,5 @@
</list>
</option>
</component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_15" project-jdk-name="15" project-jdk-type="JavaSDK" />
<component name="ProjectRootManager" version="2" languageLevel="JDK_15" project-jdk-name="openjdk-17" project-jdk-type="JavaSDK" />
</project>
\ No newline at end of file
......@@ -10,14 +10,11 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="Maven: org.openjfx:javafx-controls:linux: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-base:linux:15.0.1" level="project" />
<orderEntry type="library" name="Maven: org.openjfx:javafx-controls: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-controls:linux: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:win: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-base:15.0.1" level="project" />
<orderEntry type="library" name="Maven: org.openjfx:javafx-base:win:15.0.1" level="project" />
<orderEntry type="library" name="Maven: org.openjfx:javafx-base:linux:15.0.1" level="project" />
</component>
</module>
\ No newline at end of file
......@@ -122,7 +122,7 @@ public abstract class Charm {
//Add cost pane to window
StackPane costPane = new StackPane();
costPane.setAlignment(Pos.CENTER_RIGHT);
costPane.setPrefWidth(50);
costPane.setPrefWidth(75);
hBox.getChildren().add(costPane);
addCostsToWindow(costPane);
......@@ -144,30 +144,30 @@ public abstract class Charm {
*/
private void addCostsToWindow(StackPane pane) {
//Add mote cost to label
String label = (cost[0]+"m");
StringBuilder label = new StringBuilder(cost[0]+"m");
//Add willpower cost if above 0
if(cost[1] > 0) {
label += ", " + cost[1] + "w";
label.append(",").append(cost[1]).append("w");
}
//Add bashing cost if above 0
if(cost[2] > 0) {
label += ", " + cost[2] + "b";
label.append(",").append(cost[2]).append("b");
}
//Add lethal cost if above 0
if(cost[3] > 0) {
label += ", " + cost[3] + "l";
label.append(",").append(cost[3]).append("l");
}
//Add agg cost if above 0
if(cost[4] > 0) {
label += ", " + cost[4] + "a";
label.append(",").append(cost[4]).append("a");
}
//Add label to hBox
pane.getChildren().add(new Label(label));
pane.getChildren().add(new Label(label.toString()));
}
/**
......
......@@ -53,11 +53,11 @@
}
.uninjured {
-fx-fill: blue;
-fx-fill: green;
}
.bashing {
-fx-fill: green;
-fx-fill: blue;
}
.lethal {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment