From ff679de0e327e6fbe8cc18f9a1a24e8ce4f69ad6 Mon Sep 17 00:00:00 2001
From: Daniel Simich <21962115+dsimich@users.noreply.github.com>
Date: Wed, 22 Nov 2023 09:20:50 -0500
Subject: [PATCH] Use all scepter charges

---
 RELEASE/scripts/autoscend/auto_bedtime.ash    |  1 +
 .../scripts/autoscend/autoscend_header.ash    |  1 +
 RELEASE/scripts/autoscend/iotms/mr2023.ash    | 54 +++++++++----------
 3 files changed, 26 insertions(+), 30 deletions(-)

diff --git a/RELEASE/scripts/autoscend/auto_bedtime.ash b/RELEASE/scripts/autoscend/auto_bedtime.ash
index 3606ceaa1..2ee0d736e 100644
--- a/RELEASE/scripts/autoscend/auto_bedtime.ash
+++ b/RELEASE/scripts/autoscend/auto_bedtime.ash
@@ -721,6 +721,7 @@ boolean doBedtime()
 	}
 
 	//We are committing to end of day now...
+	auto_scepterRollover(); //Use the rest of the August Scepter's charges
 	getSpaceJelly();
 	while(acquireHermitItem($item[11-leaf Clover]));
 
diff --git a/RELEASE/scripts/autoscend/autoscend_header.ash b/RELEASE/scripts/autoscend/autoscend_header.ash
index e032596a2..98aa63fd5 100644
--- a/RELEASE/scripts/autoscend/autoscend_header.ash
+++ b/RELEASE/scripts/autoscend/autoscend_header.ash
@@ -523,6 +523,7 @@ void auto_buyFrom2002MrStore();
 void auto_useBlackMonolith();
 boolean auto_haveAugustScepter();
 void auto_scepterSkills();
+void auto_scepterRollover();
 void auto_lostStomach();
 boolean auto_haveBofa();
 boolean auto_canHabitat();
diff --git a/RELEASE/scripts/autoscend/iotms/mr2023.ash b/RELEASE/scripts/autoscend/iotms/mr2023.ash
index c4127c01f..e4a89d290 100644
--- a/RELEASE/scripts/autoscend/iotms/mr2023.ash
+++ b/RELEASE/scripts/autoscend/iotms/mr2023.ash
@@ -522,41 +522,35 @@ void auto_scepterSkills()
 	{
 		return;
 	}
-	//Day 1 skills
-	if(my_daycount() == 1)
+	
+	if(canUse($skill[Aug. 24th: Waffle Day!]) && !get_property("_aug24Cast").to_boolean())
 	{
-		if(canUse($skill[Aug. 24th: Waffle Day!]) && !get_property("_aug24Cast").to_boolean())
-		{
-			use_skill($skill[Aug. 24th: Waffle Day!]); //get some waffles to hopefully change some bad monsters to better ones
-		}
-		if(canUse($skill[Aug. 30th: Beach Day!]) && !get_property("_aug30Cast").to_boolean())
-		{
-			use_skill($skill[Aug. 30th: Beach Day!]); //Rollover adventures
-		}
-		if(canUse($skill[Aug. 28th: Race Your Mouse Day!]) && !get_property("_aug28Cast").to_boolean() && pathHasFamiliar() && ((!auto_hasStillSuit() && item_amount($item[Astral pet sweater]) == 0) || in_small()))
-		{
-			if(!is100FamRun())
-			{
-				use_familiar(findNonRockFamiliarInTerrarium()); //equip non-rock fam to ensure we get tiny gold medal
-			}
-			use_skill($skill[Aug. 28th: Race Your Mouse Day!]); //Fam equipment
-		}
+		use_skill($skill[Aug. 24th: Waffle Day!]); //get some waffles to hopefully change some bad monsters to better ones
 	}
-	//Day 2+ skills
-	if(my_daycount() >= 2)
+	if(canUse($skill[Aug. 28th: Race Your Mouse Day!]) && !get_property("_aug28Cast").to_boolean() && pathHasFamiliar() && ((!auto_hasStillSuit() && item_amount($item[Astral pet sweater]) == 0) || in_small()))
 	{
-		if(canUse($skill[Aug. 24th: Waffle Day!]) && !get_property("_aug24Cast").to_boolean())
+		if(!is100FamRun())
 		{
-			use_skill($skill[Aug. 24th: Waffle Day!]); //get some waffles to hopefully change some bad monsters to better ones
-		}
-		if(canUse($skill[Aug. 28th: Race Your Mouse Day!]) && !get_property("_aug28Cast").to_boolean() && ((!auto_hasStillSuit() && item_amount($item[Astral pet sweater]) == 0) || in_small()))
-		{
-			if(!is100FamRun())
-			{
-				use_familiar(findNonRockFamiliarInTerrarium()); //equip non-rock fam to ensure we get tiny gold medal
-			}
-			use_skill($skill[Aug. 28th: Race Your Mouse Day!]); //Fam equipment
+			use_familiar(findNonRockFamiliarInTerrarium()); //equip non-rock fam to ensure we get tiny gold medal
 		}
+		use_skill($skill[Aug. 28th: Race Your Mouse Day!]); //Fam equipment
+	}
+}
+
+void auto_scepterRollover()
+{
+	if(canUse($skill[Aug. 30th: Beach Day!]) && !get_property("_aug30Cast").to_boolean() && get_property("_augSkillsCast").to_int()< 5)
+	{
+		use_skill($skill[Aug. 30th: Beach Day!]); //Rollover adventures
+	}
+	if(canUse($skill[Aug. 27th: Just Because Day!]) && !get_property("_aug27Cast").to_boolean() && get_property("_augSkillsCast").to_int()< 5)
+	{
+		use_skill($skill[Aug. 27th: Just Because Day!]); //3 random buffs
+	}
+	if(canUse($skill[Aug. 13th: Left\/Off Hander\'s Day!]) && !get_property("_aug13Cast").to_boolean() &&
+	get_property("_augSkillsCast").to_int()< 5 && numeric_modifier(equipped_item($slot[offhand]),"Adventures") > 0)
+	{
+		use_skill($skill[Aug. 13th: Left\/Off Hander\'s Day!]); //3 random buffs
 	}
 }