Adding back the old files

Remade Legacy branch after destroying it
Merge remote-tracking branch 'origin/master'
2019-03-12 08:45:44 -06:00 · 2019-03-12 08:44:25 -06:00 · 2019-03-11 19:40:25 -06:00 · 2019-03-11 19:40:13 -06:00 · 2019-03-11 19:38:02 -06:00 · 2019-03-11 19:17:31 -06:00
3 changed files with 430 additions and 147 deletions
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -9,7 +9,7 @@
  <component name="ProjectKey">
    <option name="state" value="project://63537948-39a4-48a0-9c97-34259a0fa913" />
  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8.0_141" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
    <output url="file://$PROJECT_DIR$/out" />
  </component>
  <component name="SvnBranchConfigurationManager">
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -1,14 +1,10 @@
 <?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="Fixed the commenting on a lot of the code. Also added some stuff to Travel, fixed some bugs.">
-      <change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Travel.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Travel.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main.java" afterDir="false" />
-    </list>
+    <list default="true" id="3114a2b9-4919-4fdf-8fd9-d03b60109ce4" name="Default Changelist" comment="" />
    <ignored path="$PROJECT_DIR$/out/" />
    <ignored path="C:\Users\Harkamal Randhawa\IdeaProjects\TaipanClone\.idea\shelf/" />
+    <ignored path="$PROJECT_DIR$/.idea/shelf/" />
    <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
    <option name="SHOW_DIALOG" value="false" />
    <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -18,28 +14,19 @@
  <component name="FileEditorManager">
    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/Start.java">
+        <entry file="file://$PROJECT_DIR$/src/MainGUI.java">
          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="590">
-              <caret line="70" column="24" lean-forward="true" selection-start-line="70" selection-start-column="24" selection-end-line="70" selection-end-column="24" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="184">
-              <caret line="42" column="62" selection-start-line="42" selection-start-column="62" selection-end-line="42" selection-end-column="62" />
+            <state relative-caret-position="651">
+              <caret line="38" column="39" selection-start-line="38" selection-start-column="39" selection-end-line="38" selection-end-column="39" />
            </state>
          </provider>
        </entry>
      </file>
      <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/Travel.java">
+        <entry file="file://$PROJECT_DIR$/src/StartGUI.java">
          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="27">
-              <caret line="125" column="63" selection-start-line="125" selection-start-column="63" selection-end-line="125" selection-end-column="63" />
+            <state relative-caret-position="308">
+              <caret line="214" column="38" selection-start-line="214" selection-start-column="38" selection-end-line="214" selection-end-column="38" />
              <folding>
                <element signature="imports" expanded="true" />
              </folding>
@@ -47,41 +34,53 @@
          </provider>
        </entry>
      </file>
-      <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="168">
-              <caret line="594" column="42" lean-forward="true" selection-start-line="594" selection-start-column="42" selection-end-line="594" selection-end-column="42" />
-              <folding>
-                <element signature="imports" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/Bank.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-872">
-              <caret line="7" column="6" lean-forward="true" selection-start-line="7" selection-start-column="6" selection-end-line="7" selection-end-column="6" />
-            </state>
-          </provider>
-        </entry>
-      </file>
      <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="-2606">
-              <caret line="24" column="5" lean-forward="true" selection-start-line="24" selection-start-column="5" selection-end-line="24" selection-end-column="5" />
+            <state relative-caret-position="1764">
+              <caret line="84" column="44" selection-start-line="84" selection-start-column="44" selection-end-line="84" selection-end-column="44" />
            </state>
          </provider>
        </entry>
      </file>
      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/ShipWarfare.java">
+        <entry file="file://$PROJECT_DIR$/src/TravelGUI.java">
          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="17">
-              <caret line="353" column="11" selection-start-line="353" selection-start-column="11" selection-end-line="353" selection-end-column="11" />
+            <state relative-caret-position="9114">
+              <caret line="453" column="33" selection-start-line="453" selection-start-column="33" selection-end-line="453" selection-end-column="33" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/TaipanShopGUI.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="204">
+              <caret line="95" column="42" lean-forward="true" selection-start-line="95" selection-start-column="42" selection-end-line="95" selection-end-column="42" />
+              <folding>
+                <element signature="n#!!doc" expanded="true" />
+                <element signature="imports" expanded="true" />
+                <element signature="e#23606#23607#0" expanded="true" />
+                <element signature="e#23651#23652#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/GameEndGUI.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="42">
+              <caret line="14" column="13" selection-start-line="14" selection-start-column="13" selection-end-line="14" selection-end-column="13" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/ShipWarfareGUI.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="5901">
+              <caret line="300" column="9" selection-start-line="300" selection-start-column="9" selection-end-line="300" selection-end-column="9" />
              <folding>
                <element signature="imports" expanded="true" />
              </folding>
@@ -90,10 +89,10 @@
        </entry>
      </file>
      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/Warehouse.java">
+        <entry file="file://$PROJECT_DIR$/src/LoanSharkGUI.java">
          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="34">
-              <caret line="2" column="3" selection-start-line="2" selection-start-column="3" selection-end-line="2" selection-end-column="3" />
+            <state relative-caret-position="525">
+              <caret line="35" column="7" selection-start-line="35" selection-start-column="7" selection-end-line="35" selection-end-column="7" />
            </state>
          </provider>
        </entry>
@@ -109,25 +108,48 @@
  </component>
  <component name="FindInProjectRecents">
    <findStrings>
