bcsfe 3.2.2__tar.gz → 3.3.0__tar.gz

{bcsfe-3.2.2/src/bcsfe.egg-info → bcsfe-3.3.0}/PKG-INFO

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

{bcsfe-3.2.2 → bcsfe-3.3.0}/src/bcsfe/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "3.2.2"
+__version__ = "3.3.0"
 
 from bcsfe import core, cli
 

{bcsfe-3.2.2 → bcsfe-3.3.0}/src/bcsfe/cli/__init__.py

@@ -7,6 +7,7 @@ from bcsfe.cli import (
     save_management,
     server_cli,
     edits,
+    recent_saves,
 )
 
 __all__ = [
@@ -18,4 +19,5 @@ __all__ = [
     "save_management",
     "server_cli",
     "edits",
+    "recent_saves",
 ]

{bcsfe-3.2.2 → bcsfe-3.3.0}/src/bcsfe/cli/dialog_creator.py

@@ -73,16 +73,25 @@ class IntInput:
         default: int | None = None,
         signed: bool = True,
         bit_count: int = 32,
+        ensure_max: bool = False,
     ):
         self.signed = signed
         self.bit_count = bit_count
-        self.max = self.get_max_value(max, signed, bit_count)
+        self.max = self.get_max_value(max, signed, bit_count, ensure_max)
         self.min = min
         self.default = default
 
     @staticmethod
-    def get_max_value(max: int | None, signed: bool = True, bit_count: int = 32) -> int:
-        disable_maxes = core.core_data.config.get_bool(core.ConfigKey.DISABLE_MAXES)
+    def get_max_value(
+        max: int | None,
+        signed: bool = True,
+        bit_count: int = 32,
+        ensure_max: bool = False,
+    ) -> int:
+        disable_maxes = (
+            core.core_data.config.get_bool(core.ConfigKey.DISABLE_MAXES)
+            and not ensure_max
+        )
         if signed:
             bit_count -= 1
         max_int = (2**bit_count) - 1
@@ -273,9 +282,9 @@ class ChoiceInput:
             start_index=self.start_index,
             localize_elements=self.localize_options,
         ).display_locale(self.remove_alias)
-        return IntInput(self.get_max_value(), self.get_min_value()).get_input_locale(
-            self.dialog, self.perameters
-        )
+        return IntInput(
+            self.get_max_value(), self.get_min_value(), ensure_max=True
+        ).get_input_locale(self.dialog, self.perameters)
 
     def get_input_while(self) -> int | None:
         if len(self.strings) == 0:

{bcsfe-3.2.2 → bcsfe-3.3.0}/src/bcsfe/cli/main.py

@@ -40,6 +40,26 @@ class Main:
             if stop:
                 break
 
+    def version_check(self, v1: str, v2: str) -> bool:
+        v1_p = v1.split(".")
+        v2_p = v2.split(".")
+
+        for p1, p2 in zip(v1_p, v2_p):
+            if p1.isdigit():
+                p1 = int(p1)
+            else:
+                continue
+            if p2.isdigit():
+                p2 = int(p2)
+            else:
+                continue
+            if p1 > p2:
+                return True
+            if p1 < p2:
+                return False
+
+        return len(v1_p) > len(v2_p)
+
     def check_update(self):
         """Check for updates."""
 
@@ -64,16 +84,19 @@ class Main:
         local_no_beta = local_version.split("b")[0]
         latest_no_beta = latest_version.split("b")[0]
 
-        if latest_no_beta > local_no_beta:
+        if self.version_check(latest_no_beta, local_no_beta):
             update_needed = True
-        elif latest_no_beta < local_no_beta:
+        elif self.version_check(local_no_beta, latest_no_beta):
             update_needed = False
         else:
             if latest_version == local_version:
                 update_needed = False
             else:
                 if is_local_beta and is_latest_beta:
-                    update_needed = latest_version > local_version
+                    update_needed = self.version_check(
+                        latest_version.replace("b", "."),
+                        local_version.replace("b", "."),
+                    )
                 elif is_local_beta:
                     update_needed = True
                 else:
@@ -168,6 +191,15 @@ class Main:
             return stop
         self.save_file = save_file
 
