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

Added loot. Still need to have ships escape sometimes and Liu yen

Browse Source
This commit is contained in:
KahootChampion
2019-02-21 21:39:24 -07:00
parent 03b08e4de3
commit 3bd9f58fb1
4 changed files with 120 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

169
.idea/workspace.xml generated
View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project version="4"> <project version="4">
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="3114a2b9-4919-4fdf-8fd9-d03b60109ce4" name="Default Changelist" comment="Perhaps done basic ship warfare?"> <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$/.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$/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/Player.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Player.java" afterDir="false" />
@@ -14,29 +14,48 @@
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" /> <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
<option name="LAST_RESOLUTION" value="IGNORE" /> <option name="LAST_RESOLUTION" value="IGNORE" />
</component> </component>
<component name="DatabaseView">
<option name="SHOW_INTERMEDIATE" value="true" />
<option name="GROUP_DATA_SOURCES" value="true" />
<option name="GROUP_SCHEMA" value="true" />
<option name="GROUP_CONTENTS" value="false" />
<option name="SORT_POSITIONED" value="false" />
<option name="SHOW_EMPTY_GROUPS" value="false" />
<option name="AUTO_SCROLL_FROM_SOURCE" value="false" />
<option name="HIDDEN_KINDS">
<set />
</option>
<expand />
<select />
</component>
<component name="FileEditorManager"> <component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file pinned="false" current-in-tab="true"> <file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/ShipWarfare.java"> <entry file="file://$PROJECT_DIR$/src/ShipWarfare.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="752"> <state relative-caret-position="99">
<caret line="178" selection-start-line="178" selection-end-line="178" /> <caret line="7" column="33" selection-start-line="7" selection-start-column="33" selection-end-line="7" selection-end-column="33" />
<folding> <folding>
<element signature="imports" expanded="true" /> <element signature="imports" expanded="true" />
<element signature="e#1530#1531#0" expanded="true" />
<element signature="e#1570#1571#0" expanded="true" />
<element signature="e#1633#1634#0" expanded="true" />
<element signature="e#1691#1692#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </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">
<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"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/Player.java"> <entry file="file://$PROJECT_DIR$/src/Player.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="49"> <state relative-caret-position="31">
<caret line="4" column="33" selection-start-line="4" selection-start-column="33" selection-end-line="4" selection-end-column="33" /> <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> </state>
</provider> </provider>
</entry> </entry>
@@ -44,25 +63,19 @@
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/TaipanShop.java"> <entry file="file://$PROJECT_DIR$/src/TaipanShop.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1670"> <state relative-caret-position="-4123">
<caret line="400" selection-start-line="400" selection-end-line="400" /> <caret line="111" column="85" selection-start-line="111" selection-start-column="81" selection-end-line="111" selection-end-column="85" />
<folding> <folding>
<element signature="e#371#372#0" expanded="true" /> <element signature="e#333#334#0" expanded="true" />
<element signature="e#404#405#0" expanded="true" /> <element signature="e#366#367#0" expanded="true" />
<element signature="e#453#454#0" expanded="true" /> <element signature="e#535#536#0" expanded="true" />
<element signature="e#497#498#0" expanded="true" /> <element signature="e#568#569#0" expanded="true" />
<element signature="e#530#531#0" expanded="true" /> <element signature="e#736#737#0" expanded="true" />
<element signature="e#562#563#0" expanded="true" /> <element signature="e#768#769#0" expanded="true" />
<element signature="e#609#610#0" expanded="true" /> <element signature="e#931#932#0" expanded="true" />
<element signature="e#651#652#0" expanded="true" /> <element signature="e#963#964#0" expanded="true" />
<element signature="e#684#685#0" expanded="true" /> <element signature="e#1129#1130#0" expanded="true" />
<element signature="e#716#717#0" expanded="true" /> <element signature="e#1164#1165#0" expanded="true" />
<element signature="e#763#764#0" expanded="true" />
<element signature="e#805#806#0" expanded="true" />
<element signature="e#841#842#0" expanded="true" />
<element signature="e#876#877#0" expanded="true" />
<element signature="e#929#930#0" expanded="true" />
<element signature="e#977#978#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
@@ -97,6 +110,11 @@
<find>oh no</find> <find>oh no</find>
<find>shi</find> <find>shi</find>
<find>ships rem</find> <find>ships rem</find>
<find>phew</find>
<find>heal</find>
<find>eek</find>
<find>setg</find>
<find>guns</find>
</findStrings> </findStrings>
<replaceStrings> <replaceStrings>
<replace>player.getName()</replace> <replace>player.getName()</replace>
@@ -115,8 +133,9 @@
<option name="CHANGED_PATHS"> <option name="CHANGED_PATHS">
<list> <list>
<option value="$PROJECT_DIR$/src/TaipanShop.java" /> <option value="$PROJECT_DIR$/src/TaipanShop.java" />
<option value="$PROJECT_DIR$/src/ShipWarfare.java" /> <option value="$PROJECT_DIR$/src/Test.java" />
<option value="$PROJECT_DIR$/src/Player.java" /> <option value="$PROJECT_DIR$/src/Player.java" />
<option value="$PROJECT_DIR$/src/ShipWarfare.java" />
</list> </list>
</option> </option>
</component> </component>
@@ -154,7 +173,7 @@
<component name="PropertiesComponent"> <component name="PropertiesComponent">
<property name="WebServerToolWindowFactoryState" value="false" /> <property name="WebServerToolWindowFactoryState" value="false" />
<property name="aspect.path.notification.shown" value="true" /> <property name="aspect.path.notification.shown" value="true" />
<property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1550671761630" /> <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1550810315089" />
<property name="last_opened_file_path" value="$PROJECT_DIR$" /> <property name="last_opened_file_path" value="$PROJECT_DIR$" />
<property name="project.structure.last.edited" value="Project" /> <property name="project.structure.last.edited" value="Project" />
<property name="project.structure.proportion" value="0.15" /> <property name="project.structure.proportion" value="0.15" />
@@ -205,15 +224,24 @@
<option name="Make" enabled="true" /> <option name="Make" enabled="true" />
</method> </method>
</configuration> </configuration>
<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>
<list> <list>
<item itemvalue="Application.Main" /> <item itemvalue="Application.Main" />
<item itemvalue="Application.ShipWarfare" /> <item itemvalue="Application.ShipWarfare" />
<item itemvalue="Application.TaipanShop" /> <item itemvalue="Application.TaipanShop" />
<item itemvalue="Application.Player" /> <item itemvalue="Application.Player" />
<item itemvalue="Application.Test" />
</list> </list>
<recent_temporary> <recent_temporary>
<list> <list>
<item itemvalue="Application.ShipWarfare" /> <item itemvalue="Application.ShipWarfare" />
<item itemvalue="Application.Test" />
<item itemvalue="Application.Player" /> <item itemvalue="Application.Player" />
<item itemvalue="Application.TaipanShop" /> <item itemvalue="Application.TaipanShop" />
<item itemvalue="Application.Main" /> <item itemvalue="Application.Main" />
@@ -235,7 +263,7 @@
<workItem from="1550550806467" duration="577000" /> <workItem from="1550550806467" duration="577000" />
<workItem from="1550552635138" duration="118000" /> <workItem from="1550552635138" duration="118000" />
<workItem from="1550553016386" duration="7671000" /> <workItem from="1550553016386" duration="7671000" />
<workItem from="1550672213804" duration="8964000" /> <workItem from="1550672213804" duration="20865000" />
</task> </task>
<task id="LOCAL-00001" summary="Added troll comments"> <task id="LOCAL-00001" summary="Added troll comments">
<created>1550458807806</created> <created>1550458807806</created>
@@ -286,11 +314,25 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1550674024950</updated> <updated>1550674024950</updated>
</task> </task>
<option name="localTasksCounter" value="8" /> <task id="LOCAL-00008" summary="Perhaps done basic ship warfare? (still must add Liu yen difficulty, ships running away, and Loot)">
<created>1550681271530</created>
<option name="number" value="00008" />
<option name="presentableId" value="LOCAL-00008" />
<option name="project" value="LOCAL" />
<updated>1550681271530</updated>
</task>
<task id="LOCAL-00009" summary="Perhaps done basic ship warfare? (still must add Liu yen difficulty, ships running away, and Loot)">
<created>1550704064692</created>
<option name="number" value="00009" />
<option name="presentableId" value="LOCAL-00009" />
<option name="project" value="LOCAL" />
<updated>1550704064692</updated>
</task>
<option name="localTasksCounter" value="10" />
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="17789000" /> <option name="totallyTimeSpent" value="29690000" />
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="0" y="23" width="1280" height="709" extended-state="0" /> <frame x="0" y="23" width="1280" height="709" extended-state="0" />
@@ -311,7 +353,7 @@
<window_info anchor="bottom" id="Inspection" order="5" weight="0.4" /> <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
<window_info anchor="bottom" id="TODO" order="6" /> <window_info anchor="bottom" id="TODO" order="6" />
<window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" /> <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
<window_info anchor="bottom" id="Version Control" order="8" sideWeight="0.49946696" weight="0.32936078" /> <window_info anchor="bottom" id="Version Control" order="8" sideWeight="0.49946696" weight="0.32901135" />
<window_info anchor="bottom" id="Database Changes" order="9" /> <window_info anchor="bottom" id="Database Changes" order="9" />
<window_info anchor="bottom" id="Terminal" order="10" weight="0.32936078" /> <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="Event Log" order="11" sideWeight="0.50053304" side_tool="true" weight="0.32901135" />
@@ -320,7 +362,7 @@
<window_info anchor="right" id="Ant Build" order="1" weight="0.25" /> <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" /> <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
<window_info anchor="right" id="Palette" order="3" /> <window_info anchor="right" id="Palette" order="3" />
<window_info anchor="right" id="Database" order="4" /> <window_info anchor="right" id="Database" order="4" weight="0.32956383" />
<window_info anchor="right" id="Theme Preview" order="5" /> <window_info anchor="right" id="Theme Preview" order="5" />
<window_info anchor="right" id="Maven" order="6" /> <window_info anchor="right" id="Maven" order="6" />
<window_info anchor="right" id="Capture Analysis" order="7" /> <window_info anchor="right" id="Capture Analysis" order="7" />
@@ -341,7 +383,8 @@
<MESSAGE value="Added GameOver() Method to Player class, btw System.out.flush just straight up Thanos's the terminal at the time (clears it)." /> <MESSAGE value="Added GameOver() Method to Player class, btw System.out.flush just straight up Thanos's the terminal at the time (clears it)." />
<MESSAGE value="I think I got the basic battling system down. Would appreciate i some of you guys beta tested it though and let me know the errors if there are any." /> <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?" />
<option name="LAST_COMMIT_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)" />
</component> </component>
<component name="editorHistoryManager"> <component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/TaipanClone.iml"> <entry file="file://$PROJECT_DIR$/TaipanClone.iml">
@@ -357,48 +400,52 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/Test.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>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/TaipanShop.java"> <entry file="file://$PROJECT_DIR$/src/TaipanShop.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1670"> <state relative-caret-position="-4123">
<caret line="400" selection-start-line="400" selection-end-line="400" /> <caret line="111" column="85" selection-start-line="111" selection-start-column="81" selection-end-line="111" selection-end-column="85" />
<folding> <folding>
<element signature="e#371#372#0" expanded="true" /> <element signature="e#333#334#0" expanded="true" />
<element signature="e#404#405#0" expanded="true" /> <element signature="e#366#367#0" expanded="true" />
<element signature="e#453#454#0" expanded="true" /> <element signature="e#535#536#0" expanded="true" />
<element signature="e#497#498#0" expanded="true" /> <element signature="e#568#569#0" expanded="true" />
<element signature="e#530#531#0" expanded="true" /> <element signature="e#736#737#0" expanded="true" />
<element signature="e#562#563#0" expanded="true" /> <element signature="e#768#769#0" expanded="true" />
<element signature="e#609#610#0" expanded="true" /> <element signature="e#931#932#0" expanded="true" />
<element signature="e#651#652#0" expanded="true" /> <element signature="e#963#964#0" expanded="true" />
<element signature="e#684#685#0" expanded="true" /> <element signature="e#1129#1130#0" expanded="true" />
<element signature="e#716#717#0" expanded="true" /> <element signature="e#1164#1165#0" expanded="true" />
<element signature="e#763#764#0" expanded="true" />
<element signature="e#805#806#0" expanded="true" />
<element signature="e#841#842#0" expanded="true" />
<element signature="e#876#877#0" expanded="true" />
<element signature="e#929#930#0" expanded="true" />
<element signature="e#977#978#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </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"> <entry file="file://$PROJECT_DIR$/src/Player.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="49"> <state relative-caret-position="31">
<caret line="4" column="33" selection-start-line="4" selection-start-column="33" selection-end-line="4" selection-end-column="33" /> <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> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/ShipWarfare.java"> <entry file="file://$PROJECT_DIR$/src/ShipWarfare.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="752"> <state relative-caret-position="99">
<caret line="178" selection-start-line="178" selection-end-line="178" /> <caret line="7" column="33" selection-start-line="7" selection-start-column="33" selection-end-line="7" selection-end-column="33" />
<folding> <folding>
<element signature="imports" expanded="true" /> <element signature="imports" expanded="true" />
<element signature="e#1530#1531#0" expanded="true" />
<element signature="e#1570#1571#0" expanded="true" />
<element signature="e#1633#1634#0" expanded="true" />
<element signature="e#1691#1692#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>

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