-      <find>Hp</find>
-      <find>travel</find>
-      <find>notDone</find>
-      <find>GetGuns</find>
-      <find>get</find>
-      <find>set</find>
-      <find>TaipanShop</find>
-      <find>shop()</find>
-      <find>shop</find>
+      <find>destr</find>
+      <find>destro</find>
+      <find>hitco</find>
+      <find>game</find>
+      <find>numOf</find>
+      <find>mis</find>
+      <find>exitValue</find>
+      <find>getGuns</find>
+      <find>frustRat</find>
+      <find>counter++</find>
+      <find>setMone</find>
+      <find>setNum</find>
+      <find>We survive</find>
+      <find>total of</find>
+      <find>int numOfShips</find>
+      <find>runFromShips()</find>
+      <find>dang it!</find>
+      <find>dang it</find>
+      <find>destroy</find>
+      <find>destroyPeas</find>
+      <find>cash</find>
+      <find>op</find>
+      <find>continue</find>
+      <find>cashTex</find>
+      <find>cashTe</find>
+      <find>run</find>
+      <find>loan</find>
+      <find>get loa</find>
+      <find>warehouse</find>
+      <find>warehouse\n</find>
    </findStrings>
    <replaceStrings>
      <replace>HP</replace>
      <replace>p1.get</replace>
      <replace>p1.set</replace>
+      <replace>shipWarfare.getHowMuchRun()</replace>
+      <replace>shipWarfare.isUserAttacks()</replace>
+      <replace>shipWarfare.getNumOfPeasantShips()</replace>
    </replaceStrings>
  </component>
  <component name="Git.Settings">
-    <option name="UPDATE_CHANGES_POLICY" value="SHELVE" />
-    <option name="UPDATE_TYPE" value="MERGE" />
+    <option name="UPDATE_TYPE" value="REBASE" />
    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
  </component>
  <component name="IdeDocumentHistory">
@@ -135,30 +157,31 @@
      <list>
        <option value="$PROJECT_DIR$/src/Core.java" />
        <option value="$PROJECT_DIR$/src/Game.java" />
-        <option value="$PROJECT_DIR$/src/ShipWarfare.java" />
-        <option value="$PROJECT_DIR$/src/Player.java" />
        <option value="$PROJECT_DIR$/src/Start.java" />
        <option value="$PROJECT_DIR$/src/TaipanShop.java" />
        <option value="$PROJECT_DIR$/src/main.java" />
        <option value="$PROJECT_DIR$/src/Travel.java" />
+        <option value="$PROJECT_DIR$/src/ShipWarfare.java" />
+        <option value="$PROJECT_DIR$/src/TravelGUI.java" />
+        <option value="$PROJECT_DIR$/src/Player.java" />
+        <option value="$PROJECT_DIR$/src/TaipanShopGUI.java" />
+        <option value="$PROJECT_DIR$/src/StartGUI.java" />
+        <option value="$PROJECT_DIR$/src/ShipWarfareGUI.java" />
      </list>
    </option>
  </component>
  <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="167" />
-    <option name="y" value="-11" />
-    <option name="width" value="1696" />
-    <option name="height" value="1026" />
-  </component>
-  <component name="ProjectLevelVcsManager" settingsEditedManually="true">
-    <ConfirmationsSetting value="2" id="Add" />
+    <option name="x" value="295" />
+    <option name="y" value="36" />
+    <option name="width" value="1189" />
+    <option name="height" value="652" />
  </component>
+  <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
  <component name="ProjectView">
    <navigator proportions="" version="1">
      <foldersAlwaysOnTop value="true" />
    </navigator>
    <panes>
-      <pane id="Scope" />
      <pane id="PackagesPane" />
      <pane id="ProjectPane">
        <subPane>
@@ -176,16 +199,17 @@
          <select />
        </subPane>
      </pane>
+      <pane id="Scope" />
    </panes>
  </component>
  <component name="PropertiesComponent">
    <property name="ChangesTree.GroupingKeys" value="" />
    <property name="WebServerToolWindowFactoryState" value="false" />
    <property name="aspect.path.notification.shown" value="true" />
-    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1551163322073" />
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1552351596289" />
    <property name="extract.method.default.visibility" value="private" />
-    <property name="last_opened_file_path" value="$USER_HOME$/Documents/GitHub/Cpsc233" />
-    <property name="project.structure.last.edited" value="Project" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/../GitHub/Cpsc233" />
+    <property name="project.structure.last.edited" value="Modules" />
    <property name="project.structure.proportion" value="0.15" />
    <property name="project.structure.side.proportion" value="0.2" />
    <property name="settings.editor.selected.configurable" value="editing.templates" />
@@ -202,7 +226,7 @@
      </list>
    </option>
  </component>
-  <component name="RunManager" selected="Application.main">
+  <component name="RunManager" selected="Application.MainGUI">
    <configuration name="Game" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
      <option name="MAIN_CLASS_NAME" value="Game" />
      <module name="TaipanClone" />
@@ -210,8 +234,15 @@
        <option name="Make" enabled="true" />
      </method>
    </configuration>
-    <configuration name="ShipWarfare" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
-      <option name="MAIN_CLASS_NAME" value="ShipWarfare" />
+    <configuration name="MainGUI" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
+      <option name="MAIN_CLASS_NAME" value="MainGUI" />
+      <module name="TaipanClone" />
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
+    </configuration>
+    <configuration name="ShipWarfareGUI" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
+      <option name="MAIN_CLASS_NAME" value="ShipWarfareGUI" />
      <module name="TaipanClone" />
      <method v="2">
        <option name="Make" enabled="true" />
@@ -224,13 +255,6 @@
        <option name="Make" enabled="true" />
      </method>
    </configuration>
-    <configuration name="Travel" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
-      <option name="MAIN_CLASS_NAME" value="Travel" />
-      <module name="TaipanClone" />
-      <method v="2">
-        <option name="Make" enabled="true" />
-      </method>
-    </configuration>
    <configuration name="main" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
      <option name="MAIN_CLASS_NAME" value="main" />
      <module name="TaipanClone" />
