From 56816b59cecbaf4b92afad1e3b7b12fa6981a5c8 Mon Sep 17 00:00:00 2001
From: rogal <rogalenetory@gmail.com>
Date: Tue, 13 Aug 2019 14:18:06 +0200
Subject: [PATCH] Game complete - testing phase

---
 .gitignore            |   2 +
 .idea/misc.xml        |   7 --
 .idea/tic-tac-toe.iml |  11 ---
 .idea/workspace.xml   | 210 ------------------------------------------
 README.md             |  13 +++
 game.py               | 156 +++++++++++++------------------
 6 files changed, 78 insertions(+), 321 deletions(-)
 create mode 100644 .gitignore
 delete mode 100644 .idea/misc.xml
 delete mode 100644 .idea/tic-tac-toe.iml
 delete mode 100644 .idea/workspace.xml

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..77409fd
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+.idea
+*.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
deleted file mode 100644
index 8656114..0000000
--- a/.idea/misc.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="JavaScriptSettings">
-    <option name="languageLevel" value="ES6" />
-  </component>
-  <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.7" project-jdk-type="Python SDK" />
-</project>
\ No newline at end of file
diff --git a/.idea/tic-tac-toe.iml b/.idea/tic-tac-toe.iml
deleted file mode 100644
index f3d7bc9..0000000
--- a/.idea/tic-tac-toe.iml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="PYTHON_MODULE" version="4">
-  <component name="NewModuleRootManager">
-    <content url="file://$MODULE_DIR$" />
-    <orderEntry type="jdk" jdkName="Python 3.7" jdkType="Python SDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-  <component name="TestRunnerService">
-    <option name="PROJECT_TEST_RUNNER" value="Unittests" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
deleted file mode 100644
index 7b29394..0000000
--- a/.idea/workspace.xml
+++ /dev/null
@@ -1,210 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ChangeListManager">
-    <list default="true" id="7b55e0a4-fe1f-43e9-9277-ca003c3dc552" 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/tic-tac-toe.iml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/tic-tac-toe.iml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/game.py" beforeDir="false" afterPath="$PROJECT_DIR$/game.py" afterDir="false" />
-    </list>
-    <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
-    <option name="SHOW_DIALOG" value="false" />
-    <option name="HIGHLIGHT_CONFLICTS" value="true" />
-    <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$/game.py">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="268">
-              <caret line="88" column="62" selection-start-line="88" selection-start-column="62" selection-end-line="88" selection-end-column="62" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file:///usr/lib/python3.7/argparse.py">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="24375">
-              <caret line="1627" column="8" selection-start-line="1627" selection-start-column="8" selection-end-line="1627" selection-end-column="8" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$USER_HOME$/.PyCharm2019.1/system/python_stubs/-1247971762/builtins.py">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="74670">
-              <caret line="4978" column="8" selection-start-line="4978" selection-start-column="8" selection-end-line="4978" selection-end-column="8" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-    </leaf>
-  </component>
-  <component name="FileTemplateManagerImpl">
-    <option name="RECENT_TEMPLATES">
-      <list>
-        <option value="Python Script" />
-      </list>
-    </option>
-  </component>
-  <component name="FindInProjectRecents">
-    <findStrings>
-      <find>parser</find>
-      <find>move_dict</find>
-    </findStrings>
-    <replaceStrings>
-      <replace>self.moves</replace>
-    </replaceStrings>
-  </component>
-  <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$/game.py" />
-      </list>
-    </option>
-  </component>
-  <component name="ProjectConfigurationFiles">
-    <option name="files">
-      <list>
-        <option value="$PROJECT_DIR$/.idea/tic-tac-toe.iml" />
-        <option value="$PROJECT_DIR$/.idea/vcs.xml" />
-        <option value="$PROJECT_DIR$/.idea/misc.xml" />
-        <option value="$PROJECT_DIR$/.idea/modules.xml" />
-      </list>
-    </option>
-  </component>
-  <component name="ProjectFrameBounds" extendedState="6">
-    <option name="y" value="-1" />
-    <option name="width" value="1280" />
-    <option name="height" value="1024" />
-  </component>
-  <component name="ProjectView">
-    <navigator proportions="" version="1">
-      <foldersAlwaysOnTop value="true" />
-    </navigator>
-    <panes>
-      <pane id="ProjectPane">
-        <subPane>
-          <expand>
-            <path>
-              <item name="tic-tac-toe" type="b2602c69:ProjectViewProjectNode" />
-              <item name="tic-tac-toe" type="462c0819:PsiDirectoryNode" />
-            </path>
-          </expand>
-          <select />
-        </subPane>
-      </pane>
-      <pane id="Scope" />
-    </panes>
-  </component>
-  <component name="PropertiesComponent">
-    <property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
-    <property name="WebServerToolWindowFactoryState" value="false" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
-    <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
-    <property name="nodejs_npm_path_reset_for_default_project" value="true" />
-    <property name="settings.editor.selected.configurable" value="com.jetbrains.python.configuration.PyActiveSdkModuleConfigurable" />
-  </component>
-  <component name="RunDashboard">
-    <option name="ruleStates">
-      <list>
-        <RuleState>
-          <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
-        </RuleState>
-        <RuleState>
-          <option name="name" value="StatusDashboardGroupingRule" />
-        </RuleState>
-      </list>
-    </option>
-  </component>
-  <component name="SvnConfiguration">
-    <configuration />
-  </component>
-  <component name="TaskManager">
-    <task active="true" id="Default" summary="Default task">
-      <changelist id="7b55e0a4-fe1f-43e9-9277-ca003c3dc552" name="Default Changelist" comment="" />
-      <created>1555423087314</created>
-      <option name="number" value="Default" />
-      <option name="presentableId" value="Default" />
-      <updated>1555423087314</updated>
-      <workItem from="1555423091501" duration="1367000" />
-      <workItem from="1555579167086" duration="881000" />
-      <workItem from="1555580877901" duration="4546000" />
-      <workItem from="1560272719426" duration="780000" />
-      <workItem from="1560357277133" duration="1298000" />
-    </task>
-    <servers />
-  </component>
-  <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="8872000" />
-  </component>
-  <component name="ToolWindowManager">
-    <frame x="0" y="-1" width="1280" height="1024" extended-state="6" />
-    <layout>
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.26337114" />
-      <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="Message" order="0" />
-      <window_info anchor="bottom" id="Find" order="1" />
-      <window_info anchor="bottom" id="Run" order="2" />
-      <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" />
-      <window_info anchor="bottom" id="Version Control" order="8" />
-      <window_info anchor="bottom" id="Database Changes" order="9" />
-      <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" />
-      <window_info active="true" anchor="bottom" id="Terminal" order="11" visible="true" />
-      <window_info anchor="bottom" id="Python Console" order="12" />
-      <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" id="SciView" order="3" />
-      <window_info anchor="right" id="Database" order="4" />
-    </layout>
-  </component>
-  <component name="TypeScriptGeneratedFilesManager">
-    <option name="version" value="1" />
-  </component>
-  <component name="editorHistoryManager">
-    <entry file="file:///usr/lib/python3.7/json/decoder.py">
-      <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" />
-          <folding>
-            <element signature="e#37#46#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/game.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="268">
-          <caret line="88" column="62" selection-start-line="88" selection-start-column="62" selection-end-line="88" selection-end-column="62" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file:///usr/lib/python3.7/argparse.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="24375">
-          <caret line="1627" column="8" selection-start-line="1627" selection-start-column="8" selection-end-line="1627" selection-end-column="8" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$USER_HOME$/.PyCharm2019.1/system/python_stubs/-1247971762/builtins.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="74670">
-          <caret line="4978" column="8" selection-start-line="4978" selection-start-column="8" selection-end-line="4978" selection-end-column="8" />
-        </state>
-      </provider>
-    </entry>
-  </component>
-</project>
\ No newline at end of file
diff --git a/README.md b/README.md
index 7550369..dead72f 100644
--- a/README.md
+++ b/README.md
@@ -1,2 +1,15 @@
 # tic-tac-toe
 Tic Tac Toe game
