Klagarge/PokeHES
1
0
Fork 0
mirror of https://github.com/Klagarge/PokeHES.git synced 2024-11-22 17:33:27 +00:00
Code Releases Activity

Merge pull request #44 from Klagarge:end-to-600-xp

Browse Source 
End-to-600-xp
This commit is contained in:
Fastium 2022-06-16 19:30:22 +02:00 committed by GitHub
commit 738249ac45
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/Game/Battle.java
View File

@ -96,6 +96,7 @@ public class Battle {
xpPlayer += xp;
//remove pv enemy
pvEnemy -= xp;
if(pvEnemy<0) pvEnemy =0;
}

4
src/Main/PokeMudry.java
View File

@ -48,7 +48,7 @@ public class PokeMudry extends PortableApplication {
// add player, create and add all enemies in entities
entities.add((Entity) sp.p);
enemies.add(new Enemy("Gloeckner", 1, 7, "lumberjack_sheet32", "21N307", 600, "allemand", Direction.RIGHT));
enemies.add(new Enemy("Nicollier", 4, 2, "lumberjack_sheet32", "21N308", 1600, "mathematique", Direction.LEFT));
enemies.add(new Enemy("Nicollier", 4, 2, "lumberjack_sheet32", "21N308", 20, "mathematique", Direction.LEFT));
enemies.add(new Enemy("Mudry", 5, 11, "lumberjack_sheet32", "21N304", 700, "informatique", Direction.DOWN));
enemies.add(new Enemy("Ellert", 1, 4, "lumberjack_sheet32", "23N215", 300, "physique", Direction.RIGHT));
enemies.add(new Enemy("Bianchi", 1, 3, "lumberjack_sheet32", "23N308", 1200, "electricite", Direction.RIGHT));
@ -77,7 +77,7 @@ public class PokeMudry extends PortableApplication {
}
//end of the game
if(sp.p.getPv() <= 0 && !onEndScreen) {
if((sp.p.getPv() <= 0 || sp.p.getXp() >= sp.p.getXpMax() ) && !onEndScreen ) {
g.zoom(1);
g.resetCamera();
sp.se = sp.screenManager.getScreenEnd();

4
src/Screen/ScreenBattle.java
View File

@ -84,7 +84,7 @@ public class ScreenBattle extends RenderingScreen{
//dialog
if(b == null) return;
if(b.getLine() == null) return;
g.drawString(15, 260 ,b.getLine() , unbuntuRegularBlack);
g.drawString(15, 260, b.getLine(), unbuntuRegularBlack);
}
@ -93,7 +93,7 @@ public class ScreenBattle extends RenderingScreen{
//draw image
g.drawPicture(Settings.SIDE - (192/2), Settings.SIDE-240/2, enemyImg);
//draw pv
g.drawString(350, Settings.SIDE - 15 , "PV : " + b.pvEnemy + " / " + b.e.getPvInit(), unbuntuRegularWhite);
g.drawString(300, Settings.SIDE - 15 , "PV : " + b.pvEnemy + " / " + b.e.getPvInit(), unbuntuRegularWhite);
}