+        color.ColoredText.localize(
+            "current_save",
+            inquiry_code=save_file.inquiry_code[:4]
+            + "***"
+            + save_file.inquiry_code[-2:],
+            gv=save_file.game_version,
+            cc=save_file.cc,
+        )
+
         self.feature_handler()
         return False
 

bcsfe-3.3.0/src/bcsfe/cli/recent_saves.py

@@ -0,0 +1,141 @@
+from __future__ import annotations
+from typing import Any
+
+from bcsfe import core
+import datetime
+import json
+from bcsfe.cli import color, dialog_creator
+
+
+class RecentSave:
+    def __init__(
+        self,
+        path: core.Path,
+        cc: core.CountryCode,
+        gv: core.GameVersion,
+        inquiry: str,
+        time: datetime.datetime,
+        name: core.Path,
+    ):
+        self.path = path
+        self.cc = cc
+        self.gv = gv
+        self.inquiry = inquiry
+        self.time = time
+        self.name = name
+
+    @staticmethod
+    def from_dict(data: dict[str, Any]) -> RecentSave | None:
+        path = data.get("path")
+        cc = data.get("cc")
+        gv = data.get("gv")
+        inquiry = data.get("inquiry")
+        time_stamp = data.get("timestamp")
+        name = data.get("name")
+        if (
+            path is None
+            or cc is None
+            or gv is None
+            or inquiry is None
+            or time_stamp is None
+            or name is None
+        ):
+            return None
+
+        return RecentSave(
+            core.Path(path),
+            core.CountryCode(cc),
+            core.GameVersion.from_string(gv),
+            inquiry,
+            datetime.datetime.fromtimestamp(time_stamp),
+            core.Path(name),
+        )
+
+    def to_dict(self) -> dict[str, Any]:
+        return {
+            "path": self.path.to_str(),
+            "cc": self.cc.get_code(),
+            "gv": self.gv.to_string(),
+            "inquiry": self.inquiry,
+            "timestamp": self.time.timestamp(),
+            "name": self.name.to_str(),
+        }
+
+
+class RecentSaves:
+    def __init__(self, saves: list[RecentSave]):
+        self.saves = saves
+
+    @staticmethod
+    def from_json(data: list[dict[str, Any]]) -> RecentSaves:
+        res: list[RecentSave] = []
+
+        for item in data:
+            save = RecentSave.from_dict(item)
+            if save is not None:
+                res.append(save)
+
+        return RecentSaves(res)
+
+    def to_json(self) -> list[dict[str, Any]]:
+        return [save.to_dict() for save in self.saves][-10:]  # only store 10
+
+    @staticmethod
+    def from_path(path: core.Path) -> RecentSaves | None:
+        json_data = json.loads(path.read().to_str())
+
+        return RecentSaves.from_json(json_data)
+
+    def to_path(self, path: core.Path):
+        data = json.dumps(self.to_json(), indent=4)
+
+        path.write(core.Data(data))
+
+    @staticmethod
+    def read_default() -> RecentSaves:
+        path = RecentSaves.get_path()
+        if path.exists():
+            return RecentSaves.from_path(path) or RecentSaves([])
+        return RecentSaves([])
+
+    @staticmethod
+    def get_path() -> core.Path:
+        return core.Path.get_documents_folder().add("recent_saves.json")
+
+    def save_default(self):
+        path = RecentSaves.get_path()
+        self.to_path(path)
+
+    def select(self) -> RecentSave | None:
+        if not self.saves:
+            color.ColoredText.localize("no_recent_saves")
+            return None
+        items: list[str] = []
+        for save in self.saves:
+            items.append(
+                core.localize(
+                    "recent_save",
+                    path=save.path,
+                    cc=save.cc,
+                    gv=save.gv,
+                    inquiry_code=save.inquiry,
+                    year=save.time.year,
+                    month=str(save.time.month).zfill(2),
+                    day=str(save.time.day).zfill(2),
+                    hour=str(save.time.hour).zfill(2),
+                    minute=str(save.time.minute).zfill(2),
+                    second=str(save.time.second).zfill(2),
+                    name=save.name,
+                )
+            )
+        items.reverse()
+
+        resp = dialog_creator.ChoiceInput.from_reduced(
+            items, localize_options=False, dialog="select_recent"
+        ).single_choice()
+        if resp is None:
+            return None
+
+        resp = len(self.saves) - resp
+
+        return self.saves[resp]

