Merge branch 'master' into more-entities

src/Entity/Enemy.java

@@ -1,14 +1,23 @@
 package Entity;
 
+import Text.FightData;
+
 import com.badlogic.gdx.math.Vector2;
 
 import ch.hevs.gdx2d.lib.GdxGraphics;
 
 public class Enemy extends Character{
 
+    public FightData fightData;
+
     public Enemy(String name, int x, int y, String img) {
         super(name, x, y, img);
+
         turn(Character.Direction.DOWN);
+        //generate the vector of fight
+        fightData = new FightData(name);
+        //TODO Auto-generated constructor stub
+
     }
 
     public void setPosition(int x, int y){