s464968/AIprojekt-wozek
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixes to placing packages

Browse Source
This commit is contained in:
tonywesoly 2022-04-25 17:58:51 +02:00
parent bcc40c37e1
commit fb6ebb1d7d
4 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Environment.py
View File

@ -2,7 +2,6 @@ from Empty import Empty
from Moving_truck import Moving_truck from Moving_truck import Moving_truck
from Package import Package from Package import Package
from Package_types import Package_types from Package_types import Package_types
from Placed_package import Placed_package
from Shelf import Shelf from Shelf import Shelf
import pygame import pygame
import random import random

7
Moving_truck.py
View File

@ -1,6 +1,5 @@
from Empty import Empty from Empty import Empty
from Package import Package from Package import Package
from Placed_package import Placed_package
from Shelf import Shelf from Shelf import Shelf
@ -16,7 +15,7 @@ class Moving_truck:
field_to_move_to = self.enviroment_2d[truck_x+x][truck_y+y] field_to_move_to = self.enviroment_2d[truck_x+x][truck_y+y]
if isinstance(field_to_move_to, Empty): if isinstance(field_to_move_to, Empty):
self.swap_fields(truck_x, truck_y, truck_x+x, truck_y+y) self.swap_fields(truck_x, truck_y, truck_x+x, truck_y+y)
elif isinstance(field_to_move_to, Package) and not isinstance(field_to_move_to, Placed_package): elif isinstance(field_to_move_to, Package) and not field_to_move_to.is_placed:
self.move_truck_with_package(x, y) self.move_truck_with_package(x, y)
def move_truck_with_package(self, x, y): def move_truck_with_package(self, x, y):
@ -38,8 +37,10 @@ class Moving_truck:
truck_x = self.truck.x truck_x = self.truck.x
truck_y = self.truck.y truck_y = self.truck.y
package = self.enviroment_2d[truck_x+x][truck_y+y] package = self.enviroment_2d[truck_x+x][truck_y+y]
# self.enviroment_2d[truck_x+x][truck_y +
# y] = Placed_package(package)
self.enviroment_2d[truck_x+x][truck_y + self.enviroment_2d[truck_x+x][truck_y +
y] = Placed_package(package) y].is_placed = True
self.move_without_swapping( self.move_without_swapping(
truck_x+x, truck_y+y, truck_x+(x*2), truck_y+(y*2)) truck_x+x, truck_y+y, truck_x+(x*2), truck_y+(y*2))
self.move_without_swapping(truck_x, truck_y, truck_x+x, truck_y+y) self.move_without_swapping(truck_x, truck_y, truck_x+x, truck_y+y)

1
Package.py
View File

@ -12,6 +12,7 @@ class Package(Field):
Field.__init__(self, window, x, y) Field.__init__(self, window, x, y)
self.mark_image = self.get_marking_photo() self.mark_image = self.get_marking_photo()
self.type = random.choice(list(Package_types)) self.type = random.choice(list(Package_types))
self.is_placed = False
def get_marking_photo(self): def get_marking_photo(self):
file_path_type = ["resources/package_markings/*.jpg"] file_path_type = ["resources/package_markings/*.jpg"]

7
Placed_package.py
View File

@ -1,7 +0,0 @@
from Package import Package
class Placed_package(Package):
def __init__(self, package):
Package.__init__(self, package.window, package.x, package.y)
self.type = package.type