@@ -239,19 +263,19 @@
      </method>
    </configuration>
    <list>
-      <item itemvalue="Application.ShipWarfare" />
      <item itemvalue="Application.TaipanShop" />
-      <item itemvalue="Application.Travel" />
      <item itemvalue="Application.Game" />
      <item itemvalue="Application.main" />
+      <item itemvalue="Application.ShipWarfareGUI" />
+      <item itemvalue="Application.MainGUI" />
    </list>
    <recent_temporary>
      <list>
+        <item itemvalue="Application.MainGUI" />
+        <item itemvalue="Application.ShipWarfareGUI" />
        <item itemvalue="Application.main" />
        <item itemvalue="Application.TaipanShop" />
        <item itemvalue="Application.Game" />
-        <item itemvalue="Application.ShipWarfare" />
-        <item itemvalue="Application.Travel" />
      </list>
    </recent_temporary>
  </component>
@@ -277,6 +301,27 @@
      <workItem from="1550878072546" duration="2009000" />
      <workItem from="1551065104002" duration="1313000" />
      <workItem from="1551158469442" duration="4822000" />
+      <workItem from="1552183127375" duration="5000" />
+      <workItem from="1552183173819" duration="43000" />
+      <workItem from="1552183247090" duration="42000" />
+      <workItem from="1552183350012" duration="132000" />
+      <workItem from="1552183501892" duration="5000" />
+      <workItem from="1552187010251" duration="1043000" />
+      <workItem from="1552195875453" duration="55000" />
+      <workItem from="1552195941602" duration="33000" />
+      <workItem from="1552195980542" duration="513000" />
+      <workItem from="1552197114688" duration="110000" />
+      <workItem from="1552198897279" duration="7000" />
+      <workItem from="1552199842131" duration="998000" />
+      <workItem from="1552201459117" duration="275000" />
+      <workItem from="1552203562938" duration="2174000" />
+      <workItem from="1552207404121" duration="54000" />
+      <workItem from="1552210170594" duration="72000" />
+      <workItem from="1552238757321" duration="742000" />
+      <workItem from="1552240770629" duration="40000" />
+      <workItem from="1552241394045" duration="178000" />
+      <workItem from="1552254283748" duration="9473000" />
+      <workItem from="1552277298937" duration="10904000" />
    </task>
    <task id="LOCAL-00001" summary="This should fix the ShipWarfare file and bring it up to date with the rest of the file.">
      <created>1550458470138</created>
@@ -355,16 +400,213 @@
      <option name="project" value="LOCAL" />
      <updated>1551162699319</updated>
    </task>
