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

Added a few comments to ShipWarfare

Browse Source
This commit is contained in:
KahootChampion
2019-02-23 13:49:13 -07:00
parent 36f3b84eb8
commit 6b3112dfbb
3 changed files with 85 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

195
.idea/workspace.xml generated
View File

@@ -1,7 +1,7 @@
<?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="Sloppy but completed ShipWarfare class">
<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/ShipWarfare.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ShipWarfare.java" afterDir="false" />
@@ -29,13 +29,23 @@
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/ShipWarfare.java">
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/Start.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="111">
<caret line="248" column="36" lean-forward="true" selection-start-line="248" selection-start-column="36" selection-end-line="248" selection-end-column="36" />
<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>
</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="1725">
<caret line="139" column="4" selection-start-line="139" selection-start-column="4" selection-end-line="139" selection-end-column="4" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#2556#2557#0" expanded="true" />
<element signature="e#2583#2584#0" expanded="true" />
</folding>
</state>
</provider>
@@ -44,17 +54,8 @@
<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="165">
<caret line="11" column="15" selection-start-line="11" selection-start-column="15" selection-end-line="11" selection-end-column="15" />
</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="-4525">
<caret line="71" column="19" selection-start-line="71" selection-start-column="16" selection-end-line="71" selection-end-column="19" />
<state relative-caret-position="255">
<caret line="17" column="18" selection-start-line="17" selection-start-column="18" selection-end-line="17" selection-end-column="18" />
</state>
</provider>
</entry>
@@ -62,49 +63,19 @@
<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="225">
<caret line="16" lean-forward="true" selection-start-line="5" selection-start-column="3" selection-end-line="16" />
<state relative-caret-position="150">
<caret line="11" selection-start-line="11" selection-end-line="11" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/Bank.java">
<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="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>
</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="1935">
<caret line="129" column="30" selection-start-line="129" selection-start-column="30" selection-end-line="129" selection-end-column="30" />
<state relative-caret-position="-3787">
<caret line="14" lean-forward="true" selection-start-line="14" selection-end-line="14" />
<folding>
<element signature="e#769#770#0" expanded="true" />
<element signature="e#796#797#0" expanded="true" />
<element signature="e#836#837#0" expanded="true" />
<element signature="e#868#869#0" expanded="true" />
<element signature="e#894#895#0" expanded="true" />
<element signature="e#919#920#0" expanded="true" />
<element signature="e#1010#1011#0" expanded="true" />
<element signature="e#1037#1038#0" expanded="true" />
<element signature="e#1174#1175#0" expanded="true" />
<element signature="e#1202#1203#0" expanded="true" />
<element signature="e#1348#1349#0" expanded="true" />
<element signature="e#1380#1381#0" expanded="true" />
<element signature="e#1545#1546#0" expanded="true" />
<element signature="e#1576#1577#0" expanded="true" />
<element signature="e#1739#1740#0" expanded="true" />
<element signature="e#1773#1774#0" expanded="true" />
<element signature="e#1948#1949#0" expanded="true" />
<element signature="e#1979#1980#0" expanded="true" />
<element signature="e#2139#2140#0" expanded="true" />
<element signature="e#2170#2171#0" expanded="true" />
<element signature="e#2326#2327#0" expanded="true" />
<element signature="e#2353#2354#0" expanded="true" />
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
@@ -121,8 +92,6 @@
</component>
<component name="FindInProjectRecents">
<findStrings>
<find>ships rem</find>
<find>phew</find>
<find>heal</find>
<find>eek</find>
<find>setg</find>
@@ -145,12 +114,14 @@
<find>setMoney</find>
<find>setN</find>
<find>setNum</find>
<find>set</find>
<find>peasant</find>
<find>startingPeasantShips</find>
<find>startingLittyShips</find>
<find>destroy</find>
<find>litty</find>
<find>peasant</find>
<find>setmone</find>
<find>set</find>
<find>player.</find>
</findStrings>
<replaceStrings>
<replace>player.getName()</replace>
@@ -168,7 +139,7 @@
</replaceStrings>
</component>
<component name="Git.Settings">
<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">
@@ -178,6 +149,7 @@
<option value="$PROJECT_DIR$/src/TaipanShop.java" />
<option value="$PROJECT_DIR$/src/Player.java" />
<option value="$PROJECT_DIR$/src/main.java" />
<option value="$PROJECT_DIR$/src/Travel.java" />
<option value="$PROJECT_DIR$/src/ShipWarfare.java" />
</list>
</option>
@@ -193,7 +165,6 @@
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
<pane id="PackagesPane" />
<pane id="Scope" />
<pane id="ProjectPane">
<subPane>
@@ -211,12 +182,13 @@
<select />
</subPane>
</pane>
<pane id="PackagesPane" />
</panes>
</component>
<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="1550819711332" />
<property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1550892173887" />
<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" />
@@ -236,7 +208,7 @@
</list>
</option>
</component>
<component name="RunManager" selected="Application.ShipWarfare">
<component name="RunManager" selected="Application.main">
<configuration name="Main" type="Application" factoryName="Application" temporary="true">
<option name="MAIN_CLASS_NAME" value="Main" />
<module name="TaipanClone" />
@@ -261,15 +233,15 @@
<option name="Make" enabled="true" />
</method>
</configuration>
<configuration name="TaipanShop" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
<option name="MAIN_CLASS_NAME" value="TaipanShop" />
<configuration name="Test" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
<option name="MAIN_CLASS_NAME" value="Test" />
<module name="TaipanClone" />
<method v="2">
<option name="Make" enabled="true" />
</method>
</configuration>
<configuration name="Test" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
<option name="MAIN_CLASS_NAME" value="Test" />
<configuration name="main" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
<option name="MAIN_CLASS_NAME" value="main" />
<module name="TaipanClone" />
<method v="2">
<option name="Make" enabled="true" />
@@ -278,17 +250,17 @@
<list>
<item itemvalue="Application.Main" />
<item itemvalue="Application.ShipWarfare" />
<item itemvalue="Application.TaipanShop" />
<item itemvalue="Application.Player" />
<item itemvalue="Application.Test" />
<item itemvalue="Application.main" />
</list>
<recent_temporary>
<list>
<item itemvalue="Application.main" />
<item itemvalue="Application.ShipWarfare" />
<item itemvalue="Application.Main" />
<item itemvalue="Application.Test" />
<item itemvalue="Application.Player" />
<item itemvalue="Application.TaipanShop" />
</list>
</recent_temporary>
</component>
@@ -307,7 +279,11 @@
<workItem from="1550550806467" duration="577000" />
<workItem from="1550552635138" duration="118000" />
<workItem from="1550553016386" duration="7671000" />
<workItem from="1550672213804" duration="29369000" />
<workItem from="1550672213804" duration="29657000" />
<workItem from="1550872712636" duration="122000" />
<workItem from="1550879399892" duration="1335000" />
<workItem from="1550899071486" duration="108000" />
<workItem from="1550954455279" duration="433000" />
</task>
<task id="LOCAL-00001" summary="Added troll comments">
<created>1550458807806</created>
@@ -386,24 +362,30 @@
<option name="project" value="LOCAL" />
<updated>1550817871034</updated>
</task>
<option name="localTasksCounter" value="12" />
<task id="LOCAL-00012" summary="Fixed like 3 naming/logical errors in ShipWarfare">
<created>1550820057346</created>
<option name="number" value="00012" />
<option name="presentableId" value="LOCAL-00012" />
<option name="project" value="LOCAL" />
<updated>1550820057346</updated>
</task>
<option name="localTasksCounter" value="13" />
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="38194000" />
<option name="totallyTimeSpent" value="40480000" />
</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 active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.30048466" />
<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" />
<window_info id="UI Designer" order="4" />
<window_info id="Capture Tool" order="5" />
<window_info id="Favorites" order="6" side_tool="true" />
<window_info anchor="bottom" id="Duplicate detector" weight="0.32901135" />
<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" />
@@ -417,6 +399,7 @@
<window_info anchor="bottom" id="Terminal" order="10" weight="0.32936078" />
<window_info anchor="bottom" id="Event Log" order="11" sideWeight="0.50053304" side_tool="true" weight="0.32901135" />
<window_info anchor="bottom" id="Messages" order="12" weight="0.60777956" />
<window_info anchor="bottom" id="Duplicate detector" order="13" weight="0.32901135" />
<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" />
<window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
@@ -445,7 +428,8 @@
<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" />
<MESSAGE value="Sloppy but completed ShipWarfare class" />
<option name="LAST_COMMIT_MESSAGE" value="Sloppy but completed ShipWarfare class" />
<MESSAGE value="Fixed like 3 naming/logical errors in ShipWarfare" />
<option name="LAST_COMMIT_MESSAGE" value="Fixed like 3 naming/logical errors in ShipWarfare" />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/TaipanClone.iml">
@@ -454,10 +438,11 @@
<entry file="file://$PROJECT_DIR$/.idea/misc.xml">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/src/Test.java">
<entry file="file://$PROJECT_DIR$/src/Test.java" />
<entry file="file://$PROJECT_DIR$/src/TaipanShop.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="15">
<caret line="1" column="59" selection-start-line="1" selection-start-column="59" selection-end-line="1" selection-end-column="59" />
<state relative-caret-position="-4525">
<caret line="71" column="19" selection-start-line="71" selection-start-column="16" selection-end-line="71" selection-end-column="19" />
</state>
</provider>
</entry>
@@ -468,62 +453,42 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/Travel.java">
<entry file="file://$PROJECT_DIR$/src/Start.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="225">
<caret line="16" lean-forward="true" selection-start-line="5" selection-start-column="3" selection-end-line="16" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/TaipanShop.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-4525">
<caret line="71" column="19" selection-start-line="71" selection-start-column="16" selection-end-line="71" selection-end-column="19" />
<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/Player.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1935">
<caret line="129" column="30" selection-start-line="129" selection-start-column="30" selection-end-line="129" selection-end-column="30" />
<state relative-caret-position="1725">
<caret line="139" column="4" selection-start-line="139" selection-start-column="4" selection-end-line="139" selection-end-column="4" />
<folding>
<element signature="e#769#770#0" expanded="true" />
<element signature="e#796#797#0" expanded="true" />
<element signature="e#836#837#0" expanded="true" />
<element signature="e#868#869#0" expanded="true" />
<element signature="e#894#895#0" expanded="true" />
<element signature="e#919#920#0" expanded="true" />
<element signature="e#1010#1011#0" expanded="true" />
<element signature="e#1037#1038#0" expanded="true" />
<element signature="e#1174#1175#0" expanded="true" />
<element signature="e#1202#1203#0" expanded="true" />
<element signature="e#1348#1349#0" expanded="true" />
<element signature="e#1380#1381#0" expanded="true" />
<element signature="e#1545#1546#0" expanded="true" />
<element signature="e#1576#1577#0" expanded="true" />
<element signature="e#1739#1740#0" expanded="true" />
<element signature="e#1773#1774#0" expanded="true" />
<element signature="e#1948#1949#0" expanded="true" />
<element signature="e#1979#1980#0" expanded="true" />
<element signature="e#2139#2140#0" expanded="true" />
<element signature="e#2170#2171#0" expanded="true" />
<element signature="e#2326#2327#0" expanded="true" />
<element signature="e#2353#2354#0" expanded="true" />
<element signature="e#2556#2557#0" expanded="true" />
<element signature="e#2583#2584#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="165">
<caret line="11" column="15" selection-start-line="11" selection-start-column="15" selection-end-line="11" selection-end-column="15" />
<state relative-caret-position="255">
<caret line="17" column="18" selection-start-line="17" selection-start-column="18" selection-end-line="17" selection-end-column="18" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/Travel.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="150">
<caret line="11" selection-start-line="11" selection-end-line="11" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/ShipWarfare.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="111">
<caret line="248" column="36" lean-forward="true" selection-start-line="248" selection-start-column="36" selection-end-line="248" selection-end-column="36" />
<state relative-caret-position="-3787">
<caret line="14" lean-forward="true" selection-start-line="14" selection-end-line="14" />
<folding>
<element signature="imports" expanded="true" />
</folding>