+
+Python terminal version for popular tic tac toe game.
+
+Game is oriented for two players: x and o.
+
+RULES FOR TIC-TAC-TOE
+
+1. The game is played on a grid that's 3 squares by 3 squares.
+2. You are X, your friend (or the computer in this case) is O.
+Players take turns putting their marks in empty squares.
+3. The first player to get 3 of her marks in a row (up, down, across, or diagonally) is the winner.
+4. When all 9 squares are full, the game is over.
+If no player has 3 marks in a row, the game ends in a tie.
diff --git a/game.py b/game.py
index 29a4cc8..05c54f4 100644
--- a/game.py
+++ b/game.py
@@ -2,33 +2,21 @@
 Python terminal version for popular tic tac toe game.
 
 Game is oriented for two players: x and o.
+"""
 
+RULES = """
 RULES FOR TIC-TAC-TOE
 
 1. The game is played on a grid that's 3 squares by 3 squares.
-
 2. You are X, your friend (or the computer in this case) is O.
 Players take turns putting their marks in empty squares.
-
 3. The first player to get 3 of her marks in a row (up, down, across, or diagonally) is the winner.
-
 4. When all 9 squares are full, the game is over.
 If no player has 3 marks in a row, the game ends in a tie.
 """
 
-# import argparse
-#
-# parser = argparse.ArgumentParser(
-#     description='''
-#         My help
-#     ''',
-#     epilog="""All's well that ends well.""")
-# # parser.add_argument('--foo', type=int, default=42, help='FOO!')
-# # parser.add_argument('bar', nargs='*', default=[1, 2, 3], help='BAR!')
-# args = parser.parse_args()
 
