Merge branch 'ennunciate-widgets' into 'pregmod-master'

Clean up misc widgets

See merge request pregmodfan/fc-pregmod!8445

src/pregmod/breederProposal.tw

@@ -10,15 +10,15 @@ Within the hour, you are called before <<if $eugenicsFullControl == 1>>what's le
 <<if $eugenicsFullControl == 1>>
 	"That sounds like an acceptable proposal. We'll draft the standards for breeding stock and notify you shortly."
 	<<set $propOutcome = 1>>
-	<<set $nextButton = "Continue">><<UpdateNextButton>> /* unlock Continue button */
+	<<set $nextButton = "Continue">><<run App.Utils.updateUserButton()>> /* unlock Continue button */
 <<elseif $PC.pregSource == -1 || $PC.pregSource == -6>>
 	"Since you are doing your part and carrying an Elite child, we will gladly reward you by granting your proposal. We shall decide upon the standards for breeding stock and notify you shortly."
 	<<set $propOutcome = 1>>
-	<<set $nextButton = "Continue">><<UpdateNextButton>> /* unlock Continue button */
+	<<set $nextButton = "Continue">><<run App.Utils.updateUserButton()>> /* unlock Continue button */
 <<elseif $PC.counter.birthElite > 0>>
 	"Since you have carried children for our cause, we will gladly reward you by granting your proposal. We shall decide upon the standards for breeding stock and notify you shortly."
 	<<set $propOutcome = 1>>
-	<<set $nextButton = "Continue">><<UpdateNextButton>> /* unlock Continue button */
+	<<set $nextButton = "Continue">><<run App.Utils.updateUserButton()>> /* unlock Continue button */
 <<elseif $PC.dick == 0>>
 	<<if $failedElite > 50>>
 		"Do you really think you are in any position to make such a request? You, a fertile woman and member of the Elite, who has not taken even the slightest interest in carrying one of our children, dares to even suggest using slaves as breeding stock? Well?"
@@ -27,14 +27,14 @@ Within the hour, you are called before <<if $eugenicsFullControl == 1>>what's le
 		<<replace "#result">>
 			"Good choice, _girlP. A selection of eligible donors will be provided to you; take your pick and bear our children. Or use a test tube, if that's more to your tastes."
 			<<set $playerBred = 1, $propOutcome = 1>>
-			<<set $nextButton = "Continue">><<UpdateNextButton>> /* unlock Continue button */
+			<<set $nextButton = "Continue">><<run App.Utils.updateUserButton()>> /* unlock Continue button */
 		<</replace>>
 		<</link>>
 		<br><<link "Decline being used as a breeder and face the Societal Elites' wrath">>
 			<<replace "#result">>
 				"You'll regret this decision. We'll have our way one way or another."
 				<<set $failedElite += 275, $propOutcome = -1>>
-				<<set $nextButton = "Continue">><<UpdateNextButton>> /* unlock Continue button */
+				<<set $nextButton = "Continue">><<run App.Utils.updateUserButton()>> /* unlock Continue button */
 			<</replace>>
 		<</link>>
 		</span>
@@ -45,7 +45,7 @@ Within the hour, you are called before <<if $eugenicsFullControl == 1>>what's le
 			<<replace "#result">>
 				"Good choice, _girlP; your proposal is more important than your dignity after all, isn't it? A selection of eligible donors will be provided to you; take your pick and bear our children. Or use a test tube, if that's more to your tastes."
 				<<set $failedElite -= 50, $playerBred = 1, $propOutcome = 1>>
-				<<set $nextButton = "Continue">><<UpdateNextButton>> /* unlock Continue button */
+				<<set $nextButton = "Continue">><<run App.Utils.updateUserButton()>> /* unlock Continue button */
 			<</replace>>
 		<</link>>
 		<<if $failedElite <= 0>>
@@ -53,7 +53,7 @@ Within the hour, you are called before <<if $eugenicsFullControl == 1>>what's le
 				<<replace "#result">>
 					"Yes, you have done much to further our cause. We respect the 'balls' on you, despite your lack of them. Very well, we shall set the standards for what shall qualify as breeding stock and our standards will be delivered to you shortly."
 					<<set $propOutcome = 1>>
-					<<set $nextButton = "Continue">><<UpdateNextButton>> /* unlock Continue button */
+					<<set $nextButton = "Continue">><<run App.Utils.updateUserButton()>> /* unlock Continue button */
 				<</replace>>
 			<</link>>
 		<<else>>
