mima-engine 0.2.4__tar.gz → 0.2.5__tar.gz

{mima_engine-0.2.4 → mima_engine-0.2.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mima-engine
-Version: 0.2.4
+Version: 0.2.5
 Summary: A game engine based on pygame.
 Author-email: Stephan Balduin <stephan.balduin@mailbox.org>
 Classifier: Programming Language :: Python :: 3

{mima_engine-0.2.4 → mima_engine-0.2.5}/src/mima/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "0.2.4"
+__version__ = "0.2.5"
 
 from .core.engine import MimaEngine
 from .core.mode_engine import MimaModeEngine

{mima_engine-0.2.4 → mima_engine-0.2.5}/src/mima/backend/pygame_backend.py

@@ -87,6 +87,7 @@ class PygameBackend:
         fullscreen: bool = False,
         target_fps: int = 60,
         resizeable: bool = False,
+        no_scaled_flag: bool = False,
     ):
         LOG.info("Constructing window.")
         self.render_width, self.display_width = width, width
@@ -96,7 +97,9 @@ class PygameBackend:
 
         flags = pygame.HWSURFACE | pygame.DOUBLEBUF
         if fullscreen:
-            flags = flags | pygame.FULLSCREEN | pygame.SCALED
+            flags = flags | pygame.FULLSCREEN
+            if not no_scaled_flag:
+                flags = flags | pygame.SCALED
             self.pixel_size = -1  # Calculate later
         elif pixel_size == 0:
             flags = flags | pygame.SCALED

{mima_engine-0.2.4 → mima_engine-0.2.5}/src/mima/core/engine.py

@@ -78,6 +78,7 @@ class MimaEngine(ABC):
         fullscreen: bool = False,
         target_fps: int = 60,
         resizable: bool = False,
+        no_scaled_flag: bool = False,
         kb_map=None,
     ):
         """Initialize backend and create a window."""