-    <option name="localTasksCounter" value="12" />
+    <task id="LOCAL-00012" summary="Added time stuff to Shipwarfare GUI">
+      <created>1552168801248</created>
+      <option name="number" value="00012" />
+      <option name="presentableId" value="LOCAL-00012" />
+      <option name="project" value="LOCAL" />
+      <updated>1552168801248</updated>
+    </task>
+    <task id="LOCAL-00013" summary="Notified of getting attacked">
+      <created>1552172956109</created>
+      <option name="number" value="00013" />
+      <option name="presentableId" value="LOCAL-00013" />
+      <option name="project" value="LOCAL" />
+      <updated>1552172956109</updated>
+    </task>
+    <task id="LOCAL-00014" summary="Added fight stuff">
+      <created>1552173216531</created>
+      <option name="number" value="00014" />
+      <option name="presentableId" value="LOCAL-00014" />
+      <option name="project" value="LOCAL" />
+      <updated>1552173216532</updated>
+    </task>
+    <task id="LOCAL-00015" summary="Made ShipWarfare easier to access by ShipWarfareGUI">
+      <created>1552181324520</created>
+      <option name="number" value="00015" />
+      <option name="presentableId" value="LOCAL-00015" />
+      <option name="project" value="LOCAL" />
+      <updated>1552181324520</updated>
+    </task>
+    <task id="LOCAL-00016" summary="Missed one statement that I needed to encapsulate">
+      <created>1552181613507</created>
+      <option name="number" value="00016" />
+      <option name="presentableId" value="LOCAL-00016" />
+      <option name="project" value="LOCAL" />
+      <updated>1552181613507</updated>
+    </task>
+    <task id="LOCAL-00017" summary="Messed up player by setting money to 1000">
+      <created>1552181667375</created>
+      <option name="number" value="00017" />
+      <option name="presentableId" value="LOCAL-00017" />
+      <option name="project" value="LOCAL" />
+      <updated>1552181667376</updated>
+    </task>
+    <task id="LOCAL-00018" summary="Please find error">
+      <created>1552187032139</created>
+      <option name="number" value="00018" />
+      <option name="presentableId" value="LOCAL-00018" />
+      <option name="project" value="LOCAL" />
+      <updated>1552187032139</updated>
+    </task>
+    <task id="LOCAL-00019" summary="Super broken but fight button is in progress for shipwarfare">
+      <created>1552195966566</created>
+      <option name="number" value="00019" />
+      <option name="presentableId" value="LOCAL-00019" />
+      <option name="project" value="LOCAL" />
+      <updated>1552195966566</updated>
+    </task>
+    <task id="LOCAL-00020" summary="Forces you to fight in ShipWarfareGUI unfortunately">
+      <created>1552197150577</created>
+      <option name="number" value="00020" />
+      <option name="presentableId" value="LOCAL-00020" />
+      <option name="project" value="LOCAL" />
+      <updated>1552197150577</updated>
+    </task>
+    <task id="LOCAL-00021" summary="ShipWarfare fight button coming along nicely">
+      <created>1552200771732</created>
+      <option name="number" value="00021" />
+      <option name="presentableId" value="LOCAL-00021" />
+      <option name="project" value="LOCAL" />
+      <updated>1552200771732</updated>
+    </task>
+    <task id="LOCAL-00022" summary="Shipwarfare fight button GUI almost complete">
+      <created>1552203599900</created>
+      <option name="number" value="00022" />
+      <option name="presentableId" value="LOCAL-00022" />
+      <option name="project" value="LOCAL" />
+      <updated>1552203599900</updated>
+    </task>
+    <task id="LOCAL-00023" summary="Fixed numOfShips method for ShipWarfareGUI">
+      <created>1552205678080</created>
+      <option name="number" value="00023" />
+      <option name="presentableId" value="LOCAL-00023" />
+      <option name="project" value="LOCAL" />
+      <updated>1552205678080</updated>
+    </task>
+    <task id="LOCAL-00024" summary="Fixed the loot system a bit">
+      <created>1552207442784</created>
+      <option name="number" value="00024" />
+      <option name="presentableId" value="LOCAL-00024" />
+      <option name="project" value="LOCAL" />
+      <updated>1552207442785</updated>
+    </task>
+    <task id="LOCAL-00025" summary="Completely ruined shipWarfare with a previous edit, fixed it and added a better loot feature for peasant ships">
+      <created>1552210228514</created>
+      <option name="number" value="00025" />
+      <option name="presentableId" value="LOCAL-00025" />
+      <option name="project" value="LOCAL" />
+      <updated>1552210228514</updated>
+    </task>
+    <task id="LOCAL-00026" summary="Basic functionality of buttons completed, think all I have to do now is to find a way to break the code when the user wins, loses or runs away.">
+      <created>1552238814974</created>
+      <option name="number" value="00026" />
+      <option name="presentableId" value="LOCAL-00026" />
+      <option name="project" value="LOCAL" />
+      <updated>1552238814974</updated>
+    </task>
+    <task id="LOCAL-00027" summary="Fixed probability of ships running away">
+      <created>1552240801199</created>
+      <option name="number" value="00027" />
+      <option name="presentableId" value="LOCAL-00027" />
+      <option name="project" value="LOCAL" />
+      <updated>1552240801199</updated>
+    </task>
+    <task id="LOCAL-00028" summary="Fined minor bugs in shipwarfareGUI including the &quot;gun frustration&quot; variable">
+      <created>1552241433802</created>
+      <option name="number" value="00028" />
+      <option name="presentableId" value="LOCAL-00028" />
+      <option name="project" value="LOCAL" />
+      <updated>1552241433802</updated>
+    </task>
+    <task id="LOCAL-00029" summary="Just checking">
+      <created>1552254331758</created>
+      <option name="number" value="00029" />
+      <option name="presentableId" value="LOCAL-00029" />
+      <option name="project" value="LOCAL" />
+      <updated>1552254331759</updated>
+    </task>
+    <task id="LOCAL-00030" summary="A lot of errors but easily fixable SHipwarfareGUI">
+      <created>1552268490741</created>
+      <option name="number" value="00030" />
+      <option name="presentableId" value="LOCAL-00030" />
+      <option name="project" value="LOCAL" />
+      <updated>1552268490741</updated>
+    </task>
+    <task id="LOCAL-00031" summary="Completed SHipWarfareGUI">
+      <created>1552269636545</created>
+      <option name="number" value="00031" />
+      <option name="presentableId" value="LOCAL-00031" />
+      <option name="project" value="LOCAL" />
+      <updated>1552269636545</updated>
+    </task>
+    <task id="LOCAL-00032" summary="Completed ShipWarfareGUI">
+      <created>1552269681200</created>
+      <option name="number" value="00032" />
+      <option name="presentableId" value="LOCAL-00032" />
+      <option name="project" value="LOCAL" />
+      <updated>1552269681200</updated>
+    </task>
+    <task id="LOCAL-00033" summary="Probably should upload">
+      <created>1552270321401</created>
+      <option name="number" value="00033" />
+      <option name="presentableId" value="LOCAL-00033" />
+      <option name="project" value="LOCAL" />
+      <updated>1552270321402</updated>
+    </task>
+    <task id="LOCAL-00034" summary="Fixed ShipWarfare bug about one-shotting.">
+      <created>1552279406065</created>
+      <option name="number" value="00034" />
+      <option name="presentableId" value="LOCAL-00034" />
+      <option name="project" value="LOCAL" />
+      <updated>1552279406066</updated>
+    </task>
+    <task id="LOCAL-00035" summary="Completed javadocs for shipwarfare GUI">
+      <created>1552280311398</created>
+      <option name="number" value="00035" />
+      <option name="presentableId" value="LOCAL-00035" />
+      <option name="project" value="LOCAL" />
+      <updated>1552280311399</updated>
+    </task>
+    <task id="LOCAL-00036" summary="Added to my javadocs a bit">
+      <created>1552280610787</created>
+      <option name="number" value="00036" />
+      <option name="presentableId" value="LOCAL-00036" />
+      <option name="project" value="LOCAL" />
+      <updated>1552280610787</updated>
+    </task>
+    <task id="LOCAL-00037" summary="Changed one line of text in shipwarfare GUI">
+      <created>1552282957716</created>
+      <option name="number" value="00037" />
+      <option name="presentableId" value="LOCAL-00037" />
+      <option name="project" value="LOCAL" />
+      <updated>1552282957716</updated>
+    </task>
+    <task id="LOCAL-00038" summary="Fixed output for start and TaipanShop GUI">
+      <created>1552328825548</created>
+      <option name="number" value="00038" />
+      <option name="presentableId" value="LOCAL-00038" />
+      <option name="project" value="LOCAL" />
+      <updated>1552328825548</updated>
+    </task>
+    <task id="LOCAL-00039" summary="Added JavaDocs for ShipWarfare">
+      <created>1552339973224</created>
+      <option name="number" value="00039" />
+      <option name="presentableId" value="LOCAL-00039" />
+      <option name="project" value="LOCAL" />
+      <updated>1552339973224</updated>
+    </task>
+    <option name="localTasksCounter" value="40" />
    <servers />
  </component>
  <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="42486000" />