@@ -61,7 +61,7 @@ Within the hour, you are called before <<if $eugenicsFullControl == 1>>what's le
 				<<replace "#result">>
 					"Then why waste our time? You disappoint us, but don't worry; you'll be laden with child soon enough."
 					<<set $propOutcome = -1>>
-					<<set $nextButton = "Continue">><<UpdateNextButton>> /* unlock Continue button */
+					<<set $nextButton = "Continue">><<run App.Utils.updateUserButton()>> /* unlock Continue button */
 				<</replace>>
 			<</link>>
 		<</if>>
@@ -75,14 +75,14 @@ Within the hour, you are called before <<if $eugenicsFullControl == 1>>what's le
 			<<replace "#result">>
 				"Your contributions will be appreciated. We shall convene to decide the qualifications for a slave to become a breeder. We will inform you of them when we send the list of eligible donors to breed you. Or send you a test tube, if that's more to your tastes."
 				<<set $failedElite -= 50, $playerBred = 1, $propOutcome = 1>>
-				<<set $nextButton = "Continue">><<UpdateNextButton>> /* unlock Continue button */
+				<<set $nextButton = "Continue">><<run App.Utils.updateUserButton()>> /* unlock Continue button */
 			<</replace>>
 		<</link>>
 		<br><<link "Decline being used as a breeder and withdraw your proposal">>
 			<<replace "#result">>
 				"Very well, if your masculinity is more valuable to you than your proposal, then so be it."
 				<<set $propOutcome = -1>>
-				<<set $nextButton = "Continue">><<UpdateNextButton>> /* unlock Continue button */
+				<<set $nextButton = "Continue">><<run App.Utils.updateUserButton()>> /* unlock Continue button */
 			<</replace>>
 		<</link>>
 		</span>
@@ -95,21 +95,21 @@ Within the hour, you are called before <<if $eugenicsFullControl == 1>>what's le
 			<<replace "#result">>
 				"Your contributions will be appreciated. We shall convene to decide the qualifications for a slave to become a breeder. We will inform you of them when we send the list of eligible donors to breed you. Or send you a test tube, if that's more to your tastes."
 				<<set $playerBred = 1, $propOutcome = 1>>
-				<<set $nextButton = "Continue">><<UpdateNextButton>> /* unlock Continue button */
+				<<set $nextButton = "Continue">><<run App.Utils.updateUserButton()>> /* unlock Continue button */
 			<</replace>>
 		<</link>>
 		<br><<link "Decline being used as a breeder">>
 			<<replace "#result">>
 				"Very well, if you wish to waste your gift, it is your prerogative. We shall convene to decide the qualifications for a slave to become a breeder and inform you upon completion."
 				<<set $propOutcome = 1>>
-				<<set $nextButton = "Continue">><<UpdateNextButton>> /* unlock Continue button */
+				<<set $nextButton = "Continue">><<run App.Utils.updateUserButton()>> /* unlock Continue button */
 			<</replace>>
 		<</link>>
 		</span>
 	<<else>>
 		"We have read your proposal and agree. However, we shall set the standards for what shall qualify as breeding stock, not you. Our standards will be delivered to you shortly."
 		<<set $propOutcome = 1>>
-		<<set $nextButton = "Continue">><<UpdateNextButton>> /* unlock Continue button */
+		<<set $nextButton = "Continue">><<run App.Utils.updateUserButton()>> /* unlock Continue button */
 	<</if>>
 <</if>>
 <br><br>
\ No newline at end of file

src/pregmod/eliteTakeOverResult.tw

 :: eliteTakeOverResult [nobr]
 
-<<set $nextButton = "Continue">><<UpdateNextButton>> /* unlock Continue button */
+<<set $nextButton = "Continue">><<run App.Utils.updateUserButton()>> /* unlock Continue button */
 
 <<if _S.Bodyguard>>
 	<<setLocalPronouns _S.Bodyguard>>

src/uncategorized/pCoupAftermath.tw

@@ -46,14 +46,14 @@ You inquire as to whether there's any identifiable cause for the evident dislike
 
 <span id="result">
 <<link "Contact the culprit privately and discuss the matter">>
