From ba46f40acf07a1653d33976a4e770e34107c8f70 Mon Sep 17 00:00:00 2001 From: Thanatos Date: Mon, 2 Oct 2023 20:47:26 +0200 Subject: [PATCH] Use magic naming for heatzone actor Fix multiline export from RDV --- open_samus_returns_rando/lua_editor.py | 2 +- .../specific_patches/heat_room_patches.py | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/open_samus_returns_rando/lua_editor.py b/open_samus_returns_rando/lua_editor.py index 81f030f..7bc4025 100644 --- a/open_samus_returns_rando/lua_editor.py +++ b/open_samus_returns_rando/lua_editor.py @@ -92,7 +92,7 @@ def get_script_class(self, pickup: dict, actordef_name: str = "") -> str: "name": class_name, "resources": resources, "parent": parent, - "caption": lua_util.wrap_string(pickup["caption"]), + "caption": lua_util.wrap_string(pickup["caption"].replace("\n", "\\n")), "sound": lua_util.wrap_string(sound), } diff --git a/open_samus_returns_rando/specific_patches/heat_room_patches.py b/open_samus_returns_rando/specific_patches/heat_room_patches.py index 5336627..adb26a2 100644 --- a/open_samus_returns_rando/specific_patches/heat_room_patches.py +++ b/open_samus_returns_rando/specific_patches/heat_room_patches.py @@ -164,12 +164,12 @@ def _patch_area_5_2(editor: PatcherEditor): scenario_5.raw["objects_c"]["LS_Heat_002"] = new_logic_shape heat_actor = _get_heat_trigger(editor) - new_actor = editor.copy_actor(name_of_scenario, (5600.0, 16000.0, 0.0), heat_actor, "TG_Heat_004", 2) + new_actor = editor.copy_actor(name_of_scenario, (5600.0, 16000.0, 0.0), heat_actor, "TG_Heat_033", 2) new_actor["components"][0]["arguments"][16]["value"] = "LS_Heat_002" - scenario_5.add_actor_to_entity_groups("collision_camera_009", "TG_Heat_004", True) - scenario_5.add_actor_to_entity_groups("collision_camera_015", "TG_Heat_004", True) - scenario_5.add_actor_to_entity_groups("collision_camera_017", "TG_Heat_004", True) + scenario_5.add_actor_to_entity_groups("collision_camera_009", "TG_Heat_033", True) + scenario_5.add_actor_to_entity_groups("collision_camera_015", "TG_Heat_033", True) + scenario_5.add_actor_to_entity_groups("collision_camera_017", "TG_Heat_033", True) def _patch_area_6_b(editor: PatcherEditor): name_of_scenario = "s065_area6b"