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

egg now drawn on the description screen

Browse Source
This commit is contained in:
Nick Dyer 2021-06-04 00:33:02 -04:00
parent 4e0efbabd9
commit ba4df78d35
1 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pocket_friends/game_files/game.py
View File

@ -81,6 +81,8 @@ class SelectionEgg(pygame.sprite.Sprite):
def __init__(self, egg_color): def __init__(self, egg_color):
pygame.sprite.Sprite.__init__(self) pygame.sprite.Sprite.__init__(self)
self.egg_color = egg_color
# Loads the JSON file of the egg to read in data. # Loads the JSON file of the egg to read in data.
with open(script_dir + '/resources/data/egg_info/{0}.json'.format(egg_color), 'r') as save_file: with open(script_dir + '/resources/data/egg_info/{0}.json'.format(egg_color), 'r') as save_file:
json_file = json.load(save_file) json_file = json.load(save_file)
@ -331,9 +333,12 @@ def game():
submenu = 'main' submenu = 'main'
selected = 0 selected = 0
selected_color = ""
while running and game_state == 'egg_select': while running and game_state == 'egg_select':
all_sprites.empty() all_sprites.empty()
if submenu == 'main': if submenu == 'main':
# Creates and holds the egg objects in a list. # Creates and holds the egg objects in a list.
@ -442,11 +447,22 @@ def game():
cursor = pygame.image.load(script_dir + '/resources/images/clock_selector.png').convert_alpha() cursor = pygame.image.load(script_dir + '/resources/images/clock_selector.png').convert_alpha()
surface.blit(cursor, get_cursor_coords(selected)) surface.blit(cursor, get_cursor_coords(selected))
selected_color = eggs[selected].egg_color
draw() draw()
elif submenu == 'egg_info': elif submenu == 'egg_info':
# Draw the selected egg on screen
egg = SelectionEgg(selected_color)
egg.rect.x = 32
egg.rect.y = 3
all_sprites.add(egg)
while running and game_state == 'egg_select' and submenu == 'egg_info': while running and game_state == 'egg_select' and submenu == 'egg_info':
pre_handler() pre_handler()
for event in pygame.event.get(): for event in pygame.event.get():
if event.type == pygame.KEYDOWN: if event.type == pygame.KEYDOWN:
if event.key == Constants.buttons.get('a'): if event.key == Constants.buttons.get('a'):
@ -457,7 +473,7 @@ def game():
submenu = 'main' submenu = 'main'
# Quick debugging for which egg is selected. # Quick debugging for which egg is selected.
selection_debug = small_font.render('Egg {0}'.format(selected), False, (64, 64, 64)) selection_debug = small_font.render(egg.description, False, (64, 64, 64))
surface.blit(selection_debug, (5, 35)) surface.blit(selection_debug, (5, 35))
draw() draw()