Merge branch 'pregmod-master' of https://gitgud.io/pregmodfan/fc-pregmod into dcoded-dev

src/SecExp/securityHQ.tw

@@ -26,17 +26,18 @@ You have <span id="secHel"> <<print num($secMenials)>> </span> slaves working in
 <<if $cash > _menialPrice>>
 	<<if _bulkMax > 0 || $menials+$fuckdolls+$menialBioreactors == 0>>
 		<br>
-		[[Buy|securityHQ][$menials+=1,$menialSupplyFactor -= 1, cashX(-_menialPrice, "menialTransfer")]]
+		[[Buy|securityHQ][$menials += 1,$menialSupplyFactor -= 1, cashX(-_menialPrice, "menialTransfer")]]
 		<<if $cash > (menialSlaveCost(10))*10>>
-			[[(x10)|securityHQ][$menials+=10,$menialSupplyFactor -= 10, cashX(-(menialSlaveCost(10)*10), "menialTransfer")]]
+			[[(x10)|securityHQ][$menials += 10,$menialSupplyFactor -= 10, cashX(-(menialSlaveCost(10)*10), "menialTransfer")]]
 		<</if>>
 		<<if $cash > (menialSlaveCost(100))*100>>
-			[[(x100)|securityHQ][$menials+=100,$menialSupplyFactor -= 100, cashX(-(menialSlaveCost(100)*100), "menialTransfer")]]
+			[[(x100)|securityHQ][$menials += 100,$menialSupplyFactor -= 100, cashX(-(menialSlaveCost(100)*100), "menialTransfer")]]
 		<</if>>
 		<<if $cash > (_menialPrice+1)*2>>
 			<<set _menialBulkPremium = Math.trunc(1 + Math.clamp($cash/_menialPrice,0,_bulkMax)/400)>>
-			<<set _finalMaxCost = Math.trunc(Math.clamp($cash/(_menialPrice+_menialBulkPremium),0,_bulkMax)*(_menialPrice+_menialBulkPremium))>>
-			[[(max)|securityHQ][$menials += Math.trunc(Math.clamp($cash/(_menialPrice+_menialBulkPremium),0,_bulkMax)), $menialSupplyFactor -= Math.trunc(Math.clamp($cash/(_menialPrice+_menialBulkPremium),0,_bulkMax)), cashX(-_finalMaxCost, "menialTransfer")]]
+			<<set _maxMenials = Math.clamp($cash/(_menialPrice+_menialBulkPremium),0,_bulkMax)>>
+			<<set _finalMaxCost = Math.trunc(_maxMenials*(_menialPrice+_menialBulkPremium))>>
+			[[(max)|securityHQ][$menials += Math.trunc(_maxMenials), $menialSupplyFactor -= Math.trunc(_maxMenials), cashX(-_finalMaxCost, "menialTransfer")]]
 		<</if>>
 		//Bulk transactions may require offering a premium.//
 	<</if>>

src/events/gameover.tw

@@ -9,21 +9,15 @@
 		<br><br>
 		The implanted bomb is small, and went off too far ahead to do anything more than stun. Three other assailants run at you from where they were waiting in the confusion, wielding improvised weapons that apparently did not set off the security scanners. Without a bodyguard, decent security systems, or any other means of personal defense, you meet your ignominious death at the end of a bludgeon fashioned from a maintenance tool.
 
-		<br><br>
-		''GAME OVER''
 	<<case "idiot ball">>
 		<<set $ui = "start">>
 		<<setLocalPronouns $Bodyguard>>
 		You quickly move to deal $Bodyguard.slaveName a slap across the face. You have an instant to realize the depth of your folly as $his combat training kicks into gear: before $he realizes what $he's doing, $he has drawn $his sword, blocked your slap (and incidentally, removed your hand in doing so), and buried the sword in your chest on the riposte. $His devotion returns to $him as $his combat instincts subside. As you fade, you see $his eyes cloud with terrible, unhealable guilt; in one sure movement, $he draws $his weapon, sets it to semi-automatic, places it under $his chin, and fires a single round.
 
-		<br><br>
-		''GAME OVER''
 	<<case "debt">>
 		<<set $ui = "start">>
 		You have fallen so far into debt that it is mere child's play for another slaveowner to purchase your debt, call it in, and enslave you. The story of your remaining years may be worth telling, but it must be told elsewhere.
 
-		<br><br>
-		''GAME OVER''
 	<<case "birth complications">>
 		<<set $ui = "start">>
 		Again and again, you keep bearing down. As you grow more exhausted and are no closer to giving birth, you let out a feeble cry for help.
@@ -31,22 +25,16 @@
 		<br>
 		Some of your slaves rush to your aid, but they don't know what to do; they helplessly watch as you slowly fade away. If only you had someone you could rely on at your side, perhaps this could have been avoided. At last, the medics arrive at $assistantName's order, but it is too late to save you or your child<<if $PC.pregType > 1>>ren<</if>>.
 
-		<br><br>
-		''GAME OVER''
 	<<case "ownership">>
 		<<set $ui = "start">>
 		Since you no longer possess a controlling interest in an arcology, your time of influence and power in the Free Cities is over. You remain wealthy, and your life after the part of it worth telling is not something worth regretting. A retirement full of decadence awaits you.
 
