From 8942d44ede995fe412f0eb3522271cc2ef63a384 Mon Sep 17 00:00:00 2001 From: Pregmodder <pregmodder@gmail.com> Date: Thu, 9 May 2019 23:13:37 -0400 Subject: [PATCH] Dwarfism effects on growth stimulants --- devNotes/VersionChangeLog-Premod+LoliMod.txt | 1 + src/uncategorized/saDrugs.tw | 5 ++++- src/uncategorized/slaveInteract.tw | 2 +- src/utility/miscWidgets.tw | 2 +- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt index d3721702f0f..8164570f79a 100644 --- a/devNotes/VersionChangeLog-Premod+LoliMod.txt +++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt @@ -10,6 +10,7 @@ Pregmod -added a drug to force erections -aphrodisiacs counter erectile dysfunction -added birth tracking tattoo + -added event to revive FCNN -breast implants now impact milk production based on % implant -many new names added to lacking name pools -restored chem summary to the clinic diff --git a/src/uncategorized/saDrugs.tw b/src/uncategorized/saDrugs.tw index 86172408479..218934abc84 100644 --- a/src/uncategorized/saDrugs.tw +++ b/src/uncategorized/saDrugs.tw @@ -641,7 +641,7 @@ <</if>> <<if $slaves[$i].physicalAge > $maxGrowthAge>> <<if random(1,6) == 1>> - Since $his body already concluded $his natural growth processes, the treatment @@.red;weakens $his considerably.@@ + Since $his body already concluded $his natural growth processes, the treatment @@.red;weakens $him considerably.@@ <<set $slaves[$i].health -= 15>> <</if>> <</if>> @@ -1368,6 +1368,9 @@ <<switch $slaves[$i].drugs>> <<case "growth stimulants">> <<set _maxHeight = Math.trunc(Math.clamp((Height.mean($slaves[$i]) * 1.25),0,274))>> /*max achievable height is expected height plus 25%*/ + <<if $slaves[$i].geneticQuirks.dwarfism == 2 && $slaves[$i].geneticQuirks.gigantism != 2>> + <<set _maxHeight = Math.min(_maxHeight, 160)>> + <</if>> <<if $slaves[$i].height >= _maxHeight>> $His body has already grown far past $his natural limits; further injections of stimulants will have no effect. @@.yellow;$His drug regimen has been ended.@@ <<set $slaves[$i].height = Math.clamp($slaves[$i].height,0,_maxHeight), $slaves[$i].drugs = "no drugs">> diff --git a/src/uncategorized/slaveInteract.tw b/src/uncategorized/slaveInteract.tw index c3e14c16a22..bd587df7dac 100644 --- a/src/uncategorized/slaveInteract.tw +++ b/src/uncategorized/slaveInteract.tw @@ -1068,7 +1068,7 @@ <</if>> <</if>> <<if $growthStim == 1>> - <<if $activeSlave.height < 274 && $activeSlave.height < Math.clamp((Height.mean($activeSlave) * 1.25),0,274)>> + <<if ($activeSlave.height < 274 || ($activeSlave.height < 160 && $activeSlave.geneticQruirks.dwarfism == 2 && $activeSlave.geneticQruirks.gigantism != 2)) && $activeSlave.height < Math.clamp((Height.mean($activeSlave) * 1.25),0,274)>> | <<link "Growth stimulants">><<set $activeSlave.drugs = "growth stimulants">><<SlaveInteractDrugs>><</link>> <<else>> | Growth stimulants diff --git a/src/utility/miscWidgets.tw b/src/utility/miscWidgets.tw index d525baba949..d6741490e41 100644 --- a/src/utility/miscWidgets.tw +++ b/src/utility/miscWidgets.tw @@ -193,7 +193,7 @@ <</if>> <</if>> <<if $growthStim == 1>> - <<if $activeSlave.height < 274 && $activeSlave.height < Math.clamp((Height.mean($activeSlave) * 1.25),0,274)>> + <<if ($activeSlave.height < 274 || ($activeSlave.height < 160 && $activeSlave.geneticQruirks.dwarfism == 2 && $activeSlave.geneticQruirks.gigantism != 2)) && $activeSlave.height < Math.clamp((Height.mean($activeSlave) * 1.25),0,274)>> | <<link "Growth Stimulants">><<set $activeSlave.drugs = "growth stimulants">><<SlaveInteractDrugs>><</link>> <<else>> | Growth Stimulants -- GitLab