From 2a6685d7a22aab60a98d281a65aefaf4ad5e12b0 Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Sat, 27 May 2017 05:32:58 -0400
Subject: [PATCH] Fixes.
---
src/init/storyInit.tw | 2 +-
src/npc/databases/dSlavesDatabase.tw | 2 +-
src/npc/fKiss.tw | 2 +-
src/uncategorized/pCoupAttempt.tw | 21 ++++++++++++---------
src/uncategorized/pUndergroundRailroad.tw | 15 +++++++++++++++
src/uncategorized/saLongTermEffects.tw | 17 +++++++++++++++++
6 files changed, 47 insertions(+), 12 deletions(-)
diff --git a/src/init/storyInit.tw b/src/init/storyInit.tw
index 731fe466283..bd70a5ba276 100644
--- a/src/init/storyInit.tw
+++ b/src/init/storyInit.tw
@@ -1241,7 +1241,7 @@ DairyRestraintsSetting($dairyRestraintsSetting)
<<set $badWords = ["fuck", "shit", "ass", "cock", "piss", "dick", "slut", "cum", "whore", "butt", "boob", "cunt", "cunny", "pussy", "junk", "trash", "slave"]>>
<<set $badNames = 0>> /* I have issues getting arrays to initialize otherwise */
-<<set $badNames = ["Dipshit", "Asshole", "Cunt", "Whore", "Dick", "Pussy", "Slaver", "Assfucker", "Sodomite", "Rapist", "Spoiler", "Ruiner", "Ass", "Fucker", "Trash", "Traitor", "Cocksucker", "Dicksucker", "Ass Kisser", "Ass Licker", "Bitch", "Jerk", "Fuckface", "Prick", "Creep", "Retard", "Dumbass", "DumbFuck", "Douchebag"]>>
+<<set $badNames = ["Dipshit", "Asshole", "Cunt", "Whore", "Dick", "Pussy", "Slaver", "Assfucker", "Sodomite", "Rapist", "Despoiler", "Ruiner", "Ass", "Fucker", "Trash", "Traitor", "Cocksucker", "Dicksucker", "Ass Kisser", "Ass Licker", "Bitch", "Jerk", "Fuckface", "Prick", "Creep", "Retard", "Dumbass", "DumbFuck", "Douchebag"]>>
<<set $modestClothes = ["conservative clothing", "a toga", "a huipil", "a slutty qipao", "restrictive latex", "cutoffs and a t-shirt", "battledress", "a penitent nuns habit", "a slave gown", "slutty business attire", "nice business attire", "a comfortable bodysuit", "a leotard", "a bunny outfit", "a nice nurse outfit", "a slutty nurse outfit", "a schoolgirl outfit", "a hijab and abaya", "a kimono", "a nice maid outfit", "a slutty maid outfit", "a ball gown", "a halter top dress", "a mini dress", "a latex catsuit", "a military uniform", "a maternity dress"]>>
diff --git a/src/npc/databases/dSlavesDatabase.tw b/src/npc/databases/dSlavesDatabase.tw
index 32fa61d871d..0487486e370 100644
--- a/src/npc/databases/dSlavesDatabase.tw
+++ b/src/npc/databases/dSlavesDatabase.tw
@@ -425,7 +425,7 @@
<<set $heroSlaves.push(_HS)>>
<<set _HS = {}>>
-<<set _HS.slaveName = "Lilliana", _HS.birthName = "Zuzanna", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 25, _HS.physicalAge = 25, _HS.visualAge = 25, _HS.health = 13, _HS.devotion = 100, _HS.muscles = 100, _HS.height = 190, _HS.eyeColor = "white", _HS.eyes = -2, _HS.hColor = "white with red stripes", _HS.pubicHColor = "white", _HS.skin = "tanned", _HS.hLength = 100, _HS.hStyle = "goes back in a large ass length braid", _HS.pubicHStyle = "bushy", _HS.waist = -55, _HS.boobs = 400, _HS.nipplesPiercing = 1, _HS.butt = 4, _HS.face = 15, _HS.faceImplant = 2, _HS.lipsPiercing = 1, _HS.tonguePiercing = 1, _HS.vagina = 1, _HS.vaginaLube = 1, _HS.anus = 1, _HS.ovaries = 1, _HS.anusTat = "bleached", _HS.makeup = 2, _HS.nails = 1, _HS.earPiercing = 1, _HS.nosePiercing = 1, _HS.eyebrowPiercing = 1, _HS.whoreSkill = 15, _HS.entertainSkill = 15, _HS.combatSkill = 1, _HS.clothes = "nice business attire", _HS.collar = "leather with cowbell", _HS.shoes = "heels", _HS.intelligence = -1, _HS.attrXY = 40, _HS.fetish = "boobs", _HS.fetishKnown = 1>>
+<<set _HS.slaveName = "Lilliana", _HS.birthName = "Zuzanna", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 25, _HS.physicalAge = 25, _HS.visualAge = 25, _HS.health = 13, _HS.devotion = 100, _HS.muscles = 100, _HS.height = 190, _HS.eyeColor = "white", _HS.eyes = -2, _HS.hColor = "white with red stripes", _HS.pubicHColor = "white", _HS.skin = "tanned", _HS.hLength = 100, _HS.hStyle = "back in a large ass length braid", _HS.pubicHStyle = "bushy", _HS.waist = -55, _HS.boobs = 400, _HS.nipplesPiercing = 1, _HS.butt = 4, _HS.face = 15, _HS.faceImplant = 2, _HS.lipsPiercing = 1, _HS.tonguePiercing = 1, _HS.vagina = 1, _HS.vaginaLube = 1, _HS.anus = 1, _HS.ovaries = 1, _HS.anusTat = "bleached", _HS.makeup = 2, _HS.nails = 1, _HS.earPiercing = 1, _HS.nosePiercing = 1, _HS.eyebrowPiercing = 1, _HS.whoreSkill = 15, _HS.entertainSkill = 15, _HS.combatSkill = 1, _HS.clothes = "nice business attire", _HS.collar = "leather with cowbell", _HS.shoes = "heels", _HS.intelligence = -1, _HS.attrXY = 40, _HS.fetish = "boobs", _HS.fetishKnown = 1>>
<<set $heroSlaves.push(_HS)>>
/*Blind*/
diff --git a/src/npc/fKiss.tw b/src/npc/fKiss.tw
index 2aa3233f169..90355386b66 100644
--- a/src/npc/fKiss.tw
+++ b/src/npc/fKiss.tw
@@ -94,7 +94,7 @@ Then, you gently raise her <<if $activeSlave.face > 95>>heartrendingly beautiful
<<elseif ($activeSlave.trust < -50)>>
She is nearly frozen with fear, and does not resist as you kiss her. In fact, she barely reacts at all. She opens her mouth mechanically in response to your insistent tongue, but it's like kissing a doll. She is so filled with terror that she remains stiff even as it becomes clear to her you're not going to hurt her. When you bore of making out with the poor <<if ($activeSlave.physicalAge > 30)>>woman<<else>>girl<</if>> and pull away, she stares at you in utter incomprehension. <<if (($activeSlave.amp == 1) && (canTalk($activeSlave) == false))>>Her eyes beg for an answer: is that it?<<elseif canTalk($activeSlave) == false>>She signs spastically, begging fearfully to know if that's it.<<elseif SlaveStatsChecker.checkForLisp($activeSlave)>>She asks nervously, "I-ith that it, <<Master>>?"<<else>>She asks nervously, "I-is that it, <<Master>> Then she cringes.<</if>>
<<else>>
- She reflexively turns her head away from you, but you catch her jaw and kiss her harder. Spluttering, she flees backwards, but you tip forward with her and pin her against your desk, plundering her mouth without mercy. She wriggles desperately, but her struggles slowly subside as she realizes that you're not taking this any farther. When you bore of it and pull away, she stares at you in utter incomprehension. <<if (($activeSlave.amp == 1) && (canTalk($activeSlave) == false))>>Her eyes demand an answer: is that it?<<elseif canTalk($activeSlave) == false>>She signs irritably, asking whether that's it.<<elseif SlaveStatsChecker.checkForLisp($activeSlave)>>She splutters, "Ith that it, <<Master>>!?"<<else>>She splutters, "Is that it, <<Master>><</if>>
+ She reflexively turns her head away from you, but you catch her jaw and kiss her harder. Spluttering, she flees backwards, but you tip forward with her and pin her against your desk, plundering her mouth without mercy. She wriggles desperately, but her struggles slowly subside as she realizes that you're not taking this any farther. When you bore of it and pull away, she stares at you in utter incomprehension. <<if (($activeSlave.amp == 1) && (canTalk($activeSlave) == false))>>Her eyes demand an answer: is that it?<<elseif canTalk($activeSlave) == false>>She signs irritably, asking whether that's it.<<elseif SlaveStatsChecker.checkForLisp($activeSlave)>>She splutters, "Ith that it, <<Master>>!?"<<else>>She splutters, "Is that it, <<Master>>!?"<</if>>
<</if>>
<<if def _tempGag>>
diff --git a/src/uncategorized/pCoupAttempt.tw b/src/uncategorized/pCoupAttempt.tw
index 2c3002b3355..f7c3c313200 100644
--- a/src/uncategorized/pCoupAttempt.tw
+++ b/src/uncategorized/pCoupAttempt.tw
@@ -63,14 +63,6 @@ You are awakened in the middle of the night by a jolt that shakes the entire arc
<<set $cash -= Math.trunc($cash*0.2)>>
<<set $arcologies[0].prosperity = Math.trunc($arcologies[0].prosperity*0.7)>>
<<set $rep += 2000>>
- <<if $traitor != 0>>
- <<set $activeSlave = $traitor>>
- <<set $activeSlave.assignmentVisible = 1>>
- <<set $activeSlave.assignment = "rest">>
- <<set $activeSlave.health = random(-80,-60)>>
- <<set $activeSlave.origin = "She was your slave, but you freed her, which she repaid by participating in a coup attempt against you. It failed, and she is again your chattel.">>
- <<set _newSlaves.push($activeSlave)>>
- <</if>>
<<for $i = 0; $i < 8; $i++>>
<<if random(0,99) < $seeDicks>>
<<include "Generate XY Slave">>
@@ -120,7 +112,18 @@ You are awakened in the middle of the night by a jolt that shakes the entire arc
<<if $traitor != 0>>
$traitor.slaveName was captured and has been returned to you.
<<set $traitor.assignmentVisible = 1>>
- <<set $traitor.assignment = "rest">>
+ <<set $traitor.assignment = "stay confined">>
+ <<if $familyTesting == 1>>
+ <<for _pca = 0; _pca < $slaves.length; _pca++>>
+ <<if $traitorMother.includes($slaves[_pca].ID)>>
+ <<set $slaves[_pca].mother = $traitor.ID>>
+ <</if>>
+ <<if $traitorFather.includes($slaves[_pca].ID)>>
+ <<set $slaves[_pca].father = $traitor.ID>>
+ <</if>>
+ <</for>>
+ <<set $traitorMother = 0, $traitorFather = 0>>
+ <</if>>
<<set $traitor.health = random(-80,-60)>>
<<set $traitor.origin = "She was your slave, but you freed her, which she repaid by participating in a coup attempt against you. It failed, and she is again your chattel.">>
<<AddSlave $traitor>>
diff --git a/src/uncategorized/pUndergroundRailroad.tw b/src/uncategorized/pUndergroundRailroad.tw
index c598d17297a..9a8cb64f050 100644
--- a/src/uncategorized/pUndergroundRailroad.tw
+++ b/src/uncategorized/pUndergroundRailroad.tw
@@ -79,6 +79,21 @@ You call $activeSlave.slaveName in and politely inquire as to whether she knows
<</for>>
<</if>>
<<set $traitor = $activeSlave>>
+ <<if $familyTesting == 1>>
+ <<set $traitorMother = []>>
+ <<set $traitorfather = []>>
+ <<set $traitor.sisters = 0, $traitor.daughters = 0>>
+ <<for $i = 0; $i < $slaves.length; $i++>>
+ <<if $slaves[$i].ID != $traitor.ID>>
+ <<if $slaves[$i].mother == $traitor.ID>>
+ <<set $traitorMother.push($slaves[$i].ID)>>
+ <</if>>
+ <<if $slaves[$i].father == $traitor.ID>>
+ <<set $traitorfather.push($slaves[$i].ID)>>
+ <</if>>
+ <</if>>
+ <</for>>
+ <</if>>
<<include "Remove activeSlave">>
<</replace>>
<</link>>
diff --git a/src/uncategorized/saLongTermEffects.tw b/src/uncategorized/saLongTermEffects.tw
index 90df6503684..2fde4d73d34 100644
--- a/src/uncategorized/saLongTermEffects.tw
+++ b/src/uncategorized/saLongTermEffects.tw
@@ -3278,9 +3278,17 @@
<<if ($slaves[$i].devotion <= 20) && ($slaves[$i].pregSource == -1)>>
She is filled with a feeling of @@.mediumorchid;revulsion@@ that your child is growing within her body.
<<set $slaves[$i].devotion -= 1>>
+ <<if $slaves[$i].relationship == -3>>
+ This is compounded by the fact that you @@.gold;forced her to marry you@@ and @@.mediumorchid;raped her pregnant.@@
+ <<set $slaves[$i].devotion -= 5, $slaves[$i].trust -= -5>>
+ <</if>>
<<elseif ($slaves[$i].devotion > 50) && ($slaves[$i].pregSource == -1)>>
She @@.hotpink;loves@@ that your child is growing within her.
<<set $slaves[$i].devotion += 1>>
+ <<if $slaves[$i].relationship == -3>>
+ This is compounded by the fact that she is your @@.hotpink;devoted wife@@ and @@.aquamarine;feels it is her duty@@ to bear your children.
+ <<set $slaves[$i].devotion -= 5, $slaves[$i].trust -= -5>>
+ <</if>>
<</if>>
<<if ($slaves[$i].pregSource == $slaves[$i].relationshipTarget)>>
She can't help but feel @@.mediumaquamarine;satisfaction@@ in carrying her lover's child.
@@ -4301,6 +4309,15 @@
Society @@.green;approves@@ of $slaves[$i].slaveName being allowed to choose $possessive own job, advancing ideals about slave self-actualization.
<<FSChangePorn "Paternalist" 1>>
<</if>>
+ <<if ($slaves[$i].relationship == -3)>>
+ <<if $slaves[$i].fetish == "mindbroken">>
+ Society is mixed over your marriage to the mindbroken girl; on one hand $pronoun had no consent, but on the other, you @@.green;surely must love $object@@ to marry $object.
+ <<FSChangePorn "Paternalist" 1>>
+ <<elseif ($slaves[$i].devotion < 20)>>
+ Society is @@.red;thoroughly disgusted@@ that you took $possessive hand in marriage by force.
+ <<FSChangePorn "Paternalist" -3>>
+ <</if>>
+ <</if>>
<<if ($modScore > 15 || ($piercingScore > 8 && $tatScore > 5))>>
Society @@.red;disapproves@@ of $possessive degrading body modifications, which dulls the public interest in letting slaves choose their own appearance.
<<FSChangePorn "Paternalist" -1>>
--
GitLab