diff --git a/src/js/generateGenetics.js b/src/js/generateGenetics.js index f953280591d9970e5a75bd812c3cdf5ba7f6c26c..16c9f42679e95b70d0bf3ad66946a85df73bb1bb 100644 --- a/src/js/generateGenetics.js +++ b/src/js/generateGenetics.js @@ -1549,6 +1549,8 @@ window.generateChild = function(mother, ova, destination) { } } + child.actualAge = 0; + if (genes.clone !== undefined) { child.clone = genes.clone; child.cloneID = genes.cloneID; diff --git a/src/uncategorized/bodyModification.tw b/src/uncategorized/bodyModification.tw index c7e4aabbc3270413146983bd98b017693ab2f151..41259601c2edf7fa9960b637d4e19b8218e4afad 100644 --- a/src/uncategorized/bodyModification.tw +++ b/src/uncategorized/bodyModification.tw @@ -1003,7 +1003,7 @@ Choose a site for branding: <br> -<<if ["neck", "chest", "belly", "pubic mound", "back", "lower back", "penis"].includes($activeSlave.brandLocation)>> +<<if ["neck", "chest", "belly", "pubic mound", "back", "lower back", "penis"].includes($activeSlave.brandTarget)>> [[Brand|Body Modification][$brandApplied = 1,$activeSlave.brand = $brandDesign,$activeSlave.brandLocation = $brandTarget,cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave),$degradation += 10]] with $brandDesign on the $brandTarget. <<else>> Brand $him now with ''$brandDesign'' on the diff --git a/src/uncategorized/dairyReport.tw b/src/uncategorized/dairyReport.tw index 2fc3c52ec65a81687e1016f150049a9c6f22cd24..37a88adb83bd8651ac6f42d3b6fb081b2abaed24 100644 --- a/src/uncategorized/dairyReport.tw +++ b/src/uncategorized/dairyReport.tw @@ -46,7 +46,7 @@ <<if $slaves[_i].trust < 20>> <<set _MMWorkout++>> <</if>> - <<if $slaves[_i].muscles >= 30>> + <<if $slaves[_i].muscles >= 30 || $slaves[_i].muscles < -30>> <<set _MMWorkout++>> <</if>> <<if $slaves[_i].weight >= 70>> @@ -188,7 +188,7 @@ <<set $milkmaidHealthBonus++>> $His muscles help $him handle the fattest or most reluctant cow. <</if>> - <<if (_MMWorkout > random(1,30)) && $Milkmaid.muscles < 60>> + <<if (_MMWorkout > random(1,30-$Milkmaid.geneticQuirks.mLoss+$Milkmaid.geneticQuirks.mGain)) && $Milkmaid.muscles < 60>> Constantly having to wrestle unruly or aiding heavy cows into their stalls forces $him to @@.lime;build muscle.@@ <<set $slaves[_FLs].muscles++>> <</if>> @@ -689,7 +689,7 @@ <<set $slaves[$i].lactationAdaptation += 1>> <</if>> <<if ($slaves[$i].muscles > -100)>> - <<set $slaves[$i].muscles-->> + <<set $slaves[$i].muscles -= 1+$slaves[$i].geneticQuirks.mLoss>> <</if>> <<if ($slaves[$i].fetish == "mindbroken")>> <<if ($slaves[$i].boobs > 48000) && (($slaves[$i].balls >= 10) || ($slaves[$i].balls == 0))>> diff --git a/src/uncategorized/saHormoneEffects.tw b/src/uncategorized/saHormoneEffects.tw index 13732b9f6de8c205ad269dbfe6a1ac9dd6cd8c5b..3d5e992144f6d556d62030635f395dc74e2aa7e2 100644 --- a/src/uncategorized/saHormoneEffects.tw +++ b/src/uncategorized/saHormoneEffects.tw @@ -124,9 +124,9 @@ <<if $slaves[$i].muscles > 10 && $slaves[$i].diet != "muscle building" && $slaves[$i].drugs != "steroids">> Hormonal effects @@.orange;reduce $his musculature.@@ - <<set $slaves[$i].muscles -= 2+$hormoneUpgradePower>> + <<set $slaves[$i].muscles -= 2+$hormoneUpgradePower+$slaves[$i].geneticQuirks.mLoss>> <<if ($slaves[$i].geneMods.NCS == 1) && (random(1,100) > 50)>> - <<set $slaves[$i].muscles -= 2+$hormoneUpgradePower>> + <<set $slaves[$i].muscles -= 2+$hormoneUpgradePower+$slaves[$i].geneticQuirks.mLoss>> <</if>> <</if>> <<if $slaves[$i].waist > -30>> @@ -227,9 +227,9 @@ <<if $slaves[$i].muscles > 30 && $slaves[$i].diet != "muscle building" && $slaves[$i].drugs != "steroids">> Hormonal effects @@.orange;reduce $his musculature.@@ - <<set $slaves[$i].muscles -= 2+$hormoneUpgradePower>> + <<set $slaves[$i].muscles -= 2+$hormoneUpgradePower+$slaves[$i].geneticQuirks.mLoss>> <<if ($slaves[$i].geneMods.NCS == 1) && (random(1,100) > 50)>> - <<set $slaves[$i].muscles -= 2+$hormoneUpgradePower>> + <<set $slaves[$i].muscles -= 2+$hormoneUpgradePower+$slaves[$i].geneticQuirks.mLoss>> <</if>> <</if>> <<if $slaves[$i].waist > -10>> @@ -329,9 +329,9 @@ <<if $slaves[$i].muscles > 30 && $slaves[$i].diet != "muscle building" && $slaves[$i].drugs != "steroids">> Hormonal effects @@.orange;reduce $his musculature.@@ - <<set $slaves[$i].muscles -= 2+$hormoneUpgradePower>> + <<set $slaves[$i].muscles -= 2+$hormoneUpgradePower+$slaves[$i].geneticQuirks.mLoss>> <<if ($slaves[$i].geneMods.NCS == 1) && (random(1,100) > 50)>> - <<set $slaves[$i].muscles -= 2+$hormoneUpgradePower>> + <<set $slaves[$i].muscles -= 2+$hormoneUpgradePower+$slaves[$i].geneticQuirks.mLoss>> <</if>> <</if>> <<if $slaves[$i].waist > 0>> @@ -428,9 +428,9 @@ <<if $slaves[$i].muscles > 30 && $slaves[$i].diet != "muscle building" && $slaves[$i].drugs != "steroids">> Hormonal effects @@.orange;reduce $his musculature.@@ - <<set $slaves[$i].muscles -= 2+$hormoneUpgradePower>> + <<set $slaves[$i].muscles -= 2+$hormoneUpgradePower+$slaves[$i].geneticQuirks.mLoss>> <<if ($slaves[$i].geneMods.NCS == 1) && (random(1,100) > 50)>> - <<set $slaves[$i].muscles -= 2+$hormoneUpgradePower>> + <<set $slaves[$i].muscles -= 2+$hormoneUpgradePower+$slaves[$i].geneticQuirks.mLoss>> <</if>> <</if>> <<if $slaves[$i].waist > 10>> @@ -621,7 +621,7 @@ <<if ($slaves[$i].muscles <= 50) && ($slaves[$i].diet != "slimming")>> Hormonal effects @@.lime;build up $his musculature.@@ - <<set $slaves[$i].muscles += 2+$hormoneUpgradePower>> + <<set $slaves[$i].muscles += 2+$hormoneUpgradePower+$slaves[$i].geneticQuirks.mGain>> <</if>> <<if ($slaves[$i].waist < 80)>> Hormonal effects cause $his @@.orange;waist to broaden.@@ @@ -710,7 +710,7 @@ <<if ($slaves[$i].muscles <= 50) && ($slaves[$i].diet != "slimming")>> Hormonal effects @@.lime;build up $his musculature.@@ - <<set $slaves[$i].muscles += 2+$hormoneUpgradePower>> + <<set $slaves[$i].muscles += 2+$hormoneUpgradePower+$slaves[$i].geneticQuirks.mGain>> <</if>> <<if ($slaves[$i].waist < 40)>> Hormonal effects cause $his @@.orange;waist to broaden.@@ @@ -796,7 +796,7 @@ <<if ($slaves[$i].muscles <= 35) && ($slaves[$i].diet != "slimming")>> Hormonal effects @@.lime;build up $his musculature.@@ - <<set $slaves[$i].muscles += 2+$hormoneUpgradePower>> + <<set $slaves[$i].muscles += 2+$hormoneUpgradePower+$slaves[$i].geneticQuirks.mGain>> <</if>> <<if ($slaves[$i].waist < 25)>> Hormonal effects cause $his @@.orange;waist to broaden.@@ @@ -880,7 +880,7 @@ <<if ($slaves[$i].muscles <= 15) && ($slaves[$i].diet != "slimming")>> Hormonal effects @@.lime;build up $his musculature.@@ - <<set $slaves[$i].muscles += 2+$hormoneUpgradePower>> + <<set $slaves[$i].muscles += 2+$hormoneUpgradePower+$slaves[$i].geneticQuirks.mGain>> <</if>> <<if ($slaves[$i].waist < 9)>> Hormonal effects cause $his @@.orange;waist to broaden.@@ @@ -936,7 +936,7 @@ <<if $slaves[$i].geneMods.NCS == 0>> <<if ($slaves[$i].muscles < 0) && ($slaves[$i].diet != "slimming")>> Hormonal effects @@.lime;build up $his musculature.@@ - <<set $slaves[$i].muscles += 2+$hormoneUpgradePower>> + <<set $slaves[$i].muscles += 2+$hormoneUpgradePower+$slaves[$i].geneticQuirks.mGain>> <</if>> <<if ($slaves[$i].waist < 0)>>