@@ -106,7 +107,13 @@ class MimaEngine(ABC):
             joy_to_player=self.rtc.get_joy_to_player(),
         )
         self.backend.construct(
-            width, height, pixel_size, fullscreen, target_fps, resizable
+            width,
+            height,
+            pixel_size,
+            fullscreen,
+            target_fps,
+            resizable,
+            no_scaled_flag,
         )
         self.backend.user_input.enable_touch_controls = (
             self.enable_touch_controls

{mima_engine-0.2.4 → mima_engine-0.2.5}/src/mima/scripts/commands/save_game.py

@@ -9,5 +9,6 @@ class CommandSaveGame(Command):
             quest.save_state()
         self.engine.game_state.save_to_disk()
         self.completed = True
+        print(f"Saved the game to {self.engine.game_state.state_name}")
 
         # print(self.engine.game_state._state["player"])

{mima_engine-0.2.4 → mima_engine-0.2.5}/src/mima/states/game_state.py

@@ -2,19 +2,21 @@ import json
 import logging
 import os
 from os import PathLike
-from typing import Any, Dict, List, Optional, Union
+from pathlib import Path
+from typing import Any, Dict, Union
 
+# from typing_extensions import overload
+from ..util.constants import SAVE_FILE_NAME
 from ..util.functions import strtobool
 
 LOG = logging.getLogger(__name__)
 
 
 class GameState:
-    def __init__(self, filename: PathLike):
-        self.filename = filename
-        self._state: Dict[str, Any] = {
-            "savefile_name": os.path.split(self.filename)[-1].split(".")[0]
-        }
+    def __init__(self, save_path: PathLike, state_name: str = "autosave.json"):
+        self.state_name = state_name
+        self._save_path = save_path
+        self._state: Dict[str, Any] = {}
 
     def save_value(
         self, key: str, value: Union[int, float, bool, str, dict, list]
@@ -27,12 +29,22 @@ class GameState:
             else:
                 state[part] = value
 
+    # @overload
+    # def load_value(
+    #     self, key: str, default: str, astype: str | None
+    # ) -> str | None: ...
+
+    # @overload
+    # def load_value(
+    #     self, key: str, default: int, astype: str | None
+    # ) -> int | None: ...
+
     def load_value(
         self,
         key: str,
-        default: Optional[Union[int, float, bool, str, dict, list]] = None,
-        astype: Optional[str] = None,
-    ) -> Optional[Union[int, float, bool, str, dict, list]]:
+        default: int | float | bool | str | dict | list | None = None,
+        astype: str | None = None,
+    ) -> int | float | bool | str | dict | list | None:
         parts = key.split("__")
         state = self._state
         for idx, part in enumerate(parts):
@@ -57,11 +69,11 @@ class GameState:
         return data
 
     def load_from_disk(self, autosave: bool = False):
-        filename = self.filename
-        if autosave:
-            filename = os.path.join(
-                os.path.split(filename)[0], "autosave.json"
-            )
+        # filename = self.filename
+        # if autosave:
+        #     filename = os.path.join(self._save_path, "autosave.json")
+        # else:
+        filename = Path(self._save_path) / self.state_name
         try:
             with open(filename, "r") as fp:
                 self._state = json.load(fp)
@@ -71,32 +83,33 @@ class GameState:
             LOG.info("No saved state found or state corrupted.")
 
         if autosave:
-            self.filename = os.path.join(
-                os.path.split(filename)[0],
-                f"{self._state['savefile_name']}.json",
-            )
+            self.state_name = self.load_value("savefile_name", "")
+        # if autosave:
+        #     self.filename = os.path.join(
+        #         os.path.split(filename)[0],
+        #         f"{self._state['savefile_name']}.json",
+        #     )
 
     def save_to_disk(self, autosave: bool = False):
-        filename = self.filename
+        # filename = self.filename
         if autosave:
-            filename = os.path.join(
-                os.path.split(filename)[0], "autosave.json"
-            )
-            self.save_value("savefile_name", "autosave")
+            filename = Path(self._save_path) / "autosave.json"
+            self.save_value("savefile_name", self.state_name)
             self.save_value("player__pos_x", 5.0)
             self.save_value("player__pos_y", 5.0)
             self.save_value(
                 "player__map_name", self.load_value("player__spawn_map")
             )
         else:
-            self._state["savefile_name"] = os.path.split(filename)[-1].split(
-                "."
-            )[0]
+            if self.state_name == "autosave.json":
+                self.state_name = chose_filename(self._save_path)
+                self.save_value("savefile_name", self.state_name)
+            filename = Path(self._save_path) / self.state_name
+            self._state["savefile_name"] = self.state_name
+
             # Auto save file will be removed after a successful save
             try:
-                os.remove(
-                    os.path.join(os.path.split(filename)[0], "autosave.json")
-                )
+                os.remove(Path(self._save_path) / "autosave.json")
             except FileNotFoundError:
                 pass
 
@@ -112,6 +125,17 @@ class GameState:
             del self._state[scope][k]
 
 
+def chose_filename(save_path: PathLike):
+
+    files = os.listdir(save_path)
+    game_idx = 0
+    while True:
+        savegame = f"{SAVE_FILE_NAME}_{game_idx:03d}.json"
+        if savegame not in files:
+            return savegame
+        game_idx += 1
+
+
 def convert(value, astype):
     if astype == "int":
         try:
@@ -144,17 +168,18 @@ def load_saved_games(save_path, save_file_name):
         return all_games
 
     if "autosave.json" in files:
-        all_games["autosave"] = GameState(
-            os.path.join(save_path, "autosave.json")
+        all_games["autosave.json"] = GameState(save_path)
+        all_games["autosave.json"].load_from_disk(autosave=True)
+        LOG.debug(
+            "Loading saved game from autosave.json (%s)",
+            all_games["autosave.json"].state_name,
         )
-        all_games["autosave"].load_from_disk(autosave=True)
-        LOG.debug("Loading saved game from autosave.json")
 
     game_idx = 0
     while True:
-        savegame = f"{save_file_name}{game_idx:03d}.json"
+        savegame = f"{save_file_name}_{game_idx:03d}.json"
         if savegame in files:
-            all_games[savegame] = GameState(os.path.join(save_path, savegame))
+            all_games[savegame] = GameState(save_path, savegame)
             all_games[savegame].load_from_disk()
             LOG.debug(f"Loading saved game from {savegame}")
         game_idx += 1

{mima_engine-0.2.4 → mima_engine-0.2.5}/src/mima/util/constants.py

@@ -51,3 +51,5 @@ DIALOG_WIDTH: float = 14.0
 DIALOG_HEIGHT: float = 3.0
 DIALOG_CHARS_PER_LINE: int = 36
 DIALOG_N_LINES: int = 4
+
+SAVE_FILE_NAME = "savegame"

{mima_engine-0.2.4 → mima_engine-0.2.5}/src/mima_engine.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mima-engine
-Version: 0.2.4
+Version: 0.2.5
 Summary: A game engine based on pygame.
 Author-email: Stephan Balduin <stephan.balduin@mailbox.org>
 Classifier: Programming Language :: Python :: 3

{mima_engine-0.2.4 → mima_engine-0.2.5}/src/mima/objects/creature.py

@@ -136,6 +136,9 @@ class Creature(Dynamic):
             if self.attributes.health <= 0:
                 self.change_graphic_state(GraphicState.DEAD)
 
+            if self.can_act():
+                self.behavior(elapsed_time, target)
+
             if self.vx < -0.01:
                 self.facing_direction = Direction.WEST
             if self.vx > 0.01:
@@ -147,9 +150,6 @@ class Creature(Dynamic):
 
             self.speed = self.attributes.speed
 
-            if self.can_act():
-                self.behavior(elapsed_time, target)
-
         self.sprite.update(
             elapsed_time, self.facing_direction, self.graphic_state
         )