From 419c8ed93fbdece72ff6ffd0b57da180a88f3228 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Heredero?= Date: Thu, 9 Jun 2022 19:15:11 +0200 Subject: [PATCH 1/2] all merge done without error --- src/Entity/Enemy.java | 5 +-- src/Main/PokeMudry.java | 73 ++++++++++++++++++++++++++++++++++++---- src/Text/FightData.java | 2 +- src/Text/SpeechData.java | 8 ++--- src/testYann.java | 2 +- 5 files changed, 76 insertions(+), 14 deletions(-) diff --git a/src/Entity/Enemy.java b/src/Entity/Enemy.java index b164f98..ff43842 100644 --- a/src/Entity/Enemy.java +++ b/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); } diff --git a/src/Main/PokeMudry.java b/src/Main/PokeMudry.java index 269960f..f1ad4e3 100644 --- a/src/Main/PokeMudry.java +++ b/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 enemies = new Vector<>(); + private static Vector 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 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); } } diff --git a/src/Text/FightData.java b/src/Text/FightData.java index bb3089a..1575dfe 100644 --- a/src/Text/FightData.java +++ b/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() { diff --git a/src/Text/SpeechData.java b/src/Text/SpeechData.java index 88ec186..abf5462 100644 --- a/src/Text/SpeechData.java +++ b/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,16 +24,16 @@ public class SpeechData { line = bf.readLine(); while(line != null){ - Speechs.add(line); + speechs.add(line); line = bf.readLine(); } bf.close(); - } catch (Exception e) { + } catch (Exception e) { e.printStackTrace(); - } + } } public String getSpeechs(int i) { diff --git a/src/testYann.java b/src/testYann.java index 08c44b8..e42ef40 100644 --- a/src/testYann.java +++ b/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"); } From 876cc9192ee3d161e6040de948611b607793f36f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Heredero?= Date: Thu, 9 Jun 2022 19:20:43 +0200 Subject: [PATCH 2/2] poslish of polish --- src/Entity/Enemy.java | 5 +-- src/Main/PokeMudry.java | 6 +-- src/PokeMudry.java | 99 ----------------------------------------- src/testYann.java | 5 +-- 4 files changed, 4 insertions(+), 111 deletions(-) delete mode 100644 src/PokeMudry.java diff --git a/src/Entity/Enemy.java b/src/Entity/Enemy.java index ff43842..cf16b62 100644 --- a/src/Entity/Enemy.java +++ b/src/Entity/Enemy.java @@ -1,11 +1,8 @@ package Entity; -import Text.FightData; -import Text.TextEnemy; - import com.badlogic.gdx.math.Vector2; -import ch.hevs.gdx2d.lib.GdxGraphics; +import Text.TextEnemy; public class Enemy extends Character{ private String map; diff --git a/src/Main/PokeMudry.java b/src/Main/PokeMudry.java index f1ad4e3..ae3b330 100644 --- a/src/Main/PokeMudry.java +++ b/src/Main/PokeMudry.java @@ -2,16 +2,14 @@ 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 { diff --git a/src/PokeMudry.java b/src/PokeMudry.java deleted file mode 100644 index c7326df..0000000 --- a/src/PokeMudry.java +++ /dev/null @@ -1,99 +0,0 @@ -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; - -public class PokeMudry extends PortableApplication { - 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 enemies = new Vector<>(); - private static Vector entities = new Vector<>(); - - - public static void main(String[] args) { - new PokeMudry(); - } - - PokeMudry(){ - super(1000, 800); - controller = new Controller(); - sp = new ScreenPlayer(); - } - - public static Vector getEnemies() { - return enemies; - } - - @Override - public void onInit() { - 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) { - 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) { - 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) { - super.onKeyUp(keycode); - controller.keyStatus.put(keycode, false); - sp.screenManager.getActiveScreen().onKeyDown(keycode); - } -} diff --git a/src/testYann.java b/src/testYann.java index e42ef40..9ea062c 100644 --- a/src/testYann.java +++ b/src/testYann.java @@ -1,13 +1,10 @@ -import java.util.TreeMap; import java.util.Map; - -import com.badlogic.gdx.Input; +import java.util.TreeMap; import Control.Controller; import Entity.Enemy; import Screen.ScreenBattle; - import ch.hevs.gdx2d.desktop.PortableApplication; import ch.hevs.gdx2d.lib.GdxGraphics; import ch.hevs.gdx2d.lib.ScreenManager;