diff --git a/src/main/java/edu/ntnu/idatt2001/WarGame/Controllers/BattleResultController.java b/src/main/java/edu/ntnu/idatt2001/WarGame/Controllers/BattleResultController.java index 8495d7332c2cdd37ba5ec9029324fcba58fcff3d..150f89ad6943ed878a546ba60a622bcf672f2fb9 100644 --- a/src/main/java/edu/ntnu/idatt2001/WarGame/Controllers/BattleResultController.java +++ b/src/main/java/edu/ntnu/idatt2001/WarGame/Controllers/BattleResultController.java @@ -98,6 +98,8 @@ public class BattleResultController implements Initializable { public void resetArmies(javafx.event.ActionEvent event) throws IOException{ currentHumanArmy = readArmyFromFile(new File("src/main/resources/Files/quickResetHumanArmy.csv")); currentOrcArmy = readArmyFromFile(new File("src/main/resources/Files/quickResetOrcArmy.csv")); + writeArmyToFile(new File("src/main/resources/Files/humanArmy.csv"), currentHumanArmy); + writeArmyToFile(new File("src/main/resources/Files/orcArmy.csv"), currentOrcArmy); displayBothArmies(); winningList.getItems().clear(); } diff --git a/src/main/resources/Files/humanArmy.csv b/src/main/resources/Files/humanArmy.csv index 8ae824cd97270defbdd5de61b927590c569ccdf6..141bf05394d618b3a3d6af5dd4a9ef71816b67de 100644 --- a/src/main/resources/Files/humanArmy.csv +++ b/src/main/resources/Files/humanArmy.csv @@ -1,11 +1,23 @@ HumanArmy -CommanderUnit,Kammdor,51 -CommanderUnit,Kammdor,27 -CommanderUnit,Kammdor,49 -CommanderUnit,Kammdor,56 -CommanderUnit,Kammdor,31 -CommanderUnit,Kammdor,40 -CommanderUnit,Kammdor,26 -CommanderUnit,Kammdor,38 -CommanderUnit,Kammdor,31 -CommanderUnit,Kammdor,82 +CommanderUnit,Cavalry,42 +CavalryUnit,Cavalry,2 +CavalryUnit,Cavalry,2 +CavalryUnit,Cavalry,4 +RangedUnit,Ranged,26 +RangedUnit,Ranged,24 +RangedUnit,Ranged,54 +RangedUnit,Ranged,14 +RangedUnit,Ranged,40 +RangedUnit,Ranged,6 +RangedUnit,Ranged,52 +RangedUnit,Ranged,24 +InfantryUnit,Infantry,29 +InfantryUnit,Infantry,55 +InfantryUnit,Infantry,61 +InfantryUnit,Infantry,36 +InfantryUnit,Infantry,55 +InfantryUnit,Infantry,21 +InfantryUnit,Infantry,51 +InfantryUnit,Infantry,46 +InfantryUnit,Infantry,57 +InfantryUnit,Infantry,50 diff --git a/src/main/resources/Files/quickResetHumanArmy.csv b/src/main/resources/Files/quickResetHumanArmy.csv index f71fa3bbec07017b5b89909598a347a3c1b58f6b..6194eb0d9aa7309c6d7956942ff5fe002e4eb4d3 100644 --- a/src/main/resources/Files/quickResetHumanArmy.csv +++ b/src/main/resources/Files/quickResetHumanArmy.csv @@ -1,11 +1,32 @@ HumanArmy -CommanderUnit,Kammdor,51 -CommanderUnit,Kammdor,38 -CommanderUnit,Kammdor,60 -CommanderUnit,Kammdor,78 -CommanderUnit,Kammdor,31 -CommanderUnit,Kammdor,40 -CommanderUnit,Kammdor,26 -CommanderUnit,Kammdor,60 -CommanderUnit,Kammdor,46 -CommanderUnit,Kammdor,82 +CommanderUnit,Cavalry,100 +CavalryUnit,Cavalry,100 +CavalryUnit,Cavalry,100 +CavalryUnit,Cavalry,100 +CavalryUnit,Cavalry,100 +CavalryUnit,Cavalry,100 +CavalryUnit,Cavalry,100 +CavalryUnit,Cavalry,100 +CavalryUnit,Cavalry,100 +CavalryUnit,Cavalry,100 +CavalryUnit,Cavalry,100 +RangedUnit,Ranged,100 +RangedUnit,Ranged,100 +RangedUnit,Ranged,100 +RangedUnit,Ranged,100 +RangedUnit,Ranged,100 +RangedUnit,Ranged,100 +RangedUnit,Ranged,100 +RangedUnit,Ranged,100 +RangedUnit,Ranged,100 +RangedUnit,Ranged,100 +InfantryUnit,Infantry,100 +InfantryUnit,Infantry,100 +InfantryUnit,Infantry,100 +InfantryUnit,Infantry,100 +InfantryUnit,Infantry,100 +InfantryUnit,Infantry,100 +InfantryUnit,Infantry,100 +InfantryUnit,Infantry,100 +InfantryUnit,Infantry,100 +InfantryUnit,Infantry,100 diff --git a/src/main/resources/Files/quickResetOrcArmy.csv b/src/main/resources/Files/quickResetOrcArmy.csv index bc723292f71578ead7a5d47eb2f703cf76d605ca..64164b4c4263a0b5fa522217e612b01beef58516 100644 --- a/src/main/resources/Files/quickResetOrcArmy.csv +++ b/src/main/resources/Files/quickResetOrcArmy.csv @@ -1,2 +1,32 @@ OrcArmy -CommanderUnit,1,100 +CavalryUnit,Cavalry,41 +CavalryUnit,Cavalry,2 +RangedUnit,Ranged,2 +RangedUnit,Ranged,4 +RangedUnit,Ranged,8 +RangedUnit,Ranged,36 +RangedUnit,Ranged,18 +RangedUnit,Ranged,16 +InfantryUnit,Infantry,2 +InfantryUnit,Infantry,20 +InfantryUnit,Infantry,6 +InfantryUnit,Infantry,14 +CommanderUnit,Commander,100 +CavalryUnit,Cavalry,100 +CavalryUnit,Cavalry,100 +CavalryUnit,Cavalry,100 +CavalryUnit,Cavalry,100 +CavalryUnit,Cavalry,100 +CavalryUnit,Cavalry,100 +CavalryUnit,Cavalry,100 +CavalryUnit,Cavalry,100 +RangedUnit,Ranged,100 +RangedUnit,Ranged,100 +RangedUnit,Ranged,100 +RangedUnit,Ranged,100 +InfantryUnit,Infantry,100 +InfantryUnit,Infantry,100 +InfantryUnit,Infantry,100 +InfantryUnit,Infantry,100 +InfantryUnit,Infantry,100 +InfantryUnit,Infantry,100 diff --git a/src/main/resources/Stylesheets/MainTheme.css b/src/main/resources/Stylesheets/MainTheme.css index 5c13d5bd9a1675eadfbbc3c2f63e57eafa3d9ab0..108104f6e3707ce0c8400c1fe72888a2e40cc647 100644 --- a/src/main/resources/Stylesheets/MainTheme.css +++ b/src/main/resources/Stylesheets/MainTheme.css @@ -15,11 +15,6 @@ -fx-font-size: 20px; } -.primaryBackground { - -fx-background-image: url("../Images/primaryBackground.jpg"); - -fx-background-size: 100% 100%; -} - .menuControllerBackground { -fx-background-image: url("../Images/MenuBackground.png"); -fx-background-size: 100% 100%;