1
0
mirror of https://github.com/Klagarge/PokeHES.git synced 2024-11-23 09:53:28 +00:00

Merge pull request #40 from Klagarge:add-profs-and-manage-pv-of-player

Add-profs-and-manage-pv-of-player
This commit is contained in:
Rémi Heredero 2022-06-16 17:00:23 +02:00 committed by GitHub
commit a53fc67f97
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
22 changed files with 5 additions and 4 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 83 KiB

Binary file not shown.

Binary file not shown.

After

Width:  |  Height:  |  Size: 67 KiB

Binary file not shown.

Binary file not shown.

Binary file not shown.

After

Width:  |  Height:  |  Size: 78 KiB

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

After

Width:  |  Height:  |  Size: 72 KiB

Binary file not shown.

Binary file not shown.

After

Width:  |  Height:  |  Size: 68 KiB

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

After

Width:  |  Height:  |  Size: 85 KiB

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -20,6 +20,7 @@ public class Player extends Character{
public Player(int x, int y, String map) { public Player(int x, int y, String map) {
super("Player", x, y, "Character_flipped", map); super("Player", x, y, "Character_flipped", map);
this.pv = Settings.TIME*60;
} }
public void addXp(int xp){ public void addXp(int xp){
@ -119,9 +120,8 @@ public class Player extends Character{
} }
@Override @Override
protected void removedPv(int pv) { public void removedPv(int pv) {
// TODO Auto-generated method stub this.pv -= pv;
} }
public int getXpMax(){ public int getXpMax(){

View File

@ -68,8 +68,9 @@ public class PokeMudry extends PortableApplication {
boolean onBattleScreen = sp.screenManager.getActiveScreen().getClass().equals(ScreenBattle.class); boolean onBattleScreen = sp.screenManager.getActiveScreen().getClass().equals(ScreenBattle.class);
long timeNow = System.currentTimeMillis(); long timeNow = System.currentTimeMillis();
if((timeNow-lastMesure) >= 1000){ if((timeNow-lastMesure) >= 1000){ // one second
lastMesure = timeNow; lastMesure = timeNow;
sp.p.removedPv(1);
for (Enemy enemy : enemies) { enemy.recoveredTime++; } for (Enemy enemy : enemies) { enemy.recoveredTime++; }
} }
if((timeNow-beginTime)/1000 >= 60 * Settings.TIME) System.out.println("Game finished"); if((timeNow-beginTime)/1000 >= 60 * Settings.TIME) System.out.println("Game finished");