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

Improve battle number validation

Browse Source
This commit is contained in:
Andrew Regan
2022-01-15 23:46:21 +00:00
parent b530057278
commit 416033b8e0
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,6 +1,8 @@
import java.io.PrintStream;
import java.util.InputMismatchException;
import java.util.List;
import java.util.Scanner;
import java.util.function.Function;
import java.util.function.Predicate;
import static java.util.stream.Collectors.joining;
@@ -116,15 +118,14 @@ public class CivilWar {
out.println();
out.print("WHICH BATTLE DO YOU WISH TO SIMULATE ? ");
var terminalInput = new Scanner(System.in);
var battleNumber = terminalInput.nextInt();
var battleNumber = inputInt(i -> i >= 1 || (i == 0 && this.currentBattle != null), i -> "BATTLE " + i + " NOT ALLOWED.");
if (battleNumber == 0 && this.currentBattle != null) {
if (battleNumber == 0) {
out.println(this.currentBattle.data.name + " INSTANT REPLAY");
return this.currentBattle;
}
if (battleNumber <= 0 || battleNumber > this.data.size()) {
if (battleNumber > this.data.size()) { // TYPE ANY OTHER NUMBER TO END THE SIMULATION
return null;
}
@@ -177,6 +178,8 @@ public class CivilWar {
// ONLY IN PRINTOUT IS CONFED INFLATION = I1+15%
// IF TWO GENERALS, INPUT CONFED. FIRST
var terminalInput = new Scanner(System.in);
for (int i = 0; i < numGenerals; i++) {
out.println();