From ff54e0408b7629631c1610b45a5aa32eca308391 Mon Sep 17 00:00:00 2001 From: DCoded <dcoded@live.com> Date: Thu, 20 Dec 2018 23:09:32 -0500 Subject: [PATCH] Moved nursery rules to universal rules --- src/init/storyInit.tw | 3 ++- src/uncategorized/BackwardsCompatibility.tw | 3 +++ src/uncategorized/universalRules.tw | 22 +++++++++++++++------ 3 files changed, 21 insertions(+), 7 deletions(-) diff --git a/src/init/storyInit.tw b/src/init/storyInit.tw index 8ea529adad0..8c8c66258a1 100644 --- a/src/init/storyInit.tw +++ b/src/init/storyInit.tw @@ -569,7 +569,8 @@ DairyRestraintsSetting($dairyRestraintsSetting) <<set $nurseryName = "the Nursery">> <<set $nurseryNameCaps = "The Nursery">> <<set $reservedChildrenNursery = 0>> -<<set $cribs = []>> /* array of children in the nursery */ +<<set $cribs = []>> /* array of children in the nursery */ +<<set $cribsFreed = []>> /* array of children that have been freed */ <<set $childToSlave = -1>> <<set $farmyard = 0>> diff --git a/src/uncategorized/BackwardsCompatibility.tw b/src/uncategorized/BackwardsCompatibility.tw index b8da2e98cec..3cf1492b6e5 100644 --- a/src/uncategorized/BackwardsCompatibility.tw +++ b/src/uncategorized/BackwardsCompatibility.tw @@ -772,6 +772,9 @@ <<if ndef $cribs>> <<set $cribs = []>> <</if>> +<<if ndef $cribsFreed>> + <<set $cribsFreed = []>> +<</if>> <<if ndef $FarmyardiIDs>> <<set $FarmyardiIDs = []>> diff --git a/src/uncategorized/universalRules.tw b/src/uncategorized/universalRules.tw index 43582b1e6b1..7f93c681f8f 100644 --- a/src/uncategorized/universalRules.tw +++ b/src/uncategorized/universalRules.tw @@ -138,9 +138,9 @@ Future society names for new slaves are currently @@.cyan;APPLIED.@@ [[Stop appl //Will lessen medical costs, at the expense of scarring// <</if>> -<br><br> <<if $DefaultBirthDestination === "anywhere">> <<if $arcologies[0].FSRepopulationFocus > 40>> + <br><br> <<if $universalRulesChildrenBecomeBreeders == 1>> Unreserved children ''will be auto-enrolled'' in breeder schools to be raised into fine mothers and fathers. [[Decide children's fate on an individual level|Universal Rules][$universalRulesChildrenBecomeBreeders = 0]] @@ -152,6 +152,7 @@ Future society names for new slaves are currently @@.cyan;APPLIED.@@ [[Stop appl <</if>> <</if>> <<else>> + <br><br> //Option disabled as upon birth slave babies will be sent to $DefaultBirthDestination.// <</if>> @@ -159,15 +160,15 @@ Future society names for new slaves are currently @@.cyan;APPLIED.@@ [[Stop appl <<if $universalRulesChildrenBecomeBreeders < 1>> Upon birth slave babies <<if $DefaultBirthDestination === "anywhere">> - can be sent anywhere. Pre-select their destination a: - [[slave orphanage|Universal Rules][$DefaultBirthDestination = "an orphanage"]] - [[citizen school|Universal Rules][$DefaultBirthDestination = "a citizen school"]] - [[private school|Universal Rules][$DefaultBirthDestination = "a private school"]] + can be sent anywhere. Pre-select their destination: + [[Slave orphanage|Universal Rules][$DefaultBirthDestination = "an orphanage"]] + | [[Citizen school|Universal Rules][$DefaultBirthDestination = "a citizen school"]] + | [[Private school|Universal Rules][$DefaultBirthDestination = "a private school"]] <<if $Cash4Babies > 0>> [[market|Universal Rules][$DefaultBirthDestination = "the market"]] <</if>> <<else>> - will be sent to $DefaultBirthDestination. [[Change your mind.|Universal Rules][$DefaultBirthDestination = "anywhere"]] + will be sent to $DefaultBirthDestination. [[Change your mind|Universal Rules][$DefaultBirthDestination = "anywhere"]] <</if>> <<else>> //Option disabled as unreserved children ''will be auto-enrolled'' in breeder schools.// @@ -192,3 +193,12 @@ Future society names for new slaves are currently @@.cyan;APPLIED.@@ [[Stop appl Your Bodyguard ''is allowed'' to train potential successors. [[Stop training|Universal Rules][$bodyguardTrains = 0]] <</if>> <</if>> + +<<if $nursery > 0>> +<br><br> +<<if $nurserySex == 1>> + $nurseryNameCaps staff are ''allowed'' to molest the children. [[Forbid|Universal Rules][$nurserySex = 0]] +<<else>> + $nurseryNameCaps staff are ''not allowed'' to molest the children. [[Allow|Universal Rules][$nurserySex = 1]] +<</if>> +<</if>> -- GitLab