diff --git a/Data/img/Image_prof/Bianchi.png b/Data/img/Image_prof/Bianchi.png new file mode 100644 index 0000000..dd69628 Binary files /dev/null and b/Data/img/Image_prof/Bianchi.png differ diff --git a/Data/img/Image_prof/Bianchi.xcf b/Data/img/Image_prof/Bianchi.xcf index 62a2b12..de6f05c 100644 Binary files a/Data/img/Image_prof/Bianchi.xcf and b/Data/img/Image_prof/Bianchi.xcf differ diff --git a/Data/img/Image_prof/Ellert.png b/Data/img/Image_prof/Ellert.png new file mode 100644 index 0000000..cacf915 Binary files /dev/null and b/Data/img/Image_prof/Ellert.png differ diff --git a/Data/img/Image_prof/Ellert.xcf b/Data/img/Image_prof/Ellert.xcf index 80fb0b9..70e2dfb 100644 Binary files a/Data/img/Image_prof/Ellert.xcf and b/Data/img/Image_prof/Ellert.xcf differ diff --git a/Data/img/Image_prof/Evequoz.xcf b/Data/img/Image_prof/Evequoz.xcf index 83ab263..3c0eb3e 100644 Binary files a/Data/img/Image_prof/Evequoz.xcf and b/Data/img/Image_prof/Evequoz.xcf differ diff --git a/Data/img/Image_prof/Gloeckner.png b/Data/img/Image_prof/Gloeckner.png new file mode 100644 index 0000000..a65b44a Binary files /dev/null and b/Data/img/Image_prof/Gloeckner.png differ diff --git a/Data/img/Image_prof/Gloeckner.xcf b/Data/img/Image_prof/Gloeckner.xcf index fed74be..676386d 100644 Binary files a/Data/img/Image_prof/Gloeckner.xcf and b/Data/img/Image_prof/Gloeckner.xcf differ diff --git a/Data/img/Image_prof/Informatique.xcf b/Data/img/Image_prof/Informatique.xcf new file mode 100644 index 0000000..58db420 Binary files /dev/null and b/Data/img/Image_prof/Informatique.xcf differ diff --git a/Data/img/Image_prof/Laffargue-Rieder.xcf b/Data/img/Image_prof/Laffargue-Rieder.xcf new file mode 100644 index 0000000..70c3c38 Binary files /dev/null and b/Data/img/Image_prof/Laffargue-Rieder.xcf differ diff --git a/Data/img/Image_prof/Mudry.xcf b/Data/img/Image_prof/Mudry.xcf index 370935c..1efef7e 100644 Binary files a/Data/img/Image_prof/Mudry.xcf and b/Data/img/Image_prof/Mudry.xcf differ diff --git a/Data/img/Image_prof/Nicollier.png b/Data/img/Image_prof/Nicollier.png new file mode 100644 index 0000000..638fe30 Binary files /dev/null and b/Data/img/Image_prof/Nicollier.png differ diff --git a/Data/img/Image_prof/Nicollier.xcf b/Data/img/Image_prof/Nicollier.xcf new file mode 100644 index 0000000..93c9bd2 Binary files /dev/null and b/Data/img/Image_prof/Nicollier.xcf differ diff --git a/Data/img/Image_prof/Paciotti.png b/Data/img/Image_prof/Paciotti.png new file mode 100644 index 0000000..0dab36a Binary files /dev/null and b/Data/img/Image_prof/Paciotti.png differ diff --git a/Data/img/Image_prof/Paciotti.xcf b/Data/img/Image_prof/Paciotti.xcf new file mode 100644 index 0000000..87e59d8 Binary files /dev/null and b/Data/img/Image_prof/Paciotti.xcf differ diff --git a/Data/img/Image_prof/Rapillard.xcf b/Data/img/Image_prof/Rapillard.xcf new file mode 100644 index 0000000..9a4e280 Binary files /dev/null and b/Data/img/Image_prof/Rapillard.xcf differ diff --git a/Data/img/Image_prof/Rey-Mermet.xcf b/Data/img/Image_prof/Rey-Mermet.xcf new file mode 100644 index 0000000..ac98bc5 Binary files /dev/null and b/Data/img/Image_prof/Rey-Mermet.xcf differ diff --git a/Data/img/Image_prof/Sallem.png b/Data/img/Image_prof/Sallem.png new file mode 100644 index 0000000..dcf890b Binary files /dev/null and b/Data/img/Image_prof/Sallem.png differ diff --git a/Data/img/Image_prof/Sallem.xcf b/Data/img/Image_prof/Sallem.xcf index affcf0b..ca6731d 100644 Binary files a/Data/img/Image_prof/Sallem.xcf and b/Data/img/Image_prof/Sallem.xcf differ diff --git a/Data/img/Image_prof/Savioz.xcf b/Data/img/Image_prof/Savioz.xcf new file mode 100644 index 0000000..6bd1ed4 Binary files /dev/null and b/Data/img/Image_prof/Savioz.xcf differ diff --git a/Data/img/Image_prof/Wittmann.xcf b/Data/img/Image_prof/Wittmann.xcf new file mode 100644 index 0000000..5687556 Binary files /dev/null and b/Data/img/Image_prof/Wittmann.xcf differ diff --git a/src/Entity/Player.java b/src/Entity/Player.java index f15b0c7..e3d7d60 100644 --- a/src/Entity/Player.java +++ b/src/Entity/Player.java @@ -20,6 +20,7 @@ public class Player extends Character{ public Player(int x, int y, String map) { super("Player", x, y, "Character_flipped", map); + this.pv = Settings.TIME*60; } public void addXp(int xp){ @@ -119,9 +120,8 @@ public class Player extends Character{ } @Override - protected void removedPv(int pv) { - // TODO Auto-generated method stub - + public void removedPv(int pv) { + this.pv -= pv; } public int getXpMax(){ diff --git a/src/Main/PokeMudry.java b/src/Main/PokeMudry.java index c356cd6..50a1398 100644 --- a/src/Main/PokeMudry.java +++ b/src/Main/PokeMudry.java @@ -68,8 +68,9 @@ public class PokeMudry extends PortableApplication { boolean onBattleScreen = sp.screenManager.getActiveScreen().getClass().equals(ScreenBattle.class); long timeNow = System.currentTimeMillis(); - if((timeNow-lastMesure) >= 1000){ + if((timeNow-lastMesure) >= 1000){ // 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");