-	<<set $nextButton = "Continue">><<UpdateNextButton>> /* unlock Continue button */
+	<<set $nextButton = "Continue">><<run App.Utils.updateUserButton()>> /* unlock Continue button */
 	<<replace "#result">>
 	Your fellow arcology owner proves very receptive to your missive, as well they might. Your defeat of the Daughters has made a major impact on the willingness of slaveowners to discuss slave revolts in public, and any arcology owner who was proved to be funding anti-slaver violence, even under duress, would be shunned. With very little prompting, _heR forwards a @@.yellowgreen;huge indemnity payment.@@ It's nowhere near enough to cause bankruptcy, but it's enough to give you a massive advantage should you find yourselves at odds again.
 	<<run cashX(100000, "war")>>
 	<</replace>>
 <</link>>
 <br><<link "Reveal the evidence publicly">>
-	<<set $nextButton = "Continue">><<UpdateNextButton>> /* unlock Continue button */
+	<<set $nextButton = "Continue">><<run App.Utils.updateUserButton()>> /* unlock Continue button */
 	<<replace "#result">>
 	Free Cities society is understandably reluctant to condemn, never mind depose, arcology owners. The precedent of removing one would be bad, even if the public brought enough strength together to accomplish it. Your evidence looks quite bad, but isn't so incontrovertible as to cause your fellow aristocrats to take such a drastic measure. Nonetheless, the public is aghast at the spectacle of an arcology owner funding an attack on another. Opinion @@.green;rallies@@ around you, and you even receive some discreet @@.yellowgreen;donations,@@ delivered with the intimation that they are to be used against your enemy. There is stony silence from the Daughters' backer; today, you began a real inter-arcology war.
 	<<run repX(1000, "war")>>
@@ -75,7 +75,7 @@ You inquire as to whether there's any identifiable cause for the evident dislike
 	<</replace>>
 <</link>>
 <br><<link "Devote funds to tracing the evidence">>
-	<<set $nextButton = "Continue">><<UpdateNextButton>> /* unlock Continue button */
+	<<set $nextButton = "Continue">><<run App.Utils.updateUserButton()>> /* unlock Continue button */
 	<<replace "#result">>
 	The money flows out, and the information flows in. You are rewarded with a reasonably complete picture of your rival's operations. The intelligence will be extremely useful going forward, since by gathering it, you sent an unmistakable signal that you do not consider the matter closed. There is stony silence from the Daughters' backer; today, you began a real inter-arcology war. But, with this information, you can maintain it from a position of advantage.
 	<<run cashX(-20000, "war")>>

src/uncategorized/pDefenseFears.tw

@@ -13,7 +13,7 @@ A deputation of slaveowning citizens comes to see you. Though they haven't exper
 
 <span id="result">
 <<link "Install a full platoon by subscription">>
-	<<set $nextButton = "Continue">><<UpdateNextButton>> /* unlock Continue button */
+	<<set $nextButton = "Continue">><<run App.Utils.updateUserButton()>> /* unlock Continue button */
 	<<replace "#result">>
 	You hire a full platoon of reputable mercenaries and a veteran officer to command them, kit them in excellent gear, and quarter them in the arcology. Their pay is on an escrow basis; the huge lump sum you paid will serve to secure them, and its interest will constitute their pay. The sight of many armed men on patrol has reassured the worried slaveowners, but they are @@.red;resentful@@ of having to take this step themselves.
 	<<run repX(-500, "event")>>
@@ -21,7 +21,7 @@ A deputation of slaveowning citizens comes to see you. Though they haven't exper
 	<</replace>>
 <</link>>
 <br><<link "Install a full platoon at your expense">>
-	<<set $nextButton = "Continue">><<UpdateNextButton>> /* unlock Continue button */
+	<<set $nextButton = "Continue">><<run App.Utils.updateUserButton()>> /* unlock Continue button */
 	<<replace "#result">>
 	You hire a full platoon of reputable mercenaries and a veteran officer to command them, kit them in excellent gear, and quarter them in the arcology. Their pay is on an escrow basis; the huge lump sum you paid will serve to secure them, and its interest will constitute their pay. The sight of many armed men on patrol has reassured the worried slaveowners, and they are @@.green;grateful@@ to you for seeing to their defense.
 	<<run repX(2500, "event")>>
@@ -30,7 +30,7 @@ A deputation of slaveowning citizens comes to see you. Though they haven't exper
 	<</replace>>
 <</link>> <<if ($PC.skill.warfare >= 100) || ($PC.career == "arcology owner")>>//This will cost <<print cashFormat(10000)>> and some upkeep, @@.springgreen;reduced by your mercenary contacts@@//<<else>>//This will cost <<print cashFormat(10000)>> and incur significant upkeep costs//<</if>>
 <br><<link "Refuse to quarter so many troops in your arcology">>
