From 01b8c225d96edc7ea2d9dbf758e05445f864523a Mon Sep 17 00:00:00 2001 From: HadiSharifi Date: Sun, 10 May 2026 22:15:11 +0330 Subject: [PATCH] fix bugs and add status prints --- .../src/main/java/org/project/entity/enemies/Dragon.java | 2 +- .../src/main/java/org/project/entity/enemies/Enemy.java | 7 ++++++- .../src/main/java/org/project/entity/enemies/Goblin.java | 4 ++-- .../main/java/org/project/entity/enemies/Skeleton.java | 4 ++-- .../src/main/java/org/project/entity/enemies/Vampire.java | 4 ++-- .../main/java/org/project/entity/players/Assassin.java | 8 ++++---- .../src/main/java/org/project/entity/players/Knight.java | 8 ++++---- .../src/main/java/org/project/entity/players/Wizard.java | 8 ++++---- 8 files changed, 25 insertions(+), 20 deletions(-) diff --git a/Java-Knight/src/main/java/org/project/entity/enemies/Dragon.java b/Java-Knight/src/main/java/org/project/entity/enemies/Dragon.java index c7b2409..e29c777 100644 --- a/Java-Knight/src/main/java/org/project/entity/enemies/Dragon.java +++ b/Java-Knight/src/main/java/org/project/entity/enemies/Dragon.java @@ -54,7 +54,7 @@ public class Dragon extends Enemy { setHP(getHP() + health); setMP(getMP() - 20); } else { - System.out.println("Dragon has no mana to regenerate!"); + System.out.println("Dragon has no Mana to regenerate!"); setSuccessfulAction(false); } } diff --git a/Java-Knight/src/main/java/org/project/entity/enemies/Enemy.java b/Java-Knight/src/main/java/org/project/entity/enemies/Enemy.java index d2845a5..b4dd914 100644 --- a/Java-Knight/src/main/java/org/project/entity/enemies/Enemy.java +++ b/Java-Knight/src/main/java/org/project/entity/enemies/Enemy.java @@ -43,7 +43,7 @@ public abstract class Enemy implements Entity { setMP(getMP() - weapon.getManaCost()); } else { - System.out.println("not enough mana"); + System.out.println("Not Enough MP for Attack"); setSuccessfulAction(false); } } @@ -115,6 +115,11 @@ public abstract class Enemy implements Entity { @Override public void setMP(int mp) { this.mp = mp; + if (mp > maxMP) { + mp = maxMP; + } else if (mp < 0) { + mp = 0; + } } @Override diff --git a/Java-Knight/src/main/java/org/project/entity/enemies/Goblin.java b/Java-Knight/src/main/java/org/project/entity/enemies/Goblin.java index 07b60fc..ff833fe 100644 --- a/Java-Knight/src/main/java/org/project/entity/enemies/Goblin.java +++ b/Java-Knight/src/main/java/org/project/entity/enemies/Goblin.java @@ -23,7 +23,7 @@ public class Goblin extends Enemy{ setMP(getMP() - 20); } else { - System.out.println("Not enough MP"); + System.out.println("Not Enough MP for Defend"); setSuccessfulAction(false); } } @@ -35,7 +35,7 @@ public class Goblin extends Enemy{ setMP(getMP() - 15); } else { - System.out.println("Not enough MP"); + System.out.println("Not Enough MP for Heal"); setSuccessfulAction(false); } } diff --git a/Java-Knight/src/main/java/org/project/entity/enemies/Skeleton.java b/Java-Knight/src/main/java/org/project/entity/enemies/Skeleton.java index c177c90..f7154cb 100644 --- a/Java-Knight/src/main/java/org/project/entity/enemies/Skeleton.java +++ b/Java-Knight/src/main/java/org/project/entity/enemies/Skeleton.java @@ -25,7 +25,7 @@ public class Skeleton extends Enemy{ setMP(getMP() - 8); } else { - System.out.println("Not enough MP"); + System.out.println("Not Enough MP for Defend"); setSuccessfulAction(false); } } @@ -37,7 +37,7 @@ public class Skeleton extends Enemy{ setMP(getMP() - 18); } else { - System.out.println("Not enough MP"); + System.out.println("Not enough MP for Heal"); setSuccessfulAction(false); } } diff --git a/Java-Knight/src/main/java/org/project/entity/enemies/Vampire.java b/Java-Knight/src/main/java/org/project/entity/enemies/Vampire.java index 8be755d..82a01f9 100644 --- a/Java-Knight/src/main/java/org/project/entity/enemies/Vampire.java +++ b/Java-Knight/src/main/java/org/project/entity/enemies/Vampire.java @@ -30,7 +30,7 @@ public class Vampire extends Enemy{ setMP(getMP() - 15); } else { - System.out.println("Not enough MP"); + System.out.println("Not Enough MP for Defend"); setSuccessfulAction(false); } } @@ -42,7 +42,7 @@ public class Vampire extends Enemy{ setMP(getMP() - 12); } else { - System.out.println("Not enough MP"); + System.out.println("Not Enough MP for Heal"); setSuccessfulAction(false); } } diff --git a/Java-Knight/src/main/java/org/project/entity/players/Assassin.java b/Java-Knight/src/main/java/org/project/entity/players/Assassin.java index 9a5d3e2..3f8414e 100644 --- a/Java-Knight/src/main/java/org/project/entity/players/Assassin.java +++ b/Java-Knight/src/main/java/org/project/entity/players/Assassin.java @@ -42,7 +42,7 @@ public class Assassin extends Player { setAttackMultiplier(1); setMP(getMP() - weapon.getManaCost()); } else { - System.out.println("Not enough MP"); + System.out.println("Not Enough MP for Attack"); setSuccessfulAction(false); } @@ -55,7 +55,7 @@ public class Assassin extends Player { setMP(getMP() - 12); } else { - System.out.println("Not enough MP"); + System.out.println("Not Enough MP for Defend"); setSuccessfulAction(false); } } @@ -68,7 +68,7 @@ public class Assassin extends Player { setMP(getMP() - 25); } else { - System.out.println("Not enough MP"); + System.out.println("Not Enough MP for using special ability"); setSuccessfulAction(false); } } @@ -80,7 +80,7 @@ public class Assassin extends Player { setMP(getMP() - 12); } else { - System.out.println("Not enough MP"); + System.out.println("Not Enough MP for Heal"); setSuccessfulAction(false); } } diff --git a/Java-Knight/src/main/java/org/project/entity/players/Knight.java b/Java-Knight/src/main/java/org/project/entity/players/Knight.java index ce36785..8a79a99 100644 --- a/Java-Knight/src/main/java/org/project/entity/players/Knight.java +++ b/Java-Knight/src/main/java/org/project/entity/players/Knight.java @@ -34,7 +34,7 @@ public class Knight extends Player { setMP(getMP() - weapon.getManaCost()); } else { - System.out.println("Not enough MP"); + System.out.println("Not Enough MP for Attack"); setSuccessfulAction(false); } } @@ -46,7 +46,7 @@ public class Knight extends Player { setMP(getMP() - 16); } else { - System.out.println("Not enough MP"); + System.out.println("Not Enough MP for Defend"); setSuccessfulAction(false); } } @@ -62,7 +62,7 @@ public class Knight extends Player { setMP(getMP() - 30); } else { - System.out.println("Not enough MP"); + System.out.println("Not Enough MP for using special ability"); setUsingSpecialAbility(false); } } @@ -74,7 +74,7 @@ public class Knight extends Player { setMP(getMP() - 10); } else { - System.out.println("Not enough MP"); + System.out.println("Not Enough MP for Heal"); setSuccessfulAction(false); } } diff --git a/Java-Knight/src/main/java/org/project/entity/players/Wizard.java b/Java-Knight/src/main/java/org/project/entity/players/Wizard.java index 90e7e55..dec4093 100644 --- a/Java-Knight/src/main/java/org/project/entity/players/Wizard.java +++ b/Java-Knight/src/main/java/org/project/entity/players/Wizard.java @@ -34,7 +34,7 @@ public class Wizard extends Player{ setMP(getMP() - weapon.getManaCost()); } else { - System.out.println("Not enough MP"); + System.out.println("Not Enough MP to Attack"); setSuccessfulAction(false); } } @@ -46,7 +46,7 @@ public class Wizard extends Player{ setMP(getMP() - 15); } else { - System.out.println("Not enough MP"); + System.out.println("Not Enough MP for Defend"); setSuccessfulAction(false); } } @@ -63,7 +63,7 @@ public class Wizard extends Player{ System.out.println("Wizard absorbs residual magic — restored 10 HP!"); } else { - System.out.println("Not enough MP"); + System.out.println("Not Enough MP for using SpecialAbility"); setSuccessfulAction(false); } } @@ -75,7 +75,7 @@ public class Wizard extends Player{ setMP(getMP() - 10); } else { - System.out.println("Not enough MP"); + System.out.println("Not Enough MP for Heal"); setSuccessfulAction(false); } }