change Game structure

data/Game.py

@@ -1,32 +1,37 @@
+from data import Direction
 from data.CATEGORY import CATEGORY
 from data.Item import Item
 from data.Order import Order
-
+from typing import Dict
 
 class Game:
-    def __init__(self, id: int, agentPos: (int, int), deliveryPos: (int, int), orderPos: (int,int), stockPilePos: [(int,int)],
+    def __init__(self, id: int, agentPos: (int, int), agentDirection: Direction, deliveryPos: (int, int), orderPos: (int,int), stockPilePos: Dict,
-                 deliveryItem: Item, agentHandId: int, orderStock:[id], orderList: [Order] ):
+                 deliveryItem: Item, carriedItem: Item, orderStock: Dict, orderList: [Order]):
+        self.agentDirection = agentDirection
         self.id = id
         self.agentPos = agentPos
         self.deliveryPos = deliveryPos
         self.orderPos = orderPos
         self.stockPilePos = stockPilePos
         self.deliveryItem = deliveryItem
-        self.agentHandId = agentHandId
+        self.carriedItem = carriedItem
         self.orderStock = orderStock
         self.orderList = orderList
 
-    def move(self, x: int, y:int):
+    def getCopy(self):
-        self.agentPos = (x, y)
+        newGame = Game(self)
-
+        return newGame
-    def pickUp(self, item: Item):
+    # def move(self, x: int, y: int):
-        self.deliveryItem = item
+    #     self.agentPos = (x, y)
-
+    #
-    def drop(self, item: Item):
+    # def pickUp(self, item: Item):
-        self.deliveryItem = -1
+    #     self.deliveryItem = item
-
+    #
-    def identify(item: Item, category: CATEGORY):
+    # def drop(self, item: Item):
-        item.category = category
+    #     self.deliveryItem = -1
-
+    #
-    def finishOrder(order: Order):
+    # def identify(item: Item, category: CATEGORY):
-        order.id = -1
+    #     item.category = category
+    #
+    # def finishOrder(order: Order):
+    #     order.id = -1