-	<<set $nextButton = "Continue">><<UpdateNextButton>> /* unlock Continue button */
+	<<set $nextButton = "Continue">><<run App.Utils.updateUserButton()>> /* unlock Continue button */
 	<<replace "#result">>
 	The consensus that the arcology is vulnerable triggers an @@.red;exodus@@ of your most wealthy and valuable citizens, and your reputation @@.red;suffers@@ grievously.
 	<<set $arcologies[0].prosperity = Math.trunc($arcologies[0].prosperity*0.8)>>

src/uncategorized/pHackerSupport.tw

@@ -61,7 +61,7 @@ As she finishes speaking, another spasm distorts her expression, and then she su
 
 <span id="result">
 <<link "Decline">>
-	<<set $nextButton = "Continue">><<UpdateNextButton>>
+	<<set $nextButton = "Continue">><<run App.Utils.updateUserButton()>>
 	<<replace "#result">>
 	She's almost certainly trying to extort a quick payoff. You politely decline. "Meh," she shrugs. <<if $seeDicks == 0>>She shudders again and there's a gasping sound from down below. She looks down again, and as she ends the video call, you hear her say "Good job. Ha ha, fuck you, slut, it's your asshole anyway. Get me my strap-on."<<else>>She shudders and there's a popping sound from down below, like a cockhead springing free of someone's mouth. Sure enough, a still-erect dickhead springs into view from the bottom of the screen; for that to be visible she has to be truly huge, almost as long as one of her forearms. She looks down again, and as she ends the video call, you hear her say "Good job. Ha ha, fuck you, slut, it's your asshole anyway. Rape time! Turn around." Tearful begging can be heard before the call closes.<</if>>
 	<<if $traitorType == "hostage">>
@@ -70,7 +70,7 @@ As she finishes speaking, another spasm distorts her expression, and then she su
 	<</replace>>
 <</link>>
 <br><<link "Accept">>
-	<<set $nextButton = "Continue">><<UpdateNextButton>>
+	<<set $nextButton = "Continue">><<run App.Utils.updateUserButton()>>
 	<<replace "#result">>
 	You transfer the funds. "Meh," she shrugs. <<if $seeDicks == 0>>She shudders again and there's a gasping sound from down below. She looks down again, and as she ends the video call, you hear her say "Good job. Ha ha, fuck you, slut, it's your asshole anyway. Get me my strap-on."<<else>>She shudders and there's a popping sound from down below, like a cockhead springing free of someone's mouth. Sure enough, a still-erect dickhead springs into view from the bottom of the screen; for that to be visible she has to be truly huge, almost as long as one of her forearms. She looks down again, and as she ends the video call, you hear her say "Good job. Ha ha, fuck you, bitch, it's your asshole anyway. Buttrape time!"<</if>>
 	<<if $assistant.personality > 0>>

src/uncategorized/pMercsHelpCorp.tw

@@ -25,7 +25,7 @@ Your weekly meeting with your $mercenariesTitle commander finishes with unusual
 	<</replace>>
 <</link>>
 <br><<link "Make it so">>
-	<<set $nextButton = "Continue">><<UpdateNextButton>>
+	<<set $nextButton = "Continue">><<run App.Utils.updateUserButton()>>
 	<<replace "#result">>
 	<<setNonlocalPronouns $seeDicks>>
 	It's a fine idea, and you agree. The commander looks so enthused that you feel obliged to ask that he not risk himself unduly. He laughs. "There are no old, bold mercs, <<= properTitle()>>, and I am sure as hell old. I'll be sure to grow even older under contract with you. Now, unless there's anything else, I've just bought a nice _girlU to add to the commander's suite, and _heU makes me feel a bit younger."

src/uncategorized/pRivalryVictory.tw

@@ -25,7 +25,7 @@ For the first time, you receive a direct call from your rival. You pictured the
 
 <span id="result">
 <<link "Accept">>
-	<<set $nextButton = "Continue">><<UpdateNextButton>> /* unlock Continue button */
+	<<set $nextButton = "Continue">><<run App.Utils.updateUserButton()>> /* unlock Continue button */
 	<<replace "#result">>
 	You accept, magnanimous in victory. "I don't think I would have done that," your rival replies. "Thank you. When they write the book, I'll make sure you look good."
 	<<if $rivalSet != 0>>
@@ -50,7 +50,7 @@ For the first time, you receive a direct call from your rival. You pictured the
 	<</replace>>
 <</link>>
 <br><<link "Refuse">>
