Vikram, these are the types of changes Harkey and I meant for you to establish.
This commit is contained in:
KahootChampion
2
.idea/misc.xml
generated
2
.idea/misc.xml
generated
@@ -3,7 +3,7 @@
|
||||
<component name="ProjectKey">
|
||||
<option name="state" value="project://63537948-39a4-48a0-9c97-34259a0fa913" />
|
||||
</component>
|
||||
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8.0_191" project-jdk-type="JavaSDK">
|
||||
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8.0_201" project-jdk-type="JavaSDK">
|
||||
<output url="file://$PROJECT_DIR$/out" />
|
||||
</component>
|
||||
<component name="SvnBranchConfigurationManager">
|
||||
|
||||
135
.idea/workspace.xml
generated
135
.idea/workspace.xml
generated
@@ -1,7 +1,12 @@
|
||||
<?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/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.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$/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 +19,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="-673">
|
||||
<caret line="9" column="55" selection-start-line="9" selection-start-column="55" selection-end-line="9" selection-end-column="55" />
|
||||
<folding>
|
||||
<element signature="imports" expanded="true" />
|
||||
<element signature="e#1150#1151#0" expanded="true" />
|
||||
@@ -27,23 +32,46 @@
|
||||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<file pinned="false" current-in-tab="true">
|
||||
<entry file="file://$PROJECT_DIR$/src/TaipanShop.java">
|
||||
<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="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="30">
|
||||
<caret line="2" column="35" lean-forward="true" selection-start-line="2" selection-start-column="35" selection-end-line="2" selection-end-column="35" />
|
||||
<folding>
|
||||
<element signature="imports" expanded="true" />
|
||||
<element signature="e#350#351#0" expanded="true" />
|
||||
<element signature="e#377#378#0" expanded="true" />
|
||||
<element signature="e#417#418#0" expanded="true" />
|
||||
<element signature="e#449#450#0" expanded="true" />
|
||||
<element signature="e#475#476#0" expanded="true" />
|
||||
<element signature="e#500#501#0" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<file pinned="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/src/Player.java">
|
||||
<file pinned="false" current-in-tab="true">
|
||||
<entry file="file://$PROJECT_DIR$/src/TaipanShop.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state>
|
||||
<caret column="13" selection-start-column="13" selection-end-column="13" />
|
||||
<state relative-caret-position="810">
|
||||
<caret line="55" column="30" lean-forward="true" selection-start-line="55" selection-start-column="30" selection-end-line="55" selection-end-column="30" />
|
||||
<folding>
|
||||
<element signature="e#371#372#0" expanded="true" />
|
||||
<element signature="e#404#405#0" expanded="true" />
|
||||
<element signature="e#453#454#0" expanded="true" />
|
||||
<element signature="e#497#498#0" expanded="true" />
|
||||
<element signature="e#530#531#0" expanded="true" />
|
||||
<element signature="e#562#563#0" expanded="true" />
|
||||
<element signature="e#609#610#0" expanded="true" />
|
||||
<element signature="e#651#652#0" expanded="true" />
|
||||
<element signature="e#684#685#0" expanded="true" />
|
||||
<element signature="e#716#717#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>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
@@ -66,6 +94,8 @@
|
||||
<find>bank</find>
|
||||
<find>player.getMoney() += num *</find>
|
||||
<find>opiumHeld</find>
|
||||
<find>hp</find>
|
||||
<find>player.</find>
|
||||
</findStrings>
|
||||
<replaceStrings>
|
||||
<replace>player.getName()</replace>
|
||||
@@ -75,6 +105,7 @@
|
||||
</replaceStrings>
|
||||
</component>
|
||||
<component name="Git.Settings">
|
||||
<option name="UPDATE_TYPE" value="MERGE" />
|
||||
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
|
||||
</component>
|
||||
<component name="IdeDocumentHistory">
|
||||
@@ -96,8 +127,8 @@
|
||||
<foldersAlwaysOnTop value="true" />
|
||||
</navigator>
|
||||
<panes>
|
||||
<pane id="PackagesPane" />
|
||||
<pane id="Scope" />
|
||||
<pane id="PackagesPane" />
|
||||
<pane id="ProjectPane">
|
||||
<subPane>
|
||||
<expand>
|
||||
@@ -119,12 +150,12 @@
|
||||
<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="1550552776844" />
|
||||
<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" />
|
||||
<property name="project.structure.last.edited" value="Project" />
|
||||
<property name="project.structure.proportion" value="0.15" />
|
||||
<property name="project.structure.side.proportion" value="0.2" />
|
||||
<property name="settings.editor.selected.configurable" value="project.propVCSSupport.Mappings" />
|
||||
<property name="settings.editor.selected.configurable" value="preferences.keymap" />
|
||||
</component>
|
||||
<component name="RunDashboard">
|
||||
<option name="ruleStates">
|
||||
@@ -138,7 +169,7 @@
|
||||
</list>
|
||||
</option>
|
||||
</component>
|
||||
<component name="RunManager" selected="Application.TaipanShop">
|
||||
<component name="RunManager" selected="Application.ShipWarfare">
|
||||
<configuration name="Main" type="Application" factoryName="Application" temporary="true">
|
||||
<option name="MAIN_CLASS_NAME" value="Main" />
|
||||
<module name="TaipanClone" />
|
||||
@@ -170,8 +201,8 @@
|
||||
</list>
|
||||
<recent_temporary>
|
||||
<list>
|
||||
<item itemvalue="Application.TaipanShop" />
|
||||
<item itemvalue="Application.ShipWarfare" />
|
||||
<item itemvalue="Application.TaipanShop" />
|
||||
<item itemvalue="Application.Main" />
|
||||
</list>
|
||||
</recent_temporary>
|
||||
@@ -188,6 +219,9 @@
|
||||
<option name="presentableId" value="Default" />
|
||||
<updated>1550454898506</updated>
|
||||
<workItem from="1550454902781" duration="459000" />
|
||||
<workItem from="1550550806467" duration="577000" />
|
||||
<workItem from="1550552635138" duration="118000" />
|
||||
<workItem from="1550553016386" duration="1451000" />
|
||||
</task>
|
||||
<task id="LOCAL-00001" summary="Added troll comments">
|
||||
<created>1550458807806</created>
|
||||
@@ -214,12 +248,12 @@
|
||||
<servers />
|
||||
</component>
|
||||
<component name="TimeTrackingManager">
|
||||
<option name="totallyTimeSpent" value="459000" />
|
||||
<option name="totallyTimeSpent" value="2605000" />
|
||||
</component>
|
||||
<component name="ToolWindowManager">
|
||||
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
|
||||
<frame x="0" y="23" width="1280" height="709" extended-state="6" />
|
||||
<layout>
|
||||
<window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.1705757" />
|
||||
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.27786753" />
|
||||
<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" />
|
||||
@@ -228,17 +262,17 @@
|
||||
<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.32827735" />
|
||||
<window_info anchor="bottom" id="Run" order="2" 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" />
|
||||
<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 anchor="bottom" id="Version Control" order="8" sideWeight="0.49946696" weight="0.32936078" />
|
||||
<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" />
|
||||
<window_info anchor="bottom" id="Messages" order="12" weight="0.32827735" />
|
||||
<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="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" />
|
||||
@@ -266,17 +300,35 @@
|
||||
<entry file="file://$PROJECT_DIR$/TaipanClone.iml">
|
||||
<provider selected="true" editor-type-id="text-editor" />
|
||||
</entry>
|
||||
<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/Player.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state>
|
||||
<caret column="13" selection-start-column="13" selection-end-column="13" />
|
||||
<state relative-caret-position="30">
|
||||
<caret line="2" column="35" lean-forward="true" selection-start-line="2" selection-start-column="35" selection-end-line="2" selection-end-column="35" />
|
||||
<folding>
|
||||
<element signature="e#350#351#0" expanded="true" />
|
||||
<element signature="e#377#378#0" expanded="true" />
|
||||
<element signature="e#417#418#0" expanded="true" />
|
||||
<element signature="e#449#450#0" expanded="true" />
|
||||
<element signature="e#475#476#0" expanded="true" />
|
||||
<element signature="e#500#501#0" expanded="true" />
|
||||
</folding>
|
||||
</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="-673">
|
||||
<caret line="9" column="55" selection-start-line="9" selection-start-column="55" selection-end-line="9" selection-end-column="55" />
|
||||
<folding>
|
||||
<element signature="imports" expanded="true" />
|
||||
<element signature="e#1150#1151#0" expanded="true" />
|
||||
@@ -289,10 +341,25 @@
|
||||
</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="810">
|
||||
<caret line="55" column="30" lean-forward="true" selection-start-line="55" selection-start-column="30" selection-end-line="55" selection-end-column="30" />
|
||||
<folding>
|
||||
<element signature="imports" expanded="true" />
|
||||
<element signature="e#371#372#0" expanded="true" />
|
||||
<element signature="e#404#405#0" expanded="true" />
|
||||
<element signature="e#453#454#0" expanded="true" />
|
||||
<element signature="e#497#498#0" expanded="true" />
|
||||
<element signature="e#530#531#0" expanded="true" />
|
||||
<element signature="e#562#563#0" expanded="true" />
|
||||
<element signature="e#609#610#0" expanded="true" />
|
||||
<element signature="e#651#652#0" expanded="true" />
|
||||
<element signature="e#684#685#0" expanded="true" />
|
||||
<element signature="e#716#717#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>
|
||||
</state>
|
||||
</provider>
|
||||
@@ -337,7 +404,7 @@
|
||||
</state>
|
||||
<state key="JdkListConfigurable.UI">
|
||||
<settings>
|
||||
<last-edited>1.8</last-edited>
|
||||
<last-edited>1.8.0_201</last-edited>
|
||||
<splitter-proportions>
|
||||
<option name="proportions">
|
||||
<list>
|
||||
|
||||
Reference in New Issue
Block a user