From 1bb00d0d01197467af806678b1a40f3ba936a69d Mon Sep 17 00:00:00 2001
From: KahootChampion <p.harismuhammadkhan@gmail.com>
Date: Sat, 9 Mar 2019 22:32:45 -0700
Subject: [PATCH 1/2] Super broken but fight button is in progress for
 shipwarfare

---
 .idea/workspace.xml                          |  95 ++++---
 out/production/TaipanClone/ShipWarfare.class | Bin 8124 -> 8386 bytes
 src/ShipWarfareGUI.java                      | 254 +++++++++----------
 3 files changed, 175 insertions(+), 174 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 3bc1b50..827b9ae 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -3,6 +3,8 @@
   <component name="ChangeListManager">
     <list default="true" id="3114a2b9-4919-4fdf-8fd9-d03b60109ce4" name="Default Changelist" comment="">
       <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/ShipWarfareGUI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ShipWarfareGUI.java" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/out/" />
     <ignored path="C:\Users\Harkamal Randhawa\IdeaProjects\TaipanClone\.idea\shelf/" />
@@ -27,21 +29,21 @@
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="false">
+      <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/src/ShipWarfareGUI.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="2580">
-              <caret line="172" column="5" selection-start-line="172" selection-start-column="5" selection-end-line="172" selection-end-column="5" />
+            <state relative-caret-position="135">
+              <caret line="399" column="97" selection-start-line="399" selection-start-column="92" selection-end-line="399" selection-end-column="97" />
               <folding>
                 <element signature="imports" expanded="true" />
-                <element signature="e#1150#1151#0" expanded="true" />
-                <element signature="e#1178#1179#0" expanded="true" />
+                <element signature="e#1208#1209#0" expanded="true" />
+                <element signature="e#1236#1237#0" expanded="true" />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="true">
+      <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="135">
@@ -84,10 +86,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>GetGuns</find>
-      <find>set</find>
-      <find>TaipanShop</find>
-      <find>shop()</find>
       <find>shop</find>
       <find>being</find>
       <find>label0</find>
@@ -100,7 +98,6 @@
       <find>setNumOfP</find>
       <find>setUs</find>
       <find>starting</find>
-      <find>destro</find>
       <find>numOfpeasantShips</find>
       <find>startingPeasantShips</find>
       <find>startingLittyShips</find>
@@ -114,6 +111,11 @@
       <find>numOfLittyShips</find>
       <find>delay</find>
       <find>Hp</find>
+      <find>shipwarfare</find>
+      <find>destroyPeasa</find>
+      <find>destr</find>
+      <find>destro</find>
+      <find>hitco</find>
     </findStrings>
     <replaceStrings>
       <replace>HP</replace>
@@ -137,9 +139,9 @@
         <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/ShipWarfareGUI.java" />
         <option value="$PROJECT_DIR$/src/Player.java" />
         <option value="$PROJECT_DIR$/src/ShipWarfare.java" />
+        <option value="$PROJECT_DIR$/src/ShipWarfareGUI.java" />
       </list>
     </option>
   </component>
@@ -155,7 +157,6 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -172,6 +173,7 @@
           <select />
         </subPane>
       </pane>
+      <pane id="Scope" />
       <pane id="PackagesPane" />
     </panes>
   </component>
@@ -179,7 +181,7 @@
     <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="1552182988336" />
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1552187991754" />
     <property name="extract.method.default.visibility" value="private" />
     <property name="last_opened_file_path" value="$PROJECT_DIR$/../GitHub/Cpsc233" />
     <property name="project.structure.last.edited" value="Project" />
@@ -199,7 +201,7 @@
       </list>
     </option>
   </component>
-  <component name="RunManager" selected="Application.main">
+  <component name="RunManager" selected="Application.ShipWarfareGUI">
     <configuration name="Game" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
       <option name="MAIN_CLASS_NAME" value="Game" />
       <module name="TaipanClone" />
@@ -244,8 +246,8 @@
     </list>
     <recent_temporary>
       <list>
-        <item itemvalue="Application.main" />
         <item itemvalue="Application.ShipWarfareGUI" />
+        <item itemvalue="Application.main" />
         <item itemvalue="Application.TaipanShop" />
         <item itemvalue="Application.Game" />
         <item itemvalue="Application.ShipWarfare" />
@@ -279,6 +281,8 @@
       <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" />
     </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>
@@ -399,17 +403,24 @@
       <option name="project" value="LOCAL" />
       <updated>1552181667376</updated>
     </task>
-    <option name="localTasksCounter" value="18" />
+    <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>
+    <option name="localTasksCounter" value="19" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="57306000" />
+    <option name="totallyTimeSpent" value="58404000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="48" y="23" width="1189" height="652" extended-state="0" />
     <editor active="true" />
     <layout>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.21621622" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.22319093" />
       <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" />
@@ -418,7 +429,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 anchor="bottom" id="Run" order="2" weight="0.4482143" />
+      <window_info anchor="bottom" id="Run" order="2" 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" />
@@ -524,7 +535,8 @@
     <MESSAGE value="Made ShipWarfare easier to access by ShipWarfareGUI" />
     <MESSAGE value="Missed one statement that I needed to encapsulate" />
     <MESSAGE value="Messed up player by setting money to 1000" />
-    <option name="LAST_COMMIT_MESSAGE" value="Messed up player by setting money to 1000" />
+    <MESSAGE value="Please find error" />
+    <option name="LAST_COMMIT_MESSAGE" value="Please find error" />
   </component>
   <component name="editorHistoryManager">
     <entry file="uml://JAVA/ShipWarfare">
@@ -579,6 +591,13 @@
         </state>
       </provider>
     </entry>