-	<<set $nextButton = "Continue">><<UpdateNextButton>> /* unlock Continue button */
+	<<set $nextButton = "Continue">><<run App.Utils.updateUserButton()>> /* unlock Continue button */
 	<<replace "#result">>
 	You coldly decline. "That was a mistake," your rival replies, entering a computer command.
 	<<if $rivalSet != 0>>
@@ -86,7 +86,7 @@ For the first time, you receive a direct call from your rival. You pictured the
 <</link>>
 <<if $rivalryDuration >= 30 && $hostageAnnounced == 0 && $rivalSet != 0>>
 	<br><<link "Refuse, and place a bounty of <<print cashFormat(50000)>> on your rival's death">>
-		<<set $nextButton = "Continue">><<UpdateNextButton>> /* unlock Continue button */
+		<<set $nextButton = "Continue">><<run App.Utils.updateUserButton()>> /* unlock Continue button */
 		<<replace "#result">>
 		You coldly decline. "That was a mistake," your rival replies, entering a computer command. "All my remaining liquid assets have just been @@.red;expended in an attack on the value of your holdings,@@ and my arcology has been heavily sabotaged. You'll get nothing from me." It's not entirely true, but the damage to your holdings does outweigh your gains by a significant margin. Your rival vanishes back into the old world — but only for a few days.
 		<br><br>
@@ -106,7 +106,7 @@ For the first time, you receive a direct call from your rival. You pictured the
 	<</link>>
 <</if>>
 <br><<link "Refuse, and place a bounty of <<print cashFormat(50000)>> on your rival's enslavement">>
-	<<set $nextButton = "Continue">><<UpdateNextButton>> /* unlock Continue button */
+	<<set $nextButton = "Continue">><<run App.Utils.updateUserButton()>> /* unlock Continue button */
 	<<replace "#result">>
 	You coldly decline. "That was a mistake," your rival replies, entering a computer command.
 	<<if $rivalSet != 0>>

src/uncategorized/pUndergroundRailroad.tw

@@ -118,7 +118,7 @@ This is disturbing, to say the least. After close investigation, it appears some
 
 	<span id="result">
 	<<link "Let $him go">> /* do not set $nextLink to AS Dump for this option because we call Remove activeSlave */
-		<<set $nextButton = "Continue">><<UpdateNextButton>> /* unlock Continue button */
+		<<set $nextButton = "Continue">><<run App.Utils.updateUserButton()>> /* unlock Continue button */
 		<<replace "#result">>
 		You inform $him that $he may act as a double agent for you. $He nods and hurries out of the penthouse. $He wanders down through the arcology, attracting little notice. One moment the monitors have $him struggling through a dense-packed crowd, and the next, they don't.
 		<<if $activeSlave.intelligence+$activeSlave.intelligenceImplant < 10>>
@@ -190,7 +190,7 @@ This is disturbing, to say the least. After close investigation, it appears some
 		<</replace>>
 	<</link>>
 	<br><<link "Tell $him to ignore the Daughters in the future">>
-		<<set $nextButton = "Continue", $nextLink = "AS Dump", $returnTo = "Random Nonindividual Event">><<UpdateNextButton>> /* unlock Continue button */
+		<<set $nextButton = "Continue", $nextLink = "AS Dump", $returnTo = "Random Nonindividual Event">><<run App.Utils.updateUserButton()>> /* unlock Continue button */
 		<<replace "#result">>
 		$activeSlave.slaveName nods $his head in acceptance. There is too much at stake to take such a risk. All attempts to use your monitoring systems to find the citizens who contacted $him fail; it seems their ability to corrupt your systems is considerable. $He keeps $his lips shut tight in an effort to prevent rumors from spreading, but @@.mediumorchid;whispers of freedom@@ still manage to run through your chattel.
 		<<run $slaves.forEach(function(s) { s.devotion -= 5; })>>
@@ -247,7 +247,7 @@ This is disturbing, to say the least. After close investigation, it appears some
 
 	<span id="result">
 	<<link "Free $him">> /* do not set $nextLink to AS Dump for this option because we call Remove activeSlave */
-		<<set $nextButton = "Continue">><<UpdateNextButton>> /* unlock Continue button */
+		<<set $nextButton = "Continue">><<run App.Utils.updateUserButton()>> /* unlock Continue button */
 		<<replace "#result">>
 		You calmly inform $him that $he's free to go.
 		<<if $traitorType != "defiant">>
@@ -320,7 +320,7 @@ This is disturbing, to say the least. After close investigation, it appears some
 		<</replace>>
 	<</link>>
 	<br><<link "Tell $him to ignore the Daughters in the future">>