+    <option name="totallyTimeSpent" value="84236000" />
  </component>
  <component name="ToolWindowManager">
-    <frame x="-8" y="-8" width="1696" height="1026" extended-state="7" />
+    <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
+    <editor active="true" />
    <layout>
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.21026894" />
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.18123667" />
      <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
      <window_info id="Image Layers" order="2" />
      <window_info id="Designer" order="3" />
@@ -373,7 +615,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" weight="0.32922733" />
-      <window_info active="true" anchor="bottom" id="Run" order="2" visible="true" weight="0.3975364" />
+      <window_info active="true" anchor="bottom" id="Run" order="2" visible="true" weight="0.9357143" />
      <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" />
@@ -383,7 +625,7 @@
      <window_info anchor="bottom" id="Database Changes" order="9" />
      <window_info anchor="bottom" id="Terminal" order="10" weight="0.32922733" />
      <window_info anchor="bottom" id="Event Log" order="11" sideWeight="0.50061125" side_tool="true" weight="0.32922733" />
-      <window_info anchor="bottom" id="Messages" order="12" sideWeight="0.49938875" weight="0.32922733" />
+      <window_info anchor="bottom" id="Messages" order="12" sideWeight="0.49938875" weight="0.32857144" />
      <window_info anchor="bottom" id="Duplicate detector" order="13" weight="0.32922733" />
      <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
      <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
@@ -441,22 +683,52 @@
      </list>
    </option>
  </component>
+  <component name="Vcs.Log.Tabs.Properties">
+    <option name="RECENT_FILTERS">
+      <map>
+        <entry key="Branch">
+          <value>
+            <list />
+          </value>
+        </entry>
+        <entry key="User">
+          <value>
+            <list />
+          </value>
+        </entry>
+      </map>
+    </option>
+  </component>
  <component name="VcsManagerConfiguration">
    <ignored-roots>
      <path value="$PROJECT_DIR$" />
    </ignored-roots>
-    <MESSAGE value="This should fix the project repository once and for all." />
-    <MESSAGE value="This should fix the ShipWarfare file and bring it up to date with the rest of the file." />
-    <MESSAGE value="Created Core class" />
-    <MESSAGE value="Fixed the setters to be greater than 0" />
-    <MESSAGE value="Created Player class" />
-    <MESSAGE value="Added some stuff for the Travel Class" />
-    <MESSAGE value="Added disasters as well as removing a bug from the flee method in Haris's code" />
-    <MESSAGE value="Fixed a bunch of stuff inside of Travel, but also discovered a MASSIVE problem with our code" />
-    <MESSAGE value="Fixed stupid problem where you can't access methods above yours" />
-    <MESSAGE value="Brought back Vikram's changes" />
-    <MESSAGE value="Fixed the commenting on a lot of the code. Also added some stuff to Travel, fixed some bugs." />
-    <option name="LAST_COMMIT_MESSAGE" value="Fixed the commenting on a lot of the code. Also added some stuff to Travel, fixed some bugs." />
+    <MESSAGE value="Missed one statement that I needed to encapsulate" />
+    <MESSAGE value="Messed up player by setting money to 1000" />
+    <MESSAGE value="Please find error" />
+    <MESSAGE value="Super broken but fight button is in progress for shipwarfare" />
+    <MESSAGE value="Forces you to fight in ShipWarfareGUI unfortunately" />
+    <MESSAGE value="ShipWarfare fight button coming along nicely" />
+    <MESSAGE value="Shipwarfare fight button GUI almost complete" />
+    <MESSAGE value="Fixed numOfShips method for ShipWarfareGUI" />
+    <MESSAGE value="Fixed the loot system a bit" />
+    <MESSAGE value="Completely ruined shipWarfare with a previous edit, fixed it and added a better loot feature for peasant ships" />
+    <MESSAGE value="Basic functionality of buttons completed, think all I have to do now is to find a way to break the code when the user wins, loses or runs away." />
+    <MESSAGE value="Fixed probability of ships running away" />
+    <MESSAGE value="Fined minor bugs in shipwarfareGUI" />
+    <MESSAGE value="Fined minor bugs in shipwarfareGUI including the &quot;gun frustration&quot; variable" />
+    <MESSAGE value="Just checking" />
+    <MESSAGE value="A lot of errors but easily fixable SHipwarfareGUI" />
+    <MESSAGE value="Completed SHipWarfareGUI" />
+    <MESSAGE value="Completed ShipWarfareGUI" />
+    <MESSAGE value="Probably should upload" />
+    <MESSAGE value="Fixed ShipWarfare bug about one-shotting." />
+    <MESSAGE value="Completed javadocs for shipwarfare GUI" />
+    <MESSAGE value="Added to my javadocs a bit" />
+    <MESSAGE value="Changed one line of text in shipwarfare GUI" />
+    <MESSAGE value="Fixed output for start and TaipanShop GUI" />
+    <MESSAGE value="Added JavaDocs for ShipWarfare" />
+    <option name="LAST_COMMIT_MESSAGE" value="Added JavaDocs for ShipWarfare" />
  </component>
  <component name="editorHistoryManager">
    <entry file="uml://JAVA/ShipWarfare">
