now fully uses the player class

This commit is contained in:
Vikram
2019-02-19 10:08:52 -07:00
parent 5cb0237ef8
commit 5156547ad0
2 changed files with 215 additions and 134 deletions

75
.idea/workspace.xml generated
View File

@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ChangeListManager">
<list default="true" id="3114a2b9-4919-4fdf-8fd9-d03b60109ce4" name="Default Changelist" comment="" />
<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$/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" />
<option name="SHOW_DIALOG" value="false" />
@@ -14,8 +17,8 @@
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/ShipWarfare.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="209">
<caret line="11" column="36" lean-forward="true" selection-start-line="11" selection-start-column="36" selection-end-line="11" selection-end-column="36" />
<state relative-caret-position="171">
<caret line="11" column="36" selection-start-line="11" selection-start-column="36" selection-end-line="11" selection-end-column="36" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#1150#1151#0" expanded="true" />
@@ -30,10 +33,20 @@
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/TaipanShop.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="380">
<caret line="20" column="22" lean-forward="true" selection-start-line="20" selection-start-column="22" selection-end-line="20" selection-end-column="22" />
<state relative-caret-position="-3629">
<caret line="10" lean-forward="true" selection-start-line="10" selection-end-line="10" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#333#334#0" expanded="true" />
<element signature="e#366#367#0" expanded="true" />
<element signature="e#333#334#0" expanded="true" />
<element signature="e#366#367#0" expanded="true" />
<element signature="e#492#493#0" expanded="true" />
<element signature="e#524#525#0" expanded="true" />
<element signature="e#646#647#0" expanded="true" />
<element signature="e#678#679#0" expanded="true" />
<element signature="e#803#804#0" expanded="true" />
<element signature="e#838#839#0" expanded="true" />
</folding>
</state>
</provider>
@@ -66,12 +79,14 @@
<find>bank</find>
<find>player.getMoney() += num *</find>
<find>opiumHeld</find>
<find>silkPrice</find>
</findStrings>
<replaceStrings>
<replace>player.getName()</replace>
<replace>player.getBank()</replace>
<replace>player.setMoney(player.getMoney() + num*)</replace>
<replace>player.getOpiumHeld()</replace>
<replace>getSilkPrice()</replace>
</replaceStrings>
</component>
<component name="Git.Settings">
@@ -97,7 +112,6 @@
</navigator>
<panes>
<pane id="PackagesPane" />
<pane id="Scope" />
<pane id="ProjectPane">
<subPane>
<expand>
@@ -114,12 +128,13 @@
<select />
</subPane>
</pane>
<pane id="Scope" />
</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="1550544519995" />
<property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1550596077065" />
<property name="last_opened_file_path" value="$PROJECT_DIR$" />
<property name="project.structure.last.edited" value="SDKs" />
<property name="project.structure.proportion" value="0.0" />
@@ -210,7 +225,14 @@
<option name="project" value="LOCAL" />
<updated>1550544805794</updated>
</task>
<option name="localTasksCounter" value="4" />
<task id="LOCAL-00004" summary="the shop now uses the player class as a parent class.">
<created>1550544933067</created>
<option name="number" value="00004" />
<option name="presentableId" value="LOCAL-00004" />
<option name="project" value="LOCAL" />
<updated>1550544933067</updated>
</task>
<option name="localTasksCounter" value="5" />
<servers />
</component>
<component name="TimeTrackingManager">
@@ -218,8 +240,9 @@
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
<editor active="true" />
<layout>
<window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.1705757" />
<window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.17857143" />
<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" />
@@ -234,7 +257,7 @@
<window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
<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="Version Control" order="8" sideWeight="0.49946696" visible="true" weight="0.32936078" />
<window_info active="true" anchor="bottom" id="Version Control" order="8" sideWeight="0.49946696" visible="true" weight="0.032502707" />
<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="Event Log" order="11" sideWeight="0.50053304" side_tool="true" weight="0.32936078" />
@@ -266,17 +289,10 @@
<entry file="file://$PROJECT_DIR$/TaipanClone.iml">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/src/Player.java">
<provider selected="true" editor-type-id="text-editor">
<state>
<caret column="13" selection-start-column="13" selection-end-column="13" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/ShipWarfare.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="209">
<caret line="11" column="36" lean-forward="true" selection-start-line="11" selection-start-column="36" selection-end-line="11" selection-end-column="36" />
<state relative-caret-position="171">
<caret line="11" column="36" selection-start-line="11" selection-start-column="36" selection-end-line="11" selection-end-column="36" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#1150#1151#0" expanded="true" />
@@ -287,12 +303,29 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/Player.java">
<provider selected="true" editor-type-id="text-editor">
<state>
<caret column="13" selection-start-column="13" selection-end-column="13" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/TaipanShop.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="380">
<caret line="20" column="22" lean-forward="true" selection-start-line="20" selection-start-column="22" selection-end-line="20" selection-end-column="22" />
<state relative-caret-position="-3629">
<caret line="10" lean-forward="true" selection-start-line="10" selection-end-line="10" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#333#334#0" expanded="true" />
<element signature="e#366#367#0" expanded="true" />
<element signature="e#333#334#0" expanded="true" />
<element signature="e#366#367#0" expanded="true" />
<element signature="e#492#493#0" expanded="true" />
<element signature="e#524#525#0" expanded="true" />
<element signature="e#646#647#0" expanded="true" />
<element signature="e#678#679#0" expanded="true" />
<element signature="e#803#804#0" expanded="true" />
<element signature="e#838#839#0" expanded="true" />
</folding>
</state>
</provider>