Binary file not shown.

4
src/Player.java
View File

@@ -2,13 +2,13 @@ public class Player {
private String name = "Taipan"; private String name = "Taipan";
private int bank = 0; private int bank = 0;
private int money = 1000; private int money = 1000000000;
private int opiumHeld = 0; private int opiumHeld = 0;
private int silkHeld = 0; private int silkHeld = 0;
private int generalHeld = 0; private int generalHeld = 0;
private int armsHeld = 0; private int armsHeld = 0;
private int location = 1; private int location = 1;
private int guns = 3; private int guns = 1000;
private int HP = 100; private int HP = 100;

10
src/ShipWarfare.java
View File

@@ -5,7 +5,9 @@ import java.util.concurrent.TimeUnit;
public class ShipWarfare extends Player { public class ShipWarfare extends Player {
private int numOfPeasantShips = 0; private int numOfPeasantShips = 0;
private int numOfLittyShips=0;
private boolean userAttacks = true; private boolean userAttacks = true;
private int startingShips=0;
public void peasantFleetAttack() throws Exception { public void peasantFleetAttack() throws Exception {
@@ -49,10 +51,13 @@ public class ShipWarfare extends Player {
public int getNumOfPeasantShips() { public int getNumOfPeasantShips() {
return numOfPeasantShips; return numOfPeasantShips;
} }
public void setNumOfPeasantShips(int numOfPeasantShips) { public void setNumOfPeasantShips(int numOfPeasantShips) {
this.numOfPeasantShips = numOfPeasantShips; this.numOfPeasantShips = numOfPeasantShips;
startingShips = numOfPeasantShips;
} }
public void delayForASecond() throws Exception { public void delayForASecond() throws Exception {
@@ -96,6 +101,8 @@ public class ShipWarfare extends Player {
} }
public boolean destroyShipsOrEscape(int typeOfShip) throws Exception { public boolean destroyShipsOrEscape(int typeOfShip) throws Exception {
int calculateLoot=0;
Scanner userInput = new Scanner(System.in); Scanner userInput = new Scanner(System.in);
Random randomValue = new Random(); Random randomValue = new Random();
numOfPeasantShips = typeOfShip; numOfPeasantShips = typeOfShip;
@@ -170,6 +177,9 @@ public class ShipWarfare extends Player {
if (exitValue == 1) { 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", getHP()); System.out.printf("\nGot eem\nVictory!\nIt appears we have defeated the enemy fleet and made it out at %d%% ship status\n", getHP());
calculateLoot= (randomValue.nextInt(startingShips) + startingShips) *100;
setMoney(getMoney()+calculateLoot);
System.out.printf("We got $%,d!",calculateLoot);
return true; return true;
} else if (exitValue == 2) { } else if (exitValue == 2) {
gameOver(); gameOver();