diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt
index 9661a8ad45e9e875670d406869f7813867e56666..0eb766a4ed6b7d2e4e45e8e435dbb2795bc20af6 100644
--- a/devNotes/VersionChangeLog-Premod+LoliMod.txt
+++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt
@@ -2,6 +2,18 @@
0.10.7.0/1
+1/15/18
+
+ 276
+ -fixed improper belly size unsetting in saInflation
+ -slave on slave feeding now properly clears its variable
+ -increased cost reduction of servant's quarters
+ -added more mindbroken checks to cull inappropriate emotion
+
+ 275
+ -various overlooked mindbreak checks added
+ -phase 4 work
+
01/14/18
274
diff --git a/devNotes/twine JS b/devNotes/twine JS
index d50694e535e36a38ae4ba0981ae8410f273c9309..80054bead6e2b62cb5df92e6646f3137a0ebc3aa 100644
--- a/devNotes/twine JS
+++ b/devNotes/twine JS
@@ -1930,6 +1930,9 @@ window.getCost = function(array) {
if(slave.lactation > 0) {
costs -= 25;
}
+ if(slave.assignment === Job.SERVER) {
+ costs -= rulesCost;
+ }
}
}
diff --git a/src/js/economyJS.tw b/src/js/economyJS.tw
index ca78153eba6950f1a4e1298375004a44b4f0b7cb..8d3a79779a2d8e8db924d993f9686b5643760fc3 100644
--- a/src/js/economyJS.tw
+++ b/src/js/economyJS.tw
@@ -178,6 +178,9 @@ window.getCost = function(array) {
if(slave.lactation > 0) {
costs -= 25;
}
+ if(slave.assignment === Job.SERVER) {
+ costs -= rulesCost;
+ }
}
}
diff --git a/src/pregmod/saInflation.tw b/src/pregmod/saInflation.tw
index 30e28eed5048f7720c122c94b4245690bdb85cf3..89055da4f0e701af636174489b0e175890bfc39a 100644
--- a/src/pregmod/saInflation.tw
+++ b/src/pregmod/saInflation.tw
@@ -1,7 +1,7 @@
:: SA inflation [nobr]
<<if $slaves[$i].assignment == "be confined in the arcade" || $slaves[$i].assignment == "work in the dairy">>
- <<set $slaves[$i].inflation = 0, $slaves[$i].inflationType = "none", $slaves[$i].inflationMethod = 0, $slaves[$i].milkSource = 0>>
+ <<set $slaves[$i].inflation = 0, $slaves[$i].inflationType = "none", $slaves[$i].inflationMethod = 0, $slaves[$i].milkSource = 0>><<SetBellySize $slaves[$i]>>
<<elseif $slaves[$i].bellyImplant >= 1500>>
<<if $slaves[$i].inflation > 1>>
Due to the mounting pressure from her filled abdominal implant, she can no longer fill herself as large as she used to.
@@ -310,8 +310,8 @@
<<elseif $slaves[$i].inflationMethod == 3>>
<<set _saf = $slaves.findIndex(function(s) { return s.ID == $slaves[$i].milkSource; })>>
<<if $slaves[_saf].lactation == 0>>
- $slaves[_saf].slaveName is no longer lactating and thus can no longer keep $slaves[$i].slaveName filled with milk. @@.yellow;Her inflation regimen has been ended.@@
- <<set $slaves[$i].inflation = 0, $slaves[$i].inflationType = "none", $slaves[$i].inflationMethod = 0, $slaves[$i].milkSource = 0>>
+ $slaves[_saf].slaveName is no longer lactating and thus can no longer keep $slaves[$i].slaveName filled with milk. @@.yellow;Her inflation regimen has been ended.@@
+ <<set $slaves[$i].inflation = 0, $slaves[$i].inflationType = "none", $slaves[$i].inflationMethod = 0, $slaves[$i].milkSource = 0>><<SetBellySize $slaves[$i]>>
<<elseif $slaves[$i].inflation == 3>>
Throughout the week, she @@.mediumorchid;reluctantly@@ suckles from $slaves[_saf].slaveName until her stomach is @@.red;painfully bloated@@ with nearly two gallons of milk, leaving her looking ready to burst. She struggles to keep her fatty, liquid meal down, @@.gold;fearing@@ punishment otherwise.
<<set $slaves[$i].health -= 10, $slaves[$i].devotion -= 8, $slaves[$i].trust -= 8>>
@@ -356,7 +356,7 @@
<<set _saf = $slaves.findIndex(function(s) { return s.ID == $slaves[$i].milkSource; })>>
<<if $slaves[_saf].lactation == 0>>
$slaves[_saf].slaveName is no longer lactating and thus can no longer keep $slaves[$i].slaveName filled with milk. @@.yellow;Her inflation regimen has been ended.@@
- <<set $slaves[$i].inflation = 0, $slaves[$i].inflationType = "none", $slaves[$i].inflationMethod = 0, $slaves[$i].milkSource = 0>>
+ <<set $slaves[$i].inflation = 0, $slaves[$i].inflationType = "none", $slaves[$i].inflationMethod = 0, $slaves[$i].milkSource = 0>><<SetBellySize $slaves[$i]>>
<<elseif $slaves[$i].inflation == 3>>
Throughout the week, she @@.hotpink;eagerly@@ sucks from $slaves[_saf].slaveName until her stomach is @@.red;painfully bloated@@ with nearly two gallons of milk, leaving her looking ready to burst. She rubs her full belly @@.mediumaquamarine;contently@@, anticipating her next gorging.
<<set $slaves[$i].health -= 10, $slaves[$i].devotion += 5, $slaves[$i].trust += 5>>
@@ -397,7 +397,7 @@
<<set _saf = $slaves.findIndex(function(s) { return s.ID == $slaves[$i].milkSource; })>>
<<if $slaves[_saf].lactation == 0>>
$slaves[_saf].slaveName is no longer lactating and thus can no longer keep $slaves[$i].slaveName filled with milk. @@.yellow;Her inflation regimen has been ended.@@
- <<set $slaves[$i].inflation = 0, $slaves[$i].inflationType = "none", $slaves[$i].inflationMethod = 0, $slaves[$i].milkSource = 0>>
+ <<set $slaves[$i].inflation = 0, $slaves[$i].inflationType = "none", $slaves[$i].inflationMethod = 0, $slaves[$i].milkSource = 0>><<SetBellySize $slaves[$i]>>
<<elseif $slaves[$i].inflation == 3>>
Throughout the week, she makes sure keep suckling from $slaves[_saf].slaveName until she is filled with nearly two gallons of milk, leaving her looking ready to give birth. She keeps herself @@.red;painfully full@@ for you.
<<set $slaves[$i].health -= 10>>
@@ -443,7 +443,7 @@
<<set _saf = $slaves.findIndex(function(s) { return s.ID == $slaves[$i].cumSource; })>>
<<if $slaves[_saf].balls == 0>>
$slaves[_saf].slaveName has no longer has testicles and thus can no longer keep $slaves[$i].slaveName filled with cum. @@.yellow;Her inflation regimen has been ended.@@
- <<set $slaves[$i].inflation = 0, $slaves[$i].inflationType = "none", $slaves[$i].inflationMethod = 0, $slaves[$i].cumSource = 0>>
+ <<set $slaves[$i].inflation = 0, $slaves[$i].inflationType = "none", $slaves[$i].inflationMethod = 0, $slaves[$i].cumSource = 0>><<SetBellySize $slaves[$i]>>
<<elseif $slaves[$i].inflation == 3>>
Throughout the week, she @@.mediumorchid;reluctantly@@ sucks $slaves[_saf].slaveName's <<if $slaves[_saf].dick > 0>>cock<<else>>cum hole<</if>> until her stomach is @@.red;painfully bloated@@ with nearly two gallons of cum, leaving her looking ready to burst. She struggles to keep her liquid meal down, @@.gold;fearing@@ punishment otherwise.
<<set $slaves[$i].health -= 10, $slaves[$i].devotion -= 8, $slaves[$i].trust -= 8>>
@@ -488,7 +488,7 @@
<<set _saf = $slaves.findIndex(function(s) { return s.ID == $slaves[$i].cumSource; })>>
<<if $slaves[_saf].balls == 0>>
$slaves[_saf].slaveName has no longer has testicles and thus can no longer keep $slaves[$i].slaveName filled with cum. @@.yellow;Her inflation regimen has been ended.@@
- <<set $slaves[$i].inflation = 0, $slaves[$i].inflationType = "none", $slaves[$i].inflationMethod = 0, $slaves[$i].cumSource = 0>>
+ <<set $slaves[$i].inflation = 0, $slaves[$i].inflationType = "none", $slaves[$i].inflationMethod = 0, $slaves[$i].cumSource = 0>><<SetBellySize $slaves[$i]>>
<<elseif $slaves[$i].inflation == 3>>
Throughout the week, she @@.hotpink;eagerly@@ sucks $slaves[_saf].slaveName's <<if $slaves[_saf].dick > 0>>cock<<else>>cum hole<</if>> until her stomach is @@.red;painfully bloated@@ with nearly two gallons of cum, leaving her looking ready to burst. She rubs her full belly @@.mediumaquamarine;contently@@, anticipating her next gorging.
<<set $slaves[$i].health -= 10, $slaves[$i].devotion += 5, $slaves[$i].trust += 5>>
@@ -529,7 +529,7 @@
<<set _saf = $slaves.findIndex(function(s) { return s.ID == $slaves[$i].cumSource; })>>
<<if $slaves[_saf].balls == 0>>
$slaves[$j].slaveName has no longer has testicles and thus can no longer keep $slaves[$i].slaveName filled with cum. @@.yellow;Her inflation regimen has been ended.@@
- <<set $slaves[$i].inflation = 0, $slaves[$i].inflationType = "none", $slaves[$i].inflationMethod = 0, $slaves[$i].cumSource = 0>>
+ <<set $slaves[$i].inflation = 0, $slaves[$i].inflationType = "none", $slaves[$i].inflationMethod = 0, $slaves[$i].cumSource = 0>><<SetBellySize $slaves[$i]>>
<<elseif $slaves[$i].inflation == 3>>
Throughout the week, she makes sure keep sucking $slaves[_saf].slaveName's <<if $slaves[_saf].dick > 0>>cock<<else>>cum hole<</if>> until she is filled with nearly two gallons of cum, leaving her looking ready to burst. She keeps herself @@.red;painfully full@@ for you.
<<set $slaves[$i].health -= 10>>
diff --git a/src/pregmod/slaveOnSlaveFeedingWorkAround.tw b/src/pregmod/slaveOnSlaveFeedingWorkAround.tw
index 4006103b17b7a4c02c24379174322bc32fd9694f..b8313be09c113aa8c9e630cd8b8f32ca006c539c 100644
--- a/src/pregmod/slaveOnSlaveFeedingWorkAround.tw
+++ b/src/pregmod/slaveOnSlaveFeedingWorkAround.tw
@@ -13,6 +13,7 @@
<<set $slaves[_i].milkOutput = _milk>>
<<else>>
<<set _milk = 0>>
+ <<set $slaves[_i].milkOutput = 0>>
<</if>>
<</for>>
<<for _i = 0; _i < $slaves.length; _i++>> /* cum output */
@@ -25,6 +26,7 @@
<<set $slaves[_i].cumOutput = _cum>>
<<else>>
<<set _cum = 0>>
+ <<set $slaves[_i].cumOutput = 0>>
<</if>>
<</for>>
diff --git a/src/uncategorized/costs.tw b/src/uncategorized/costs.tw
index 7a187ac5035de62a989fcdc2451cebc2e5a42404..8be656bbfb3d251be19bcfbd4c7a5705677fe797 100644
--- a/src/uncategorized/costs.tw
+++ b/src/uncategorized/costs.tw
@@ -295,6 +295,9 @@
<<if ($slaves[$i].lactation > 0)>>
<<set $costs -= 25>>
<</if>>
+ <<if ($slaves[$i].assignment == "be a servant")>>
+ <<set $costs -= ($rulesCost)>>
+ <</if>>
<</if>>
<<if ($slaves[$i].assignment != "work in the dairy" || $dairyRestraintsSetting < 2) && ($slaves[$i].assignment != "be confined in the arcade")>>
diff --git a/src/uncategorized/saHormoneEffects.tw b/src/uncategorized/saHormoneEffects.tw
index de3d80dd9d894f32b375ebda154358e80ab3cfe2..3e48f80ea493a5fb59465c1db10cfed246c632ac 100644
--- a/src/uncategorized/saHormoneEffects.tw
+++ b/src/uncategorized/saHormoneEffects.tw
@@ -760,6 +760,7 @@
<</if>>
+<<if $slaves[$i].fetish != "mindbroken" && $slaves[$i].fuckdoll == 0>>
<<if ($slaves[$i].hormoneBalance <= 20)>>
<<if ($slaves[$i].dick > 0)>>
<<if ($slaves[$i].devotion > 0)>>
@@ -787,6 +788,7 @@
<</if>>
<</if>>
<</if>>
+<</if>>
<<if Math.abs($slaves[$i].hormones) > 1>>
<<set $slaves[$i].chem += 0.5>>
diff --git a/src/uncategorized/saLongTermEffects.tw b/src/uncategorized/saLongTermEffects.tw
index 3909467f7dd73af617ed51b52ee039ee9405a755..1d3c29492ded803cf591a105f13b1890123c28c2 100644
--- a/src/uncategorized/saLongTermEffects.tw
+++ b/src/uncategorized/saLongTermEffects.tw
@@ -5989,23 +5989,27 @@
<</if>>
*/
making her life more difficult. Other slaves have to help her at times, which
- <<if $slaves[$i].devotion > 50>>
- the devoted slave bears with equanimity.
- <<elseif $slaves[$i].devotion > 20>>
- she can't help @@.mediumorchid;resenting@@ a little.
- <<set $slaves[$i].devotion -= 1>>
- <<elseif $slaves[$i].devotion >= -20>>
- she @@.mediumorchid;actively resents.@@
- <<set $slaves[$i].devotion -= 2>>
+ <<if $slaves[$i].fetish != "mindbroken">>
+ <<if $slaves[$i].devotion > 50>>
+ the devoted slave bears with equanimity.
+ <<elseif $slaves[$i].devotion > 20>>
+ she can't help @@.mediumorchid;resenting@@ a little.
+ <<set $slaves[$i].devotion -= 1>>
+ <<elseif $slaves[$i].devotion >= -20>>
+ she @@.mediumorchid;actively resents.@@
+ <<set $slaves[$i].devotion -= 2>>
+ <<else>>
+ she @@.mediumorchid;utterly detests.@@
+ <<set $slaves[$i].devotion -= 2>>
+ <</if>>
+ <<if $slaves[$i].devotion < 10>>
+ <<if $slaves[$i].trust > -20>>
+ She's @@.gold;aware of her total vulnerability@@ to punishment.
+ <<set $slaves[$i].trust -= 1>>
+ <</if>>
+ <</if>>
<<else>>
- she @@.mediumorchid;utterly detests.@@
- <<set $slaves[$i].devotion -= 2>>
- <</if>>
- <<if $slaves[$i].devotion < 10>>
- <<if $slaves[$i].trust > -20>>
- She's @@.gold;aware of her total vulnerability@@ to punishment.
- <<set $slaves[$i].trust -= 1>>
- <</if>>
+ goes largely unnoticed by the mindless slave.
<</if>>
<<if ($slaves[$i].amp == 1)>>
<<if $slaves[$i].muscles > -80>>