From 0bcdbd1af83f31f5045f652e3b9d149a5e0a092f Mon Sep 17 00:00:00 2001
From: KahootChampion
Date: Fri, 22 Feb 2019 00:20:57 -0700
Subject: [PATCH] Fixed like 3 naming/logical errors in ShipWarfare
---
.idea/workspace.xml | 174 +++++++++++++------
out/production/TaipanClone/ShipWarfare.class | Bin 4713 -> 6993 bytes
src/ShipWarfare.java | 4 +-
3 files changed, 125 insertions(+), 53 deletions(-)
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index d3fa46a..dcb0929 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -1,11 +1,10 @@
-
+
-
+
-
@@ -33,8 +32,8 @@
-
-
+
+
@@ -42,11 +41,29 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
@@ -63,8 +80,32 @@
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -80,20 +121,6 @@
- name
- bank
- player.getMoney() += num *
- opiumHeld
- player.
- ARR
- ARRG!
- exit
- exitValue
- setG
- hp
- o
- oh no
- shi
ships rem
phew
heal
@@ -104,12 +131,26 @@
chanceOfRun
chance
get
- set
Peasant
d
captain
printf
+ liu
+ howmuchRun
+ setPlayer
+ setNumOf
+ setNumOfLitty
+ setNumOfLitt
+ setG
+ setMoney
+ setN
setNum
+ set
+ peasant
+ startingPeasantShips
+ startingLittyShips
+ destroy
+ litty
player.getName()
@@ -122,6 +163,7 @@
litty
Liitty
Litty
+ player.set
%s
@@ -135,6 +177,7 @@
+
@@ -173,7 +216,7 @@
-
+
@@ -242,10 +285,10 @@
+
-
@@ -264,7 +307,7 @@
-
+
1550458807806
@@ -336,14 +379,22 @@
1550810365166
-
+
+ 1550817871034
+
+
+
+ 1550817871034
+
+
-
+
+
@@ -352,9 +403,10 @@
+
-
+
@@ -392,7 +444,8 @@
-
+
+
@@ -417,41 +470,60 @@
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
diff --git a/out/production/TaipanClone/ShipWarfare.class b/out/production/TaipanClone/ShipWarfare.class
index 7eac9bfa262c9a478d624bfaf6b2e8e53c2a6a5f..80ae05917a0414070037b7565c2e1885901a35db 100644
GIT binary patch
literal 6993
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
literal 4713
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
CKSnwL
diff --git a/src/ShipWarfare.java b/src/ShipWarfare.java
index 4e39241..ebcf9c0 100644
--- a/src/ShipWarfare.java
+++ b/src/ShipWarfare.java
@@ -17,7 +17,7 @@ public class ShipWarfare extends Player {
Scanner userResponse = new Scanner(System.in);
setNumOfPeasantShips(numOfShips());
- System.out.printf("By Golly! We have $%,d and are being attacked by %d Merchant ships\nCurrently our ship status is %d%%\n", getMoney(), numOfLittyShips, getHP());
+ System.out.printf("By Golly! We have $%,d and are being attacked by %d Merchant ships\nCurrently our ship status is %d%%\n", getMoney(), numOfPeasantShips, getHP());
fightOrRunMessage();
while (true) {
@@ -239,7 +239,7 @@ public class ShipWarfare extends Player {
if (exitValue == 1) {
System.out.printf("\nGot eem\nVictory!\nIt appears we have defeated the enemy fleet and made it out at %d%% ship status\n", getHP());
- calculateLoot = (randomValue.nextInt(startingPeasantShips) + startingPeasantShips) * 100;
+ calculateLoot = (randomValue.nextInt(startingLittyShips) + startingLittyShips) * 300;
setMoney(getMoney() + calculateLoot);
System.out.printf("We got $%,d!\n", calculateLoot);
return true;