diff --git a/src/main/java/re/forestier/edu/rpg/Adventurer.java b/src/main/java/re/forestier/edu/rpg/Adventurer.java
index b8efe079ec42b512fc51895276e34029fa97ef45..0ba1aa4ff19d4f11cc4e09404a6ddbe3dd6a8210 100644
--- a/src/main/java/re/forestier/edu/rpg/Adventurer.java
+++ b/src/main/java/re/forestier/edu/rpg/Adventurer.java
@@ -4,7 +4,7 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Map;
-public class Adventurer extends player {
+public class Adventurer extends Player {
public Adventurer(String playerName, String avatar_name, int money, ArrayList<String> inventory) {
@@ -35,10 +35,10 @@ public class Adventurer extends player {
public void majFinDeTour() {
super.majFinDeTour();
- if (currenthealthpoints < healthpoints / 2) {
- currenthealthpoints+=2;
+ if (currentHealthPoints < healthPoints / 2) {
+ currentHealthPoints +=2;
if(getLevel() < 3) {
- currenthealthpoints-=1;
+ currentHealthPoints -=1;
}
}
super.maxHealth();
diff --git a/src/main/java/re/forestier/edu/rpg/Affichage.java b/src/main/java/re/forestier/edu/rpg/Affichage.java
index 41d53fb117d3820bbc8278dc3d8f993029f4eb08..562daee08818bd47ce702f0247e21a1ce1ab26f6 100644
--- a/src/main/java/re/forestier/edu/rpg/Affichage.java
+++ b/src/main/java/re/forestier/edu/rpg/Affichage.java
@@ -2,8 +2,8 @@ package re.forestier.edu.rpg;
public class Affichage {
- public static String afficherJoueur(player player) {
- final String[] finalString = {"Joueur " + player.Avatar_name + " joué par " + player.playerName};
+ public static String afficherJoueur(Player player) {
+ final String[] finalString = {"Joueur " + player.avatarName + " joué par " + player.playerName};
finalString[0] += "\nNiveau : " + player.getLevel() + " (XP totale : " + player.xp + ")";
finalString[0] += "\n\nCapacités :";
player.abilities.forEach((name, level) -> {
diff --git a/src/main/java/re/forestier/edu/rpg/Archer.java b/src/main/java/re/forestier/edu/rpg/Archer.java
index 49809760984f024779ddee804e4dbb692ff3a9d6..35ddd7e9ef962849c89595a26cc574b8d40338f3 100644
--- a/src/main/java/re/forestier/edu/rpg/Archer.java
+++ b/src/main/java/re/forestier/edu/rpg/Archer.java
@@ -4,7 +4,7 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Map;
-public class Archer extends player {
+public class Archer extends Player {
public Archer(String playerName, String avatar_name, int money, ArrayList<String> inventory) {
super(playerName, avatar_name, money, inventory);
@@ -33,11 +33,11 @@ public class Archer extends player {
public void majFinDeTour() {
super.majFinDeTour();
- if (currenthealthpoints < healthpoints / 2) {
+ if (currentHealthPoints < healthPoints / 2) {
- currenthealthpoints += 1;
+ currentHealthPoints += 1;
if (inventory.contains("Magic Bow")) {
- currenthealthpoints += currenthealthpoints / 8 - 1;
+ currentHealthPoints += currentHealthPoints / 8 - 1;
}
}
diff --git a/src/main/java/re/forestier/edu/rpg/Dwarf.java b/src/main/java/re/forestier/edu/rpg/Dwarf.java
index cd5fd026760d8dd137fdf0e5f7062fa1f2c781ae..64122ea14d6cac98d8af3523d4ce76bd97070e09 100644
--- a/src/main/java/re/forestier/edu/rpg/Dwarf.java
+++ b/src/main/java/re/forestier/edu/rpg/Dwarf.java
@@ -4,7 +4,7 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Map;
-public class Dwarf extends player{
+public class Dwarf extends Player {
public Dwarf(String playerName, String avatar_name, int money, ArrayList<String> inventory) {
super(playerName, avatar_name, money, inventory);
@@ -34,12 +34,12 @@ public class Dwarf extends player{
public void majFinDeTour() {
super.majFinDeTour();
- if(currenthealthpoints < healthpoints/2) {
+ if(currentHealthPoints < healthPoints /2) {
if(inventory.contains("Holy Elixir")) {
- currenthealthpoints+=1;
+ currentHealthPoints +=1;
}
- currenthealthpoints+=1;
+ currentHealthPoints +=1;
}
super.maxHealth();
diff --git a/src/main/java/re/forestier/edu/rpg/player.java b/src/main/java/re/forestier/edu/rpg/Player.java
similarity index 84%
rename from src/main/java/re/forestier/edu/rpg/player.java
rename to src/main/java/re/forestier/edu/rpg/Player.java
index 205b00c7b7d3e3a4cd85bf36c4c105bd4331cabb..6a52518290c1e0e956f3368ef718f64f63777677 100644
--- a/src/main/java/re/forestier/edu/rpg/player.java
+++ b/src/main/java/re/forestier/edu/rpg/Player.java
@@ -4,16 +4,16 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.Random;
-public abstract class player {
+public abstract class Player {
public String playerName;
- public String Avatar_name;
+ public String avatarName;
public Integer money;
public Integer lvlXp;
public Integer level;
- public Integer healthpoints;
- public Integer currenthealthpoints;
+ public Integer healthPoints;
+ public Integer currentHealthPoints;
protected Integer xp;
private final static String[] objectList = {"Lookout Ring : Prevents surprise attacks","Scroll of Stupidity : INT-2 when applied to an enemy", "Draupnir : Increases XP gained by 100%", "Magic Charm : Magic +10 for 5 rounds", "Magic Bow : Bow is magic !","Rune Staff of Curse : May burn your ennemies... Or yourself. Who knows?", "Combat Edge : Well, that's an edge", "Holy Elixir : Recover your HP"
@@ -23,10 +23,10 @@ public abstract class player {
public HashMap<String, Integer> abilities;
public ArrayList<String> inventory;
- public player(String playerName, String avatar_name, int money, ArrayList<String> inventory) {
+ public Player(String playerName, String avatar_name, int money, ArrayList<String> inventory) {
this.playerName = playerName;
- Avatar_name = avatar_name;
+ this.avatarName = avatar_name;
this.money = money;
this.inventory = inventory;
this.level = 1;
@@ -39,7 +39,7 @@ public abstract class player {
public void changeMoney(Integer amount) throws IllegalArgumentException {
if (money + amount < 0) {
- throw new IllegalArgumentException("Player can't have a negative money!");
+ throw new IllegalArgumentException("Player can't have negative money!");
}
money += amount;
}
@@ -67,15 +67,15 @@ public abstract class player {
}
protected void majFinDeTour() {
- if(currenthealthpoints == 0) {
+ if(currentHealthPoints == 0) {
System.out.println("Le joueur est KO !");
}
//The rest of the method is implemented in the subclasses
}
protected void maxHealth() {
- if (currenthealthpoints >= healthpoints) {
- currenthealthpoints = healthpoints;
+ if (currentHealthPoints >= healthPoints) {
+ currentHealthPoints = healthPoints;
}
}
diff --git a/src/test/java/re/forestier/edu/UnitTests.java b/src/test/java/re/forestier/edu/UnitTests.java
index 953eb34f31e03f241ac26e0111604fafef47db7d..ad22b741c2f54b0dc472b677a2676a8285c29672 100644
--- a/src/test/java/re/forestier/edu/UnitTests.java
+++ b/src/test/java/re/forestier/edu/UnitTests.java
@@ -73,8 +73,8 @@ public class UnitTests {
void testDeath() {
Archer deadPlayer = new Archer("Florian", "Gnognak le Barbare", 200, new ArrayList<>());
- deadPlayer.healthpoints = 50;
- deadPlayer.currenthealthpoints = 0;
+ deadPlayer.healthPoints = 50;
+ deadPlayer.currentHealthPoints = 0;
deadPlayer.majFinDeTour();
}
@@ -84,19 +84,19 @@ public class UnitTests {
void testHolyElixir() {
Dwarf holyElixirPlayer = new Dwarf("Florian", "Gnognak le Barbare", 200, new ArrayList<>());
Dwarf normalPlayer = new Dwarf("Florian", "Gnognak le Barbare", 200, new ArrayList<>());
- System.out.println(holyElixirPlayer.healthpoints);
- holyElixirPlayer.healthpoints = 10;
- normalPlayer.healthpoints = 10;
+ System.out.println(holyElixirPlayer.healthPoints);
+ holyElixirPlayer.healthPoints = 10;
+ normalPlayer.healthPoints = 10;
- holyElixirPlayer.currenthealthpoints = holyElixirPlayer.healthpoints / 2 - 1;
- normalPlayer.currenthealthpoints = normalPlayer.healthpoints / 2 - 1;
+ holyElixirPlayer.currentHealthPoints = holyElixirPlayer.healthPoints / 2 - 1;
+ normalPlayer.currentHealthPoints = normalPlayer.healthPoints / 2 - 1;
holyElixirPlayer.inventory.add("Holy Elixir");
holyElixirPlayer.majFinDeTour();
normalPlayer.majFinDeTour();
- assertEquals(normalPlayer.currenthealthpoints, holyElixirPlayer.currenthealthpoints - 1);
+ assertEquals(normalPlayer.currentHealthPoints, holyElixirPlayer.currentHealthPoints - 1);
}
@Test
@@ -106,18 +106,18 @@ public class UnitTests {
Archer normalArcher = new Archer("Florian", "Gnognak le Barbare", 200, new ArrayList<>());
- magicBowArcher.healthpoints = 50;
- normalArcher.healthpoints = 50;
+ magicBowArcher.healthPoints = 50;
+ normalArcher.healthPoints = 50;
- magicBowArcher.currenthealthpoints = magicBowArcher.healthpoints / 2 - 1;
- normalArcher.currenthealthpoints = normalArcher.healthpoints / 2 - 1;
+ magicBowArcher.currentHealthPoints = magicBowArcher.healthPoints / 2 - 1;
+ normalArcher.currentHealthPoints = normalArcher.healthPoints / 2 - 1;
magicBowArcher.inventory.add("Magic Bow");
magicBowArcher.majFinDeTour();
normalArcher.majFinDeTour();
- assertEquals(normalArcher.currenthealthpoints, magicBowArcher.currenthealthpoints - 2);
+ assertEquals(normalArcher.currentHealthPoints, magicBowArcher.currentHealthPoints - 2);
}
@@ -128,13 +128,13 @@ public class UnitTests {
Adventurer adventurer2 = new Adventurer("Adventurer", "Adv1", 200, new ArrayList<>());
- adventurer1.healthpoints = 50;
+ adventurer1.healthPoints = 50;
- adventurer1.currenthealthpoints = adventurer1.healthpoints / 2 - 1;
+ adventurer1.currentHealthPoints = adventurer1.healthPoints / 2 - 1;
- adventurer2.healthpoints = 50;
+ adventurer2.healthPoints = 50;
- adventurer2.currenthealthpoints = adventurer1.healthpoints / 2 - 1;
+ adventurer2.currentHealthPoints = adventurer1.healthPoints / 2 - 1;
adventurer1.addXp( 200);
@@ -142,9 +142,9 @@ public class UnitTests {
adventurer1.majFinDeTour();
adventurer2.majFinDeTour();
- assertEquals(26,adventurer1.currenthealthpoints);
+ assertEquals(26,adventurer1.currentHealthPoints);
- assertEquals(25,adventurer2.currenthealthpoints);
+ assertEquals(25,adventurer2.currentHealthPoints);
}
@@ -155,17 +155,17 @@ public class UnitTests {
Adventurer adventurer2 = new Adventurer("Adventurer", "Adv1", 200, new ArrayList<>());
- adventurer1.healthpoints = 50;
- adventurer2.healthpoints = 50;
+ adventurer1.healthPoints = 50;
+ adventurer2.healthPoints = 50;
- adventurer1.currenthealthpoints = adventurer1.healthpoints + 2;
- adventurer2.currenthealthpoints = adventurer2.healthpoints - 2;
+ adventurer1.currentHealthPoints = adventurer1.healthPoints + 2;
+ adventurer2.currentHealthPoints = adventurer2.healthPoints - 2;
adventurer1.majFinDeTour();
adventurer2.majFinDeTour();
- assertEquals(adventurer1.currenthealthpoints, adventurer1.healthpoints);
- assertEquals(48, adventurer2.currenthealthpoints);
+ assertEquals(adventurer1.currentHealthPoints, adventurer1.healthPoints);
+ assertEquals(48, adventurer2.currentHealthPoints);
}
@@ -185,4 +185,5 @@ public class UnitTests {
assertThat(player.level, is(5));
assertThat(player.abilities.get("ATK"), is(4));
}
+
}