{bcsfe-3.2.2 → bcsfe-3.3.0}/src/bcsfe/cli/save_management.py

@@ -1,8 +1,9 @@
 from __future__ import annotations
+import datetime
 from bcsfe import core
 import bcsfe
 from bcsfe.core import io
-from bcsfe.cli import main, color, dialog_creator, server_cli
+from bcsfe.cli import main, color, dialog_creator, server_cli, recent_saves
 from bcsfe.core.country_code import CountryCode
 from bcsfe.core.io.config import ConfigKey
 
@@ -350,7 +351,7 @@ class SaveManagement:
             )
             if file is None:
                 return (None, True)
-            return (file, False)
+            return (file[0], False)
 
         options = [
             "download_save",
@@ -358,6 +359,7 @@ class SaveManagement:
             "load_from_documents",
             "adb_pull_save",
             "load_save_data_json",
+            # "load_recent_saves",
             # "create_new_save",
         ]
         if starting_options:
@@ -463,6 +465,14 @@ class SaveManagement:
                 save_path, cc = data
             else:
                 save_path = None
+        # elif choice == 5:
+        #     recent_save = recent_saves.RecentSaves.read_default().select()
+        #     if recent_save is None:
+        #         save_path = None
+        #     else:
+        #         save_path = recent_save.path
+        #         cc = recent_save.cc
+
         # elif choice == 5:
         #     color.ColoredText.localize("create_new_save_warning")
         #     cc = core.CountryCode.select()
@@ -494,10 +504,30 @@ class SaveManagement:
         if save_path is None or not save_path.exists():
             return None, False
 
+        save = SaveManagement.load_save_file_path(
+            save_path, cc, used_storage, package_name
+        )
+
+        if save is None:
+            return (None, False)
+
+        save, backup_path = save
+
+        if choice != 5:
+            recent_s = recent_saves.RecentSaves.read_default()
+            recent_s.saves.append(
+                recent_saves.RecentSave(
+                    backup_path,
+                    save.cc,
+                    save.game_version,
+                    save.inquiry_code,
+                    datetime.datetime.now(),
+                    save_path,
+                )
+            )
+            recent_s.save_default()
         return (
-            SaveManagement.load_save_file_path(
-                save_path, cc, used_storage, package_name
-            ),
+            save,
             False,
         )
 
@@ -507,7 +537,7 @@ class SaveManagement:
         cc: CountryCode | None,
         used_storage: bool,
         package_name: str | None = None,
-    ) -> core.SaveFile | None:
+    ) -> tuple[core.SaveFile, core.Path] | None:
         color.ColoredText.localize("save_file_found", path=save_path)
 
         data = save_path.read()
@@ -546,10 +576,11 @@ class SaveManagement:
             return None
 
         save_file.save_path = save_path
-        save_file.save_path.copy_thread(save_file.get_default_path())
+        backup_path = save_file.get_default_path()
+        save_file.save_path.copy_thread(backup_path)
         save_file.used_storage = used_storage
 
-        return save_file
+        return save_file, backup_path
 
     @staticmethod
     def select_package_name(package_names: list[str]) -> str | None:

{bcsfe-3.2.2 → bcsfe-3.3.0}/src/bcsfe/core/game/catbase/cat.py

@@ -1208,6 +1208,8 @@ class Cats:
         for _ in range(total_cats):
             cat_id = stream.read_int()
             if cat_id < 0 or cat_id >= len(self.cats):
+                cat = Cat.init(cat_id)
+                cat.read_talents(stream)
                 continue
             self.cats[cat_id].read_talents(stream)
 
@@ -1217,7 +1219,7 @@ class Cats:
             total_talents += 1 if cat.talents is not None else 0
         stream.write_int(total_talents)
         for cat in self.cats:
-            if not cat.talents:
+            if cat.talents is None:
                 continue
             stream.write_int(cat.id)
             cat.write_talents(stream)

{bcsfe-3.2.2 → bcsfe-3.3.0}/src/bcsfe/core/game/catbase/login_bonuses.py

@@ -133,11 +133,12 @@ class LoginBonus:
             return LoginBonus(logins=logins)
 
     def write(self, stream: core.Data, gv: core.GameVersion):
