GameLogic.py

@@ -1,35 +1,2 @@
-from GameMap import *
-from Player import *
-
 class GameLogic():
-    
-    def __init__(self, gameMap, playerList, winRowLength, individualMoves):
-        
-        self.gameMap = gameMap
-        self.playerList = playerList
-        self.winRowLength = winRowLength
-        self.individualMoves = individualMoves
-        self.time = 0 # in seconds
-        self.score = 0
-        
-        self.wait_for_input()
-    
-    
-    def wait_for_input(self):
-        pass
-    
-    
-    def check_for_win(self, playerList):
-        for player in playerList:
-            pass
-    
-    def get_time(self):
-        return self.time
-    
-    
-    def reset_time(self):
-        self.time = 0
-      
-      
-    def get_score(self):
-        return self.score
+    pass

GameMap.py

@@ -17,21 +17,16 @@ class GameMap:
         return self.size_y
     
     
-    def add_mark(self, x, y, player):
+    def add_player_mark(self, x, y, player):
         if (x <= self.max_size_x and y <= self.max_size_y) and (x >= 0 and y >= 0):
-            if (x, y) not in self.data:
-                self.data[(x,y)] = player
-            else:
-                errorMessage = "The mark is already busy by the Player" + self.data[(x, y)].get_name()
-                raise KeyError(errorMessage)
+            self.data[(x,y)] = player
+            player.record_mark(x, y)
         else:
             errorMessage = "The mark" + str((x,y)) + " is beyond preset max values, max_x - " + str(self.max_size_x) + ", max_y - " + str(self.max_size_y)
             raise IndexError(errorMessage)
     
-    
-    def remove_mark(self, x, y):
-        data.pop((x,y))
-        
         
     def clear_map(self):
-        data.clear()
+        self.data = {}
+        
+        

Main.py

@@ -1,2 +0,0 @@
-import pygame
-from GameLogic import *

Player.py

@@ -8,9 +8,5 @@ class Player():
         return "Player " + self.name + ': ' + "\n    " + str(self.markList)
     
     
-    def get_name(self):
-        return self.name
-    
-    
     def record_mark(self, x, y):
         self.markList.append((x, y))