updates per review

loathers · Oct 14, 2023 · 87531d1 · 87531d1
1 parent 96bc2b4
commit 87531d1
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 9 deletions.
diff --git a/RELEASE/scripts/autoscend/auto_equipment.ash b/RELEASE/scripts/autoscend/auto_equipment.ash
@@ -663,12 +663,6 @@ void finalizeMaximize(boolean speculative)
 		//100 to 200 bonus for diminishing returns when drams already high
 		addBonusToMaximize($item[tiny stillsuit], (100 + to_int(100*min(1,(10.0 / max(1,auto_expectedStillsuitAdvs()))))));
 	}
-	if(my_familiar() == $familiar[Jill-of-All-Trades] && item_amount($item[LED candle]) > 0)
-	{
-		// maximizer uses whatever mode LED candle is in, won't change it
-		// so ensure in correct mode prior to maximizing
-		auto_handleJillOfAllTrades();
-	}
 	if(speculative && auto_haveCrystalBall())
 	{	//when doing simMaximize, in order to know if miniature crystal ball will be allowed in the simulated location, 
 		//location queue checks that would normally be done by pre_adv before maximizing equipment need to be simulated here too

diff --git a/RELEASE/scripts/autoscend/auto_familiar.ash b/RELEASE/scripts/autoscend/auto_familiar.ash
@@ -283,7 +283,7 @@ familiar lookupFamiliarDatafile(string type)
 
 	auto_log_debug("lookupFamiliarDatafile is checking for type [" + type + "]");
 	// store what type of fam we are looking for
-	set_property("auto_lastFamiliarLoopupType",type);
+	set_property("auto_lastFamiliarLookupType",type);
 	string [string,int,string] familiars_text;
 	if(!file_to_map("autoscend_familiars.txt", familiars_text))
 	{
@@ -777,7 +777,7 @@ void preAdvUpdateFamiliar(location place)
 			run_choice(-1);
 			set_property("_auto_gnomeArenaVisited", "true");
 		}
-		autoEquip($slot[familiar], $item[gnomish housemaid's kgnee]);
+		autoEquip($slot[familiar], $item[gnomish housemaid\'s kgnee]);
 	}
 
 	if (my_familiar() == $familiar[Baby Bugged Bugbear])
@@ -803,6 +803,13 @@ void preAdvUpdateFamiliar(location place)
 			}
 		}
 	}
+
+	if(my_familiar() == $familiar[Jill-of-All-Trades] && item_amount($item[LED candle]) > 0)
+	{
+		// maximizer uses whatever mode LED candle is in, won't change it
+		// so ensure in correct mode prior to maximizing
+		auto_handleJillOfAllTrades();
+	}
 
 	if(auto_checkFamiliarMummery(my_familiar()))
 	{

diff --git a/RELEASE/scripts/autoscend/iotms/mr2023.ash b/RELEASE/scripts/autoscend/iotms/mr2023.ash
@@ -518,7 +518,7 @@ void auto_handleJillOfAllTrades()
 
 	string currentMode = getParsedCandleMode();
 	// want to configure jill to have bonus of whatever fam type we last looked up
-	string desiredCandleMode = get_property("auto_lastFamiliarLoopupType");
+	string desiredCandleMode = get_property("auto_lastFamiliarLookupType");
 
 	auto_log_debug(`Jill current mode: {currentMode} and desired is {desiredCandleMode}`);
 	if(currentMode == desiredCandleMode)