diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt index f0352b4654b948bb536554b9e6ac773b5636421d..55136168766d6ec1f95eb9c95f176e4e65770dec 100644 --- a/devNotes/VersionChangeLog-Premod+LoliMod.txt +++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt @@ -4591,4 +4591,8 @@ Pregmod 0.10.3.0 123 -some fixes - -more RESS work \ No newline at end of file + -more RESS work + + 124 + -fixes + -dairy diet changes \ No newline at end of file diff --git a/src/init/storyInit.tw b/src/init/storyInit.tw index 53fd7319e088c86b2fc698fc677008a39d04ac7c..335a8c9eae3bbbb853c1636b46b05a6f4a830a84 100644 --- a/src/init/storyInit.tw +++ b/src/init/storyInit.tw @@ -408,6 +408,7 @@ DairyRestraintsSetting($dairyRestraintsSetting) <<set $dairySlimMaintainUpgrade = 0>> <<set $dairySlimMaintain = 0>> <<set $dairyHyperPregRemodel = 0>> +<<set $dairyWeightSetting = 0>> <<set $dairyUpgradeMenials = 0>> <<set $createBioreactors = 0>> <<set $bioreactorsAnnounced = 0>> diff --git a/src/npc/startingGirls/startingGirls.tw b/src/npc/startingGirls/startingGirls.tw index ca2d3b342db3c5bc1d23da6a3e5816395cbaa79c..10719fa46e69f8c5941b77aa6bec6fd8fd367dab 100644 --- a/src/npc/startingGirls/startingGirls.tw +++ b/src/npc/startingGirls/startingGirls.tw @@ -350,6 +350,7 @@ __You are customizing this slave:__ <<set $activeSlave.boobs = Math.clamp(Math.trunc($activeSlave.boobs/50)*50, 0, 50000) || 200>> <<set $activeSlave.visualAge = $activeSlave.actualAge>> <<set $activeSlave.physicalAge = $activeSlave.actualAge>> +<<set $activeSlave.ovaryAge = $activeSlave.actualAge>> <<set $activeSlave.canRecruit = 0>> <span id="slaveinfo"> diff --git a/src/uncategorized/BackwardsCompatibility.tw b/src/uncategorized/BackwardsCompatibility.tw index 0fcedc6536558802220944c8838aea63aaefddda..a3e76a55d43df64039e611873d2ad0b6a6bd632c 100644 --- a/src/uncategorized/BackwardsCompatibility.tw +++ b/src/uncategorized/BackwardsCompatibility.tw @@ -419,6 +419,9 @@ <<if ndef $dairyHyperPregRemodel>> <<set $dairyHyperPregRemodel = 0>> <</if>> +<<if ndef $dairyWeightSetting>> + <<set $dairyWeightSetting = 0>> +<</if>> <<if ndef $clubAdsPreg>> <<set $clubAdsPreg = 0>> <</if>> diff --git a/src/uncategorized/dairy.tw b/src/uncategorized/dairy.tw index 166b57d2109f6911f506a73b9569408a5b5184ce..b8199f87167d10b593f2669d85f2e7cb601aa8cb 100644 --- a/src/uncategorized/dairy.tw +++ b/src/uncategorized/dairy.tw @@ -427,6 +427,21 @@ $dairyNameCaps <</if>> <</if>> +<br> +<<if $dairyWeightSetting == 0>> + $dairyNameCaps is keeping cows at least chubby. [[Increase Weight Target|Dairy][$dairyWeightSetting = 1]] | [[Disable Dietary Control|Dairy][$dairyWeightSetting = -1]] +<<elseif $dairyWeightSetting == 1>> + $dairyNameCaps aims to keep cows overweight. [[Increase Weight Target|Dairy][$dairyWeightSetting = 2]] | [[Decrease Weight Target|Dairy][$dairyWeightSetting = 0]] | [[Disable Dietary Control|Dairy][$dairyWeightSetting = -1]] +<<elseif $dairyWeightSetting == 2>> + $dairyNameCaps aims to keep cows fat. [[Increase Weight Target|Dairy][$dairyWeightSetting = 3]] | [[Decrease Weight Target|Dairy][$dairyWeightSetting = 1]] | [[Disable Dietary Control|Dairy][$dairyWeightSetting = -1]] +<<elseif $dairyWeightSetting == 3>> + $dairyNameCaps aims to keep cows very fat. [[Increase Weight Target|Dairy][$dairyWeightSetting = 4]] | [[Decrease Weight Target|Dairy][$dairyWeightSetting = 2]] | [[Disable Dietary Control|Dairy][$dairyWeightSetting = -1]] +<<elseif $dairyWeightSetting == 4>> + $dairyNameCaps aims to keep cows so fat they can barely move. [[Decrease Weight Target|Dairy][$dairyWeightSetting = 3]] | [[Disable Dietary Control|Dairy][$dairyWeightSetting = -1]] +<<else>> + $dairyNameCaps is currently not monitoring slave diets and will allow you full control. [[Enable Dietary Control|Dairy][$dairyWeightSetting = 0]] +<</if>> <<if $dairySlimMaintainUpgrade == 1 || $arcologies[0].FSSlimnessEnthusiast > 20>> //NOTE: Slimness controls will override all weight settings//<</if>> + <<if $arcologies[0].FSPaternalist == "unset">> <br> <<if $dairyUpgradeMenials == 1>> diff --git a/src/uncategorized/dairyReport.tw b/src/uncategorized/dairyReport.tw index a1257918cefac990f662bed4e6dbe533891a11de..d939cfd6a3e49c96a71a31c080596d75c9efd76f 100644 --- a/src/uncategorized/dairyReport.tw +++ b/src/uncategorized/dairyReport.tw @@ -280,9 +280,43 @@ <</if>> /* Perform facility based rule changes */ - <<if ($dairySlimMaintain == 0) && ($slaves[$i].weight <= 30)>> - <<set $slaves[$i].diet = "fattening">> - <<elseif ($slaves[$i].diet == "fattening") || ($dairyRestraintsSetting > 1)>> + <<if ($dairySlimMaintain == 0)>> + <<if $dairyWeightSetting == 0>> + <<if $slaves[$i].weight <= 30>> + <<set $slaves[$i].diet = "fattening">> + <<else>> + <<set $slaves[$i].diet = "healthy">> + <</if>> + <<elseif $dairyWeightSetting == 1>> + <<if $slaves[$i].weight <= 95>> + <<set $slaves[$i].diet = "fattening">> + <<else>> + <<set $slaves[$i].diet = "healthy">> + <</if>> + <<elseif $dairyWeightSetting == 2>> + <<if $slaves[$i].weight <= 130>> + <<set $slaves[$i].diet = "fattening">> + <<else>> + <<set $slaves[$i].diet = "healthy">> + <</if>> + <<elseif $dairyWeightSetting == 3>> + <<if $slaves[$i].weight <= 160>> + <<set $slaves[$i].diet = "fattening">> + <<else>> + <<set $slaves[$i].diet = "healthy">> + <</if>> + <<elseif $dairyWeightSetting == 4>> + <<if $slaves[$i].weight <= 200>> + <<set $slaves[$i].diet = "fattening">> + <<else>> + <<set $slaves[$i].diet = "healthy">> + <</if>> + <<elseif $dairyRestraintsSetting > 1>> + <<set $slaves[$i].diet = "healthy">> + <</if>> + <<elseif $slaves[$i].weight > 10>> + <<set $slaves[$i].diet = "restricted">> + <<elseif ($slaves[$i].diet == "fattening") || $slaves[$i].diet == "healthy" || ($dairyRestraintsSetting > 1)>> <<set $slaves[$i].diet = "healthy">> <</if>> <<if $dairyRestraintsSetting > 1>> @@ -364,6 +398,8 @@ <<if ($slaves[$i].lactation < 2)>> <<set $slaves[$i].lactation = 2, $slaves[$i].health -= 10, $cash -= $surgeryCost>> <</if>> + <<elseif $slaves[$i].diet == "fattening">> + <<set $slaves[$i].weight += 2>> <</if>> <<if $slaves[$i].prostate == 1>> <<set $slaves[$i].prostate = 2, $slaves[$i].health -= 10, $cash -= $surgeryCost>>