Merge branch 'main' into ag-improvements

loathers · Oct 17, 2024 · bf32a0e · bf32a0e
2 parents bf6bd14 + 739be92
commit bf32a0e
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 39 deletions.
diff --git a/RELEASE/scripts/autoscend.ash b/RELEASE/scripts/autoscend.ash
@@ -1,4 +1,4 @@
-since r28084;	// feat: make bat wings rest always available
+since r28092;	// feat: add 'avoid attack' modifier
 /***
 	autoscend_header.ash must be first import
 	All non-accessory scripts must be imported here

diff --git a/RELEASE/scripts/autoscend/combat/auto_combat_quest.ash b/RELEASE/scripts/autoscend/combat/auto_combat_quest.ash
@@ -57,36 +57,11 @@ string auto_JunkyardCombatHandler(int round, monster enemy, string text)
 		return useItem($item[Molybdenum Magnet]);
 	}
 
-	if (canUse($skill[Curse Of Weaksauce]))
-	{
-		return useSkill($skill[Curse Of Weaksauce]);
-	}
-
-	if (canUse($skill[Curse Of The Marshmallow]))
-	{
-		return useSkill($skill[Curse Of The Marshmallow]);
-	}
-
 	if (canUse($skill[Summon Love Scarabs]))
 	{
 		return useSkill($skill[Summon Love Scarabs]);
 	}
 
-	if (canUse($skill[Summon Love Gnats]))
-	{
-		return useSkill($skill[Summon Love Gnats]);
-	}
-
-	if(canUse($skill[Beanscreen]))
-	{
-		return useSkill($skill[Beanscreen]);
-	}
-
-	if(canUse($skill[Bad Medicine]))
-	{
-		return useSkill($skill[Bad Medicine]);
-	}
-
 	if(canUse($skill[Good Medicine]) && canSurvive(2.1))
 	{
 		return useSkill($skill[Good Medicine]);
@@ -142,20 +117,11 @@ string auto_JunkyardCombatHandler(int round, monster enemy, string text)
 		}
 	}
 
-	if (get_property("auto_gremlinMoly").to_boolean() && !canSurvive(20) && !stunned && !staggeringFlyer)	//don't flyer tool gremlins if it's dangerous to survive them for long
+	if (get_property("auto_gremlinMoly").to_boolean())	//don't ever stun tool gremlins
 	{
-		if(monster_attack() > ( my_buffedstat($stat[moxie]) + 10) && !canSurvive(10) && haveUsed($skill[Curse Of Weaksauce]))
-		{
-			//if after all deleveling it's still too strong to safely stasis let weaksauce delevel it more in exchange for a few turns
-			//except if stuck with an attack familiar or unforeseen passive damage effects that can kill the gremlin
-			if(!gremlinTakesDamage && round < 10 && stunner != $skill[none])
-			{
-				combat_status_add("stunned");
-				return useSkill(stunner);
-			}
-		}
+		stunner = $skill[none];
 	}
-	else if (canUse(flyer) && get_property("flyeredML").to_int() < 10000 && !get_property("auto_ignoreFlyer").to_boolean())
+	if (canUse(flyer) && get_property("flyeredML").to_int() < 10000 && !get_property("auto_ignoreFlyer").to_boolean())
 	{
 		if(!staggeringFlyer && stunner != $skill[none] && !stunned)
 		{

diff --git a/RELEASE/scripts/autoscend/quests/level_12.ash b/RELEASE/scripts/autoscend/quests/level_12.ash
@@ -1271,7 +1271,8 @@ boolean L12_gremlins()
 	gremlinsFamiliar();
 
 	auto_log_info("Doing them gremlins", "blue");
-	addToMaximize("20dr,1da 1000max,3hp,-3ml");
+	// ideally we want to survive a single attack
+	addToMaximize("20dr,1da 1000max,-ml,-1000avoid attack");
 	acquireHP();
 	if(!bat_wantHowl($location[over where the old tires are]))
 	{