diff --git a/src/endWeek/saServeThePublic.js b/src/endWeek/saServeThePublic.js index 4c475bea42a41adb2f71d81eaa2deadb9948fd2f..f75d3d22f0ebc57c2caecef6e50e95ec4ec3a2fb 100644 --- a/src/endWeek/saServeThePublic.js +++ b/src/endWeek/saServeThePublic.js @@ -94,11 +94,11 @@ window.saServeThePublic = (function saServeThePublic() { // ads if (V.clubAdsSpending !== 0) { if (V.clubAdsStacked === 1) { - if (slave.butt > 4 && slave.boobs > 800) { + if (isStacked(slave)) { r += ` ${His} stacked body fits ${V.clubName}'s ad campaign, getting ${him} more attention.`; } } else if (V.clubAdsStacked === -1) { - if (slave.boobs < 500 && slave.butt < 3 && slave.weight <= 10 && slave.muscles <= 30) { + if (isSlim(slave)) { r += ` ${His} slim body fits ${V.clubName}'s ad campaign, getting ${him} more attention.`; } } @@ -667,7 +667,7 @@ window.saServeThePublic = (function saServeThePublic() { r += ` ${He} neither loves nor fears you enough to work hard, and makes a poor slut.`; } - if (slave.butt > 4 && slave.boobs > 800) { + if (isStacked(slave)) { if (arcology.FSAssetExpansionist !== "unset") { r += ` ${His} huge, fashionable assets are immensely popular.`; if (canTalk(slave)) { diff --git a/src/js/assayJS.js b/src/js/assayJS.js index f2e1e1edae157600cb67dc6096b62a2b9e9373c4..5e9fafe6806471f9c9353ffacb6f9dfb4bba2586 100644 --- a/src/js/assayJS.js +++ b/src/js/assayJS.js @@ -1,63 +1,3 @@ -/** - * @param {App.Entity.SlaveState} slave - * @returns {boolean} - */ -window.isSlim = function(slave) { - let slim = false; - const ArcologyZero = State.variables.arcologies[0]; - - if (ArcologyZero.FSSlimnessEnthusiastLaw === 1) { - return (slimPass(slave) === 1); - } else { - if ((slave.boobs < 500) && (slave.butt < 3)) { - if ((slave.muscles <= 30) && (ArcologyZero.FSPhysicalIdealist === "unset") && (slave.weight <= 10) && (ArcologyZero.FSHedonisticDecadence === "unset")) { - slim = true; - } else if (ArcologyZero.FSPhysicalIdealist !== "unset") { - if ((ArcologyZero.FSPhysicalIdealistStrongFat === 1) && (slave.weight <= 30)) { - slim = true; - } else if (slave.weight <= 10) { - slim = true; - } - } else if ((ArcologyZero.FSHedonisticDecadence !== "unset") && (slave.weight <= 30)) { - if (ArcologyZero.FSHedonisticDecadenceStrongFat === 1) { - slim = true; - } else if (slave.muscles <= 30) { - slim = true; - } - } - } - } - - return slim; -}; - -/** - * @param {App.Entity.SlaveState} slave - * @returns {number} - */ -window.slimPass = function(slave) { - let slimPass = 0; - const ArcologyZero = State.variables.arcologies[0]; - - if (ArcologyZero.FSSlimnessEnthusiastLaw === 1) { - if ((slave.boobs < 300) && (slave.butt <= 1) && (slave.waist <= 10)) { - if ((ArcologyZero.FSPhysicalIdealist === "unset") && (ArcologyZero.FSHedonisticDecadenceStrongFat === 0) && (slave.muscles > 30)) { /* muscle check*/ - slimPass = 0; - } else if ((ArcologyZero.FSHedonisticDecadence !== "unset") || (ArcologyZero.FSPhysicalIdealistStrongFat === 1)) { /* weight check*/ - if (slave.weight > 30) { - slimPass = 0; - } - } else if (slave.weight > 10) { - slimPass = 0; - } else { - slimPass = 1; - } - } - } - - return slimPass; -}; - window.sameAssignmentP = function sameAssignmentP(A, B) { return A.assignment === B.assignment; }; diff --git a/src/js/rulesAssistantOptions.js b/src/js/rulesAssistantOptions.js index 494fb5d4ad067369b39524dee87b62355a2356df..5c215c53fe53eab987f6138a727c72ea193ac41f 100644 --- a/src/js/rulesAssistantOptions.js +++ b/src/js/rulesAssistantOptions.js @@ -1599,7 +1599,7 @@ window.rulesAssistantOptions = (function() { stacked() { this.breasts.setValue(1000); - this.butts.setValue(4); + this.butts.setValue(5); this.lips.setValue(25); if (this.dicks) this.dicks.setValue(4); if (this.balls) this.balls.setValue(4); diff --git a/src/js/slaveCostJS.js b/src/js/slaveCostJS.js index 974f9d612502cc67a3b4561969c093bdf2a028ba..cdd5835aba1f525473387630b8d640a90482fb3b 100644 --- a/src/js/slaveCostJS.js +++ b/src/js/slaveCostJS.js @@ -1151,7 +1151,7 @@ window.Beauty = (function() { beauty += arcology.FSSlimnessEnthusiast/40; } } - } else if (slave.butt > 4 && slave.boobs > 800) { + } else if (isStacked(slave)) { if (arcology.FSSlimnessEnthusiast === "unset") { beauty += 1; } diff --git a/src/js/slaveStatsChecker.js b/src/js/slaveStatsChecker.js index df3a9defce0e8be3c7b23f6a53b024ba02a74231..764ddfa58f82e80d3130af4d53f3fbe3b57a00ae 100644 --- a/src/js/slaveStatsChecker.js +++ b/src/js/slaveStatsChecker.js @@ -137,6 +137,59 @@ window.SlaveStatsChecker = (function() { } }()); +window.isSlim = /** @param {App.Entity.SlaveState} slave */ function (slave) { + let slim = false; + const ArcologyZero = State.variables.arcologies[0]; + + if (ArcologyZero.FSSlimnessEnthusiastLaw === 1) { + return (slimPass(slave) === 1); + } + if ((slave.boobs < 500) && (slave.butt < 3)) { + if ((slave.muscles <= 30) && (ArcologyZero.FSPhysicalIdealist === "unset") && (slave.weight <= 10) && (ArcologyZero.FSHedonisticDecadence === "unset")) { + slim = true; + } else if (ArcologyZero.FSPhysicalIdealist !== "unset") { + if ((ArcologyZero.FSPhysicalIdealistStrongFat === 1) && (slave.weight <= 30)) { + slim = true; + } else if (slave.weight <= 10) { + slim = true; + } + } else if ((ArcologyZero.FSHedonisticDecadence !== "unset") && (slave.weight <= 30)) { + if (ArcologyZero.FSHedonisticDecadenceStrongFat === 1) { + slim = true; + } else if (slave.muscles <= 30) { + slim = true; + } + } + } + + return slim; +}; + +window.slimPass = /** @param {App.Entity.SlaveState} slave */ function (slave) { + let slimPass = 0; + const ArcologyZero = State.variables.arcologies[0]; + + if (ArcologyZero.FSSlimnessEnthusiastLaw === 1) { + if ((slave.boobs < 300) && (slave.butt <= 1) && (slave.waist <= 10)) { + if ((ArcologyZero.FSPhysicalIdealist === "unset") && (ArcologyZero.FSHedonisticDecadenceStrongFat === 0) && (slave.muscles > 30)) { + /* muscle check*/ + slimPass = 0; + } else if ((ArcologyZero.FSHedonisticDecadence !== "unset") || (ArcologyZero.FSPhysicalIdealistStrongFat === 1)) { + /* weight check*/ + if (slave.weight > 30) { + slimPass = 0; + } + } else if (slave.weight > 10) { + slimPass = 0; + } else { + slimPass = 1; + } + } + } + + return slimPass; +}; + window.isStacked = /** @param {App.Entity.SlaveState} slave */ function(slave) { return (slave.butt > 4) && (slave.boobs > 800); }; diff --git a/src/pregmod/JobFulfillmentCenter/JobFulfillmentCenterDelivery.tw b/src/pregmod/JobFulfillmentCenter/JobFulfillmentCenterDelivery.tw index d370835c301c2f5762acde1fafe371b81e2881b5..9a03de6e8ccbbf0469606d255bc468def7e691eb 100644 --- a/src/pregmod/JobFulfillmentCenter/JobFulfillmentCenterDelivery.tw +++ b/src/pregmod/JobFulfillmentCenter/JobFulfillmentCenterDelivery.tw @@ -23,9 +23,16 @@ A slave dealer has submitted a slave to satisfy your ''$Role'' order. $He has been very well trained by the dealer that offered $him to you. $He has also picked up on the fact that $he was specially selected, and is a little hopeful that this means $he may be treated well. $He is now eagerly awaiting your instructions. <<include "New Slave Intro">> <<set $Role = "">> + <<if def $JFCReorder>><<run delete $JFCReorder>><</if>> <</replace>> <</link>> <<else>> //You lack the necessary funds to accept the offered slave.// <</if>> +<br> +<<link "Reject this offer and place the same order again">> + <<set $JFCOrder = 1>> + <<set $JFCReorder = 1>> + <<goto $nextLink>> +<</link>> </span> diff --git a/src/pregmod/incubatorReport.tw b/src/pregmod/incubatorReport.tw index de1b5d854eba32b0d1f99b0b45c1c18b490e6b04..24e64066255ce043d16a91db048a35b0164ecb77 100644 --- a/src/pregmod/incubatorReport.tw +++ b/src/pregmod/incubatorReport.tw @@ -229,6 +229,7 @@ <<if $incubatorUpgradeReproduction == 1>> <br> + <<set _rearQuirk = $tanks[_inc].geneticQuirks.rearLipedema == 2 ? 2 : 0>> <<if $incubatorReproductionSetting == 2>> $His developing body is being flooded with hormones. <<if $incubatorWeightSetting == 1>> @@ -255,7 +256,7 @@ The excess estrogen-laced growth hormones @@.green;cause $his hips to widen for childbirth.@@ <<set $tanks[_inc].hips += 2>> <</if>> - <<if $tanks[_inc].butt < 12 && random(1,100) > 30>> + <<if $tanks[_inc].butt < 12*_rearQuirk && random(1,100) > 30/_rearQuirk>> The excess estrogen-laced growth hormones @@.green;cause $his rear to grow fatter.@@ <<set $tanks[_inc].butt += 4>> <</if>> @@ -268,7 +269,7 @@ The excess estrogen-laced growth hormones @@.green;cause $his hips to widen for childbirth.@@ <<set $tanks[_inc].hips++>> <</if>> - <<if $tanks[_inc].butt < 12 && random(1,100) > 50>> + <<if $tanks[_inc].butt < 12*_rearQuirk && random(1,100) > 50/_rearQuirk>> The excess estrogen-laced growth hormones @@.green;cause $his rear to grow fatter.@@ <<set $tanks[_inc].butt += 3>> <</if>> @@ -281,7 +282,7 @@ The excess estrogen-laced growth hormones @@.green;causes $his hips to widen for childbirth.@@ <<set $tanks[_inc].hips++>> <</if>> - <<if $tanks[_inc].butt < 12 && random(1,100) > 50>> + <<if $tanks[_inc].butt < 12*_rearQuirk && random(1,100) > 50/_rearQuirk>> The excess estrogen-laced growth hormones @@.green;cause $his rear grow fatter.@@ <<set $tanks[_inc].butt += 2>> <</if>> @@ -294,7 +295,7 @@ The excess estrogen-laced growth hormones @@.green;cause $his hips to widen for childbirth.@@ <<set $tanks[_inc].hips++>> <</if>> - <<if $tanks[_inc].butt < 12 && random(1,100) > 60>> + <<if $tanks[_inc].butt < 12*_rearQuirk && random(1,100) > 60/_rearQuirk>> The excess estrogen-laced growth hormones @@.green;cause $his rear to grow fatter.@@ <<set $tanks[_inc].butt++>> <</if>> @@ -307,7 +308,7 @@ The excess estrogen-laced growth hormones @@.green;cause $his hips to widen for childbirth.@@ <<set $tanks[_inc].hips++>> <</if>> - <<if $tanks[_inc].butt < 12 && random(1,100) > 70>> + <<if $tanks[_inc].butt < 12*_rearQuirk && random(1,100) > 70/_rearQuirk>> The excess estrogen-laced growth hormones @@.green;cause $his rear to grow fatter.@@ <<set $tanks[_inc].butt++>> <</if>> @@ -391,7 +392,7 @@ The excess estrogen-laced growth hormones @@.green;cause $his hips to widen for childbirth.@@ <<set $tanks[_inc].hips++>> <</if>> - <<if $tanks[_inc].butt < 8 && random(1,100) > 50>> + <<if $tanks[_inc].butt < 8*_rearQuirk && random(1,100) > 50/_rearQuirk>> The excess estrogen-laced growth hormones @@.green;cause $his rear to grow fatter.@@ <<set $tanks[_inc].butt += 3>> <</if>> @@ -404,7 +405,7 @@ The excess estrogen-laced growth hormones @@.green;cause $his hips to widen for childbirth.@@ <<set $tanks[_inc].hips++>> <</if>> - <<if $tanks[_inc].butt < 8 && random(1,100) > 50>> + <<if $tanks[_inc].butt < 8*_rearQuirk && random(1,100) > 50/_rearQuirk>> The excess estrogen-laced growth hormones @@.green;cause $his rear to grow fatter.@@ <<set $tanks[_inc].butt++>> <</if>> @@ -417,7 +418,7 @@ The excess estrogen-laced growth hormones @@.green;cause $his hips to widen for childbirth.@@ <<set $tanks[_inc].hips++>> <</if>> - <<if $tanks[_inc].butt < 8 && random(1,100) > 60>> + <<if $tanks[_inc].butt < 8*_rearQuirk && random(1,100) > 60/_rearQuirk>> The excess estrogen-laced growth hormones @@.green;cause $his rear to grow fatter.@@ <<set $tanks[_inc].butt++>> <</if>> @@ -430,7 +431,7 @@ The excess estrogen-laced growth hormones @@.green;cause $his hips to widen for childbirth.@@ <<set $tanks[_inc].hips++>> <</if>> - <<if $tanks[_inc].butt < 8 && random(1,100) > 70>> + <<if $tanks[_inc].butt < 8*_rearQuirk && random(1,100) > 70/_rearQuirk>> The excess estrogen-laced growth hormones @@.green;cause $his rear to grow fatter.@@ <<set $tanks[_inc].butt++>> <</if>> @@ -443,7 +444,7 @@ The excess estrogen-laced growth hormones @@.green;cause $his hips to widen for childbirth.@@ <<set $tanks[_inc].hips++>> <</if>> - <<if $tanks[_inc].butt < 8 && random(1,100) > 80>> + <<if $tanks[_inc].butt < 8*_rearQuirk && random(1,100) > 80/_rearQuirk>> The excess estrogen-laced growth hormones @@.green;cause $his rear to grow fatter.@@ <<set $tanks[_inc].butt++>> <</if>> @@ -527,7 +528,7 @@ The excess estrogen-laced growth hormones @@.green;cause $his hips to widen for childbirth.@@ <<set $tanks[_inc].hips += 2>> <</if>> - <<if $tanks[_inc].butt < 6 && random(1,100) > 70>> + <<if $tanks[_inc].butt < 6*_rearQuirk && random(1,100) > 70/_rearQuirk>> The excess estrogen-laced growth hormones @@.green;cause $his rear to grow fatter.@@ <<set $tanks[_inc].butt += 2>> <</if>> @@ -540,7 +541,7 @@ The excess estrogen-laced growth hormones @@.green;cause $his hips to widen for childbirth.@@ <<set $tanks[_inc].hips++>> <</if>> - <<if $tanks[_inc].butt < 6 && random(1,100) > 70>> + <<if $tanks[_inc].butt < 6*_rearQuirk && random(1,100) > 70/_rearQuirk>> The excess estrogen-laced growth hormones @@.green;cause $his rear to grow fatter.@@ <<set $tanks[_inc].butt++>> <</if>> @@ -553,7 +554,7 @@ The excess estrogen-laced growth hormones @@.green;cause $his hips to widen for childbirth.@@ <<set $tanks[_inc].hips++>> <</if>> - <<if $tanks[_inc].butt < 6 && random(1,100) > 90>> + <<if $tanks[_inc].butt < 6*_rearQuirk && random(1,100) > 90/_rearQuirk>> The excess estrogen-laced growth hormones @@.green;cause $his rear to grow fatter.@@ <<set $tanks[_inc].butt++>> <</if>> @@ -566,7 +567,7 @@ The excess estrogen-laced growth hormones @@.green;cause $his hips to widen for childbirth.@@ <<set $tanks[_inc].hips++>> <</if>> - <<if $tanks[_inc].butt < 6 && random(1,100) > 90>> + <<if $tanks[_inc].butt < 6*_rearQuirk && random(1,100) > 90/_rearQuirk>> The excess estrogen-laced growth hormones @@.green;cause $his rear to grow fatter.@@ <<set $tanks[_inc].butt++>> <</if>> @@ -579,7 +580,7 @@ The excess estrogen-laced growth hormones @@.green;cause $his hips to widen for childbirth.@@ <<set $tanks[_inc].hips++>> <</if>> - <<if $tanks[_inc].butt < 6 && random(1,100) > 90>> + <<if $tanks[_inc].butt < 6*_rearQuirk && random(1,100) > 90/_rearQuirk>> The excess estrogen-laced growth hormones @@.green;cause $his rear to grow fatter.@@ <<set $tanks[_inc].butt++>> <</if>> @@ -657,7 +658,7 @@ The added estrogen @@.green;causes $his hips to widen.@@ <<set $tanks[_inc].hips++>> <</if>> - <<if $tanks[_inc].butt < 5 && random(1,100) > 80>> + <<if $tanks[_inc].butt < 5*_rearQuirk && random(1,100) > 80/_rearQuirk>> The added estrogen @@.green;causes $his butt to grow.@@ <<set $tanks[_inc].butt++>> <</if>> diff --git a/src/pregmod/saAgent.tw b/src/pregmod/saAgent.tw index ebdfb9eb76243c4220b8c5fcd46e900a0ffa7a38..9016bdae8ac7b9cf3dc807bb21a3b52acd44ec18 100644 --- a/src/pregmod/saAgent.tw +++ b/src/pregmod/saAgent.tw @@ -33,6 +33,9 @@ <</if>> <</if>> <</if>> +<<if $slaves[$i].geneticQuirks.rearLipedema == 2 && $slaves[$i].butt < 20>> + <<set $slaves[$i].butt += .1>> +<</if>> <<if $slaves[$i].genes == "XX">> <<if $slaves[$i].ovaries == 1 || $slaves[$i].mpreg == 1>> diff --git a/src/pregmod/saInflation.tw b/src/pregmod/saInflation.tw index bdf3a1c8b18776f8caa573eb6e2afdc0876208b3..4f8406b2f5068dbe06dc7230d16db2ea0ecdd448 100644 --- a/src/pregmod/saInflation.tw +++ b/src/pregmod/saInflation.tw @@ -528,16 +528,17 @@ <</if>> <<if $slaves[$i].inflationType == "milk" && $slaves[$i].bellyFluid >= 1500>> + <<set _rearQuirk = $slaves[$i].geneticQuirks.rearLipedema == 2 ? 2 : 0>> <<if $slaves[$i].weight < 200>> $His body @@.lime;grows a little more padded@@ as it absorbs the milk contained in $his digestive track. <<set $slaves[$i].weight += 2>> <</if>> - <<if random(1,100) > 50>> - <<if $slaves[$i].boobs < 3000>> + <<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>> - <<if $slaves[$i].butt < 7>> + <</if>> + <<if random(1,100) > (50/_rearQuirk) && $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>> @@ -551,7 +552,7 @@ $His breasts @@.lime;swell@@ with added fat as $he digests the food contained in $his digestive track. <<set $slaves[$i].boobs += 200>> <</if>> - <<if random(1,100) > 50 && $slaves[$i].butt < 7>> + <<if random(1,100) > (50/_rearQuirk) && $slaves[$i].butt < 7*_rearQuirk>> $His butt @@.lime;swells@@ with added fat as $he digests the food contained in $his digestive track. <<set $slaves[$i].butt += 1>> <</if>> diff --git a/src/uncategorized/RESS.tw b/src/uncategorized/RESS.tw index 32a1792905c4ada5118e30abfd4cfb39abe93a46..e0e1cc4d70db9d1c4babc5029cc03befd9b718d5 100644 --- a/src/uncategorized/RESS.tw +++ b/src/uncategorized/RESS.tw @@ -3775,6 +3775,8 @@ Your slaves get dressed in a large wardrobe area adjacent to the dormitory, room apparently bigger today than it was yesterday. Intensive female hormone regimens like $hers sometimes cause minor ass expansion. <<elseif $activeSlave.buttImplantType == 1>> apparently a little bigger today than it was yesterday. String implants like $hers steadily grow if not regularly drained. +<<elseif $geneticMappingUpgrade == 1 && $activeSlave.geneticQuirks.rearLipedema == 2>> + apparently a little bigger today than it was yesterday. $His body is constantly laying fat on $his ass and thighs, so this isn't really unexpected. <<elseif $activeSlave.buttImplant/$activeSlave.butt >= .5>> apparently a little bigger today than it was yesterday. Large implants like $hers normally cause some slight size fluctuations. <<else>> diff --git a/src/uncategorized/saDiet.tw b/src/uncategorized/saDiet.tw index aef20a727457d8459f15566af417b5429717b5e5..17089ecaf641b4b5418aca10d06f04f8e983bc1e 100644 --- a/src/uncategorized/saDiet.tw +++ b/src/uncategorized/saDiet.tw @@ -1,5 +1,8 @@ :: SA diet [nobr] +/* quirk modifiers */ +<<set _rearQuirk = $slaves[$i].geneticQuirks.rearLipedema == 2 ? 2 : 0>> + <<if $slaves[$i].fuckdoll == 0>> <<if $feeder == 1>> @@ -124,10 +127,10 @@ <</if>> <</if>> <<if $slaves[$i].butt > 1>> - <<if (($slaves[$i].geneMods.NCS == 0) && (random(1,_assetLoss) <= 1+$feeder))>> + <<if (($slaves[$i].geneMods.NCS == 0) && (random(1,_assetLoss+_rearQuirk) <= 1+$feeder))>> @@.orange;$His butt gets a little smaller.@@ <<set $slaves[$i].butt -= 1>> - <<elseif (($slaves[$i].geneMods.NCS == 1) && ($slaves[$i].butt > 2) && (random(-_assetLoss, _assetLoss - 2) <= 1+$feeder))>> + <<elseif (($slaves[$i].geneMods.NCS == 1) && ($slaves[$i].butt > 2) && (random(-_assetLoss, _assetLoss - 2 + _rearQuirk) <= 1+$feeder))>> @@.orange;$His butt gets smaller.@@ <<set $slaves[$i].butt -= 2>> <</if>> @@ -307,7 +310,7 @@ <<set $slaves[$i].boobs += 25>> <</if>> <</if>> - <<if random(1,_assetGain) <= 1+$feeder>> + <<if random(1,_assetGain-_rearQuirk) <= 1+$feeder>> @@.lime;$His butt gets a little bigger.@@ <<set $slaves[$i].butt += 1>> <</if>> @@ -365,7 +368,7 @@ @@.orange;$His breasts get smaller.@@ <<set $slaves[$i].boobs -= 100>> <</if>> - <<elseif ($slaves[$i].butt > 1)>> + <<elseif ($slaves[$i].butt > 1 && ($slaves[$i].geneticQuirks.rearLipedema != 2 || ($slaves[$i].butt > 10 && random(1,100) > 80)))>> <<if (($slaves[$i].geneMods.NCS == 0) || ($slaves[$i].butt == 1))>> @@.orange;$His butt gets a little smaller.@@ <<set $slaves[$i].butt -= 1>> @@ -431,7 +434,7 @@ @@.orange;$His breasts get smaller.@@ <<set $slaves[$i].boobs -= 100>> <</if>> - <<elseif ($slaves[$i].butt > 1)>> + <<elseif ($slaves[$i].butt > 1 && ($slaves[$i].geneticQuirks.rearLipedema != 2 || ($slaves[$i].butt > 10 && random(1,100) > 80)))>> <<if (($slaves[$i].geneMods.NCS == 0) || ($slaves[$i].butt == 1))>> @@.orange;$His butt gets a little smaller.@@ <<set $slaves[$i].butt -= 1>> @@ -469,7 +472,7 @@ <</if>> <</if>> <<if random(1,100) > 50>> - <<if ($slaves[$i].butt > 1)>> + <<if ($slaves[$i].butt > 1) && ($slaves[$i].geneticQuirks.rearLipedema != 2 || ($slaves[$i].butt > 10 && random(1,100) > 80))>> @@.orange;$His butt loses a little mass.@@ <<set $slaves[$i].butt -= 1>> <</if>> @@ -528,7 +531,7 @@ $His breasts @@.lime;grow slightly@@ from the estrogen. <<set $slaves[$i].boobs += 10>> <</if>> - <<if (($slaves[$i].geneMods.NCS == 0) && ($slaves[$i].butt < 4) && (random(1,100) > 75))>> + <<if (($slaves[$i].geneMods.NCS == 0) && ($slaves[$i].butt < 4) && (random(1,100) > (75/_rearQurk)))>> $His rear @@.lime;rounds out@@ to fit $his developing femininity. <<set $slaves[$i].butt += 1>> <</if>> @@ -571,7 +574,7 @@ Hormonal changes @@.lime;slim $his waist.@@ <<set $slaves[$i].waist-->> <</if>> - <<if (($slaves[$i].geneMods.NCS == 0) && ($slaves[$i].butt < 5) && (random(1,100) > 75))>> + <<if (($slaves[$i].geneMods.NCS == 0) && ($slaves[$i].butt < 5) && (random(1,100) > (75/_rearQurk)))>> $His rear @@.lime;rounds out@@ to fit $his developing femininity. <<set $slaves[$i].butt += 1>> <</if>> @@ -592,7 +595,7 @@ Hormonal changes @@.lime;slim $his waist.@@ <<set $slaves[$i].waist-->> <</if>> - <<if (($slaves[$i].geneMods.NCS == 0) && ($slaves[$i].butt < 3) && (random(1,100) > 75))>> + <<if (($slaves[$i].geneMods.NCS == 0) && ($slaves[$i].butt < 3) && (random(1,100) > (75/_rearQurk)))>> $His rear @@.lime;rounds out@@ to fit $his developing femininity. <<set $slaves[$i].butt += 1>> <</if>> @@ -726,7 +729,7 @@ $His breasts @@.lime;grow slightly@@ to fit $his developing femininity. <<set $slaves[$i].boobs += 10>> <</if>> - <<if (($slaves[$i].geneMods.NCS == 0) && ($slaves[$i].butt < 5) && (random(1,100) > 75))>> + <<if (($slaves[$i].geneMods.NCS == 0) && ($slaves[$i].butt < 5) && (random(1,100) > (75/_rearQurk)))>> $His rear @@.lime;rounds out@@ to fit $his developing femininity. <<set $slaves[$i].butt += 1>> <</if>> @@ -868,7 +871,7 @@ <<if ($slaves[$i].boobs-$slaves[$i].boobsImplant-$slaves[$i].boobsMilk >= 200)>> @@.orange;$His breasts get a little smaller.@@ <<set $slaves[$i].boobs -= 50>> - <<elseif ($slaves[$i].butt > 1)>> + <<elseif ($slaves[$i].butt > 1) && ($slaves[$i].geneticQuirks.rearLipedema != 2 || ($slaves[$i].butt > 10 && random(1,100) > 80))>> @@.orange;$His butt gets a little smaller.@@ <<set $slaves[$i].butt -= 1>> <</if>> @@ -979,7 +982,7 @@ <</if>> <</if>> <<if $slaves[$i].butt > 1>> - <<if random(1,5) <= 1>> + <<if random(1,5+_rearQuirk) <= 1>> @@.orange;$His butt gets a little smaller.@@ <<set $slaves[$i].butt -= 1>> <<if (($slaves[$i].geneMods.NCS == 1) && ($slaves[$i].butt > 2))>> @@ -998,7 +1001,7 @@ @@.lime;$His breasts get a little bigger.@@ <<set $slaves[$i].boobs += 50>> <</if>> - <<if random(1,5) <= 1>> + <<if random(1,5-_rearQuirk) <= 1>> @@.lime;$His butt gets a little bigger.@@ <<set $slaves[$i].butt += 1>> <</if>> @@ -1020,7 +1023,7 @@ <<if ($slaves[$i].boobs-$slaves[$i].boobsImplant-$slaves[$i].boobsMilk >= 200)>> @@.orange;$His breasts get a little smaller.@@ <<set $slaves[$i].boobs -= 50>> - <<elseif ($slaves[$i].butt > 1)>> + <<elseif ($slaves[$i].butt > 1) && ($slaves[$i].geneticQuirks.rearLipedema != 2 || ($slaves[$i].butt > 10 && random(1,100) > 80))>> @@.orange;$His butt gets a little smaller.@@ <<set $slaves[$i].butt -= 1>> <</if>> @@ -1044,7 +1047,7 @@ <<if ($slaves[$i].boobs-$slaves[$i].boobsImplant-$slaves[$i].boobsMilk >= 200)>> @@.orange;$His breasts get a little smaller.@@ <<set $slaves[$i].boobs -= 50>> - <<elseif ($slaves[$i].butt > 1)>> + <<elseif ($slaves[$i].butt > 1) && ($slaves[$i].geneticQuirks.rearLipedema != 2 || ($slaves[$i].butt > 10 && random(1,100) > 80))>> @@.orange;$His butt gets a little smaller.@@ <<set $slaves[$i].butt -= 1>> <</if>> @@ -1080,7 +1083,7 @@ Hormonal changes @@.lime;slim $his waist.@@ <<set $slaves[$i].waist-->> <</if>> - <<if (($slaves[$i].geneMods.NCS == 0) && ($slaves[$i].butt < 4) && (random(1,100) > 75))>> + <<if (($slaves[$i].geneMods.NCS == 0) && ($slaves[$i].butt < 4) && (random(1,100) > 75/_rearQurk))>> $His rear @@.lime;rounds out@@ to fit $his growing curves. <<set $slaves[$i].butt += 1>> <</if>> @@ -1105,7 +1108,7 @@ Hormonal changes @@.lime;slim $his waist.@@ <<set $slaves[$i].waist-->> <</if>> - <<if (($slaves[$i].geneMods.NCS == 0) && ($slaves[$i].butt < 5) && (random(1,100) > 75))>> + <<if (($slaves[$i].geneMods.NCS == 0) && ($slaves[$i].butt < 5) && (random(1,100) > 75/_rearQurk))>> $His rear @@.lime;rounds out@@ to fit $his developing femininity. <<set $slaves[$i].butt += 1>> <</if>> @@ -1122,7 +1125,7 @@ Hormonal changes @@.lime;slim $his waist.@@ <<set $slaves[$i].waist-->> <</if>> - <<if (($slaves[$i].geneMods.NCS == 0) && ($slaves[$i].butt < 3) && (random(1,100) > 75))>> + <<if (($slaves[$i].geneMods.NCS == 0) && ($slaves[$i].butt < 3) && (random(1,100) > 75/_rearQurk))>> $His rear @@.lime;rounds out@@ to fit $his developing femininity. <<set $slaves[$i].butt += 1>> <</if>> @@ -1213,7 +1216,7 @@ $His breasts @@.lime;grow slightly@@ to fit $his developing femininity. <<set $slaves[$i].boobs += 10>> <</if>> - <<if (($slaves[$i].geneMods.NCS == 0) && ($slaves[$i].butt < 5) && (random(1,100) > 75))>> + <<if (($slaves[$i].geneMods.NCS == 0) && ($slaves[$i].butt < 5) && (random(1,100) > 75/_rearQurk))>> $His rear @@.lime;rounds out@@ to fit $his developing femininity. <<set $slaves[$i].butt += 1>> <</if>> diff --git a/src/uncategorized/saDrugs.tw b/src/uncategorized/saDrugs.tw index d15b4c9db3c9e330b7a3c65efc68546ac3bbe6a3..4192f96d9cdf21bd53e2c11713c0d1ab1eb57d33 100644 --- a/src/uncategorized/saDrugs.tw +++ b/src/uncategorized/saDrugs.tw @@ -248,6 +248,7 @@ <<case "butt injections" "intensive butt injections">> <<set _growth = 1+$injectionUpgrade>> + <<set _rearQuirk = $slaves[$i].geneticQuirks.rearLipedema == 2 ? 1 : 0>> $He receives @@.lime; <<if _intensive>> massive @@ -286,18 +287,26 @@ big behind tends to grow readily. <<set _growth += 2>> <<elseif $slaves[$i].butt < 6>> - massive ass tend to grow slowly. + massive ass tends to grow slowly. <<set _growth++>> <<else>> monstrous cheeks tend to grow very slowly. <</if>> + <<if _rearQuirk != 0>> + <<set _growth += 3>> + <<if $geneticMappingUpgrade == 1>> + $His rear lipedema amplifies the drug's effects on $his bottom. + <<else>> + The drugs seem to have an added effect on $him. + <</if>> + <</if>> <<set _growth*=0.2>> <<if $slaves[$i].geneMods.NCS == 1>> <<set _growth = Math.trunc(_growth/2.2)>> $His @@.orange;NCS@@ kicks in fighting the butt growth<<if _growth > 1>>, converting the excess fat into sexual energy for $him<<else>> and no change happens<</if>>. <<set $slaves[$i].energy += _growth>> <</if>> - <<set $slaves[$i].butt += Math.clamp(_growth,0,2)>> + <<set $slaves[$i].butt += Math.clamp(_growth,0,2+_rearQuirk)>> <<if $slaves[$i].geneMods.rapidCellGrowth != 1>> <<if _intensive>> <<if $slaves[$i].anus > 1>> @@ -314,6 +323,7 @@ <<case "hyper butt injections">> <<set $slaves[$i].chem += 2>> + <<set _rearQuirk = $slaves[$i].geneticQuirks.rearLipedema == 2 ? 1 : 0>> <<set _growth = .5>> $He receives @@.lime;direct injections of <<if ($injectionUpgrade != 0)>> advanced<</if>> hyper growth hormones, right into $his buttocks;@@ <<if ($slaves[$i].diet == "fattening")>> @@ -355,6 +365,14 @@ inhuman cheeks tend to grow slowly. <<set _growth += .4>> <</if>> + <<if _rearQuirk != 0>> + <<set _growth += 1>> + <<if $geneticMappingUpgrade == 1>> + $His rear lipedema massively amplifies the drug's effects. + <<else>> + The drugs seem to have an added effect on $him. + <</if>> + <</if>> <<if $slaves[$i].geneMods.NCS == 1>> <<set _growth = Math.trunc(_growth/2.2)>> $His @@.orange;NCS@@ kicks in fighting the butt growth<<if _growth > 1>>, converting the excess fat into sexual energy for $him<<else>> and no change happens<</if>>. @@ -1028,13 +1046,23 @@ <<set $slaves[$i].boobs -= 100*_factor>> <<case "butt redistributors">> - $He receives @@.lime;direct injections of fat redistributors right into $his buttocks,@@ causing $his body to begin moving fatty tissue from it to $his core<<if $slaves[$i].geneMods.NCS == 1>>, $his @@.orange;NCS@@ amplifies the effectiveness<</if>>. + <<set _rearQuirk = $slaves[$i].geneticQuirks.rearLipedema == 2 ? 1 : 0>> + $He receives @@.lime;direct injections of fat redistributors right into $his buttocks,@@ causing $his body to begin moving fatty tissue from it to $his core<<if $slaves[$i].geneMods.NCS == 1 && _rearQuirk != 1>>, $his @@.orange;NCS@@ amplifies the effectiveness<</if>>. <<if ($slaves[$i].butt-$slaves[$i].buttImplant) <= 0>> $His natural ass flesh is now so thin that further drug use will fail to shrink it further; @@.yellow;$his drug regimen has been ended.@@ <<set $slaves[$i].drugs = "no drugs">> <<elseif ($slaves[$i].weight >= 200)>> $He is now so immensely obese $his health is greatly at risk; @@.yellow;$his drug regimen has been ended.@@ <<set $slaves[$i].drugs = "no drugs">> + <<elseif _rearQuirk == 2>> + $His @@.orange;waistline swells slightly,@@ but @@.lime;$his butt barely loses any mass@@ + <<if $geneticMappingUpgrade == 1>> + due to $his rear lipedema putting it right back. + <<else>> + for an unknown reason. + <</if>> + <<set $slaves[$i].butt -= .2>> + <<set $slaves[$i].weight += 5>> <<elseif ($slaves[$i].butt-$slaves[$i].buttImplant) >= 15>> @@.lime;$His butt shrinks painfully,@@ becoming massively smaller while $his @@.orange;waistline swells tremendously.@@ <<set $slaves[$i].butt -= 2>> @@ -1048,6 +1076,7 @@ <<set $slaves[$i].butt -= 1>> <<set $slaves[$i].weight += 10>> <</if>> + <<set $slaves[$i].butt = Math.clamp($slaves[$i].butt,0,20)>> <<case "sag-B-gone">> <<if $slaves[$i].assignment == "be your concubine">> @@ -1301,7 +1330,7 @@ <<case "butt injections" "intensive butt injections">> <<if ($slaves[$i].butt >= 10)>> $His ass is now so huge that further A-HGH treatment will not increase its size. @@.yellow;$His drug regimen has been ended.@@ - <<set $slaves[$i].butt = Math.clamp($slaves[$i].butt,0,10), $slaves[$i].drugs = "no drugs">> + <<set $slaves[$i].butt = Math.clamp($slaves[$i].butt,0,20), $slaves[$i].drugs = "no drugs">> <</if>> <<case "hyper butt injections">> <<if $slaves[$i].butt >= 20>> diff --git a/src/uncategorized/saHormoneEffects.tw b/src/uncategorized/saHormoneEffects.tw index a312b69e5e27dc4ca58658ac575785f81c36a451..b5acc52a0ebf251abe13ea008a38bb185ea9687c 100644 --- a/src/uncategorized/saHormoneEffects.tw +++ b/src/uncategorized/saHormoneEffects.tw @@ -71,6 +71,9 @@ <</if>> <</if>> +/* quirk modifiers */ +<<set _rearQuirk = $slaves[$i].geneticQuirks.rearLipedema == 2 ? 2 : 0>> + <<if $slaves[$i].physicalAge >= 18 || $loliGrow == 1 || $slaves[$i].geneMods.NCS == 1>> <<if Math.abs($slaves[$i].hormoneBalance) >= 50>> @@ -137,7 +140,7 @@ Hormonal effects cause $his tiny @@.lime;nipples to grow to a more normal size.@@ <<set $slaves[$i].nipples = "cute">> <</if>> - <<if ($slaves[$i].butt-$slaves[$i].buttImplant) < 4>> + <<if ($slaves[$i].butt-$slaves[$i].buttImplant) < 4*_rearQuirk>> Hormonal effects cause @@.lime;the natural size of $his butt to increase.@@ <<set $slaves[$i].butt++>> <</if>> @@ -238,7 +241,7 @@ Hormonal effects cause $his tiny @@.lime;nipples to grow to a more normal size.@@ <<set $slaves[$i].nipples = "cute">> <</if>> - <<if ($slaves[$i].butt-$slaves[$i].buttImplant) < 4>> + <<if ($slaves[$i].butt-$slaves[$i].buttImplant) < 4*_rearQuirk>> Hormonal effects cause @@.lime;the natural size of $his butt to increase.@@ <<set $slaves[$i].butt++>> <</if>> @@ -338,7 +341,7 @@ Hormonal effects cause $his tiny @@.lime;nipples to grow to a more normal size.@@ <<set $slaves[$i].nipples = "cute">> <</if>> - <<if ($slaves[$i].butt-$slaves[$i].buttImplant) < 3>> + <<if ($slaves[$i].butt-$slaves[$i].buttImplant) < 3*_rearQuirk>> Hormonal effects cause @@.lime;the natural size of $his butt to increase.@@ <<set $slaves[$i].butt++>> <</if>> @@ -435,7 +438,7 @@ Hormonal effects cause $his tiny @@.lime;nipples to grow to a more normal size.@@ <<set $slaves[$i].nipples = "cute">> <</if>> - <<if ($slaves[$i].butt-$slaves[$i].buttImplant) < 2>> + <<if ($slaves[$i].butt-$slaves[$i].buttImplant) < 2*_rearQuirk>> Hormonal effects cause @@.lime;the natural size of $his butt to increase.@@ <<set $slaves[$i].butt++>> <</if>> @@ -558,7 +561,7 @@ <</if>> <<if ($hormoneUpgradeShrinkage == 0)>> - <<if (($slaves[$i].butt-$slaves[$i].buttImplant) > 1)>> + <<if (($slaves[$i].butt-$slaves[$i].buttImplant) > 1) && _rearQuirk != 2>> <<if (($slaves[$i].geneMods.NCS == 1) && (random(1,100) > 50) && ($slaves[$i].butt > 2))>> Hormonal effects work with $his @@.orange;NCS@@ and cause @@.orange;$his butt to decrease a lot.@@ <<set $slaves[$i].butt -= 1>> @@ -645,7 +648,7 @@ <</if>> <<if ($hormoneUpgradeShrinkage == 0)>> - <<if (($slaves[$i].butt-$slaves[$i].buttImplant) > 1)>> + <<if (($slaves[$i].butt-$slaves[$i].buttImplant) > 1) && _rearQuirk != 2>> <<if (($slaves[$i].geneMods.NCS == 1) && (random(1,100) > 50) && ($slaves[$i].butt > 2))>> Hormonal effects work with $his @@.orange;NCS@@ and cause @@.orange;$his butt to decrease a lot.@@ <<set $slaves[$i].butt -= 1>> @@ -729,7 +732,7 @@ <</if>> <<if ($hormoneUpgradeShrinkage == 0)>> - <<if (($slaves[$i].butt-$slaves[$i].buttImplant) > 2)>> + <<if (($slaves[$i].butt-$slaves[$i].buttImplant) > 2) && _rearQuirk != 2>> <<if (($slaves[$i].geneMods.NCS == 1) && (random(1,100) > 50))>> Hormonal effects work with $his @@.orange;NCS@@ and cause @@.orange;$his butt to decrease a lot.@@ <<set $slaves[$i].butt -= 1>> @@ -813,7 +816,7 @@ <</if>> <<if ($hormoneUpgradeShrinkage == 0)>> - <<if (($slaves[$i].butt-$slaves[$i].buttImplant) > 3)>> + <<if (($slaves[$i].butt-$slaves[$i].buttImplant) > 3) && _rearQuirk != 2>> <<if (($slaves[$i].geneMods.NCS == 1) && (random(1,100) > 50))>> Hormonal effects work with $his @@.orange;NCS@@ and cause @@.orange;$his butt to decrease a lot.@@ <<set $slaves[$i].butt -= 1>> @@ -891,7 +894,7 @@ <</if>> <<if ($hormoneUpgradeShrinkage == 0)>> - <<if (($slaves[$i].butt-$slaves[$i].buttImplant) > 4)>> + <<if (($slaves[$i].butt-$slaves[$i].buttImplant) > 4) && _rearQuirk != 2>> <<if (($slaves[$i].geneMods.NCS == 1) && (random(1,100) > 50))>> Hormonal effects work with $his @@.orange;NCS@@ and cause @@.orange;$his butt to decrease a lot.@@ <<set $slaves[$i].butt -= 1>> diff --git a/src/uncategorized/saLongTermEffects.tw b/src/uncategorized/saLongTermEffects.tw index 08166af9ce9b819b48bca70ad53ea4492c2f8ebb..fc5f1a0be71fa9a8ae0d4626ca62bb1588d4a3e7 100644 --- a/src/uncategorized/saLongTermEffects.tw +++ b/src/uncategorized/saLongTermEffects.tw @@ -9,6 +9,7 @@ <</if>> <<set _para = 0>> <<if $slaves[$i].aphrodisiacs === -1>><<set _oldEnergy = $slaves[$i].energy, _maxEnergyGain = Math.round((75 - _oldEnergy)/9.3)>><</if>> +<<set _rearQuirk = $slaves[$i].geneticQuirks.rearLipedema == 2 ? 2 : 0>> <<if $slaves[$i].fuckdoll > 0>> <<if $slaves[$i].fuckdoll >= 100>> @@ -3233,7 +3234,7 @@ <<if ($slaves[$i].buttImplantType == 1)>> $His string implants absorb fluid @@.lime;slowly swelling $his ass.@@ <<set $slaves[$i].buttImplant += .25, $slaves[$i].butt += .25>> - <<if ($slaves[$i].butt > 10)>> + <<if ($slaves[$i].butt+$slaves[$i].buttImplant > 10 && $slaves[$i].buttImplant > 1)>> Since it as large as $his body can handle, some serum is drained from them. <<set $slaves[$i].butt -= 1, $slaves[$i].buttImplant -= 1>> <</if>> @@ -3298,7 +3299,7 @@ <<if ($slaves[$i].vagina > -1) && ($slaves[$i].ovaries != 0) && ($slaves[$i].vaginaLube < 2)>> <<set _Effects.push("VaginaWetter")>> <</if>> - <<if (($slaves[$i].butt-$slaves[$i].buttImplant) < 2) && (($slaves[$i].geneMods.NCS == 0) || (random(1,100) > 75))>> + <<if (($slaves[$i].butt-$slaves[$i].buttImplant) < 2*_rearQuirk) && (($slaves[$i].geneMods.NCS == 0) || (random(1,100) > 75/_rearQuirk))>> <<set _Effects.push("ButtBigger")>> <</if>> <<if (($slaves[$i].boobs-$slaves[$i].boobsImplant) < 500) && (($slaves[$i].geneMods.NCS == 0) || (random(1,100) > 75))>> @@ -3621,7 +3622,7 @@ $He feels @@.lime;strange minor pains@@ in $his pelvis. <<set $slaves[$i].hips += 1>> <</if>> - <<if ($slaves[$i].butt < 4) && (random(1,100) < 10)>> + <<if ($slaves[$i].butt < 4) && (random(1,100) < 10*_rearQuirk)>> $He feels a @@.lime;strange weight@@ on $his rear. <<set $slaves[$i].butt += 1>> <</if>> @@ -3718,7 +3719,7 @@ $He feels @@.lime;strange minor pains@@ in $his pelvis. <<set $slaves[$i].hips += 1>> <</if>> - <<if ($slaves[$i].butt < 4) && (random(1,100) < 10)>> + <<if ($slaves[$i].butt < 4) && (random(1,100) < 10*_rearQuirk)>> $He feels a @@.lime;strange weight@@ to $his rear. <<set $slaves[$i].butt += 1>> <</if>> @@ -6131,13 +6132,13 @@ <<if $slaves[$i].boobs-$slaves[$i].boobsImplant-$slaves[$i].boobsMilk > 750>> $His desperately underweight body @@.orange;burns fat off $his plush boobs.@@ <<set $slaves[$i].boobs -= 50>> - <<elseif $slaves[$i].butt-$slaves[$i].buttImplant > 3>> + <<elseif $slaves[$i].butt-$slaves[$i].buttImplant > 3 && _rearQuirk != 2>> $His desperately underweight body @@.orange;burns fat off $his plush butt.@@ <<set $slaves[$i].butt -= 0.4>> <<elseif $slaves[$i].boobs-$slaves[$i].boobsImplant-$slaves[$i].boobsMilk > 500>> $His desperately underweight body @@.orange;burns some fat off $his healthy boobs.@@ <<set $slaves[$i].boobs -= 25>> - <<elseif $slaves[$i].butt-$slaves[$i].buttImplant > 2>> + <<elseif $slaves[$i].butt-$slaves[$i].buttImplant > 2 && _rearQuirk != 2>> $His desperately underweight body @@.orange;burns some fat off $his healthy butt.@@ <<set $slaves[$i].butt -= 0.2>> <</if>> @@ -6145,13 +6146,13 @@ <<if $slaves[$i].boobs-$slaves[$i].boobsImplant-$slaves[$i].boobsMilk > 1000>> $His underweight body @@.orange;burns fat off $his big boobs.@@ <<set $slaves[$i].boobs -= 50>> - <<elseif $slaves[$i].butt-$slaves[$i].buttImplant > 4>> + <<elseif $slaves[$i].butt-$slaves[$i].buttImplant > 4 && _rearQuirk != 2>> $His underweight body @@.orange;burns fat off $his big butt.@@ <<set $slaves[$i].butt -= 0.4>> <<elseif $slaves[$i].boobs-$slaves[$i].boobsImplant-$slaves[$i].boobsMilk > 750>> $His underweight body @@.orange;burns some fat off $his plush boobs.@@ <<set $slaves[$i].boobs -= 25>> - <<elseif $slaves[$i].butt-$slaves[$i].buttImplant > 3>> + <<elseif $slaves[$i].butt-$slaves[$i].buttImplant > 3 && _rearQuirk != 2>> $His underweight body @@.orange;burns some fat off $his plush butt.@@ <<set $slaves[$i].butt -= 0.2>> <</if>> @@ -6159,13 +6160,13 @@ <<if $slaves[$i].boobs-$slaves[$i].boobsImplant-$slaves[$i].boobsMilk > 2000>> $His skinny body @@.orange;burns fat off $his huge boobs.@@ <<set $slaves[$i].boobs -= 50>> - <<elseif $slaves[$i].butt-$slaves[$i].buttImplant > 6>> + <<elseif $slaves[$i].butt-$slaves[$i].buttImplant > 6 && _rearQuirk != 2>> $His skinny body @@.orange;burns fat off $his huge butt.@@ <<set $slaves[$i].butt -= 0.4>> <<elseif $slaves[$i].boobs-$slaves[$i].boobsImplant-$slaves[$i].boobsMilk > 1000>> $His skinny body @@.orange;burns some fat off $his big boobs.@@ <<set $slaves[$i].boobs -= 25>> - <<elseif $slaves[$i].butt-$slaves[$i].buttImplant > 4>> + <<elseif $slaves[$i].butt-$slaves[$i].buttImplant > 4 && _rearQuirk != 2>> $His skinny body @@.orange;burns some fat off $his big butt.@@ <<set $slaves[$i].butt -= 0.2>> <</if>> @@ -6173,13 +6174,13 @@ <<if $slaves[$i].boobs-$slaves[$i].boobsImplant-$slaves[$i].boobsMilk > 5000>> $His thin body @@.orange;burns fat off $his monstrous boobs.@@ <<set $slaves[$i].boobs -= 50>> - <<elseif $slaves[$i].butt-$slaves[$i].buttImplant > 8>> + <<elseif $slaves[$i].butt-$slaves[$i].buttImplant > 8 && _rearQuirk != 2>> $His thin body @@.orange;burns fat off $his monstrous butt.@@ <<set $slaves[$i].butt -= 0.4>> <<elseif $slaves[$i].boobs-$slaves[$i].boobsImplant-$slaves[$i].boobsMilk > 2000>> $His thin body @@.orange;burns some fat off $his huge boobs.@@ <<set $slaves[$i].boobs -= 25>> - <<elseif $slaves[$i].butt-$slaves[$i].buttImplant > 6>> + <<elseif $slaves[$i].butt-$slaves[$i].buttImplant > 6 && _rearQuirk != 2>> $His thin body @@.orange;burns some fat off $his huge butt.@@ <<set $slaves[$i].butt -= 0.2>> <</if>> @@ -6719,6 +6720,13 @@ <</if>> <</if>> +<<if $slaves[$i].geneticQuirks.rearLipedema == 2 && $slaves[$i].butt < 20>> + <<if $geneticMappingUpgrade == 1>> + $His body @@.lime;continues to lay fat on $his rear@@ due to $his lipedema. + <</if>> + <<set $slaves[$i].butt += .1>> +<</if>> + <<if $slaves[$i].fuckdoll == 0>> <<if !canWalk($slaves[$i])>> $He is immobilized by $his diff --git a/src/uncategorized/scheduledEvent.tw b/src/uncategorized/scheduledEvent.tw index a5ff872bf75c5a02d8223040cba450b2c2f8c5b4..90e2ce03355add5694f8191d536c676de951caab 100644 --- a/src/uncategorized/scheduledEvent.tw +++ b/src/uncategorized/scheduledEvent.tw @@ -161,7 +161,7 @@ <<goto "SE recruiter success">> <<elseif ($customSlaveOrdered == 1)>> <<goto "SE custom slave delivery">> -<<elseif ($JFCOrder == 1)>> +<<elseif ($JFCOrder == 1 && $JFCReorder != 1)>> <<goto "JobFulfillmentCenterDelivery">> <<elseif ($huskSlaveOrdered == 1)>> <<goto "SE husk slave delivery">> @@ -211,5 +211,6 @@ <<set $nicaeaAchievement = either("devotion", "slaves", "trust")>> <<goto "SE nicaea council">> <<else>> + <<run delete $JFCReorder>> <<goto "Nonrandom Event">> <</if>> diff --git a/src/uncategorized/seWeddingDouble.tw b/src/uncategorized/seWeddingDouble.tw index a12b1e11563b64cbf4efdcd5fa7814006b5f87e0..1c5a0ff8226028c19614cd7a24f053f59aafc0a1 100644 --- a/src/uncategorized/seWeddingDouble.tw +++ b/src/uncategorized/seWeddingDouble.tw @@ -168,7 +168,7 @@ <</if>> <<elseif _slave1.relationship == 3>> fucking $his lover, $slaves[_m].slaveName, as often as possible while ignoring you. - <<if !isAvailable(_slave1)>> + <<if !isSlaveAvailable(_slave1)>> Or $he would have, if $he were able. <<elseif !isSlaveAvailable($slaves[_m])>> Or $he would have, if _he2 were around. @@ -428,7 +428,7 @@ <</if>> <<elseif _slave2.relationship == 3>> fucking $his lover, $slaves[_n].slaveName, as often as possible while ignoring you. - <<if !isAvailable(_slave2)>> + <<if !isSlaveAvailable(_slave2)>> Or $he would have, if $he were able. <<elseif !isSlaveAvailable($slaves[_n])>> Or $he would have, if _he2 were around. diff --git a/src/uncategorized/seWeddingSingle.tw b/src/uncategorized/seWeddingSingle.tw index ebe83f89f8c18a4382975d2eb4013fdd2e838015..c2242ff398e8df1b43882a858d435f2c81c95761 100644 --- a/src/uncategorized/seWeddingSingle.tw +++ b/src/uncategorized/seWeddingSingle.tw @@ -151,7 +151,7 @@ In the days leading up to your wedding, $slaves[_wedS].slaveName spent $his time <</if>> <<elseif $slaves[_wedS].relationship == 3>> fucking $his lover, $slaves[_m].slaveName, as often as possible while ignoring you. - <<if !isAvailable($slaves[_wedS])>> + <<if !isSlaveAvailable($slaves[_wedS])>> Or $he would have, if $he were able. <<elseif !isSlaveAvailable($slaves[_m])>> Or $he would have, if _he2 were around.