version push + two very small bugfixes

loathers · Sep 9, 2023 · 1b9dd34 · 1b9dd34
1 parent 78b9bdf
commit 1b9dd34
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 16 deletions.
diff --git a/Source/relay/TourGuide/Sets/Fax.ash b/Source/relay/TourGuide/Sets/Fax.ash
@@ -15,20 +15,20 @@ string [int] SFaxGeneratePotentialFaxes(boolean suggest_less_powerful_faxes, boo
 
     if (__misc_state["in run"])
     {
-
-        if (!familiar_is_usable($familiar[angry jung man]))
-        {
-            //Can't pull for jar of psychoses, no jung man...
-            //It's time for a g-g-g-ghost! zoinks!
-            if (!__quest_state["Level 13"].state_boolean["digital key used"] && ($item[digital key].available_amount() + creatable_amount($item[digital key])) == 0)
-            {
-                string line = "Ghost - only if you can copy it.";
-                if (can_arrow)
-                    line += " (arrow?)";
-                line += "|*5 white pixels drop per ghost, speeds up digital key. Run +150% item.";
-                potential_faxes.listAppend(line);
-            }
-        }
+        // Remove Ghost because it is now bad now that you don't actually need white pixels.
+        // if (!familiar_is_usable($familiar[angry jung man]))
+        // {
+        //     //Can't pull for jar of psychoses, no jung man...
+        //     //It's time for a g-g-g-ghost! zoinks!
+        //     if (!__quest_state["Level 13"].state_boolean["digital key used"] && ($item[digital key].available_amount() + creatable_amount($item[digital key])) == 0)
+        //     {
+        //         string line = "Ghost - only if you can copy it.";
+        //         if (can_arrow)
+        //             line += " (arrow?)";
+        //         line += "|*5 white pixels drop per ghost, speeds up digital key. Run +150% item.";
+        //         potential_faxes.listAppend(line);
+        //     }
+        // }
         //sleepy mariachi
         if (familiar_is_usable($familiar[fancypants scarecrow]) || familiar_is_usable($familiar[mad hatrack]))
         {

diff --git a/Source/relay/TourGuide/Settings.ash b/Source/relay/TourGuide/Settings.ash
@@ -1,5 +1,5 @@
 //These settings are for development. Don't worry about editing them.
-string __version = "2.1.0";
+string __version = "2.2.0"; // pushed to 2.2.0 on new pull list refactor
 
 //Path and name of the .js file. In case you change either.
 string __javascript = "TourGuide/TourGuide.js";

diff --git a/Source/relay/TourGuide/Support/Banishers.ash b/Source/relay/TourGuide/Support/Banishers.ash
@@ -97,8 +97,8 @@ static
 	__banish_source_length["system sweep"] = -1;
 	__banish_source_length["feel hatred"] = 50;
 	__banish_source_length["show your boring familiar pictures"] = 100;
+	__banish_source_length["bowl a curveball"] = 5;
 	__banish_source_length["patriotic screech"] = 100;
-	__banish_source_length["bowl a curveball"] = get_property_int("cosmicBowlingBallReturnCombats");
 	__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.
 
     int [string] __banish_simultaneous_limit;
@@ -145,6 +145,7 @@ Banish [int] BanishesActive()
         b.banish_turn_length = 0;
         if (__banish_source_length contains b.banish_source.to_lower_case())
             b.banish_turn_length = __banish_source_length[b.banish_source.to_lower_case()];
+            if (b.banish_source == "bowl a curveball") b.banish_turn_length = get_property_int("cosmicBowlingBallReturnCombats");
         if (b.banish_source == "batter up!" || b.banish_source == "deathchucks" || b.banish_source == "dirty stinkbomb" || b.banish_source == "nanorhino" || b.banish_source == "spooky music box mechanism" || b.banish_source == "ice hotel bell" || b.banish_source == "beancannon" || b.banish_source == "monkey slap")
             b.custom_reset_conditions = "rollover";
         if (b.banish_source == "ice house" && (!$item[ice house].is_unrestricted() || in_bad_moon())) //not relevant