-		<<set $nextButton = "Continue", $nextLink = "AS Dump", $returnTo = "Random Nonindividual Event">><<UpdateNextButton>> /* unlock Continue button */
+		<<set $nextButton = "Continue", $nextLink = "AS Dump", $returnTo = "Random Nonindividual Event">><<run App.Utils.updateUserButton()>> /* unlock Continue button */
 		<<replace "#result">>
 		<<if $traitorType != "defiant">>
 			$activeSlave.slaveName almost @@.mediumorchid;faints with relief@@ when it becomes apparent you aren't going to punish $him for speaking of freedom.
@@ -333,7 +333,7 @@ This is disturbing, to say the least. After close investigation, it appears some
 		<</replace>>
 	<</link>>
 	<br><<link "Publicly flog $him for treasonous conversation">>
-		<<set $nextButton = "Continue", $nextLink = "AS Dump", $returnTo = "Random Nonindividual Event">><<UpdateNextButton>> /* unlock Continue button */
+		<<set $nextButton = "Continue", $nextLink = "AS Dump", $returnTo = "Random Nonindividual Event">><<run App.Utils.updateUserButton()>> /* unlock Continue button */
 		<<replace "#result">>
 		You announce that a treasonous slave will be publicly flogged. Treason is understood in the Free Cities to be activity that tends to undermine slavery, and public interest is considerable when $activeSlave.slaveName is dragged out into a public atrium and secured to a post. You do your duty; the one that passes the sentence should swing the lash. The ordeal is long and bloody. The populace understand the necessity of the punishment, though they are @@.red;disturbed@@ that such a thing could happen in your penthouse of all places. The effect on $activeSlave.slaveName's health @@.health.dec;is serious,@@ and $he is @@.gold;terrified of failing you again.@@
 		<<set $activeSlave.trust -= 15>>
@@ -341,7 +341,7 @@ This is disturbing, to say the least. After close investigation, it appears some
 		<</replace>>
 	<</link>>
 	<br><<link "Chemically lobotomize $him to extirpate any record of the incident">>
-		<<set $nextButton = "Continue", $nextLink = "AS Dump", $returnTo = "Random Nonindividual Event">><<UpdateNextButton>> /* unlock Continue button */
+		<<set $nextButton = "Continue", $nextLink = "AS Dump", $returnTo = "Random Nonindividual Event">><<run App.Utils.updateUserButton()>> /* unlock Continue button */
 		<<replace "#result">>
 		You inform $activeSlave.slaveName that $he is to return to $his duties, which $he does, mystified. Later in the day $he finds $himself scheduled for surgery, and meekly goes. As $he feels the cool touch of the injector, loaded with powerful chemical lobotomizing agents, $he looks up at the camera above the autosurgery with a hint of <<if $traitorType != "defiant">>resigned apology<<else>>regret<</if>> in $his eyes. When $he is released from the surgery's care a few hours later, the hint is gone. @@.red;As is everything.@@
 		<<set $activeSlave.fetish = "mindbroken">>
@@ -349,7 +349,7 @@ This is disturbing, to say the least. After close investigation, it appears some
 	<</link>>
 	<<if $arcologies[0].FSPaternalist == "unset" && $seeExtreme == 1>>
 		<br><<link "Publicly execute $him">>
-			<<set $nextButton = "Continue", $returnTo = "Random Nonindividual Event">><<UpdateNextButton>> /* unlock Continue button */
+			<<set $nextButton = "Continue", $returnTo = "Random Nonindividual Event">><<run App.Utils.updateUserButton()>> /* unlock Continue button */
 			<<replace "#result">>
 			You announce that a treasonous slave will be publicly executed. Treason is understood in the Free Cities to be activity that tends to undermine slavery, and public interest is considerable when $activeSlave.slaveName is dragged out into a public atrium and <<if $arcologies[0].FSAztecRevivalist !== "unset">>has $his heart cut out of $his living body<<elseif $arcologies[0].FSEdoRevivalist !== "unset">>is boiled alive<<elseif $arcologies[0].FSRomanRevivalist !== "unset">>is crucified and left hanging until $he perishes<<else>>is summarily hanged<</if>>. The populace understands the necessity of the punishment, though they are @@.red;disturbed@@ that such a thing could happen in your penthouse of all places. The surviving slaves are @@.gold;terrified@@ at the display, but at least you can be sure they will remember the price of failing you.
 			<<run repX(-500, "event", $activeSlave)>>

