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

Merge branch 'master' into battlescreen-display

Browse Source
This commit is contained in:
Rémi Heredero
2022-06-16 15:49:47 +02:00
committed by GitHub
parent cad32fde7d ca902bb277
commit e590224acd
9 changed files with 33 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/Entity/Enemy.java
View File

@@ -1,10 +1,13 @@
package Entity;
import com.badlogic.gdx.math.Vector2;
import com.badlogic.gdx.math.Vector2;
import Main.Settings;
public class Enemy extends Character{
private String branch;
public int recoveredTime = Settings.RECOVERED;
private int pvInit;

3
src/Entity/Player.java
View File

@@ -8,6 +8,7 @@ import com.badlogic.gdx.math.Vector2;
import Control.Controller;
import Main.PokeMudry;
import Main.Settings;
import Screen.ScreenMap;
public class Player extends Character{
@@ -78,6 +79,8 @@ public class Player extends Character{
if(onDoor){
long time = System.currentTimeMillis();
while (System.currentTimeMillis()-time < Settings.SWITCHMAPTIME) { }
String nMap = null;
Integer x = null;
Integer y = null;