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

Sloppy but completed ShipWarfare class

Browse Source
This commit is contained in:
KahootChampion
2019-02-21 23:44:30 -07:00
parent 3bd9f58fb1
commit f9435e7309
4 changed files with 394 additions and 328 deletions
Download Patch File Download Diff File Expand all files Collapse all files

124
.idea/workspace.xml generated
View File

@@ -3,9 +3,9 @@
<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/Player.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Player.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/ShipWarfare.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ShipWarfare.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TaipanShop.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TaipanShop.java" afterDir="false" />
</list>
<ignored path="$PROJECT_DIR$/out/" />
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -33,8 +33,8 @@
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/ShipWarfare.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="99">
<caret line="7" column="33" selection-start-line="7" selection-start-column="33" selection-end-line="7" selection-end-column="33" />
<state relative-caret-position="-1419">
<caret line="12" column="30" selection-start-line="12" selection-start-column="30" selection-end-line="12" selection-end-column="30" />
<folding>
<element signature="imports" expanded="true" />
</folding>
@@ -42,10 +42,19 @@
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/Travel.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="265">
<caret line="66" column="1" lean-forward="true" selection-start-line="66" selection-start-column="1" selection-end-line="66" selection-end-column="1" />
</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="23">
<state relative-caret-position="30">
<caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
</state>
</provider>
@@ -54,29 +63,8 @@
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/Player.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="31">
<caret line="4" column="24" lean-forward="true" selection-start-line="4" selection-start-column="24" selection-end-line="4" selection-end-column="24" />
</state>
</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="-4123">
<caret line="111" column="85" selection-start-line="111" selection-start-column="81" selection-end-line="111" selection-end-column="85" />
<folding>
<element signature="e#333#334#0" expanded="true" />
<element signature="e#366#367#0" expanded="true" />
<element signature="e#535#536#0" expanded="true" />
<element signature="e#568#569#0" expanded="true" />
<element signature="e#736#737#0" expanded="true" />
<element signature="e#768#769#0" expanded="true" />
<element signature="e#931#932#0" expanded="true" />
<element signature="e#963#964#0" expanded="true" />
<element signature="e#1129#1130#0" expanded="true" />
<element signature="e#1164#1165#0" expanded="true" />
</folding>
<state relative-caret-position="148">
<caret line="10" column="24" selection-start-line="10" selection-start-column="24" selection-end-line="10" selection-end-column="24" />
</state>
</provider>
</entry>
@@ -92,9 +80,6 @@
</component>
<component name="FindInProjectRecents">
<findStrings>
<find>couldn</find>
<find>could</find>
<find>runFromShips</find>
<find>name</find>
<find>bank</find>
<find>player.getMoney() += num *</find>
@@ -115,6 +100,16 @@
<find>eek</find>
<find>setg</find>
<find>guns</find>
<find>duplic</find>
<find>chanceOfRun</find>
<find>chance</find>
<find>get</find>
<find>set</find>
<find>Peasant</find>
<find>d</find>
<find>captain</find>
<find>printf</find>
<find>setNum</find>
</findStrings>
<replaceStrings>
<replace>player.getName()</replace>
@@ -123,6 +118,11 @@
<replace>player.getOpiumHeld()</replace>
<replace>numOfPeasantShips</replace>
<replace>typeOfShip</replace>
<replace>chanceOfRun</replace>
<replace>litty</replace>
<replace>Liitty</replace>
<replace>Litty</replace>
<replace>%s</replace>
</replaceStrings>
</component>
<component name="Git.Settings">
@@ -132,8 +132,8 @@
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
<option value="$PROJECT_DIR$/src/TaipanShop.java" />
<option value="$PROJECT_DIR$/src/Test.java" />
<option value="$PROJECT_DIR$/src/TaipanShop.java" />
<option value="$PROJECT_DIR$/src/Player.java" />
<option value="$PROJECT_DIR$/src/ShipWarfare.java" />
</list>
@@ -173,7 +173,8 @@
<component name="PropertiesComponent">
<property name="WebServerToolWindowFactoryState" value="false" />
<property name="aspect.path.notification.shown" value="true" />
<property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1550810315089" />
<property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1550817767263" />
<property name="extract.method.default.visibility" value="public" />
<property name="last_opened_file_path" value="$PROJECT_DIR$" />
<property name="project.structure.last.edited" value="Project" />
<property name="project.structure.proportion" value="0.15" />
@@ -263,7 +264,7 @@
<workItem from="1550550806467" duration="577000" />
<workItem from="1550552635138" duration="118000" />
<workItem from="1550553016386" duration="7671000" />
<workItem from="1550672213804" duration="20865000" />
<workItem from="1550672213804" duration="27182000" />
</task>
<task id="LOCAL-00001" summary="Added troll comments">
<created>1550458807806</created>
@@ -328,15 +329,21 @@
<option name="project" value="LOCAL" />
<updated>1550704064692</updated>
</task>
<option name="localTasksCounter" value="10" />
<task id="LOCAL-00010" summary="Added loot. Still need to have ships escape sometimes and Liu yen">
<created>1550810365166</created>
<option name="number" value="00010" />
<option name="presentableId" value="LOCAL-00010" />
<option name="project" value="LOCAL" />
<updated>1550810365166</updated>
</task>
<option name="localTasksCounter" value="11" />
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="29690000" />
<option name="totallyTimeSpent" value="36007000" />
</component>
<component name="ToolWindowManager">
<frame x="0" y="23" width="1280" height="709" extended-state="0" />
<editor active="true" />
<layout>
<window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.2819063" />
<window_info id="Structure" order="1" side_tool="true" weight="0.25" />
@@ -347,7 +354,7 @@
<window_info id="Favorites" order="6" side_tool="true" />
<window_info anchor="bottom" id="Message" order="0" />
<window_info anchor="bottom" id="Find" order="1" />
<window_info anchor="bottom" id="Run" order="2" weight="0.3273906" />
<window_info active="true" anchor="bottom" id="Run" order="2" visible="true" weight="0.3273906" />
<window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
<window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
<window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
@@ -384,7 +391,8 @@
<MESSAGE value="I think I got the basic battling system down. Would appreciate i some of you guys beta tested it though and let me know the errors if there are any." />
<MESSAGE value="Perhaps done basic ship warfare?" />
<MESSAGE value="Perhaps done basic ship warfare? (still must add Liu yen difficulty, ships running away, and Loot)" />
<option name="LAST_COMMIT_MESSAGE" value="Perhaps done basic ship warfare? (still must add Liu yen difficulty, ships running away, and Loot)" />
<MESSAGE value="Added loot. Still need to have ships escape sometimes and Liu yen" />
<option name="LAST_COMMIT_MESSAGE" value="Added loot. Still need to have ships escape sometimes and Liu yen" />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/TaipanClone.iml">
@@ -393,13 +401,6 @@
<entry file="file://$PROJECT_DIR$/.idea/misc.xml">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/src/Travel.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="30">
<caret line="2" lean-forward="true" selection-start-line="2" selection-end-line="2" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/Test.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="15">
@@ -407,10 +408,24 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/Bank.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="30">
<caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/Travel.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="265">
<caret line="66" column="1" lean-forward="true" selection-start-line="66" selection-start-column="1" selection-end-line="66" selection-end-column="1" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/TaipanShop.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-4123">
<caret line="111" column="85" selection-start-line="111" selection-start-column="81" selection-end-line="111" selection-end-column="85" />
<state relative-caret-position="173">
<caret line="137" lean-forward="true" selection-start-line="137" selection-end-line="137" />
<folding>
<element signature="e#333#334#0" expanded="true" />
<element signature="e#366#367#0" expanded="true" />
@@ -426,24 +441,17 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/Bank.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="23">
<caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/Player.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="31">
<caret line="4" column="24" lean-forward="true" selection-start-line="4" selection-start-column="24" selection-end-line="4" selection-end-column="24" />
<state relative-caret-position="148">
<caret line="10" column="24" selection-start-line="10" selection-start-column="24" selection-end-line="10" selection-end-column="24" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/ShipWarfare.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="99">
<caret line="7" column="33" selection-start-line="7" selection-start-column="33" selection-end-line="7" selection-end-column="33" />
<state relative-caret-position="-1419">
<caret line="12" column="30" selection-start-line="12" selection-start-column="30" selection-end-line="12" selection-end-column="30" />
<folding>
<element signature="imports" expanded="true" />
</folding>