-        if gv < 80000 and self.old_logins is not None:
-            self.old_logins.write(stream)
-        elif gv >= 80000 and self.logins is not None:
-            stream.write_int(len(self.logins))
-            for id, login in self.logins.items():
+        if gv < 80000:
+            (self.old_logins or LoginSets([])).write(stream)
+        elif gv >= 80000:
+            logins = self.logins or {}
+            stream.write_int(len(logins))
+            for id, login in logins.items():
                 stream.write_int(id)
                 login.write(stream)
 

{bcsfe-3.2.2 → bcsfe-3.3.0}/src/bcsfe/core/game/catbase/talent_orbs.py

@@ -451,30 +451,30 @@ def color_from_grade(grade_id: int) -> str:
 
 
 def color_from_effect(effect_id: int):
-    if effect_id == 0:
-        return color.ColorHex.RED
-    elif effect_id == 1:
-        return color.ColorHex.GREEN
-    elif effect_id == 2:
-        return color.ColorHex.DARK_GREY
-    elif effect_id == 3:
-        return color.ColorHex.LIGHT_GREY
-    elif effect_id == 4:
-        return color.ColorHex.YELLOW
-    elif effect_id == 5:
-        return color.ColorHex.BLUE
-    elif effect_id == 6:
-        return color.ColorHex.MAGENTA
-    elif effect_id == 7:
-        return color.ColorHex.DARK_GREEN
-    elif effect_id == 8:
-        return color.ColorHex.WHITE
-    elif effect_id == 9:
-        return color.ColorHex.DARK_MAGENTA
-    elif effect_id == 10:
-        return color.ColorHex.ORANGE
-
-    return color.ColorHex.BLACK
+    # if effect_id == 0:
+    #     return color.ColorHex.RED
+    # elif effect_id == 1:
+    #     return color.ColorHex.GREEN
+    # elif effect_id == 2:
+    #     return color.ColorHex.DARK_GREY
+    # elif effect_id == 3:
+    #     return color.ColorHex.LIGHT_GREY
+    # elif effect_id == 4:
+    #     return color.ColorHex.YELLOW
+    # elif effect_id == 5:
+    #     return color.ColorHex.BLUE
+    # elif effect_id == 6:
+    #     return color.ColorHex.MAGENTA
+    # elif effect_id == 7:
+    #     return color.ColorHex.DARK_GREEN
+    # elif effect_id == 8:
+    #     return color.ColorHex.WHITE
+    # elif effect_id == 9:
+    #     return color.ColorHex.DARK_MAGENTA
+    # elif effect_id == 10:
+    #     return color.ColorHex.ORANGE
+
+    return "@t"
 
 
 class SaveOrbs:
@@ -556,23 +556,23 @@ class SaveOrbs:
         all_effects = self.orb_info_list.get_all_effects()
         all_effects.sort()
         all_effects_str = [
-            effect.lower().replace("%@", "").replace(":", "").strip() + f" ({i})"
+            effect.lower().replace("%@", "").replace(":", "").strip() + f" <@s>({i})</>"
             for (i, effect) in enumerate(all_effects)
         ]
         all_effect_ids = [i for i in range(len(all_effects))]
 