-
-class TicTacToeGame:
+class GameOn:
 
     def __init__(self):
         self.p_signs = 'xo'
@@ -39,15 +27,6 @@ def __init__(self):
             '7': ' ', '8': ' ', '9': ' '
             }
 
-    def battlefield(self):
-        # plansza
-        print('Battlefield look like that!')
-        print(f'\n 1 | 2 | 3 ')
-        print('-----------')
-        print(f' 4 | 5 | 6 ')
-        print('-----------')
-        print(f' 7 | 8 | 9 \n')
-
     def current_battlefield(self):
         print(f"\n {self.moves['1']} | {self.moves['2']} | {self.moves['3']} ")
         print('-----------')
@@ -55,15 +34,11 @@ def current_battlefield(self):
         print('-----------')
         print(f" {self.moves['7']} | {self.moves['8']} | {self.moves['9']} \n")
 
-    def rules(self):
-        # rules
-        print('Rules of the game')
-
     def play_round(self, player_symbol):
         move = (input("Please select position for next move, from 1 to 9, don't use number "
                       "which is already taken: "))
         if move not in self.p_moves or len(move) != 1:
-            print('Ops! You have chosed wrong symbol or already taken, try again!\n')
+            print('Ops! You chose wrong symbol or already taken, try again!\n')
             return True
         else:
             self.p_moves = self.p_moves.replace(move, "")
@@ -71,13 +46,22 @@ def play_round(self, player_symbol):
             self.current_battlefield()
             return False
 
-    def win(self):
-        pass
-
-    def game_on(self):
-        print('Welcome to my game! Let\'s start with some rules.')
-        self.battlefield()
-
+    def win(self, symbol):
+        winning_list = [
+            ['1', '2', '3'], ['4', '5', '6'], ['7', '8', '9'],
+            ['1', '4', '7'], ['2', '5', '8'], ['3', '6', '9'],
+            ['1', '5', '8'], ['3', '5', '7']
+        ]
+        keys = [k for k, v in self.moves.items() if v == symbol]
+        for trio in winning_list:
+            success = 0
+            for k in trio:
+                success += 1 if k in keys else 0
+                if success == 3:
+                    return True
+        return False
+
+    def game(self):
         print('Now first player will choose symbol.')
         while True:
             try:
@@ -94,72 +78,58 @@ def game_on(self):
             while round_on:
                 round_on = self.play_round(player_now)
 
+            if self.win(player_now):
+                print(f"Winner is player with '{player_now}' symbol!!!")
+                GameOff().start(True)
 
-            if self.win():
-                break
+            if len(self.p_moves) == 0:
+                print('We have draw, start game again!')
+                GameOff().start(True)
 
             temporary_player = player_now
             player_now = player_later
             player_later = temporary_player
 
