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

Merge pull request #41 from Klagarge:end-battle

Browse Source 
ok end battle
This commit is contained in:
Fastium 2022-06-16 17:16:30 +02:00 committed by GitHub
commit a62a239579
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/Game/Battle.java
View File

@ -42,7 +42,8 @@ public class Battle {
System.out.println("pv enemy : " +pvEnemy); System.out.println("pv enemy : " +pvEnemy);
System.out.println("xp player : " + xpPlayer); System.out.println("xp player : " + xpPlayer);
System.out.println("xp win " + newXp); System.out.println("xp win " + newXp);
if(getLineSpeech() == 4){ if(getLineSpeech() == 4){
FinishSpeech(); FinishSpeech();
} }
@ -52,11 +53,14 @@ public class Battle {
} }
else if(0 < getLineSpeech() && getLineSpeech() < 4){ else if(0 < getLineSpeech() && getLineSpeech() < 4){
checkAnswer(answer); checkAnswer(answer);
if(pvEnemy <= 0){
FinishSpeech();
}
} }
else{ else{
readNextLine(); readNextLine();
} }
} }
//check the choice answer //check the choice answer
@ -98,15 +102,16 @@ public class Battle {
public void FinishSpeech(){ public void FinishSpeech(){
if(pvEnemy>0){ if(pvEnemy>0){
//alive (speechline = 6) //alive (speechline = 6)
lineSpeech += 2; lineSpeech = 6;
System.out.println("enemy alive"); System.out.println("enemy alive");
} }
else{ else{
//dead (speechline = 5) //dead (speechline = 5)
lineSpeech += 1; lineSpeech = 5;
System.out.println("enemy dead"); System.out.println("enemy dead");
} }
} }
public void finish(){ public void finish(){
screenBattleOn = false; screenBattleOn = false;