Modifier after x turns

RELEASE/scripts/autoscend/auto_post_adv.ash

@@ -395,14 +395,26 @@ boolean auto_post_adventure()
 		{
 			use_skill(1, $skill[Soul Rotation]);
 		}
-		int missing = (my_maxmp() - my_mp()) / 15;		//soul food restores 15 MP per cast.
+
+		int maxMPNextTurn;
+		int MPtoRestore = my_maxmp() - my_mp();
+		if(MPtoRestore >= 15 && my_maxmp() > 150)	//todo how much MP wanted for buffing before next turn?
+		{
+			maxMPNextTurn = modifierAfterXTurns("Buffed MP Maximum",1);
+			if(maxMPNextTurn > 100)	//todo how much MP wanted for combat?
+			{
+				//don't restore MP that will expire with effects
+				MPtoRestore = max(0,maxMPNextTurn - my_mp());
+			}
+		}
+		int casts = MPtoRestore / 15;		//soul food restores 15 MP per cast.
 		int availableSauce = my_soulsauce();
 		int minMPexpected = my_mp() + (availableSauce - 5) * 15; //mp expected after soul food if last 5 soulsauce is saved
 		if(availableSauce >= 5 && minMPexpected > 100 && minMPexpected > 0.8*my_maxmp())
 		{
 			availableSauce -= 5;	//keep 5 soulsauce for soul bubble if not missing much MP
 		}
-		int casts = min(missing, availableSauce / 5);	//soul food costs 5 soulsauce per cast.
+		casts = min(casts, availableSauce / 5);	//soul food costs 5 soulsauce per cast.
 		if(casts > 0)
 		{
 			use_skill(casts, $skill[Soul Food]);
@@ -675,6 +687,16 @@ boolean auto_post_adventure()
 			buffMaintain($effect[Intimidating Mien], 50, 1, 5);
 		}
 
+		if(my_maxmp() < 120 && have_effect($effect[The Magical Mojomuscular Melody]) > 0)
+		{
+			// The Magical Mojomuscular Melody gives at least 30 max MP and is maintained when under 80 max MP
+			// when the effect itself is raising max MP over 80, if not maintained longer here it would expire, waste any MP above max, then get cast again
+			if(my_maxmp() - my_mp() < 35)
+			{
+				buffMaintain($effect[The Magical Mojomuscular Melody], 3, 1, 5);
+			}
+		}
+
 		buffMaintain($effect[Polka of Plenty], 110, 1, 5);
 	}
 	else

RELEASE/scripts/autoscend/auto_pre_adv.ash

@@ -908,7 +908,19 @@ boolean auto_pre_adventure()
 	//my_mp is broken in Dark Gyffte
 	if (!in_darkGyffte())
 	{
+		//TODO don't do this when next turn is free since that gives no effect from mp_regen(). PR #1199 adds "auto_nextEncounter"
 		int wasted_mp = my_mp() + mp_regen() - my_maxmp();
+		if(my_maxmp() > 400)	//todo how much MP wanted for combat? but for now there is no MP burning after this without 400 MP anyway so check 400
+		{
+			int maxMPNextTurn = modifierAfterXTurns("Buffed MP Maximum",1);
+			if(maxMPNextTurn != my_maxmp())
+			{
+				//count MP that will expire with effects next turn
+				maxMPNextTurn = max(100,maxMPNextTurn);	//todo how much MP wanted for combat?
+				wasted_mp = my_mp() + mp_regen() - maxMPNextTurn;
+			}
+		}
+		wasted_mp = min(my_mp() - 100,wasted_mp);	//todo how much MP wanted for combat? in case regen is higher than MP, like with blue rocket, at least keep 100
 		if(wasted_mp > 0 && my_mp() > 400)
 		{
 			auto_log_info("Burning " + wasted_mp + " MP...");

RELEASE/scripts/autoscend/auto_util.ash

@@ -277,6 +277,64 @@ void debugMaximize(string req, int meat)	//This function will be removed.
 
 }
 
+float modifierAfterXTurns(string mod, int turns, boolean forceMaintainable)
+{
+	//returns predicted value of modifier after X turns of effects have expired assuming no equipment change
+	//used for the special derivative modifiers "Buffed MP Maximum"
+	//any modifier works but some may need additions (item drop with broken champagne bottle, quantum terrarium familiar change,...)
+
+	string speculateString;
+	int [effect] currentEffects = my_effects();
+	foreach buff in currentEffects
+	{
+		if(have_effect(buff) <= turns)
+		{
+			//effect would expire after specified amount of turns
+			boolean substractEffect = true;
+			if(turns > 1)
+			{
+				//effects that can be maintained will not necessarily be maintained
+				if(forceMaintainable)
+				{
+					//force the assumption that maintainable effects will be maintained
+					if(buffMaintain(buff, 0, 1, (turns+1), true))	//speculative
+					{
+						substractEffect = false;
+					}
+				}
+				else
+				{
+					//if not expiring next turn assume that at least buffs from casting known skills will be maintained
+					//routine buff maintenance in post adv doesn't wait for buffs to be at 1 turn to maintain them if it can
+					skill effectSkill = to_skill(buff);
+					if (auto_have_skill(effectSkill))
+					{
+						substractEffect = false;
+					}
+					//are there other indefinitely maintained effects to count here?
+				}
+			}
+			if(substractEffect)
+			{
+				//not worth filtering effects here before speculating uneffect on them?
+				//for modifier "buffed hp maximum" effects can be any of numeric_modifier(buff,"maximum hp"), "maximum hp percent", "muscle", "muscle percent"
+				speculateString += " uneffect " + buff.to_string() + ";";
+			}
+		}
+	}
+
+	if(speculateString != "")
+	{
+		cli_execute("speculate quiet; " + speculateString);
+	}
+	return numeric_modifier("Generated:_spec", mod);
+}
+
+float modifierAfterXTurns(string mod, int turns)
+{
+	return modifierAfterXTurns(mod, turns, false);
+}
+
 string trim(string input)
 {
 	matcher whitespace = create_matcher("(\\A\\s+)|(\\s+\\z)", input);

RELEASE/scripts/autoscend/autoscend_header.ash

@@ -1604,6 +1604,8 @@ boolean autoMaximize(string req, boolean simulate);
 boolean autoMaximize(string req, int maxPrice, int priceLevel, boolean simulate);
 aggregate autoMaximize(string req, int maxPrice, int priceLevel, boolean simulate, boolean includeEquip);
 void debugMaximize(string req, int meat);
+float modifierAfterXTurns(string mod, int turns, boolean forceMaintainable);
+float modifierAfterXTurns(string mod, int turns);
 string trim(string input);
 string safeString(string input);
 string safeString(skill input);