Did some more work in Python and started officially learning Java

3 files changed, 62 insertions, 245 deletions

diff --git a/Python/.idea/Python.iml b/Python/.idea/Python.iml
index fa80a76..3f73144 100644
--- a/Python/.idea/Python.iml
+++ b/Python/.idea/Python.iml
@@ -3,8 +3,9 @@
   <component name="NewModuleRootManager">
     <content url="file://$MODULE_DIR$">
       <excludeFolder url="file://$MODULE_DIR$/venv" />
+      <excludeFolder url="file://$MODULE_DIR$/venv1" />
     </content>
-    <orderEntry type="jdk" jdkName="Python 3.7" jdkType="Python SDK" />
+    <orderEntry type="jdk" jdkName="Python 3.7 (venv1)" jdkType="Python SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
   <component name="TestRunnerService">
diff --git a/Python/.idea/misc.xml b/Python/.idea/misc.xml
index a2e120d..112e751 100644
--- a/Python/.idea/misc.xml
+++ b/Python/.idea/misc.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.7" project-jdk-type="Python SDK" />
+  <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.7 (venv1)" project-jdk-type="Python SDK" />
 </project>
\ No newline at end of file
diff --git a/Python/.idea/workspace.xml b/Python/.idea/workspace.xml
index 7b967de..ec04b64 100644
--- a/Python/.idea/workspace.xml
+++ b/Python/.idea/workspace.xml
@@ -2,20 +2,10 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="fa33c027-ed35-40de-9bbc-c9cf5acfc8e7" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/Beginner training/Classes.py" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Beginner training/Exam 1.py" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Beginner training/Exam 2.py" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Beginner training/Tasks.py" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/Beginner training/Game test.py" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/Python.iml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/Python.iml" afterDir="false" />
       <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$/Beginner training/001 GoSkiing.py" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/Beginner training/002 Pets.py" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/Beginner training/003 Hotel.py" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/Beginner training/004 TakingCare.py" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/Beginner training/011 FitnessEquipment.py" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/Beginner training/012 FitnessVisitors.py" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/Beginner training/Random.py" beforeDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
@@ -23,32 +13,6 @@
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
     <option name="LAST_RESOLUTION" value="IGNORE" />
   </component>
-  <component name="FileEditorManager">
-    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/Beginner training/Classes.py">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="170">
-              <caret line="234" selection-start-line="234" selection-end-line="234" />
-              <folding>
-                <element signature="e#76#1213#0" />
-                <element signature="e#1250#4841#0" />
-                <element signature="e#1267#1805#0" />
-                <element signature="e#2294#3190#0" />
-                <element signature="e#3266#4029#0" />
-                <element signature="e#3606#3689#0" />
-                <element signature="e#3745#3772#0" />
-                <element signature="e#3870#3894#0" />
-                <element signature="e#2353#2464#0" />
-                <element signature="e#5490#7384#0" />
-                <element signature="e#5529#5887#0" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-    </leaf>
-  </component>
   <component name="FileTemplateManagerImpl">
     <option name="RECENT_TEMPLATES">
       <list>
@@ -59,68 +23,18 @@
   <component name="Git.Settings">
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$/.." />
   </component>
-  <component name="IdeDocumentHistory">
-    <option name="CHANGED_PATHS">
-      <list>
-        <option value="$PROJECT_DIR$/Beginner training/GoSkiing.py" />
-        <option value="$PROJECT_DIR$/Beginner training/Pets.py" />
-        <option value="$PROJECT_DIR$/Beginner training/3 Hotel.py" />
-        <option value="$PROJECT_DIR$/Beginner training/4 TakingCare.py" />
-        <option value="$PROJECT_DIR$/Beginner training/005 UniqueCombinations.py" />
-        <option value="$PROJECT_DIR$/Beginner training/Basic synthax.py" />
-        <option value="$PROJECT_DIR$/Beginner training/001 GoSkiing.py" />
-        <option value="$PROJECT_DIR$/Beginner training/002 Pets.py" />
-        <option value="$PROJECT_DIR$/Beginner training/003 Hotel.py" />
-        <option value="$PROJECT_DIR$/Beginner training/004 TakingCare.py" />
-        <option value="$PROJECT_DIR$/Beginner training/Exam 1.py" />
-        <option value="$PROJECT_DIR$/Beginner training/011 FitnessEquipment.py" />
-        <option value="$PROJECT_DIR$/Beginner training/012 FitnessVisitors.py" />
-        <option value="$PROJECT_DIR$/Beginner training/Exam 2.py" />
-        <option value="$PROJECT_DIR$/Beginner training/Random.py" />
-        <option value="$PROJECT_DIR$/Beginner training/Tasks.py" />
-        <option value="$PROJECT_DIR$/Beginner training/Classes.py" />
-      </list>
-    </option>
-  </component>
-  <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="-7" />
-    <option name="width" value="974" />
-    <option name="height" value="1047" />
-  </component>
+  <component name="ProjectId" id="1OddUdJn47AFLBgIxJzF9yYmR9b" />
   <component name="ProjectLevelVcsManager" settingsEditedManually="true">
     <ConfirmationsSetting value="2" id="Add" />
   </component>
