Kata refactoring

@@ -41,7 +41,7 @@

 </td>

 <td>

 <div class="infoBox" id="duration">

-<div class="counter">0.164s</div>

+<div class="counter">0.153s</div>

 <p>duration</p>

 </div>

 </td>

@@ -76,7 +76,7 @@

 </thead>

 <tr>

 <td class="success">testAffichageBase()</td>

-<td class="success">0.164s</td>

+<td class="success">0.153s</td>

 <td class="success">passed</td>

 </tr>

 </table>

@@ -89,7 +89,7 @@

 <input id="line-wrapping-toggle" type="checkbox" autocomplete="off"/>

 </label>

 </div>Generated by 

-<a href="http://www.gradle.org">Gradle 8.8</a> at 21 oct. 2024, 11:13:10</p>

+<a href="http://www.gradle.org">Gradle 8.8</a> at 21 oct. 2024, 11:47:26</p>

 </div>

 </div>

 </body>

@@ -41,7 +41,7 @@

 </td>

 <td>

 <div class="infoBox" id="duration">

-<div class="counter">0.017s</div>

+<div class="counter">0.036s</div>

 <p>duration</p>

 </div>

 </td>

@@ -84,7 +84,7 @@

 <tr>

 <td class="success">Affichage</td>

 <td class="success">testAffichage()</td>

-<td class="success">0.006s</td>

+<td class="success">0.024s</td>

 <td class="success">passed</td>

 </tr>

 <tr>

@@ -126,7 +126,7 @@

 <tr>

 <td class="success">ex &amp; lvl</td>

 <td class="success">testRetrieveLevel()</td>

-<td class="success">0.001s</td>

+<td class="success">0.002s</td>

 <td class="success">passed</td>

 </tr>

 <tr>

@@ -145,7 +145,7 @@

 <input id="line-wrapping-toggle" type="checkbox" autocomplete="off"/>

 </label>

 </div>Generated by 

-<a href="http://www.gradle.org">Gradle 8.8</a> at 21 oct. 2024, 11:13:10</p>

+<a href="http://www.gradle.org">Gradle 8.8</a> at 21 oct. 2024, 11:47:26</p>

 </div>

 </div>

 </body>

@@ -38,7 +38,7 @@

 </td>

 <td>

 <div class="infoBox" id="duration">

-<div class="counter">0.181s</div>

+<div class="counter">0.189s</div>

 <p>duration</p>

 </div>

 </td>

@@ -85,7 +85,7 @@

 <td>11</td>

 <td>0</td>

 <td>0</td>

-<td>0.181s</td>

+<td>0.189s</td>

 <td class="success">100%</td>

 </tr>

 </tbody>

@@ -112,7 +112,7 @@

 <td>1</td>

 <td>0</td>

 <td>0</td>

-<td>0.164s</td>

+<td>0.153s</td>

 <td class="success">100%</td>

 </tr>

 <tr>

@@ -122,7 +122,7 @@

 <td>10</td>

 <td>0</td>

 <td>0</td>

-<td>0.017s</td>

+<td>0.036s</td>

 <td class="success">100%</td>

 </tr>

 </tbody>

@@ -136,7 +136,7 @@

 <input id="line-wrapping-toggle" type="checkbox" autocomplete="off"/>

 </label>

 </div>Generated by 

-<a href="http://www.gradle.org">Gradle 8.8</a> at 21 oct. 2024, 11:13:10</p>

+<a href="http://www.gradle.org">Gradle 8.8</a> at 21 oct. 2024, 11:47:26</p>

 </div>

 </div>

 </body>

@@ -40,7 +40,7 @@

 </td>

 <td>

 <div class="infoBox" id="duration">

-<div class="counter">0.181s</div>

+<div class="counter">0.189s</div>

 <p>duration</p>

 </div>

 </td>

@@ -83,7 +83,7 @@

 <td>1</td>

 <td>0</td>

 <td>0</td>

-<td>0.164s</td>

+<td>0.153s</td>

 <td class="success">100%</td>

 </tr>

 <tr>

@@ -93,7 +93,7 @@

 <td>10</td>

 <td>0</td>

 <td>0</td>

-<td>0.017s</td>

+<td>0.036s</td>

 <td class="success">100%</td>

 </tr>

 </table>

@@ -106,7 +106,7 @@

 <input id="line-wrapping-toggle" type="checkbox" autocomplete="off"/>

 </label>

 </div>Generated by 

-<a href="http://www.gradle.org">Gradle 8.8</a> at 21 oct. 2024, 11:13:10</p>

+<a href="http://www.gradle.org">Gradle 8.8</a> at 21 oct. 2024, 11:47:26</p>

 </div>

 </div>

 </body>

@@ -1,7 +1,7 @@

 <?xml version="1.0" encoding="UTF-8"?>

-<testsuite name="re.forestier.edu.GlobalTest" tests="1" skipped="0" failures="0" errors="0" timestamp="2024-10-21T09:13:10" hostname="a206pc27L.local.isima.fr" time="0.164">

+<testsuite name="re.forestier.edu.GlobalTest" tests="1" skipped="0" failures="0" errors="0" timestamp="2024-10-21T09:47:25" hostname="a206pc27L.local.isima.fr" time="0.153">

   <properties/>

