ndyer/pocket-friends
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed mistake in stage calulation, age now ticks with time

Browse Source
This commit is contained in:
Nick Dyer 2021-06-05 22:10:47 -04:00
parent b533cde549
commit ef6ce5118c
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pocket_friends/game_files/game.py
View File

@ -92,7 +92,7 @@ class PlaygroundFriend(pygame.sprite.Sprite):
self.direction = 0 self.direction = 0
# Draw the correct bloop depending on the stage # Draw the correct bloop depending on the stage
if self.evolution_stage != 0: if self.evolution_stage == 0:
image_directory = script_dir + '/resources/images/bloops/{0}/egg_images'.format(self.bloop) image_directory = script_dir + '/resources/images/bloops/{0}/egg_images'.format(self.bloop)
elif self.evolution_stage == 1: elif self.evolution_stage == 1:
image_directory = script_dir + '/resources/images/bloops/{0}/baby_images'.format(self.bloop) image_directory = script_dir + '/resources/images/bloops/{0}/baby_images'.format(self.bloop)
@ -120,7 +120,7 @@ class PlaygroundFriend(pygame.sprite.Sprite):
self.animation_frames = game_fps / animation_fps self.animation_frames = game_fps / animation_fps
self.current_frame = 0 self.current_frame = 0
def update_frame_dependent(self): def update(self):
""" """
Takes the images loaded and animates it, spacing it out equally for the framerate. Takes the images loaded and animates it, spacing it out equally for the framerate.
""" """
@ -135,7 +135,7 @@ class PlaygroundFriend(pygame.sprite.Sprite):
self.image = self.images[self.index] self.image = self.images[self.index]
# Move the sprite so long as it is not in the egg stage # Move the sprite so long as it is not in the egg stage
if self.evolution_stage == 0: if self.evolution_stage != 0:
if self.rect.x < margins: if self.rect.x < margins:
self.direction = 1 self.direction = 1
elif self.rect.x > game_res - margins - self.rect.width: elif self.rect.x > game_res - margins - self.rect.width:
@ -146,11 +146,7 @@ class PlaygroundFriend(pygame.sprite.Sprite):
else: else:
self.rect.x += movement_amount self.rect.x += movement_amount
def update(self): self.age += 1
"""
Updates the sprite object.
"""
self.update_frame_dependent()
class SelectionEgg(pygame.sprite.Sprite): class SelectionEgg(pygame.sprite.Sprite):