From b4b2d3377b00e1f9bffa3f756c5eb7083e6feb5b Mon Sep 17 00:00:00 2001
From: KahootChampion <p.harismuhammadkhan@gmail.com>
Date: Wed, 20 Feb 2019 09:47:51 -0700
Subject: [PATCH] Perhaps done basic ship warfare? (still must add Liu yen
 difficulty, ships running away, and Loot)

---
 .idea/workspace.xml                          |  94 +++++++++++-------
 out/production/TaipanClone/ShipWarfare.class | Bin 4148 -> 4472 bytes
 src/Player.java                              |  28 +++---
 src/ShipWarfare.java                         |  99 +++++++++++--------
 4 files changed, 128 insertions(+), 93 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 123eccf..f41aa8a 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ChangeListManager">
-    <list default="true" id="3114a2b9-4919-4fdf-8fd9-d03b60109ce4" name="Default Changelist" comment="Vikram, these are the types of changes Harkey and I meant for you to establish.">
+    <list default="true" id="3114a2b9-4919-4fdf-8fd9-d03b60109ce4" name="Default Changelist" comment="Perhaps done basic ship warfare?">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/out/production/TaipanClone/ShipWarfare.class" beforeDir="false" afterPath="$PROJECT_DIR$/out/production/TaipanClone/ShipWarfare.class" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/Player.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Player.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/ShipWarfare.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ShipWarfare.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TaipanShop.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TaipanShop.java" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/out/" />
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -19,12 +19,14 @@
       <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/src/ShipWarfare.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="1042">
-              <caret line="145" column="67" selection-start-line="145" selection-start-column="67" selection-end-line="145" selection-end-column="67" />
+            <state relative-caret-position="752">
+              <caret line="178" selection-start-line="178" selection-end-line="178" />
               <folding>
                 <element signature="imports" expanded="true" />
-                <element signature="e#1434#1435#0" expanded="true" />
-                <element signature="e#1555#1556#0" expanded="true" />
+                <element signature="e#1530#1531#0" expanded="true" />
+                <element signature="e#1570#1571#0" expanded="true" />
+                <element signature="e#1633#1634#0" expanded="true" />
+                <element signature="e#1691#1692#0" expanded="true" />
               </folding>
             </state>
           </provider>
@@ -33,8 +35,8 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/Player.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="1350">
-              <caret line="112" column="28" selection-start-line="112" selection-start-column="28" selection-end-line="112" selection-end-column="28" />
+            <state relative-caret-position="49">
+              <caret line="4" column="33" selection-start-line="4" selection-start-column="33" selection-end-line="4" selection-end-column="33" />
             </state>
           </provider>
         </entry>
@@ -42,7 +44,7 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/TaipanShop.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="5985">
+            <state relative-caret-position="1670">
               <caret line="400" selection-start-line="400" selection-end-line="400" />
               <folding>
                 <element signature="e#371#372#0" expanded="true" />
@@ -84,15 +86,25 @@
       <find>bank</find>
       <find>player.getMoney() += num *</find>
       <find>opiumHeld</find>
-      <find>hp</find>
       <find>player.</find>
+      <find>ARR</find>
+      <find>ARRG!</find>
+      <find>exit</find>
       <find>exitValue</find>
+      <find>setG</find>
+      <find>hp</find>
+      <find>o</find>
+      <find>oh no</find>
+      <find>shi</find>
+      <find>ships rem</find>
     </findStrings>
     <replaceStrings>
       <replace>player.getName()</replace>
       <replace>player.getBank()</replace>
       <replace>player.setMoney(player.getMoney() + num*)</replace>
       <replace>player.getOpiumHeld()</replace>
+      <replace>numOfPeasantShips</replace>
+      <replace>typeOfShip</replace>
     </replaceStrings>
   </component>
   <component name="Git.Settings">
@@ -103,8 +115,8 @@
     <option name="CHANGED_PATHS">
       <list>
         <option value="$PROJECT_DIR$/src/TaipanShop.java" />
-        <option value="$PROJECT_DIR$/src/Player.java" />
         <option value="$PROJECT_DIR$/src/ShipWarfare.java" />
+        <option value="$PROJECT_DIR$/src/Player.java" />
       </list>
     </option>
   </component>
@@ -223,7 +235,7 @@
       <workItem from="1550550806467" duration="577000" />
       <workItem from="1550552635138" duration="118000" />
       <workItem from="1550553016386" duration="7671000" />
