restructured directories to make more sense of modules and sub-modules

pocket_friends/game_files/surfaces/egg_select.py

@@ -1,7 +1,7 @@
 import pygame
 from . import sprites
-from pocket_friends.game_files.io_helpers.gpio_handler import Constants
-from ..io_helpers.input_handler import InputHandler
+import pocket_friends.game_files.io.gpio_handler as gpio_handler
+from ..io.input_handler import InputHandler
 
 
 class Surface(pygame.Surface):
@@ -133,15 +133,15 @@ class Surface(pygame.Surface):
 
         for event in pygame.event.get():
             if event.type == pygame.KEYDOWN:
-                if event.key == Constants.buttons.get('j_r'):
+                if event.key == gpio_handler.BUTTONS.get('j_r'):
                     self.sel_right()
-                if event.key == Constants.buttons.get('j_l'):
+                if event.key == gpio_handler.BUTTONS.get('j_l'):
                     self.sel_left()
-                if event.key == Constants.buttons.get('j_d'):
+                if event.key == gpio_handler.BUTTONS.get('j_d'):
                     self.sel_down()
-                if event.key == Constants.buttons.get('j_u'):
+                if event.key == gpio_handler.BUTTONS.get('j_u'):
                     self.sel_up()
-                if event.key == Constants.buttons.get('a'):
+                if event.key == gpio_handler.BUTTONS.get('a'):
                     self.additional_args = {'selected_egg': self.selected_color}
                     self.next_surface = 'selection_info'
                     self.running = False

pocket_friends/game_files/surfaces/resources/data/bloop_info/blue.json

@@ -1,5 +0,0 @@
-{
-  "description": "This is Blue! They are a easy going bloop, with a laid back personality that you will love! They are also easy to take care of, as they just enjoy living life!",
-  "contentedness": 4,
-  "metabolism": 5
-}

pocket_friends/game_files/surfaces/resources/data/bloop_info/dev_egg.json

@@ -1,5 +0,0 @@
-{
-  "description": "Dev egg description",
-  "contentedness": 4,
-  "metabolism": 4
-}

pocket_friends/game_files/surfaces/resources/data/bloop_info/rainbow.json

@@ -1,5 +0,0 @@
-{
-  "description": "Rainbow egg description",
-  "contentedness": 5,
-  "metabolism": 4
-}

pocket_friends/game_files/surfaces/resources/data/bloop_info/red.json

@@ -1,5 +0,0 @@
-{
-  "description": "Red egg description",
-  "contentedness": 5,
-  "metabolism": 5
-}

pocket_friends/game_files/surfaces/resources/images/bloops/blue/egg.json

@@ -1,5 +0,0 @@
-{
-  "width": 17,
-  "height": 17,
-  "frames": 17
-}

pocket_friends/game_files/surfaces/resources/images/bloops/dev_egg/baby.json

@@ -1,5 +0,0 @@
-{
-  "width": 14,
-  "height": 10,
-  "frames": 16
-}

pocket_friends/game_files/surfaces/resources/images/bloops/dev_egg/egg.json

@@ -1,5 +0,0 @@
-{
-  "width": 17,
-  "height": 17,
-  "frames": 16
-}

pocket_friends/game_files/surfaces/resources/images/bloops/rainbow/egg.json

@@ -1,5 +0,0 @@
-{
-  "width": 17,
-  "height": 17,
-  "frames": 48
-}

pocket_friends/game_files/surfaces/resources/images/bloops/red/egg.json

@@ -1,5 +0,0 @@
-{
-  "width": 17,
-  "height": 17,
-  "frames": 1
-}

pocket_friends/game_files/surfaces/resources/images/gui/popup_menu/apple.json

@@ -1,5 +0,0 @@
-{
-  "width": 9,
-  "height": 10,
-  "frames": 2
-}

pocket_friends/game_files/surfaces/resources/images/gui/popup_menu/bed.json

@@ -1,5 +0,0 @@
-{
-  "width": 11,
-  "height": 6,
-  "frames": 2
-}

pocket_friends/game_files/surfaces/resources/images/gui/popup_menu/controller.json

@@ -1,5 +0,0 @@
-{
-  "width": 12,
-  "height": 8,
-  "frames": 2
-}

pocket_friends/game_files/surfaces/resources/images/gui/popup_menu/dumbbell.json

@@ -1,5 +0,0 @@
-{
-  "width": 11,
-  "height": 8,
-  "frames": 2
-}

pocket_friends/game_files/surfaces/resources/images/gui/popup_menu/stats.json

@@ -1,5 +0,0 @@
-{
-  "width": 11,
-  "height": 9,
-  "frames": 2
-}

pocket_friends/game_files/surfaces/selection_info.py

@@ -1,8 +1,8 @@
 import pygame
 from . import sprites
-from pocket_friends.game_files.io_helpers.gpio_handler import Constants
+import pocket_friends.game_files.io.gpio_handler as gpio_handler
 from .sprites import SelectionEgg
-from ..io_helpers.input_handler import InputHandler
+from ..io.input_handler import InputHandler
 
 
 class Surface(pygame.Surface):
@@ -46,15 +46,15 @@ class Surface(pygame.Surface):
 
         for event in pygame.event.get():
             if event.type == pygame.KEYDOWN:
-                if event.key == Constants.buttons.get('j_d'):
+                if event.key == gpio_handler.BUTTONS.get('j_d'):
                     # Scroll down on the info screen.
                     self.info_text.scroll_down()
-                if event.key == Constants.buttons.get('j_u'):
+                if event.key == gpio_handler.BUTTONS.get('j_u'):
                     # Scroll up on the info screen.
                     self.info_text.scroll_up()
-                if event.key == Constants.buttons.get('a'):
+                if event.key == gpio_handler.BUTTONS.get('a'):
                     pass
-                if event.key == Constants.buttons.get('b'):
+                if event.key == gpio_handler.BUTTONS.get('b'):
                     self.running = False
                     self.additional_args = {'selected_color': self.selected_egg}
                     self.next_surface = 'egg_select'