-  <component name="ProjectView">
-    <navigator proportions="" version="1">
-      <foldersAlwaysOnTop value="true" />
-    </navigator>
-    <panes>
-      <pane id="Scope" />
-      <pane id="ProjectPane">
-        <subPane>
-          <expand>
-            <path>
-              <item name="Python" type="b2602c69:ProjectViewProjectNode" />
-              <item name="Python" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="Python" type="b2602c69:ProjectViewProjectNode" />
-              <item name="Python" type="462c0819:PsiDirectoryNode" />
-              <item name="Beginner training" type="462c0819:PsiDirectoryNode" />
-            </path>
-          </expand>
-          <select />
-        </subPane>
-      </pane>
-    </panes>
-  </component>
   <component name="PropertiesComponent">
+    <property name="ASKED_ADD_EXTERNAL_FILES" value="true" />
     <property name="ASKED_SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
     <property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
     <property name="ToolWindowRun.ShowToolbar" value="false" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$/Beginner training/Tasks.py" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/Beginner training/Game test.py" />
     <property name="restartRequiresConfirmation" value="false" />
-    <property name="settings.editor.selected.configurable" value="preferences.lookFeel" />
+    <property name="settings.editor.selected.configurable" value="com.jetbrains.python.configuration.PyActiveSdkModuleConfigurable" />
   </component>
   <component name="RunDashboard">
     <option name="configurationTypes">
@@ -139,7 +53,7 @@
       </list>
     </option>
   </component>
-  <component name="RunManager" selected="Python.Classes">
+  <component name="RunManager" selected="Python.Game test">
     <configuration default="true" type="CompoundRunConfigurationType">
       <toRun name="Basic synthax config" type="PythonConfigurationType" />
       <toRun name="2 Pets config" type="PythonConfigurationType" />
@@ -232,6 +146,27 @@
       <option name="INPUT_FILE" value="" />
       <method v="2" />
     </configuration>
+    <configuration name="Game test" type="PythonConfigurationType" factoryName="Python" folderName="Beginner training" nameIsGenerated="true">
+      <module name="Python" />
+      <option name="INTERPRETER_OPTIONS" value="" />
+      <option name="PARENT_ENVS" value="true" />
+      <envs>
+        <env name="PYTHONUNBUFFERED" value="1" />
+      </envs>
+      <option name="SDK_HOME" value="C:\Users\Kamen\GitHub_repos\Self-learning\Python\venv1\Scripts\python.exe" />
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/Beginner training" />
+      <option name="IS_MODULE_SDK" value="false" />
+      <option name="ADD_CONTENT_ROOTS" value="true" />
+      <option name="ADD_SOURCE_ROOTS" value="true" />
+      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/Beginner training/Game test.py" />
+      <option name="PARAMETERS" value="" />
+      <option name="SHOW_COMMAND_LINE" value="false" />
+      <option name="EMULATE_TERMINAL" value="false" />
+      <option name="MODULE_MODE" value="false" />
+      <option name="REDIRECT_INPUT" value="false" />
+      <option name="INPUT_FILE" value="" />
+      <method v="2" />
+    </configuration>
     <configuration name="Tasks" type="PythonConfigurationType" factoryName="Python" folderName="Beginner training" nameIsGenerated="true">
       <module name="Python" />
       <option name="INTERPRETER_OPTIONS" value="" />
@@ -254,6 +189,7 @@
       <method v="2" />
     </configuration>
     <list>
+      <item itemvalue="Python.Game test" />
       <item itemvalue="Python.Tasks" />
       <item itemvalue="Python.Exam 2" />
       <item itemvalue="Python.Exam 1" />
@@ -261,6 +197,22 @@
       <item itemvalue="Python.Basic synthax config" />
     </list>
   </component>
+  <component name="ServiceViewManager">
+    <option name="allServicesViewState">
+      <serviceView>
+        <option name="contentProportion" value="0.1038526" />
+        <treeState>
+          <expand>
+            <path>
+              <item name="services root" type="e789fda9:ObjectUtils$Sentinel" />
+              <item name="com.intellij.execution.services.ServiceModel$ServiceGroupNode@5fbdd309" type="7427dc5b:ServiceModel$ServiceGroupNode" />
+            </path>
+          </expand>
+          <select />
+        </treeState>
+      </serviceView>
+    </option>
+  </component>
   <component name="SvnConfiguration">
     <configuration />
   </component>
@@ -283,29 +235,16 @@
       <is-autoscroll-to-source value="true" />
     </todo-panel>
   </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" weight="0.13219616" />