BIN
out/production/TaipanClone/ShipWarfare.class
View File

Binary file not shown.

8
src/ShipWarfare.java
View File

@@ -28,7 +28,7 @@ public class ShipWarfare extends Player {
return playerDummy;
}
//This fleet is easy to defeat as a maximum of 15 ships can run away each volley, they can not tank hits
public void peasantFleetAttack() throws Exception {
Scanner userResponse = new Scanner(System.in);
setNumOfPeasantShips(numOfShips());
@@ -63,7 +63,7 @@ public class ShipWarfare extends Player {
}
//This fleet is difficult to defeat as a maximum of 10 ships can run away each volley, they can tank hits
public void littyFleetAttack() throws Exception {
Scanner userResponse = new Scanner(System.in);
setNumOfLittyShips(numOfShips());
@@ -124,7 +124,7 @@ public class ShipWarfare extends Player {
TimeUnit.SECONDS.sleep(1);
}
//The number of ships which attack is based on the amount of money one has on hand
public int numOfShips() {
int numOfShipsAttacking = 0;
@@ -148,6 +148,7 @@ public class ShipWarfare extends Player {
}
//One in two chance of running away
public boolean runFromShips() {
userAttacks = false;
Random randomValue = new Random();
@@ -160,6 +161,7 @@ public class ShipWarfare extends Player {
return false;
}
//The loot for defeating a litty fleet is much higher than that of a peasant one
public boolean destroyLittyShipsOrEscape() throws Exception {
int calculateLoot = 0;
int chanceOfEnemyRun = 0;