From 1ecba13c6ec5f243a9c1956ba5273ece1a7771f3 Mon Sep 17 00:00:00 2001
From: klorpa <30924131+klorpa@users.noreply.github.com>
Date: Tue, 30 Apr 2019 14:53:15 -0500
Subject: [PATCH] Formatted
---
src/SecExp/edicts.tw | 48 ++---
src/cheats/mod_EditArcologyCheat.tw | 165 +++++++++---------
src/js/vignettes.js | 14 +-
src/uncategorized/assign.tw | 7 -
src/uncategorized/masterSuite.tw | 44 ++---
src/uncategorized/pRivalInitiation.tw | 2 +-
.../personalAssistantAppearance.tw | 2 +-
src/uncategorized/randomNonindividualEvent.tw | 1 +
src/uncategorized/saRivalries.tw | 2 +-
src/utility/descriptionWidgetsFlesh.tw | 4 +-
10 files changed, 142 insertions(+), 147 deletions(-)
diff --git a/src/SecExp/edicts.tw b/src/SecExp/edicts.tw
index b4bd0614891..ae5bd171732 100644
--- a/src/SecExp/edicts.tw
+++ b/src/SecExp/edicts.tw
@@ -540,39 +540,39 @@
<</if>>
<<if $arcologies[0].FSHedonisticDecadence >= 40>>
- <<if $lowerRquirements == 0>>
- <br>''@@.lime;Revised minimum requirements:@@'' will allow citizens outside the normally accepted range to join the militia.
- <<if $authority >= 1000>>
- [[Implement|edicts][$lowerRquirements = 1, cashX(-5000, "policies"), $authority -= 1000, $militiaBaseDefense--, $militiaBaseHp--]]
- <<else>>
- <br>//Not enough Authority.//
+ <<if $lowerRquirements == 0>>
+ <br>''@@.lime;Revised minimum requirements:@@'' will allow citizens outside the normally accepted range to join the militia.
+ <<if $authority >= 1000>>
+ [[Implement|edicts][$lowerRquirements = 1, cashX(-5000, "policies"), $authority -= 1000, $militiaBaseDefense--, $militiaBaseHp--]]
+ <<else>>
+ <br>//Not enough Authority.//
+ <</if>>
+ <br> //Will slightly lower defense and hp of militia units, but will increase the manpower replenishment rate.//
<</if>>
- <br> //Will slightly lower defense and hp of militia units, but will increase the manpower replenishment rate.//
- <</if>>
<</if>>
<<if $arcologies[0].FSSubjugationist >= 40>>
- <<if $noSubhumansInArmy == 0>>
- <br>''@@.lime;No subhumans in the militia:@@'' prevent subhumans from joining the militia.
- <<if $authority >= 1000>>
- [[Implement|edicts][$noSubhumansInArmy = 1, cashX(-5000, "policies"), $authority -= 1000]]
- <<else>>
- <br>//Not enough Authority.//
+ <<if $noSubhumansInArmy == 0>>
+ <br>''@@.lime;No subhumans in the militia:@@'' prevent subhumans from joining the militia.
+ <<if $authority >= 1000>>
+ [[Implement|edicts][$noSubhumansInArmy = 1, cashX(-5000, "policies"), $authority -= 1000]]
+ <<else>>
+ <br>//Not enough Authority.//
+ <</if>>
+ <br> //Will help advance racial Subjugation, but will slow down slightly manpower replenishment.//
<</if>>
- <br> //Will help advance racial Subjugation, but will slow down slightly manpower replenishment.//
- <</if>>
<</if>>
<<if $arcologies[0].FSRepopulationFocus >= 40 && ($conscription == 1 || $militaryService == 1 || $militarizedSociety == 1)>>
- <<if $pregExemption == 0>>
- <br>''@@.lime;Military exemption for pregnancies:@@'' pregnant citizens will be allowed, and encouraged, to avoid military service.
- <<if $authority >= 1000>>
- [[Implement|edicts][$pregExemption = 1, cashX(-5000, "policies"), $authority -= 1000]]
- <<else>>
- <br>//Not enough Authority.//
+ <<if $pregExemption == 0>>
+ <br>''@@.lime;Military exemption for pregnancies:@@'' pregnant citizens will be allowed, and encouraged, to avoid military service.
+ <<if $authority >= 1000>>
+ [[Implement|edicts][$pregExemption = 1, cashX(-5000, "policies"), $authority -= 1000]]
+ <<else>>
+ <br>//Not enough Authority.//
+ <</if>>
+ <br> //Will help advance repopulation focus, but will slow down slightly manpower replenishment.//
<</if>>
- <br> //Will help advance repopulation focus, but will slow down slightly manpower replenishment.//
- <</if>>
<</if>>
<</if>>
diff --git a/src/cheats/mod_EditArcologyCheat.tw b/src/cheats/mod_EditArcologyCheat.tw
index 481603859e9..578f7e50104 100644
--- a/src/cheats/mod_EditArcologyCheat.tw
+++ b/src/cheats/mod_EditArcologyCheat.tw
@@ -196,88 +196,89 @@ Custom: <<textbox "$language" $language "MOD_Edit Arcology Cheat">>
<br><br>Shelter Abuse Counter: $shelterAbuse
<<textbox "$shelterAbuse" $shelterAbuse>>
-<br><br>''The Slavegirl School:''
-<br>TSS Students Bought: <<textbox "$TSS.studentsBought" $TSS.studentsBought>>
-
-<br>TSS Upgrades: ''$TSS.schoolUpgrade'' |
-<<radiobutton "$TSS.schoolUpgrade" 0>> 0
-| <<radiobutton "$TSS.schoolUpgrade" 1>> 1
-| <<radiobutton "$TSS.schoolUpgrade" 2>> 2
-
-<br>TSS Moved to Arcology: ''$TSS.schoolPresent'' |
-<<radiobutton "$TSS.schoolPresent" 0>> 0
-| <<radiobutton "$TSS.schoolPresent" 1>> 1 (Moved)
-
-<br>TSS Prosperity: <<textbox "$TSS.schoolProsperity" $TSS.schoolProsperity>>
-<br>TSS Failed: ''$TSS.schoolAnnexed'' |
-<<radiobutton "$TSS.schoolAnnexed" 0>> 0
-| <<radiobutton "$TSS.schoolAnnexed" 1>> 1 (Failed)
-
-<br><br>''The Growth Research Institute:''
-<br>GRI Students Bought: <<textbox "$GRI.studentsBought" $GRI.studentsBought>>
-<br>GRI Upgrades: ''$GRI.schoolUpgrade'' |
-<<radiobutton "$GRI.schoolUpgrade" 0>> 0
-| <<radiobutton "$GRI.schoolUpgrade" 1>> 1
-| <<radiobutton "$GRI.schoolUpgrade" 2>> 2
-
-<br>GRI Moved to Arcology: ''$GRI.schoolPresent'' |
-<<radiobutton "$GRI.schoolPresent" 0>> 0
-| <<radiobutton "$GRI.schoolPresent" 1>> 1 (Moved)
-
-<br>GRI Prosperity: <<textbox "$GRI.schoolProsperity" $GRI.schoolProsperity>>
-<br>GRI Failed: ''$GRI.schoolAnnexed'' |
-<<radiobutton "$GRI.schoolAnnexed" 0>> 0
-| <<radiobutton "$GRI.schoolAnnexed" 1>> 1 (Failed)
-
-<br><br>''St. Claver Preparatory:''
-<br>SCP Students Bought: <<textbox "$SCP.studentsBought" $SCP.studentsBought>>
-<br>SCP Upgrades: ''$SCP.schoolUpgrade'' |
-<<radiobutton "$SCP.schoolUpgrade" 0>> 0
-| <<radiobutton "$SCP.schoolUpgrade" 1>> 1
-| <<radiobutton "$SCP.schoolUpgrade" 2>> 2
-
-<br>SCP Moved to Arcology: ''$SCP.schoolPresent'' |
-<<radiobutton "$SCP.schoolPresent" 0>> 0
-| <<radiobutton "$SCP.schoolPresent" 1>> 1 (Moved)
-
-<br>SCP Prosperity: <<textbox "$SCP.schoolProsperity" $SCP.schoolProsperity>>
-<br>SCP Failed: ''$SCP.schoolAnnexed'' |
-<<radiobutton "$SCP.schoolAnnexed" 0>> 0
-| <<radiobutton "$SCP.schoolAnnexed" 1>> 1 (Failed)
-
-
-<br><br>''The Hippolyta Academy:''
-<br>HA Students Bought: <<textbox "$HA.studentsBought" $HA.studentsBought>>
-<br>HA Upgrades: ''$HA.schoolUpgrade''
-<<radiobutton "$HA.schoolUpgrade" 0>> 0
-| <<radiobutton "$HA.schoolUpgrade" 1>> 1
-| <<radiobutton "$HA.schoolUpgrade" 2>> 2
-
-<br>HA Moved to Arcology: ''$HA.schoolPresent'' |
-<<radiobutton "$HA.schoolPresent" 0>> 0
-| <<radiobutton "$HA.schoolPresent" 1>> 1 (Moved)
-
-<br>HA Prosperity: <<textbox "$HA.schoolProsperity" $HA.schoolProsperity>>
-<br>HA Failed: ''$HA.schoolAnnexed'' |
-<<radiobutton "$HA.schoolAnnexed" 0>> 0
-| <<radiobutton "$HA.schoolAnnexed" 1>> 1 (Failed)
-
-<<if $seePreg != 0>>
- <br><br>''The Cattle Ranch:''
- <br>TCR Students Bought: <<textbox "$TCR.studentsBought" $TCR.studentsBought>>
- <br>TCR Upgrades: ''$TCR.schoolUpgrade''
- <<radiobutton "$TCR.schoolUpgrade" 0>> 0
- | <<radiobutton "$TCR.schoolUpgrade" 1>> 1
- | <<radiobutton "$TCR.schoolUpgrade" 2>> 2
-
- <br>TCR Moved to Arcology: ''$TCR.schoolPresent'' |
- <<radiobutton "$TCR.schoolPresent" 0>> 0
- | <<radiobutton "$TCR.schoolPresent" 1>> 1 (Moved)
-
- <br>TCR Prosperity: <<textbox "$TCR.schoolProsperity" $TCR.schoolProsperity>>
- <br>TCR Failed: ''$TCR.schoolAnnexed'' |
- <<radiobutton "$TCR.schoolAnnexed" 0>> 0
- | <<radiobutton "$TCR.schoolAnnexed" 1>> 1 (Failed)
+<<if ($seeDicks != 100)>>
+ <br><br>''The Slavegirl School:''
+ <br>TSS Students Bought: <<textbox "$TSS.studentsBought" $TSS.studentsBought>>
+
+ <br>TSS Upgrades: ''$TSS.schoolUpgrade'' |
+ <<radiobutton "$TSS.schoolUpgrade" 0>> 0
+ | <<radiobutton "$TSS.schoolUpgrade" 1>> 1
+ | <<radiobutton "$TSS.schoolUpgrade" 2>> 2
+
+ <br>TSS Moved to Arcology: ''$TSS.schoolPresent'' |
+ <<radiobutton "$TSS.schoolPresent" 0>> 0
+ | <<radiobutton "$TSS.schoolPresent" 1>> 1 (Moved)
+
+ <br>TSS Prosperity: <<textbox "$TSS.schoolProsperity" $TSS.schoolProsperity>>
+ <br>TSS Failed: ''$TSS.schoolAnnexed'' |
+ <<radiobutton "$TSS.schoolAnnexed" 0>> 0
+ | <<radiobutton "$TSS.schoolAnnexed" 1>> 1 (Failed)
+
+ <br><br>''The Growth Research Institute:''
+ <br>GRI Students Bought: <<textbox "$GRI.studentsBought" $GRI.studentsBought>>
+ <br>GRI Upgrades: ''$GRI.schoolUpgrade'' |
+ <<radiobutton "$GRI.schoolUpgrade" 0>> 0
+ | <<radiobutton "$GRI.schoolUpgrade" 1>> 1
+ | <<radiobutton "$GRI.schoolUpgrade" 2>> 2
+
+ <br>GRI Moved to Arcology: ''$GRI.schoolPresent'' |
+ <<radiobutton "$GRI.schoolPresent" 0>> 0
+ | <<radiobutton "$GRI.schoolPresent" 1>> 1 (Moved)
+
+ <br>GRI Prosperity: <<textbox "$GRI.schoolProsperity" $GRI.schoolProsperity>>
+ <br>GRI Failed: ''$GRI.schoolAnnexed'' |
+ <<radiobutton "$GRI.schoolAnnexed" 0>> 0
+ | <<radiobutton "$GRI.schoolAnnexed" 1>> 1 (Failed)
+
+ <br><br>''St. Claver Preparatory:''
+ <br>SCP Students Bought: <<textbox "$SCP.studentsBought" $SCP.studentsBought>>
+ <br>SCP Upgrades: ''$SCP.schoolUpgrade'' |
+ <<radiobutton "$SCP.schoolUpgrade" 0>> 0
+ | <<radiobutton "$SCP.schoolUpgrade" 1>> 1
+ | <<radiobutton "$SCP.schoolUpgrade" 2>> 2
+
+ <br>SCP Moved to Arcology: ''$SCP.schoolPresent'' |
+ <<radiobutton "$SCP.schoolPresent" 0>> 0
+ | <<radiobutton "$SCP.schoolPresent" 1>> 1 (Moved)
+
+ <br>SCP Prosperity: <<textbox "$SCP.schoolProsperity" $SCP.schoolProsperity>>
+ <br>SCP Failed: ''$SCP.schoolAnnexed'' |
+ <<radiobutton "$SCP.schoolAnnexed" 0>> 0
+ | <<radiobutton "$SCP.schoolAnnexed" 1>> 1 (Failed)
+
+ <br><br>''The Hippolyta Academy:''
+ <br>HA Students Bought: <<textbox "$HA.studentsBought" $HA.studentsBought>>
+ <br>HA Upgrades: ''$HA.schoolUpgrade''
+ <<radiobutton "$HA.schoolUpgrade" 0>> 0
+ | <<radiobutton "$HA.schoolUpgrade" 1>> 1
+ | <<radiobutton "$HA.schoolUpgrade" 2>> 2
+
+ <br>HA Moved to Arcology: ''$HA.schoolPresent'' |
+ <<radiobutton "$HA.schoolPresent" 0>> 0
+ | <<radiobutton "$HA.schoolPresent" 1>> 1 (Moved)
+
+ <br>HA Prosperity: <<textbox "$HA.schoolProsperity" $HA.schoolProsperity>>
+ <br>HA Failed: ''$HA.schoolAnnexed'' |
+ <<radiobutton "$HA.schoolAnnexed" 0>> 0
+ | <<radiobutton "$HA.schoolAnnexed" 1>> 1 (Failed)
+
+ <<if $seePreg != 0>>
+ <br><br>''The Cattle Ranch:''
+ <br>TCR Students Bought: <<textbox "$TCR.studentsBought" $TCR.studentsBought>>
+ <br>TCR Upgrades: ''$TCR.schoolUpgrade''
+ <<radiobutton "$TCR.schoolUpgrade" 0>> 0
+ | <<radiobutton "$TCR.schoolUpgrade" 1>> 1
+ | <<radiobutton "$TCR.schoolUpgrade" 2>> 2
+
+ <br>TCR Moved to Arcology: ''$TCR.schoolPresent'' |
+ <<radiobutton "$TCR.schoolPresent" 0>> 0
+ | <<radiobutton "$TCR.schoolPresent" 1>> 1 (Moved)
+
+ <br>TCR Prosperity: <<textbox "$TCR.schoolProsperity" $TCR.schoolProsperity>>
+ <br>TCR Failed: ''$TCR.schoolAnnexed'' |
+ <<radiobutton "$TCR.schoolAnnexed" 0>> 0
+ | <<radiobutton "$TCR.schoolAnnexed" 1>> 1 (Failed)
+ <</if>>
<</if>>
<<if ($seeDicks != 0)>>
diff --git a/src/js/vignettes.js b/src/js/vignettes.js
index 602652eb705..a0f3f4e9470 100644
--- a/src/js/vignettes.js
+++ b/src/js/vignettes.js
@@ -2311,14 +2311,14 @@ window.GetVignette = function GetVignette(slave) {
break;
case "strugglefuck queen":
vignettes.push({
- text: `${he} earns extra gratitude from a citizen who's obsessed with strugglefucking,`,
+ text: `${he} earned extra gratitude from a citizen who's obsessed with strugglefucking,`,
type: "rep",
effect: 1,
});
break;
case "tease":
vignettes.push({
- text: `${he} convinces a citizen who's never had sex with a street slut to patronize ${him} with some truly inspired flirting,`,
+ text: `${he} convinced a citizen who's never had sex with a street slut to patronize ${him} with some truly inspired flirting,`,
type: "rep",
effect: 1,
});
@@ -2349,7 +2349,7 @@ window.GetVignette = function GetVignette(slave) {
break;
case "caring":
vignettes.push({
- text: `${he} serves as an impromptu sounding board for a citizen having marital trouble,`,
+ text: `${he} served as an impromptu sounding board for a citizen having marital trouble,`,
type: "rep",
effect: 1,
});
@@ -2364,28 +2364,28 @@ window.GetVignette = function GetVignette(slave) {
if (slave.counter.pitKills > 0) {
vignettes.push({
- text: `${he} earns extra gratitude from a citizen obsessed with the fact that ${he}'s a killer,`,
+ text: `${he} earned extra gratitude from a citizen obsessed with the fact that ${he}'s a killer,`,
type: "rep",
effect: 1,
});
}
if (slave.counter.oral > 500) {
vignettes.push({
- text: `a citizen into degradation becomes obsessed with driving ${his} oral mileage as high as possible,`,
+ text: `a citizen into degradation became obsessed with driving ${his} oral mileage as high as possible,`,
type: "rep",
effect: 1,
});
}
if (slave.counter.anal > 500 && slave.anus > 0) {
vignettes.push({
- text: `a citizen into degradation becomes obsessed with driving ${his} anal mileage as high as possible,`,
+ text: `a citizen into degradation became obsessed with driving ${his} anal mileage as high as possible,`,
type: "rep",
effect: 1,
});
}
if (slave.counter.vaginal > 500 && slave.vagina > 0) {
vignettes.push({
- text: `a citizen into degradation becomes obsessed with driving ${his} pussy mileage as high as possible,`,
+ text: `a citizen into degradation became obsessed with driving ${his} pussy mileage as high as possible,`,
type: "rep",
effect: 1,
});
diff --git a/src/uncategorized/assign.tw b/src/uncategorized/assign.tw
index 9fb35d058a7..52be71e1e81 100644
--- a/src/uncategorized/assign.tw
+++ b/src/uncategorized/assign.tw
@@ -3,23 +3,18 @@
<<if $i >= 0 && $i < $slaves.length && ((ndef $activeSlave) || $activeSlave.ID != $slaves[$i].ID)>> /* don't overwrite activeSlave unnecessarily */
<<set $activeSlave = $slaves[$i]>>
<</if>>
-
<<if (ndef $activeSlave)>>
@@.red;ERROR: $activeSlave undefined in Assign.tw, $$i = $i, previous passage was '<<print previous()>>'@@ <<link "Continue">><<goto $returnTo>><</link>>
<<else>>
-
<<switch $assignTo>>
<<case "Pit">>
<<set $fighterIDs.push($activeSlave.ID)>>
<<goto $returnTo>>
-
<<case "Coursing Association">>
<<set $Lurcher = $activeSlave>>
<<goto $returnTo>>
-
<<default>>
<<= assignJob($activeSlave, $assignTo)>>
-
<<if ($showAssignToScenes == 1) && ($activeSlave.fetish != "mindbroken")>>
<<if ($assignTo == "Dairy") && (($dairyStimulatorsSetting >= 2) || ($dairyFeedersSetting >= 2) || ($dairyPregSetting >= 2))>>
<<goto "Industrial Dairy Assignment Scene">>
@@ -34,6 +29,4 @@
<<goto $returnTo>>
<</if>>
<</switch>>
-
<</if>>
-
diff --git a/src/uncategorized/masterSuite.tw b/src/uncategorized/masterSuite.tw
index 0478aadd359..ba559fb3052 100644
--- a/src/uncategorized/masterSuite.tw
+++ b/src/uncategorized/masterSuite.tw
@@ -318,30 +318,30 @@ $masterSuiteNameCaps is furnished
<</if>>
<<if $seePreg != 0>>
-<br>
-<<if $masterSuiteUpgradePregnancy == 1>>
- The master suite has been further upgraded to support fertile slaves and encourage slave pregnancy, providing additional rest areas, better access to amenities, and a dedicated birthing chamber.
- <<if $masterSuitePregnancySlaveLuxuries == 1>>
- Pregnant slaves are being ''given some luxuries'' to reduce stress. [[End the special treatment of pregnant slaves|Master Suite][$masterSuitePregnancySlaveLuxuries = 0]]<br>
- <<else>>
- Pregnant slaves ''have no extra luxuries'' to reduce stress. [[Give pregnant slaves lighter duties|Master Suite][$masterSuitePregnancySlaveLuxuries = 1]] //Costs <<print cashFormat(500)>>/week//<br>
- <</if>>
- <<if $masterSuitePregnancyFertilityDrugs == 1 || $masterSuiteHyperPregnancy == 1>>
- Fertile slaves ''are being given'' <<if $masterSuiteHyperPregnancy == 1>>super fertility drugs<<else>>fertility drugs<</if>>, encouraging impregnation and multiple pregnancy.<<if $masterSuiteHyperPregnancy == 1>> [[End the drug regime|Master Suite][$masterSuiteHyperPregnancy = 0, $masterSuitePregnancyFertilitySupplements = 0]]<<else>> [[End the drug regime|Master Suite][$masterSuitePregnancyFertilityDrugs = 0, $masterSuitePregnancyFertilitySupplements = 0]]<</if>><br>
+ <br>
+ <<if $masterSuiteUpgradePregnancy == 1>>
+ The master suite has been further upgraded to support fertile slaves and encourage slave pregnancy, providing additional rest areas, better access to amenities, and a dedicated birthing chamber.
+ <<if $masterSuitePregnancySlaveLuxuries == 1>>
+ Pregnant slaves are being ''given some luxuries'' to reduce stress. [[End the special treatment of pregnant slaves|Master Suite][$masterSuitePregnancySlaveLuxuries = 0]]<br>
+ <<else>>
+ Pregnant slaves ''have no extra luxuries'' to reduce stress. [[Give pregnant slaves lighter duties|Master Suite][$masterSuitePregnancySlaveLuxuries = 1]] //Costs <<print cashFormat(500)>>/week//<br>
+ <</if>>
+ <<if $masterSuitePregnancyFertilityDrugs == 1 || $masterSuiteHyperPregnancy == 1>>
+ Fertile slaves ''are being given'' <<if $masterSuiteHyperPregnancy == 1>>super fertility drugs<<else>>fertility drugs<</if>>, encouraging impregnation and multiple pregnancy.<<if $masterSuiteHyperPregnancy == 1>> [[End the drug regime|Master Suite][$masterSuiteHyperPregnancy = 0, $masterSuitePregnancyFertilitySupplements = 0]]<<else>> [[End the drug regime|Master Suite][$masterSuitePregnancyFertilityDrugs = 0, $masterSuitePregnancyFertilitySupplements = 0]]<</if>><br>
+ <<else>>
+ Fertile slaves ''are not being given'' fertility drugs. [[Give fertility drugs to all fertile slaves|Master Suite][$masterSuitePregnancyFertilityDrugs = 1]]<<if $seeHyperPreg == 1 && $superFertilityDrugs == 1>> | [[Give hyper fertility drugs to all fertile slaves|Master Suite][$masterSuiteHyperPregnancy = 1]]<</if>><br>
+ <</if>>
+ <<if $masterSuitePregnancyFertilityDrugs == 0 && $masterSuiteHyperPregnancy == 0>>
+ //Fertile slaves ''must be on fertility drugs'' to be given fertility supplements// <br>
+ <<elseif $masterSuitePregnancyFertilitySupplements == 0 && ($masterSuitePregnancyFertilityDrugs == 1 || $masterSuiteHyperPregnancy == 1)>>
+ Fertile slaves ''are not being given'' fertility drug supplements. [[Give supplements to slaves on fertility drugs|Master Suite][$masterSuitePregnancyFertilitySupplements = 1]] //Costs <<print cashFormat(1000)>>/week//<br>
+ <</if>>
+ <<if $masterSuitePregnancyFertilitySupplements == 1 && ($masterSuitePregnancyFertilityDrugs == 1 || $masterSuiteHyperPregnancy == 1)>>
+ Fertile slaves ''are being given'' supplements to their fertility drugs, further enhancing the chances of multiple pregnancy. [[End the supplement regime|Master Suite][$masterSuitePregnancyFertilitySupplements = 0]]<br>
+ <</if>>
<<else>>
- Fertile slaves ''are not being given'' fertility drugs. [[Give fertility drugs to all fertile slaves|Master Suite][$masterSuitePregnancyFertilityDrugs = 1]]<<if $seeHyperPreg == 1 && $superFertilityDrugs == 1>> | [[Give hyper fertility drugs to all fertile slaves|Master Suite][$masterSuiteHyperPregnancy = 1]]<</if>><br>
- <</if>>
- <<if $masterSuitePregnancyFertilityDrugs == 0 && $masterSuiteHyperPregnancy == 0>>
- //Fertile slaves ''must be on fertility drugs'' to be given fertility supplements// <br>
- <<elseif $masterSuitePregnancyFertilitySupplements == 0 && ($masterSuitePregnancyFertilityDrugs == 1 || $masterSuiteHyperPregnancy == 1)>>
- Fertile slaves ''are not being given'' fertility drug supplements. [[Give supplements to slaves on fertility drugs|Master Suite][$masterSuitePregnancyFertilitySupplements = 1]] //Costs <<print cashFormat(1000)>>/week//<br>
+ The master suite does not currently have special customizations to support slave pregnancy. [[Refit the suite to support and encourage slave pregnancy|Master Suite][cashX(forceNeg(_Tmult3), "capEx"), $masterSuiteUpgradePregnancy = 1]] //Costs <<print cashFormat(_Tmult3)>>//
<</if>>
- <<if $masterSuitePregnancyFertilitySupplements == 1 && ($masterSuitePregnancyFertilityDrugs == 1 || $masterSuiteHyperPregnancy == 1)>>
- Fertile slaves ''are being given'' supplements to their fertility drugs, further enhancing the chances of multiple pregnancy. [[End the supplement regime|Master Suite][$masterSuitePregnancyFertilitySupplements = 0]]<br>
- <</if>>
-<<else>>
- The master suite does not currently have special customizations to support slave pregnancy. [[Refit the suite to support and encourage slave pregnancy|Master Suite][cashX(forceNeg(_Tmult3), "capEx"), $masterSuiteUpgradePregnancy = 1]] //Costs <<print cashFormat(_Tmult3)>>//
-<</if>>
<</if>>
<br><br>
diff --git a/src/uncategorized/pRivalInitiation.tw b/src/uncategorized/pRivalInitiation.tw
index 6bd25e71d2f..e5551284507 100644
--- a/src/uncategorized/pRivalInitiation.tw
+++ b/src/uncategorized/pRivalInitiation.tw
@@ -31,7 +31,7 @@ This is a special week, the week of your victory. <<EventNameLink>> awaits your
<<EventNameDelink $activeSlave>>
<<replace "#result">>
<<setLocalPronouns $slaves[1] 2>>
- $slaves[0].slaveName leads $him out into the arcology's largest atrium, forces $him to $his knees, and in full view of the whole arcology, orally rapes someone who was until this week a slaveowner $himself. Behind them, $slaves[1].slaveName is standing ready for _his2 turn, and all your other slaves stand behind _him2. Public opinion is divided; the precedent is universally agreed to be bad, but the punishment is generally thought to be terrible and deserved. Your slaves, however, are almost insufferably @@.hotpink;pleased with you@@ for forcing $activeSlave.slaveName, whom they still view as a slaveowner, to pleasure them.
+ $slaves[0].slaveName leads $him out into the arcology's largest atrium, forces $him to $his knees, and, in full view of the whole arcology, orally rapes someone who was until this week a slaveowner $himself. Behind them, $slaves[1].slaveName is standing ready for _his2 turn, and all your other slaves stand behind _him2. Public opinion is divided; the precedent is universally agreed to be bad, but the punishment is generally thought to be terrible and deserved. Your slaves, however, are almost insufferably @@.hotpink;pleased with you@@ for forcing $activeSlave.slaveName, whom they still view as a slaveowner, to pleasure them.
<<set $activeSlave.counter.oral += $slaves.length*2, $oralTotal += $slaves.length*2>>
<<run $slaves.forEach(function(s) { s.devotion += 10; })>>
<<set $rivalID = 0>>
diff --git a/src/uncategorized/personalAssistantAppearance.tw b/src/uncategorized/personalAssistantAppearance.tw
index 2020edd0248..0154aa62ebe 100644
--- a/src/uncategorized/personalAssistantAppearance.tw
+++ b/src/uncategorized/personalAssistantAppearance.tw
@@ -518,7 +518,7 @@ _HeA's a cute little <<if $arcologies[0].FSSupremacist != "unset" && $assistantF
<<case "eugenics">>
_HeA appears as an ugly and unkempt slave<<= _girlA>>, massively pregnant with hundreds of subhuman spawn. _HisA immense belly is coated in bulges and moving ominously. A malformed, impish child claws its way out of _hisA ruined cunt periodically.
<<case "degradationist">>
- _HeA's made _himselfA up to look almost comically evil: _heA's wearing black lipstick and black eyeliner. Numerous studs cover _hisA bulging belly and a large, heavy ring is driven through _hisA popped navel. Liquid constantly oozes from _hisA gaping vagina where a baby is held mid-birth by several criss-crossing chains.
+ _HeA's made _himselfA up to look almost comically evil: _heA's wearing black lipstick and black eyeliner. Numerous studs cover _hisA bulging belly and a large, heavy ring is driven through _hisA popped navel. Liquid constantly oozes from _hisA gaping vagina where a baby is held mid-birth by several crisscrossing chains.
<<case "supremacist">>
_HeA is nude except for a golden tiara on _hisA head, a symbol of the $arcologies[0].FSSupremacistRace race's divine right to rule. Occasionally a stream of liquid pours from _hisA crotch along with a healthy $arcologies[0].FSSupremacistRace baby.
<<case "subjugationist">>
diff --git a/src/uncategorized/randomNonindividualEvent.tw b/src/uncategorized/randomNonindividualEvent.tw
index f9042f49b12..10c9affc3de 100644
--- a/src/uncategorized/randomNonindividualEvent.tw
+++ b/src/uncategorized/randomNonindividualEvent.tw
@@ -54,6 +54,7 @@
<<if $week >= 10>>
<<set $events.push("P associates public slut")>>
<</if>>
+
<<set $legendaryFacility = 1>>
<<if $legendaryWhoreID != 0>>
<<set $events.push("RE legendary whore")>>
diff --git a/src/uncategorized/saRivalries.tw b/src/uncategorized/saRivalries.tw
index 063cc6dac63..32498fc50b7 100644
--- a/src/uncategorized/saRivalries.tw
+++ b/src/uncategorized/saRivalries.tw
@@ -63,7 +63,7 @@
<<if $slaves[_j].faceShape != "masculine">>
<<if $slaves[_j].muscles <= 30>>
<<if $slaves[_j].vagina > -1>>
- $slaves[$i].slaveName hates women, and something about the feminine <<= SlaveFullName($slaves[_j])>> really gets to $him. @@.lightsalmon;They start to dislike each other.@@
+ $slaves[$i].slaveName hates women, and something about the feminine <<= SlaveFullName($slaves[_j])>> really gets to $him. @@.lightsalmon;They start to dislike each other.@@
<<set $slaves[_j].rivalry = 1, $slaves[$i].rivalry = 1, $slaves[_j].rivalryTarget = $slaves[$i].ID, $slaves[$i].rivalryTarget = $slaves[_j].ID>>
<<break>>
<<else>>
diff --git a/src/utility/descriptionWidgetsFlesh.tw b/src/utility/descriptionWidgetsFlesh.tw
index a133ffb39e1..8bf01c81b07 100644
--- a/src/utility/descriptionWidgetsFlesh.tw
+++ b/src/utility/descriptionWidgetsFlesh.tw
@@ -4292,7 +4292,7 @@ $He's got a
<<case 1>>
a soft little trace of scrotum, since $his testicles are so small they have retreated up into $his abdomen.
<<case 0>>
- smooth $activeSlave.skin.
+ smooth $activeSlave.skin skin.
<<default>>
a hypertrophied, clearly unnatural pair of testicles<<if $showDickCMs == 1>>, about <<= ballsToEitherUnit($activeSlave.balls)>> long<</if>>, a true masterpiece of modern growth hormone treatment.
<</switch>>
@@ -4523,7 +4523,7 @@ $He's got a
<<case 1>>
a soft little trace of scrotum, since $his testicles are so small they have retreated up into $his abdomen.
<<case 0>>
- smooth $activeSlave.skin.
+ smooth $activeSlave.skin skin.
<<default>>
a hypertrophied, clearly unnatural pair of testicles<<if $showDickCMs == 1>>, about <<= ballsToEitherUnit($activeSlave.balls)>> long<</if>>, a true masterpiece of modern growth hormone treatment.
<</switch>>
--
GitLab