bcsfe 3.5.1__tar.gz → 3.5.2__tar.gz

{bcsfe-3.5.1/src/bcsfe.egg-info → bcsfe-3.5.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: bcsfe
-Version: 3.5.1
+Version: 3.5.2
 Summary: A save file editor for The Battle Cats
 Author: fieryhenry
 License-Expression: GPL-3.0-or-later

{bcsfe-3.5.1 → bcsfe-3.5.2}/src/bcsfe/__init__.py

@@ -1,15 +1,20 @@
-__version__ = "3.5.1"
+from __future__ import annotations
+
+__version__ = "3.5.2"
 
 __app_name__ = "bcsfe"
 
-from importlib.resources.abc import Traversable
+try:
+    from importlib.resources.abc import Traversable
+except ImportError:
+    pass
 
 from bcsfe import core, cli
 
 __all__ = ["core", "cli"]
 
 
-def copy_to_data_dir(base_path: Traversable, path: Traversable):
+def copy_to_data_dir(base_path: "Traversable", path: "Traversable"):
     if path.is_dir():
         for item in path.iterdir():
             copy_to_data_dir(base_path, item)

{bcsfe-3.5.1 → bcsfe-3.5.2}/src/bcsfe/cli/file_dialog.py

@@ -49,7 +49,7 @@ class FileDialog:
 
         files_str_ls = [file.basename() for file in files]
 
-        dialog_creator.single_select_key(
+        return dialog_creator.single_select_key(
             dialog_creator.Actions[Optional[str]]
             .new()
             .add_new_raw(files_str_ls, lambda index: files[index].to_str())

{bcsfe-3.5.1 → bcsfe-3.5.2}/src/bcsfe/core/game/catbase/upgrade.py

@@ -10,8 +10,8 @@ class Upgrade:
         self.plus = plus
         self.base = base
 
-        self.base_range = None
-        self.plus_range = None
+        self.base_range: tuple[int, int] | None = None
+        self.plus_range: tuple[int, int] | None = None
 
     def get_base(self) -> int:
         return self.base + 1
@@ -34,7 +34,9 @@ class Upgrade:
     def get_random_base(self, max_base: int | None = None) -> int:
         if self.base_range is None:
             return self.base
-        base = random.randint(self.base_range[0], self.base_range[1])
+        min_b = min(self.base_range)
+        max_b = max(self.base_range)
+        base = random.randint(min_b, max_b)
         if max_base is not None:
             base = min(base, max_base)
         return base
@@ -42,7 +44,9 @@ class Upgrade:
     def get_random_plus(self, max_plus: int | None = None) -> int:
         if self.plus_range is None:
             return self.plus
-        plus = random.randint(self.plus_range[0], self.plus_range[1])
+        min_p = min(self.plus_range)
+        max_p = max(self.plus_range)
+        plus = random.randint(min_p, max_p)
         if max_plus is not None:
             plus = min(plus, max_plus)
         return plus

{bcsfe-3.5.1 → bcsfe-3.5.2}/src/bcsfe/core/game/map/story.py

@@ -2,6 +2,7 @@ from __future__ import annotations
 from typing import Any, Optional
 from bcsfe import core
 from bcsfe.cli import color, dialog_creator
+import random
 
 
 class Stage:
@@ -962,6 +963,27 @@ class StoryChapters:
 
         color.color_print_key("itf_timed_scores_edited")
 
+    @staticmethod
+    def itf_timed_score_input() -> tuple[int, int] | None:
+        inp = dialog_creator.str_input_key("itf_timed_score_dialog")
+        if inp is None:
+            return None
+
+        parts = inp.split("-", maxsplit=1)
+
+        parts_i: list[int] = []
+        for part in parts:
+            if not part.isdigit():
+                return StoryChapters.itf_timed_score_input()
+            score = int(part)
+            mx = dialog_creator.MaxValue.i32(
+                core.core_data.max_value_manager.itf_timed_score
+            )
+            score = mx.clamp(score)
+            parts_i.append(score)
+
+        return min(parts_i), max(parts_i)
+
     @staticmethod
     def edit_itf_timed_scores_whole_chapters(
         save_file: core.SaveFile, chapters: list[int]
@@ -972,34 +994,21 @@ class StoryChapters:
 
         if is_per_chapter:
             for chapter_id in chapters:
-                print(chapter_id)
                 StoryChapters.print_current_chapter(save_file, chapter_id)
                 chapter = save_file.story.get_real_chapters()[chapter_id]
-                score = dialog_creator.int_input_key(
-                    "itf_timed_score",
-                    min=0,
-                    _max=dialog_creator.MaxValue.i32(
-                        core.core_data.max_value_manager.itf_timed_score
-                    ),
-                )
+                score = StoryChapters.itf_timed_score_input()
                 if score is None:
                     return
                 for stage in chapter.get_valid_treasure_stages():
-                    stage.itf_timed_score = score
+                    stage.itf_timed_score = random.randrange(score[0], score[1])
         else:
-            score = dialog_creator.int_input_key(
-                "itf_timed_score_dialog",
-                min=0,
-                _max=dialog_creator.MaxValue.i32(
-                    core.core_data.max_value_manager.itf_timed_score
-                ),
-            )
+            score = StoryChapters.itf_timed_score_input()
             if score is None:
                 return
             for chapter_id in chapters:
                 chapter = save_file.story.get_real_chapters()[chapter_id]
                 for stage in chapter.get_valid_treasure_stages():
-                    stage.itf_timed_score = score
+                    stage.itf_timed_score = random.randrange(score[0], score[1])
 
     @staticmethod
     def print_current_stage(save_file: core.SaveFile, chapter_id: int, stage_id: int):
@@ -1027,32 +1036,25 @@ class StoryChapters:
         for stage_id in stage_ids:
             StoryChapters.print_current_stage(save_file, chapter_id, stage_id)
 
-            score = dialog_creator.int_input_key(
-                "itf_timed_score_dialog",
-                min=0,
-                _max=dialog_creator.MaxValue.i32(
-                    core.core_data.max_value_manager.itf_timed_score
-                ),
-            )
+            score = StoryChapters.itf_timed_score_input()
+
             if score is None:
                 return
-            chapter.stages[stage_id].itf_timed_score = score
+            chapter.stages[stage_id].itf_timed_score = random.randrange(
+                score[0], score[1]
+            )
 
     @staticmethod
     def edit_itf_timed_scores_ind_per_chapter_many(
         chapter: Chapter, stage_ids: list[int]
     ):
-        score = dialog_creator.int_input_key(
-            "itf_timed_score_dialog",
-            min=0,
-            _max=dialog_creator.MaxValue.i32(
-                core.core_data.max_value_manager.itf_timed_score
-            ),
-        )
+        score = StoryChapters.itf_timed_score_input()
         if score is None:
             return
         for stage_id in stage_ids:
-            chapter.stages[stage_id].itf_timed_score = score
+            chapter.stages[stage_id].itf_timed_score = random.randrange(
+                score[0], score[1]
+            )
 
     @staticmethod
     def edit_itf_timed_scores_ind_per_chapter(
@@ -1083,32 +1085,24 @@ class StoryChapters:
         if is_ind:
             for stage_id in stage_ids:
                 StoryChapters.print_current_stage(save_file, 3, stage_id)
-                score = dialog_creator.int_input_key(
-                    "itf_timed_score_dialog",
-                    min=0,
-                    _max=dialog_creator.MaxValue.i32(
-                        core.core_data.max_value_manager.itf_timed_score
-                    ),
-                )
+                score = StoryChapters.itf_timed_score_input()
                 if score is None:
                     return
                 for chapter_id in chapters:
                     chapter = save_file.story.get_real_chapters()[chapter_id]
-                    chapter.stages[stage_id].itf_timed_score = score
+                    chapter.stages[stage_id].itf_timed_score = random.randrange(
+                        score[0], score[1]
+                    )
         else:
-            score = dialog_creator.int_input_key(
-                "itf_timed_score",
-                min=0,
-                _max=dialog_creator.MaxValue.i32(
-                    core.core_data.max_value_manager.itf_timed_score
-                ),
-            )
+            score = StoryChapters.itf_timed_score_input()
             if score is None:
                 return
             for chapter_id in chapters:
                 chapter = save_file.story.get_real_chapters()[chapter_id]
                 for stage_id in stage_ids:
-                    chapter.stages[stage_id].itf_timed_score = score
+                    chapter.stages[stage_id].itf_timed_score = random.randrange(
+                        score[0], score[1]
+                    )
 
     @staticmethod
     def edit_itf_timed_scores_individual_stages(

{bcsfe-3.5.1 → bcsfe-3.5.2}/src/bcsfe/core/io/path.py

@@ -59,11 +59,17 @@ class Path:
     def to_str_forwards(self) -> str:
         return self.path.replace("\\", "/")
 
+    @staticmethod
+    def is_ashell() -> bool:
+        return os.environ["HOME"].rstrip("/").endswith("Documents")
+
     @staticmethod
     def get_data_folder() -> Path:
         os_name = os.name
         if os_name == "nt":
             path = Path.join(os.environ["USERPROFILE"], "Documents", __app_name__)
+        elif os_name == "mac" or Path.is_ashell():
+            path = Path.join(os.environ["HOME"], "Documents", __app_name__)
         elif os_name == "posix":
             data_home = os.environ.get("XDG_DATA_HOME")
             if data_home is None:
@@ -75,9 +81,6 @@ class Path:
             if path.is_empty():
                 orig = Path.join(os.environ["HOME"], "Documents", __app_name__)
                 orig.copy(path)
-
-        elif os_name == "mac":
-            path = Path.join(os.environ["HOME"], "Documents", __app_name__)
         else:
             raise OSError("Unknown OS")
         path.generate_dirs()
@@ -86,7 +89,7 @@ class Path:
     @staticmethod
     def get_config_folder() -> Path:
         os_name = os.name
-        if os_name != "posix":
+        if os_name != "posix" or Path.is_ashell():
             return Path.get_data_folder()
 
         data_home = os.environ.get("XDG_CONFIG_HOME")
@@ -108,7 +111,7 @@ class Path:
     @staticmethod
     def get_state_folder() -> Path:
         os_name = os.name
-        if os_name != "posix":
+        if os_name != "posix" or Path.is_ashell():
             return Path.get_data_folder()
         data_home = os.environ.get("XDG_STATE_HOME")
         if data_home is None:

{bcsfe-3.5.1 → bcsfe-3.5.2}/src/bcsfe/files/locales/en/core/save.properties

@@ -104,3 +104,5 @@ recent_save=<@s><@q>{inquiry_code}</> <@t>{cc}</>-<@t>{gv}</> @ <@t>{year}</>-<@
 load_recent_saves=Load from recent saves and backups
 no_recent_saves=<@w>No recent saves</>
 current_save=\nCurrent Save: <@t>{cc}</>-<@t>{gv}</> Inquiry: <@t>{inquiry_code}</>
+
+root_storage_pull=Pull save file from root storage

{bcsfe-3.5.1 → bcsfe-3.5.2}/src/bcsfe/files/locales/en/edits/map.properties

@@ -50,7 +50,7 @@ aku_current_stage=Aku Realm Stage <@q>{name}</> (id: <@q>{id}</>)
 itf_timed_scores=Into the Future Timed Scores
 itf_timed_scores_dialog=Do you want to edit timed scores for <@t>whole chapters at once</> or <@t>individual stages</>?:
 itf_timed_scores_edited=<@su>Succesfully edited Into The Future timed scores</>
-itf_timed_score_dialog=Enter the timed score:
+itf_timed_score_dialog=Enter the timed score (you can also specify a range such as <@t>6000</>-<@t>9000</> to assign a random score):
 current_stage={chapter_name} <@t>{stage_name}</>
 itf_timed_scores_individual_dialog=Do you want to edit the timed score of each selected stage <@t>individually</>? or set <@t>all</> selected stages to the same timed score?:
 

{bcsfe-3.5.1 → bcsfe-3.5.2/src/bcsfe.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: bcsfe
-Version: 3.5.1
+Version: 3.5.2
 Summary: A save file editor for The Battle Cats
 Author: fieryhenry
 License-Expression: GPL-3.0-or-later