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

develop #1

Merged
Meraj merged 8 commits from develop into main 2026-05-18 23:58:59 +00:00
Conversation 0 Commits 8 Files Changed 58
+18 -20
1 changed files with 18 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit f07c1416df - Show all commits
Java-Knight/src/main/java/org/project/MenuActions.java
+18 -20
View File
@@ -20,11 +20,6 @@ public class MenuActions {
public void startGame(Player player) { public void startGame(Player player) {
while (player.getKeysCollectedCount() < 3) { while (player.getKeysCollectedCount() < 3) {
// System.out.println("Keys collected: " + player.getStringKeysCollected());
// if (askInventory(player)) {
//
// };
askInventory(player); askInventory(player);
Enemy enemy = chooseEnemy(); Enemy enemy = chooseEnemy();
Entity winner = fight(player, enemy); Entity winner = fight(player, enemy);
@@ -34,22 +29,25 @@ public class MenuActions {
} }
} }
if (player.getKeysCollectedCount() == 3) { if (player.getKeysCollectedCount() == 3) {
askInventory(player); bossFight(player);
System.out.println("Congratulations! You have successfully collected all 3 keys\n" +
"You may now fight the Dragon");
System.out.println("Make sure to upgrade before entering the castle!");
askInventory(player);
System.out.println("Entering the castle...");
Entity winner = fight(player, new Dragon());
if (winner != player) {
System.out.println("You were killed by the dragon. Game over!\nreturning to main menu...");
} else {
System.out.println("Congratulations! You killed the dragon and saved Javanest!");
}
} }
} }
private void bossFight(Player player) {
System.out.println("Congratulations! You have successfully collected all 3 keys\n" +
"You may now fight the Dragon");
System.out.println("Make sure to upgrade before entering the castle!");
askInventory(player);
System.out.println("Entering the castle...");
Entity winner = fight(player, new Dragon());
if (winner != player) {
System.out.println("You were killed by the dragon. Game over!\nreturning to main menu...");
} else {
System.out.println("Congratulations! You killed the dragon and saved Javanest!");
}
}
private Enemy chooseEnemy() { private Enemy chooseEnemy() {
while (true) { while (true) {
Location location = new Location(); Location location = new Location();
@@ -145,14 +143,14 @@ public class MenuActions {
int choice = random.nextInt(3) + 1; int choice = random.nextInt(3) + 1;
switch (choice) { switch (choice) {
case 1: enemy.getWeapon().lightAttack(player); case 1: enemy.getWeapon().lightAttack(player);
System.out.println(enemy.getType() + "attacked(light)!"); return; System.out.println(enemy.getType() + " attacked(light)!"); return;
case 2: if(enemy.getMp() >= enemy.getWeapon().getManaCost()) { case 2: if(enemy.getMp() >= enemy.getWeapon().getManaCost()) {
enemy.getWeapon().heavyAttack(enemy, player); enemy.getWeapon().heavyAttack(enemy, player);
System.out.println(enemy.getType() + "attacked(Heavy)!"); return; System.out.println(enemy.getType() + " attacked(Heavy)!"); return;
} break; } break;
case 3: if (enemy.getMp() >= enemy.getWeapon().getSpecialMana()){ case 3: if (enemy.getMp() >= enemy.getWeapon().getSpecialMana()){
enemy.getWeapon().useSpecialAbility(enemy, player); enemy.getWeapon().useSpecialAbility(enemy, player);
System.out.println(enemy.getType() + "used special ability!"); return; System.out.println(enemy.getType() + " used special ability!"); return;
} break; } break;
// case 4: if (enemy.getMp() >= enemy.getDefendManaCost()) { // case 4: if (enemy.getMp() >= enemy.getDefendManaCost()) {
// enemy.defend(); return; // enemy.defend(); return;