From 8b281b5654e1ccdb1ff863e7b3d9a7d806d42e74 Mon Sep 17 00:00:00 2001 From: SowinskiBraeden Date: Mon, 22 Sep 2025 13:41:11 -0700 Subject: [PATCH 1/2] ensure lab02 params are final --- .gitignore | 2 ++ .idea/workspace.xml | 16 +++++++--------- .../ca/bcit/comp2522/lab02/DamageException.java | 2 +- src/code/ca/bcit/comp2522/lab02/Dragon.java | 5 +++-- .../ca/bcit/comp2522/lab02/HealingException.java | 2 +- 5 files changed, 14 insertions(+), 13 deletions(-) diff --git a/.gitignore b/.gitignore index f6e094f..005ff6e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,5 @@ # Compiled files /out/* *.class + +.idea/* diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 84263ca..b4ff339 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -6,12 +6,9 @@ - - - - - - + + + diff --git a/src/code/ca/bcit/comp2522/lab02/DamageException.java b/src/code/ca/bcit/comp2522/lab02/DamageException.java index b48c106..a17342b 100644 --- a/src/code/ca/bcit/comp2522/lab02/DamageException.java +++ b/src/code/ca/bcit/comp2522/lab02/DamageException.java @@ -8,7 +8,7 @@ package ca.bcit.comp2522.lab02; * @version 1.0.0 */ public class DamageException extends RuntimeException { - public DamageException(String message) { + public DamageException(final String message) { super(message); } } diff --git a/src/code/ca/bcit/comp2522/lab02/Dragon.java b/src/code/ca/bcit/comp2522/lab02/Dragon.java index b0ad86e..fe7515e 100644 --- a/src/code/ca/bcit/comp2522/lab02/Dragon.java +++ b/src/code/ca/bcit/comp2522/lab02/Dragon.java @@ -22,8 +22,9 @@ public class Dragon extends Creature { * @param firePower to verify * @throws IllegalArgumentException if firePower is outside valid range */ - private static void validateFirePower(int firePower) - throws IllegalArgumentException { + private static void validateFirePower(final int firePower) + throws IllegalArgumentException + { if (firePower < MIN_FIRE_POWER || firePower > MAX_FIRE_POWER) { throw new IllegalArgumentException("Fire power is outside of valid range."); diff --git a/src/code/ca/bcit/comp2522/lab02/HealingException.java b/src/code/ca/bcit/comp2522/lab02/HealingException.java index 5cb559a..1195f77 100644 --- a/src/code/ca/bcit/comp2522/lab02/HealingException.java +++ b/src/code/ca/bcit/comp2522/lab02/HealingException.java @@ -8,7 +8,7 @@ package ca.bcit.comp2522.lab02; * @version 1.0.0 */ public class HealingException extends RuntimeException { - public HealingException(String message) { + public HealingException(final String message) { super(message); } } From 93351ea56f5b8a244940055d3c742b6f4b1a1c5b Mon Sep 17 00:00:00 2001 From: SowinskiBraeden Date: Mon, 22 Sep 2025 13:43:15 -0700 Subject: [PATCH 2/2] clean --- src/code/ca/bcit/comp2522/lab02/Creature.java | 4 +- src/code/ca/bcit/comp2522/lab02/Dragon.java | 4 +- src/code/ca/bcit/comp2522/lab02/Orc.java | 1 - .../ca/bcit/comp2522/project/Country.java | 25 +++++++++ src/code/ca/bcit/comp2522/project/Main.java | 54 +++++++++++++++++++ 5 files changed, 83 insertions(+), 5 deletions(-) create mode 100644 src/code/ca/bcit/comp2522/project/Country.java create mode 100644 src/code/ca/bcit/comp2522/project/Main.java diff --git a/src/code/ca/bcit/comp2522/lab02/Creature.java b/src/code/ca/bcit/comp2522/lab02/Creature.java index a1d8ba1..c6d9210 100644 --- a/src/code/ca/bcit/comp2522/lab02/Creature.java +++ b/src/code/ca/bcit/comp2522/lab02/Creature.java @@ -160,15 +160,15 @@ public class Creature { */ public String getDetails() { StringBuilder builder; + builder = new StringBuilder(); + builder.append("Is alive: " + this.isAlive()); builder.append("Name: " + this.name); builder.append("Date of birth: " + this.dateOfBirth); builder.append("Age: " + this.getAgeYears()); builder.append("Health: " + this.health); - - return builder.toString(); } diff --git a/src/code/ca/bcit/comp2522/lab02/Dragon.java b/src/code/ca/bcit/comp2522/lab02/Dragon.java index 0bcf686..e7ec08b 100644 --- a/src/code/ca/bcit/comp2522/lab02/Dragon.java +++ b/src/code/ca/bcit/comp2522/lab02/Dragon.java @@ -61,7 +61,9 @@ public class Dragon extends Creature { @Override public String getDetails() { StringBuilder builder; + builder = new StringBuilder(); + builder.append("Is alive: " + this.isAlive()); builder.append(" Name: " + this.getName()); builder.append(" Date of birth: " + (this.getDateOfBirth()).getYyyyMmDd()); @@ -69,8 +71,6 @@ public class Dragon extends Creature { builder.append(" Health: " + this.getHealth()); builder.append(" FirePower: " + this.firePower); - - return builder.toString(); } diff --git a/src/code/ca/bcit/comp2522/lab02/Orc.java b/src/code/ca/bcit/comp2522/lab02/Orc.java index 58a1a07..ddd0223 100644 --- a/src/code/ca/bcit/comp2522/lab02/Orc.java +++ b/src/code/ca/bcit/comp2522/lab02/Orc.java @@ -103,5 +103,4 @@ public class Orc extends Creature { } } - } diff --git a/src/code/ca/bcit/comp2522/project/Country.java b/src/code/ca/bcit/comp2522/project/Country.java new file mode 100644 index 0000000..386f66a --- /dev/null +++ b/src/code/ca/bcit/comp2522/project/Country.java @@ -0,0 +1,25 @@ +package ca.bcit.comp2522.project; + +import java.util.Arrays; + +/** + * Country class + * + * @author Braeden Sowinski + * @version 1.0.0 + */ +public class Country { + final String name; + final String capitalCityName; + final String[] facts; + + Country( + final String name, + final String capitalCityName, + final String[] facts + ) { + this.name = name; + this.capitalCityName = capitalCityName; + this.facts = facts; + } +} diff --git a/src/code/ca/bcit/comp2522/project/Main.java b/src/code/ca/bcit/comp2522/project/Main.java new file mode 100644 index 0000000..c64aee2 --- /dev/null +++ b/src/code/ca/bcit/comp2522/project/Main.java @@ -0,0 +1,54 @@ +package ca.bcit.comp2522.project; + +import java.util.Scanner; + +/** + * Main program entry to access a games menu + * + * @author Braeden Sowinski + * @version 1.0.0 + */ +public class Main { + public static void main(final String[] args) { + final Scanner scanner; + + scanner = new Scanner(System.in); + + boolean run = true; + + do { + final String input; + + System.out.println("Select a game: "); + System.out.println("Word Game (W)"); + System.out.println("Number Game (N)"); + System.out.println("My Game (M)"); + System.out.println("Quit (Q)"); + System.out.print("> "); + + input = scanner.nextLine().toUpperCase(); + + switch (input) { + case "W": + System.out.println("Word game..."); + break; + case "N": + System.out.println("Number game..."); + break; + case "M": + System.out.println("My game..."); + break; + case "Q": + System.out.println("Quitting..."); + run = false; + break; + default: + System.out.println("Invalid input: " + input); + break; + } + + } while (run); + + scanner.close(); + } +}