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:
commit
a53fc67f97
BIN
Data/img/Image_prof/Bianchi.png
Normal file
BIN
Data/img/Image_prof/Bianchi.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 83 KiB |
Binary file not shown.
BIN
Data/img/Image_prof/Ellert.png
Normal file
BIN
Data/img/Image_prof/Ellert.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 67 KiB |
Binary file not shown.
Binary file not shown.
BIN
Data/img/Image_prof/Gloeckner.png
Normal file
BIN
Data/img/Image_prof/Gloeckner.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 78 KiB |
Binary file not shown.
BIN
Data/img/Image_prof/Informatique.xcf
Normal file
BIN
Data/img/Image_prof/Informatique.xcf
Normal file
Binary file not shown.
BIN
Data/img/Image_prof/Laffargue-Rieder.xcf
Normal file
BIN
Data/img/Image_prof/Laffargue-Rieder.xcf
Normal file
Binary file not shown.
Binary file not shown.
BIN
Data/img/Image_prof/Nicollier.png
Normal file
BIN
Data/img/Image_prof/Nicollier.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 72 KiB |
BIN
Data/img/Image_prof/Nicollier.xcf
Normal file
BIN
Data/img/Image_prof/Nicollier.xcf
Normal file
Binary file not shown.
BIN
Data/img/Image_prof/Paciotti.png
Normal file
BIN
Data/img/Image_prof/Paciotti.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 68 KiB |
BIN
Data/img/Image_prof/Paciotti.xcf
Normal file
BIN
Data/img/Image_prof/Paciotti.xcf
Normal file
Binary file not shown.
BIN
Data/img/Image_prof/Rapillard.xcf
Normal file
BIN
Data/img/Image_prof/Rapillard.xcf
Normal file
Binary file not shown.
BIN
Data/img/Image_prof/Rey-Mermet.xcf
Normal file
BIN
Data/img/Image_prof/Rey-Mermet.xcf
Normal file
Binary file not shown.
BIN
Data/img/Image_prof/Sallem.png
Normal file
BIN
Data/img/Image_prof/Sallem.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 85 KiB |
Binary file not shown.
BIN
Data/img/Image_prof/Savioz.xcf
Normal file
BIN
Data/img/Image_prof/Savioz.xcf
Normal file
Binary file not shown.
BIN
Data/img/Image_prof/Wittmann.xcf
Normal file
BIN
Data/img/Image_prof/Wittmann.xcf
Normal file
Binary file not shown.
@ -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(){
|
||||||
|
@ -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");
|
||||||
|
Loading…
Reference in New Issue
Block a user