From 6d15499f14fd75e51ee8c4de6bfee50e060bd157 Mon Sep 17 00:00:00 2001 From: GSKirox <65768236+GSKirox@users.noreply.github.com> Date: Wed, 8 Jan 2025 13:09:17 +0100 Subject: [PATCH 1/2] Expand scarecrow behavior to 3 options --- ItemPool.py | 2 +- Patches.py | 7 +++--- SettingsList.py | 20 ++++++++++++----- data/Glitched World/Overworld.json | 2 +- data/World/Overworld.json | 2 +- data/presets_default.json | 22 +++++++++---------- data/settings_mapping.json | 2 +- ...plando-goals-exclusions-skulls-bridge.json | 2 +- .../plando-goals-exclusions-skulls-gbk.json | 2 +- .../plando-goals-exclusions-var-dungeons.json | 2 +- .../plando-goals-exclusions-var-meds.json | 2 +- .../plando-goals-exclusions-var-stones.json | 2 +- ...-multiworld-crisscross-entrance-locks.json | 2 +- .../plando/plando-goals-priority-bridge.json | 2 +- .../plando/plando-goals-priority-custom.json | 2 +- tests/plando/plando-goals-priority-gbk.json | 2 +- .../plando-goals-priority-mixed-trials.json | 2 +- tests/plando/plando-goals-priority-mixed.json | 2 +- .../plando-goals-priority-triforce-hunt.json | 2 +- .../plando-goals-starting-items-fallback.json | 2 +- .../plando-goals-starting-items-trials.json | 2 +- tests/plando/plando-table-tests.json | 2 +- 22 files changed, 49 insertions(+), 38 deletions(-) diff --git a/ItemPool.py b/ItemPool.py index be6b7f823..50992a033 100644 --- a/ItemPool.py +++ b/ItemPool.py @@ -915,7 +915,7 @@ def get_pool_core(world: World) -> tuple[list[str], dict[str, Item]]: else: pending_junk_pool.append(rupee) - if world.settings.free_scarecrow: + if world.settings.scarecrow_behavior == 'free': world.state.collect(ItemFactory('Scarecrow Song', world)) if world.settings.no_epona_race: diff --git a/Patches.py b/Patches.py index 28ff0cd3d..f846812df 100644 --- a/Patches.py +++ b/Patches.py @@ -2103,9 +2103,10 @@ def update_scrub_text(message: bytearray, text_replacement: list[str], default_p # f.write("\t0x%04X: \"%s\",\n" % (m.id, m.get_python_string())) # f.write('}\n') - if world.settings.free_scarecrow: - # Played song as adult - save_context.write_bits(0x0EE6, 0x10) + if world.settings.scarecrow_behavior != 'vanilla': + if world.settings.scarecrow_behavior == 'free': + # Played song as adult + save_context.write_bits(0x0EE6, 0x10) # Direct scarecrow behavior symbol = rom.sym('FREE_SCARECROW_ENABLED') rom.write_byte(symbol, 0x01) diff --git a/SettingsList.py b/SettingsList.py index f69a270ac..dc3b4d77d 100644 --- a/SettingsList.py +++ b/SettingsList.py @@ -3286,12 +3286,22 @@ class SettingInfos: shared = True, ) - free_scarecrow = Checkbutton( - gui_text = "Free Scarecrow's Song", + scarecrow_behavior = Combobox( + gui_text = 'Scarecrow Behavior', + default = 'vanilla', + choices = { + 'vanilla': 'Vanilla', + 'fast': 'Fast', + 'free': 'Free', + }, gui_tooltip = '''\ - Pulling out the Ocarina near a - spot at which Pierre can spawn will - do so, without needing the song. + "Fast" will require setting the same song + both as child and adult, but pulling out + the Ocarina near a spot at which Pierre can + spawn will do so, without needing the song. + + "Free" removes both the need to set the song first + and to play the song to summon Pierre. ''', shared = True, ) diff --git a/data/Glitched World/Overworld.json b/data/Glitched World/Overworld.json index 2eb841b40..014f838b3 100644 --- a/data/Glitched World/Overworld.json +++ b/data/Glitched World/Overworld.json @@ -232,7 +232,7 @@ "Bonooru": "is_child and Ocarina and has_all_notes_for_song(Scarecrow_Song)" }, "locations": { - "Pierre": "is_adult and Bonooru and not free_scarecrow", + "Pierre": "is_adult and Bonooru and scarecrow_behavior != 'free'", "LH Underwater Item": "is_child and can_dive", "LH Sun": " is_adult and diff --git a/data/World/Overworld.json b/data/World/Overworld.json index b7e0aebed..eb48c6fcf 100644 --- a/data/World/Overworld.json +++ b/data/World/Overworld.json @@ -521,7 +521,7 @@ "Bonooru": "is_child and Ocarina and has_all_notes_for_song(Scarecrow_Song)" }, "locations": { - "Pierre": "is_adult and Bonooru and not free_scarecrow", + "Pierre": "is_adult and Bonooru and scarecrow_behavior != 'free'", "LH Sun": "(can_use(Distant_Scarecrow) or 'Water Temple Clear') and can_use(Bow)", "LH Freestanding PoH": " is_adult and (can_use(Scarecrow) or here(can_plant_bean))", diff --git a/data/presets_default.json b/data/presets_default.json index 140c7bade..05d88ef4b 100644 --- a/data/presets_default.json +++ b/data/presets_default.json @@ -128,7 +128,7 @@ "complete_mask_quest": false, "useful_cutscenes": false, "fast_chests": true, - "free_scarecrow": true, + "scarecrow_behavior": "free", "fast_bunny_hood": true, "auto_equip_masks": false, "plant_beans": false, @@ -344,7 +344,7 @@ "complete_mask_quest": false, "useful_cutscenes": false, "fast_chests": true, - "free_scarecrow": false, + "scarecrow_behavior": "vanilla", "fast_bunny_hood": true, "auto_equip_masks": false, "plant_beans": false, @@ -551,7 +551,7 @@ "complete_mask_quest": false, "useful_cutscenes": false, "fast_chests": true, - "free_scarecrow": false, + "scarecrow_behavior": "vanilla", "fast_bunny_hood": true, "auto_equip_masks": false, "plant_beans": false, @@ -765,7 +765,7 @@ "complete_mask_quest": false, "useful_cutscenes": true, "fast_chests": true, - "free_scarecrow": false, + "scarecrow_behavior": "vanilla", "fast_bunny_hood": false, "auto_equip_masks": false, "plant_beans": false, @@ -981,7 +981,7 @@ "complete_mask_quest": false, "useful_cutscenes": false, "fast_chests": true, - "free_scarecrow": true, + "scarecrow_behavior": "free", "fast_bunny_hood": true, "auto_equip_masks": false, "plant_beans": false, @@ -1191,7 +1191,7 @@ "complete_mask_quest": false, "useful_cutscenes": false, "fast_chests": true, - "free_scarecrow": true, + "scarecrow_behavior": "free", "fast_bunny_hood": true, "auto_equip_masks": false, "plant_beans": false, @@ -1585,7 +1585,7 @@ "complete_mask_quest": false, "useful_cutscenes": false, "fast_chests": false, - "free_scarecrow": false, + "scarecrow_behavior": "vanilla", "fast_bunny_hood": false, "auto_equip_masks": false, "plant_beans": false, @@ -1777,7 +1777,7 @@ "complete_mask_quest": false, "useful_cutscenes": false, "fast_chests": true, - "free_scarecrow": false, + "scarecrow_behavior": "vanilla", "fast_bunny_hood": false, "auto_equip_masks": false, "plant_beans": false, @@ -2001,7 +2001,7 @@ "complete_mask_quest": false, "useful_cutscenes": false, "fast_chests": true, - "free_scarecrow": false, + "scarecrow_behavior": "vanilla", "fast_bunny_hood": true, "auto_equip_masks": false, "plant_beans": true, @@ -2221,7 +2221,7 @@ "complete_mask_quest": false, "useful_cutscenes": false, "fast_chests": true, - "free_scarecrow": true, + "scarecrow_behavior": "free", "fast_bunny_hood": true, "auto_equip_masks": false, "plant_beans": false, @@ -2406,7 +2406,7 @@ "complete_mask_quest": true, "useful_cutscenes": true, "fast_chests": true, - "free_scarecrow": false, + "scarecrow_behavior": "vanilla", "fast_bunny_hood": false, "auto_equip_masks": false, "plant_beans": false, diff --git a/data/settings_mapping.json b/data/settings_mapping.json index 846636c89..3df45b632 100644 --- a/data/settings_mapping.json +++ b/data/settings_mapping.json @@ -341,7 +341,7 @@ "complete_mask_quest", "useful_cutscenes", "fast_chests", - "free_scarecrow", + "scarecrow_behavior", "fast_bunny_hood", "auto_equip_masks", "plant_beans", diff --git a/tests/plando/plando-goals-exclusions-skulls-bridge.json b/tests/plando/plando-goals-exclusions-skulls-bridge.json index 34a5a3f75..0ca421a0c 100644 --- a/tests/plando/plando-goals-exclusions-skulls-bridge.json +++ b/tests/plando/plando-goals-exclusions-skulls-bridge.json @@ -27,7 +27,7 @@ "complete_mask_quest": false, "fast_chests": true, "logic_no_night_tokens_without_suns_song": false, - "free_scarecrow": false, + "scarecrow_behavior": "vanilla", "fast_bunny_hood": true, "start_with_rupees": false, "start_with_consumables": true, diff --git a/tests/plando/plando-goals-exclusions-skulls-gbk.json b/tests/plando/plando-goals-exclusions-skulls-gbk.json index 0bfa0575f..5d74d7e63 100644 --- a/tests/plando/plando-goals-exclusions-skulls-gbk.json +++ b/tests/plando/plando-goals-exclusions-skulls-gbk.json @@ -27,7 +27,7 @@ "complete_mask_quest": false, "fast_chests": true, "logic_no_night_tokens_without_suns_song": false, - "free_scarecrow": false, + "scarecrow_behavior": "vanilla", "fast_bunny_hood": true, "start_with_rupees": false, "start_with_consumables": true, diff --git a/tests/plando/plando-goals-exclusions-var-dungeons.json b/tests/plando/plando-goals-exclusions-var-dungeons.json index 654f5f2e1..73b8bc2c2 100644 --- a/tests/plando/plando-goals-exclusions-var-dungeons.json +++ b/tests/plando/plando-goals-exclusions-var-dungeons.json @@ -27,7 +27,7 @@ "complete_mask_quest": false, "fast_chests": true, "logic_no_night_tokens_without_suns_song": false, - "free_scarecrow": false, + "scarecrow_behavior": "vanilla", "fast_bunny_hood": true, "start_with_rupees": false, "start_with_consumables": true, diff --git a/tests/plando/plando-goals-exclusions-var-meds.json b/tests/plando/plando-goals-exclusions-var-meds.json index 408d29ae1..5b50582ef 100644 --- a/tests/plando/plando-goals-exclusions-var-meds.json +++ b/tests/plando/plando-goals-exclusions-var-meds.json @@ -27,7 +27,7 @@ "complete_mask_quest": false, "fast_chests": true, "logic_no_night_tokens_without_suns_song": false, - "free_scarecrow": false, + "scarecrow_behavior": "vanilla", "fast_bunny_hood": true, "start_with_rupees": false, "start_with_consumables": true, diff --git a/tests/plando/plando-goals-exclusions-var-stones.json b/tests/plando/plando-goals-exclusions-var-stones.json index e96011d55..f88d52687 100644 --- a/tests/plando/plando-goals-exclusions-var-stones.json +++ b/tests/plando/plando-goals-exclusions-var-stones.json @@ -27,7 +27,7 @@ "complete_mask_quest": false, "fast_chests": true, "logic_no_night_tokens_without_suns_song": false, - "free_scarecrow": false, + "scarecrow_behavior": "vanilla", "fast_bunny_hood": true, "start_with_rupees": false, "start_with_consumables": true, diff --git a/tests/plando/plando-goals-multiworld-crisscross-entrance-locks.json b/tests/plando/plando-goals-multiworld-crisscross-entrance-locks.json index 180a53b19..611a12e1d 100644 --- a/tests/plando/plando-goals-multiworld-crisscross-entrance-locks.json +++ b/tests/plando/plando-goals-multiworld-crisscross-entrance-locks.json @@ -27,7 +27,7 @@ "complete_mask_quest": false, "fast_chests": true, "logic_no_night_tokens_without_suns_song": false, - "free_scarecrow": false, + "scarecrow_behavior": "vanilla", "fast_bunny_hood": true, "start_with_rupees": false, "start_with_consumables": true, diff --git a/tests/plando/plando-goals-priority-bridge.json b/tests/plando/plando-goals-priority-bridge.json index 2e553ba40..1d3a29f4c 100644 --- a/tests/plando/plando-goals-priority-bridge.json +++ b/tests/plando/plando-goals-priority-bridge.json @@ -27,7 +27,7 @@ "complete_mask_quest": false, "fast_chests": true, "logic_no_night_tokens_without_suns_song": false, - "free_scarecrow": false, + "scarecrow_behavior": "vanilla", "fast_bunny_hood": true, "start_with_rupees": false, "start_with_consumables": true, diff --git a/tests/plando/plando-goals-priority-custom.json b/tests/plando/plando-goals-priority-custom.json index 2e731d32e..251e4cece 100644 --- a/tests/plando/plando-goals-priority-custom.json +++ b/tests/plando/plando-goals-priority-custom.json @@ -27,7 +27,7 @@ "complete_mask_quest": false, "fast_chests": true, "logic_no_night_tokens_without_suns_song": false, - "free_scarecrow": false, + "scarecrow_behavior": "vanilla", "fast_bunny_hood": true, "start_with_rupees": false, "start_with_consumables": true, diff --git a/tests/plando/plando-goals-priority-gbk.json b/tests/plando/plando-goals-priority-gbk.json index 2dd5cb6e1..c33bf14e6 100644 --- a/tests/plando/plando-goals-priority-gbk.json +++ b/tests/plando/plando-goals-priority-gbk.json @@ -26,7 +26,7 @@ "complete_mask_quest": false, "fast_chests": true, "logic_no_night_tokens_without_suns_song": false, - "free_scarecrow": false, + "scarecrow_behavior": "vanilla", "fast_bunny_hood": true, "start_with_rupees": false, "start_with_consumables": true, diff --git a/tests/plando/plando-goals-priority-mixed-trials.json b/tests/plando/plando-goals-priority-mixed-trials.json index 8c01b50c6..44d128657 100644 --- a/tests/plando/plando-goals-priority-mixed-trials.json +++ b/tests/plando/plando-goals-priority-mixed-trials.json @@ -27,7 +27,7 @@ "complete_mask_quest": false, "fast_chests": true, "logic_no_night_tokens_without_suns_song": false, - "free_scarecrow": false, + "scarecrow_behavior": "vanilla", "fast_bunny_hood": true, "start_with_rupees": false, "start_with_consumables": true, diff --git a/tests/plando/plando-goals-priority-mixed.json b/tests/plando/plando-goals-priority-mixed.json index b82614367..8d395969a 100644 --- a/tests/plando/plando-goals-priority-mixed.json +++ b/tests/plando/plando-goals-priority-mixed.json @@ -27,7 +27,7 @@ "complete_mask_quest": false, "fast_chests": true, "logic_no_night_tokens_without_suns_song": false, - "free_scarecrow": false, + "scarecrow_behavior": "vanilla", "fast_bunny_hood": true, "start_with_rupees": false, "start_with_consumables": true, diff --git a/tests/plando/plando-goals-priority-triforce-hunt.json b/tests/plando/plando-goals-priority-triforce-hunt.json index 4aa699e79..eebc5d62c 100644 --- a/tests/plando/plando-goals-priority-triforce-hunt.json +++ b/tests/plando/plando-goals-priority-triforce-hunt.json @@ -28,7 +28,7 @@ "complete_mask_quest": false, "fast_chests": true, "logic_no_night_tokens_without_suns_song": false, - "free_scarecrow": false, + "scarecrow_behavior": "vanilla", "fast_bunny_hood": true, "start_with_rupees": false, "start_with_consumables": true, diff --git a/tests/plando/plando-goals-starting-items-fallback.json b/tests/plando/plando-goals-starting-items-fallback.json index 615b40513..45001a1f0 100644 --- a/tests/plando/plando-goals-starting-items-fallback.json +++ b/tests/plando/plando-goals-starting-items-fallback.json @@ -27,7 +27,7 @@ "complete_mask_quest": false, "fast_chests": true, "logic_no_night_tokens_without_suns_song": false, - "free_scarecrow": false, + "scarecrow_behavior": "vanilla", "fast_bunny_hood": true, "start_with_rupees": false, "start_with_consumables": true, diff --git a/tests/plando/plando-goals-starting-items-trials.json b/tests/plando/plando-goals-starting-items-trials.json index d048f023c..c036d254a 100644 --- a/tests/plando/plando-goals-starting-items-trials.json +++ b/tests/plando/plando-goals-starting-items-trials.json @@ -27,7 +27,7 @@ "complete_mask_quest": false, "fast_chests": true, "logic_no_night_tokens_without_suns_song": false, - "free_scarecrow": false, + "scarecrow_behavior": "vanilla", "fast_bunny_hood": true, "start_with_rupees": false, "start_with_consumables": true, diff --git a/tests/plando/plando-table-tests.json b/tests/plando/plando-table-tests.json index 75a6afdbc..7ac0c3a42 100644 --- a/tests/plando/plando-table-tests.json +++ b/tests/plando/plando-table-tests.json @@ -172,7 +172,7 @@ "complete_mask_quest": false, "useful_cutscenes": false, "fast_chests": true, - "free_scarecrow": false, + "scarecrow_behavior": "vanilla", "fast_bunny_hood": true, "auto_equip_masks": true, "plant_beans": false, From 5332e719001d7b71380a74c9853e00a870bebc87 Mon Sep 17 00:00:00 2001 From: GSKirox <65768236+GSKirox@users.noreply.github.com> Date: Wed, 8 Jan 2025 13:36:28 +0100 Subject: [PATCH 2/2] Forgot .sav CI tests --- tests/disables.sav | 2 +- tests/entrance.sav | 2 +- tests/entrance2.sav | 2 +- tests/entrance3.sav | 2 +- tests/glitched-standard.sav | 2 +- tests/glitched-tokens.sav | 2 +- tests/ludicrous.sav | 2 +- tests/mq.sav | 2 +- tests/multiworld.sav | 2 +- tests/nightforest.sav | 2 +- tests/plentiful.sav | 2 +- tests/tokensanity.sav | 2 +- tests/triforce-multiworld.sav | 2 +- tests/triforce-startingitems.sav | 2 +- tests/triforce.sav | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/tests/disables.sav b/tests/disables.sav index c16611522..38336f89f 100644 --- a/tests/disables.sav +++ b/tests/disables.sav @@ -23,7 +23,7 @@ "trials_random": false, "trials": 0, "logic_no_night_tokens_without_suns_song": false, -"free_scarecrow": false, +"scarecrow_behavior": "vanilla", "big_poe_count_random": false, "big_poe_count": 1, "shuffle_kokiri_sword": true, diff --git a/tests/entrance.sav b/tests/entrance.sav index e106de979..818e1095e 100644 --- a/tests/entrance.sav +++ b/tests/entrance.sav @@ -18,7 +18,7 @@ "trials_random": false, "trials": 0, "logic_no_night_tokens_without_suns_song": false, -"free_scarecrow": false, +"scarecrow_behavior": "vanilla", "big_poe_count_random": false, "big_poe_count": 1, "shuffle_kokiri_sword": true, diff --git a/tests/entrance2.sav b/tests/entrance2.sav index 4b5e640e4..f89d23e8c 100644 --- a/tests/entrance2.sav +++ b/tests/entrance2.sav @@ -19,7 +19,7 @@ "trials_random": false, "trials": 0, "logic_no_night_tokens_without_suns_song": false, -"free_scarecrow": false, +"scarecrow_behavior": "vanilla", "big_poe_count_random": false, "big_poe_count": 1, "shuffle_kokiri_sword": true, diff --git a/tests/entrance3.sav b/tests/entrance3.sav index c4058dda8..fad930f6f 100644 --- a/tests/entrance3.sav +++ b/tests/entrance3.sav @@ -17,7 +17,7 @@ "trials_random": false, "trials": 0, "logic_no_night_tokens_without_suns_song": false, -"free_scarecrow": false, +"scarecrow_behavior": "vanilla", "start_with_consumables": false, "big_poe_count_random": false, "big_poe_count": 1, diff --git a/tests/glitched-standard.sav b/tests/glitched-standard.sav index f418aac13..558da177e 100644 --- a/tests/glitched-standard.sav +++ b/tests/glitched-standard.sav @@ -38,7 +38,7 @@ "no_epona_race": false, "useful_cutscenes": true, "fast_chests": true, - "free_scarecrow": false, + "scarecrow_behavior": "vanilla", "start_with_rupees": false, "start_with_consumables": false, "plant_beans": false, diff --git a/tests/glitched-tokens.sav b/tests/glitched-tokens.sav index 5665d5153..2980bb21b 100644 --- a/tests/glitched-tokens.sav +++ b/tests/glitched-tokens.sav @@ -22,7 +22,7 @@ "one_item_per_dungeon": false, "trials_random": false, "trials": 0, -"free_scarecrow": false, +"scarecrow_behavior": "vanilla", "big_poe_count_random": false, "big_poe_count": 1, "shuffle_kokiri_sword": true, diff --git a/tests/ludicrous.sav b/tests/ludicrous.sav index 38b12c22c..88cdc3566 100644 --- a/tests/ludicrous.sav +++ b/tests/ludicrous.sav @@ -23,7 +23,7 @@ "trials_random": false, "trials": 0, "logic_no_night_tokens_without_suns_song": false, -"free_scarecrow": false, +"scarecrow_behavior": "vanilla", "big_poe_count_random": false, "big_poe_count": 1, "shuffle_kokiri_sword": true, diff --git a/tests/mq.sav b/tests/mq.sav index 2b751d31e..1d13ce35b 100644 --- a/tests/mq.sav +++ b/tests/mq.sav @@ -23,7 +23,7 @@ "trials_random": false, "trials": 0, "logic_no_night_tokens_without_suns_song": false, -"free_scarecrow": false, +"scarecrow_behavior": "vanilla", "big_poe_count_random": false, "big_poe_count": 1, "shuffle_kokiri_sword": true, diff --git a/tests/multiworld.sav b/tests/multiworld.sav index 68f0490ef..c7f639a80 100644 --- a/tests/multiworld.sav +++ b/tests/multiworld.sav @@ -20,7 +20,7 @@ "one_item_per_dungeon": false, "trials_random": true, "logic_no_night_tokens_without_suns_song": false, -"free_scarecrow": false, +"scarecrow_behavior": "vanilla", "big_poe_count_random": false, "big_poe_count": 1, "shuffle_kokiri_sword": true, diff --git a/tests/nightforest.sav b/tests/nightforest.sav index c5b6b6674..ae1f1ab1d 100644 --- a/tests/nightforest.sav +++ b/tests/nightforest.sav @@ -23,7 +23,7 @@ "trials_random": false, "trials": 6, "logic_no_night_tokens_without_suns_song": false, -"free_scarecrow": false, +"scarecrow_behavior": "vanilla", "big_poe_count_random": false, "big_poe_count": 1, "shuffle_kokiri_sword": true, diff --git a/tests/plentiful.sav b/tests/plentiful.sav index ea4e26170..ce85eab9b 100644 --- a/tests/plentiful.sav +++ b/tests/plentiful.sav @@ -23,7 +23,7 @@ "trials_random": false, "trials": 0, "logic_no_night_tokens_without_suns_song": false, -"free_scarecrow": false, +"scarecrow_behavior": "vanilla", "big_poe_count_random": false, "big_poe_count": 1, "shuffle_kokiri_sword": true, diff --git a/tests/tokensanity.sav b/tests/tokensanity.sav index 7dac88df4..366ce7795 100644 --- a/tests/tokensanity.sav +++ b/tests/tokensanity.sav @@ -23,7 +23,7 @@ "trials_random": false, "trials": 0, "logic_no_night_tokens_without_suns_song": false, -"free_scarecrow": false, +"scarecrow_behavior": "vanilla", "big_poe_count_random": false, "big_poe_count": 1, "shuffle_kokiri_sword": true, diff --git a/tests/triforce-multiworld.sav b/tests/triforce-multiworld.sav index 57b820cdd..c6e0c0cdc 100644 --- a/tests/triforce-multiworld.sav +++ b/tests/triforce-multiworld.sav @@ -22,7 +22,7 @@ "trials_random": false, "trials": 0, "logic_no_night_tokens_without_suns_song": false, -"free_scarecrow": false, +"scarecrow_behavior": "vanilla", "start_with_consumables": false, "big_poe_count_random": false, "big_poe_count": 1, diff --git a/tests/triforce-startingitems.sav b/tests/triforce-startingitems.sav index d12c54a7f..93fb8f850 100644 --- a/tests/triforce-startingitems.sav +++ b/tests/triforce-startingitems.sav @@ -25,7 +25,7 @@ "trials_random": false, "trials": 0, "logic_no_night_tokens_without_suns_song": false, -"free_scarecrow": false, +"scarecrow_behavior": "vanilla", "start_with_consumables": true, "big_poe_count_random": false, "big_poe_count": 1, diff --git a/tests/triforce.sav b/tests/triforce.sav index b3bb7c8a7..e977e76fc 100644 --- a/tests/triforce.sav +++ b/tests/triforce.sav @@ -23,7 +23,7 @@ "trials_random": false, "trials": 0, "logic_no_night_tokens_without_suns_song": false, -"free_scarecrow": false, +"scarecrow_behavior": "vanilla", "start_with_consumables": true, "big_poe_count_random": false, "big_poe_count": 1,