Nursery stuff

src/uncategorized/BackwardsCompatibility.tw

@@ -569,9 +569,6 @@
 <<if ndef $seePreg>>
 	<<set $seePreg = 1>>
 <</if>>
-<<if ndef $dangerousPregancy>>
-	<<set $dangerousPregancy = 1>>
-<</if>>
 <<if ndef $retainCareer>>
 	<<set $retainCareer = 1>>
 <</if>>
@@ -683,6 +680,24 @@
 <<if ndef $boughtFelines>>
 	<<set $boughtFelines = 0>>
 <</if>>
+<<if ndef $defaultCanine>>
+	<<set $defaultCanine = "wolf">>
+<</if>>
+<<if ndef $defaultHooved>>
+	<<set $defaultHooved = "horse">>
+<</if>>
+<<if ndef $defaultFeline>>
+	<<set $defaultFeline = "cougar">>
+<</if>>
+<<if ndef $defaultCaninePlural>>
+	<<set $defaultCaninePlural = "wolves">>
+<</if>>
+<<if ndef $defaultHoovedPlural>>
+	<<set $defaultHoovedPlural = "horses">>
+<</if>>
+<<if ndef $defaultFelinePlural>>
+	<<set $defaultFelinePlural = "cougars">>
+<</if>>
 <<if ndef $activeCanine>>
 	<<set $activeCanine = "wolf">>
 <</if>>
@@ -731,6 +746,21 @@
 <<if ndef $farmyardNameCaps>>
 	<<set $farmyardNameCaps = "The Farmyard">>
 <</if>>
+<<if ndef $nursery>>
+	<<set $nursery = 0>>
+<</if>>
+<<if ndef $nurserySlaves>>
+	<<set $nurserySlaves = 0>>
+<</if>>
+<<if ndef $nurseryBabies>>
+	<<set $nurseryBabies = 0>>
+<</if>>
+<<if ndef $nurseryName>>
+	<<set $nurseryName = "the Nursery">>
+<</if>>
+<<if ndef $nurseryNameCaps>>
+	<<set $nurseryNameCaps = "The Nursery">>
+<</if>>
 <<if ndef $clinicUpgradePurge>>
 	<<set $clinicUpgradePurge = 0>>
 <</if>>
@@ -1920,6 +1950,12 @@ Setting missing global variables:
 <<if ndef $pitBG>>
 	<<set $pitBG = 0>>
 <</if>>
+<<if ndef $pitAnimal>>
+	<<set $pitAnimal = 0>>
+<</if>>
+<<if ndef $pitAnimalType>>
+	<<set $pitAnimalType = 0>>
+<</if>>
 
 <<if ndef $verboseDescriptions>>
 	<<set $verboseDescriptions = 0>>
@@ -2566,9 +2602,6 @@ Setting missing slave variables:
 <<if (_Slave.race == "surgically altered to look mixed race") || (_Slave.race == "surgically altered to look mixed")>>
 	<<set _Slave.race = "mixed race">>
 <</if>>
-<<if ndef _Slave.race>>
-	<<run nationalityToRace(_Slave)>>
-<</if>>
 <<if ndef _Slave.origRace>>
 	<<set _Slave.origRace = _Slave.race>>
 <</if>>
@@ -3409,45 +3442,15 @@ Done!
 	<<set $brothelAdsSpending = 0>>
 <</if>>
 
-<<for _bci = 0; _bci < $defaultRules.length; _bci++>>
-	<<set _rule = $defaultRules[_bci].set>>
-	<<if !([true, false, "no default setting"].includes(_rule.preg))>>
-		<<set _rule.preg = (_rule.preg === -1 ? true : false)>>
-	<</if>>
-	<<if ndef _rule.haircuts>>
-		<<set _rule.haircuts = "no default setting">>
-	<</if>>
-	<<if ndef _rule.label>>
-		<<set _rule.label = "no default setting">>
-	<</if>>
-	<<if ndef _rule.removeLabel>>
-		<<set _rule.removeLabel = "no default setting">>
-	<</if>>
-	<<if ndef _rule.skinColor>>
-		<<set _rule.skinColor = "no default setting">>
-	<</if>>
-	<<if ndef _rule.earwear>>
-		<<set _rule.earwear = "no default setting">>
-	<</if>>
-	<<if ndef _rule.surgery_hears>>
-		<<set _rule.surgery_hears = "no default setting">>
-	<</if>>
-	<<if ndef _rule.surgery_vasectomy>>
-		<<set _rule.surgery_vasectomy = "no default setting">>
-	<</if>>
-	<<if ndef _rule.dietCum>>
-		<<set _rule.dietCum = "no default setting">>
-	<</if>>
-	<<if ndef _rule.dietMilk>>
-		<<set _rule.dietMilk = "no default setting">>
-	<</if>>
-	<<if ndef _rule.toyHole>>
-		<<set _rule.toyHole = "no default setting">>
-	<</if>>
-	<<if ndef _rule.pornFeed>>
-		<<set _rule.pornFeed = "no default setting">>
-	<</if>>
-	<<if ndef _rule.pornFameSpending || _rule.pornFameSpending === -1>>
-		<<set _rule.pornFameSpending = "no default setting">>
-	<</if>>
-<</for>>
+<<run $defaultRules.filter(x => !([true, false, "no default setting"].includes(x.set.preg))).forEach(x => {
+	if (x.set.preg === -1) x.set.preg = true;
+	else x.set.preg = false;
+})>>
+
+<<run $defaultRules.filter(x => x.set.haircuts === undefined).forEach(x => { x.set.haircuts = "no default setting"; })>>
+
+<<run $defaultRules.filter(x => x.set.label === undefined).forEach(x => { x.set.label = "no default setting"; })>>
+
+<<run $defaultRules.filter(x => x.set.removeLabel === undefined).forEach(x => { x.set.removeLabel = "no default setting"; })>>
+
+<<run $defaultRules.filter(x => x.set.skinColour === undefined).forEach(x => { x.set.skinColor = "no default setting"; })>>