RecentRunner/TaipanClone
1
0
Fork 0
Code Issues 9 Pull Requests Actions Packages Projects Releases 11 Wiki Activity

Aight fixed some stuff

Browse Source
This commit is contained in:
KahootChampion
2019-02-25 20:06:21 -07:00
parent 27ac100618
commit 52ec4c2422
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/ShipWarfare.java
View File

@@ -3,7 +3,7 @@ import java.util.Random;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
public class ShipWarfare extends Player { public class ShipWarfare {
private int numOfPeasantShips = 0; private int numOfPeasantShips = 0;
private int numOfLittyShips = 0; private int numOfLittyShips = 0;
@@ -234,7 +234,7 @@ public class ShipWarfare extends Player {
System.out.println("Got eem"); System.out.println("Got eem");
delayForSeconds(1); delayForSeconds(1);
} else if (hitOrMiss == 2) { } else if (hitOrMiss == 2) {
System.out.printf("ARRG! We missed %s\n", getName()); System.out.printf("ARRG! We missed %s\n", player.getName());
delayForSeconds(1); delayForSeconds(1);
} else { } else {
System.out.println("Darn! Their fleet tanked our attack"); System.out.println("Darn! Their fleet tanked our attack");
@@ -247,7 +247,7 @@ public class ShipWarfare extends Player {
} }
} }
} else { } else {
System.out.printf("%s! We don't have any GUNS!!!!\n",player.getName()); System.out.printf("%s! We don't have any GUNS!!!!\n",player.player.getName());
delayForSeconds(1); delayForSeconds(1);
} }
@@ -265,7 +265,7 @@ public class ShipWarfare extends Player {
setNumOfLittyShips(numOfLittyShips - howMuchRun); setNumOfLittyShips(numOfLittyShips - howMuchRun);
if (userAttacks == true) { if (userAttacks == true) {
System.out.printf("Cowards! %d ships ran away %s!\n", howMuchRun, getName()); System.out.printf("Cowards! %d ships ran away %s!\n", howMuchRun, player.getName());
} else { } else {
System.out.printf("Escaped %d of them!\n", howMuchRun); System.out.printf("Escaped %d of them!\n", howMuchRun);
} }
@@ -367,7 +367,7 @@ public class ShipWarfare extends Player {
System.out.println("Got eem"); System.out.println("Got eem");
delayForSeconds(1); delayForSeconds(1);
} else { } else {
System.out.printf("ARRG! We missed %s\n", getName()); System.out.printf("ARRG! We missed %s\n", player.getName());
delayForSeconds(1); delayForSeconds(1);
} }
@@ -397,7 +397,7 @@ public class ShipWarfare extends Player {
setNumOfPeasantShips(numOfPeasantShips - howMuchRun); setNumOfPeasantShips(numOfPeasantShips - howMuchRun);
if (userAttacks == true) { if (userAttacks == true) {
System.out.printf("Ahhh, %d ships ran away %s!\n", howMuchRun, getName()); System.out.printf("Ahhh, %d ships ran away %s!\n", howMuchRun, player.getName());
} else { } else {
System.out.printf("Escaped %d of them!\n", howMuchRun); System.out.printf("Escaped %d of them!\n", howMuchRun);
} }
@@ -452,7 +452,10 @@ public class ShipWarfare extends Player {
delayForSeconds(2); delayForSeconds(2);
return true; return true;
} else if (exitValue == 2) { } else if (exitValue == 2) {
gameOver(); player.gameOver();
if(player.playAgain()){
setPlayer(new Player());
}
return true; return true;
} else if (exitValue == 3) { } else if (exitValue == 3) {
System.out.printf("We made it out at %d%% ship status!\n", player.getHP()); System.out.printf("We made it out at %d%% ship status!\n", player.getHP());