little class adjustments

QOLfunc.py

@@ -16,9 +16,9 @@ def extractPredicts(houses: list) -> set:
     return preds
 
 
-def distance(object1, object2) -> int:
-    lok1 = object1.getPosition()
-    lok2 = object2.getPosition()
-
-    dist = abs(lok1[0]-lok2[0]) + abs(lok1[1]-lok2[1])
-    return dist
+def allLocations(*lista):
+    final = set()
+    for _ in lista:
+        for item in _:
+            final.add(item)
+    return final

classes/Garbage.py

@@ -7,6 +7,8 @@ class Garbage:
         self.content = []
         self.predict = []
         self.prob: float = 0.3
+        self.generatePredict()
+        self.generateContent()
 
     def getContent(self):
         return self.content
@@ -52,7 +54,6 @@ class Garbage:
                     if bruh != traf:
                         del bruh
 
-
     def generateContent(self):
         mod = random.choice([1, -1])
         self.setContent(self.predict[:])

classes/Garbagetruck.py

@@ -1,4 +1,5 @@
 import pygame
+from classes.Trash import *
 
 
 class Garbagetruck:
@@ -8,15 +9,23 @@ class Garbagetruck:
         self.trash: list = []
         self.trashweight: int = 0
         self.image = pygame.image.load(file).convert_alpha()
-        self.image = pygame.transform.scale(self.image, (32,32))
-        self.position = [800, 500]
+        self.image = pygame.transform.scale(self.image, (32, 32))
+        self.position = [3, 3]
         self.predicts: set = set()
+        self.others: set = set()
         self.state = None
         self.route = None
         self.scanner = None
         self.planner = None
         self.driver = None
 
+    def getOthers(self):
+        return self.others
+
+    def setOthers(self, others):
+        self.others = others
+        return self
+
     def setPredicts(self, predicts):
         self.predicts = predicts
         return self
@@ -33,11 +42,11 @@ class Garbagetruck:
     def setTrash(self, trash: list) -> None:
         self.trash = trash
         for item in trash:
-            self.addTrashweight(item.getWeight)
+            self.addTrashweight(item.getWaga)
 
-    def addTrash(self, trash: object) -> None:
+    def addTrash(self, trash: Trash) -> None:
         self.trash.append(trash)
-        self.addTrashweight(trash.getWeight)
+        self.addTrashweight(trash.getWaga())
 
     def removeTrash(self, trashid: int) -> object:
         trash = self.trash.pop(trashid)
@@ -59,11 +68,17 @@ class Garbagetruck:
     def setImage(self, image: object) -> None:
         self.image = image
 
-    def getPosition(self) -> object:
+    def getPosition(self) -> list:
         return self.position
 
-    def setPosition(self, position: object) -> None:
+    def setPosition(self, position: list) -> object:
         self.position = position
+        return self
+
+    def modPosiotion(self, modX, modY):
+        x = self.getPosition()[0] + modX
+        y = self.getPosition()[1] + modY
+        self.setPosition([x, y])
 
     def getRoute(self):
         return self.route
@@ -88,3 +103,10 @@ class Garbagetruck:
 
     def setDriver(self, driver) -> None:
         self.route = driver
+
+    def distance(self, object1, object2) -> int:
+        lok1 = object1.getPosition()
+        lok2 = object2.getPosition()
+
+        dist = abs(lok1[0] - lok2[0]) + abs(lok1[1] - lok2[1])
+        return dist

main.py

@@ -9,7 +9,7 @@ tilemap = Tilemap(Tileset("sprites/Tiles/1 Tiles/FieldsTile_38.png"), (30, 20))
 
 trashcans = trashcanGenerator()
 houses = householdGenerator()
-garbagetruck = Garbagetruck().setPredicts(extractPredicts(houses))
+garbagetruck = Garbagetruck().setPredicts(extractPredicts(houses)).setOthers(allLocations(trashcans, houses))
 
 running = True
 while running: