From 6c52458f41746ce3d1b361078f56c65171588d86 Mon Sep 17 00:00:00 2001 From: Nick Dyer Date: Sat, 5 Jun 2021 18:05:27 -0400 Subject: [PATCH] revised file structure to be more organized --- pocket_friends/game_files/game.py | 4 ++-- .../data/{egg_info => bloop_info}/blue.json | 0 .../data/{egg_info => bloop_info}/rainbow.json | 0 .../data/{egg_info => bloop_info}/red.json | 0 .../blue => bloops/blue/egg_images}/blue.png | Bin .../dev_egg/egg_images/0.png} | Bin .../dev_egg/egg_images/1.png} | Bin .../images/{egg_images => bloops}/green/green.png | Bin .../images/{egg_images => bloops}/indigo/indigo.png | Bin .../images/{egg_images => bloops}/orange/orange.png | Bin .../rainbow/egg_images}/rainbow.png | Bin .../red => bloops/red/egg_images}/red.png | Bin .../images/{egg_images => bloops}/violet/violet.png | Bin .../images/{egg_images => bloops}/white/white.png | Bin .../images/{egg_images => bloops}/yellow/yellow.png | Bin 15 files changed, 2 insertions(+), 2 deletions(-) rename pocket_friends/game_files/resources/data/{egg_info => bloop_info}/blue.json (100%) rename pocket_friends/game_files/resources/data/{egg_info => bloop_info}/rainbow.json (100%) rename pocket_friends/game_files/resources/data/{egg_info => bloop_info}/red.json (100%) rename pocket_friends/game_files/resources/images/{egg_images/blue => bloops/blue/egg_images}/blue.png (100%) rename pocket_friends/game_files/resources/images/{egg_images/dev_egg/dev_egg_0.png => bloops/dev_egg/egg_images/0.png} (100%) rename pocket_friends/game_files/resources/images/{egg_images/dev_egg/dev_egg_1.png => bloops/dev_egg/egg_images/1.png} (100%) rename pocket_friends/game_files/resources/images/{egg_images => bloops}/green/green.png (100%) rename pocket_friends/game_files/resources/images/{egg_images => bloops}/indigo/indigo.png (100%) rename pocket_friends/game_files/resources/images/{egg_images => bloops}/orange/orange.png (100%) rename pocket_friends/game_files/resources/images/{egg_images/rainbow => bloops/rainbow/egg_images}/rainbow.png (100%) rename pocket_friends/game_files/resources/images/{egg_images/red => bloops/red/egg_images}/red.png (100%) rename pocket_friends/game_files/resources/images/{egg_images => bloops}/violet/violet.png (100%) rename pocket_friends/game_files/resources/images/{egg_images => bloops}/white/white.png (100%) rename pocket_friends/game_files/resources/images/{egg_images => bloops}/yellow/yellow.png (100%) diff --git a/pocket_friends/game_files/game.py b/pocket_friends/game_files/game.py index a0e41ca..53ebab4 100644 --- a/pocket_friends/game_files/game.py +++ b/pocket_friends/game_files/game.py @@ -84,10 +84,10 @@ class SelectionEgg(pygame.sprite.Sprite): self.egg_color = egg_color # 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/bloop_info/{0}.json'.format(egg_color), 'r') as save_file: json_file = json.load(save_file) save_file.close() - image_directory = script_dir + '/resources/images/egg_images/{0}'.format(egg_color) + image_directory = script_dir + '/resources/images/bloops/{0}/egg_images'.format(egg_color) # Gets the description off the egg from the JSON file. self.description = json_file.get('description') diff --git a/pocket_friends/game_files/resources/data/egg_info/blue.json b/pocket_friends/game_files/resources/data/bloop_info/blue.json similarity index 100% rename from pocket_friends/game_files/resources/data/egg_info/blue.json rename to pocket_friends/game_files/resources/data/bloop_info/blue.json diff --git a/pocket_friends/game_files/resources/data/egg_info/rainbow.json b/pocket_friends/game_files/resources/data/bloop_info/rainbow.json similarity index 100% rename from pocket_friends/game_files/resources/data/egg_info/rainbow.json rename to pocket_friends/game_files/resources/data/bloop_info/rainbow.json diff --git a/pocket_friends/game_files/resources/data/egg_info/red.json b/pocket_friends/game_files/resources/data/bloop_info/red.json similarity index 100% rename from pocket_friends/game_files/resources/data/egg_info/red.json rename to pocket_friends/game_files/resources/data/bloop_info/red.json diff --git a/pocket_friends/game_files/resources/images/egg_images/blue/blue.png b/pocket_friends/game_files/resources/images/bloops/blue/egg_images/blue.png similarity index 100% rename from pocket_friends/game_files/resources/images/egg_images/blue/blue.png rename to pocket_friends/game_files/resources/images/bloops/blue/egg_images/blue.png diff --git a/pocket_friends/game_files/resources/images/egg_images/dev_egg/dev_egg_0.png b/pocket_friends/game_files/resources/images/bloops/dev_egg/egg_images/0.png similarity index 100% rename from pocket_friends/game_files/resources/images/egg_images/dev_egg/dev_egg_0.png rename to pocket_friends/game_files/resources/images/bloops/dev_egg/egg_images/0.png diff --git a/pocket_friends/game_files/resources/images/egg_images/dev_egg/dev_egg_1.png b/pocket_friends/game_files/resources/images/bloops/dev_egg/egg_images/1.png similarity index 100% rename from pocket_friends/game_files/resources/images/egg_images/dev_egg/dev_egg_1.png rename to pocket_friends/game_files/resources/images/bloops/dev_egg/egg_images/1.png diff --git a/pocket_friends/game_files/resources/images/egg_images/green/green.png b/pocket_friends/game_files/resources/images/bloops/green/green.png similarity index 100% rename from pocket_friends/game_files/resources/images/egg_images/green/green.png rename to pocket_friends/game_files/resources/images/bloops/green/green.png diff --git a/pocket_friends/game_files/resources/images/egg_images/indigo/indigo.png b/pocket_friends/game_files/resources/images/bloops/indigo/indigo.png similarity index 100% rename from pocket_friends/game_files/resources/images/egg_images/indigo/indigo.png rename to pocket_friends/game_files/resources/images/bloops/indigo/indigo.png diff --git a/pocket_friends/game_files/resources/images/egg_images/orange/orange.png b/pocket_friends/game_files/resources/images/bloops/orange/orange.png similarity index 100% rename from pocket_friends/game_files/resources/images/egg_images/orange/orange.png rename to pocket_friends/game_files/resources/images/bloops/orange/orange.png diff --git a/pocket_friends/game_files/resources/images/egg_images/rainbow/rainbow.png b/pocket_friends/game_files/resources/images/bloops/rainbow/egg_images/rainbow.png similarity index 100% rename from pocket_friends/game_files/resources/images/egg_images/rainbow/rainbow.png rename to pocket_friends/game_files/resources/images/bloops/rainbow/egg_images/rainbow.png diff --git a/pocket_friends/game_files/resources/images/egg_images/red/red.png b/pocket_friends/game_files/resources/images/bloops/red/egg_images/red.png similarity index 100% rename from pocket_friends/game_files/resources/images/egg_images/red/red.png rename to pocket_friends/game_files/resources/images/bloops/red/egg_images/red.png diff --git a/pocket_friends/game_files/resources/images/egg_images/violet/violet.png b/pocket_friends/game_files/resources/images/bloops/violet/violet.png similarity index 100% rename from pocket_friends/game_files/resources/images/egg_images/violet/violet.png rename to pocket_friends/game_files/resources/images/bloops/violet/violet.png diff --git a/pocket_friends/game_files/resources/images/egg_images/white/white.png b/pocket_friends/game_files/resources/images/bloops/white/white.png similarity index 100% rename from pocket_friends/game_files/resources/images/egg_images/white/white.png rename to pocket_friends/game_files/resources/images/bloops/white/white.png diff --git a/pocket_friends/game_files/resources/images/egg_images/yellow/yellow.png b/pocket_friends/game_files/resources/images/bloops/yellow/yellow.png similarity index 100% rename from pocket_friends/game_files/resources/images/egg_images/yellow/yellow.png rename to pocket_friends/game_files/resources/images/bloops/yellow/yellow.png