Kata refactoring

@@ -2,19 +2,18 @@ package re.forestier.edu;

 import re.forestier.edu.rpg.Affichage;

 import re.forestier.edu.rpg.UpdatePlayer;

 import re.forestier.edu.rpg.Player;

-import re.forestier.edu.lib.Natural;

 import java.util.ArrayList;

 public class Main {

     public static void main(String[] args) {

         Player firstPlayer = new Player("Florian", "Ruzberg de Rivehaute", "DWARF", 200, new ArrayList<>());

-        firstPlayer.addMoney(Natural.valueOf(400));

+        firstPlayer.addMoney(400);

-        firstPlayer.addXp(Natural.valueOf(15));

+        firstPlayer.addXp(15);

         System.out.println(Affichage.afficherJoueur(firstPlayer));

         System.out.println("------------------");

-        firstPlayer.addXp(Natural.valueOf(20));

+        firstPlayer.addXp(20);

         System.out.println(Affichage.afficherJoueur(firstPlayer));

     }

 }

\ No newline at end of file

@@ -3,7 +3,6 @@ package re.forestier.edu.rpg;

 import java.util.Random;

 import java.util.ArrayList;

 import java.util.HashMap;

-import re.forestier.edu.lib.Natural;

 public class Player {

     private static final Integer[] xpForlevel = {0,10,27,57,111}; //Level = i+1 

@@ -13,12 +12,13 @@ public class Player {

     private String Avatar_name;

     private String AvatarClass;

-    private Natural money;

+    private Integer money;

+    private Float __real_money__;

-    private Natural level;

-    private Natural healthpoints;

-    private Natural currenthealthpoints;

-    private Natural xp;

+    private int level;

+    private int healthpoints;

+    private int currenthealthpoints;

+    private int xp;

     public HashMap<String, Integer> abilities; //Ability = stat

     public ArrayList<String> inventory;

@@ -32,10 +32,10 @@ public class Player {

         this.playerName = playerName;

         Avatar_name = avatar_name;

         AvatarClass = avatarClass;

-        this.money = Natural.valueOf(money);

+        this.money = Integer.valueOf(money);

         this.inventory = inventory;

-        this.level = Natural.valueOf(1);

-        this.xp = Natural.valueOf(0);

+        this.level = 1;

+        this.xp = 0;

         this.abilities = UpdatePlayer.abilitiesPerTypeAndLevel().get(AvatarClass).get(1);

     }

@@ -49,42 +49,42 @@ public class Player {

         return this.Avatar_name;

     }

-    public Natural getMoney()

+    public Integer getMoney()

     {

         return this.money;

     }

-    public Natural getLevel()

+    public int getLevel()

     {

         return this.level;

     }

-    public Natural getHealthPoints()

+    public int getHealthPoints()

     {

         return this.healthpoints;

     }

-    public void setHealthPoints(Natural hp)

+    public void setHealthPoints(int hp)

     {

-        this.healthpoints = hp.clone();

+        this.healthpoints = hp;

     }

-    public Natural getCurrentHealthPoints()

+    public int getCurrentHealthPoints()

     {

-        return this.currenthealthpoints.clone();

+        return this.currenthealthpoints;

     }

     public void setCurrentHealthPoints(int hp)

     {

-        this.currenthealthpoints = hp.clone();

+        this.currenthealthpoints = hp;

     }

-    public Natural getXp()

+    public int getXp()

     {

         return this.xp;

     }

-    public void setXp(Natural xp)

+    public void setXp(int xp)

     {

         this.xp = xp;

     }

@@ -93,18 +93,18 @@ public class Player {

         return AvatarClass;

     }

-    public void addXp(Natural xp) {

-        Natural ancientLevel = this.level;

-        this.xp.add(xp);

+    public void addXp(int xp) {

+        int ancientLevel = this.level;

+        this.xp += xp;

         int i = 0;

         while(i < xpForlevel.length && this.xp >= xpForlevel[i])

         {

             i++;

         }

-        this.level = Natural.valueof(i);

+        this.level = i;

-        if (this.level.compareTo(ancientLevel) == -1) {

+        if (this.level != ancientLevel) {

             // Player leveled-up!

             // Give a random object

             ;

@@ -119,16 +119,14 @@ public class Player {

         }

     }

-    public void removeMoney(Natural amount)

-    {

+    public void removeMoney(int amount) throws IllegalArgumentException {

         if (money - amount < 0) {

             throw new IllegalArgumentException("Player can't have a negative money!");

         }

-        money.remove(amount);

+        money = Integer.parseInt(money.toString()) - amount;

     }

-

-    public void addMoney(Natural amount) { 

-        money.add(amount);

+    public void addMoney(int amount) { 

+        money = money + amount;

     }

 }

\ No newline at end of file

@@ -2,7 +2,6 @@ package re.forestier.edu.rpg;

 import java.util.HashMap;

 import java.util.Random;

-import re.forestier.edu.lib.Natural;

 public class UpdatePlayer {

@@ -101,31 +100,31 @@ public class UpdatePlayer {

     // majFinDeTour met à jour les points de vie

     public static void majFinDeTour(Player player) {

-        if(player.getCurrentHealthPoints().equals(Natural.ZERO)) {

+        if(player.getCurrentHealthPoints() == 0) {

             System.out.println("Le joueur est KO !");

             return;

         }

-        if(player.getCurrentHealthPoints().compareTo(Natural.divide(player.getHealthPoints(),2)) == 1 ) {

+        if(player.getCurrentHealthPoints() < player.getHealthPoints()/2) {

             if(!player.getAvatarClass().equals("ADVENTURER")) {

                 if(player.getAvatarClass().equals("DWARF")) {

                     if(player.inventory.contains("Holy Elixir")) {

-                        player.setCurrentHealthPoints(Natural.add(player.getCurrentHealthPoints(),1));

+                        player.setCurrentHealthPoints(player.getCurrentHealthPoints()+1);

                     }

-                    player.setCurrentHealthPoints(Natural.add(player.getCurrentHealthPoints(),1));

+                    player.setCurrentHealthPoints(player.getCurrentHealthPoints()+1);

                 }

                 if(player.getAvatarClass().equals("ARCHER")) {

-                    player.setCurrentHealthPoints(Natural.add(player.getCurrentHealthPoints(),1));

+                    player.setCurrentHealthPoints(player.getCurrentHealthPoints()+1);

                     if(player.inventory.contains("Magic Bow")) {

-                        player.setCurrentHealthPoints(Natural.add(player.getCurrentHealthPoints(), Natural.substract(Natural.divide(player.getCurrentHealthPoints(),8),1),player.getCurrentHealthPoints))

+                        player.setCurrentHealthPoints(player.getCurrentHealthPoints()+player.getCurrentHealthPoints()/8-1);

                     }

                 }

             } else {

                 player.setCurrentHealthPoints(player.getCurrentHealthPoints()+2);

-                if(player.getLevel().compareTo(Natural.valueOf(3)) == 1) {

-                    player.setCurrentHealthPoints(player.getCurrentHealthPoints().substract(1));

+                if(player.getLevel() < 3) {

+                    player.setCurrentHealthPoints(player.getCurrentHealthPoints()-1);

                 }

             }

         } else 

@@ -229,9 +229,6 @@ public class UnitTests {

         assertEquals(n.substract(Natural.valueOf(2)),Natural.valueOf(0));

         assertThrows(IllegalArgumentException.class, () -> Natural.valueOf(0).substract(Natural.valueOf(4)));

-        assertEquals(Natural.valueOf(4).divide(Natural.valueOf(2)),Natural.valueOf(2));

-        assertThrows(IllegalArgumentException.class, () -> Natural.valueOf(0).divide(null));

-

         assertEquals(n.toString(),"2");

         assertTrue(n.equals(Natural.valueOf(2)));

         assertTrue(n.equals(n));