-      <workItem from="1550672213804" duration="1589000" />
+      <workItem from="1550672213804" duration="8964000" />
     </task>
     <task id="LOCAL-00001" summary="Added troll comments">
       <created>1550458807806</created>
@@ -267,11 +279,18 @@
       <option name="project" value="LOCAL" />
       <updated>1550673099893</updated>
     </task>
-    <option name="localTasksCounter" value="7" />
+    <task id="LOCAL-00007" summary="Perhaps done basic ship warfare?">
+      <created>1550674024950</created>
+      <option name="number" value="00007" />
+      <option name="presentableId" value="LOCAL-00007" />
+      <option name="project" value="LOCAL" />
+      <updated>1550674024950</updated>
+    </task>
+    <option name="localTasksCounter" value="8" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="10414000" />
+    <option name="totallyTimeSpent" value="17789000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="0" y="23" width="1280" height="709" extended-state="0" />
@@ -286,7 +305,7 @@
       <window_info id="Favorites" order="6" side_tool="true" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" />
-      <window_info active="true" anchor="bottom" id="Run" order="2" visible="true" weight="0.3273906" />
+      <window_info anchor="bottom" id="Run" order="2" weight="0.3273906" />
       <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
@@ -321,7 +340,8 @@
     <MESSAGE value="Vikram, these are the types of changes Harkey and I meant for you to establish." />
     <MESSAGE value="Added GameOver() Method to Player class, btw System.out.flush just straight up Thanos's the terminal at the time (clears it)." />
     <MESSAGE value="I think I got the basic battling system down. Would appreciate i some of you guys beta tested it though and let me know the errors if there are any." />
-    <option name="LAST_COMMIT_MESSAGE" value="I think I got the basic battling system down. Would appreciate i some of you guys beta tested it though and let me know the errors if there are any." />
+    <MESSAGE value="Perhaps done basic ship warfare?" />
+    <option name="LAST_COMMIT_MESSAGE" value="Perhaps done basic ship warfare?" />
   </component>
   <component name="editorHistoryManager">
     <entry file="file://$PROJECT_DIR$/TaipanClone.iml">
@@ -337,28 +357,9 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/ShipWarfare.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1042">
-          <caret line="145" column="67" selection-start-line="145" selection-start-column="67" selection-end-line="145" selection-end-column="67" />
-          <folding>
-            <element signature="imports" expanded="true" />
-            <element signature="e#1434#1435#0" expanded="true" />
-            <element signature="e#1555#1556#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/Player.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1350">
-          <caret line="112" column="28" selection-start-line="112" selection-start-column="28" selection-end-line="112" selection-end-column="28" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/TaipanShop.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="5985">
+        <state relative-caret-position="1670">
           <caret line="400" selection-start-line="400" selection-end-line="400" />
           <folding>
             <element signature="e#371#372#0" expanded="true" />
@@ -381,6 +382,27 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/Player.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="49">
+          <caret line="4" column="33" selection-start-line="4" selection-start-column="33" selection-end-line="4" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/ShipWarfare.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="752">
+          <caret line="178" selection-start-line="178" selection-end-line="178" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="e#1530#1531#0" expanded="true" />
+            <element signature="e#1570#1571#0" expanded="true" />
+            <element signature="e#1633#1634#0" expanded="true" />
+            <element signature="e#1691#1692#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
   </component>
   <component name="masterDetails">
     <states>
