Merge branch 'master' of github.com:lvl2/avocados
commit
6d142808e2
|
@ -104,11 +104,15 @@ class Avocado:
|
|||
if self.checkObstacle \
|
||||
and (self.rect.right < right and self.rect.left > left):
|
||||
self.checkObstacle = False
|
||||
# print(self.rect.bottom, top)
|
||||
# if self.rect.bottom > top:
|
||||
# self.vy = -self.vy
|
||||
|
||||
if self.checkObstacle \
|
||||
and ((self.rect.right > right and self.rect.left < right) \
|
||||
or (self.rect.left < left and self.rect.right > left)):
|
||||
self.vx = -self.vx
|
||||
if self.rect.bottom > top:
|
||||
self.vx = -self.vx
|
||||
|
||||
|
||||
def move(self):
|
||||
|
|
|
@ -12,11 +12,12 @@ class Crystal:
|
|||
def __init__(self, screen):
|
||||
self.screen = screen
|
||||
screen_width, screen_height = screen.get_size()
|
||||
self.rect = self.screen.get_rect()
|
||||
self.imageCenterX = self.rect.centerx
|
||||
self.imageCenterY = self.rect.centery
|
||||
screen_rect = self.screen.get_rect()
|
||||
self.imageCenterX = screen_rect.centerx
|
||||
self.imageCenterY = screen_rect.centery
|
||||
self.pos = (self.imageCenterX-100,self.imageCenterY-5,200,183)
|
||||
|
||||
|
||||
def getBoundaries(self):
|
||||
return self.pos
|
||||
|
||||
|
|
Loading…
Reference in New Issue