HadiSharifi/JAVA-RPG
1
0
Fork 0
forked from AdvancedProgramming1404/HW-04-JAVA-KNIGHT
Code Pull Requests 1 Activity

fix bugs

Browse Source
This commit is contained in:
HadiSharifi
2026-05-11 12:04:39 +03:30
parent 01b8c225d9
commit 24175b68bf
3 changed files with 24 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Java-Knight/src/main/java/org/project/Game.java
+18 -20
View File
@@ -18,7 +18,7 @@ public class Game {
private final ArrayList<Location> locations;
private final Scanner sc;
private Player player;
private final ArrayList<Class<? extends Enemy>> collectedKeyTypes = new ArrayList<>();
private final List<String> collectedKeyTypes = new ArrayList<>();
public Game() {
sc = new Scanner(System.in);
@@ -72,7 +72,7 @@ public class Game {
private boolean canChallengeDragon() {
for (Enemy enemy : regularEnemies) {
if (!collectedKeyTypes.contains(enemy.getClass())) return false;
if (!player.hasKey(enemy)) return false;
}
return true;
}
@@ -103,19 +103,14 @@ public class Game {
private void displayKeys() {
System.out.println("=".repeat(30));
System.out.print("Keys collected: ");
List<String> collected = new ArrayList<>();
List<String> missing = new ArrayList<>();
for (Enemy enemy : regularEnemies) {
if (collectedKeyTypes.contains(enemy.getClass())) collected.add(enemy.getClass().getSimpleName());
else missing.add(enemy.getClass().getSimpleName());
if (player.hasKey(enemy) && !collectedKeyTypes.contains(enemy.getClass().getSimpleName()))
collectedKeyTypes.add(enemy.getClass().getSimpleName());
}
if (collected.isEmpty()) {
if (collectedKeyTypes.isEmpty()) {
System.out.println("none");
} else {
System.out.println(String.join(", ", collected));
}
if (!missing.isEmpty()) {
System.out.println("Still needed: " + String.join(", ", missing));
System.out.println(String.join(", ", collectedKeyTypes));
}
System.out.println("=".repeat(30));
}
@@ -142,8 +137,17 @@ public class Game {
private Enemy chooseEnemy(Location location) {
int index = new Random().nextInt(location.getEnemies().size());
Enemy enemy = location.getEnemies().get(index);
enemy.setHP(enemy.getMaxHP());
enemy.setMP(enemy.getMaxMP());
if (enemy instanceof Vampire) {
enemy = new Vampire();
}
if (enemy instanceof Goblin) {
enemy = new Goblin();
}
if (enemy instanceof Skeleton) {
enemy = new Skeleton();
}
System.out.println("The enemy is: " + enemy.getClass().getSimpleName());
return enemy;
}
@@ -191,15 +195,9 @@ public class Game {
player.setHP(player.getMaxHP());
player.setMP(player.getMaxMP());
if (!(enemy instanceof Dragon)) {
Class<? extends Enemy> type = enemy.getClass();
if (!collectedKeyTypes.contains(type)) {
collectedKeyTypes.add(type);
if (!(enemy instanceof Dragon) && enemy.dropKey()) {
System.out.println(enemy.getClass().getSimpleName() + "'s key dropped!");
player.achieveKey(enemy);
} else {
System.out.println("You already have " + enemy.getClass().getSimpleName() + "'s key.");
}
}
}
}