Klagarge/PokeHES
1
0
Fork 0
mirror of https://github.com/Klagarge/PokeHES.git synced 2024-11-26 19:13:27 +00:00
Code Releases Activity

change PokeMudry by PokeHES

Browse Source
This commit is contained in:
Rémi Heredero 2022-06-17 10:17:50 +02:00
parent afe374c201
commit f6f47d3063
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Entity/Player.java
View File

@ -7,7 +7,7 @@ import com.badlogic.gdx.maps.tiled.TiledMapTile;
import com.badlogic.gdx.math.Vector2; import com.badlogic.gdx.math.Vector2;
import Control.Controller; import Control.Controller;
import Main.PokeMudry; import Main.PokeHES;
import Main.Settings; import Main.Settings;
import Screen.ScreenMap; import Screen.ScreenMap;
@ -120,7 +120,7 @@ public class Player extends Character{
* @return true if an enemy is on next position * @return true if an enemy is on next position
*/ */
private boolean enemy(ScreenMap sm, Vector2 nextPos) { private boolean enemy(ScreenMap sm, Vector2 nextPos) {
Vector<Enemy> enemies = PokeMudry.getEnemies(); Vector<Enemy> enemies = PokeHES.getEnemies();
for (Enemy enemy : enemies) { for (Enemy enemy : enemies) {
boolean bMap = sm.map.equals(enemy.getMap()); boolean bMap = sm.map.equals(enemy.getMap());
int pX = (int) nextPos.x/sm.tileWidth; int pX = (int) nextPos.x/sm.tileWidth;

6
src/Main/PokeMudry.java → src/Main/PokeHES.java
View File

@ -13,7 +13,7 @@ import Screen.ScreenPlayer;
import ch.hevs.gdx2d.desktop.PortableApplication; import ch.hevs.gdx2d.desktop.PortableApplication;
import ch.hevs.gdx2d.lib.GdxGraphics; import ch.hevs.gdx2d.lib.GdxGraphics;
public class PokeMudry extends PortableApplication { public class PokeHES extends PortableApplication {
private ScreenPlayer sp; private ScreenPlayer sp;
private Controller controller; private Controller controller;
@ -26,10 +26,10 @@ public class PokeMudry extends PortableApplication {
public static void main(String[] args) { public static void main(String[] args) {
new PokeMudry(); new PokeHES();
} }
PokeMudry(){ PokeHES(){
super(Settings.SIDE, Settings.SIDE); super(Settings.SIDE, Settings.SIDE);
controller = new Controller(); controller = new Controller();
sp = new ScreenPlayer(); sp = new ScreenPlayer();

6
src/Screen/ScreenBattle.java
View File

@ -10,7 +10,7 @@ import com.badlogic.gdx.graphics.g2d.freetype.FreeTypeFontGenerator.FreeTypeFont
import Control.Controller; import Control.Controller;
import Game.Battle; import Game.Battle;
import Main.PokeMudry; import Main.PokeHES;
import Main.Settings; import Main.Settings;
import ch.hevs.gdx2d.components.bitmaps.BitmapImage; import ch.hevs.gdx2d.components.bitmaps.BitmapImage;
@ -108,7 +108,7 @@ public class ScreenBattle extends RenderingScreen{
public void manage(Controller c, Battle battle){ public void manage(Controller c, Battle battle){
//add a rising front to have one impulsion //add a rising front to have one impulsion
if(PokeMudry.risingFront){ if(PokeHES.risingFront){
//the enemi is attacking //the enemi is attacking
if( battle.getAttackOn() == false){ if( battle.getAttackOn() == false){
if (c.keyStatus.get(Input.Keys.SPACE)){ 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é //mettre le front à false jusqu'à ce que le bouton soit relâché
PokeMudry.risingFront = false; PokeHES.risingFront = false;
} }
} }
} }