-            break
 
-    def game_off(self):
-        # tutaj może coś w stylu czy chcesz zagrać czy zobaczyć zasady najpierw?
+class GameOff:
+
+    def __init__(self):
         pass
 
+    def start(self, reply=False):
+        if not reply:
+            while True:
+                try:
+                    char = input('To start game enter "s" or "p", '
+                                 'if you want see the rules enter "r". Have fun!: ').lower()
+                    assert char in 'spr'
+                    break
+                except AssertionError:
+                    print('Provided sign is not R or P or S. Try again to play or go away!!\n')
+            if char == 'r':
+                self.rules()
+                GameOff().start()
+            else:
+                GameOn().game()
+        else:
+            char = input('Do you want to play again? Enter "y" or "p", if not enter anything else '
+                         'and game will stop: ').lower()
+            if char == 'y' or char == 'p':
+                GameOn().game()
+            else:
+                raise SystemExit
+
+    def rules(self):
+        print('Rules of the game')
+        print(RULES)
+        print('Battlefield look like that!')
+        print(f'\n 1 | 2 | 3 ')
+        print('-----------')
+        print(f' 4 | 5 | 6 ')
+        print('-----------')
+        print(f' 7 | 8 | 9 \n')
 
-# while sign not in patt:
-#     sign = input("Please pick 'X' or 'O': ").lower()
-# drugi = patt.replace(sign, '')
-# dupa dupa dupa
-#
-# while True:
-#     move = '0'
-#     print(f"Player with '{sign}' symbol is now playing.")
-#     while (move not in pattern or len(move) != 1):
-#         move = (input
-#             ("Please select position for next move, from 1 to 9,
-#             don't use number which is already taken: "))
-#     pattern = pattern.replace(move, "")
-#     move_dict[move] = sign
-#     print(f"\n {move_dict['1']} | {move_dict['2']} | {move_dict['3']} ")
-#     print('-----------')
-#     print(f" {move_dict['4']} | {move_dict['5']} | {move_dict['6']} ")
-#     print('-----------')
-#     print(f" {move_dict['7']} | {move_dict['8']} | {move_dict['9']} \n")
-#
-#     if move_dict['1'] == move_dict['2'] and move_dict['1'] == move_dict['3'] and move_dict['1'] != ' ':
-#         print(f"Winner is player with '{sign}' symbol!!!")
-#         break
-#     elif move_dict['1'] == move_dict['4'] and move_dict['1'] == move_dict['7'] and move_dict['1'] != ' ':
-#         print(f"Winner is player with '{sign}' symbol!!!")
-#         break
-#     elif move_dict['1'] == move_dict['5'] and move_dict['1'] == move_dict['9'] and move_dict['1'] != ' ':
-#         print(f"Winner is player with '{sign}' symbol!!!")
-#         break
-#     elif move_dict['7'] == move_dict['5'] and move_dict['7'] == move_dict['3'] and move_dict['7'] != ' ':
-#         print(f"Winner is player with '{sign}' symbol!!!")
-#         break
-#     if move_dict['2'] == move_dict['5'] and move_dict['2'] == move_dict['8'] and move_dict['2'] != ' ':
-#         print(f"Winner is player with '{sign}' symbol!!!")
-#         break
-#     elif move_dict['3'] == move_dict['6'] and move_dict['3'] == move_dict['9'] and move_dict['3'] != ' ':
-#         print(f"Winner is player with '{sign}' symbol!!!")
-#         break
-#     if move_dict['4'] == move_dict['5'] and move_dict['4'] == move_dict['6'] and move_dict['4'] != ' ':
-#         print(f"Winner is player with '{sign}' symbol!!!")
-#         break
-#     elif move_dict['7'] == move_dict['8'] and move_dict['7'] == move_dict['9'] and move_dict['7'] != ' ':
-#         print(f"Winner is player with '{sign}' symbol!!!")
-#         break
-#     elif len(pattern) == 0:
-#         print('We have draw, start game again!')
-#         break
-#
-#     temp = sign
-#     sign = drugi
-#     drugi = temp
 
 if __name__ == "__main__":
-    TicTacToeGame().game_on()
+    print('Welcome to my TicTacToe game!')
+    GameOff().start()