@@ -498,65 +770,77 @@
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/src/Game.java" />
-    <entry file="file://$PROJECT_DIR$/src/Warehouse.java">
+    <entry file="file://$PROJECT_DIR$/src/Warehouse.java" />
+    <entry file="file://$PROJECT_DIR$/src/Bank.java" />
+    <entry file="file://$PROJECT_DIR$/src/TaipanShop.java" />
+    <entry file="file://$PROJECT_DIR$/src/Travel.java" />
+    <entry file="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_201.jdk/Contents/Home/javafx-src.zip!/com/sun/glass/ui/InvokeLaterDispatcher.java" />
+    <entry file="file://$PROJECT_DIR$/src/ShopGUI" />
+    <entry file="file://$PROJECT_DIR$/src/Start.java" />
+    <entry file="file://$PROJECT_DIR$/src/main.java" />
+    <entry file="file://$PROJECT_DIR$/src/ShipWarfare.java" />
+    <entry file="file://$PROJECT_DIR$/src/TravelGUI.java">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="34">
-          <caret line="2" column="3" selection-start-line="2" selection-start-column="3" selection-end-line="2" selection-end-column="3" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/Start.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="590">
-          <caret line="70" column="24" lean-forward="true" selection-start-line="70" selection-start-column="24" selection-end-line="70" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/Bank.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-872">
-          <caret line="7" column="6" lean-forward="true" selection-start-line="7" selection-start-column="6" selection-end-line="7" selection-end-column="6" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/ShipWarfare.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="17">
-          <caret line="353" column="11" selection-start-line="353" selection-start-column="11" selection-end-line="353" selection-end-column="11" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
+        <state relative-caret-position="9114">
+          <caret line="453" column="33" selection-start-line="453" selection-start-column="33" selection-end-line="453" selection-end-column="33" />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/src/Player.java">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-2606">
-          <caret line="24" column="5" lean-forward="true" selection-start-line="24" selection-start-column="5" selection-end-line="24" selection-end-column="5" />
+        <state relative-caret-position="1764">
+          <caret line="84" column="44" selection-start-line="84" selection-start-column="44" selection-end-line="84" selection-end-column="44" />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/src/TaipanShop.java">
+    <entry file="file://$PROJECT_DIR$/src/WarehouseGUI.java">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="168">
-          <caret line="594" column="42" lean-forward="true" selection-start-line="594" selection-start-column="42" selection-end-line="594" selection-end-column="42" />
+        <state relative-caret-position="-1968">
+          <caret line="14" column="13" selection-start-line="14" selection-start-column="13" selection-end-line="14" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/GameEndGUI.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="42">
+          <caret line="14" column="13" selection-start-line="14" selection-start-column="13" selection-end-line="14" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/TaipanShopGUI.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="204">
+          <caret line="95" column="42" lean-forward="true" selection-start-line="95" selection-start-column="42" selection-end-line="95" selection-end-column="42" />
+          <folding>
+            <element signature="n#!!doc" expanded="true" />
+            <element signature="imports" expanded="true" />
+            <element signature="e#23606#23607#0" expanded="true" />
+            <element signature="e#23651#23652#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/ShipWarfareGUI.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="5901">
+          <caret line="300" column="9" selection-start-line="300" selection-start-column="9" selection-end-line="300" selection-end-column="9" />
          <folding>
            <element signature="imports" expanded="true" />
          </folding>
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main.java">
+    <entry file="file://$PROJECT_DIR$/src/MainGUI.java">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="184">
-          <caret line="42" column="62" selection-start-line="42" selection-start-column="62" selection-end-line="42" selection-end-column="62" />
+        <state relative-caret-position="651">
+          <caret line="38" column="39" selection-start-line="38" selection-start-column="39" selection-end-line="38" selection-end-column="39" />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/src/Travel.java">
+    <entry file="file://$PROJECT_DIR$/src/StartGUI.java">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="27">
-          <caret line="125" column="63" selection-start-line="125" selection-start-column="63" selection-end-line="125" selection-end-column="63" />
+        <state relative-caret-position="308">
+          <caret line="214" column="38" selection-start-line="214" selection-start-column="38" selection-end-line="214" selection-end-column="38" />
          <folding>
            <element signature="imports" expanded="true" />
          </folding>
@@ -603,7 +887,7 @@
      </state>
      <state key="JdkListConfigurable.UI">
        <settings>
-          <last-edited>1.8</last-edited>
+          <last-edited>1.8.0_201</last-edited>
          <splitter-proportions>
            <option name="proportions">
              <list>
@@ -620,7 +904,6 @@
            <option name="proportions">
              <list>
                <option value="0.2" />
-                <option value="0.6" />
              </list>
            </option>
          </splitter-proportions>