-      <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
-      <window_info id="Favorites" order="2" side_tool="true" />
-      <window_info anchor="bottom" id="Version Control" order="0" weight="0.32936078" />
-      <window_info anchor="bottom" id="Python Console" order="1" weight="0.32936078" />
-      <window_info anchor="bottom" id="Terminal" order="2" weight="0.32936078" />
-      <window_info anchor="bottom" id="Event Log" order="3" side_tool="true" />
-      <window_info anchor="bottom" id="Message" order="4" />
-      <window_info anchor="bottom" id="Find" order="5" />
-      <window_info anchor="bottom" id="Debug" order="6" weight="0.4" />
-      <window_info anchor="bottom" id="Cvs" order="7" weight="0.25" />
-      <window_info anchor="bottom" id="Inspection" order="8" weight="0.4" />
-      <window_info anchor="bottom" id="TODO" order="9" weight="0.32936078" />
-      <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" />
-      <window_info anchor="right" x="11" y="368" width="1898" height="304" id="Run" order="3" weight="0.68443495" />
-      <window_info active="true" anchor="right" id="Run Dashboard" order="4" visible="true" weight="0.5079957" />
-    </layout>
+  <component name="Vcs.Log.Tabs.Properties">
+    <option name="TAB_STATES">
+      <map>
+        <entry key="MAIN">
+          <value>
+            <State />
+          </value>
+        </entry>
+      </map>
+    </option>
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -319,135 +258,12 @@
           <line>218</line>
           <option name="timeStamp" value="14" />
         </line-breakpoint>
+        <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
+          <url>file://$PROJECT_DIR$/Beginner training/Game test.py</url>
+          <line>19</line>
+          <option name="timeStamp" value="19" />
+        </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
   </component>
-  <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/Beginner training/005 UniqueCombinations.py" />
-    <entry file="file://$PROJECT_DIR$/Beginner training/002 Pets.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="68">
-          <caret line="4" selection-start-line="4" selection-end-line="4" />
-          <folding>
-            <element signature="e#0#10#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/Beginner training/003 Hotel.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="68">
-          <caret line="4" selection-start-line="4" selection-end-line="4" />
-          <folding>
-            <element signature="e#0#10#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/Beginner training/004 TakingCare.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="68">
-          <caret line="4" selection-start-line="4" selection-end-line="4" />
-          <folding>
-            <element signature="e#0#10#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/Beginner training/001 GoSkiing.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="51">
-          <caret line="3" selection-start-line="3" selection-end-line="3" />
-          <folding>
-            <element signature="e#0#10#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/Beginner training/Exam 1.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="221">
-          <caret line="77" column="12" selection-start-line="77" selection-start-column="12" selection-end-line="77" selection-end-column="12" />
-          <folding>
-            <element signature="e#68#589#0" />
-            <element signature="e#607#1325#0" />
-            <element signature="e#1344#2025#0" />
-            <element signature="e#2054#2518#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/Beginner training/011 FitnessEquipment.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="34">
-          <caret line="5" selection-start-line="5" selection-end-line="5" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/Beginner training/012 FitnessVisitors.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="34">
-          <caret line="5" selection-start-line="5" selection-end-line="5" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/Beginner training/Random.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="306">
-          <caret line="18" selection-start-line="18" selection-end-line="18" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/Beginner training/Basic synthax.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="34">
-          <caret line="4" column="19" lean-forward="true" selection-start-line="4" selection-start-column="19" selection-end-line="4" selection-end-column="19" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/Beginner training/Tasks.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="170">
-          <caret line="67" column="8" lean-forward="true" selection-start-line="67" selection-start-column="8" selection-end-line="67" selection-end-column="8" />
-          <folding>
-            <element signature="e#66#461#0" />
-            <element signature="e#488#1093#0" />
-            <element signature="e#1136#1525#0" />
-            <element signature="e#1560#1717#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/Beginner training/Exam 2.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="119">
-          <caret line="47" column="1" selection-start-line="47" selection-start-column="1" selection-end-line="47" selection-end-column="1" />
-          <folding>
-            <element signature="e#76#469#0" />
-            <element signature="e#562#1217#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/Beginner training/Classes.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="170">
-          <caret line="234" selection-start-line="234" selection-end-line="234" />
-          <folding>
-            <element signature="e#76#1213#0" />
-            <element signature="e#1250#4841#0" />
-            <element signature="e#1267#1805#0" />
-            <element signature="e#2294#3190#0" />
-            <element signature="e#3266#4029#0" />
-            <element signature="e#3606#3689#0" />
-            <element signature="e#3745#3772#0" />
-            <element signature="e#3870#3894#0" />
-            <element signature="e#2353#2464#0" />
-            <element signature="e#5490#7384#0" />
-            <element signature="e#5529#5887#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-  </component>
 </project>
\ No newline at end of file