+    <entry file="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_201.jdk/Contents/Home/javafx-src.zip!/com/sun/glass/ui/InvokeLaterDispatcher.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="140">
+          <caret line="110" column="19" selection-start-line="110" selection-start-column="19" selection-end-line="110" selection-end-column="19" />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/src/ShipWarfare.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="5025">
@@ -589,15 +608,17 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/ShipWarfareGUI.java">
+    <entry file="file://$PROJECT_DIR$/src/main.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="2580">
-          <caret line="172" column="5" selection-start-line="172" selection-start-column="5" selection-end-line="172" selection-end-column="5" />
-          <folding>
-            <element signature="imports" expanded="true" />
-            <element signature="e#1150#1151#0" expanded="true" />
-            <element signature="e#1178#1179#0" expanded="true" />
-          </folding>
+        <state relative-caret-position="135">
+          <caret line="9" column="4" selection-end-line="55" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/Start.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="15">
+          <caret line="1" column="13" selection-start-line="1" selection-start-column="13" selection-end-line="1" selection-end-column="13" />
         </state>
       </provider>
     </entry>
@@ -611,17 +632,15 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/Start.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="15">
-          <caret line="1" column="13" selection-start-line="1" selection-start-column="13" selection-end-line="1" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main.java">
+    <entry file="file://$PROJECT_DIR$/src/ShipWarfareGUI.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="135">
-          <caret line="9" column="4" selection-end-line="55" />
+          <caret line="399" column="97" selection-start-line="399" selection-start-column="92" selection-end-line="399" selection-end-column="97" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="e#1208#1209#0" expanded="true" />
+            <element signature="e#1236#1237#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
diff --git a/out/production/TaipanClone/ShipWarfare.class b/out/production/TaipanClone/ShipWarfare.class
index da08cf6213d842f125c937412fb28abad9f46416..c5ed7032c0d092c9bbcf56f86ddfa849481ff933 100644
GIT binary patch
literal 8386
zcmcIp3w%`Nl|SdsGm{$<LIS}c+#rD@1S77ZKzJDf1QQYo4?)q~WNtD;CNps!foOH9
zZ>`oxtGm*|g4Cu3WGh0jQY~t=)l#h$ZK>5=tKz%1-FA0H9{WG{-kD6|u=v}b3qQVl
zzw<rL`+v?IUO4gilSFhL=lQ6BzMDl$X_E|_W%w5vw#cwmh6la0O`hNL&_h1*(f4K2
z=b;~D(GO|6k8)^-50srUJS?<bUiw!L{Ydsc;-lU4sI2Uf>0Tf8(>|F#Cg*<arN@1=
zpMD~gC%p8eEdNv{2V{84OHa%5887|JOV7&db6)znJbxj>^D?~PrC-X`2ear`^r8>L
zOCI{QkItd*I*4!HB5yA{$dNPGL7uIegK{sLE9ZXWrB}RkNRGbhrPsXlTcQ3=hQnU^
zy_a71(jUC^hHQA#OaCU%fA`W`Uizb#-uBWvvh!V`9`Vw9@_gS*A9(3Qp?~D1k3IAW
z)9`SjtFgVw&|`Wy-W&*a$C$W|Dc7Xe2jlTxo0^@78PR$1xZc(&dsZ_Q#Nv819t?L3
zKAxW>r=Ru(BI_CwZGokUFq5x47}ev(61~e{%CBFm_vlq2J={^%9FO9<nN05Pklt%V
znY{H)=9|!}gW+I&HdA(4l32ci$ypQe<C@(1VAxoa=xQ~h%k<Wed2yso53SInL7Ce`
zXFL#u_&N2W)k;0uu15{roo(@(pXlo9Wy*>faf>b9I|kl;W#viEkh|M5+JcZ_#4Wop
zIm$$&taZU~W3)aJgB0GV5$leG<y936E=^5GSc)g&!BACmn;s4uQAm>0EEaCiyG?-+
z#2)$+ELOX|&FGE?agm2Uh3O#`lpX3hu!ryRlZ)vN$O*=lr#lc^;lfea3WgcHSeUjl
z=pN7)rTH=k^QJU+7QjXs96Agp9mL;RwpvV;7m^SgWW(X@!Hz(@F^W)WFk&&iLwt$j
zroQQ-ILqqfih|_Y;4sYf8;G0*k!Z8g776>|bO&M@ro`CTZU^;<fr;fpgdd_Is)zlN
zt`&MHVaAcEkLjnS=E6)QFx(kUgcn33UG`OZm^LTc+8}aGKo7U!WDX=tx7BFB5sOD7
zy#q=#Mr&hjdN=lF1%lAIAsCb7T8p!Bz0+8j2&e8sEVm^>NSpddBo4#1nM@knYr{rY
zubEa^5?^)U?gW;zjP=2|seqa0#Wv@36Ake8HAfQBHe*3h(k3r0GtL&xRl1ToRcfYX
zDlL~`1+7%+Qh8e?!)jW_<f#uPv{gn}rOW7Y<f@fEa<oOIHFO1#X26Pew0r2!D*c82
zD!cwerCX^-rJLwRmHtM5XEHA8)fPrVq23a0rJ)7%9z&Z@TItu|0S!s3wHol1rkj9d
z__fwvt<<kI7*VlHT#E^m`Dzl;s1c5bdNn9$(lmfmJQ34^F>Eg_^+Df(Xl-m=YqZ5x
z`cLZd(0{4)-}ISE2@&h4P(D}b7#&yXdNIcdx(<$NM|P@o62U<KNE?7cje$U=W(Kfk
z1OjtZW>!?XS+sh904*F<=}vjcuZbi={_v!@hPcu6b$V|JQ(;rUSXTnI<0eIm>Fq|S
zSEU>1MkfFN#UPP(tu!_%_NDEi(mK)iTDnf9yG721l>t4j`6F6yB%!Sn)5as1&e3Ya
zaU-gYZyzrNQ{zh0H{+uwMYJkgXFCp_=}3fQ<vx`iup~QGcClM!4||giNJ}r3v)HH7
zdSUMoTNnoNcEr4;OBb54(1j#{$4g_lE?eAi)_gr0F42|+j9^r27d+PDdbksN#O+py
zFpVpXnaBMRvAP*hdKfXbd`WW&{($3M;-;@r5BAnX*6C3{4nTA>mNa03<rG|luqm(-
z7h-@*yA}@^T|yo)u;1v?QLw@tpq4fUv~Z+ScJ-RUi{zH*#T<v*jc_d3W0a_@ik~OV
zM=8{TaZ{mQ&CXm=CM>&6oy3|d=g9VnwY3*ln#49M+B3zu1|cqO4(Oqf2A=>AQMMCC
z%5z`No5?hUir`-sE7w9sd%PT15C1|iGqw6`*ZEci+v1UEZ;7uCVcm_g8I6e)rU(2+
zy8%q|o2D=X%4`Qpns@1b1BQTdI2bn*HeES*>>30s4-+%wK)MdZieLnM$+^_YGy%lZ
zTp~^zGcO=%JK(x>SF3cjM1-1tKT1RzN+v@%t%X4#48TgNb`Rdz8;eU^D?xNbg;vcB
zMygEwMjvG8UFZgi$}%oU*>k`u=?9z8I-!=^2fZlE4G0*dkOjP^aCOMp4r!}AJyP2m
z+nGk9h^7^6dk0v%q|i4d6@g@F45UF5b~s;cOPHqo%*)a)v@mt1&13L2;NlG%>*Lb8
z!8XQK2|X06>j+1pMvX2VQ(=b7rET$;+(TlxOgms552Q!+L@_;cpza{<?Hs9E7VI*X
zqn*Ug=GvOZCG(q+^p@Br5@pybHi-dTy3uo%EfyDeM0i+C2zAnV30JGD^`P`y{9V!n
zz>Z!#ZI5_6(D^p@7*Q%gFJ6G}94{$SVDY9%jWwSrv*r_()_kJanorbQ^NB)hK2crq
z97!z27Nd^YCc+m5o)=W?Bd&1lB}E2Dg>x@C<;^97TLw=>zIQKW?I+)=$@?g~p`vmx
zsgIZ!w_-e-vN0Bt6C!5e?=XBvi~y|&74J-ZA&m#649us}D4GUp8+L0JYx0wU8HA7q
z0D?^=H?`wU!Fxwa)aACQxu+6gn0eheFxSAWB#lLGibbx?A}ftWfP%I)7T^X2f(#QD
z6?;g9qV<!11d2kUq|aO}gG%M*?IW$-_U$TWA~uRQt)))PU}5%ylM`om?WdeoyJ^@y
ze1TL{^iy6x4c|@q`6Jv<P{AsPaO<bS$7p2pDkqjlnQtzOTqKiz8od$=XH4#=;)crn
zG5vJr15{e!?5DAE&$xclWKx1X<7c1g+(Pa?n%PI^SLUB(Zmq<^gpE`vn@eRg_B}u&
z`)H(4CJM!c<9#@Ha<e$rVd}gZP9wM^o6dzp&!hQp-y*t@8fZEiycuZYX2KTL6rfqu
zMYAbNbI=Oa(ATl^R;opFuz>!F7ScwlqX%g*_0h$&oto%j#IXcH1+3GBpa~(09k_K3
zW|y0G-DTS~o3>GyBCu*V_7{-*7%lS9RmZ5(Ls6yVDCH^?!-^9-;`oO~3?pn$Rd_O<
zVn$^rUMx4dP2viZy=rZ+S+R6ApbS0i7<zbh#>41DG8}deJ$yyR!>Aq^4!edPZq0ZY
z^)16;_t3-b84shA$#B>+^zhn@htUCMIGi<*G?ul)84sfuwhzySZzT2H6~%y_0bH?C
zE=n%ASi;3hId>|d-SU-zI~W0%Ou0@w<@SCt<t9n2mw7U#T)CZc{Z!Gs%6+=bGm~u~
z^ZIFWGU?{_(Trr$O|_Elj8xLu89Mn(XWrGwylaqoUqjwpOO5z^SO%l5fx4~uz*vix
zKSDPm?r%cq-iF!j`1=jIm+nB;-ASA2o3s@<_(Qsfc7gf`sC$r$$;^wSGH+R0=Iu>o
z-u9uH*Jx(mB+0yqU&uUs@YwFGg9{|{ibe5CXPUjIB(ZF$kGIkpNOTd*%E{tXPU5S^
zzILG<CD{@s4jJ47*I4+!9ig%VNd0hHxMZioCEKi;5-#|F%yg+Dm%4^t3KD+M^U-6c
zxKv8AT#D~ENGRwr&n_idyXoxWoBFA0;7Ti`55V$IrCpbmk}->JF|SL<G<@^g(!LD_
z4lw9+RPU#AR_&vy4R-CwKX)7DR^}D-(?2*{s{3ehl78Mc%B##P13ho7EKE%<oNq3y
zmW6X=p(wd9?R%tFx`pm<sV){Eu!@0I<)4QLFTffHk&Q2+vcH7t|1!$JZvgX$Ao{D+
zLcc{({k^H4RpmQv^%T%=Gu89KP7<n$3F|63kJEVe&>clZ1yB{=zP7@5*$S6dI8f?r
zo$DvNOf_eXacv=&bLSW*9*&(RPFtdmhkc3Of#cpq`*8%V$$JQ}_h}4$fZpIkI*UF|
z6R*@3F9)rO2!)1`@{l{rZ1Lc;<1_}+vBWjL|7_s~!Io#JkN*tre@XLkI&4XICLx25
zXYfGCI8PvFAhUA9QSF#D09{LLm1j5|(_DqFjmiScOH($}9gb=4LK~^3JV;jqY%YKy
zLZhAHJ7>!@PoW3%3h6gSIsNE3@KU~svYgXgsKb(*7be>VbP9zY7<0T(r>AG^46F4J
z<m#h5S)Q3ZbfcU5PHyO<aYC&=#i2Bwe0xgv4dS_LMmudkR*ZJ$`AnhvX%<e*et@o!
zha7&8nni<hnL~+5c#4`Pmd|ln*n%Y!zMU2WOXfZ@fp@Mgn7v0DDUo+xifkf(l6+B8
zxzSFKWkuK+?8;K2kCiujCRVMH+vej~9~BQQ6*-|&E^cVSmRf6j5p3@g+g~q77Ni?&
zpvQAsP22?=$(!o#7N&1aLFg2;f-^j$J$8pDMnZ=-LhfFa)S}OtPn0=qZT5G^_ZPaL
zQHyM>OTT%r5Tm6LT?`H6(K4JX1JwiS6&APjTOm|$-B6qac9V^BXQ2xYw$0QaQ}-5{
zARL!u<|x8B(=wQ6&=O?uQDn#G=<QBWE}f(zMoqzQLmE4&f?YHn`8W@#aWQ-863(K_
z*hj7SvB$tqBmsQzcjNnhJ?G)apW$>L=hG%Gpoh4Sw&U!hJeFSIar6?OMX&J$I?Sc?
z2cASnxQssHa{3!r;8(fHJc7?=jjOnf&*6GLm)rP4zM7}=^*n=b;cC8zXYp2^&5!UL
z{t3_HLtMje@_c@aYxx~s$R~J_;@~>P$BUI*Zcxg(QK{l4WjbG?%;lxZB5qcic)4;Z
zuTa+TN~MJ_SK9bWCCDwx4Xi7-a;x$kZc}!!U->B;%Fno6d5$}jgB(y^;kC-E+^M|I
zA?5Gfr5xq3a*Vr8%xMQiUyN_Pdw?_^nu6ZoUc9;a9su^Y<V~qUUoYLZM^GmT(8@9T
zwuwzn<tW{UHw6v$r*uF13<nh{M@)QlQnB(jdWmH~IO)nSqLC-5nA{%vXNEhj5~L*j
z3ObyR(G1R=aFo=e<Wh>&&nYtU7+uPvax0F}T(l9N;r7p|b=br~Jv@E`wNde)jf!ua
z1{EjT3Avei2BV@M(JOGVB8fGEiU`fYs5mN#isws+rlFz<ZKuLR6aVf%J^m$c=M5<-
zHzdU|OITF!Pr$;7tQvxUqip;e1w{n^1jJML*Z5W7pZT$AeqRdqhylJ*5cHh_1Y^SK
zs|LYhSO*|DOzsvC?4vBVAg;Ub`0FO>T`4Q4L%k*o^_p7p{Fy=TlK&^rtH38R@wKGz
zb>!r)Q!ZZ*(7OSkcQZim7J%Mu0KMA*dfx!(-2u?M6QK7^fZkmIy}JQ=_X7031<<>X
z?&ACD+t|N}x6mHmN<ZfB(*f?IXZQ#79B;?}P3-{a?W8yPVF2DPIt~c)@ovuNM|m3W
z<p$o*en47~pWv(bN$%kTyn&zMyZLF}!q4yyeiq};`B(f4{xv_(ukbJV6F$g)1?4k-
z5y1DdQpB$)WBHI$#;*eOUQ=f9@03}57{K?YQp0a4b^J$w-P=ll-%+mSca_`uh_adA
zQ?~K@%0v7CK<`6kH-Dt;;g6Na`4i<3|4BK_p91i##>xV@x)jKD*&w%p4%i?!79DC5
z<labu-0LZjJDdW!7gHejYzpL_P6N4lRQSJv+)*k{$G9~X#^L_}fpIQioIV8OHUc*l
H`p*9V25p9E

literal 8124
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
N5RAKuxM|?(zXE=?Ru=#O

diff --git a/src/ShipWarfareGUI.java b/src/ShipWarfareGUI.java
index cf7323c..21cf3db 100644
--- a/src/ShipWarfareGUI.java
+++ b/src/ShipWarfareGUI.java
@@ -29,16 +29,22 @@ import static javafx.application.Application.launch;
 public class ShipWarfareGUI extends Application {
 
 
-    private Player player = new Player();
-    private ShipWarfare shipWarfare = new ShipWarfare(player);
+    private  Player player = new Player();
+    private  ShipWarfare shipWarfare = new ShipWarfare(player);
     private  HBox hBox;
-    private  Button button1;
-    private  Button button2;
+    private  Button fightButton;
+    private  Button runButton;
     private  VBox vBox;
-    private  Label label1;
-    private  Label label;
-    private  VBox vBox0;
-    private  Label label0;
+    private  Label title;
+    private  Label chooseFightOrRun;
+    private  Label report;
+    private  Label runAwayOrLeft;
+    private  Label shipsRemaining;
+    private  Label HPLeft;
+    private  Label gunsLeftOrTaken;
+    private  Label continueToFight;
+
+
 
 
     public static void main(String args[]) {
@@ -53,14 +59,6 @@ public class ShipWarfareGUI extends Application {
     private int howMuchRun = 0;
     private String pirateName = "Liu Yen";
 
-    /**
-     * Class Constructor that takes in a type player as a parameter
-     * @param player object of the class Player
-     */
-    public ShipWarfareGUI(Player player) {
-        Player playerDummy = new Player(player);
-        this.player = playerDummy;
-    }
 
     /**
      * setter method for player
@@ -88,15 +86,13 @@ public class ShipWarfareGUI extends Application {
         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", player.getMoney(), numOfPeasantShips, player.getHP());
-
+        title.setText(String.format("By Golly! We have $%,d and are being attacked by %d Merchant ships\nCurrently our ship status is %d%%\n", player.getMoney(), numOfPeasantShips, player.getHP()));
         fightOrRunMessage();
         while (true) {
             String response = userResponse.nextLine();
             if (response.equalsIgnoreCase("f")) {
                 userAttacks = true;
                 System.out.println("Ohh, fight ehh?");
-                delayForSeconds(1);
                 boolean winOrLose = destroyPeasantShipsOrEscape();
                 if (winOrLose == true) {
                     break;
@@ -147,7 +143,6 @@ public class ShipWarfareGUI extends Application {
                         break;
                 } else {
                     System.out.println("Phew! Got away safely");
-                    delayForSeconds(2);
                     break;
                 }
 
@@ -263,13 +258,10 @@ public class ShipWarfareGUI extends Application {
                                 break;
                             }
                             System.out.println("Got eem");
-                            delayForSeconds(1);
                         } else if (hitOrMiss == 2) {
                             System.out.printf("ARRG! We missed %s\n", player.getName());
-                            delayForSeconds(1);
                         } else {
                             System.out.println("Darn! Their fleet tanked our attack");
-                            delayForSeconds(1);
                         }
 
 
@@ -279,7 +271,6 @@ public class ShipWarfareGUI extends Application {
                 }
             } else {
                 System.out.printf("%s! We don't have any GUNS!!!!\n",player.getName());
-                delayForSeconds(1);
             }
 
 
@@ -306,7 +297,6 @@ public class ShipWarfareGUI extends Application {
 
             System.out.printf("%d ships remaining\n", numOfLittyShips);
             System.out.println("Oh no, they are taking the offensive!");
-            delayForSeconds(1);
             //Computer volley
             int takeGunChance = randomValue.nextInt(4) + 1;
             if (takeGunChance == 1 && player.getGuns() > 0) {
@@ -320,7 +310,6 @@ public class ShipWarfareGUI extends Application {
                 break;
             }
             System.out.printf("EEK, our current ship status is %d%% \n", player.getHP());
-            delayForSeconds(1);
             if (userAttacks == false) {
                 userAttacks = true;
             }
@@ -331,10 +320,8 @@ public class ShipWarfareGUI extends Application {
             if (response.equalsIgnoreCase("r")) {
                 if (runFromShips() == false) {
                     System.out.println("Couldn't run away");
-                    delayForSeconds(1);
                 } else {
                     System.out.println("Phew! Got away safely");
-                    delayForSeconds(2);
                     break;
                 }
             }
@@ -345,11 +332,9 @@ public class ShipWarfareGUI extends Application {
 
         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", player.getHP());
-            delayForSeconds(1);
             calculateLoot = (randomValue.nextInt(startingLittyShips) + startingLittyShips) * 300;
             player.setMoney(player.getMoney() + calculateLoot);
             System.out.printf("We got $%,d!\n", calculateLoot);
-            delayForSeconds(2);
             return true;
         } else if (exitValue == 2) {
             player.gameOver();
@@ -357,7 +342,6 @@ public class ShipWarfareGUI extends Application {
             return true;
         } else if (exitValue == 3) {
             System.out.printf("We made it out at %d%% ship status!\n", player.getHP());
-            delayForSeconds(2);
             return true;
         }
         return false;
@@ -371,11 +355,23 @@ public class ShipWarfareGUI extends Application {
      * @throws Exception in case of errors due to the delay
      */
 
+    public void wipe(){
+        title.setVisible(false);
+        runAwayOrLeft.setVisible(false);
+        shipsRemaining.setVisible(false);
+        HPLeft.setVisible(false);
+        gunsLeftOrTaken.setVisible(false);
+        continueToFight.setVisible(false);
+
+
+    }
+
     public boolean destroyPeasantShipsOrEscape() throws Exception {
         int calculateLoot = 0;
         int chanceOfEnemyRun = 0;
         int hitCounter=0;
         int missCounter=0;
+        boolean gunFrustration= false;
 
 
         Scanner userInput = new Scanner(System.in);
@@ -396,10 +392,8 @@ public class ShipWarfareGUI extends Application {
                                 break;
                             }
                             hitCounter++;
-                            delayForSeconds(1);
                         } else {
-                            missCounter++;
-                            delayForSeconds(1);
+
                         }
 
 
@@ -407,11 +401,10 @@ public class ShipWarfareGUI extends Application {
                         continue;
                     }
                 }
-                label1.setText(String.format("Report:\nShips we hit: %d\nShots missed: %d", hitCounter,missCounter));
+                report.setText(String.format("Report: Ships we hit: %d Shots missed: %d", hitCounter,missCounter));
             }
             else{
-                label1.setText("We don't have any guns!!!");
-                delayForSeconds(1);
+                report.setText("We don't have any guns!!!");
 
             }
 
@@ -429,23 +422,20 @@ public class ShipWarfareGUI extends Application {
 
                         setNumOfPeasantShips(numOfPeasantShips - howMuchRun);
                         if (userAttacks == true) {
-                            System.out.printf("Ahhh, %d ships ran away %s!\n", howMuchRun, player.getName());
+                            runAwayOrLeft.setText(String.format("Ahhh, %d ships ran away %s!\n", howMuchRun, player.getName()));
                         } else {
-                            System.out.printf("Escaped %d of them!\n", howMuchRun);
+                            runAwayOrLeft.setText(String.format("Escaped %d of them!\n", howMuchRun));
                         }
                     }
                 }
             }
 
-            System.out.printf("%d ships remaining\n", numOfPeasantShips);
-            delayForSeconds(1);
-            System.out.println("Oh no, they are taking the offensive!");
-            delayForSeconds(1);
+            shipsRemaining.setText(String.format("%d ships remaining and they look angry!\n", numOfPeasantShips));
             //Computer volley
             int takeGunChance = randomValue.nextInt(4) + 1;
             if (takeGunChance == 1 && player.getGuns() > 0) {
                 player.setGuns(player.getGuns() - 1);
-                System.out.println("Dang it! They destroyed one of our guns");
+                gunFrustration=true;
             } else {
                 player.setHP(player.getHP() - (1 + randomValue.nextInt(10)));
             }
@@ -453,42 +443,53 @@ public class ShipWarfareGUI extends Application {
                 exitValue = 2;
                 break;
             }
-            System.out.printf("EEK, our current ship status is %d%% \n", player.getHP());
-            delayForSeconds(1);
+            if(gunFrustration==true){
+                gunsLeftOrTaken.setText(String.format("Dang it! We only have %d guns left", player.getGuns()));
+            }
+            else{
+                gunsLeftOrTaken.setText(String.format("We still have %d guns left", player.getGuns()));
+            }
+
+            HPLeft.setText(String.format("EEK, our current ship status is %d%% \n", player.getHP()));
             if (userAttacks == false) {
                 userAttacks = true;
             }
 
-            System.out.printf("Shall we continue to fight? Enter \"f\" to fight, and \"r\" to run (We have %d gun(s) left)\n", player.getGuns());
+            continueToFight.setText(String.format("Shall we continue to fight? (Click the fight button or the run button)\n", player.getGuns()));
+
+            if (runButton.isPressed()) {
 
-            String response = userInput.nextLine();
-            if (response.equalsIgnoreCase("r")) {
                 if (runFromShips() == false) {
-                    System.out.println("Couldn't run away");
+                    wipe();
+                    chooseFightOrRun.setText("Couldn't run away");
                 } else {
                     exitValue = 3;
                     break;
                 }
             }
 
+            else if(fightButton.isPressed()){
+                title.setText("AYYYYYYYYYYY");
+            }
+            else{
+
+            }
+
 
         }
 
 
         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", player.getHP());
-            delayForSeconds(1);
             calculateLoot = (randomValue.nextInt(startingPeasantShips) + startingPeasantShips) * 100;
             player.setMoney(player.getMoney() + calculateLoot);
             System.out.printf("We got $%,d!", calculateLoot);
-            delayForSeconds(2);
             return true;
         } else if (exitValue == 2) {
             player.gameOver();
             return true;
         } else if (exitValue == 3) {
             System.out.printf("We made it out at %d%% ship status!\n", player.getHP());
-            delayForSeconds(2);
             return true;
         }
         return false;
@@ -521,7 +522,7 @@ public class ShipWarfareGUI extends Application {
 
 
     public void setLabel1(String sysOut) {
-        label1.setText(sysOut);
+        report.setText(sysOut);
     }
 
     /*
@@ -533,7 +534,7 @@ public class ShipWarfareGUI extends Application {
     */
 
     public void start(Stage stage) throws Exception {
-        shipWarfare.setNumOfPeasantShips(shipWarfare.numOfShips());
+        setNumOfPeasantShips(numOfShips());
 
 
         BorderPane BorderPane = new BorderPane();
@@ -543,13 +544,19 @@ public class ShipWarfareGUI extends Application {
         gridPane.setVgap(5.0);
 
         hBox = new HBox();
-        button1 = new Button();
-        button2 = new Button();
+        fightButton = new Button();
+        runButton = new Button();
         vBox = new VBox();
-        label1 = new Label();
-        label = new Label();
-        vBox0 = new VBox();
-        label0 = new Label();
+        title = new Label();
+        chooseFightOrRun = new Label();
+        report = new Label();
+        runAwayOrLeft = new Label();
+        shipsRemaining = new Label();
+        HPLeft = new Label();
+        gunsLeftOrTaken = new Label();
+        continueToFight = new Label();
+
+
 
         BorderPane.setPrefHeight(400.0);
         BorderPane.setPrefWidth(600.0);
@@ -558,16 +565,22 @@ public class ShipWarfareGUI extends Application {
         hBox.setPrefWidth(200.0);
         hBox.setSpacing(10.0);
 
-        button1.setAlignment(javafx.geometry.Pos.CENTER);
-        button1.setContentDisplay(javafx.scene.control.ContentDisplay.CENTER);
-        button1.setId("Button1");
-        button1.setMnemonicParsing(false);
-        button1.setText("Fight");
+        title.setAlignment(javafx.geometry.Pos.TOP_CENTER);
+        title.setContentDisplay(javafx.scene.control.ContentDisplay.CENTER);
+        title.setId("Label1");
+        title.setText(String.format("%d ships attacking. Would you like to Fight or Run?",numOfPeasantShips));
+        title.setPadding(new Insets(6.0, 0.0, 0.0, 0.0));
 
-        button2.setAlignment(javafx.geometry.Pos.CENTER);
-        button2.setId("Button2");
-        button2.setMnemonicParsing(false);
-        button2.setText("Run");
+        fightButton.setAlignment(javafx.geometry.Pos.CENTER);
+        fightButton.setContentDisplay(javafx.scene.control.ContentDisplay.CENTER);
+        fightButton.setId("Button1");
+        fightButton.setMnemonicParsing(false);
+        fightButton.setText("Fight");
+
+        runButton.setAlignment(javafx.geometry.Pos.CENTER);
+        runButton.setId("Button2");
+        runButton.setMnemonicParsing(false);
+        runButton.setText("Run");
         BorderPane.setBottom(hBox);
 
         BorderPane.setAlignment(vBox, javafx.geometry.Pos.CENTER);
@@ -576,76 +589,45 @@ public class ShipWarfareGUI extends Application {
         vBox.setPrefWidth(100.0);
         vBox.setSpacing(20.0);
 
-        label1.setAlignment(javafx.geometry.Pos.TOP_CENTER);
-        label1.setContentDisplay(javafx.scene.control.ContentDisplay.CENTER);
-        label1.setId("Label1");
-        label1.setPadding(new Insets(6.0, 0.0, 0.0, 0.0));
+        report.setAlignment(javafx.geometry.Pos.TOP_CENTER);
+        report.setContentDisplay(javafx.scene.control.ContentDisplay.CENTER);
+        report.setId("Label1");
+        report.setPadding(new Insets(6.0, 0.0, 0.0, 0.0));
         vBox.setPadding(new Insets(0.0, 0.0, 10.0, 0.0));
         BorderPane.setTop(vBox);
         BorderPane.setPadding(new Insets(6.0, 0.0, 0.0, 0.0));
-        vBox0.setAlignment(javafx.geometry.Pos.TOP_CENTER);
-        vBox0.setPrefHeight(200.0);
-        vBox0.setPrefWidth(100.0);
-        vBox0.setSpacing(5.0);
 
-        hBox.getChildren().add(button1);
-        hBox.getChildren().add(button2);
-        vBox.getChildren().add(label1);
-        vBox.getChildren().add(label);
-        vBox0.getChildren().add(label0);
-        vBox.getChildren().add(vBox0);
-        int calculateLoot = 0;
-        int chanceOfEnemyRun = 0;
+        hBox.getChildren().add(fightButton);
+        hBox.getChildren().add(runButton);
+        vBox.getChildren().add(title);
+        vBox.getChildren().add(chooseFightOrRun);
+        vBox.getChildren().add(report);
+        vBox.getChildren().add(runAwayOrLeft);
+        vBox.getChildren().add(shipsRemaining);
+        vBox.getChildren().add(HPLeft);
+        vBox.getChildren().add(gunsLeftOrTaken);
+        vBox.getChildren().add(continueToFight);
 
 
-        //label1.setText(String.format("By Golly! We have $%,d and are being attacked by %d Merchant ships\nCurrently our ship status is %d%%\n", player.getMoney(), shipWarfare.getNumOfPeasantShips(), player.getHP()));
-        label.setText("What would you like to do?");
+
+
+
+        //report.setText(String.format("By Golly! We have $%,d and are being attacked by %d Merchant ships\nCurrently our ship status is %d%%\n", player.getMoney(), shipWarfare.getNumOfPeasantShips(), player.getHP()));
 
 
         //Fight
-        button1.setOnAction(new EventHandler<ActionEvent>() {
+        fightButton.setOnAction(new EventHandler<ActionEvent>() {
             @Override
-            public void handle(ActionEvent event) {
+            public void handle(ActionEvent event)  {
                 counter++;
                 if (counter == 1) {
 
-                    label.setText("Ohh, Fight ehh?");
+                    chooseFightOrRun.setText("Ohh, Fight ehh?");
+                    try {
+                        destroyPeasantShipsOrEscape();
+                    }
+                    catch(Exception e){
 
-                    int hitCounter=0;
-                    int missCounter=0;
-
-                    Random randomValue = new Random();
-                    int exitValue = 0;
-                    while (exitValue == 0) {
-                        if (player.getGuns() > 0) {
-
-                            for (int j = 0; j < player.getGuns(); j++) {
-                                if (userAttacks == true) {
-                                    int hitOrMiss = randomValue.nextInt(2) + 1;
-                                    if (hitOrMiss == 2) {
-                                        numOfPeasantShips--;
-                                        if (numOfPeasantShips <= 0) {
-                                            exitValue = 1;
-                                            break;
-                                        }
-                                        hitCounter++;
-                                        delayForSeconds(1);
-                                    } else {
-                                        missCounter++;
-                                        delayForSeconds(1);
-                                    }
-
-
-                                } else {
-                                    continue;
-                                }
-                            }
-                            label1.setText(String.format("Report:\nShips we hit: %d\nShots missed: %d", hitCounter, missCounter));
-                        } else {
-                            label1.setText("We don't have any guns!!!");
-                            delayForSeconds(1);
-
-                        }
                     }
 
 
@@ -653,30 +635,30 @@ public class ShipWarfareGUI extends Application {
                 }
                 if (counter == 2) {
                     System.out.println("You pressed the button twice.");
-                    button1.setVisible(false);
-                    button2.setVisible(false);
-                    button1.setDisable(true);
-                    button2.setDisable(true);
+                    fightButton.setVisible(false);
+                    runButton.setVisible(false);
+                    fightButton.setDisable(true);
+                    runButton.setDisable(true);
                 }
             }
         });
 
         //Flee
-        button2.setOnAction(new EventHandler<ActionEvent>() {
+        runButton.setOnAction(new EventHandler<ActionEvent>() {
             @Override
             public void handle(ActionEvent event) {
                 counter++;
                 if (counter == 1) {
-                    label1.setText("Ohh, Run ehh?");
+                    chooseFightOrRun.setText("Ohh, Run ehh?");
 
 
                 }
                 if (counter == 2) {
                     System.out.println("You pressed the button twice.");
-                    button1.setVisible(false);
-                    button2.setVisible(false);
-                    button1.setDisable(true);
-                    button2.setDisable(true);
+                    fightButton.setVisible(false);
+                    runButton.setVisible(false);
+                    fightButton.setDisable(true);
+                    runButton.setDisable(true);
                 }
             }
         });

From 9feac6e90e7c382dbc126d9d462096ca379889cc Mon Sep 17 00:00:00 2001
From: KahootChampion <p.harismuhammadkhan@gmail.com>
Date: Sat, 9 Mar 2019 22:52:30 -0700
Subject: [PATCH 2/2] Forces you to fight in ShipWarfareGUI unfortunately

---
 .idea/workspace.xml     | 47 ++++++++++++++++++++++++-----------------
 src/ShipWarfareGUI.java | 14 ++++++------
 2 files changed, 36 insertions(+), 25 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 827b9ae..234d2ae 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -3,7 +3,6 @@
   <component name="ChangeListManager">
     <list default="true" id="3114a2b9-4919-4fdf-8fd9-d03b60109ce4" name="Default Changelist" comment="">
       <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/ShipWarfareGUI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ShipWarfareGUI.java" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/out/" />
@@ -32,12 +31,12 @@
       <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/src/ShipWarfareGUI.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="135">
-              <caret line="399" column="97" selection-start-line="399" selection-start-column="92" selection-end-line="399" selection-end-column="97" />
+            <state relative-caret-position="608">
+              <caret line="47" lean-forward="true" selection-start-line="47" selection-end-line="47" />
               <folding>
                 <element signature="imports" expanded="true" />
-                <element signature="e#1208#1209#0" expanded="true" />
-                <element signature="e#1236#1237#0" expanded="true" />
+                <element signature="e#17426#17427#0" expanded="true" />
+                <element signature="e#17464#17465#0" expanded="true" />
               </folding>
             </state>
           </provider>
@@ -86,9 +85,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>shop</find>
-      <find>being</find>
-      <find>label0</find>
       <find>hBox</find>
       <find>&lt;</find>
       <find>winO</find>
@@ -116,6 +112,9 @@
       <find>destr</find>
       <find>destro</find>
       <find>hitco</find>
+      <find>setNum</find>
+      <find>game</find>
+      <find>numOf</find>
     </findStrings>
     <replaceStrings>
       <replace>HP</replace>
@@ -157,6 +156,8 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="PackagesPane" />
+      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -173,15 +174,13 @@
           <select />
         </subPane>
       </pane>
-      <pane id="Scope" />
-      <pane id="PackagesPane" />
     </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="1552187991754" />
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1552196488451" />
     <property name="extract.method.default.visibility" value="private" />
     <property name="last_opened_file_path" value="$PROJECT_DIR$/../GitHub/Cpsc233" />
     <property name="project.structure.last.edited" value="Project" />
@@ -283,6 +282,8 @@
       <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" />
     </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>
@@ -410,17 +411,24 @@
       <option name="project" value="LOCAL" />
       <updated>1552187032139</updated>
     </task>
-    <option name="localTasksCounter" value="19" />
+    <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>
+    <option name="localTasksCounter" value="20" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="58404000" />
+    <option name="totallyTimeSpent" value="58950000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="48" y="23" width="1189" height="652" extended-state="0" />
     <editor active="true" />
     <layout>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.22319093" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.23016565" />
       <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" />
@@ -536,7 +544,8 @@
     <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" />
-    <option name="LAST_COMMIT_MESSAGE" value="Please find error" />
+    <MESSAGE value="Super broken but fight button is in progress for shipwarfare" />
+    <option name="LAST_COMMIT_MESSAGE" value="Super broken but fight button is in progress for shipwarfare" />
   </component>
   <component name="editorHistoryManager">
     <entry file="uml://JAVA/ShipWarfare">
@@ -634,12 +643,12 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/src/ShipWarfareGUI.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="135">
-          <caret line="399" column="97" selection-start-line="399" selection-start-column="92" selection-end-line="399" selection-end-column="97" />
+        <state relative-caret-position="608">
+          <caret line="47" lean-forward="true" selection-start-line="47" selection-end-line="47" />
           <folding>
             <element signature="imports" expanded="true" />
-            <element signature="e#1208#1209#0" expanded="true" />
-            <element signature="e#1236#1237#0" expanded="true" />
+            <element signature="e#17426#17427#0" expanded="true" />
+            <element signature="e#17464#17465#0" expanded="true" />
           </folding>
         </state>
       </provider>
diff --git a/src/ShipWarfareGUI.java b/src/ShipWarfareGUI.java
index 21cf3db..ac44710 100644
--- a/src/ShipWarfareGUI.java
+++ b/src/ShipWarfareGUI.java
@@ -422,15 +422,15 @@ public class ShipWarfareGUI extends Application {
 
                         setNumOfPeasantShips(numOfPeasantShips - howMuchRun);
                         if (userAttacks == true) {
-                            runAwayOrLeft.setText(String.format("Ahhh, %d ships ran away %s!\n", howMuchRun, player.getName()));
+                            runAwayOrLeft.setText(String.format("Ahhh, %d ships ran away %s! ", howMuchRun, player.getName()));
                         } else {
-                            runAwayOrLeft.setText(String.format("Escaped %d of them!\n", howMuchRun));
+                            runAwayOrLeft.setText(String.format("Escaped %d of them! ", howMuchRun));
                         }
                     }
                 }
             }
 
-            shipsRemaining.setText(String.format("%d ships remaining and they look angry!\n", numOfPeasantShips));
+            shipsRemaining.setText(String.format("%d ships remaining and they look angry!", numOfPeasantShips));
             //Computer volley
             int takeGunChance = randomValue.nextInt(4) + 1;
             if (takeGunChance == 1 && player.getGuns() > 0) {
@@ -450,12 +450,12 @@ public class ShipWarfareGUI extends Application {
                 gunsLeftOrTaken.setText(String.format("We still have %d guns left", player.getGuns()));
             }
 
-            HPLeft.setText(String.format("EEK, our current ship status is %d%% \n", player.getHP()));
+            HPLeft.setText(String.format("EEK, our current ship status is %d%% ", player.getHP()));
             if (userAttacks == false) {
                 userAttacks = true;
             }
 
-            continueToFight.setText(String.format("Shall we continue to fight? (Click the fight button or the run button)\n", player.getGuns()));
+            continueToFight.setText(String.format("Shall we continue to fight? (Click the fight button or the run button)", player.getGuns()));
 
             if (runButton.isPressed()) {
 
@@ -480,10 +480,12 @@ public class ShipWarfareGUI extends Application {
 
 
         if (exitValue == 1) {
+            wipe();
+            chooseFightOrRun.setText(String.format("Ayy We won! We survived at %d ship status!", player.getHP()));
             System.out.printf("\nGot eem\nVictory!\nIt appears we have defeated the enemy fleet and made it out at %d%% ship status\n", player.getHP());
             calculateLoot = (randomValue.nextInt(startingPeasantShips) + startingPeasantShips) * 100;
             player.setMoney(player.getMoney() + calculateLoot);
-            System.out.printf("We got $%,d!", calculateLoot);
+            report.setText(String.format("We got $%,d! ",calculateLoot));
             return true;
         } else if (exitValue == 2) {
             player.gameOver();