-		<br><br>
-		''GAME OVER''
 	<<case "sisters">>
 		<<set $ui = "start">>
 		For the first time in a long time, you feel the need to verbalize a response, telling the matron that yes, you will join them. She seems to understand, and takes you by the hand in a surprisingly familial gesture, leading you towards the orgy. She tells you she loves you, and all her Sisters echo her. After a moments' surprise, you tell them you love them too, and feminine hands reach out to draw you into their communion. A young futa sucks your cock and then feeds you your own cum from her mouth. An older futa with an enormous penis displaces her and makes out with you while she fucks your pussy. After she finishes inside you she slides your erection inside her own womanhood and rides you while a younger futa fucks your cleavage. You have a free hand which someone fills by pressing an enormous soft breast against it and you oblige her by massaging it eagerly. The futa matron's pussy grows suddenly tighter as another futa starts to buttfuck her and then looser as the cock is removed and inserted into your asshole instead. When she cums inside you she pulls out and her cock is replaced by a greedy mouth and tongue whose owner you cannot see. The older futa presses her cockhead into a younger Sister's mouth and orgasms before sliding herself under you so you can be on top instead. A futa whispers that she wants to be closer to you and slides her cock inside the matron's pussy alongside yours as she nestles her face between your breasts.
 		<br><br>
 		Your appointed successor arrives in your old office to find $assistantName ready to help them take control of the arcology. Most of your assets have been liquidated to create a huge endowment for $arcologies[0].name's Sisters. They'll never have to sell one of their own again, and will be able to afford all the advanced drugs and surgeries they desire. From the most matronly futa down to their newest Sister, none of them need concern themselves with anything other than sex.
 
-		<br><br>
-		''GAME OVER''
 	<<case "major battle defeat">>
 		<<set $ui = "start">>
 		<<if $attackType == "raiders">>
@@ -63,8 +51,6 @@
 			Your personal story may continue, but that part of it worthy of retelling has now ended.
 		<</if>>
 
-		<br><br>
-		''GAME OVER''
 	<<case "Rebellion defeat">>
 		<<set $ui = "start">>
 		<<if $slaveRebellion == 1>>
@@ -75,19 +61,15 @@
 			The end of your story has come and your arcology is now in the hands of whoever will take control of the vermin that dared rise up this day.
 		<</if>>
 
-		<br><br>
-		''GAME OVER''
 	<<case "Idiot Ball 2 The Dumbassening">>
 	<<case "Idiot Ball 3 Totally Not Idiot Ball 2 Again">>
 		<<set $ui = "start">>
 		As you leave your penthouse to conduct your daily rounds, you promptly get <<if $arcologyUpgrade.drones == 1>>tased by the nearest drone<<else>>tackled hard against the wall<</if>>. When you awake, it hits you like a truck; you idiotically enslaved your $PC.race ass by decreeing all <<if $gameover == "Idiot Ball 2 The Dumbassening">>non-<<print $arcologies[0].FSSupremacistRace>><<else>><<print $arcologies[0].FSSubjugationistRace>><</if>><<if $PC.race != "mixed race">>s<<else>> individuals<</if>> slaves, and since you are now a slave, lack the authority to revert the policy. The story of your remaining years may be worth telling, as is your legendary blunder, but it must be told elsewhere.
 
-		<br><br>
-		''GAME OVER''
 	<<default>>
 		<<set $ui = "start">>
 		Since you are without slaves, Free Cities society no longer considers you a citizen of the first rank. Your personal story may continue, but that part of it worthy of retelling has now ended.
 
-		<br><br>
-		''GAME OVER''
-<</switch>>
\ No newline at end of file
+<</switch>>
+<br><br>
+''GAME OVER''
\ No newline at end of file

src/pregmod/seFCTVremote.tw

@@ -159,7 +159,7 @@ $activeSlave.slaveName stands perfectly still for a moment, clearly not sure wha
 <br>
 The customer quietly places a hand on $his shoulder and the tech jumps several inches. "Like I said, bottom shelf," _he2 repeated softly in $his ear.
 <br>
-The tech slowly lowers $himself to the floor, and as $his modified shirt rides up $his pants ride down, they reveal your second modification: a tramp stamp that read "Shove that upgraded package here." The customer whistles and in an instant grabs a handful of ass. Perfect! The tech tries to stand up and object: "Excuse me <<if _customer.dick > 0>>sir<<else>>ma'am<</if>>, what...!" "Hold on baby," the customer replies and you pick that moment to hit the third button.
+The tech slowly lowers $himself to the floor, and as $his modified shirt rides up $his pants ride down, they reveal your second modification: a tramp stamp that reads "Shove that upgraded package here." The customer whistles and in an instant grabs a handful of ass. Perfect! The tech tries to stand up and object: "Excuse me <<if _customer.dick > 0>>sir<<else>>ma'am<</if>>, what...!" "Hold on baby," the customer replies and you pick that moment to hit the third button.
 <br><br>
 Channel 14 had fascinated you. Thanks to this bumbling tech you hadn't been able to see it very often, but the idea of an aphrodisiac that took effect instantly and then quickly vanished seemed incredibly useful to you. How fortunate that it had arrived in time for this moment. The tech would have felt a fairly large liquid 'splurt' from the vibe inside $his ass that would have been difficult to explain. Equally difficult to explain would be the now undeniably raging vibrations. But as $he turns $his head and you can see $his face on the camera, it's clear none of that matters. "Please," the now flushed tech says. "M...mm my ass."
 <br><br>

src/utility/descriptionWidgetsTattoos.tw

@@ -561,6 +561,8 @@
 		$He has a ring of numbers around $his anus, detailing the date $he was enslaved by you.
 	<<case "paternalist">>
 		$His anus is bleached. It is tattooed with text in a ring around $his hole, reading '<<= WrittenMaster($activeSlave)>> Helped Me Love Anal.'
+	<<case "Asian art">>
+		$His anus is bleached.
 	<<default>>
 		$activeSlave.anusTat
 	<</switch>>