gitea-mirror/basic-computer-games
1
0
Fork 0
mirror of https://github.com/coding-horror/basic-computer-games.git synced 2025-12-24 20:10:15 -08:00
Code Issues Packages Projects Releases Wiki Activity

Fix budget validation; restore "keep same allocations"

Browse Source
This commit is contained in:
Andrew Regan
2022-01-15 22:54:13 +00:00
parent 48edb2c5d7
commit c256a7b0fb
1 changed files with 21 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
27_Civil_War/java/src/CivilWar.java
View File

@@ -190,27 +190,31 @@ public class CivilWar {
currentResources = resources.union;
}
out.println("HOW MUCH DO YOU WISH TO SPEND FOR");
out.print("- FOOD...... ? ");
var F = terminalInput.nextInt();
if (F == 0) {
if (this.revenue.confederate != 0) {
out.println("ASSUME YOU WANT TO KEEP SAME ALLOCATIONS");
out.println();
var validInputs = false;
while (!validInputs) {
out.println("HOW MUCH DO YOU WISH TO SPEND FOR");
out.print("- FOOD...... ? ");
var food = terminalInput.nextInt();
if (food == 0) {
if (this.revenue.confederate != 0) {
out.println("ASSUME YOU WANT TO KEEP SAME ALLOCATIONS");
out.println();
}
} else {
currentResources.food = food;
}
}
currentResources.food = F;
out.print("- SALARIES.. ? ");
currentResources.salaries = terminalInput.nextInt();
out.print("- SALARIES.. ? ");
currentResources.salaries = terminalInput.nextInt();
out.print("- AMMUNITION ? ");
currentResources.ammunition = terminalInput.nextInt(); // FIXME Retry if -ve
out.print("- AMMUNITION ? ");
currentResources.ammunition = terminalInput.nextInt(); // FIXME Retry if -ve
if (currentResources.getTotal() > currentResources.budget) {
out.println("THINK AGAIN! YOU HAVE ONLY $" + currentResources.budget);
// FIXME Redo inputs from Food
if (currentResources.getTotal() > currentResources.budget) {
out.println("THINK AGAIN! YOU HAVE ONLY $" + currentResources.budget);
} else {
validInputs = true;
}
}
}