From cc8bd3b5579ad46fc9400299247bd28b18c09468 Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Sun, 11 Jun 2017 23:59:34 -0400
Subject: [PATCH] Fixes.
---
src/uncategorized/newSlaveIntro.tw | 4 +--
src/uncategorized/personalAssistantOptions.tw | 2 +-
src/uncategorized/saDrugs.tw | 6 ++--
src/uncategorized/saLongTermEffects.tw | 30 +++++++++++++++++++
4 files changed, 36 insertions(+), 6 deletions(-)
diff --git a/src/uncategorized/newSlaveIntro.tw b/src/uncategorized/newSlaveIntro.tw
index fc9b1e224a2..98d5fa37ab9 100644
--- a/src/uncategorized/newSlaveIntro.tw
+++ b/src/uncategorized/newSlaveIntro.tw
@@ -1105,7 +1105,7 @@ The legalities completed, ''__@@.pink;$activeSlave.slaveName@@__'' <<if ($active
<<if ($activeSlave.indentureRestrictions <= 0) && ($seeExtreme == 1)>>
<br>
<<if $activeSlave.balls > 0>>
- <<link "Geld her">> |
+ <<link "Geld her">>
<<replace "#introResult">>
You drag her to the remote surgery and strap her face down with her legs spread. She doesn't understand what's happening, since the anaesthetics totally deprive her of any sensation. She's so drugged and drowsy with @@.red;surgical recovery@@ that it takes a while for her to figure out what's happened. When she does, her poor mind scarcely processes the @@.gold;horror@@ of what's happened. She numbly carries on, terrified.
<<if $arcologies[0].FSGenderRadicalist != "unset">>
@@ -1119,7 +1119,7 @@ The legalities completed, ''__@@.pink;$activeSlave.slaveName@@__'' <<if ($active
<</replace>>
<<set $activeSlave.balls = 0, $activeSlave.scrotum = 0>>
<<set $activeSlave.health -= 10, $activeSlave.trust -= 50>>
- <</link>>
+ <</link>> |
<</if>>
<<link "Remove her genitalia">>
<<replace "#introResult">>
diff --git a/src/uncategorized/personalAssistantOptions.tw b/src/uncategorized/personalAssistantOptions.tw
index e53f133442f..786a94fe125 100644
--- a/src/uncategorized/personalAssistantOptions.tw
+++ b/src/uncategorized/personalAssistantOptions.tw
@@ -659,7 +659,7 @@ It has no impact on public opinion.
<br>
<</if>>
<<if $seeDicks != 0>>
-<<if $assistantAppearance != "incubus">> [[Inucbus|Personal assistant options][$assistantAppearance = "incubus"]]
+<<if $assistantAppearance != "incubus">> [[Incubus|Personal assistant options][$assistantAppearance = "incubus"]]
<<if $PAPublic == 1>>
<<set _seed = []>>
<<if $arcologies[0].FSRestart != "unset">> <<set _seed.push("Eugenics")>> <</if>>
diff --git a/src/uncategorized/saDrugs.tw b/src/uncategorized/saDrugs.tw
index 1a9c640feec..051f411b2cb 100644
--- a/src/uncategorized/saDrugs.tw
+++ b/src/uncategorized/saDrugs.tw
@@ -720,7 +720,7 @@
<<set $slaves[$i].health -= ($slaves[$i].preg+$slaves[$i].pregType)>>
<<if $slaves[$i].health <= -100>>
$possessiveCap critically poor health @@.orange;caused her to miscarry.@@
- <<if ($slaves[$i].assignmentVisible == 1) && (_currentRule.preg is -1)>><<set $slaves[$i].preg = -1>><<else>><<set $slaves[$i].preg = 0>><</if>>
+ <<if lastPregRule($slaves[$i],$defaultRules)>><<set $slaves[$i].preg = -1>><<else>><<set $slaves[$i].preg = 0>><</if>>
<<if $slaves[$i].fetish != "mindbroken" && $slaves[$i].fuckdoll == 0>>
$pronounCap is
<<if $slaves[$i].devotion < -50>>
@@ -748,7 +748,7 @@
<<set $slaves[$i].labor = 1>>
<<set $slaves[$i].induce = 1>>
<<set $birthee = 1>>
- $pronounCap has been ready to give birth for some time now. Supressing birth for so long @@.red;greatly affects $possessive health@@. $pronounCap may @@.red;have trouble@@ giving birth to $possessive oversized child. $pronounCap seems to be in distress, $possessive body is @@.red;forcing her child out!@@
+ $pronounCap has been ready to give birth for some time now. Supressing birth for so long @@.red;greatly affects $possessive health@@. $pronounCap may @@.red;have trouble@@ giving birth to $possessive oversized child. $pronounCap seems to be in distress, $possessive body is @@.red;forcing $possessive child out!@@
<<elseif $slaves[$i].preg > 40>>
<<set $slaves[$i].health -= 20>>
$pronounCap has been ready to give birth for some time now. Supressing birth for so long @@.red;greatly affects $possessive health@@. $pronounCap may @@.red;have trouble@@ giving birth to $possessive oversized child.
@@ -829,7 +829,7 @@
<</if>>
<<set $slaves[$i].chem = Math.clamp($slaves[$i].chem-0.5, 0, 1000)>>
-<<if $slaves[$i].curatives < 2 && $slaves[$i].inflationType != "curative">>
+<<if $slaves[$i].curatives < 2 && $slaves[$i].inflationType != "curative" && $slaves[$i].assignment != "get treatment in the clinic">>
<<if $slaves[$i].health < -50>>
It's difficult being so ill, and $pronoun @@.mediumorchid;resents you@@ for not treating $possessive.
<<set $slaves[$i].devotion -= 2>>
diff --git a/src/uncategorized/saLongTermEffects.tw b/src/uncategorized/saLongTermEffects.tw
index 1cb264d2506..82087127b60 100644
--- a/src/uncategorized/saLongTermEffects.tw
+++ b/src/uncategorized/saLongTermEffects.tw
@@ -2,6 +2,7 @@
<<fetishChangeChance $slaves[$i]>>
<<set $bellyAccessory to $slaves[$i].bellyAccessory>>
+<<set _para = 0>>
<<if $slaves[$i].fuckdoll > 0>>
<<if $slaves[$i].fuckdoll >= 100>>
@@ -4189,6 +4190,27 @@
<</if>>
<</if>>
+<<if $arcologies[0].FSHedonisticDecadence != "unset" && $slaves[$i].fetish != "mindbroken" && $slaves[$i].fuckdoll == 0>>
+ <<if $arcologies[0].FSHedonisticDecadenceResearch == 1>>
+ <<if $slaves[$i].behavioralQuirk == "insecure">>
+ <<elseif $slaves[$i].behavioralQuirk == "fitness">>
+ <<elseif $slaves[$i].behavioralFlaw == "gluttonous">>
+ <<elseif $slaves[$i].behavioralFlaw == "anorexic">>
+ <<else>>
+ <</if>>
+ <<else>>
+ <<if $slaves[$i].behavioralQuirk == "insecure">>
+ Watching citizens sculpt their slaves to their ideals fills her with @@.mediumaquamarine;relief@@ that someone will find her attractive, or make her so.
+ <<set $slaves[$i].trust++>>
+ <<elseif $slaves[$i].behavioralQuirk == "fitness">>
+ Watching both citizens and other slaves lay around and shirk excercise disappoints her. She @@.gold;fears@@ that she'll be prevented from excercising and grow soft too.
+ <<set $slaves[$i].trust -= 2>>
+ <<elseif $slaves[$i].behavioralFlaw == "gluttonous">>
+ <<elseif $slaves[$i].behavioralFlaw == "anorexic">>
+ <</if>>
+ <</if>>
+<</if>>
+
<<if $FSAnnounced > 0>>
<<set $pornFameBonus = 1>>
@@ -4634,6 +4656,7 @@
<<FSChangePorn "Pastoralist" 1>>
<</if>>
<</if>>
+
<<if $arcologies[0].FSPhysicalIdealist != "unset">>
<<if ($slaves[$i].muscles > 95)>>
Society @@.green;strongly approves@@ of $slaves[$i].slaveName's glorious muscles; everyone wants to train a slave to look as swole as $object.
@@ -4672,6 +4695,13 @@
Society @@.green;approves@@ of $possessive intense fetish; the expectation that everyone's deepest desires should be fulfilled grows.
<<FSChangePorn "HedonisticDecadence" 1>>
<</if>>
+ <<if (_para > 0)>>
+ Society @@.green;is pleased@@ that $pronoun is allowed to fully indulge $possessive paraphilia.
+ <<FSChangePorn "HedonisticDecadence" 1>>
+ <<elseif (_para < 0)>>
+ Society @@.green;frowns@@ upon $object not being allowed to indulge in $possessive paraphilia.
+ <<FSChangePorn "HedonisticDecadence" -2>>
+ <</if>>
<</if>>
<<if $arcologies[0].FSChattelReligionist != "unset">>
--
GitLab