diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt
index f976c50623494d72e15fe5112ef353085f64a779..6a060fa250e89b80cc7303a91a711a5921ec4647 100644
--- a/devNotes/VersionChangeLog-Premod+LoliMod.txt
+++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt
@@ -2,6 +2,12 @@
0.10.7.1-0.1.x
+5/02/2018
+
+ 79
+ -various fixes
+ -work towards fuckable nipples
+
4/30/2018
78
diff --git a/devNotes/twine JS b/devNotes/twine JS
index df160de4954bdb2de6a277d36c1c3c97756046b8..ddf90872af65d111f83ff7eb36fd26497797f64f 100644
--- a/devNotes/twine JS
+++ b/devNotes/twine JS
@@ -7993,6 +7993,9 @@ window.FResult = (function() {
if (slave.lactation > 0)
V.FResult += 1;
+ if (slave.nipples === "fuckable")
+ calcFuckableTits(slave);
+
if (V.seeAge === 1)
calcAge(slave);
if (slave.fetish === "mindbroken")
@@ -8042,6 +8045,12 @@ window.FResult = (function() {
}
}
+ function calcFuckableTits(slave) {
+ V.FResult += 2;
+ if (slave.fetish === "boobs")
+ V.FResult += Math.trunc(slave.fetishStrength/20);
+ }
+
function calcWorksWithRelatives(slave) {
V.slaves.forEach(islave => {
if (isParentP(slave, islave) && sameAssignmentP(slave, islave)) {
diff --git a/src/js/fresult.tw b/src/js/fresult.tw
index a03c62956ad03c3d5f470fe0ed3e017e5b5dec61..d803bf94b9c28e8db9732cd8a022c6d57f85b42b 100644
--- a/src/js/fresult.tw
+++ b/src/js/fresult.tw
@@ -28,6 +28,9 @@ window.FResult = (function() {
if (slave.lactation > 0)
V.FResult += 1;
+ if (slave.nipples === "fuckable")
+ calcFuckableTits(slave);
+
if (V.seeAge === 1)
calcAge(slave);
if (slave.fetish === "mindbroken")
@@ -77,6 +80,12 @@ window.FResult = (function() {
}
}
+ function calcFuckableTits(slave) {
+ V.FResult += 2;
+ if (slave.fetish === "boobs")
+ V.FResult += Math.trunc(slave.fetishStrength/20);
+ }
+
function calcWorksWithRelatives(slave) {
V.slaves.forEach(islave => {
if (isParentP(slave, islave) && sameAssignmentP(slave, islave)) {
diff --git a/src/pregmod/saInflation.tw b/src/pregmod/saInflation.tw
index 27c7c6b6d2d92611a153996dc6d3e718ccc9ea8a..7ed3e4f88b203a022d99f65dd87739e91552fef3 100644
--- a/src/pregmod/saInflation.tw
+++ b/src/pregmod/saInflation.tw
@@ -115,7 +115,7 @@
<<if $slaves[$i].anus > 1>>
The solution slowly tightens $possessive anus while inside $possessive bowels. Being filled to $possessive limit with the solution does not make it tighten any better or faster; it's just perverted.
<<if random(1,100) > 60>>
- @@.lime;$possessiveCap butthole is noticeably tighter from the previous week.@@
+ By week's end, @@.lime;$possessive butthole has tightened nicely.@@
<<set $slaves[$i].anus-->>
<</if>>
<<else>>
@@ -124,7 +124,7 @@
<<if $slaves[$i].vagina > 1>>
As $possessive body slowly absorbs the solution, its benefits begin to affect $possessive pussy. Being filled to $possessive limit with the solution does not make it tighten any better or faster; it's just perverted.
<<if random(1,100) > 80>>
- @@.lime;$possessiveCap vagina is noticeably tighter from the previous week.@@
+ By week's end, @@.lime;$possessive vagina has regained some tightness.@@
<<set $slaves[$i].vagina-->>
<</if>>
<<elseif $slaves[$i].vagina == 1>>
@@ -135,7 +135,7 @@
<<if $slaves[$i].anus > 1>>
The solution slowly tightens $possessive anus while inside $possessive bowels. Being overfilled with the solution does not make it tighten any better or faster; it's just perverted.
<<if random(1,100) > 60>>
- @@.lime;$possessiveCap butthole is noticeably tighter from the previous week.@@
+ By week's end, @@.lime;$possessive butthole has tightened nicely.@@
<<set $slaves[$i].anus-->>
<</if>>
<<else>>
@@ -144,7 +144,7 @@
<<if $slaves[$i].vagina > 1>>
As $possessive body slowly absorbs the solution, its benefits begin to affect $possessive pussy. Being overfilled with the solution does not make it tighten any better or faster; it's just perverted.
<<if random(1,100) > 80>>
- @@.lime;$possessiveCap vagina is noticeably tighter from the previous week.@@
+ By week's end, @@.lime;$possessive vagina has regained some tightness.@@
<<set $slaves[$i].vagina-->>
<</if>>
<<elseif $slaves[$i].vagina == 1>>
@@ -155,7 +155,7 @@
<<if $slaves[$i].anus > 1>>
The solution slowly tightens $possessive anus while inside $possessive bowels.
<<if random(1,100) > 60>>
- @@.lime;$possessiveCap butthole is noticeably tighter from the previous week.@@
+ By week's end, @@.lime;$possessive butthole has tightened nicely.@@
<<set $slaves[$i].anus-->>
<</if>>
<<else>>
@@ -164,7 +164,7 @@
<<if $slaves[$i].vagina > 1>>
As $possessive body slowly absorbs the solution, its benefits begin to affect $possessive pussy.
<<if random(1,100) > 80>>
- @@.lime;$possessiveCap vagina is noticeably tighter from the previous week.@@
+ By week's end, @@.lime;$possessive vagina has regained some tightness.@@
<<set $slaves[$i].vagina-->>
<</if>>
<<elseif $slaves[$i].vagina == 1>>
diff --git a/src/uncategorized/BackwardsCompatibility.tw b/src/uncategorized/BackwardsCompatibility.tw
index 679b97792d99069b286cdcb135fc9d3eb52e5fc0..2526bedcbd34e7fd972e0e7bae18b5ca5ff20bf0 100644
--- a/src/uncategorized/BackwardsCompatibility.tw
+++ b/src/uncategorized/BackwardsCompatibility.tw
@@ -1529,8 +1529,10 @@
<<set $arcologies[0].FSChineseRevivalistLaw = 0>>
<</if>>
+<<silently>>
<<include "MOD_Edit FS Cheat Datatype Cleanup">>
<<include "MOD_Edit Neighbor Arcology Cheat Datatype Cleanup">>
+<</silently>>
Setting missing global variables:
<<if ndef $assistantPower>>
diff --git a/src/uncategorized/dispensary.tw b/src/uncategorized/dispensary.tw
index a81f00f48cf8ede16ecc2f443bb758ac8b23d539..149123fab0018e77a70acc177654ea5aa5f1a953 100644
--- a/src/uncategorized/dispensary.tw
+++ b/src/uncategorized/dispensary.tw
@@ -668,6 +668,9 @@ Future Societies Research
A diet recipe is being utilized to prevent unwanted weight gain.
<br>
<</if>>
+ [[Cancel solid slave food production|Dispensary][$arcologies[0].FSHedonisticDecadenceDietResearch = 0]]
+ <br> Will //completely// remove this research.
+ <br>
<<else>>
// Hedonistic Decadence focused research unavailable. //
<br>
diff --git a/src/uncategorized/reRelativeRecruiter.tw b/src/uncategorized/reRelativeRecruiter.tw
index 9afc4b88d608da6a57d1a0aaa6529c3a96c0cebd..7e475389923e6427453bd8d7b9a3076e3db19d19 100644
--- a/src/uncategorized/reRelativeRecruiter.tw
+++ b/src/uncategorized/reRelativeRecruiter.tw
@@ -123,6 +123,9 @@
<<RandomizeAttraction>>
<<ResyncHeight $activeSlave>>
<</if>>
+ <<if $activeSlave.nipples == "fuckable">>
+ <<set $activeSlave.nipples = either("cute", "puffy", "inverted", "partially inverted")>>
+ <</if>>
<<set $activeSlave.preg = 0>>
<<set $activeSlave.pregType = 0>>
<<set $activeSlave.pregWeek = 0>>
@@ -987,6 +990,9 @@ She waits anxiously for your decision.
<<set $activeSlave.behavioralFlaw = either("none", "none", "none", "arrogant", "bitchy", "odd", "anorexic", "hates men", "hates women", "hates women")>>
<<set $activeSlave.weekAcquired = $week>>
<<RandomizeAttraction>>
+<<if $activeSlave.nipples == "fuckable">>
+ <<set $activeSlave.nipples = either("cute", "puffy", "inverted", "partially inverted")>>
+<</if>>
<<slaveCost $activeSlave>>
diff --git a/src/uncategorized/rulesAutosurgery.tw b/src/uncategorized/rulesAutosurgery.tw
index 2a61403ba77ca4fca0beb4b5bca560f026243a55..46c44794e3587777341b0b38bd1a4d46d67489aa 100644
--- a/src/uncategorized/rulesAutosurgery.tw
+++ b/src/uncategorized/rulesAutosurgery.tw
@@ -80,14 +80,14 @@
<<elseif ($slaves[$i].faceImplant <= 15) && ($slaves[$i].face <= 95) && ($thisSurgery.cosmetic > 0)>>
<<set $surgeries.push("a nicer face")>>
<<if $slaves[$i].faceShape == "masculine">><<set $slaves[$i].faceShape = "androgynous">><</if>>
- <<set $slaves[$i].faceImplant += 25-5*Math.trunc($PC.medicine/100)-5*$surgeryUpgrade>>
+ <<set $slaves[$i].faceImplant += 25-5*Math.trunc($PC.medicine/50)-5*$surgeryUpgrade>>
<<set $slaves[$i].face = Math.clamp($slaves[$i].face+20,-100,100)>>
<<set $cash -= $surgeryCost>>
<<if $PC.medicine >= 100>><<set $slaves[$i].health -= 5>><<else>><<set $slaves[$i].health -= 10>><</if>>
<<elseif ($slaves[$i].faceImplant <= 15) && ($slaves[$i].ageImplant != 1) && ($slaves[$i].visualAge >= 25) && ($thisSurgery.cosmetic > 0)>>
<<set $surgeries.push("an age lift")>>
<<set $slaves[$i].ageImplant = 1>>
- <<set $slaves[$i].faceImplant += 25-5*Math.trunc($PC.medicine/100)-5*$surgeryUpgrade>>
+ <<set $slaves[$i].faceImplant += 25-5*Math.trunc($PC.medicine/50)-5*$surgeryUpgrade>>
<<if $slaves[$i].visualAge > 80>>
<<set $slaves[$i].visualAge -= 40>>
<<elseif $slaves[$i].visualAge >= 70>>
@@ -163,7 +163,7 @@
<<elseif ($slaves[$i].faceImplant <= 45) && ($slaves[$i].face <= 95) && ($thisSurgery.cosmetic == 2)>>
<<set $surgeries.push("a nicer face")>>
<<if $slaves[$i].faceShape == "masculine">><<set $slaves[$i].faceShape = "androgynous">><</if>>
- <<set $slaves[$i].faceImplant += 25-5*Math.trunc($PC.medicine/100)-5*$surgeryUpgrade>>
+ <<set $slaves[$i].faceImplant += 25-5*Math.trunc($PC.medicine/50)-5*$surgeryUpgrade>>
<<set $slaves[$i].face = Math.clamp($slaves[$i].face+20,-100,100)>>
<<set $cash -= $surgeryCost>>
<<if $PC.medicine >= 100>><<set $slaves[$i].health -= 5>><<else>><<set $slaves[$i].health -= 10>><</if>>
@@ -186,7 +186,7 @@
<<else>>
<<set $slaves[$i].visualAge -= 5>>
<</if>>
- <<set $slaves[$i].faceImplant += 25-5*Math.trunc($PC.medicine/100)-5*$surgeryUpgrade>>
+ <<set $slaves[$i].faceImplant += 25-5*Math.trunc($PC.medicine/50)-5*$surgeryUpgrade>>
<<set $cash -= $surgeryCost>>
<<if $PC.medicine >= 100>><<set $slaves[$i].health -= 5>><<else>><<set $slaves[$i].health -= 10>><</if>>
<<elseif ($slaves[$i].waist >= -95) && ($thisSurgery.cosmetic == 2) && ($seeExtreme == 1)>>
diff --git a/src/utility/assayWidgets.tw b/src/utility/assayWidgets.tw
index 0ed024214c6ce2c0a0b3e9629844382c64c7d957..f6e3a122cd6bcbe50ab347c94327f4b42abf6da0 100644
--- a/src/utility/assayWidgets.tw
+++ b/src/utility/assayWidgets.tw
@@ -995,6 +995,9 @@
<<if $args[0].faceImplant > 95 && $args[0].face > 40>>
<<set $beauty += ($arcologies[0].FSTransformationFetishist/4)>>
<</if>>
+ <<if $args[0].nipples == "fuckable">>
+ <<set $beauty += ($arcologies[0].FSTransformationFetishist/10)>>
+ <</if>>
<</if>>
<<if $arcologies[0].FSBodyPurist != "unset">>