diff --git a/out/production/TaipanClone/ShipWarfare.class b/out/production/TaipanClone/ShipWarfare.class
index afd7e0713bad595c9cf6ab2913e62b6e48558f29..1a9fdcce977aabd26917fe5db4d8be30d1b73065 100644
GIT binary patch
literal 4472
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
F{V(@N{j~r9

delta 2495
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

diff --git a/src/Player.java b/src/Player.java
index 18d8116..a82f6d3 100644
--- a/src/Player.java
+++ b/src/Player.java
@@ -2,13 +2,13 @@ public class Player {
 
     private String name = "Taipan";
     private int bank = 0;
-    private int money = 1000;
+    private int money = 100000000;
     private int opiumHeld = 0;
     private int silkHeld = 0;
     private int generalHeld = 0;
     private int armsHeld = 0;
     private int location = 1;
-    private int guns = 3;
+    private int guns = 6;
     private int HP = 100;
 
 
@@ -25,9 +25,9 @@ public class Player {
     }
 
     public void setHP(int HP) {
-        if(HP>= 0){
-            this.HP = HP;
-        }
+
+        this.HP = HP;
+
     }
 
     public int getBank() {
@@ -35,7 +35,7 @@ public class Player {
     }
 
     public void setBank(int bank) {
-        if(bank>= 0) {
+        if (bank >= 0) {
             this.bank = bank;
         }
     }
@@ -45,7 +45,7 @@ public class Player {
     }
 
     public void setMoney(int money) {
-        if(money>= 0) {
+        if (money >= 0) {
             this.money = money;
         }
     }
@@ -55,7 +55,7 @@ public class Player {
     }
 
     public void setOpiumHeld(int opiumHeld) {
-        if(opiumHeld>= 0) {
+        if (opiumHeld >= 0) {
             this.opiumHeld = opiumHeld;
         }
     }
@@ -65,7 +65,7 @@ public class Player {
     }
 
     public void setSilkHeld(int silkHeld) {
-        if(silkHeld>= 0) {
+        if (silkHeld >= 0) {
             this.silkHeld = silkHeld;
         }
     }
@@ -75,7 +75,7 @@ public class Player {
     }
 
     public void setGeneralHeld(int generalHeld) {
-        if(generalHeld>= 0) {
+        if (generalHeld >= 0) {
             this.generalHeld = generalHeld;
         }
     }
@@ -85,7 +85,7 @@ public class Player {
     }
 
     public void setArmsHeld(int armsHeld) {
-        if(armsHeld>= 0) {
+        if (armsHeld >= 0) {
             this.armsHeld = armsHeld;
         }
     }
@@ -95,7 +95,7 @@ public class Player {
     }
 
     public void setLocation(int location) {
-        if(location>= 0) {
+        if (location >= 0) {
             this.location = location;
         }
     }
@@ -105,7 +105,7 @@ public class Player {
     }
 
     public void setGuns(int guns) {
-        if(guns>= 0) {
+        if (guns >= 0) {
             this.guns = guns;
         }
     }
@@ -115,7 +115,7 @@ public class Player {
         System.out.println("Game over");
     }
 
-    public static void main(String[] args) throws Exception{
+    public static void main(String[] args) throws Exception {
         ShipWarfare littyboi = new ShipWarfare();
         TaipanShop littyShop = new TaipanShop();
         littyShop.shop();
diff --git a/src/ShipWarfare.java b/src/ShipWarfare.java
index aec5b46..a4e80b9 100644
--- a/src/ShipWarfare.java
+++ b/src/ShipWarfare.java
@@ -5,34 +5,31 @@ import java.util.concurrent.TimeUnit;
 public class ShipWarfare extends Player {
 
     private int numOfPeasantShips = 0;
-    private boolean userAttacks= true;
-
+    private boolean userAttacks = true;
 
 
     public void peasantFleetAttack() throws Exception {
         Scanner userResponse = new Scanner(System.in);
         setNumOfPeasantShips(numOfShips());
         System.out.printf("By Golly! We have $%,d \nwe are being attacked by %d ships\n", getMoney(), getNumOfPeasantShips());
-        System.out.println("What do you want to do? Enter \"f\" to fight, and \"r\" to run ");
+        fightOrRunMessage();
         while (true) {
             String response = userResponse.nextLine();
             if (response.equalsIgnoreCase("f")) {
-                userAttacks=true;
+                userAttacks = true;
                 System.out.println("Ohh, fight ehh?");
-                boolean winOrLose= destroyShipsOrEscape(getNumOfPeasantShips());
-                if(winOrLose==true){
+                boolean winOrLose = destroyShipsOrEscape(getNumOfPeasantShips());
+                if (winOrLose == true) {
                     break;
                 }
 
 
-
             } else if (response.equalsIgnoreCase("r")) {
                 runFromShips();
-                if(runFromShips()==false) {
+                if (runFromShips() == false) {
                     System.out.println("Couldn't run away!");
                     destroyShipsOrEscape(getNumOfPeasantShips());
-                }
-                else{
+                } else {
                     break;
                 }
 
@@ -44,6 +41,11 @@ public class ShipWarfare extends Player {
     }
 
 
+    public void fightOrRunMessage() {
+        System.out.printf("What do you want to do? Enter \"f\" to fight, and \"r\" to run (we have %d guns)", getGuns());
+
+    }
+
     public int getNumOfPeasantShips() {
         return numOfPeasantShips;
     }
@@ -81,7 +83,7 @@ public class ShipWarfare extends Player {
     }
 
     public boolean runFromShips() {
-        userAttacks=false;
+        userAttacks = false;
         Random randomValue = new Random();
         int runSuccessChance = randomValue.nextInt(2) + 1;
         if (runSuccessChance == 2) {
@@ -95,21 +97,21 @@ public class ShipWarfare extends Player {
     public boolean destroyShipsOrEscape(int typeOfShip) throws Exception {
         Scanner userInput = new Scanner(System.in);
         Random randomValue = new Random();
-        int shipsRemaining = typeOfShip;
-        int exitValue=0;
-        int counter=0;
+        numOfPeasantShips = typeOfShip;
+        int exitValue = 0;
 
-            //Player volley
+        //Player volley
+        if (exitValue == 0) {
             while (exitValue == 0) {
-                counter++;
-                for (int i = 0; i < shipsRemaining; i++) {
-                    if (userAttacks==true) {
-                        for (int j = 0; j < getGuns(); j++) {
+                for (int i = 0; i < numOfPeasantShips; i++) {
+
+                    for (int j = 0; j < getGuns(); j++) {
+                        if (userAttacks == true) {
                             int hitOrMiss = randomValue.nextInt(2) + 1;
                             if (hitOrMiss == 2) {
-                                shipsRemaining--;
-                                if (shipsRemaining <= 0) {
-                                    exitValue= 1;
+                                numOfPeasantShips--;
+                                if (numOfPeasantShips <= 0) {
+                                    exitValue = 1;
                                     break;
                                 }
                                 System.out.println("Got eem");
@@ -120,30 +122,39 @@ public class ShipWarfare extends Player {
                             }
 
 
+                        } else {
+                            continue;
                         }
                     }
 
-                    if (shipsRemaining <= 0) {
+
+                    if (numOfPeasantShips <= 0) {
                         exitValue = 1;
                         break;
                     }
 
-                    System.out.printf("%d ships remaining\n", shipsRemaining);
+                    System.out.printf("%d ships remaining\n", getNumOfPeasantShips());
                     System.out.println("Oh no, they are taking the offensive!");
                     delayForASecond();
                     //Computer volley
-                    setHP(getHP() - (1+ randomValue.nextInt(10)));
+                    int takeGunChance = randomValue.nextInt(4) + 1;
+                    if (takeGunChance == 1 && getGuns() > 0) {
+                        setGuns(getGuns() - 1);
+                        System.out.println("Dang it! They destroyed one of our guns");
+                    } else {
+                        setHP(getHP() - (1 + randomValue.nextInt(10)));
+                    }
                     if (getHP() <= 0) {
                         exitValue = 2;
                         break;
                     }
                     System.out.printf("EEK, we have %d health left\n", getHP());
                     delayForASecond();
-                    if(userAttacks==false){
-                        userAttacks=true;
+                    if (userAttacks == false) {
+                        userAttacks = true;
                     }
 
-                    System.out.println("Shall we continue to fight? Enter \"f\" to fight, and \"r\" to run");
+                    System.out.printf("Shall we continue to fight? Enter \"f\" to fight, and \"r\" to run (We have %d guns left)", getGuns());
 
                     String response = userInput.nextLine();
                     if (response.equalsIgnoreCase("r")) {
@@ -162,27 +173,29 @@ public class ShipWarfare extends Player {
                     break;
                 }
             }
-            if (exitValue == 1) {
-                System.out.printf("\nGot eem\nVictory!\nIt appears we have defeated the enemy fleet and made it out at %d health\n", getHP());
-                return true;
-            } else if (exitValue == 2) {
-                gameOver();
-                return true;
-            } else if (exitValue == 3) {
-                System.out.printf("We made it out at %d health!\n", getHP());
-                return true;
-            }
-            return false;
-
-
         }
-        //Type of ship implied to be Liu Yen fleet
+        if (exitValue == 1) {
+            System.out.printf("\nGot eem\nVictory!\nIt appears we have defeated the enemy fleet and made it out at %d health\n", getHP());
+            return true;
+        } else if (exitValue == 2) {
+            gameOver();
+            return true;
+        } else if (exitValue == 3) {
+            System.out.printf("We made it out at %d health!\n", getHP());
+            return true;
+        }
+        return false;
 
 
+    }
+    //Type of ship implied to be Liu Yen fleet
+
 
     public static void main(String[] args) throws Exception {
         ShipWarfare littyObject = new ShipWarfare();
         littyObject.peasantFleetAttack();
     }
 
-}
\ No newline at end of file
+}
+
+