czyszczenie + nowe funkcje i klasy

QOLfunc.py

@@ -1,17 +1,24 @@
 # Tutaj wrzucam jakieś funkcje różne, co by nie zaśmiecać tym maina jak nie trzeba
-import random
+from classes.Household import *
+
+colors = {
+    "white": (255, 255, 255),
+    "black": (0, 0, 0),
+    "red": (255, 0, 0)
+}
 
 
-def chooseNeighbours(count: int, i: int) -> set:
+def extractPredicts(houses: list) -> set:
-    """
+    preds = set()
-    :param count: ile sąsiadów ma wybrać
+    for house in houses:
-    :param i: id obiektu, żeby nie był sąsiadem sam ze sobą
+        temp = [house, house.getGarbage().getPredict()]
-    :return: zbiór id wybranych losowo sąsiadów obiektu
+        preds.add(temp)
-    """
+    return preds
-    neigh = set()
-    while len(neigh) < count:
-        num = random.randint(0, 7)
-        if num != i:
-            neigh.add(num)
-    return neigh
 
+
+def distance(object1, object2) -> int:
+    lok1 = object1.getPosition()
+    lok2 = object2.getPosition()
+
+    dist = abs(lok1[0]-lok2[0]) + abs(lok1[1]-lok2[1])
+    return dist

classes/Garbage.py

@@ -0,0 +1,60 @@
+import random
+from classes.Trash import *
+
+
+class Garbage:
+    def __init__(self):
+        self.content = []
+        self.predict = []
+        self.prob: float = 0.3
+
+    def getContent(self):
+        return self.content
+
+    def setContent(self, content):
+        self.content = content
+        return self
+
+    def addContent(self, item: Trash):
+        self.content.append(item)
+        return self
+
+    def removeContent(self, item: int):
+        return self.content.pop(item)
+
+    def getPredict(self):
+        return self.predict
+
+    def setPredict(self, predict):
+        self.predict = predict
+        return self
+
+    def addPredict(self, item):
+        self.predict.append(item)
+        return self
+
+    def getProb(self):
+        return self.prob
+
+    def setProb(self, prob):
+        self.prob = prob
+        return self
+
+    def generatePredict(self, i=random.choice([2, 3])):
+        if i < 0:
+            self.predict.pop(i)
+        else:
+            for _ in range(i):
+                possible = [Papier(), MetalPlastik(), Szklo(), Mixed(), Bio()]
+                traf = random.choice(possible)
+                self.predict.append(traf)
+                for bruh in possible:
+                    if bruh != traf:
+                        del bruh
+
+
+    def generateContent(self):
+        mod = random.choice([1, -1])
+        self.setContent(self.predict[:])
+        if random.random() < self.prob:
+            self.generatePredict(mod)

classes/Garbagetruck.py

@@ -2,11 +2,6 @@ import pygame
 
 
 class Garbagetruck:
-    image: object
-    position: object
-    trashweight: int
-    trash: list
-    capacity: int
 
     def __init__(self, file="sprites/garbage_truck.png"):
         self.capacity: int = 20
@@ -15,11 +10,20 @@ class Garbagetruck:
         self.image = pygame.image.load(file).convert_alpha()
         self.image = pygame.transform.scale(self.image, (32,32))
         self.position = [800, 500]
+        self.predicts: set = set()
+        self.state = None
         self.route = None
         self.scanner = None
         self.planner = None
         self.driver = None
 
+    def setPredicts(self, predicts):
+        self.predicts = predicts
+        return self
+
+    def getPredicts(self):
+        return self.predicts
+
     def getCapacity(self) -> int:
         return self.capacity
 

classes/Household.py

@@ -1,21 +1,12 @@
+from classes.Garbage import *
+
+
 class Household:
     def __init__(self):
         self.id: int = 0
         self.image: object = None
         self.position: tuple = None
