diff --git a/pocket_friends/__init__.py b/pocket_friends/__init__.py index e5a9890..cb23a34 100644 --- a/pocket_friends/__init__.py +++ b/pocket_friends/__init__.py @@ -1,4 +1,4 @@ """Pocket Friends is a game where you raise your own little pocket friend! These pocket friends, called bloops, are great little companions to have! You can feed them, play with them, and watch them grow up!""" -__version__ = 'dev_0.0.3' +__version__ = 'dev_0.0.4' diff --git a/pocket_friends/__main__.py b/pocket_friends/__main__.py index 4c55047..7347b8a 100644 --- a/pocket_friends/__main__.py +++ b/pocket_friends/__main__.py @@ -5,7 +5,7 @@ import os import pygame import sys from pathlib import Path -import pocket_friends.game_files.game as game +import pocket_friends.game as game if __name__ == '__main__': enable_dev = False diff --git a/pocket_friends/game_files/elements/__init__.py b/pocket_friends/elements/__init__.py similarity index 100% rename from pocket_friends/game_files/elements/__init__.py rename to pocket_friends/elements/__init__.py diff --git a/pocket_friends/game_files/elements/sprites.py b/pocket_friends/elements/sprites.py similarity index 100% rename from pocket_friends/game_files/elements/sprites.py rename to pocket_friends/elements/sprites.py diff --git a/pocket_friends/game_files/elements/surface.py b/pocket_friends/elements/surface.py similarity index 100% rename from pocket_friends/game_files/elements/surface.py rename to pocket_friends/elements/surface.py diff --git a/pocket_friends/game_files/game.py b/pocket_friends/game.py similarity index 98% rename from pocket_friends/game_files/game.py rename to pocket_friends/game.py index 19ebd74..fc38328 100644 --- a/pocket_friends/game_files/game.py +++ b/pocket_friends/game.py @@ -14,7 +14,7 @@ valid_surfaces = [ # Add all the surface modules to a dictionary for easy switching surface_modules = {} for module in valid_surfaces: - surface_modules[module] = importlib.import_module('pocket_friends.game_files.surfaces.{0}'.format(module)) + surface_modules[module] = importlib.import_module('pocket_friends.surfaces.{0}'.format(module)) starting_surface = 'title' # FPS for the game to run at. diff --git a/pocket_friends/game_files/io/__init__.py b/pocket_friends/io/__init__.py similarity index 100% rename from pocket_friends/game_files/io/__init__.py rename to pocket_friends/io/__init__.py diff --git a/pocket_friends/game_files/io/data.py b/pocket_friends/io/data.py similarity index 100% rename from pocket_friends/game_files/io/data.py rename to pocket_friends/io/data.py diff --git a/pocket_friends/game_files/io/input_handler.py b/pocket_friends/io/input_handler.py similarity index 100% rename from pocket_friends/game_files/io/input_handler.py rename to pocket_friends/io/input_handler.py diff --git a/pocket_friends/game_files/resources/data/bloop_info/blue.json b/pocket_friends/resources/data/bloop_info/blue.json similarity index 100% rename from pocket_friends/game_files/resources/data/bloop_info/blue.json rename to pocket_friends/resources/data/bloop_info/blue.json diff --git a/pocket_friends/game_files/resources/data/bloop_info/dev_egg.json b/pocket_friends/resources/data/bloop_info/dev_egg.json similarity index 100% rename from pocket_friends/game_files/resources/data/bloop_info/dev_egg.json rename to pocket_friends/resources/data/bloop_info/dev_egg.json diff --git a/pocket_friends/game_files/resources/data/bloop_info/rainbow.json b/pocket_friends/resources/data/bloop_info/rainbow.json similarity index 100% rename from pocket_friends/game_files/resources/data/bloop_info/rainbow.json rename to pocket_friends/resources/data/bloop_info/rainbow.json diff --git a/pocket_friends/game_files/resources/data/bloop_info/red.json b/pocket_friends/resources/data/bloop_info/red.json similarity index 100% rename from pocket_friends/game_files/resources/data/bloop_info/red.json rename to pocket_friends/resources/data/bloop_info/red.json diff --git a/pocket_friends/game_files/resources/fonts/5Pts5.ttf b/pocket_friends/resources/fonts/5Pts5.ttf similarity index 100% rename from pocket_friends/game_files/resources/fonts/5Pts5.ttf rename to pocket_friends/resources/fonts/5Pts5.ttf diff --git a/pocket_friends/game_files/resources/icon/icon.ico b/pocket_friends/resources/icon/icon.ico similarity index 100% rename from pocket_friends/game_files/resources/icon/icon.ico rename to pocket_friends/resources/icon/icon.ico diff --git a/pocket_friends/game_files/resources/icon/icon.png b/pocket_friends/resources/icon/icon.png similarity index 100% rename from pocket_friends/game_files/resources/icon/icon.png rename to pocket_friends/resources/icon/icon.png diff --git a/pocket_friends/game_files/resources/images/bg.png b/pocket_friends/resources/images/bg.png similarity index 100% rename from pocket_friends/game_files/resources/images/bg.png rename to pocket_friends/resources/images/bg.png diff --git a/pocket_friends/game_files/resources/images/bloops/_postponed/green/green.png b/pocket_friends/resources/images/bloops/_postponed/green/green.png similarity index 100% rename from pocket_friends/game_files/resources/images/bloops/_postponed/green/green.png rename to pocket_friends/resources/images/bloops/_postponed/green/green.png diff --git a/pocket_friends/game_files/resources/images/bloops/_postponed/indigo/indigo.png b/pocket_friends/resources/images/bloops/_postponed/indigo/indigo.png similarity index 100% rename from pocket_friends/game_files/resources/images/bloops/_postponed/indigo/indigo.png rename to pocket_friends/resources/images/bloops/_postponed/indigo/indigo.png diff --git a/pocket_friends/game_files/resources/images/bloops/_postponed/orange/orange.png b/pocket_friends/resources/images/bloops/_postponed/orange/orange.png similarity index 100% rename from pocket_friends/game_files/resources/images/bloops/_postponed/orange/orange.png rename to pocket_friends/resources/images/bloops/_postponed/orange/orange.png diff --git a/pocket_friends/game_files/resources/images/bloops/_postponed/violet/violet.png b/pocket_friends/resources/images/bloops/_postponed/violet/violet.png similarity index 100% rename from pocket_friends/game_files/resources/images/bloops/_postponed/violet/violet.png rename to pocket_friends/resources/images/bloops/_postponed/violet/violet.png diff --git a/pocket_friends/game_files/resources/images/bloops/_postponed/white/white.png b/pocket_friends/resources/images/bloops/_postponed/white/white.png similarity index 100% rename from pocket_friends/game_files/resources/images/bloops/_postponed/white/white.png rename to pocket_friends/resources/images/bloops/_postponed/white/white.png diff --git a/pocket_friends/game_files/resources/images/bloops/_postponed/yellow/yellow.png b/pocket_friends/resources/images/bloops/_postponed/yellow/yellow.png similarity index 100% rename from pocket_friends/game_files/resources/images/bloops/_postponed/yellow/yellow.png rename to pocket_friends/resources/images/bloops/_postponed/yellow/yellow.png diff --git a/pocket_friends/game_files/resources/images/bloops/blue/egg.json b/pocket_friends/resources/images/bloops/blue/egg.json similarity index 100% rename from pocket_friends/game_files/resources/images/bloops/blue/egg.json rename to pocket_friends/resources/images/bloops/blue/egg.json diff --git a/pocket_friends/game_files/resources/images/bloops/blue/egg.png b/pocket_friends/resources/images/bloops/blue/egg.png similarity index 100% rename from pocket_friends/game_files/resources/images/bloops/blue/egg.png rename to pocket_friends/resources/images/bloops/blue/egg.png diff --git a/pocket_friends/game_files/resources/images/bloops/dev_egg/baby.json b/pocket_friends/resources/images/bloops/dev_egg/baby.json similarity index 100% rename from pocket_friends/game_files/resources/images/bloops/dev_egg/baby.json rename to pocket_friends/resources/images/bloops/dev_egg/baby.json diff --git a/pocket_friends/game_files/resources/images/bloops/dev_egg/baby.png b/pocket_friends/resources/images/bloops/dev_egg/baby.png similarity index 100% rename from pocket_friends/game_files/resources/images/bloops/dev_egg/baby.png rename to pocket_friends/resources/images/bloops/dev_egg/baby.png diff --git a/pocket_friends/game_files/resources/images/bloops/dev_egg/egg.json b/pocket_friends/resources/images/bloops/dev_egg/egg.json similarity index 100% rename from pocket_friends/game_files/resources/images/bloops/dev_egg/egg.json rename to pocket_friends/resources/images/bloops/dev_egg/egg.json diff --git a/pocket_friends/game_files/resources/images/bloops/dev_egg/egg.png b/pocket_friends/resources/images/bloops/dev_egg/egg.png similarity index 100% rename from pocket_friends/game_files/resources/images/bloops/dev_egg/egg.png rename to pocket_friends/resources/images/bloops/dev_egg/egg.png diff --git a/pocket_friends/game_files/resources/images/bloops/rainbow/egg.json b/pocket_friends/resources/images/bloops/rainbow/egg.json similarity index 100% rename from pocket_friends/game_files/resources/images/bloops/rainbow/egg.json rename to pocket_friends/resources/images/bloops/rainbow/egg.json diff --git a/pocket_friends/game_files/resources/images/bloops/rainbow/egg.png b/pocket_friends/resources/images/bloops/rainbow/egg.png similarity index 100% rename from pocket_friends/game_files/resources/images/bloops/rainbow/egg.png rename to pocket_friends/resources/images/bloops/rainbow/egg.png diff --git a/pocket_friends/game_files/resources/images/bloops/red/egg.json b/pocket_friends/resources/images/bloops/red/egg.json similarity index 100% rename from pocket_friends/game_files/resources/images/bloops/red/egg.json rename to pocket_friends/resources/images/bloops/red/egg.json diff --git a/pocket_friends/game_files/resources/images/bloops/red/egg.png b/pocket_friends/resources/images/bloops/red/egg.png similarity index 100% rename from pocket_friends/game_files/resources/images/bloops/red/egg.png rename to pocket_friends/resources/images/bloops/red/egg.png diff --git a/pocket_friends/game_files/resources/images/debug/invalid.png b/pocket_friends/resources/images/debug/invalid.png similarity index 100% rename from pocket_friends/game_files/resources/images/debug/invalid.png rename to pocket_friends/resources/images/debug/invalid.png diff --git a/pocket_friends/game_files/resources/images/gui/apple.png b/pocket_friends/resources/images/gui/apple.png similarity index 100% rename from pocket_friends/game_files/resources/images/gui/apple.png rename to pocket_friends/resources/images/gui/apple.png diff --git a/pocket_friends/game_files/resources/images/gui/bar_graphic.png b/pocket_friends/resources/images/gui/bar_graphic.png similarity index 100% rename from pocket_friends/game_files/resources/images/gui/bar_graphic.png rename to pocket_friends/resources/images/gui/bar_graphic.png diff --git a/pocket_friends/game_files/resources/images/gui/bar_outline.png b/pocket_friends/resources/images/gui/bar_outline.png similarity index 100% rename from pocket_friends/game_files/resources/images/gui/bar_outline.png rename to pocket_friends/resources/images/gui/bar_outline.png diff --git a/pocket_friends/game_files/resources/images/gui/blank_star.png b/pocket_friends/resources/images/gui/blank_star.png similarity index 100% rename from pocket_friends/game_files/resources/images/gui/blank_star.png rename to pocket_friends/resources/images/gui/blank_star.png diff --git a/pocket_friends/game_files/resources/images/gui/down_arrow.png b/pocket_friends/resources/images/gui/down_arrow.png similarity index 100% rename from pocket_friends/game_files/resources/images/gui/down_arrow.png rename to pocket_friends/resources/images/gui/down_arrow.png diff --git a/pocket_friends/game_files/resources/images/gui/egg_selector.png b/pocket_friends/resources/images/gui/egg_selector.png similarity index 100% rename from pocket_friends/game_files/resources/images/gui/egg_selector.png rename to pocket_friends/resources/images/gui/egg_selector.png diff --git a/pocket_friends/game_files/resources/images/gui/popup_menu/apple.json b/pocket_friends/resources/images/gui/popup_menu/apple.json similarity index 100% rename from pocket_friends/game_files/resources/images/gui/popup_menu/apple.json rename to pocket_friends/resources/images/gui/popup_menu/apple.json diff --git a/pocket_friends/game_files/resources/images/gui/popup_menu/apple.png b/pocket_friends/resources/images/gui/popup_menu/apple.png similarity index 100% rename from pocket_friends/game_files/resources/images/gui/popup_menu/apple.png rename to pocket_friends/resources/images/gui/popup_menu/apple.png diff --git a/pocket_friends/game_files/resources/images/gui/popup_menu/bed.json b/pocket_friends/resources/images/gui/popup_menu/bed.json similarity index 100% rename from pocket_friends/game_files/resources/images/gui/popup_menu/bed.json rename to pocket_friends/resources/images/gui/popup_menu/bed.json diff --git a/pocket_friends/game_files/resources/images/gui/popup_menu/bed.png b/pocket_friends/resources/images/gui/popup_menu/bed.png similarity index 100% rename from pocket_friends/game_files/resources/images/gui/popup_menu/bed.png rename to pocket_friends/resources/images/gui/popup_menu/bed.png diff --git a/pocket_friends/game_files/resources/images/gui/popup_menu/controller.json b/pocket_friends/resources/images/gui/popup_menu/controller.json similarity index 100% rename from pocket_friends/game_files/resources/images/gui/popup_menu/controller.json rename to pocket_friends/resources/images/gui/popup_menu/controller.json diff --git a/pocket_friends/game_files/resources/images/gui/popup_menu/controller.png b/pocket_friends/resources/images/gui/popup_menu/controller.png similarity index 100% rename from pocket_friends/game_files/resources/images/gui/popup_menu/controller.png rename to pocket_friends/resources/images/gui/popup_menu/controller.png diff --git a/pocket_friends/game_files/resources/images/gui/popup_menu/dumbbell.json b/pocket_friends/resources/images/gui/popup_menu/dumbbell.json similarity index 100% rename from pocket_friends/game_files/resources/images/gui/popup_menu/dumbbell.json rename to pocket_friends/resources/images/gui/popup_menu/dumbbell.json diff --git a/pocket_friends/game_files/resources/images/gui/popup_menu/dumbbell.png b/pocket_friends/resources/images/gui/popup_menu/dumbbell.png similarity index 100% rename from pocket_friends/game_files/resources/images/gui/popup_menu/dumbbell.png rename to pocket_friends/resources/images/gui/popup_menu/dumbbell.png diff --git a/pocket_friends/game_files/resources/images/gui/popup_menu/frame.png b/pocket_friends/resources/images/gui/popup_menu/frame.png similarity index 100% rename from pocket_friends/game_files/resources/images/gui/popup_menu/frame.png rename to pocket_friends/resources/images/gui/popup_menu/frame.png diff --git a/pocket_friends/game_files/resources/images/gui/popup_menu/stats.json b/pocket_friends/resources/images/gui/popup_menu/stats.json similarity index 100% rename from pocket_friends/game_files/resources/images/gui/popup_menu/stats.json rename to pocket_friends/resources/images/gui/popup_menu/stats.json diff --git a/pocket_friends/game_files/resources/images/gui/popup_menu/stats.png b/pocket_friends/resources/images/gui/popup_menu/stats.png similarity index 100% rename from pocket_friends/game_files/resources/images/gui/popup_menu/stats.png rename to pocket_friends/resources/images/gui/popup_menu/stats.png diff --git a/pocket_friends/game_files/resources/images/gui/smiley.png b/pocket_friends/resources/images/gui/smiley.png similarity index 100% rename from pocket_friends/game_files/resources/images/gui/smiley.png rename to pocket_friends/resources/images/gui/smiley.png diff --git a/pocket_friends/game_files/resources/images/gui/star.png b/pocket_friends/resources/images/gui/star.png similarity index 100% rename from pocket_friends/game_files/resources/images/gui/star.png rename to pocket_friends/resources/images/gui/star.png diff --git a/pocket_friends/game_files/resources/images/gui/up_arrow.png b/pocket_friends/resources/images/gui/up_arrow.png similarity index 100% rename from pocket_friends/game_files/resources/images/gui/up_arrow.png rename to pocket_friends/resources/images/gui/up_arrow.png diff --git a/pocket_friends/game_files/resources/images/promotional.png b/pocket_friends/resources/images/promotional.png similarity index 100% rename from pocket_friends/game_files/resources/images/promotional.png rename to pocket_friends/resources/images/promotional.png diff --git a/pocket_friends/game_files/resources/images/title.png b/pocket_friends/resources/images/title.png similarity index 100% rename from pocket_friends/game_files/resources/images/title.png rename to pocket_friends/resources/images/title.png diff --git a/pocket_friends/game_files/surfaces/__init__.py b/pocket_friends/surfaces/__init__.py similarity index 100% rename from pocket_friends/game_files/surfaces/__init__.py rename to pocket_friends/surfaces/__init__.py diff --git a/pocket_friends/game_files/surfaces/egg_select.py b/pocket_friends/surfaces/egg_select.py similarity index 98% rename from pocket_friends/game_files/surfaces/egg_select.py rename to pocket_friends/surfaces/egg_select.py index bc8edcf..525dac0 100644 --- a/pocket_friends/game_files/surfaces/egg_select.py +++ b/pocket_friends/surfaces/egg_select.py @@ -1,5 +1,7 @@ import pygame -from ..elements import sprites, surface +from pocket_friends.elements import sprites +from pocket_friends.elements import surface + class Surface(surface.GameSurface): def __init__(self, game_res, resources_dir, game_fps, **kwargs): diff --git a/pocket_friends/game_files/surfaces/error_screen.py b/pocket_friends/surfaces/error_screen.py similarity index 90% rename from pocket_friends/game_files/surfaces/error_screen.py rename to pocket_friends/surfaces/error_screen.py index 026a12a..1aa1800 100644 --- a/pocket_friends/game_files/surfaces/error_screen.py +++ b/pocket_friends/surfaces/error_screen.py @@ -1,6 +1,5 @@ import pygame -from ..elements import surface -from pocket_friends.game_files.io.input_handler import InputHandler +from pocket_friends.elements import surface class Surface(surface.GameSurface): diff --git a/pocket_friends/game_files/surfaces/selection_info.py b/pocket_friends/surfaces/selection_info.py similarity index 95% rename from pocket_friends/game_files/surfaces/selection_info.py rename to pocket_friends/surfaces/selection_info.py index 071c6f4..3d9bb30 100644 --- a/pocket_friends/game_files/surfaces/selection_info.py +++ b/pocket_friends/surfaces/selection_info.py @@ -1,6 +1,6 @@ import pygame -from ..elements import sprites, surface -from ..io.input_handler import InputHandler +from pocket_friends.elements import sprites +from pocket_friends.elements import surface class Surface(surface.GameSurface): diff --git a/pocket_friends/game_files/surfaces/title.py b/pocket_friends/surfaces/title.py similarity index 93% rename from pocket_friends/game_files/surfaces/title.py rename to pocket_friends/surfaces/title.py index 9f05801..57087c6 100644 --- a/pocket_friends/game_files/surfaces/title.py +++ b/pocket_friends/surfaces/title.py @@ -1,5 +1,5 @@ import pygame -from ..elements import surface +from pocket_friends.elements import surface class Surface(surface.GameSurface):