From f047220096621d8bdbf638cdfd3768f4abc36fec Mon Sep 17 00:00:00 2001 From: uthuluc <58225812+uthuluc@users.noreply.github.com> Date: Fri, 2 Feb 2024 12:57:45 -0500 Subject: [PATCH 1/3] Create Spring Shoes if the bean needs shoes equipped then that needs to be added when the flag is added to mafia --- .../Items of the Month/2024/Spring Shoes | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 Source/relay/TourGuide/Items of the Month/2024/Spring Shoes diff --git a/Source/relay/TourGuide/Items of the Month/2024/Spring Shoes b/Source/relay/TourGuide/Items of the Month/2024/Spring Shoes new file mode 100644 index 00000000..a510876b --- /dev/null +++ b/Source/relay/TourGuide/Items of the Month/2024/Spring Shoes @@ -0,0 +1,19 @@ +//Spring shoes +RegisterTaskGenerationFunction("IOTMSpringShoesGenerateTasks"); +void IOTMSpringShoesGenerateTasks(ChecklistEntry [int] task_entries, ChecklistEntry [int] optional_task_entries, ChecklistEntry [int] future_task_entries) +{ + if (__misc_state["in run"] && available_amount($item[spring shoes]) > 0 && my_path().id != PATH_COMMUNITY_SERVICE) + { + if ($effect[everything looks green].have_effect() == 0) + { + string [int] description; + string url = "inventory.php?ftext=spring+shoes"; + description.listAppend(HTMLGenerateSpanFont("Run away from your problems!", "green")); + if (lookupItem("spring shoes").equipped_amount() == 0) + { + description.listAppend(HTMLGenerateSpanFont("Equip the spring shoes first.", "red")); + } + task_entries.listAppend(ChecklistEntryMake("__item spring shoes", url, ChecklistSubentryMake("Spring shoes runaway available!", "", description), -11)); + } + } +} From 3880fdc7d38d7de5404bc173bd7f88efc72768c5 Mon Sep 17 00:00:00 2001 From: "DSONE\\OB8" Date: Wed, 21 Feb 2024 09:08:02 -0500 Subject: [PATCH 2/3] finish up spring shoes --- Bundle_ASH_script.py | 2 ++ .../2024/{Spring Shoes => Spring Shoes.ash} | 15 ++++++++++++++- .../Items of the Month import.ash | 1 + Source/relay/TourGuide/Support/Banishers.ash | 1 + 4 files changed, 18 insertions(+), 1 deletion(-) rename Source/relay/TourGuide/Items of the Month/2024/{Spring Shoes => Spring Shoes.ash} (51%) diff --git a/Bundle_ASH_script.py b/Bundle_ASH_script.py index ed033b87..7b3381b8 100644 --- a/Bundle_ASH_script.py +++ b/Bundle_ASH_script.py @@ -189,3 +189,5 @@ def bundle_and_write(path_to_file,path_to_result,path_to_folder = '',allow_overw if return_imported_files: return imported_files + +# bundle_and_write('relay/relay_TourGuide.ash', 'relay_TourGuide.ash', 'Source') \ No newline at end of file diff --git a/Source/relay/TourGuide/Items of the Month/2024/Spring Shoes b/Source/relay/TourGuide/Items of the Month/2024/Spring Shoes.ash similarity index 51% rename from Source/relay/TourGuide/Items of the Month/2024/Spring Shoes rename to Source/relay/TourGuide/Items of the Month/2024/Spring Shoes.ash index a510876b..a47bbb5f 100644 --- a/Source/relay/TourGuide/Items of the Month/2024/Spring Shoes +++ b/Source/relay/TourGuide/Items of the Month/2024/Spring Shoes.ash @@ -1,8 +1,10 @@ //Spring shoes RegisterTaskGenerationFunction("IOTMSpringShoesGenerateTasks"); +RegisterResourceGenerationFunction("IOTMSpringShoesGenerateResource"); + void IOTMSpringShoesGenerateTasks(ChecklistEntry [int] task_entries, ChecklistEntry [int] optional_task_entries, ChecklistEntry [int] future_task_entries) { - if (__misc_state["in run"] && available_amount($item[spring shoes]) > 0 && my_path().id != PATH_COMMUNITY_SERVICE) + if (available_amount($item[spring shoes]) > 0 && my_path().id != PATH_COMMUNITY_SERVICE) { if ($effect[everything looks green].have_effect() == 0) { @@ -17,3 +19,14 @@ void IOTMSpringShoesGenerateTasks(ChecklistEntry [int] task_entries, ChecklistEn } } } + +void IOTMSpringShoesGenerateResource(ChecklistEntry [int] resource_entries) +{ + string [int] banishDescription; + banishDescription.listAppend("All day banish, doesn't end combat"); + if (lookupItem("spring shoes").equipped_amount() == 0) + { + banishDescription.listAppend(HTMLGenerateSpanFont("Equip the spring shoes first.", "red")); + } + resource_entries.listAppend(ChecklistEntryMake("__skill spring shoes", "", ChecklistSubentryMake("Spring Kick", "", banishDescription)).ChecklistEntrySetCombinationTag("banish").ChecklistEntrySetIDTag("Spring shoes spring kick banish")); +} \ No newline at end of file diff --git a/Source/relay/TourGuide/Items of the Month/Items of the Month import.ash b/Source/relay/TourGuide/Items of the Month/Items of the Month import.ash index 8c1da66c..e84e7d37 100644 --- a/Source/relay/TourGuide/Items of the Month/Items of the Month import.ash +++ b/Source/relay/TourGuide/Items of the Month/Items of the Month import.ash @@ -145,3 +145,4 @@ import "relay/TourGuide/Items of the Month/2023/A Guide to Burning Leaves.ash"; // 2024 import "relay/TourGuide/Items of the Month/2024/Chest Mimic.ash"; +import "relay/TourGuide/Items of the Month/2024/Spring Shoes.ash"; diff --git a/Source/relay/TourGuide/Support/Banishers.ash b/Source/relay/TourGuide/Support/Banishers.ash index ddde3032..3d3d470e 100644 --- a/Source/relay/TourGuide/Support/Banishers.ash +++ b/Source/relay/TourGuide/Support/Banishers.ash @@ -106,6 +106,7 @@ static __banish_source_length["patriotic screech"] = 100; __banish_source_length["roar like a lion"] = 30; // not sure it is needed; it should generally be not more than 30 __banish_source_length["monkey slap"] = 1234567; // this, for some reason, was not properly respecting the reset condition. so imma just do this to hopefully solve it. + __banish_source_length["spring kick"] = -1; int [string] __banish_simultaneous_limit; __banish_simultaneous_limit["beancannon"] = 5; From ec652b2d8abe32f043893acc751a77a1093266d5 Mon Sep 17 00:00:00 2001 From: "DSONE\\OB8" Date: Wed, 21 Feb 2024 09:28:34 -0500 Subject: [PATCH 3/3] add back in run check for spring shoes --- Source/relay/TourGuide/Items of the Month/2024/Spring Shoes.ash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/relay/TourGuide/Items of the Month/2024/Spring Shoes.ash b/Source/relay/TourGuide/Items of the Month/2024/Spring Shoes.ash index a47bbb5f..8b739f80 100644 --- a/Source/relay/TourGuide/Items of the Month/2024/Spring Shoes.ash +++ b/Source/relay/TourGuide/Items of the Month/2024/Spring Shoes.ash @@ -4,7 +4,7 @@ RegisterResourceGenerationFunction("IOTMSpringShoesGenerateResource"); void IOTMSpringShoesGenerateTasks(ChecklistEntry [int] task_entries, ChecklistEntry [int] optional_task_entries, ChecklistEntry [int] future_task_entries) { - if (available_amount($item[spring shoes]) > 0 && my_path().id != PATH_COMMUNITY_SERVICE) + if (__misc_state["in run"] && available_amount($item[spring shoes]) > 0 && my_path().id != PATH_COMMUNITY_SERVICE) { if ($effect[everything looks green].have_effect() == 0) {