-        self.neighbours: list = []
+        self.garbage: object = Garbage()
-        self.garbage: object = None
-
-    def setNeighbours(self, neighbours):
-        self.neighbours = neighbours
-        return self
-
-    def addNeighbour(self, neighbour):
-        self.neighbours.append(neighbour)
-        return self
-
-    def getNeighbours(self):
-        return self.neighbours
 
     def setPosition(self, position: tuple):
         self.position = position

classes/Junkyard.py

@@ -1,17 +0,0 @@
-class Junkyard:
-    def __init__(self):
-        self.id = 0
-        self.position = (1400, 500)
-        self.neighbours = []
-
-    def getPosition(self):
-        return self.position
-
-    def addNeighbour(self, neighbour):
-        self.neighbours.append(neighbour)
-
-    def getNeighbours(self):
-        return self.neighbours
-
-    def getId(self):
-        return self.id

classes/Tilemap.py

@@ -8,7 +8,7 @@ class Tilemap:
         self.size = size
         self.tileset = tileset
         self.map = np.zeros(size, dtype=int)
-        h, w = self.size
+        w, h = self.size
         self.image = pygame.Surface((32*w, 32*h))
         if rect:
             self.rect = pygame.Rect(rect)

classes/Trash.py

@@ -0,0 +1,48 @@
+typelist = ["paper", "metals_and_plastics", "mixed", "bio_waste", "glass"]
+
+
+class Trash:
+
+    def getWaga(self):
+        return self.waga
+
+    def setWaga(self, waga):
+        self.waga = waga
+        return self
+
+    def getImage(self):
+        return self.image
+
+    def setImage(self, image):
+        self.image = image
+        return self
+
+
+class Papier(Trash):
+    def __init__(self):
+        self.waga = 2
+        self.image = None
+
+
+class MetalPlastik(Trash):
+    def __init__(self):
+        self.waga = 3
+        self.image = None
+
+
+class Mixed(Trash):
+    def __init__(self):
+        self.waga = 1
+        self.image = None
+
+
+class Bio(Trash):
+    def __init__(self):
+        self.waga = 2
+        self.image = None
+
+
+class Szklo(Trash):
+    def __init__(self):
+        self.waga = 5
+        self.image = None

classes/Trashcan.py

@@ -4,18 +4,6 @@ class Trashcan:
         self.image: object = None
         self.position: tuple = None
         self.trashtype: str = None
-        self.neighbours: list = []
-
-    def setNeighbours(self, neighbours: list):
-        self.neighbours = neighbours
-        return self
-
-    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

generators.py

@@ -1,19 +1,20 @@
-from classes.Junkyard import *
 from classes.Trashcan import *
 from classes.Household import *
 from classes.Garbagetruck import *
+from classes.Tilemap import *
+from classes.Tileset import *
 from QOLfunc import *
 import pygame
 
 
-def trashcanGenerator(junkyard: Junkyard) -> list:
+def trashcanGenerator() -> list:
     typelist = ["paper", "metals_and_plastics", "mixed", "bio_waste", "glass"]
     trash_cans = [
-        {'position': (1600, 300), 'type': 'paper'},
+        {'position': (1, 0), 'type': 'paper'},
-        {'position': (1600, 500), 'type': 'metals_and_plastics'},
+        {'position': (1, 1), 'type': 'metals_and_plastics'},
-        {'position': (1600, 700), 'type': 'mixed'},
+        {'position': (1, 2), 'type': 'mixed'},
-        {'position': (1600, 900), 'type': 'bio_waste'},
+        {'position': (1, 3), 'type': 'bio_waste'},
-        {'position': (1600, 100), 'type': 'glass'},
+        {'position': (1, 4), 'type': 'glass'},
     ]
     trash_can_images = {
         'paper': pygame.image.load('sprites/trash_can_papier.jpg').convert_alpha(),
@@ -24,19 +25,17 @@ def trashcanGenerator(junkyard: Junkyard) -> list:
     }
     trashcans = []
     for key in trash_can_images:
