diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt
index f1e0e0fb7dd8fde39da93985e4f372926134289b..ca6c2d58f4b04829d2efe3f648e311bc0a9aeae3 100644
--- a/devNotes/VersionChangeLog-Premod+LoliMod.txt
+++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt
@@ -2,8 +2,17 @@ Pregmod
0.10.7.1-2.3.x
+04/13/2019
+
+ 5
+ -fixes
+
04/12/2019
+ 4
+ -fixed issues with salon skin treatments
+ -fixed inflation errors
+
3
-fixes
diff --git a/src/js/slaveSummaryWidgets.js b/src/js/slaveSummaryWidgets.js
index 466eec2b022f4b71b0d73455452d6a526031cb98..3f532330122e6420bfa9edf3d0bf84530f4dfb13 100644
--- a/src/js/slaveSummaryWidgets.js
+++ b/src/js/slaveSummaryWidgets.js
@@ -2690,11 +2690,11 @@ window.SlaveSummaryUncached = (function () {
function long_hips(slave) {
r += `<span class="red">`;
if (slave.hips < -1) {
- if (slave.butt > 2 && (V.arcologies[0].FSTransformationFetishist < 20 || V.arcologies[0].FSTransformationFetishist === "unset") && (V.arcologies[0].FSHedonisticDecadence < 20 || V.arcologies[0].FSHedonisticDecadence === "unset")) {
+ if (slave.butt > 2 && (V.arcologies[0].FSTransformationFetishist < 20 || V.arcologies[0].FSTransformationFetishist === "unset") && (V.arcologies[0].FSHedonisticDecadence < 20 || V.arcologies[0].FSHedonisticDecadence === "unset") && (V.arcologies[0].FSAssetExpansionist < 20 || V.arcologies[0].FSAssetExpansionist === "unset")) {
r += `Disproportionately big butt.`;
}
} else if (slave.hips < 0) {
- if (slave.butt > 4 && (V.arcologies[0].FSTransformationFetishist < 20 || V.arcologies[0].FSTransformationFetishist === "unset") && (V.arcologies[0].FSHedonisticDecadence < 20 || V.arcologies[0].FSHedonisticDecadence === "unset")) {
+ if (slave.butt > 4 && (V.arcologies[0].FSTransformationFetishist < 20 || V.arcologies[0].FSTransformationFetishist === "unset") && (V.arcologies[0].FSHedonisticDecadence < 20 || V.arcologies[0].FSHedonisticDecadence === "unset") && (V.arcologies[0].FSAssetExpansionist < 20 || V.arcologies[0].FSAssetExpansionist === "unset")) {
r += `Disproportionately big butt.`;
}
} else if (slave.hips > 2) {
@@ -2707,7 +2707,7 @@ window.SlaveSummaryUncached = (function () {
}
} else if (slave.hips > 0) {
if (slave.butt > 8) {
- if ((V.arcologies[0].FSTransformationFetishist < 20 || V.arcologies[0].FSTransformationFetishist === "unset") && (V.arcologies[0].FSHedonisticDecadence < 20 || V.arcologies[0].FSHedonisticDecadence === "unset")) {
+ if ((V.arcologies[0].FSTransformationFetishist < 20 || V.arcologies[0].FSTransformationFetishist === "unset") && (V.arcologies[0].FSHedonisticDecadence < 20 || V.arcologies[0].FSHedonisticDecadence === "unset") && (V.arcologies[0].FSAssetExpansionist < 20 || V.arcologies[0].FSAssetExpansionist === "unset")) {
r += `Disproportionately big butt.`;
}
} else if (slave.butt <= 2 && ((V.arcologies[0].FSSlimnessEnthusiast === "unset") || (slave.boobs >= 500))) {
@@ -2715,7 +2715,7 @@ window.SlaveSummaryUncached = (function () {
}
} else {
if (slave.butt > 6) {
- if ((V.arcologies[0].FSTransformationFetishist < 20 || V.arcologies[0].FSTransformationFetishist === "unset") && (V.arcologies[0].FSHedonisticDecadence < 20 || V.arcologies[0].FSHedonisticDecadence === "unset")) {
+ if ((V.arcologies[0].FSTransformationFetishist < 20 || V.arcologies[0].FSTransformationFetishist === "unset") && (V.arcologies[0].FSHedonisticDecadence < 20 || V.arcologies[0].FSHedonisticDecadence === "unset") && (V.arcologies[0].FSAssetExpansionist < 20 || V.arcologies[0].FSAssetExpansionist === "unset")) {
r += `Disproportionately big butt.`;
}
} else if (slave.butt <= 1 && ((V.arcologies[0].FSSlimnessEnthusiast === "unset") || (slave.boobs >= 500))) {
diff --git a/src/js/utilJS.js b/src/js/utilJS.js
index ca6a9cb5c74b85ae748df4241d481cf829c564c3..117017cc92fb35f3fb94cd535707be3ab450ee41 100644
--- a/src/js/utilJS.js
+++ b/src/js/utilJS.js
@@ -2145,6 +2145,7 @@ window.changeSkinTone = function (skin, value) {
} else if (newSkin < 1) {
newSkin = 1;
}
+ let prop;
for (prop in skinToMelanin) {
if (!skinToMelanin.hasOwnProperty(prop)) continue;
if (newSkin >= skinToMelanin[prop]) return prop;
diff --git a/src/pregmod/saInflation.tw b/src/pregmod/saInflation.tw
index 6678fa03ce4bcc3ac7feae58949616ab5664133a..bbb81ae68b986f79e1562340aa24f986a064db89 100644
--- a/src/pregmod/saInflation.tw
+++ b/src/pregmod/saInflation.tw
@@ -535,16 +535,16 @@
<<set $slaves[$i].weight += 2>>
<</if>>
<<if random(1,100) > 50 && if $slaves[$i].boobs < 3000>>
- $His breasts @@.lime;swell@@ with added fat as $he digests the milk contained in $his digestive track.
- <<set $slaves[$i].boobs += 200>>
- <</if>>
+ $His breasts @@.lime;swell@@ with added fat as $he digests the milk contained in $his digestive track.
+ <<set $slaves[$i].boobs += 200>>
<</if>>
<<if random(1,100) > (50/_rearQuirkDivider) && $slaves[$i].butt < 7*_rearQuirk>>
- $His butt @@.lime;swells@@ with added fat as $he digests the milk contained in $his digestive track.
- <<set $slaves[$i].butt += 1>>
- <</if>>
+ $His butt @@.lime;swells@@ with added fat as $he digests the milk contained in $his digestive track.
+ <<set $slaves[$i].butt += 1>>
<</if>>
<<elseif $slaves[$i].inflationType == "food" && $slaves[$i].bellyFluid >= 1500>>
+ <<set _rearQuirk = $slaves[$i].geneticQuirks.rearLipedema == 2 ? 2 : 0>>
+ <<set _rearQuirkDivider = _rearQuirk == 0 ? 1 : _rearQuirk>>
<<if $slaves[$i].weight < 200>>
$His body @@.lime;rapidly gains weight@@ as it digests the food contained in $his digestive track.
<<set $slaves[$i].weight += 4>>
diff --git a/src/pregmod/sePlayerBirth.tw b/src/pregmod/sePlayerBirth.tw
index d12af5397e4a43a8225371f936854623d32ac659..bebf7133f4c4a7ae7695a089cd23a3f9241a130a 100644
--- a/src/pregmod/sePlayerBirth.tw
+++ b/src/pregmod/sePlayerBirth.tw
@@ -70,7 +70,7 @@ PC.pregSource documentation
<<set _babies.push("designer")>>
<<elseif $PC.curBabies[_spb].fatherID == -9>>
<<set _futaS++>>
- <<set _fathers.push("a Futanari Sister's")>>
+ <<set _babies.push("a Futanari Sister's")>>
<<else>>
<<set _babyDaddy = $slaveIndices[$PC.curBabies[_spb].fatherID]>>
<<if def _babyDaddy>>
diff --git a/src/uncategorized/reNickname.tw b/src/uncategorized/reNickname.tw
index 075fb33b4a9fb23746def8b8393ac8925f99c62c..07d26f78a9a90b12bd3fa0ed5bb5c30bff2bc506 100644
--- a/src/uncategorized/reNickname.tw
+++ b/src/uncategorized/reNickname.tw
@@ -1027,7 +1027,7 @@
<<set $notApplyDesc = "accepts that $his broad areolae are just another part of $him, just like $his big tits.">>
<<case "lips">>
- <<set $nickname = either("'Beestung'", "'Cakehole'", "'Chops'", "'DSLs'", "'Ducklips'", "'Facepussy'", "'Fat Lips'" "'Lip Gloss'", "'Kisser'", "'Kissing Booth'", "'Kissy'", "'Lippy'", "'Lips'", "'Lipstick'", "'Mwah'", "'Pillows'", "'Rims'", "'Smackers'", "'Smooches'", "'Soup Coolers'", "'Sucker'", "'Suckles'", "'Sucky-Sucky'")>>
+ <<set $nickname = either("'Beestung'", "'Cakehole'", "'Chops'", "'DSLs'", "'Ducklips'", "'Facepussy'", "'Fat Lips'", "'Lip Gloss'", "'Kisser'", "'Kissing Booth'", "'Kissy'", "'Lippy'", "'Lips'", "'Lipstick'", "'Mwah'", "'Pillows'", "'Rims'", "'Smackers'", "'Smooches'", "'Soup Coolers'", "'Sucker'", "'Suckles'", "'Sucky-Sucky'")>>
<<set $situationDesc = "has lovely lips. They're so big $he can hardly talk straight, and they even hinder $his ability to communicate any facial expression other than a desire to be facefucked. This is appropriate, as $he spends a lot of time getting facefucked.">>
<<set $applyDesc = "accepts that $his big lips define $him. Even more than before, $he presents $his mouth for oral sex whenever $he flirts, and $he views $his throat as $his primary sexual organ.">>
<<set $notApplyDesc = "accepts that $his mouth is only one of $his holes, and that as a sex slave $he'll be taking cock in all of them, even if $his lips are huge.">>
diff --git a/src/uncategorized/salon.tw b/src/uncategorized/salon.tw
index be562bf78006634c3c2175e7b8c87c64a44e0998..99641825de8b6877b490f20c1347e220ffdf10d7 100644
--- a/src/uncategorized/salon.tw
+++ b/src/uncategorized/salon.tw
@@ -643,22 +643,22 @@ $His skin is $activeSlave.skin.
<<set _needsSpacers = 0>>
<<if (skinToneLevel($activeSlave.skin) > 1)>>
<<if _needsSpacers == 1>> | <</if>>
- [[Bleach|Salon][$activeSlave.skin = changeSkinTone($activeSlave.skin, -2),cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
+ [[Bleach|Salon][$activeSlave.skin = changeSkinTone($activeSlave.skin, -2), cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
<<set _needsSpacers = 1>>
<</if>>
<<if (skinToneLevel($activeSlave.skin) > 8)>>
<<if _needsSpacers == 1>> | <</if>>
- [[Lighten|Salon][$activeSlave.skin = changeSkinTone($activeSlave.skin, -1),cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
+ [[Lighten|Salon][$activeSlave.skin = changeSkinTone($activeSlave.skin, -1), cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
<<set _needsSpacers = 1>>
<</if>>
<<if (skinToneLevel($activeSlave.skin) < 18)>>
<<if _needsSpacers == 1>> | <</if>>
- [[Darken|Salon][$activeSlave.skin = changeSkinTone($activeSlave.skin, 1),cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
+ [[Darken|Salon][$activeSlave.skin = changeSkinTone($activeSlave.skin, 1), cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
<<set _needsSpacers = 1>>
<</if>>
<<if (skinToneLevel($activeSlave.skin) < 25)>>
<<if _needsSpacers == 1>> | <</if>>
- [[Blacken|Salon][$activeSlave.skin = changeSkinTone($activeSlave.skin, 2),cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
+ [[Blacken|Salon][$activeSlave.skin = changeSkinTone($activeSlave.skin, 2), cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
<<set _needsSpacers = 1>>
<</if>>
<</if>>
@@ -670,13 +670,13 @@ $His skin is $activeSlave.skin.
<<elseif (skinToneLevel($activeSlave.skin) > 20)>>
$His skin is so dark in color that any attempt at natural tanning is not likely to appear on $his skin.
<<else>>
- [["Sun tan " + $his + " skin"|Salon][$activeSlave.skin = "sun tanned",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
+ [["Sun tan " + $his + " skin"|Salon][$activeSlave.skin = "sun tanned", cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
<<set _needsSpacers = 1>>
<</if>>
<</if>>
<<if ($activeSlave.skin != "spray tanned")>>
<<if _needsSpacers == 1>> | <</if>>
- [["Spray tan " + $his + " skin"|Salon][$activeSlave.skin = "spray tanned",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
+ [["Spray tan " + $his + " skin"|Salon][$activeSlave.skin = "spray tanned", cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
<</if>>
<</if>>