diff --git a/ff_draw/gui/panel.py b/ff_draw/gui/panel.py index 7c0cc3e..813e41a 100644 --- a/ff_draw/gui/panel.py +++ b/ff_draw/gui/panel.py @@ -58,8 +58,8 @@ def ffd_page(self): p.unload() self.main.enable_plugins[k] = v self.main.save_config() - if imgui.button('reload'): - plugins.reload_plugin_lists() + # if imgui.button('reload'): + # plugins.reload_plugin_lists() imgui.text('gui') gui = self.main.gui diff --git a/ff_draw/mem/__init__.py b/ff_draw/mem/__init__.py index 12b87fc..5cdbeea 100644 --- a/ff_draw/mem/__init__.py +++ b/ff_draw/mem/__init__.py @@ -22,7 +22,7 @@ def __init__(self, main: 'FFDraw', pid: int): self.hwnd = utils.get_hwnd(self.pid) self.game_version, self.game_build_date = utils.get_game_version_info(file_name) self.screen_address = self.scanner.find_point('48 ? ? * * * * e8 ? ? ? ? 42 ? ? ? 39 05')[0] + 0x1b4 - self.replay_flag_address = self.scanner.find_point('f6 05 * * * * ? 45 ? ? 8b')[0] + self.replay_flag_address = self.scanner.find_point('84 1d * * * * 74 ? 80 3d')[0] self.territory_type_address = self.scanner.find_point('0f b7 ? * * * * 48 8d ? ? ? f3 0f ? ? 33 d2')[0] self.actor_table = actor.ActorTable(self) self.party = party.PartyManager(self) diff --git a/ff_draw/sniffer/message_structs/zone_server.py b/ff_draw/sniffer/message_structs/zone_server.py index a26bfa5..44e681c 100644 --- a/ff_draw/sniffer/message_structs/zone_server.py +++ b/ff_draw/sniffer/message_structs/zone_server.py @@ -334,7 +334,7 @@ def name(self) -> str: @property def fc_tag(self) -> str: - return self._fc_tag.decode('utf-8', 'ignore') + return self.__fc_tag.decode('utf-8', 'ignore') @type_map.set(ZoneServer.NpcSpawn) diff --git a/nylib/utils/win32/inject_rpc.py b/nylib/utils/win32/inject_rpc.py index c03c870..cbe42de 100644 --- a/nylib/utils/win32/inject_rpc.py +++ b/nylib/utils/win32/inject_rpc.py @@ -100,7 +100,7 @@ def run(self, code, res_key='res'): def pywin32_dll_place(): dll_suffix = f"{sys.version_info.major}{sys.version_info.minor}.dll" - target_dir = pathlib.Path(os.environ['SystemDrive']) / 'Windows' / 'System32' + target_dir = pathlib.Path(os.environ['SystemDrive'] + os.sep) / 'Windows' / 'System32' for prefix in ('pythoncom', 'pywintypes'): dll_name = prefix + dll_suffix target_path = target_dir / dll_name diff --git a/version.txt b/version.txt index b60d719..7ada0d3 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -0.8.4 +0.8.5