From 2a7b5dc63871fefa0c3305dc6770a7fea626f6bc Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Fri, 28 Apr 2017 01:40:43 -0400
Subject: [PATCH] More vanilla fixes.
---
src/uncategorized/dairy.tw | 60 +++++++++++---------------------
src/uncategorized/masterSuite.tw | 2 +-
2 files changed, 21 insertions(+), 41 deletions(-)
diff --git a/src/uncategorized/dairy.tw b/src/uncategorized/dairy.tw
index 1fa7fc8876a..5c88f72a6bb 100644
--- a/src/uncategorized/dairy.tw
+++ b/src/uncategorized/dairy.tw
@@ -9,6 +9,18 @@ DairyRestraintsSetting($dairyRestraintsSetting)
<<set $dairyNameCaps = $dairyName.replace("the ", "The ")>>
<</if>>
+<<for _Di = 0; _Di < _DL; _Di++>>
+<<set _i = $DairyiIDs[_Di].Index, _ID = $DairyiIDs[_Di].ID>>
+<<if _i >= _SL || _ID != $slaves[_i].ID>>
+ <<for _i = 0; _i < _SL; _i++>>
+ <<if _ID == $slaves[_i].ID>>
+ <<set $DairyiIDs[_Di].Index = _i>>
+ <<break>>
+ <</if>>
+ <</for>>
+<</if>>
+<</for>>
+
<<if ($dairyRestraintsSetting != 2) || ($dairyRestraintsUpgrade != 1)>>
<<if $dairyStimulatorsSetting == 2>>
<<set $dairyStimulatorsSetting = 1>>
@@ -38,19 +50,11 @@ DairyRestraintsSetting($dairyRestraintsSetting)
<</if>>
<<if $dairyPregSettingChanged == 1>>
<<for _Di = 0; _Di < _DL; _Di++>>
- <<set _i = $DairyiIDs[_Di].Index, _ID = $DairyiIDs[_Di].ID>>
- <<if _ID != $slaves[_i].ID>>
- <<for _i = 0; _i < _SL; _i++>>
- <<if _ID == $slaves[_i].ID>>
- <<set $DairyiIDs[_Di].Index = _i>>
- <<break>>
- <</if>>
- <</for>>
- <</if>>
+ <<set _i = $DairyiIDs[_Di].Index>>
<<if ($slaves[_i].vagina > -1) && ($slaves[_i].vagina < 3)>>
$slaves[_i].slaveName's milking machine ejects her, since it cannot fit the mandated dildo into her tight cunt.
<<removeJob $slaves[_i] "work in the dairy">>
- <<set _DL-->>
+ <<set _DL--, Di-->>
<</if>>
<<if ($dairyPregSetting > 0)>>
<<set $reservedChildren -= $slaves[_i].reservedChildren>>
@@ -79,19 +83,11 @@ DairyRestraintsSetting($dairyRestraintsSetting)
<</if>>
<<if $dairyStimulatorsSettingChanged == 1>>
<<for _Di = 0; _Di < _DL; _Di++>>
- <<set _i = $DairyiIDs[_Di].Index, _ID = $DairyiIDs[_Di].ID>>
- <<if _ID != $slaves[_i].ID>>
- <<for _i = 0; _i < _SL; _i++>>
- <<if _ID == $slaves[_i].ID>>
- <<set $DairyiIDs[_Di].Index = _i>>
- <<break>>
- <</if>>
- <</for>>
- <</if>>
+ <<set _i = $DairyiIDs[_Di].Index>>
<<if ($slaves[_i].anus < 3)>>
$slaves[_i].slaveName's milking machine ejects her, since it cannot fit its massive anal dildo up her tight asshole.
<<removeJob $slaves[_i] "work in the dairy">>
- <<set _DL-->>
+ <<set _DL--, Di-->>
<</if>>
<</for>>
In unison, the milking machines shove their dildos deep into slaves' anuses, ejaculating large quantities of lubricant deep inside their rectums. The slaves start in surprise at the sudden rush of warm slick fluid, and then relax as the phalli withdraw themselves from their butts. Their relief is short-lived, however, as their assholes are only empty for a moment. The reasonably sized dildos are replaced with dildos the size of horse cocks. As soon as the slaves feel the heads of these monstrous phalli press inexorably against their sphincters,
@@ -113,19 +109,11 @@ DairyRestraintsSetting($dairyRestraintsSetting)
<<if $dairyRestraintsSettingChanged == 1>>
<<if $dairyRestraintsSetting == 1>>
<<for _Di = 0; _Di < _DL; _Di++>>
- <<set _i = $DairyiIDs[_Di].Index, _ID = $DairyiIDs[_Di].ID>>
- <<if _ID != $slaves[_i].ID>>
- <<for _i = 0; _i < _SL; _i++>>
- <<if _ID == $slaves[_i].ID>>
- <<set $DairyiIDs[_Di].Index = _i>>
- <<break>>
- <</if>>
- <</for>>
- <</if>>
+ <<set _i = $DairyiIDs[_Di].Index>>
<<if ($slaves[_i].indentureRestrictions >= 2)>>
$slaves[_i].slaveName's milking machine declines to restrain her, since she is encoded as an indentured servant protected from restraint for milking.
<<removeJob $slaves[_i] "work in the dairy">>
- <<set _DL-->>
+ <<set _DL--, Di-->>
<</if>>
<</for>>
The next cow to stumble over to a milking machine to be drained is gently but firmly embraced by its restraints, allowing it to suck her dry and violate her without any regard for her feelings. Most of the cows accept this new wrinkle in their lives, since the restraints let them go afterward, and the milking machines bring temporary relief. Some, however, begin to regard the machines with concern.
@@ -136,19 +124,11 @@ DairyRestraintsSetting($dairyRestraintsSetting)
<<elseif $dairyRestraintsSettingChanged == -1>>
<<if $dairyRestraintsSetting == 1>>
<<for _Di = 0; _Di < _DL; _Di++>>
- <<set _i = $DairyiIDs[_Di].Index, _ID = $DairyiIDs[_Di].ID>>
- <<if _ID != $slaves[_i].ID>>
- <<for _i = 0; _i < _SL; _i++>>
- <<if _ID == $slaves[_i].ID>>
- <<set $DairyiIDs[_Di].Index = _i>>
- <<break>>
- <</if>>
- <</for>>
- <</if>>
+ <<set _i = $DairyiIDs[_Di].Index>>
<<if ($slaves[_i].indentureRestrictions >= 1)>>
$slaves[_i].slaveName's milking machine declines to restrain her, since she is encoded as an indentured servant protected from being restrained for milking.
<<removeJob $slaves[_i] "work in the dairy">>
- <<set _DL-->>
+ <<set _DL--, Di-->>
<</if>>
<</for>>
The next time a cow tries to get up after being milked, she finds to her sudden terror that the machine will not let her go. It continues to add fluids to her body, and remove them from her nipples, ignoring her mounting panic as she realizes that it's to be her new partner and lover, on a level far more intimate than any possible human relationship. The other cows approach their machines with trepidation, but the mounting pressure in their udders forces them to embrace their immurement despite their terror.
diff --git a/src/uncategorized/masterSuite.tw b/src/uncategorized/masterSuite.tw
index 4e4978627b8..ac40b3f37dd 100644
--- a/src/uncategorized/masterSuite.tw
+++ b/src/uncategorized/masterSuite.tw
@@ -25,7 +25,7 @@
<<if $masterSuiteSlaves > 0>>
<<for _dI = 0; _dI < _DL; _dI++>>
<<set _i = $MastSiIDs[_dI].Index, _ID = $MastSiIDs[_dI].ID>>
- <<if _ID != $slaves[_i].ID>>
+ <<if _i >= _SL || _ID != $slaves[_i].ID>>
/% Slaves.ID and $MastSiIDs.ID's don't match-up so let's find her %/
<<for _i = 0; _i < _SL; _i++>>
<<if _ID == $slaves[_i].ID>>
--
GitLab