-        all_grades_str = "".join(
-            f"<{color_from_grade(self.orb_info_list.get_all_grades().index(grade))}>{grade}</>,"
+        all_grades_str = ",".join(
+            f"<{color_from_grade(self.orb_info_list.get_all_grades().index(grade))}>{grade}</>"
             for grade in all_grades
         )
 
-        all_attributes_str = "".join(
-            f"<{color_from_enemy_type(self.orb_info_list.get_all_attributes().index(attribute))}>{attribute}</>,"
+        all_attributes_str = ",".join(
+            f"<{color_from_enemy_type(self.orb_info_list.get_all_attributes().index(attribute))}>{attribute}</>"
             for attribute in all_attributes
         )
 
-        all_effects_str = "".join(
-            f"<{color_from_effect(self.orb_info_list.get_all_effects().index(effect))}>{effect_str}</>,"
+        all_effects_str = ", ".join(
+            f"<{color_from_effect(self.orb_info_list.get_all_effects().index(effect))}>{effect_str}</>"
             for effect_str, effect in zip(all_effects_str, all_effects)
         )
 

{bcsfe-3.2.2 → bcsfe-3.3.0}/src/bcsfe/core/game/gamoto/cat_shrine.py

@@ -109,6 +109,9 @@ class CatShrine:
 
         if choice == 2:
             shrine.shrine_gone = False
+
+            shrine.stamp_1 = 0.0
+            shrine.stamp_2 = 0.0
             color.ColoredText.localize("cat_shrine_edited")
             return
         elif choice == 3:

{bcsfe-3.2.2 → bcsfe-3.3.0}/src/bcsfe/core/io/config.py

@@ -232,7 +232,7 @@ class Config:
             "game_data_repo_dialog", {}
         )
         if value is None:
-            return
+            value = self.get_default(ConfigKey.GAME_DATA_REPO)
         color.ColoredText.localize("validating_game_repo")
         try:
             resp = core.RequestHandler(value).get()

{bcsfe-3.2.2 → bcsfe-3.3.0}/src/bcsfe/core/io/save.py

@@ -1234,6 +1234,10 @@ class SaveFile:
                 val = self.data.read_byte()
                 self.uil11.append(val)
 
+            if self.game_version >= 150300:
+                self.ui24 = self.data.read_int()
+                self.ub38 = self.data.read_bool()
+
             self.ub36 = self.data.read_bool()
 
             length = self.data.read_byte()
@@ -2206,6 +2210,10 @@ class SaveFile:
             for val in self.uil11:
                 self.data.write_byte(val)
 
+            if self.game_version >= 150300:
+                self.data.write_int(self.ui24)
+                self.data.write_bool(self.ub38)
+
             self.data.write_bool(self.ub36)
 
             self.data.write_byte(len(self.treasure_chests))
@@ -2574,6 +2582,8 @@ class SaveFile:
             "ui23": self.ui23,
             "uil13": self.uil13,
             "ub37": self.ub37,
+            "ub38": self.ub38,
+            "ui24": self.ui24,
             "remaining_data": base64.b64encode(self.remaining_data).decode("utf-8"),
         }
         return data
@@ -2960,6 +2970,8 @@ class SaveFile:
         save_file.ui23 = data.get("ui23", 0)
         save_file.uil13 = data.get("uil13", [])
         save_file.ub37 = data.get("ub37", False)
+        save_file.ub38 = data.get("ub38", False)
+        save_file.ui24 = data.get("ui24", 0)
 
         save_file.remaining_data = base64.b64decode(data.get("remaining_data", ""))
 
@@ -3011,6 +3023,7 @@ class SaveFile:
         self.ub35 = False
         self.ub36 = False
         self.ub37 = False
+        self.ub38 = False
 
         self.mute_bgm = False
         self.mute_se = False
@@ -3050,6 +3063,7 @@ class SaveFile:
         self.ui21 = 0
         self.ui22 = 0
         self.ui23 = 0
+        self.ui24 = 0
 
         self.catfood = 0
         self.current_energy = 0

{bcsfe-3.2.2 → bcsfe-3.3.0}/src/bcsfe/core/server/game_data_getter.py

@@ -2,7 +2,7 @@ from __future__ import annotations
 from io import BytesIO
 from typing import Any, Callable
 
-from bcsfe.cli import color
+from bcsfe.cli import color, dialog_creator
 
 import tarfile
 
@@ -82,9 +82,26 @@ class GameDataGetter:
             return cc_version_keys[-1], cc_versions[cc_version_keys[-1]]
         return gv_string, cc_versions[gv_string]
 
-    def get_metadata(self) -> dict[str, Any] | None:
+    def get_metadata(self, show_alt: bool = True) -> dict[str, Any] | None:
         response = core.RequestHandler(self.repo_url).get()
         if response is None:
+            if (
+                self.repo_url
+                == core.core_data.config.get_default(core.ConfigKey.GAME_DATA_REPO)
+                and show_alt
+            ):
+                alt = "https://gitlab.com/fieryhenry/bcdata/-/raw/main/metadata.json"
+                res = dialog_creator.YesNoInput().get_input_once(
+                    "use_alternative_repo",
+                    {
+                        "repo": "https://gitlab.com/fieryhenry/bcdata/-/raw/main/metadata.json"
+                    },
+                )
+                if res:
+                    core.core_data.config.set(core.ConfigKey.GAME_DATA_REPO, alt)
+                    self.repo_url = alt
+                    return self.get_metadata(show_alt=False)
+
             return None
         try:
             data = response.json()

{bcsfe-3.2.2 → bcsfe-3.3.0}/src/bcsfe/core/server/request.py

@@ -88,7 +88,7 @@ class RequestHandler:
                 stream=stream,
                 files=None if self.form is None else self.form.into_files(),
             )
