From 98446ca557ae5b458705fa0978c932d8da07df70 Mon Sep 17 00:00:00 2001
From: klorpa <30924131+klorpa@users.noreply.github.com>
Date: Tue, 4 Dec 2018 23:39:52 -0600
Subject: [PATCH] Fixems
---
src/pregmod/analyzePlayerPregnancy.tw | 10 ++--
src/uncategorized/arcmgmt.tw | 72 ++++++++++++------------
src/uncategorized/arcologyDescription.tw | 39 +++++--------
src/uncategorized/seBirth.tw | 2 +-
4 files changed, 57 insertions(+), 66 deletions(-)
diff --git a/src/pregmod/analyzePlayerPregnancy.tw b/src/pregmod/analyzePlayerPregnancy.tw
index 57162158b70..1dbc7dfe9ef 100644
--- a/src/pregmod/analyzePlayerPregnancy.tw
+++ b/src/pregmod/analyzePlayerPregnancy.tw
@@ -128,9 +128,9 @@
<br>
Reserved: $PC.womb[_ap].reserve
<</if>>
-
+
<br><br>
-
+
Rename: <<textbox "_tempName" _tempName >> [[Apply | Analyze PC Pregnancy][$PC.womb[_ap].genetics.name = _tempName]]
<<if $PC.womb[_ap].age < 4 && $PC.womb[_ap].fatherID != -6>>
<br>
@@ -142,7 +142,7 @@
<<if $incubator > 0>>
<br>
<<if $PC.womb[_ap].reserve === "incubator">>
- <<link "Don't keep this child in $incubatorName" "Analyze PC Pregnancy">>
+ <<link "Remove this child from $incubatorName" "Analyze PC Pregnancy">>
<<set $PC.womb[_ap].reserve = "">>
<<set $reservedChildren-->>
<</link>>
@@ -161,7 +161,7 @@
<<if $nursery > 0>>
<br>
<<if $PC.womb[_ap].reserve === "nursery">>
- <<link "Don't keep this child in $nurseryName" "Analyze PC Pregnancy">>
+ <<link "Remove this child from $nurseryName" "Analyze PC Pregnancy">>
<<set $PC.womb[_ap].reserve = "">>
<<set $reservedChildrenNursery-->>
<</link>>
@@ -180,5 +180,5 @@
<br><br><hr style="margin:0"><br>
<</capture>>
<</for>>
-
+
<</if>>
diff --git a/src/uncategorized/arcmgmt.tw b/src/uncategorized/arcmgmt.tw
index 389ba6cef5f..80e7a1c1040 100644
--- a/src/uncategorized/arcmgmt.tw
+++ b/src/uncategorized/arcmgmt.tw
@@ -11,11 +11,11 @@ More elite citizens require their own slaves and will cause the population of sl
_FSScore = 0, /*FS progress for tourism*/
_slaveDemandU = 1, /*Changes to upperclass slave demand*/
_slaveDemandT = 1, /*Changes to topclass slave demand*/
-_expirationFS = 1, /*changes to likelyhood of slave death*/
+_expirationFS = 1, /*changes to likelihood of slave death*/
_slaveProductivity = 0, /*changes to slave productivity*/
_lowerClass = 0, /*fixed amount of changes to lowerclass interest to move in*/
_lowerClassP = 1, /*scaling changes to lowerclass interest ("stacking bonus")*/
-_welfareFS = 1, /*changes to likelyhood of lowerclass getting enslaved*/
+_welfareFS = 1, /*changes to likelihood of lowerclass getting enslaved*/
_middleClass = 0, /*see lowerclass examples for the rest of these*/
_middleClassP = 1,
_upperClass = 0,
@@ -1246,18 +1246,18 @@ earning you @@.yellowgreen;<<print cashFormat(_earnings)>>.@@
<<if $desc.length > 0>>
Your arcology's economy benefits from close social alignment with
<<if $desc.length > 2>>
- ''$desc[0]'',
- <<for $k = 1; $k < $desc.length; $k++>>
- <<if $k < $desc.length-1>>
- ''$desc[$k]'',
- <<else>>
- and ''$desc[$k]''<<if $descNeg.length > 0>>, but<<else>>.<</if>>
- <</if>>
- <</for>>
+ ''$desc[0]'',
+ <<for $k = 1; $k < $desc.length; $k++>>
+ <<if $k < $desc.length-1>>
+ ''$desc[$k]'',
+ <<else>>
+ and ''$desc[$k]''<<if $descNeg.length > 0>>, but<<else>>.<</if>>
+ <</if>>
+ <</for>>
<<elseif $desc.length == 2>>
- ''$desc[0]'' and ''$desc[1]''<<if $descNeg.length > 0>>, but<<else>>.<</if>>
+ ''$desc[0]'' and ''$desc[1]''<<if $descNeg.length > 0>>, but<<else>>.<</if>>
<<else>>
- ''$desc[0]''<<if $descNeg.length > 0>>, but<<else>>.<</if>>
+ ''$desc[0]''<<if $descNeg.length > 0>>, but<<else>>.<</if>>
<</if>>
<<set _AWeekGrowth += $desc.length>>
<</if>>
@@ -1265,18 +1265,18 @@ earning you @@.yellowgreen;<<print cashFormat(_earnings)>>.@@
<<if $desc.length == 0>>Your arcology's economy<</if>>
is hindered by social conflicts with
<<if $descNeg.length > 2>>
- ''$descNeg[0]'',
- <<for $k = 1; $k < $descNeg.length; $k++>>
- <<if $k < $descNeg.length-1>>
- ''$descNeg[$k]'',
- <<else>>
- and ''$descNeg[$k]''.
- <</if>>
- <</for>>
+ ''$descNeg[0]'',
+ <<for $k = 1; $k < $descNeg.length; $k++>>
+ <<if $k < $descNeg.length-1>>
+ ''$descNeg[$k]'',
+ <<else>>
+ and ''$descNeg[$k]''.
+ <</if>>
+ <</for>>
<<elseif $descNeg.length == 2>>
- ''$descNeg[0]'' and ''$descNeg[1]''.
+ ''$descNeg[0]'' and ''$descNeg[1]''.
<<else>>
- ''$descNeg[0]''.
+ ''$descNeg[0]''.
<</if>>
<<set _AWeekGrowth -= $descNeg.length>>
<</if>>
@@ -1348,20 +1348,20 @@ earning you @@.yellowgreen;<<print cashFormat(_earnings)>>.@@
<br>
<<if $TSS.schoolPresent == 1>>
-<br>
-The Slave School has a <<if $TSS.schoolProsperity > 4>>very prosperous<<elseif $TSS.schoolProsperity < -4>>struggling<<else>>thriving<</if>> branch campus in $arcologies[0].name.
-<<if $TSS.schoolProsperity >= 10>>
- It is one of the finest slave schools in the world<<if $rep > 19000>>.<<else>>, @@.green;improving your reputation.@@<<set $rep += 200>><</if>>
- <<set $TSS.subsidize = 0>>
- <<set $TSS.schoolProsperity = 10>>
-<</if>>
-<<if $TSS.subsidize == 1>>
- You have a policy of subsidizing them.
- <<set $TSS.schoolProsperity++>>
-<<elseif $TSS.subsidize == -1>>
- You have a policy of covertly undermining them.
- <<set $TSS.schoolProsperity-->>
-<</if>>
+ <br>
+ The Slave School has a <<if $TSS.schoolProsperity > 4>>very prosperous<<elseif $TSS.schoolProsperity < -4>>struggling<<else>>thriving<</if>> branch campus in $arcologies[0].name.
+ <<if $TSS.schoolProsperity >= 10>>
+ It is one of the finest slave schools in the world<<if $rep > 19000>>.<<else>>, @@.green;improving your reputation.@@<<set $rep += 200>><</if>>
+ <<set $TSS.subsidize = 0>>
+ <<set $TSS.schoolProsperity = 10>>
+ <</if>>
+ <<if $TSS.subsidize == 1>>
+ You have a policy of subsidizing them.
+ <<set $TSS.schoolProsperity++>>
+ <<elseif $TSS.subsidize == -1>>
+ You have a policy of covertly undermining them.
+ <<set $TSS.schoolProsperity-->>
+ <</if>>
<</if>>
<<if $GRI.schoolPresent == 1>>
diff --git a/src/uncategorized/arcologyDescription.tw b/src/uncategorized/arcologyDescription.tw
index a92071f918a..e7b8a379c4e 100644
--- a/src/uncategorized/arcologyDescription.tw
+++ b/src/uncategorized/arcologyDescription.tw
@@ -39,12 +39,9 @@ Its<<if $weatherCladding == 2>> glorious<<elseif $weatherCladding > 0>> dull<<el
<<if ($arcologies[0].FSSupremacistDecoration == 100) || ($arcologies[0].FSSubjugationistDecoration == 100) || ($arcologies[0].FSGenderRadicalistDecoration == 100) || ($arcologies[0].FSGenderFundamentalistDecoration == 100) || ($arcologies[0].FSPaternalistDecoration == 100) || ($arcologies[0].FSDegradationistDecoration == 100) || ($arcologies[0].FSBodyPuristDecoration == 100) || ($arcologies[0].FSTransformationFetishistDecoration == 100) || ($arcologies[0].FSYouthPreferentialistDecoration == 100) || ($arcologies[0].FSMaturityPreferentialistDecoration == 100) || ($arcologies[0].FSSlimnessEnthusiastDecoration == 100) || ($arcologies[0].FSAssetExpansionistDecoration == 100) || ($arcologies[0].FSPastoralistDecoration == 100) || ($arcologies[0].FSPhysicalIdealistDecoration == 100) || ($arcologies[0].FSChattelReligionistDecoration == 100) || ($arcologies[0].FSRomanRevivalistDecoration == 100) || ($arcologies[0].FSAztecRevivalistDecoration == 100) || ($arcologies[0].FSEgyptianRevivalistDecoration == 100) || ($arcologies[0].FSEdoRevivalistDecoration == 100) || ($arcologies[0].FSArabianRevivalistDecoration == 100) || ($arcologies[0].FSChineseRevivalistDecoration == 100) || ($arcologies[0].FSRepopulationFocusDecoration == 100) || ($arcologies[0].FSRestartDecoration == 100) || ($arcologies[0].FSHedonisticDecadenceDecoration == 100)>>
Outside the main entrance, there is an enormous statue of an idealized
- <<if ($PC.dick == 1)>><<if ($PC.vagina == 1)>>futanari<<elseif ($PC.boobs == 1)>>shemale figure<<else>>male figure<</if>><<else>>female figure<</if>>
- with several statues of nude slaves at its feet.
+ <<if ($PC.dick == 1)>><<if ($PC.vagina == 1)>>futanari<<elseif ($PC.boobs == 1)>>shemale<<else>>male<</if>><<else>>female<</if>> figure with several statues of nude slaves at its feet.
<<if $arcologies[0].FSSupremacistDecoration == 100>>
- The central
- <<if ($PC.dick == 1)>><<if ($PC.vagina == 1)>>futanari<<elseif ($PC.boobs == 1)>>shemale figure<<else>>male figure<</if>><<else>>female figure<</if>>
- has distinctly $arcologies[0].FSSupremacistRace features.
+ The central <<if ($PC.dick == 1)>><<if ($PC.vagina == 1)>>futanari<<elseif ($PC.boobs == 1)>>shemale<<else>>male<</if>><<else>>female<</if>> figure has distinctly $arcologies[0].FSSupremacistRace features.
<</if>>
<<if $arcologies[0].FSSubjugationistDecoration == 100>>
The slaves have exaggerated $arcologies[0].FSSubjugationistRace features.
@@ -56,8 +53,7 @@ Its<<if $weatherCladding == 2>> glorious<<elseif $weatherCladding > 0>> dull<<el
The slaves are all perfectly female.
<</if>>
<<if $arcologies[0].FSPaternalistDecoration == 100>>
- The slaves are gazing adoringly up at the central
- <<if ($PC.dick == 1)>><<if ($PC.vagina == 1)>>futanari<<elseif ($PC.boobs == 1)>>shemale figure<<else>>male figure<</if>><<else>>female figure<</if>>.
+ The slaves are gazing adoringly up at the central <<if ($PC.dick == 1)>><<if ($PC.vagina == 1)>>futanari<<elseif ($PC.boobs == 1)>>shemale<<else>>male<</if>><<else>>female<</if>> figure.
<</if>>
<<if $arcologies[0].FSDegradationistDecoration == 100>>
The slaves are cowering, and are wearing chains.
@@ -90,7 +86,9 @@ Its<<if $weatherCladding == 2>> glorious<<elseif $weatherCladding > 0>> dull<<el
<<if $arcologies[0].FSRestartDecoration == 100>>
The central
<<if ($PC.dick == 1) && ($PC.vagina == 1)>>
- shemale figure's balls are oversized and her stomach slightly rounded,
+ futanari figure's balls are oversized and her stomach slightly rounded,
+ <<elseif ($PC.dick == 1) && ($PC.boobs == 1)>>
+ shemale figure's balls are swollen with virile seed,
<<elseif ($PC.dick == 1)>>
male figure's balls are swollen with virile seed,
<<else>>
@@ -103,34 +101,29 @@ Its<<if $weatherCladding == 2>> glorious<<elseif $weatherCladding > 0>> dull<<el
<</if>>
<<if $arcologies[0].FSPhysicalIdealistDecoration == 100>>
Both the central
- <<if ($PC.dick == 1)>><<if ($PC.vagina == 1)>>futanari<<elseif ($PC.boobs == 1)>>shemale figure<<else>>male figure<</if>><<else>>female figure<</if>>
- and the slaves are <<if $arcologies[0].FSPhysicalIdealistLaw == 1>>quite fit<<else>>very muscular<</if>>.
+ <<if ($PC.dick == 1)>><<if ($PC.vagina == 1)>>futanari<<elseif ($PC.boobs == 1)>>shemale<<else>>male<</if>><<else>>female<</if>> figure and the slaves are <<if $arcologies[0].FSPhysicalIdealistLaw == 1>>quite fit<<else>>very muscular<</if>>.
<</if>>
<<if $arcologies[0].FSHedonisticDecadenceDecoration == 100>>
The central
- <<if ($PC.dick == 1)>><<if ($PC.vagina == 1)>>futanari<<elseif ($PC.boobs == 1)>>shemale figure<<else>>male figure<</if>><<else>>female figure<</if>>
- has a distinct softness to its body, while the slaves are delightfully rotund.
+ <<if ($PC.dick == 1)>><<if ($PC.vagina == 1)>>futanari<<elseif ($PC.boobs == 1)>>shemale<<else>>male<</if>><<else>>female<</if>> figure has a distinct softness to its body, while the slaves are delightfully rotund.
<</if>>
<<if $arcologies[0].FSChattelReligionistDecoration == 100>>
The central
- <<if ($PC.dick == 1)>><<if ($PC.vagina == 1)>>futanari<<elseif ($PC.boobs == 1)>>shemale figure<<else>>male figure<</if>><<else>>female figure<</if>> has a halo behind <<if $PC.title == 1>>his<<else>>her<</if>> head, and the slaves are in attitudes of worship.
+ <<if ($PC.dick == 1)>><<if ($PC.vagina == 1)>>futanari<<elseif ($PC.boobs == 1)>>shemale<<else>>male<</if>><<else>>female<</if>> figure has a halo behind <<if $PC.title == 1>>his<<else>>her<</if>> head, and the slaves are in attitudes of worship.
<</if>>
<<if $arcologies[0].FSRomanRevivalistDecoration == 100>>
The central
- <<if ($PC.dick == 1)>><<if ($PC.vagina == 1)>>futanari<<elseif ($PC.boobs == 1)>>shemale figure<<else>>male figure<</if>><<else>>female figure<</if>> is wearing a toga; <<if $PC.title == 1>>he<<else>>she<</if>> has a laurel wreath about <<if $PC.title == 1>>his<<else>>her<</if>> brow.
+ <<if ($PC.dick == 1)>><<if ($PC.vagina == 1)>>futanari<<elseif ($PC.boobs == 1)>>shemale<<else>>male<</if>><<else>>female<</if>> figure is wearing a toga; <<if $PC.title == 1>>he<<else>>she<</if>> has a laurel wreath about <<if $PC.title == 1>>his<<else>>her<</if>> brow.
<</if>>
<<if $arcologies[0].FSAztecRevivalistDecoration == 100>>
The central
- <<if ($PC.dick == 1)>><<if ($PC.vagina == 1)>>futanari<<elseif ($PC.boobs == 1)>>shemale figure<<else>>male figure<</if>><<else>>female figure<</if>> is wearing a feathered cloak, ornamented with jewels; <<if $PC.title == 1>>he<<else>>she<</if>> has a giant headdress on <<if $PC.title == 1>>his<<else>>her<</if>> head.
+ <<if ($PC.dick == 1)>><<if ($PC.vagina == 1)>>futanari<<elseif ($PC.boobs == 1)>>shemale<<else>>male<</if>><<else>>female<</if>> figure is wearing a feathered cloak, ornamented with jewels; <<if $PC.title == 1>>he<<else>>she<</if>> has a giant headdress on <<if $PC.title == 1>>his<<else>>her<</if>> head.
<</if>>
<<if $arcologies[0].FSEgyptianRevivalistDecoration == 100>>
- The central
- <<if ($PC.dick == 1)>><<if ($PC.vagina == 1)>>futanari<<elseif ($PC.boobs == 1)>>shemale figure<<else>>male figure<</if>><<else>>female figure<</if>> is wearing a pharaoh's crown.
+ The central <<if ($PC.dick == 1)>><<if ($PC.vagina == 1)>>futanari<<elseif ($PC.boobs == 1)>>shemale<<else>>male<</if>><<else>>female<</if>> figure is wearing a pharaoh's crown.
<</if>>
<<if $arcologies[0].FSEdoRevivalistDecoration == 100>>
- The central
- <<if ($PC.dick == 1)>><<if ($PC.vagina == 1)>>futanari<<elseif ($PC.boobs == 1)>>shemale figure<<else>>male figure<</if>><<else>>female figure<</if>>
- figure has a hand resting confidently on the hilts of the sheathed katana and wakizashi
+ The central <<if ($PC.dick == 1)>><<if ($PC.vagina == 1)>>futanari<<elseif ($PC.boobs == 1)>>shemale<<else>>male<</if>><<else>>female<</if>> figure has a hand resting confidently on the hilts of the sheathed katana and wakizashi
<<if ($PC.title == 1)>>
he
<<else>>
@@ -145,12 +138,10 @@ Its<<if $weatherCladding == 2>> glorious<<elseif $weatherCladding > 0>> dull<<el
waist.
<</if>>
<<if $arcologies[0].FSArabianRevivalistDecoration == 100>>
- The central
- <<if ($PC.dick == 1)>><<if ($PC.vagina == 1)>>futanari<<elseif ($PC.boobs == 1)>>shemale figure<<else>>male figure<</if>><<else>>female figure<</if>> is wearing a turban and flowing robes.
+ The central <<if ($PC.dick == 1)>><<if ($PC.vagina == 1)>>futanari<<elseif ($PC.boobs == 1)>>shemale<<else>>male<</if>><<else>>female<</if>> figure is wearing a turban and flowing robes.
<</if>>
<<if $arcologies[0].FSChineseRevivalistDecoration == 100>>
- The central
- <<if ($PC.dick == 1)>><<if ($PC.vagina == 1)>>futanari<<elseif ($PC.boobs == 1)>>shemale figure<<else>>male figure<</if>><<else>>female figure<</if>> is wearing the robes of an ancient Chinese
+ The central <<if ($PC.dick == 1)>><<if ($PC.vagina == 1)>>futanari<<elseif ($PC.boobs == 1)>>shemale<<else>>male<</if>><<else>>female<</if>> figure is wearing the robes of an ancient Chinese
<<if ($PC.title == 1)>>
Emperor.
<<else>>
diff --git a/src/uncategorized/seBirth.tw b/src/uncategorized/seBirth.tw
index 7bf3b08a0bc..41dbba39537 100644
--- a/src/uncategorized/seBirth.tw
+++ b/src/uncategorized/seBirth.tw
@@ -30,7 +30,7 @@ I need to break single passage to several widgets, as it's been overcomplicated
<</if>>
<</if>>
<<set $dispositionId = _.uniqueId('babyDisposition-')>>
- Birth report: @@.coral;SlaveFullName($slaves[$i])@@
+ Birth report: @@.coral;<<= SlaveFullName($HeadGirl)>>@@
<br>
<<seBirthPreChek>>
<<seBirthPreScene>>
--
GitLab