From 2bd00696fe6f37f2c370e08b00ce828b8f7aed43 Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Thu, 24 Aug 2017 21:50:25 -0400
Subject: [PATCH] Fixes
---
src/uncategorized/BackwardsCompatibility.tw | 8 ++--
src/uncategorized/RESS.tw | 2 +-
src/uncategorized/longSlaveDescription.tw | 4 ++
src/uncategorized/reAWOL.tw | 1 -
src/uncategorized/saGetMilked.tw | 5 ++
src/uncategorized/saLongTermEffects.tw | 52 +++++++++++++++++----
src/uncategorized/servantsQuartersReport.tw | 4 ++
7 files changed, 60 insertions(+), 16 deletions(-)
diff --git a/src/uncategorized/BackwardsCompatibility.tw b/src/uncategorized/BackwardsCompatibility.tw
index ae1d1fcffb0..02d3fe40fe8 100644
--- a/src/uncategorized/BackwardsCompatibility.tw
+++ b/src/uncategorized/BackwardsCompatibility.tw
@@ -1163,11 +1163,11 @@ Setting missing global variables:
<<set $masterSuiteDecoration = "standard">>
<</if>>
-<<if ndef $HGSuiteIDs>>
- <<set $HGSuiteIDs = []>>
+<<if ndef $HGSuiteiIDs>>
+ <<set $HGSuiteiIDs = []>>
<</if>>
-<<if $HGSuiteIDs.length > 0 && typeof $HGSuiteIDs[0] === 'object'>>
- <<set $HGSuiteIDs = $HGSuiteIDs.map(function(a) { return a.ID; })>>
+<<if $HGSuiteiIDs.length > 0 && typeof $HGSuiteiIDs[0] === 'object'>>
+ <<set $HGSuiteiIDs = $HGSuiteiIDs.map(function(a) { return a.ID; })>>
<</if>>
<<if ndef $HGSuiteName>>
<<set $HGSuiteName = "the Head Girl Suite">>
diff --git a/src/uncategorized/RESS.tw b/src/uncategorized/RESS.tw
index 9465a78d481..226218ffd87 100644
--- a/src/uncategorized/RESS.tw
+++ b/src/uncategorized/RESS.tw
@@ -5380,7 +5380,7 @@ You tell her kindly that you understand, and that she'll be trained to address t
<<EventNameDelink $activeSlave>>
<<replace "#result">>
$activeSlave.slaveName is face down into a special chair a bit like a massage setup<<if $activeSlave.preg > 20>>, though with a hole for her pregnancy to fit into<</if>>, with her breasts hanging down so the milkers can work away at her nipples. As such, her back and ass are on display as she grunts and groans with relief. She starts at your hand on her back but <<if $activeSlave.devotion > 20>>quickly<<else>>slowly<</if>> relaxes. <<if ($activeSlave.vagina != -1)>>The stimulation of the milking has her soaking wet, and she whimpers with pleasure as you enter her sopping pussy. She's so wet that her plentiful vaginal secretions make it very easy for you to switch <<if $PC.dick == 0>>your strap-on<<else>>your dick<</if>> to the cow's butt.<<elseif ($activeSlave.vaginalAccessory == "chastity belt")>>This milk cow's vagina is protected by a chastity belt, but her butthole isn't. You fuck it<<if $PC.dick == 0>> with a strap-on<</if>> instead as she bucks and grinds against the chair.<<else>>Perversely, this milk cow has no pussy, so you spit on her ass and sodomize her<<if $PC.dick == 0>> with a strap-on<</if>> instead as she bucks and grinds against the chair.<</if>> When she comes, the milkers detect her orgasm to your fucking and shunt the milk into different reservoirs. Though you've never been able to taste much difference, there's a belief out there that 'milk-cum,' the squirts of milk a slave milk girl produces when climaxing with her <<Master>>, have special aphrodisiac powers. @@.yellowgreen;It can be sold at a special premium.@@ Naturally, @@.hotpink;her devotion to you has also increased.@@
- <<if ($activeSlave.vagina > -1) && ($activeSlave.vaginalAccessory != "chastity belt")>>
+ <<if ($activeSlave.vagina > -1) && canDoVaginal($activeSlave)>>
<<BothVCheck>>
<<else>>
<<AnalVCheck>>
diff --git a/src/uncategorized/longSlaveDescription.tw b/src/uncategorized/longSlaveDescription.tw
index 7b5443322fe..a9155325f60 100644
--- a/src/uncategorized/longSlaveDescription.tw
+++ b/src/uncategorized/longSlaveDescription.tw
@@ -1170,6 +1170,10 @@ when a dick is pushed inside <<if $activeSlave.vagina >= -1>>either of its lower
She was a slave long before you obtained her.
<<elseif $activeSlave.career == "a slave since birth">>
She's been your slave her entire life.
+ <<elseif $activeSlave.career == "a dairy cow">>
+ She's been broken into the belief that she is nothing more than a cow to be milked and bred.
+ <<elseif $activeSlave.career == "a breeding bull">>
+ She's been broken into the belief that she is nothing more than a bull destined to fill fertile wombs with calfs.
<<elseif $activeSlave.career == "a breeder">>
Before you obtained her, she was nothing more than a womb to be filled.
<<elseif $activeSlave.career == "a bioreactor">>
diff --git a/src/uncategorized/reAWOL.tw b/src/uncategorized/reAWOL.tw
index 8f0b921bfd6..9dfb379fbe5 100644
--- a/src/uncategorized/reAWOL.tw
+++ b/src/uncategorized/reAWOL.tw
@@ -45,7 +45,6 @@ Your window of opportunity to act is closing. If you have plans for punishing th
<<if $securityForceActive > 1>>
<<link "Let your $securityForceName handle her">>
<<replace "#result">>
- <<if <<if $securityForceActive > 1>>
You take a tablet and send the Colonel a notice about the mutinous mercenary. When you have the majority of the pertinent details committed to text, all that remains is to decide the fate of your quarry.
<br><br>
<span id="SFresult">
diff --git a/src/uncategorized/saGetMilked.tw b/src/uncategorized/saGetMilked.tw
index 5c42f7bece4..0ef565e110e 100644
--- a/src/uncategorized/saGetMilked.tw
+++ b/src/uncategorized/saGetMilked.tw
@@ -168,6 +168,11 @@ gets milked this week.
<<set $slaves[$i].devotion += 1>>
<</if>>
+ <<if $slaves[$i].career == "a dairy cow" && $slaves[$i].fetish != "mindbroken" && $slaves[$i].fuckdoll == 0>>
+ She feels like @@.hotpink;she was made to be milked,@@ @@.aquamarine;not that she'd complain about such a good feeling.@@
+ <<set $slaves[$i].devotion++, $slaves[$i].trust++>>
+ <</if>>
+
<<if ($slaves[$i].lactation > 1)>>
<<if ($slaves[$i].nipples != "huge")>>
<<if ($slaves[$i].nipples == "inverted")>>
diff --git a/src/uncategorized/saLongTermEffects.tw b/src/uncategorized/saLongTermEffects.tw
index 9f3e13f4228..22f1a40641e 100644
--- a/src/uncategorized/saLongTermEffects.tw
+++ b/src/uncategorized/saLongTermEffects.tw
@@ -2246,10 +2246,14 @@
<<if ($slaves[$i].heels == 1)>>
<<if ($slaves[$i].shoes != "heels") && ($slaves[$i].shoes != "boots") && ($slaves[$i].shoes != "extreme heels")>>
<<if $slaves[$i].fetish != "submissive">>
+<<if $slaves[$i].career == "a dairy cow" || $slaves[$i].career == "a breeding bull">>
+ Since she sees herself as an animal, she is perfectly content walking on all fours.
+<<else>>
<<if $fetishChangeChance > random(0,100)>>
Living as a sex slave on all fours @@.lightcoral;turns her into a sexual submissive.@@
<<set $slaves[$i].fetish = "submissive", $slaves[$i].fetishKnown = 1, $slaves[$i].fetishStrength = 65>>
<</if>>
+<</if>>
<<elseif ($slaves[$i].fetish == "submissive") && ($slaves[$i].fetishStrength <= 95)>>
Living as a sex slave on all fours @@.lightcoral;pushes her deeper into submission.@@
<<set $slaves[$i].fetishStrength += 4>>
@@ -2258,16 +2262,37 @@
<</if>>
<</if>>
-<<if $slaves[$i].career == "a slave">>
+<<switch $slaves[$i].career>>
+<<case "a slave">>
She has been a slave so long that she can barely remember making decisions for herself, and @@.hotpink;feels naturally drawn@@ to her <<if $PC.title == 1>>Master<<else>>Mistress<</if>>.
<<set $slaves[$i].devotion += 1>>
-<<elseif $slaves[$i].career == "a Fuckdoll">>
+<<case "a Fuckdoll">>
She was once a Fuckdoll, leaving her @@.hotpink;willing to obey on an instinctual level.@@
<<set $slaves[$i].devotion += 5>>
-<<elseif $slaves[$i].career == "a slave since birth">>
+<<case "a dairy cow">>
+ Her mental conditioning @@.hotpink;leaves her mellow@@ and @@.mediumaquamarine;trusting.@@
+ <<set $slaves[$i].trust += 1, $slaves[$i].devotion += 1>>
+ <<if $slaves[$i].lactation == 0>>
+ However, she is @@.gold;reduced to a state of sheer panic@@ over her dried up breasts.
+ <<set $slaves[$i].trust -= 10>>
+ <<elseif $slaves[$i].preg < 1 || $slaves[$i].bellyImplant < 2000>>
+ However, she is @@.gold;reduced to a state of panic@@ that her milk will dry up if she doesn't get pregnant again soon.
+ <<set $slaves[$i].trust -= 2>>
+ <</if>>
+<<case "a breeding bull">>
+ Her mental conditioning @@.hotpink;leaves her mellow@@ and @@.mediumaquamarine;trusting.@@
+ <<set $slaves[$i].trust += 1, $slaves[$i].devotion += 1>>
+ <<if !canAchieveErection($slaves[$i])>>
+ However, she is @@.gold;reduced to a state of sheer panic@@ over her inability to get hard.
+ <<set $slaves[$i].trust -= 10>>
+ <<elseif !canPenetrate($slaves[$i])>>
+ However, she is @@.mediumorchid;disapointed@@ that she is unable to mount and fuck others any more.
+ <<set $slaves[$i].devotion -= 2>>
+ <</if>>
+<<case "a slave since birth">>
The tank's imprinting left a lasting impression on her; deep down she @@.hotpink;knows you are to be obeyed@@ and @@.mediumaquamarine;trusted,@@ even if she can't understand why.
<<set $slaves[$i].devotion += 3, $slaves[$i].trust += 3>>
-<<elseif $slaves[$i].career == "a breeder">>
+<<case "a breeder">>
<<if $slaves[$i].preg > 3 && $arcologies[0].FSRepopulation != "unset">>
Her life used to revolve around being pregnant all the time and nothing has changed. However, being surrounded with happy, heavily pregnant women leaves her @@.hotpink;slightly more accepting@@ of her fate and @@.mediumaquamarine;hopeful@@ that her trained body will be useful to you.
<<set $slaves[$i].trust += 1, $slaves[$i].devotion += 1>>
@@ -2281,10 +2306,10 @@
She remembers how her womb used to be swollen with children as often as possible, and is @@.hotpink;thankful@@ and @@.mediumaquamarine;grateful@@ that she isn't just meat to fuck pregnant anymore.
<<set $slaves[$i].trust += 1, $slaves[$i].devotion += 1>>
<</if>>
-<<elseif $slaves[$i].career == "a bioreactor">>
+<<case "a bioreactor">>
She remembers what it was like to be a living, breathing, milk-jetting,<<if isFertile($slaves[$i]) && ($dairyPregUpgrade > 0)>> baby-filled,<</if>><<if ($slaves[$i].balls != 0)>> cum-squirting,<</if>> drug-filled piece of industrial equipment, and is @@.hotpink;thankful@@ and @@.mediumaquamarine;grateful@@ that she isn't any more.
<<set $slaves[$i].trust += 1, $slaves[$i].devotion += 1>>
-<<elseif $slaves[$i].career == "a Futanari Sister">>
+<<case "a Futanari Sister">>
<<if $masterSuiteUpgradeLuxury is 2>>
<<if $slaves[$i].assignment == "serve in the master suite">>
She knows that $masterSuiteName features a fuckpit much like the one she spent years enjoying as a Futanari Sister, and @@.hotpink;does her best@@ to be a good girl in the hope you'll send her there someday.
@@ -2294,7 +2319,7 @@
<<set $slaves[$i].trust += 1>>
<</if>>
<</if>>
-<<else>>
+<<default>>
<<if $slaves[$i].trust >= -50>>
<<if setup.gratefulCareers.includes($slaves[$i].career)>>
<<set $slaves[$i].trust += 1>>
@@ -2321,7 +2346,7 @@
<</if>>
<</if>>
<</if>>
-<</if>>
+<</switch>>
<</if>> /* CLOSES FUCKDOLL CHECK FOR MENTAL DEVELOPMENT */
<</if>> /* CLOSES MINDBROKEN CHECK FOR MENTAL DEVELOPMENT */
@@ -3630,7 +3655,9 @@
<<if ($slaves[$i].preg >= 10)>>
<<if ($slaves[$i].fuckdoll == 0) && ($slaves[$i].fetish != "mindbroken")>>
- <<if ($slaves[$i].devotion <= 20) && ($slaves[$i].pregSource == -1)>>
+ <<if $slaves[$i].career == "a dairy cow" && ($slaves[$i].devotion <= 50)>>
+ She @@.aquamarine;feels right@@ to be growing heavy with child. To her, a growing baby means better milk.
+ <<elseif ($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>>
@@ -3890,6 +3917,9 @@
The opportunity @@.green;strengthens her pregnancy fetish@@ by indulgence.
<<set $HeadGirl.fetishStrength += 4>>
<</if>>
+ <<elseif $HeadGirl.career == "a breeding bull">>
+ Head girl feels @@.hotpink;she was meant for.@@
+ <<set $HeadGirl.devotion += 1>>
<<elseif ($HeadGirl.attrXX > 65) && ($HeadGirl.attrKnown == 1)>>
<<if $slaves[$i].mpreg == 1>>ass<<else>>pussy<</if>>-hungry Head Girl is @@.hotpink;happy@@ to take on.
<<set $HeadGirl.devotion += 1>>
@@ -3898,7 +3928,9 @@
<</if>>
<<if ($slaves[$i].fuckdoll == 0) && ($slaves[$i].fetish != "mindbroken")>>
- <<if ($slaves[$i].devotion <= 20) && ($slaves[$i].trust > -20)>>
+ <<if $slaves[$i].career == "a dairy cow" && ($slaves[$i].devotion <= 20)>>
+ $slaves[$i].slaveName feels a need to be bred by the Head Girl, and takes her superior's cock bareback until @@.lime;conception@@ is verified.
+ <<elseif ($slaves[$i].devotion <= 20) && ($slaves[$i].trust > -20)>>
<<if (($HeadGirl.fetish == "sadist") || ($HeadGirl.fetish == "dom")) && ($HeadGirl.fetishKnown == 1) && ($HeadGirl.fetishStrength > 60)>>
Her interest is piqued, however, when $slaves[$i].slaveName shows signs of resistance. $HeadGirl.slaveName @@.hotpink;enthusiastically@@ @@.mediumorchid;rapes the poor girl@@ pregnant, ejaculating inside her victim more often than is really necessary for @@.lime;conception.@@
<<set $HeadGirl.devotion += 2, $slaves[$i].devotion -= 5>>
diff --git a/src/uncategorized/servantsQuartersReport.tw b/src/uncategorized/servantsQuartersReport.tw
index 0d88477ea39..10bfe93f60f 100644
--- a/src/uncategorized/servantsQuartersReport.tw
+++ b/src/uncategorized/servantsQuartersReport.tw
@@ -57,6 +57,10 @@
<<else>>
she ensures the _stewardessImpregnated fertile servants are full of her cum at all times.
<</if>>
+ <<if $Stewardess.career == "a breeding bull">>
+ She was conditioned to fill empty wombs, so she takes a @@.hotpink;deep pleasure@@ in her job.
+ <<set $slaves[_FLs].devotion++>>
+ <</if>>
<<set _Tmult = (_stewardessImpregnated * 10), $slaves[_FLs].penetrativeCount += _Tmult, $Stewardess.penetrativeCount += _Tmult, $penetrativeTotal += _Tmult>>
<</if>>
<</if>>
--
GitLab