src/uncategorized/pePitFight.tw

@@ -227,7 +227,7 @@ The umpire announces gravely that the fight is to the death and rings a bell.
 <<if $activeSlave.health.health < -90>>
 	<<= removeSlave($activeSlave)>>
 	<<set $nextLink = "Random Nonindividual Event">>
-	<<UpdateNextButton>>
+	<<run App.Utils.updateUserButton()>>
 <</if>>
 
 <<set $pitFightsTotal++>>

src/uncategorized/reShelterInspection.tw

@@ -112,7 +112,7 @@ Not waiting to be greeted, the inspector looks up at the nearest camera and dema
 	<<replace "#result">>
 	$assistant.name ushers _him2 into your penthouse and keeps _him2 busy for the few minutes you need to circumvent the Shelter's various legal and contractual defenses to prevent slaveowners from doing exactly what you're doing. Fortunately, you're cleverer and richer than most, and you succeed. You have _him2 brought into your office, and you are pleased to see _him2. _He2's not young and _he2's not pretty, but _his2 suit cannot disguise _his2 big bottom, and _he2's using the tablet _he2 has clasped protectively against _his2 chest to conceal a huge pair of mature breasts. _He2 knows exactly what's happened, and fixes you with a gimlet stare. "In a couple of month<<s>>," _he2 says with venom, "when you've filled me full of hormone<<s>> and drug<<s>> and training, and I'm begging you to <<if $PC.dick != 0>><<s>>tick your tiny little dick up<<else>>fi<<s>>t<</if>> my a<<ss>>hole, remember thi<<s>>. It'll be conditioning and <<s>>elf-pre<<s>>ervation and <<S>>tockholm <<S>>yndrome talking, not me. I think you're a <<if $PC.title == 1>><<s>>ad ba<<s>>tard<<else>>vile cunt<</if>>, and I alway<<s>> will."
 	<<set $shelterAbuse += 10>>
-	<<set $nextButton = "Continue">><<UpdateNextButton>> /* unlock Continue button */
+	<<set $nextButton = "Continue">><<run App.Utils.updateUserButton()>> /* unlock Continue button */
 	<<includeDOM App.UI.newSlaveIntro($activeSlave)>>
 	<</replace>>
 <</link>> //This will cost <<print cashFormat(_ContractCost)>>//
@@ -135,7 +135,7 @@ Not waiting to be greeted, the inspector looks up at the nearest camera and dema
 		<</if>>
 		forcefully escort the inspector off your property. You barely make it back to the penthouse before the message deeming you permanently banned from the Slave Shelter arrives.
 		<<set $shelterAbuse += 100>>
-		<<set $nextButton = "Continue">><<UpdateNextButton>> /* unlock Continue button */
+		<<set $nextButton = "Continue">><<run App.Utils.updateUserButton()>> /* unlock Continue button */
 	<</replace>>
 	<</link>>
 <</if>>
@@ -148,7 +148,7 @@ Not waiting to be greeted, the inspector looks up at the nearest camera and dema
 		<<replace "#result">>
 		_Inspectee.slaveName is attached to a milking machine, so it would be extremely unwise to let the inspector report on _Inspectee.slaveName's industrial fate in all its gorgeous productivity. So, you greet _him2 politely, and bring _him2 down to $dairyName to show _him2 _Inspectee.slaveName. The inspector has a single moment to stiffen in shock at the sight before _he2 stiffens involuntarily due to the security drone tasing _him2 unconscious. It takes a few credits here and there to circumvent the Shelter's various legal and contractual defenses to prevent slaveowners from doing exactly what you're doing, but you finish the day richer by one more big-boobed milk producer. You leave the inspector's drug dosage low to start, so _he2 can appreciate _his2 situation for a while. When the inspector awakes, _his2 visor is set to show an overhead view of _his2 bay in $dairyName. _He2 sees _his2 breasts, already larger than _he2 remembers, gently swaying with the pumping of the milkers.<<if $dairyFeedersSetting > 1>> _He2 sees the huge phallus occupying _his2 mouth, and feels nutrition sliding down _his2 throat.<</if>><<if $dairyPregSetting > 1>> _He2 sees _his2 vagina drooling as it's fucked in preparation for pregnancy.<</if>><<if $dairyPregSetting > 1>> _He2 sees a massive piston moving slowly back and forth beneath _his2 buttocks, and understands what the ache of impossible fullness in _his2 bottom is.<</if>> _His2 hands ball into fists.
 		<<set $shelterAbuse += 10>>
