diff --git a/src/Entity/Player.java b/src/Entity/Player.java index 2838173..a9d89fe 100644 --- a/src/Entity/Player.java +++ b/src/Entity/Player.java @@ -7,7 +7,7 @@ import com.badlogic.gdx.maps.tiled.TiledMapTile; import com.badlogic.gdx.math.Vector2; import Control.Controller; -import Main.PokeMudry; +import Main.PokeHES; import Main.Settings; import Screen.ScreenMap; @@ -120,7 +120,7 @@ public class Player extends Character{ * @return true if an enemy is on next position */ private boolean enemy(ScreenMap sm, Vector2 nextPos) { - Vector enemies = PokeMudry.getEnemies(); + Vector enemies = PokeHES.getEnemies(); for (Enemy enemy : enemies) { boolean bMap = sm.map.equals(enemy.getMap()); int pX = (int) nextPos.x/sm.tileWidth; diff --git a/src/Main/PokeMudry.java b/src/Main/PokeHES.java similarity index 97% rename from src/Main/PokeMudry.java rename to src/Main/PokeHES.java index b638e19..11178ac 100644 --- a/src/Main/PokeMudry.java +++ b/src/Main/PokeHES.java @@ -13,7 +13,7 @@ import Screen.ScreenPlayer; import ch.hevs.gdx2d.desktop.PortableApplication; import ch.hevs.gdx2d.lib.GdxGraphics; -public class PokeMudry extends PortableApplication { +public class PokeHES extends PortableApplication { private ScreenPlayer sp; private Controller controller; @@ -26,10 +26,10 @@ public class PokeMudry extends PortableApplication { public static void main(String[] args) { - new PokeMudry(); + new PokeHES(); } - PokeMudry(){ + PokeHES(){ super(Settings.SIDE, Settings.SIDE); controller = new Controller(); sp = new ScreenPlayer(); diff --git a/src/Screen/ScreenBattle.java b/src/Screen/ScreenBattle.java index 08544cd..c59dcea 100644 --- a/src/Screen/ScreenBattle.java +++ b/src/Screen/ScreenBattle.java @@ -10,7 +10,7 @@ import com.badlogic.gdx.graphics.g2d.freetype.FreeTypeFontGenerator.FreeTypeFont import Control.Controller; import Game.Battle; -import Main.PokeMudry; +import Main.PokeHES; import Main.Settings; import ch.hevs.gdx2d.components.bitmaps.BitmapImage; @@ -108,7 +108,7 @@ public class ScreenBattle extends RenderingScreen{ public void manage(Controller c, Battle battle){ //add a rising front to have one impulsion - if(PokeMudry.risingFront){ + if(PokeHES.risingFront){ //the enemi is attacking if( battle.getAttackOn() == false){ if (c.keyStatus.get(Input.Keys.SPACE)){ @@ -131,7 +131,7 @@ public class ScreenBattle extends RenderingScreen{ } } //mettre le front à false jusqu'à ce que le bouton soit relâché - PokeMudry.risingFront = false; + PokeHES.risingFront = false; } } }