Merge dev fixes

Author: afellowcorn

scripts/cat/sprites.py

@@ -6,6 +6,7 @@
 import ujson
 
 from scripts.game_structure import constants
+from scripts.game_structure.game_essentials import game
 from scripts.game_structure.game.settings import game_setting_get
 from scripts.special_dates import SpecialDate, is_today
 

scripts/game_structure/game_essentials.py

@@ -2,6 +2,7 @@
 
 import pygame
 import ujson
+from os import walk
 
 from scripts.event_class import Single_Event
 from scripts.game_structure import constants
@@ -85,7 +86,7 @@ class Game:
     cat_class = None
     prey_config = {}
 
-    species_list = {}
+    species = {}
     sprite_folders = set()
 
     rpc = None
@@ -103,6 +104,14 @@ def __init__(self, current_screen="start screen"):
         with open(f"resources/prey_config.json", "r", encoding="utf-8") as read_file:
             self.prey_config = ujson.loads(read_file.read())
 
+        with open(f"resources/species.json", 'r') as read_file:
+            self.species = ujson.loads(read_file.read())
+
+        # count amount of folders excluding faded and dicts folder
+        for x in(next(walk('sprites'))[1]):
+            if not x in ['faded', 'dicts']:
+                self.sprite_folders.add(x)
+
     @property
     def config(self):
         """DEPRECATED: use constants.CONFIG instead"""
@@ -139,14 +148,6 @@ def settings(self):
             "game.settings has been deprecated, use get_game_setting() and set_game_setting() or helpers instead. Unrecoverable."
         )
 
-        with open(f"resources/species.json", 'r') as read_file:
-            self.species = ujson.loads(read_file.read())
-
-        # count amount of folders excluding faded and dicts folder
-        for x in(next(os.walk('sprites'))[1]):
-            if not x in ['faded', 'dicts']:
-                self.sprite_folders.add(x)
-
     def update_game(self):
         if self.current_screen != switch_get_value(Switch.cur_screen):
             self.current_screen = switch_get_value(Switch.cur_screen)

scripts/housekeeping/version.py

@@ -10,7 +10,7 @@
 logger = logging.getLogger(__name__)
 
 VERSION_NAME = "unknown"
-SPS_VERSION = "1.1.4dev"
+SPS_VERSION = "1.1.5dev"
 # This is saved in the Clan save-file, and is used for save-file converstion.
 SAVE_VERSION_NUMBER = 3
 

scripts/screens/ChooseMateScreen.py

@@ -6,6 +6,7 @@
 
 from scripts.cat.cats import Cat
 from scripts.game_structure import image_cache
+from scripts.game_structure.game_essentials import game
 from scripts.game_structure.ui_elements import (
     UIImageButton,
     UISpriteButton,

scripts/utility.py

@@ -2952,17 +2952,17 @@ def generate_sprite(
                     if accessory in getattr(Pelt, category):
                         if accessory in cat.pelt.plant_accessories:
                             new_sprite.blit(
-                                sprites.sprites["acc_herbs" + accessory + cat_sprite],
+                                sprites.sprites["acc_herbs" + f'{n}_' + accessory + cat_sprite],
                                 (0, 0),
                             )
                         elif accessory in cat.pelt.wild_accessories:
                             new_sprite.blit(
-                                sprites.sprites["acc_wild" + accessory + cat_sprite],
+                                sprites.sprites["acc_wild" + f'{n}_' + accessory + cat_sprite],
                                 (0, 0),
                             )
                         elif accessory in cat.pelt.collars:
                             new_sprite.blit(
-                                sprites.sprites["collars" + accessory + cat_sprite],
+                                sprites.sprites["collars" + f'{n}_' + accessory + cat_sprite],
                                 (0, 0),
                             )