-        except requests.exceptions.ConnectionError:
+        except (requests.exceptions.ConnectionError, requests.exceptions.Timeout):
             return None
 
     def post(self, no_timeout: bool = False) -> requests.Response | None:

{bcsfe-3.2.2 → bcsfe-3.3.0}/src/bcsfe/files/locales/en/core/save.properties

@@ -80,8 +80,8 @@ game_version_set=<@su>Succesfully set game version to <@s>{version}</>
 convert_region=Convert country code (e.g en -\> jp)
 convert_version=Convert game version (e.g 12.2.1 -\> 12.2.0)
 
-cc_warning=<@w>Warning: This may cause issues with your save file. Bugs and crashes are expected! If reporting a bug, please ensure to mention you have used this feature.</>\nCurrent country code: <@t>{current}</>
-gv_warning=<@w>Warning: This may cause issues with your save file. Bugs and crashes are expected! If reporting a bug, plesae ensure to mention you have used this feature.</>\nCurrent game version: <@t>{current}</>
+cc_warning=<@w>Warning: This may cause issues with your save file. Bugs and crashes are expected! If reporting a bug, please ensure to mention you have used this feature. You should enter the cat base / upgrade menu after running this feature so the game makes the necessary changes to your save file.</>\nCurrent country code: <@t>{current}</>
+gv_warning=<@w>Warning: This may cause issues with your save file. Bugs and crashes are expected! If reporting a bug, plesae ensure to mention you have used this feature. You should enter the cat base / upgrade menu after running this feature so the game makes the necessary changes to your save file.</>\nCurrent game version: <@t>{current}</>
 
 create_new_save_success=<@su>Succesfully created new save file</>
 create_new_save=Create new save file
@@ -107,3 +107,10 @@ root_rerun_fail=<@e>Failed to rerun game. Error: <@s>{error}</></>
 
 root_push=Use root to push save directly to the game
 root_push_rerun=Use root to push save directly to the game (and rerun the game)
+
+select_recent=Select recent save:
+recent_save=<@s><@q>{inquiry_code}</> <@t>{cc}</>-<@t>{gv}</> @ <@t>{year}</>-<@t>{month}</>-<@t>{day}</> <@t>{hour}</>:<@t>{minute}</>:<@t>{second}</> - original path: <@q>{name}</></>
+
+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}</>

{bcsfe-3.2.2 → bcsfe-3.3.0}/src/bcsfe/files/locales/en/core/server.properties

@@ -54,3 +54,5 @@ validating_game_repo=Validating game data repo...
 invalid_response=<@e>Invalid response code: <@s>{response_code}</>. Expected <@s>200</></>
 no_internet_or_connection_error=<@e>Failed to connect to game data repo</>
 invalid_url=<@e>Invalid URL</>
+
+use_alternative_repo=<@e>Failed to fetch game data repo, this may be an issue with your internet connection or the repo is blocked on your network.</> Would you like to swap to <@t>{repo}</t> as an alternative game data repo? ({{y/n}}):

{bcsfe-3.2.2 → bcsfe-3.3.0}/src/bcsfe/files/locales/en/edits/gamototo.properties

@@ -44,11 +44,11 @@ cannon_level=Cannon Level
 
 cannon_success=<@su>Succesfully edited ototo cannons</>
 
-cat_shrine=Cat Shrine
-shrine_level=Shrine Level
+cat_shrine=Edit Cat Shrine
+shrine_level=Edit Shrine Level
 shrine_xp=Shrine XP
 current_shrine_xp_level=<@t>Current XP: <@q>{xp}</> (Level: <@q>{level}</>)</>
-cat_shrine_choice_dialog=Do you want to edit the cat shrine <@t>level</> or the cat shrine <@t>XP</>?:
+cat_shrine_choice_dialog=What do you want to do?:
 shrine_level_dialog=Enter cat shrine level (max: <@q>{max_level}</>):
 shrine_xp_dialog=Enter cat shrine XP (max: <@q>{max_xp}</>):
 cat_shrine_edited=<@su>Succesfully edited cat shrine</>