classes completion, qol changes

QOLfunc.py

@@ -1,5 +1,4 @@
 # Tutaj wrzucam jakieś funkcje różne, co by nie zaśmiecać tym maina jak nie trzeba
-
 import random
 
 

classes/Garbagetruck.py

@@ -0,0 +1,82 @@
+class Garbagetruck:
+    image: object
+    position: object
+    trashweight: int
+    trash: list
+    capacity: int
+
+    def __init__(self):
+        self.capacity: int = 20
+        self.trash: list = []
+        self.trashweight: int = 0
+        self.image: object = None
+        self.position: object = None
+        self.route = None
+        self.scanner = None
+        self.planner = None
+        self.driver = None
+
+    def getCapacity(self) -> int:
+        return self.capacity
+
+    def getTrash(self) -> list:
+        return self.trash
+
+    def setTrash(self, trash: list) -> None:
+        self.trash = trash
+        for item in trash:
+            self.addTrashweight(item.getWeight)
+
+    def addTrash(self, trash: object) -> None:
+        self.trash.append(trash)
+        self.addTrashweight(trash.getWeight)
+
+    def removeTrash(self, trashid: int) -> object:
+        trash = self.trash.pop(trashid)
+        self.addTrashweight(trash.getWeight * (-1))
+        return trash
+
+    def getTrashweight(self) -> int:
+        return self.trashweight
+
+    def setTrashweight(self, weight: int) -> None:
+        self.trashweight = weight
+
+    def addTrashweight(self, weight: int) -> None:
+        self.trashweight += weight
+
+    def getImage(self) -> object:
+        return self.image
+
+    def setImage(self, image: object) -> None:
+        self.image = image
+
+    def getPosition(self) -> object:
+        return self.position
+
+    def setPosition(self, position: object) -> None:
+        self.position = position
+
+    def getRoute(self):
+        return self.route
+
+    def setRoute(self, route) -> None:
+        self.route = route
+
+    def getScanner(self):
+        return self.scanner
+
+    def setScanner(self, scanner) -> None:
+        self.route = scanner
+
+    def getPlanner(self):
+        return self.planner
+
+    def setPlanner(self, planner) -> None:
+        self.route = planner
+
+    def getDriver(self):
+        return self.driver
+
+    def setDriver(self, driver) -> None:
+        self.route = driver

classes/Household.py

@@ -1,10 +1,10 @@
 class Household:
-    def __init__(self, id, image, position):
-        self.id = id
-        self.image = image
-        assert isinstance(position, tuple)
-        self.position = position
-        self.neighbours = []
+    def __init__(self):
+        self.id: int = 0
+        self.image: object = None
+        self.position: tuple = None
+        self.neighbours: list = []
+        self.garbage: object = None
 
     def setNeighbours(self, neighbours):
         self.neighbours = neighbours
@@ -15,11 +15,26 @@ class Household:
     def getNeighbours(self):
         return self.neighbours
 
+    def setPosition(self, position: tuple):
+        self.position = position
+
     def getPosition(self):
         return self.position
 
+    def setImage(self, image: object):
+        self.image = image
+
     def getImage(self):
         return self.image
 
+    def setId(self, newID: int):
+        self.id = newID
+
     def getId(self):
-        return self.id
+        return self.id
+
+    def setGarbage(self, garbage: object):
+        self.garbage = garbage
+
+    def getGarbage(self):
+        return self.garbage

classes/Tile.py

@@ -1,14 +1,14 @@
 class Tile:
     def __init__(self):
         self.position = None
-        self.sprite = None
+        self.image = None
         self.parent = None
 
     def getSprite(self):
-        return self.sprite
+        return self.image
 
     def setSprite(self, sprite):
-        self.sprite = sprite
+        self.image = sprite
 
     def getPosition(self):
         return self.position

classes/Trashcan.py

@@ -1,29 +1,59 @@
 class Trashcan:
-    def __init__(self, id, image, position, trashtype):
-        self.id = id
-        self.image = image
-        assert isinstance(position, tuple)
-        self.position = position
-        self.type = trashtype
-        self.neighbours = []
+    def __init__(self):
+        self.id: int = 0
+        self.image: object = None
+        self.position: tuple = None
+        self.trashtype: str = None
+        self.neighbours: list = []
 
-    def setNeighbours(self, neighbours):
+    def setNeighbours(self, neighbours: list):
         self.neighbours = neighbours
+        return self
 
-    def addNeighbour(self, neighbour):
+    def addNeighbour(self, neighbour: object):
         self.neighbours.append(neighbour)
+        return self
 
     def getNeighbours(self):
         return self.neighbours
 
+    def setPosition(self, position: tuple):
+        self.position = position
+        return self
+
     def getPosition(self):
         return self.position
 
+    def setImage(self, image: object):
+        self.image = image
+        return self
+
     def getImage(self):
         return self.image
 
-    def getType(self):
-        return self.type
+    def setTrashtype(self, trashtype: str):
+        self.trashtype = trashtype
+        return self
+
+    def getTrashtype(self):
+        return self.trashtype
+
+    def setId(self, newId: int):
+        self.id = newId
+        return self
 
     def getId(self):
         return self.id
+
+
+def generateTrashcan(newId, image, position, trashtype):
+    """
+    :param int newId:
+    :param string image:
+    :param tuple position:
+    :param string trashtype:
+    :return object Trashcan:
+    """
+    trash = Trashcan()
+    trash.setId(newId).setImage(image).setPosition(position).setTrashtype(trashtype)
+    return trash