Przeniesienie zmiennych globalnych do osobnej klasy
This commit is contained in:
parent
e2924ae3c6
commit
592281ea2b
10
Shelf.py
10
Shelf.py
@ -1,17 +1,15 @@
|
|||||||
import pygame
|
import pygame
|
||||||
RECT_SIZE = 50
|
from Global_variables import Global_variables as G_var
|
||||||
SHELF_COLOR = (143, 68, 33)
|
|
||||||
|
|
||||||
|
|
||||||
class Shelf:
|
class Shelf:
|
||||||
def __init__(self, window, x, y):
|
def __init__(self, window, x, y):
|
||||||
self.window = window
|
self.window = window
|
||||||
self.width = RECT_SIZE
|
self.width = G_var().RECT_SIZE
|
||||||
self.length = 6*RECT_SIZE
|
self.length = 6*G_var().RECT_SIZE
|
||||||
self.x = x
|
self.x = x
|
||||||
self.y = y
|
self.y = y
|
||||||
self.block = pygame.Rect(self.x, self.y, self.width, self.length)
|
self.block = pygame.Rect(self.x, self.y, self.width, self.length)
|
||||||
|
|
||||||
def draw(self):
|
def draw(self):
|
||||||
pygame.draw.rect(self.window, SHELF_COLOR, self.block)
|
pygame.draw.rect(self.window, G_var().SHELF_COLOR, self.block)
|
||||||
# pygame.draw.line(self.window, (255, 255, 255), (self.x, self.y), (self.x, self.y + self.length))
|
# pygame.draw.line(self.window, (255, 255, 255), (self.x, self.y), (self.x, self.y + self.length))
|
||||||
|
12
Truck.py
12
Truck.py
@ -1,9 +1,7 @@
|
|||||||
|
|
||||||
import pygame
|
import pygame
|
||||||
from Environment import Environment
|
from Environment import Environment
|
||||||
from Package import Package
|
from Package import Package
|
||||||
RECT_SIZE = 50
|
from Global_variables import Global_variables as G_var
|
||||||
|
|
||||||
|
|
||||||
class Truck:
|
class Truck:
|
||||||
def __init__(self, window, ):
|
def __init__(self, window, ):
|
||||||
@ -25,19 +23,19 @@ class Truck:
|
|||||||
|
|
||||||
# moving the truck
|
# moving the truck
|
||||||
def move_right(self):
|
def move_right(self):
|
||||||
self.x += RECT_SIZE
|
self.x += G_var().RECT_SIZE
|
||||||
self.draw()
|
self.draw()
|
||||||
|
|
||||||
def move_left(self):
|
def move_left(self):
|
||||||
self.x -= RECT_SIZE
|
self.x -= G_var().RECT_SIZE
|
||||||
self.draw()
|
self.draw()
|
||||||
|
|
||||||
def move_up(self):
|
def move_up(self):
|
||||||
self.y -= RECT_SIZE
|
self.y -= G_var().RECT_SIZE
|
||||||
self.draw()
|
self.draw()
|
||||||
|
|
||||||
def move_down(self):
|
def move_down(self):
|
||||||
self.y += RECT_SIZE
|
self.y += G_var().RECT_SIZE
|
||||||
self.draw()
|
self.draw()
|
||||||
|
|
||||||
# def collision_with_shelves(self,x,y):
|
# def collision_with_shelves(self,x,y):
|
||||||
|
Loading…
Reference in New Issue
Block a user