Merge branch 'tes-candy-cane-sword-cane' of https://github.com/loathe…

…rs/TourGuide into tes-candy-cane-sword-cane
loathers · Mar 2, 2024 · cf8606b · cf8606b
2 parents 2a764e1 + 37d1119
commit cf8606b
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 0 deletions.
diff --git 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')
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
@@ -0,0 +1,32 @@
+//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 ($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));
+		}
+	}
+}
+
+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"));
+}
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
@@ -146,3 +146,4 @@ import "relay/TourGuide/Items of the Month/2023/Candy Cane Sword Cane.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
@@ -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;