-		<<set $nextButton = "Continue">><<UpdateNextButton>> /* unlock Continue button */
+		<<set $nextButton = "Continue">><<run App.Utils.updateUserButton()>> /* unlock Continue button */
 		<<run newSlave($activeSlave)>> /* skip New Slave Intro */
 		<</replace>>
 	<</link>> //This will cost <<print cashFormat(_ContractCost/2)>>//
@@ -170,7 +170,7 @@ Not waiting to be greeted, the inspector looks up at the nearest camera and dema
 		<</if>>
 		Before _he2 gets the chance to swear defiance against you, another patron rams his dick down _his2 throat, putting a stop to that notion. _His2 hands ball into fists as _he2 endures _his2 first spitroasting.
 		<<set $shelterAbuse += 15>>
-		<<set $nextButton = "Continue">><<UpdateNextButton>> /* unlock Continue button */
+		<<set $nextButton = "Continue">><<run App.Utils.updateUserButton()>> /* unlock Continue button */
 		<<run newSlave($activeSlave)>> /* skip New Slave Intro */
 		<</replace>>
 	<</link>> //This will cost <<print cashFormat(_ContractCost/2)>>//
@@ -179,7 +179,7 @@ Not waiting to be greeted, the inspector looks up at the nearest camera and dema
 		<<replace "#result">>
 		_Inspectee.slaveName is now a guiding force in another of the Free City's arcologies, so it would be disruptive to $his work to be called away like this. You simply pass along $his new address and send the inspector on _his2 way. _He2 stands there dumbfounded before hastily writing notes on _his2 tablet. _He2 seems quite pleased by _Inspectee.slaveName's progress.
 		<<set $shelterAbuse -= 15>>
-		<<set $nextButton = "Continue">><<UpdateNextButton>> /* unlock Continue button */
+		<<set $nextButton = "Continue">><<run App.Utils.updateUserButton()>> /* unlock Continue button */
 		<</replace>>
 	<</link>>
 <<elseif _Inspectee.fuckdoll > 0>>
@@ -189,7 +189,7 @@ Not waiting to be greeted, the inspector looks up at the nearest camera and dema
 		You have _him2 ushered up to your office, and order _Inspectee.slaveName brought in. The inspector has a single moment to stiffen in shock at the sight before _he2 stiffens involuntarily due to the security drone tasing _him2 unconscious. It takes a few credits here and there to circumvent the Shelter's various legal and contractual defenses to prevent slaveowners from doing exactly what you're doing, but you finish the day richer by one more Fuckdoll. Odds are _he2 wants to be defiant, but the suit works perfectly and leaves _him2 no outlet to make _his2 thoughts known.
 		<<run beginFuckdoll($activeSlave)>>
 		<<set $shelterAbuse += 10>>
-		<<set $nextButton = "Continue">><<UpdateNextButton>> /* unlock Continue button */
+		<<set $nextButton = "Continue">><<run App.Utils.updateUserButton()>> /* unlock Continue button */
 		<<run newSlave($activeSlave)>> /* skip New Slave Intro */
 		<</replace>>
 	<</link>> //This will cost <<print cashFormat(_ContractCost/2)>>//
@@ -511,7 +511,7 @@ Not waiting to be greeted, the inspector looks up at the nearest camera and dema
 				<<set $shelterAbuse -= 1>>
 			<</switch>>
 		<</if>>
-		<<set $nextButton = "Continue">><<UpdateNextButton>> /* unlock Continue button */
+		<<set $nextButton = "Continue">><<run App.Utils.updateUserButton()>> /* unlock Continue button */
 		<</replace>>
 	<</link>>
 <</if>>

src/utility/miscWidgets.tw → src/utility/enunciateWidgets.tw

-:: misc widgets [nobr widget]
-
-/* TODO: Modularize. */
-
-/%
-Call as <<UpdateNextButton>>
-Allows for dynamic updating of the next button in the storyCaption (left side-bar) for events that disable the button until user makes a selection
-%/
-<<widget "UpdateNextButton">>
-	<<run App.Utils.updateUserButton()>>
-<</widget>>
+:: enunciate widgets [nobr widget]
 
 <<widget "Master">><<if def $args[0]>><<run Enunciate($args[0])>><<elseif ndef $enunciate>><<run Enunciate($activeSlave)>><</if>>$enunciate.title<</widget>>
 <<widget "say">><<if (def $args[0]) && $enunciate.say != "lisp">>$args[0]<<else>>$enunciate.say<</if>><</widget>>