Fixed collision hang
This commit is contained in:
+1
-3
@@ -17,7 +17,6 @@ from Cloud import Cloud
|
|||||||
from Floor import Floor
|
from Floor import Floor
|
||||||
from EndSceen import EndSceen
|
from EndSceen import EndSceen
|
||||||
|
|
||||||
|
|
||||||
class Drakora():
|
class Drakora():
|
||||||
def getGameSpeed(self):
|
def getGameSpeed(self):
|
||||||
return self.__gameSpeed
|
return self.__gameSpeed
|
||||||
@@ -256,8 +255,7 @@ class Drakora():
|
|||||||
|
|
||||||
if self.player.isOnFloor:
|
if self.player.isOnFloor:
|
||||||
while pygame.sprite.spritecollideany(self.player, self.floors):
|
while pygame.sprite.spritecollideany(self.player, self.floors):
|
||||||
self.player.rect.y -= 0.1
|
self.player.moveDown(-0.1)
|
||||||
self.player._Player__doubleY -= 0.1
|
|
||||||
|
|
||||||
|
|
||||||
def doCheats(self):
|
def doCheats(self):
|
||||||
|
|||||||
@@ -145,6 +145,11 @@ class Player(pygame.sprite.Sprite):
|
|||||||
|
|
||||||
def calcMaxHoverCount(self, speed):
|
def calcMaxHoverCount(self, speed):
|
||||||
return round(-0.44 + 0.079*math.log(speed) + 49.42 * (1/math.sqrt(speed)))
|
return round(-0.44 + 0.079*math.log(speed) + 49.42 * (1/math.sqrt(speed)))
|
||||||
|
|
||||||
|
|
||||||
|
def moveDown(self, value):
|
||||||
|
self.__doubleY += value
|
||||||
|
self.rect.y = self.__doubleY
|
||||||
|
|
||||||
|
|
||||||
def update(self):
|
def update(self):
|
||||||
@@ -185,8 +190,7 @@ class Player(pygame.sprite.Sprite):
|
|||||||
else:
|
else:
|
||||||
self.speed += 0.07 * gameSpeed
|
self.speed += 0.07 * gameSpeed
|
||||||
|
|
||||||
self.__doubleY += self.speed
|
self.moveDown(self.speed)
|
||||||
self.rect.y = self.__doubleY
|
|
||||||
|
|
||||||
for collisionBox in self.collisionBoxes:
|
for collisionBox in self.collisionBoxes:
|
||||||
collisionBox.setY(self.rect.y)
|
collisionBox.setY(self.rect.y)
|
||||||
|
|||||||
Reference in New Issue
Block a user