From c0e385da387822f935c7088d0bca1a96682f7091 Mon Sep 17 00:00:00 2001 From: dazedanon Date: Thu, 12 Mar 2026 23:44:19 -0500 Subject: [PATCH] Cooking finished --- gui/config_integration.py | 4 ++-- gui/workflow_tab.py | 4 ++-- modules/rpgmakermvmz.py | 10 +++++++++- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/gui/config_integration.py b/gui/config_integration.py index 76f300b..bd131a1 100644 --- a/gui/config_integration.py +++ b/gui/config_integration.py @@ -181,10 +181,10 @@ class ConfigIntegration: ("ENABLED_PATTERNS_355655", enabled_355655), ): content = re.sub( - rf'^{re.escape(var_name)}\s*(?::\s*set)?\s*=\s*.*$', + rf'^{re.escape(var_name)}\s*(?::\s*set)?\s*=\s*(?:\{{[^}}]*\}}|set\(\))', f'{var_name}: set = {_fmt(val_set)}', content, - flags=re.MULTILINE, + flags=re.MULTILINE | re.DOTALL, ) with open(module_path, "w", encoding="utf-8") as f: f.write(content) diff --git a/gui/workflow_tab.py b/gui/workflow_tab.py index 8529465..3f79732 100644 --- a/gui/workflow_tab.py +++ b/gui/workflow_tab.py @@ -1509,7 +1509,7 @@ class WorkflowTab(QWidget): self._p2_plugin_checks: dict = {} try: from modules.rpgmakermvmz import HEADER_MAPPINGS_357 as _HM357 - for idx, key in enumerate(_HM357.keys()): + for idx, key in enumerate(sorted(_HM357.keys())): cb = QCheckBox(key) cb.setStyleSheet("color:#bbb;font-size:9px;") plugin357_grid.addWidget(cb, idx // 2, idx % 2) @@ -1542,7 +1542,7 @@ class WorkflowTab(QWidget): self._p2_pattern_checks: dict = {} try: from modules.rpgmakermvmz import PATTERNS_355655 as _PAT - for idx, key in enumerate(_PAT.keys()): + for idx, key in enumerate(sorted(_PAT.keys())): cb = QCheckBox(key) cb.setStyleSheet("color:#bbb;font-size:9px;") patterns_grid.addWidget(cb, idx // 2, idx % 2) diff --git a/modules/rpgmakermvmz.py b/modules/rpgmakermvmz.py index 52c6ae6..e327112 100644 --- a/modules/rpgmakermvmz.py +++ b/modules/rpgmakermvmz.py @@ -183,9 +183,17 @@ HEADER_MAPPINGS_357 = { "TorigoyaMZ_NotifyMessage_CommandMessage": (["message"], None), "NUUN_SaveScreen": (["AnyName"], None), "build/ARPG_Core": (["Text", "SkillByName"], None), + "EventLabel": (["text"], None), + "KN_MapBattle": (["enemyName"], None), + "KN_Shop": (["goodsType"], None), + "Mano_CurrencyUnit": (["unit"], None), + "SceneGlossary": (["category"], None), + # No visible text — keys hold asset/internal IDs, not display text: + "KN_StillManager": (["id"], None), + "TemplateEvent": (["eventId"], None), } # Subset of HEADER_MAPPINGS_357 keys that should be processed (empty = none). -ENABLED_PLUGINS_357: set = {"TorigoyaMZ_NotifyMessage_CommandMessage"} +ENABLED_PLUGINS_357: set = {"EventLabel", "KN_MapBattle", "KN_Shop", "Mano_CurrencyUnit", "SceneGlossary", "TorigoyaMZ_NotifyMessage", "TorigoyaMZ_NotifyMessage_CommandMessage"} # All known code-355/655 script patterns. Enable entries via ENABLED_PATTERNS_355655. PATTERNS_355655 = {