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 pull request #43 from Klagarge:end-game

Browse Source 
finsh text end
This commit is contained in:
Fastium
2022-06-16 19:15:25 +02:00
committed by GitHub
parent d47a0acc8b b283460840
commit ab3292314d
7 changed files with 94 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/Main/PokeMudry.java
View File

@@ -8,6 +8,7 @@ import Entity.Enemy;
import Entity.Entity;
import Game.Battle;
import Screen.ScreenBattle;
import Screen.ScreenEnd;
import Screen.ScreenMap;
import Screen.ScreenPlayer;
import ch.hevs.gdx2d.desktop.PortableApplication;
@@ -66,15 +67,22 @@ public class PokeMudry extends PortableApplication {
g.clear();
boolean onMapScreen = sp.screenManager.getActiveScreen().getClass().equals(ScreenMap.class);
boolean onBattleScreen = sp.screenManager.getActiveScreen().getClass().equals(ScreenBattle.class);
boolean onEndScreen = sp.screenManager.getActiveScreen().getClass().equals(ScreenEnd.class);
long timeNow = System.currentTimeMillis();
if((timeNow-lastMesure) >= 1000){ // one second
if((timeNow-lastMesure) >= 1000 && !onEndScreen){ // one second
lastMesure = timeNow;
sp.p.removedPv(1);
for (Enemy enemy : enemies) { enemy.recoveredTime++; }
}
if((timeNow-beginTime)/1000 >= 60 * Settings.TIME) System.out.println("Game finished");
//end of the game
if(sp.p.getPv() <= 0 && !onEndScreen) {
g.zoom(1);
g.resetCamera();
sp.se = sp.screenManager.getScreenEnd();
System.out.println("Game finished");
}
if(onMapScreen) sp.p.manageEntity(sp.sm, controller);
@@ -89,8 +97,6 @@ public class PokeMudry extends PortableApplication {
if (pv>0 && recovered) {
sp.sb = sp.screenManager.getScreenBattle();
sp.b = new Battle(sp.e);
sp.sb = sp.screenManager.getScreenBattle();

2
src/Main/Settings.java
View File

@@ -4,7 +4,7 @@ public class Settings {
public static final boolean ANDROID = false;
public static final int PLAYERS = 1;
public static final int TIME = 10; // number of minutes for kill all enemy
public static final int TIME = 10; // number of minutes for kill all enemy // should be 10
public static final int RECOVERED = 30; // number of seconds an enemy need for recovered
public static final int SWITCHMAPTIME = 250; // Number of milliseconds the player wait for switch map