diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt index 2954d6e4077b07eb2850aedc08477caa006cf777..35456f92709e5bd2bbc0e5ce3b000395ba3e0ef4 100644 --- a/devNotes/VersionChangeLog-Premod+LoliMod.txt +++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt @@ -8,6 +8,7 @@ -tweaked saGuardsYou to actually count facility heads the BG has trained when it comes to counting successors -your BG nows considers servants and your harem in her count -a race now no longer be both superior and inferior + -slaves can now die of age as young as 50 should they be in bad condition 386 -tweaked childgen to only random face and int for playerXmarked if the child is below the minimum value diff --git a/src/pregmod/widgets/deathWidgets.tw b/src/pregmod/widgets/deathWidgets.tw index e0589f33c4b71c2a3c409f27e7dc240cefc0db0e..c7f8b4e386794e200a5d90a91062292bd292cb5d 100644 --- a/src/pregmod/widgets/deathWidgets.tw +++ b/src/pregmod/widgets/deathWidgets.tw @@ -20,11 +20,11 @@ As $args[0].slaveName is going about her business with her overfilled $args[0].i <<widget "DeathOldAge">> <<SlavePronouns $args[0]>> <<if $args[0].assignment == "be confined in the arcade">> - You are notified by $arcadeName staff that one of the cabinets has broken down and will need to be replaced. It would seem ''@@.pink;$args[0].slaveName@@'', the fucktoy encased in it, died naturally of old age despite $possessive living conditions. $pronounCap was a good unit; logs show $pronoun was taking dick up until the very end. + You are notified by $arcadeName staff that one of the cabinets has broken down and will need to be replaced. It would seem ''@@.pink;$args[0].slaveName@@'', the fucktoy encased in it, died <<if $args[0].physicalAge >= 70>>naturally of old age despite<<else>>suddenly, unrelated to<</if>> $possessive living conditions. $pronounCap was a good unit; logs show $pronoun was taking dick up until the very end. <<elseif $args[0].assignment == "work in the dairy" && $dairyRestraintsSetting > 1>> - You are notified by $dairyName staff that one of the occupied milkers has ceased producing. Upon inspection, it would seem ''@@.pink;$args[0].slaveName@@'', the cow restrained in it, died naturally of old age despite $possessive living conditions. $pronounCap was a good cow; $pronoun gave milk up until $possessive death. + You are notified by $dairyName staff that one of the occupied milkers has ceased producing. Upon inspection, it would seem ''@@.pink;$args[0].slaveName@@'', the cow restrained in it, died <<if $args[0].physicalAge >= 70>>naturally of old age despite<<else>>suddenly, unrelated to<</if>> $possessive living conditions. $pronounCap was a good cow; $pronoun gave milk up until $possessive death. <<elseif $args[0].fuckdoll > 0>> - One of your fuckdoll's monitoring systems alerts you that the slave contained within has died. It would seem ''@@.pink;$args[0].slaveName@@'' has died naturally of old age despite $possessive living conditions. Thankfully the suit notifies its owner of such things; especially with the rumors of earlier models and necrophilia you hear occasionally. + One of your fuckdoll's monitoring systems alerts you that the slave contained within has died. It would seem ''@@.pink;$args[0].slaveName@@'' has died <<if $args[0].physicalAge >= 70>>naturally of old age despite<<else>>suddenly, unrelated to<</if>> $possessive living conditions. Thankfully the suit notifies its owner of such things; especially with the rumors of earlier models and necrophilia you hear occasionally. <<else>> ''@@.pink;$args[0].slaveName@@'' failed to report in for a routine inspection, something that rarely occurs under your watch. It doesn't take long to track down the wayward slave. <<set _deathSeed = random(1,100)>> diff --git a/src/uncategorized/saLongTermEffects.tw b/src/uncategorized/saLongTermEffects.tw index a4b2e5348223c9385e3f95c84f25d903814ea5c7..a24bb573eb75e23672bddfa0880e1cb181426d8f 100644 --- a/src/uncategorized/saLongTermEffects.tw +++ b/src/uncategorized/saLongTermEffects.tw @@ -7401,7 +7401,7 @@ <</if>> <<if $seeAge == 1>> <<set _deathSeed = (($slaves[$i].health*2)-($slaves[$i].physicalAge*2)-($slaves[$i].chem*4)-($slaves[$i].addict*3))>> - <<if $slaves[$i].physicalAge >= 90 && random(1,1000) > 800+_deathSeed>> + <<if $slaves[$i].physicalAge >= Math.max((70+($slaves[$i].health/5)-($slaves[$i].addict)-($slaves[$i].chem/20)),50) && random(1,1000) > 800+_deathSeed>> <<set $slaves[$i].death = "old">> <<set $slaveDeath = 1>> <</if>>