-        trash_can_images[key] = pygame.transform.scale(trash_can_images[key], (90,90))
+        trash_can_images[key] = pygame.transform.scale(trash_can_images[key], (32,32))
     for i in range(5):
         trashcan = generateTrashcan(i, trash_can_images[typelist[i]], trash_cans[i]["position"], trash_cans[i]["type"])
-        trashcan.addNeighbour(junkyard)
-        junkyard.addNeighbour(trashcan)
         trashcans.append(trashcan)
 
     return trashcans
 
 
-def householdGenerator(junkyard):
+def householdGenerator():
-    new_house_size = (140, 120)
+    new_house_size = (32, 32)
-    house_positions = [(450, 100), (250, 250), (200, 700), (850, 800), (1000, 200), (1050, 700), (800, 100), (400, 850)]
+    house_positions = [(15, 5), (17, 5), (19, 5), (21, 5), (15, 8), (17, 8), (19, 8), (21, 8)]
     houses = []
     for i in range(8):
         house_image = pygame.image.load(f'sprites/house_{i}.jpg')
@@ -44,16 +43,4 @@ def householdGenerator(junkyard):
         house = generateHousehold(i, house_image, house_positions[i])
         houses.append(house)
 
-    for i in range(len(houses)):
-        if i % 2 == 0:
-            neigh = chooseNeighbours(2, i)
-        else:
-            neigh = chooseNeighbours(3, i)
-        for num in neigh:
-            if len(houses[i].getNeighbours()) < 3 and len(houses[num].getNeighbours()) < 3:
-                houses[i].addNeighbour(houses[num])
-                houses[num].addNeighbour(houses[i])
-        if i == 7 or i == 1:
-            houses[i].addNeighbour(junkyard)
-            junkyard.addNeighbour(houses[i])
     return houses

main.py

@@ -1,21 +1,15 @@
 from generators import *
 
+W = 960
+H = 640
+SIZE = (W, H)
 pygame.init()
-screen = pygame.display.set_mode((1800, 1000))
+screen = pygame.display.set_mode(SIZE)
-
+tilemap = Tilemap(Tileset("sprites/Tiles/1 Tiles/FieldsTile_38.png"), (30, 20))
-colors = {
-    "white": (255, 255, 255),
-    "black": (0, 0, 0),
-    "red": (255, 0, 0)
-}
-
-new_house_size = (140, 120)
-
-garbagetruck = Garbagetruck()
-junkyard = Junkyard()
-trashcans = trashcanGenerator(junkyard)
-houses = householdGenerator(junkyard)
 
+trashcans = trashcanGenerator()
+houses = householdGenerator()
+garbagetruck = Garbagetruck().setPredicts(extractPredicts(houses))
 
 running = True
 while running:
@@ -23,23 +17,9 @@ while running:
         if event.type == pygame.QUIT:
             running = False
 
-    # garbage_truck_position[0] += random.randint(-4, 4)
+    screen.fill((0, 0, 0))
-    # garbage_truck_position[1] += random.randint(-4, 4)
+    tilemap.render()
-
+    screen.blit(tilemap.image, tilemap.rect)
-    screen.fill(colors["white"])
+    pygame.display.update()
-    for trash_can in trashcans:
-        for neighbour in trash_can.getNeighbours():
-            pygame.draw.line(screen, colors["black"], trash_can.getPosition(), neighbour.getPosition(), 3)
-        screen.blit(trash_can.getImage(), trash_can.getPosition())
-    for house in houses:
-        for neighbour in house.getNeighbours():
-            if neighbour.getId() < house.getId():
-                pygame.draw.line(screen, colors["black"], house.getPosition(), neighbour.getPosition(), 3)
-    for house in houses:
-        screen.blit(house.getImage(), house.getPosition())
-    pygame.draw.circle(screen, colors["red"], junkyard.getPosition(), 10)
-
-    screen.blit(garbagetruck.getImage(), junkyard.getPosition())
-    pygame.display.flip()
 
 pygame.quit()