-  <testcase name="testAffichageBase()" classname="re.forestier.edu.GlobalTest" time="0.164"/>

+  <testcase name="testAffichageBase()" classname="re.forestier.edu.GlobalTest" time="0.153"/>

   <system-out><![CDATA[]]></system-out>

   <system-err><![CDATA[]]></system-err>

 </testsuite>

@@ -1,10 +1,10 @@

 <?xml version="1.0" encoding="UTF-8"?>

-<testsuite name="re.forestier.edu.UnitTests" tests="10" skipped="0" failures="0" errors="0" timestamp="2024-10-21T09:13:10" hostname="a206pc27L.local.isima.fr" time="0.023">

+<testsuite name="re.forestier.edu.UnitTests" tests="10" skipped="0" failures="0" errors="0" timestamp="2024-10-21T09:47:25" hostname="a206pc27L.local.isima.fr" time="0.042">

   <properties/>

-  <testcase name="Affichage" classname="re.forestier.edu.UnitTests" time="0.006"/>

+  <testcase name="Affichage" classname="re.forestier.edu.UnitTests" time="0.024"/>

   <testcase name="Main" classname="re.forestier.edu.UnitTests" time="0.002"/>

   <testcase name="removeMoney" classname="re.forestier.edu.UnitTests" time="0.004"/>

-  <testcase name="ex &amp; lvl" classname="re.forestier.edu.UnitTests" time="0.001"/>

+  <testcase name="ex &amp; lvl" classname="re.forestier.edu.UnitTests" time="0.002"/>

   <testcase name="addMoney" classname="re.forestier.edu.UnitTests" time="0.001"/>

   <testcase name="Construcor UpdatePlayer" classname="re.forestier.edu.UnitTests" time="0.001"/>

   <testcase name="majDeFinDeTour" classname="re.forestier.edu.UnitTests" time="0.001"/>

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

     private Natural level;

     private Natural maxHealthPoint;

-    private int currenthealthpoints;

+    private Natural currentHealthPoints;

     private int xp;

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

@@ -40,6 +40,13 @@ public class Player {

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

     }

+    public Player(String playerName, String avatar_name, String avatarClass, int money, ArrayList<String> inventory, int maxHp)

+    {

+        Player p = new Player(playerName,avatar_name,avatarClass,money,inventory);

+        p.setMaxHealthPoints(maxHp);

+        p.setCurrentHealthPoints(maxHp);

+    }

+

     public String getPlayerName()

     {

         return this.playerName;

@@ -72,13 +79,36 @@ public class Player {

     public int getCurrentHealthPoints()

     {

-        return this.currenthealthpoints;

+        return this.currentHealthPoints.toInt();

     }

     public void setCurrentHealthPoints(int hp)

     {

-        this.currenthealthpoints = hp;

+        this.currentHealthPoints = Natural.valueOf(hp);

+    }

+

+    public void heal(int hp)

+    {

+        if(hp < 0 )

+        {

+            throw new IllegalArgumentException();

+        }

+        this.currentHealthPoints.add(Natural.valueOf(hp));

+        if(this.currentHealthPoints.compareTo(this.maxHealthPoint) == -1)

+        {

+            this.currentHealthPoints = (Natural)this.maxHealthPoint.clone();

+        }

+    }

+

+    public void hurt(int damage)

+    {

+        if(damage < 0 )

+        {

+            throw new IllegalArgumentException();

         }

+        this.currentHealthPoints.substract(Natural.valueOf(damage));

+    }

+

     public int getXp()

     {

@@ -5,7 +5,7 @@ import java.util.Random;

 public class UpdatePlayer {

-    public 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", "Rune Staff of Curse : May burn your ennemies... Or yourself. Who knows?", "Combat Edge : Well, that's an edge", "Holy Elixir : Recover your HP"

+    public final static String[] objectList = {"Magic bow : Heal by 1/8th of your HP","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", "Rune Staff of Curse : May burn your ennemies... Or yourself. Who knows?", "Combat Edge : Well, that's an edge", "Holy Elixir : Recover your HP"

     };

     public static HashMap<String, HashMap<Integer, HashMap<String, Integer>>> abilitiesPerTypeAndLevel() {

@@ -109,22 +109,24 @@ public class UpdatePlayer {

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

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

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

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

+                        player.heal(1);

                     }

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

+                    player.heal(1);

                 }

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

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

+                    player.heal(1);

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

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

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

+                        int potentialHeal = player.getCurrentHealthPoints()/8-1;

+                        player.heal(potentialHeal < 0 ? 0 : potentialHeal);

                     }

                 }

             } else {

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

+                player.heal(2);

                 if(player.getLevel() < 3) {

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

+                    player.hurt(1);

                 }

             }

         } else 

@@ -174,7 +174,7 @@ public class UnitTests {

         p.setCurrentHealthPoints(1);

         p.setMaxHealthPoints(10);

         UpdatePlayer.majFinDeTour(p);

-        assertThat(p.getCurrentHealthPoints(),is(1));

+        assertThat(p.getCurrentHealthPoints(),is(2)); //Suite a discussion avec le client, le "Magic bow" ne peut que soigné

         p.setCurrentHealthPoints(16);

         p.setMaxHealthPoints(40);

         UpdatePlayer.majFinDeTour(p);