--- a/out/production/TaipanClone/ShipWarfare.class
+++ b/out/production/TaipanClone/ShipWarfare.class
Author	SHA1	Message	Date
Solargale	c24d485463	Adding back the old files	2019-03-12 08:45:44 -06:00
Solargale	ae39a210be	Remade Legacy branch after destroying it	2019-03-12 08:44:25 -06:00
Solargale	36f72b22e4	Merge remote-tracking branch 'origin/master'	2019-03-11 19:40:25 -06:00
Solargale	4efe650091	Fixed the problem where shipwarfare didn't run after Travel	2019-03-11 19:40:13 -06:00
Vikramb987	e341112aec	Update TaipanShopGUI.java javadocs update.	2019-03-11 19:38:02 -06:00
Vikram	a56a6690ee	Merge remote-tracking branch 'origin/master'	2019-03-11 19:17:31 -06:00
Vikram	c179ac17ae	fixed one small issue.	2019-03-11 19:17:13 -06:00
Solargale	29e0f3e683	Merge remote-tracking branch 'origin/master'	2019-03-11 19:07:26 -06:00
Solargale	923ff50c87	Finished the fix for negative numbers and Strings messing up the travel textField	2019-03-11 19:07:11 -06:00
Vikram	15525d789e	fixed one small issue.	2019-03-11 19:07:06 -06:00
Vikram	e0171bacfa	finished javadocs	2019-03-11 19:00:26 -06:00
KahootChampion	8c776b769b	wrote javadocs for authorname	2019-03-11 18:47:10 -06:00
Solargale	428a7caf80	Fixed the problem where the player could recalculate price values by leaving and entering the travel screen.	2019-03-11 18:27:42 -06:00
Vikramb987	af81624e27	Update TaipanShopGUI.java changed the javadoc slightly.	2019-03-11 17:21:15 -06:00
KahootChampion	762b399c4b	Added JavaDocs for ShipWarfare	2019-03-11 15:33:08 -06:00
Nathan Lum	8402a2368c	Added Javadoc comments	2019-03-11 15:28:11 -06:00
Nathan Lum	8c3098a498	Added Javadoc comments	2019-03-11 15:20:38 -06:00
Vikramb987	f1a43a279a	Update TaipanShopGUI.java	2019-03-11 15:18:05 -06:00
Nathan Lum	140e8dc706	Added Javadoc comments	2019-03-11 15:17:42 -06:00
Nathan Lum	e21a7c9f54	Added Javadoc comments	2019-03-11 15:12:03 -06:00
Nathan Lum	023e77f034	Added Javadoc comments	2019-03-11 15:07:35 -06:00
Vikramb987	696af67665	Update TaipanShopGUI.java comment	2019-03-11 14:07:12 -06:00
Solargale	cf0fd1281f	Update README.md	2019-03-11 13:56:54 -06:00
Vikramb987	4e4d30c222	Update TravelGUI.java aesthetic changes	2019-03-11 12:41:32 -06:00
Vikramb987	d2e42048b2	Update TaipanShopGUI.java aesthetic changes boi	2019-03-11 12:40:08 -06:00
KahootChampion	303be2eea6	Fixed output for start and TaipanShop GUI	2019-03-11 12:27:17 -06:00
Siddhant Dewani	963f16afca	Fixed bank label	2019-03-11 11:49:50 -06:00
Siddhant Dewani	fd03a7c588	FIXED Loanshark and bank	2019-03-11 11:41:06 -06:00
Vikramb987	c912394dd9	Update TaipanShopGUI.java fixed minor error	2019-03-11 09:09:53 -06:00
Solargale	c0914d8e5e	Renamed a few classes so that all of them are uppercase	2019-03-11 02:12:10 -06:00
Solargale	11b16b4e40	Finished cleaning up the code. Ready for Demo 2	2019-03-11 02:05:26 -06:00
Solargale	076ba12ef1	Update README.md	2019-03-10 23:54:43 -06:00
Solargale	59de84a47d	Made it GUI friendly	2019-03-10 23:52:35 -06:00
Solargale	e1671d8d21	Merge remote-tracking branch 'origin/master'	2019-03-10 23:50:56 -06:00
Solargale	e6a67ce1e4	Removed previous textbased game	2019-03-10 23:50:41 -06:00
Nathan Lum	1ac82edf1e	Added Javadoc comments	2019-03-10 23:43:19 -06:00
Nathan Lum	1df0cbec36	Added Javadoc comments	2019-03-10 23:42:24 -06:00
KahootChampion	0af20d9f67	Changed one line of text in shipwarfare GUI	2019-03-10 23:42:46 -06:00
Vikramb987	5b8682a900	Update TaipanShopGUI.java finished javadocs	2019-03-10 23:18:20 -06:00
Solargale	a58d0fa184	Merge remote-tracking branch 'origin/master' # Conflicts: # src/WarehouseGUI.java	2019-03-10 23:05:39 -06:00
KahootChampion	4d09891665	Added to my javadocs a bit	2019-03-10 23:03:30 -06:00
Solargale	91bb72351e	Fixed the Game End screen into Taipan Shop	2019-03-10 23:00:25 -06:00
KahootChampion	ba16ea1809	Completed javadocs for shipwarfare GUI	2019-03-10 22:58:43 -06:00
Nathan Lum	9b9af573a8	Added Javadoc comments	2019-03-10 22:56:26 -06:00
KahootChampion	c6df980f8e	Fixed ShipWarfare bug about one-shotting.	2019-03-10 22:43:46 -06:00
Vikram	666e409e74	Merge remote-tracking branch 'origin/master'	2019-03-10 22:42:55 -06:00
Vikram	89f9e47921	some changes...	2019-03-10 22:42:40 -06:00
Solargale	414a9634b5	Merge remote-tracking branch 'origin/master'	2019-03-10 22:11:07 -06:00
Solargale	f4fbc474e7	Finished the End Game Screen	2019-03-10 22:10:45 -06:00
Vikram	4c8b99d4bb	Merge remote-tracking branch 'origin/master'	2019-03-10 21:50:27 -06:00
Vikram	ffb77b14a0	some changes...	2019-03-10 21:49:50 -06:00
Vikramb987	0c5317cf6f	Update TaipanShopGUI.java fixed to adapt to loanshark	2019-03-10 21:15:38 -06:00
Vikram	461171ff46	minor changes. Still in progress.	2019-03-10 21:12:44 -06:00
Vikramb987	13f30b681a	Update TaipanShopGUI.java made it so that certain buttons are invisible in certain locations.	2019-03-10 21:12:26 -06:00
Siddhant Dewani	1d5e5aa706	Fixed bank and loanshark	2019-03-10 21:11:49 -06:00
Vikramb987	01ee9b2600	Update TaipanShopGUI.java fixed shop prices not changing	2019-03-10 20:49:45 -06:00
Solargale	3aa6ad619d	Merge remote-tracking branch 'origin/master'	2019-03-10 20:13:33 -06:00
Solargale	0b8b8ed50c	Fixed output for travel	2019-03-10 20:13:06 -06:00
KahootChampion	df372522e4	Probably should upload	2019-03-10 20:12:01 -06:00
KahootChampion	4fd40af606	Completed ShipWarfareGUI	2019-03-10 20:01:20 -06:00
KahootChampion	664d194d7b	Completed SHipWarfareGUI	2019-03-10 20:00:36 -06:00
KahootChampion	2198fffbd5	A lot of errors but easily fixable SHipwarfareGUI	2019-03-10 19:41:43 -06:00
Solargale	d395d91730	Made it so you're not locked out of Taipan shop for Bank and Loanshark	2019-03-10 18:54:03 -06:00
Solargale	31e93f6997	Fixed BorderPane issue in Warehouse	2019-03-10 18:38:24 -06:00
Solargale	0f2e8848ad	Merged together Taipanshop with both Loanshark and Bank GUI	2019-03-10 18:36:54 -06:00
Solargale	c3f7cc16d2	Merge remote-tracking branch 'origin/master'	2019-03-10 18:29:17 -06:00
Solargale	9a15f6bc63	Merged TaipanShop and Warehouse. Just need to add functionality to warehouse.	2019-03-10 18:28:59 -06:00
Siddhant Dewani	680225550f	Small thing, changed an output of warehouse a bit, shows user its the warehouse they are concerned with.	2019-03-10 18:23:48 -06:00
Siddhant Dewani	6778aa5737	Merge remote-tracking branch 'origin/master'	2019-03-10 18:07:34 -06:00
Siddhant Dewani	46624389f5	Finished LoanShark!!	2019-03-10 18:06:03 -06:00
Solargale	a0e0ab517d	Merged Travel and Ship warfare	2019-03-10 17:35:46 -06:00
Nathan Lum	5e33374e3c	Add files via upload	2019-03-10 17:27:17 -06:00
Solargale	325c4127dd	Fix bunch of issues with Travel and Taipanshop, also merged Main, Shop, Travel and Start. Now attempting to merge in ship.	2019-03-10 16:06:48 -06:00
KahootChampion	fde76a5bfb	Just checking	2019-03-10 15:45:31 -06:00
KahootChampion	888d8a1c92	Fined minor bugs in shipwarfareGUI including the "gun frustration" variable	2019-03-10 12:10:33 -06:00
KahootChampion	42c4534f52	Fixed probability of ships running away	2019-03-10 12:00:00 -06:00
KahootChampion	a07d633ff9	Basic functionality of buttons completed, think all I have to do now is to find a way to break the code when the user wins, loses or runs away.	2019-03-10 11:26:54 -06:00
KahootChampion	b4e0e18d20	Completely ruined shipWarfare with a previous edit, fixed it and added a better loot feature for peasant ships	2019-03-10 03:30:28 -06:00
KahootChampion	d558e7cf0c	Fixed the loot system a bit	2019-03-10 01:44:02 -07:00
KahootChampion	36aa789590	Fixed numOfShips method for ShipWarfareGUI	2019-03-10 01:14:37 -07:00
KahootChampion	e5807a46af	Shipwarfare fight button GUI almost complete	2019-03-10 00:39:59 -07:00
KahootChampion	5f6abbc817	ShipWarfare fight button coming along nicely	2019-03-09 23:52:51 -07:00
Solargale	b376ad5284	Fixed loop problem ShipwarfareGUI	2019-03-09 23:36:58 -07:00
Solargale	b945cafe98	Merge remote-tracking branch 'origin/master' # Conflicts: # .idea/workspace.xml	2019-03-09 23:27:03 -07:00
Solargale	75673d40e1	Finished TravelGUI and StartGUI	2019-03-09 23:26:25 -07:00
KahootChampion	9feac6e90e	Forces you to fight in ShipWarfareGUI unfortunately	2019-03-09 22:52:30 -07:00
KahootChampion	1bb00d0d01	Super broken but fight button is in progress for shipwarfare	2019-03-09 22:32:45 -07:00
KahootChampion	80102eabee	Please find error	2019-03-09 20:03:51 -07:00
KahootChampion	f5845cb8df	Messed up player by setting money to 1000	2019-03-09 18:34:27 -07:00
KahootChampion	5a7d1e7c34	Missed one statement that I needed to encapsulate	2019-03-09 18:33:33 -07:00
KahootChampion	370b3ee041	Made ShipWarfare easier to access by ShipWarfareGUI	2019-03-09 18:28:44 -07:00
Vikramb987	7314bc174f	Update ShopGUI Mostly done.	2019-03-09 16:51:26 -07:00
KahootChampion	5c78f561d8	Added fight stuff	2019-03-09 16:13:36 -07:00
KahootChampion	271a37877b	Notified of getting attacked	2019-03-09 16:09:15 -07:00
KahootChampion	89188152e6	Added time stuff to Shipwarfare GUI	2019-03-09 15:00:00 -07:00
Solargale	6b9e3dcc06	Added some logic to ShipWarfareGUI	2019-03-09 14:33:27 -07:00
Solargale	14e5eb2d30	Added basic functionality with KahootChampion	2019-03-09 14:28:02 -07:00
Solargale	bf2d1c3fb0	Basic layout for ShipwarefareGUI.	2019-03-09 14:14:03 -07:00
Vikramb987	b62274cda3	Update ShopGUI another set of updates.	2019-03-09 12:04:18 -07:00
Vikramb987	72708e53f2	Update ShopGUI small change.	2019-03-08 19:44:05 -07:00
Vikramb987	540605f0f1	Update ShopGUI Updated. Still a w.i.p	2019-03-08 19:36:55 -07:00
Vikramb987	f6fa9dc646	Create ShopGUI This file is the temporary placeholder for my shop GUI. Very much still in progress.	2019-03-07 20:57:36 -07:00