From 48f00dcaf54abfcf907a7bf6755f01306a2cee84 Mon Sep 17 00:00:00 2001 From: Pregmodder <pregmodder@gmail.com> Date: Sun, 29 Apr 2018 17:27:49 -0400 Subject: [PATCH] fixes and tweaks --- devNotes/VersionChangeLog-Premod+LoliMod.txt | 8 ++- src/player/actions/fondleDick.tw | 4 +- src/uncategorized/saLongTermEffects.tw | 16 +++--- src/uncategorized/saRelationships.tw | 2 +- src/uncategorized/saServeThePublic.tw | 4 ++ src/uncategorized/saWhore.tw | 4 ++ src/utility/descriptionWidgetsFlesh.tw | 56 +++++++++++++++----- 7 files changed, 68 insertions(+), 26 deletions(-) diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt index f84c25e1c77..5cdaafb6cdb 100644 --- a/devNotes/VersionChangeLog-Premod+LoliMod.txt +++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt @@ -2,10 +2,16 @@ 0.10.7.1-0.1.x +4/29/2018 + + 76 + -multiple fixed bugs + -tweak to oversized breast decrease rate (it's no longer instant) + 4/28/2018 75 - -groudwork for pronoun rework + -groundwork for pronoun rework -various minor corrections -vector name standardization diff --git a/src/player/actions/fondleDick.tw b/src/player/actions/fondleDick.tw index 448828f54fa..d7618cdb691 100644 --- a/src/player/actions/fondleDick.tw +++ b/src/player/actions/fondleDick.tw @@ -3,9 +3,9 @@ <<nobr>> You call her over so you can fondle her <<if $activeSlave.dick == 1>> - tiny dick. + tiny dick <<elseif $activeSlave.dick == 2>> - cute dick. + cute dick <<elseif $activeSlave.dick == 3>> dick <<elseif $activeSlave.dick == 4>> diff --git a/src/uncategorized/saLongTermEffects.tw b/src/uncategorized/saLongTermEffects.tw index 34d6c2a2b96..7a894c8cbb4 100644 --- a/src/uncategorized/saLongTermEffects.tw +++ b/src/uncategorized/saLongTermEffects.tw @@ -6253,10 +6253,10 @@ <<if $slaves[$i].bellyPreg < 300000 && $slaves[$i].hormoneBalance < 300>> <<if ($slaves[$i].boobs > 30000+($slaves[$i].muscles*100))>> Her breasts are larger than her body can possibly sustain without industrial intervention, and they @@.orange;naturally lose mass.@@ - <<set $slaves[$i].boobs = Math.clamp($slaves[$i].boobs-25, 30000+($slaves[$i].muscles*100), 50000)>> + <<set $slaves[$i].boobs -= 25>> <<else>> Her breasts are far, far beyond what her body can sustain without industrial intervention, and they @@.orange;naturally lose mass.@@ - <<set $slaves[$i].boobs = Math.clamp($slaves[$i].boobs-50, 30000+($slaves[$i].muscles*100), 50000)>> + <<set $slaves[$i].boobs -= 50>> <</if>> <</if>> <</if>> @@ -6311,10 +6311,10 @@ <<if $slaves[$i].bellyPreg < 300000 && $slaves[$i].hormoneBalance < 300>> <<if ($slaves[$i].boobs > 5000+($slaves[$i].muscles*10))>> Her breasts are larger than her body can possibly sustain without industrial intervention, and they @@.orange;naturally lose mass.@@ - <<set $slaves[$i].boobs = Math.clamp($slaves[$i].boobs-25, 5000+($slaves[$i].muscles*10), 50000)>> + <<set $slaves[$i].boobs -= 25>> <<else>> Her breasts are far, far beyond what her body can sustain without industrial intervention, and they @@.orange;naturally lose mass.@@ - <<set $slaves[$i].boobs = Math.clamp($slaves[$i].boobs-50, 5000+($slaves[$i].muscles*10), 50000)>> + <<set $slaves[$i].boobs -= 50>> <</if>> <</if>> <</if>> @@ -6378,10 +6378,10 @@ <<if $slaves[$i].bellyPreg < 300000 && $slaves[$i].hormoneBalance < 300>> <<if ($slaves[$i].boobs > 10000+($slaves[$i].muscles*20))>> Her breasts are larger than her body can possibly sustain without industrial intervention, and they @@.orange;naturally lose mass.@@ - <<set $slaves[$i].boobs = Math.clamp($slaves[$i].boobs-25, 10000+($slaves[$i].muscles*20), 50000)>> + <<set $slaves[$i].boobs -= 25>> <<else>> Her breasts are far, far beyond what her body can sustain without industrial intervention, and they @@.orange;naturally lose mass.@@ - <<set $slaves[$i].boobs = Math.clamp($slaves[$i].boobs-50, 10000+($slaves[$i].muscles*20), 50000)>> + <<set $slaves[$i].boobs -= 50>> <</if>> <</if>> <</if>> @@ -6445,10 +6445,10 @@ <<if $slaves[$i].bellyPreg < 300000 && $slaves[$i].hormoneBalance < 300>> <<if ($slaves[$i].boobs > 20000+($slaves[$i].muscles*50))>> Her breasts are larger than her body can possibly sustain without industrial intervention, and they @@.orange;naturally lose mass.@@ - <<set $slaves[$i].boobs = Math.clamp($slaves[$i].boobs-25, 20000+($slaves[$i].muscles*50), 50000)>> + <<set $slaves[$i].boobs -= 25>> <<else>> Her breasts are far, far beyond what her body can sustain without industrial intervention, and they @@.orange;naturally lose mass.@@ - <<set $slaves[$i].boobs = Math.clamp($slaves[$i].boobs-50, 20000+($slaves[$i].muscles*50), 50000)>> + <<set $slaves[$i].boobs -= 50>> <</if>> <</if>> <</if>> diff --git a/src/uncategorized/saRelationships.tw b/src/uncategorized/saRelationships.tw index b6d9b8dd487..5c96282b3e8 100644 --- a/src/uncategorized/saRelationships.tw +++ b/src/uncategorized/saRelationships.tw @@ -1001,7 +1001,7 @@ Having already had kids together, their relationship turns sexual once again and they become @@.lightgreen;friends with benefits.@@ <<set _SlaveI.relationship++, _SlaveJ.relationship = _SlaveI.relationship>> <<elseif $familyTesting == 1 && (_SlaveI.energy > 95) && (_SlaveI.mother == _SlaveJ.ID || _SlaveI.father == _SlaveJ.ID || _SlaveJ.mother == _SlaveI.ID || _SlaveJ.father == _SlaveI.ID || areSisters(_SlaveI, _SlaveJ) > 0) && (random(1,100) > (90-_seed))>> - Driven by nymphomania to attempt to have sex with everyone, _SlaveJ.slaveName successfully seduces _SlaveJ.slaveName and they become @@.lightgreen;friends with benefits.@@ + Driven by nymphomania to attempt to have sex with everyone, _SlaveI.slaveName successfully seduces _SlaveJ.slaveName and they become @@.lightgreen;friends with benefits.@@ <<set _SlaveI.relationship++, _SlaveJ.relationship = _SlaveI.relationship>> <<elseif (_SlaveI.energy > 95) && (_SlaveI.relation != 0) && (_SlaveI.relationTarget == _SlaveI.relationshipTarget) && (random(1, 100) > (90 - _seed))>> Driven by nymphomania to attempt to have sex with everyone, _SlaveI.slaveName successfully seduces _SlaveJ.slaveName and they become @@.lightgreen;friends with benefits.@@ diff --git a/src/uncategorized/saServeThePublic.tw b/src/uncategorized/saServeThePublic.tw index 23c116a5983..093e8e77951 100644 --- a/src/uncategorized/saServeThePublic.tw +++ b/src/uncategorized/saServeThePublic.tw @@ -454,6 +454,10 @@ Her appearance attracted $beauty members of the public (<<print Math.trunc($beau <</if>> <</if>> +<<if $slaves[$i].assignment == "serve in the club" && $slaves[$i].devotion >= 50>> + Being so far from your presence @@.mediumorchid;weakens her intense devotion to you.@@ +<</if>> + <<if $showEWM == 1>> <<if ($slaves[$i].releaseRules == "restrictive") && ($slaves[$i].standardReward !== "orgasm")>> diff --git a/src/uncategorized/saWhore.tw b/src/uncategorized/saWhore.tw index 982d0c04938..61fc3bdd59f 100644 --- a/src/uncategorized/saWhore.tw +++ b/src/uncategorized/saWhore.tw @@ -456,6 +456,10 @@ Her appearance attracted $beauty customers (<<print Math.trunc($beauty/7)>> a da <<set $beauty -= 1>> <</if>> +<<if $slaves[$i].assignment == "work in the brothel" && $slaves[$i].devotion >= 50>> + Being so far from your presence @@.mediumorchid;weakens her intense devotion to you.@@ +<</if>> + <<if $showEWM == 1>> <<if ($slaves[$i].releaseRules == "restrictive") && ($slaves[$i].standardReward !== "orgasm")>> diff --git a/src/utility/descriptionWidgetsFlesh.tw b/src/utility/descriptionWidgetsFlesh.tw index 2f68067284a..7a9591881f8 100644 --- a/src/utility/descriptionWidgetsFlesh.tw +++ b/src/utility/descriptionWidgetsFlesh.tw @@ -11808,43 +11808,71 @@ $pronounCap has <<if $activeSlave.hips < -1>> <<if $activeSlave.butt > 2>> - $possessiveCap butt is @@.red;disproportionately large@@ for $possessive narrow hips<<if $arcologies[0].FSHedonisticDecadence != "unset">>, but your hedonistic arcology finds this attractive.<<elseif $arcologies[0].FSTransformationFetishist != "unset">>, but your transformation fetishist arcology considers this attractive.<<else>>.<</if>> + $possessiveCap butt is + <<if $arcologies[0].FSHedonisticDecadence != "unset">> + disproportionately large for $possessive narrow hips, but your hedonistic arcology finds this attractive. + <<elseif $arcologies[0].FSTransformationFetishist != "unset">> + disproportionately large for $possessive narrow hips, but your transformation fetishist arcology considers this attractive. + <<else>> + @@.red;disproportionately large@@ for $possessive narrow hips. + <</if>> <<else>> - $possessiveCap hips are very narrow. + $possessiveCap hips are very narrow. <</if>> <<elseif $activeSlave.hips < 0>> <<if $activeSlave.butt > 4>> - $possessiveCap butt is @@.red;disproportionately large@@ for $possessive trim hips<<if $arcologies[0].FSHedonisticDecadence != "unset">>, but your hedonistic arcology finds this attractive.<<elseif $arcologies[0].FSTransformationFetishist != "unset">>, but your transformation fetishist arcology considers this attractive.<<else>>.<</if>> + $possessiveCap butt is + <<if $arcologies[0].FSHedonisticDecadence != "unset">> + disproportionately large for $possessive trim hips, but your hedonistic arcology finds this attractive. + <<elseif $arcologies[0].FSTransformationFetishist != "unset">> + disproportionately large for $possessive trim hips, but your transformation fetishist arcology considers this attractive. + <<else>> + @@.red;disproportionately large@@ for $possessive trim hips. + <</if>> <<else>> - $possessiveCap butt is complemented by $possessive trim hips. + $possessiveCap butt is complemented by $possessive trim hips. <</if>> <<elseif $activeSlave.hips > 2>> <<if $activeSlave.butt <= 8>> - $possessiveCap butt is @@.red;disproportionately small@@ for $possessive monstrous hips. + $possessiveCap butt is @@.red;disproportionately small@@ for $possessive monstrous hips. <<else>> - $possessiveCap butt is fitting for $possessive monstrous hips. + $possessiveCap butt is fitting for $possessive monstrous hips. <</if>> <<elseif $activeSlave.hips > 1>> <<if $activeSlave.butt <= 3 && ($arcologies[0].FSSlimnessEnthusiast == "unset" || ($activeSlave.boobs >= 500))>> - $possessiveCap butt is @@.red;disproportionately small@@ for $possessive very wide hips<<if $arcologies[0].FSSlimnessEnthusiast != "unset">>, which your arcology finds unattractive on busty slaves.<<else>>.<</if>> + $possessiveCap butt is @@.red;disproportionately small@@ for $possessive very wide hips<<if $arcologies[0].FSSlimnessEnthusiast != "unset">>, which your arcology finds unattractive on busty slaves.<<else>>.<</if>> <<else>> - $possessiveCap butt is flattered by $possessive very wide hips. + $possessiveCap butt is flattered by $possessive very wide hips. <</if>> <<elseif $activeSlave.hips > 0>> <<if $activeSlave.butt > 8>> - $possessiveCap butt is @@.red;disproportionately large@@ for $possessive broad hips<<if $arcologies[0].FSHedonisticDecadence != "unset">>, but your hedonistic arcology finds this attractive.<<elseif $arcologies[0].FSTransformationFetishist != "unset">>, but your transformation fetishist arcology considers this attractive.<<else>>.<</if>> + $possessiveCap butt is + <<if $arcologies[0].FSHedonisticDecadence != "unset">> + disproportionately large for $possessive broad hips, but your hedonistic arcology finds this attractive. + <<elseif $arcologies[0].FSTransformationFetishist != "unset">> + disproportionately large for $possessive broad hips, but your transformation fetishist arcology considers this attractive. + <<else>> + @@.red;disproportionately large@@ for $possessive broad hips. + <</if>> <<elseif $activeSlave.butt <= 2 && ($arcologies[0].FSSlimnessEnthusiast == "unset" || ($activeSlave.boobs >= 500))>> - $possessiveCap butt is @@.red;disproportionately small@@ for $possessive broad hips<<if $arcologies[0].FSSlimnessEnthusiast != "unset">>, which your arcology finds unattractive on busty slaves.<<else>>.<</if>> + $possessiveCap butt is @@.red;disproportionately small@@ for $possessive broad hips<<if $arcologies[0].FSSlimnessEnthusiast != "unset">>, which your arcology finds unattractive on busty slaves.<<else>>.<</if>> <<else>> - $possessiveCap butt is complemented by $possessive broad hips. + $possessiveCap butt is complemented by $possessive broad hips. <</if>> <<else>> <<if $activeSlave.butt > 6>> - $possessiveCap butt is @@.red;disproportionately large@@ for $possessive womanly hips<<if $arcologies[0].FSHedonisticDecadence != "unset">>, but your hedonistic arcology finds this attractive.<<elseif $arcologies[0].FSTransformationFetishist != "unset">>, but your transformation fetishist arcology considers this attractive.<<else>>.<</if>> + $possessiveCap butt is + <<if $arcologies[0].FSHedonisticDecadence != "unset">> + disproportionately large for $possessive womanly hips, but your hedonistic arcology finds this attractive. + <<elseif $arcologies[0].FSTransformationFetishist != "unset">> + disproportionately large for $possessive womanly hips, but your transformation fetishist arcology considers this attractive. + <<else>> + @@.red;disproportionately large@@ for $possessive womanly hips. + <</if>> <<elseif $activeSlave.butt <= 1 && ($arcologies[0].FSSlimnessEnthusiast == "unset" || ($activeSlave.boobs >= 500))>> - $possessiveCap butt is @@.red;disproportionately small@@ for $possessive ample hips<<if $arcologies[0].FSSlimnessEnthusiast != "unset">>, which your arcology finds unattractive on busty slaves.<<else>>.<</if>> + $possessiveCap butt is @@.red;disproportionately small@@ for $possessive ample hips<<if $arcologies[0].FSSlimnessEnthusiast != "unset">>, which your arcology finds unattractive on busty slaves.<<else>>.<</if>> <<else>> - $possessiveCap butt is complemented by $possessive ample hips. + $possessiveCap butt is complemented by $possessive ample hips. <</if>> <</if>> -- GitLab