diff --git a/src/uncategorized/BackwardsCompatibility.tw b/src/uncategorized/BackwardsCompatibility.tw index dccc272fdd465127e8bfeff0583e5da88e0a2a5c..f0fcfdf3772449c30ef7e71cd5f4b7dca3101f30 100644 --- a/src/uncategorized/BackwardsCompatibility.tw +++ b/src/uncategorized/BackwardsCompatibility.tw @@ -11,7 +11,7 @@ <</if>> <<if def $youngCareers>> - <<unset $youngCareers, $educatedCareers, $uneducatedCareers, $gratefulCareers, $menialCareers, $entertainmentCareers, $whoreCareers, $HGCareers, $madamCareers, $DJCareers, $bodyguardCareers, $wardenessCareers, $nurseCareers, $attendantCareers, $milkmaidCareers, $stewardessCareers, $schoolteacherCareers>> + <<unset $youngCareers, $educatedCareers, $uneducatedCareers, $gratefulCareers, $menialCareers, $entertainmentCareers, $whoreCareers, $HGCareers, $madamCareers, $DJCareers, $bodyguardCareers, $wardenessCareers, $nurseCareers, $attendantCareers, $matronCareers, $milkmaidCareers, $stewardessCareers, $schoolteacherCareers>> <<unset $whiteNationalities, $asianNationalities, $latinaNationalities, $middleeasternNationalities, $blackNationalities, $indoaryanNationalities, $pacificislanderNationalities, $malayNationalities, $amerindianNationalities, $southerneuropeanNationalities, $semiticNationalities>> @@ -569,6 +569,9 @@ <<if ndef $seePreg>> <<set $seePreg = 1>> <</if>> +<<if ndef $dangerousPregancy>> + <<set $dangerousPregancy = 1>> +<</if>> <<if ndef $retainCareer>> <<set $retainCareer = 1>> <</if>> @@ -650,6 +653,11 @@ <<if ndef $tanks>> <<set $tanks = []>> <</if>> + +<<if ndef $nursery>> + <<set $nursery = 0>> +<</if>> + <<if ndef $farmyard>> <<set $farmyard = 0>> <</if>> @@ -746,21 +754,8 @@ <<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>> @@ -1950,12 +1945,6 @@ 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>> @@ -2602,6 +2591,9 @@ 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>> @@ -3442,15 +3434,42 @@ Done! <<set $brothelAdsSpending = 0>> <</if>> -<<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"; })>> +<<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.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>> + <<if ndef _rule.legAccessory>> + <<set _rule.legAccessory = "no default setting">> + <</if>> +<</for>>