From 721d3c1a9e63157cdad6832ae14fc021d6a22a19 Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Wed, 22 May 2019 23:30:49 -0400
Subject: [PATCH] fix + quirk work
---
src/js/generateGenetics.js | 2 ++
src/uncategorized/bodyModification.tw | 2 +-
src/uncategorized/dairyReport.tw | 6 +++---
src/uncategorized/saHormoneEffects.tw | 26 +++++++++++++-------------
4 files changed, 19 insertions(+), 17 deletions(-)
diff --git a/src/js/generateGenetics.js b/src/js/generateGenetics.js
index f953280591d..16c9f42679e 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 c7e4aabbc32..41259601c2e 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 2fc3c52ec65..37a88adb83b 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 13732b9f6de..3d5e992144f 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)>>
--
GitLab