Kata refactoring

@@ -17,6 +17,12 @@ public class Item implements Cloneable

 		this.value = value;

 	}

+	Item(String name)

+	{

+		this.name = name;

+		this.description = "Is used to search in list, if you see me, there is a problem";

+	}

+

 	public String getName()

 	{

 		return this.name;

@@ -55,4 +61,17 @@ public class Item implements Cloneable

 	{

 		return new Item(this.name,this.description,(Natural)this.weight.clone(),(Natural)this.value.clone());

 	}

+

+	@Override

+	public boolean equals(Object o)

+	{

+		if(o != null && o instanceof Item && ((Item)o).getName() == this.name)

+		{

+			return true;

+		}

+		else 

+		{

+			return false;

+		}

+	}

 }

\ No newline at end of file

@@ -2,11 +2,21 @@ package re.forestier.edu.rpg;

 import java.util.HashMap;

 import java.util.Random;

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

 public class Manager {

-    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"

-    }; //SHOULDDO : Create an item class

+    public final static Item[] objectList = {

+        new Item("Magic bow", "Heal by 1/8th of your HP",Natural.valueOf(0),Natural.valueOf(0)),

+        new Item("Lookout Ring","Prevents surprise attacks",Natural.valueOf(0),Natural.valueOf(0)),

+        new Item("Scroll of Stupidity","INT-2 when applied to an enemy",Natural.valueOf(0),Natural.valueOf(0)), 

+        new Item("Draupnir", "Increases XP gained by 100%",Natural.valueOf(0),Natural.valueOf(0)), 

+        new Item("Magic Charm","Magic +10 for 5 rounds",Natural.valueOf(0),Natural.valueOf(0)), 

+        new Item("Rune Staff of Curse","May burn your ennemies... Or yourself. Who knows?",Natural.valueOf(0),Natural.valueOf(0)),

+        new Item("Combat Edge","Well, that's an edge",Natural.valueOf(0),Natural.valueOf(0)), 

+        new Item("Holy Elixir","Recover your HP",Natural.valueOf(0),Natural.valueOf(0))

+    }; //SHOULDDO : Instantiate from file (xml)

+       //Since we don't have value for weight and value, we put neutral

     // majFinDeTour met à jour les points de vie

     public static void majFinDeTour(Player player) {

@@ -26,13 +36,13 @@ public class Manager {

                     break;

                 case DWARF :

                     player.heal(1);

-                    if(player.getInventory().contains("Holy Elixir")) {

+                    if(player.getInventory().contains(new Item("Holy Elixir"))) {

                         player.heal(1);

                     }

                     break;

                 case ARCHER :

                     player.heal(1);

-                    if(player.getInventory().contains("Magic Bow")) {

+                    if(player.getInventory().contains(new Item("Magic Bow"))) {

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

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

                     }

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

     private final HashMap<Ability, Integer> abilities; //Ability = stat

                                                        //SHOULDDO : have another hashmap to have contextual modifier (items,...)

-    private ArrayList<String> inventory;

+    private ArrayList<Item> inventory;

-    public Player(String playerName, String avatar_name, Jobs avatarClass, int money, ArrayList<String> inventory) {

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

         this(playerName,avatar_name,avatarClass,money,inventory,Player.defaultMaxHp.toInt());

     }

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

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

     {

         this.playerName = playerName;

         this.avatarName = avatar_name;

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

         return copy;

     }

-    public ArrayList<String> getInventory()

+    public ArrayList<Item> getInventory()

     {

-        return new ArrayList<String>(this.inventory);

+        return new ArrayList<Item>(this.inventory);

     }

     public void heal(int hp)