all merge done without error

src/Entity/Enemy.java

@@ -1,5 +1,6 @@
 package Entity;
 
+import Text.FightData;
 import Text.TextEnemy;
 
 import com.badlogic.gdx.math.Vector2;
@@ -14,13 +15,13 @@ public class Enemy extends Character{
     public Enemy(String name, int x, int y, String img, String map) {
         super(name, x, y, img);
         //generate his text
-        this.textEnemy = new TextEnemy(name);
+        this.textEnemy = new TextEnemy("enemi"); //TODO should be name
         textEnemy.generateText();
         this.map = map;
 
         turn(Character.Direction.DOWN);
         //generate the vector of fight
-        fightData = new FightData(name);
+        //FightData fightData = new FightData(name);
 
     }
 

src/Main/PokeMudry.java

@@ -1,12 +1,34 @@
 package Main;
 
+
+import java.util.Vector;
+import com.badlogic.gdx.Input;
+import Control.Controller;
+import Entity.Enemy;
+import Entity.Entity;
+import Entity.Player;
+import Screen.ScreenMap;
 import Screen.ScreenPlayer;
 import ch.hevs.gdx2d.desktop.PortableApplication;
+import ch.hevs.gdx2d.lib.GdxGraphics;import Screen.ScreenPlayer;
+import ch.hevs.gdx2d.desktop.PortableApplication;
 import ch.hevs.gdx2d.lib.GdxGraphics;
 
 public class PokeMudry extends PortableApplication {
     
-    private ScreenPlayer screenPlayer = new ScreenPlayer();
+    public final boolean ANDROID = false;
+    public final int PLAYERS = 1;
+    public static final int TIME = 10; // number of minutes for kill all enemy
+
+    public static final int HEIGHT = 800;
+    public static final int width = 800;
+
+    private ScreenPlayer sp;
+    private Controller controller;
+	//private Player p1;
+    private static Vector<Enemy> enemies = new Vector<>();
+	private static Vector<Entity> entities = new Vector<>();
+
 
     public static void main(String[] args) {
         new PokeMudry();
@@ -14,29 +36,68 @@ public class PokeMudry extends PortableApplication {
 
     PokeMudry(){
         super(Settings.SIDE, Settings.SIDE);
+        controller = new Controller();
+        sp = new ScreenPlayer();
     }
 
+    public static Vector<Enemy> getEnemies() {
+		return enemies;
+	}
 
     @Override
     public void onInit() {
-        screenPlayer.init();
+        sp.init();
+        controller.init();
+		entities.add((Entity) sp.p);
+		enemies.add(new Enemy("Mudry", 10, 15, "lumberjack_sheet32", "desert"));
+		enemies.add(new Enemy("Pignat", 12, 15, "lumberjack_sheet32", "desert"));
+
+        for (Enemy enemy : enemies) {
+            entities.add(enemy);
+        }
+
+		for (Entity entity : entities) {
+			entity.init();
+		}
     }
 
     @Override
     public void onGraphicRender(GdxGraphics g) {
-        screenPlayer.render(g);
+        g.clear();
+		sp.p.manageEntity(sp.sm, controller);
+        sp.render(g);
+		for (Entity entity : entities) {
+			entity.graphicRender(g);
+		}
     }
 
 
     //key gestion
     @Override
     public void onKeyDown(int keycode) {
-        screenPlayer.screenManager.getActiveScreen().onKeyDown(keycode);
         super.onKeyDown(keycode);
+        
+        switch (keycode) {
+            case Input.Keys.Z:
+                if (sp.sm.zoom == 1.0) {
+                    sp.sm.zoom = 0.5f;
+                } else if (sp.sm.zoom == 0.5) {
+                    sp.sm.zoom = 0.25f;
+                } else {
+                    sp.sm.zoom = 1;
+                }
+                return;
+    
+            default:
+                break;
+        }
+        controller.keyStatus.put(keycode, true);
+        sp.screenManager.getActiveScreen().onKeyUp(keycode);
     }
     @Override
     public void onKeyUp(int keycode) {
-        screenPlayer.screenManager.getActiveScreen().onKeyUp(keycode);
         super.onKeyUp(keycode);
+        controller.keyStatus.put(keycode, false);
+        sp.screenManager.getActiveScreen().onKeyDown(keycode);
     }
 }

src/Text/FightData.java

@@ -22,7 +22,7 @@ public class FightData {
     */
 
     public FightData(String name) {
-        file = new File("resources//fight//" + name + ".csv");
+        file = new File("./resources/Battle/Fight/" + name + ".csv");
     }
 
     public void readFile() {

src/Text/SpeechData.java

@@ -12,7 +12,7 @@ public class SpeechData {
     
 
     public SpeechData(String name){
-        file = new File("resources//fight//" + name + ".csv");
+        file = new File("./resources/Battle/Fight/" + name + ".csv");
     }
     
     public void readFile() {
@@ -24,7 +24,7 @@ public class SpeechData {
             line = bf.readLine(); 
             while(line != null){
                 
-                Speechs.add(line);
+                speechs.add(line);
 
                 line = bf.readLine();
             }

src/testYann.java

@@ -32,7 +32,7 @@ public class testYann extends PortableApplication{
     public void onInit() {
         
         s.registerScreen(ScreenBattle.class);
-        Enemy e = new Enemy("enemi", 50, 50, "resources//lumberjack_sheet32.png");
+        Enemy e = new Enemy("enemi", 50, 50, "resources//lumberjack_sheet32.png", "desert");
         
     }