From 93d666e71276e2766d07eec68c5b4a4965b0498d Mon Sep 17 00:00:00 2001 From: DCoded <dcoded@live.com> Date: Sat, 22 Sep 2018 18:54:40 -0700 Subject: [PATCH] Nursery variables --- src/init/storyInit.tw | 218 +++++++++++++++++++++--------------------- 1 file changed, 111 insertions(+), 107 deletions(-) diff --git a/src/init/storyInit.tw b/src/init/storyInit.tw index 01cbe94b640..4f39f5fc113 100644 --- a/src/init/storyInit.tw +++ b/src/init/storyInit.tw @@ -23,57 +23,56 @@ You should have received a copy of the GNU General Public License along with thi <<if def $slaves>> <<set _SL = $slaves.length>> <<for _i = 0; _i < _SL; _i++>> - <<if $slaves[_i].assignment == "be imported">> - <<set $slaves[_i].ID += 1200000>> - <<set $slaves[_i].assignment = "rest">> - <<set $slaves[_i].assignmentVisible = 1>> - <<set $slaves[_i].weekAcquired = 0>> - <<set $slaves[_i].newGamePlus = 1>> - <<PMODinit $slaves[_i]>> - <<if $slaves[_i].mother > 0>> - <<set $slaves[_i].mother += 1200000>> - <<elseif $freshPC == 1 && $slaves[_i].mother == -1>> - <<set $slaves[_i].mother = -12000000>> - <<elseif $slaves[_i].mother < -1>> - <<set $slaves[_i].mother -= 1200000>> - <</if>> - <<if $slaves[_i].father > 0>> - <<set $slaves[_i].father += 1200000>> - <<elseif $freshPC == 1 && $slaves[_i].father == -1>> - <<set $slaves[_i].father = -12000000>> - <<elseif $slaves[_i].father < -1>> - <<set $slaves[_i].father -= 1200000>> - <</if>> - <<set $slaves[_i].daughters = 0>> - <<set $slaves[_i].sisters = 0>> - <<set $slaves[_i].canRecruit = 0>> - <<set $slaves[_i].breedingMark = 0>> - <<set $slaves[_i].reservedChildren = 0>> - <<if $arcologies[0].FSRomanRevivalist > 90>> - <<set $slaves[_i].nationality = "Roman Revivalist">> - <<elseif $arcologies[0].FSAztecRevivalist > 90>> - <<set $slaves[_i].nationality = "Aztec Revivalist">> - <<elseif $arcologies[0].FSEgyptianRevivalist > 90>> - <<set $slaves[_i].nationality = "Ancient Egyptian Revivalist">> - <<elseif $arcologies[0].FSEdoRevivalist > 90>> - <<set $slaves[_i].nationality = "Edo Revivalist">> - <<elseif $arcologies[0].FSArabianRevivalist > 90>> - <<set $slaves[_i].nationality = "Arabian Revivalist">> - <<elseif $arcologies[0].FSChineseRevivalist > 90>> - <<set $slaves[_i].nationality = "Ancient Chinese Revivalist">> - <</if>> - <<if $slaves[_i].relationTarget != 0>> - <<set $slaves[_i].relationTarget += 1200000>> - <</if>> - <<if $slaves[_i].relationshipTarget != 0>> - <<set $slaves[_i].relationshipTarget += 1200000>> - <</if>> - <<set $slaves[_i].rivalry = 0, $slaves[_i].rivalryTarget = 0, $slaves[_i].subTarget = 0>> - <<else>> - <<set _dump = removeSlave(_i), _i--, _SL-->> + <<if $slaves[_i].assignment == "be imported">> + <<set $slaves[_i].ID += 1200000>> + <<set $slaves[_i].assignment = "rest">> + <<set $slaves[_i].assignmentVisible = 1>> + <<set $slaves[_i].weekAcquired = 0>> + <<set $slaves[_i].newGamePlus = 1>> + <<PMODinit $slaves[_i]>> + <<if $slaves[_i].mother > 0>> + <<set $slaves[_i].mother += 1200000>> + <<elseif $freshPC == 1 && $slaves[_i].mother == -1>> + <<set $slaves[_i].mother = -12000000>> + <<elseif $slaves[_i].mother < -1>> + <<set $slaves[_i].mother -= 1200000>> + <</if>> + <<if $slaves[_i].father > 0>> + <<set $slaves[_i].father += 1200000>> + <<elseif $freshPC == 1 && $slaves[_i].father == -1>> + <<set $slaves[_i].father = -12000000>> + <<elseif $slaves[_i].father < -1>> + <<set $slaves[_i].father -= 1200000>> <</if>> + <<set $slaves[_i].daughters = 0>> + <<set $slaves[_i].sisters = 0>> + <<set $slaves[_i].canRecruit = 0>> + <<set $slaves[_i].breedingMark = 0>> + <<set $slaves[_i].reservedChildren = 0>> + <<if $arcologies[0].FSRomanRevivalist > 90>> + <<set $slaves[_i].nationality = "Roman Revivalist">> + <<elseif $arcologies[0].FSAztecRevivalist > 90>> + <<set $slaves[_i].nationality = "Aztec Revivalist">> + <<elseif $arcologies[0].FSEgyptianRevivalist > 90>> + <<set $slaves[_i].nationality = "Ancient Egyptian Revivalist">> + <<elseif $arcologies[0].FSEdoRevivalist > 90>> + <<set $slaves[_i].nationality = "Edo Revivalist">> + <<elseif $arcologies[0].FSArabianRevivalist > 90>> + <<set $slaves[_i].nationality = "Arabian Revivalist">> + <<elseif $arcologies[0].FSChineseRevivalist > 90>> + <<set $slaves[_i].nationality = "Ancient Chinese Revivalist">> + <</if>> + <<if $slaves[_i].relationTarget != 0>> + <<set $slaves[_i].relationTarget += 1200000>> + <</if>> + <<if $slaves[_i].relationshipTarget != 0>> + <<set $slaves[_i].relationshipTarget += 1200000>> + <</if>> + <<set $slaves[_i].rivalry = 0, $slaves[_i].rivalryTarget = 0, $slaves[_i].subTarget = 0>> + <<else>> + <<set _dump = removeSlave(_i), _i--, _SL-->> + <</if>> <</for>> - <<set $slaveIndices = slaves2indices()>> <<for _k = 0; _k < _SL; _k++>> <<for _i = 0; _i < _SL; _i++>> <<if $slaves[_k].mother == $slaves[_i].ID || $slaves[_k].father == $slaves[_i].ID>> @@ -89,11 +88,6 @@ You should have received a copy of the GNU General Public License along with thi <<if ndef _getFather>> <<set $slaves[_k].pregSource = 0>> <</if>> - <<for _sInit = 0; _sInit < $slaves[_k].womb.length; _sInit++>> - <<if $slaves[_k].womb[_sInit].fatherID > 0>> - <<set $slaves[_k].womb[_sInit].fatherID += 1200000>> - <</if>> - <</for>> <</if>> <</for>> <<set $genePool = ngUpdateGenePool($genePool)>> @@ -111,57 +105,57 @@ You should have received a copy of the GNU General Public License along with thi <</for>> */ <<for _i = 0; _i < _SL; _i++>> - <<if $slaves[_i].relation != 0>> - <<set _seed = 0, _rt = $slaves[_i].relationTarget, _ID = $slaves[_i].ID>> - <<set _j = $slaveIndices[_rt]>> - <<if def _j && $slaves[_j].relationTarget == _ID>> - <<set _seed = 1>> - <</if>> - <<if _seed == 0>> - <<set $slaves[_i].relation = 0, $slaves[_i].relationTarget = 0>> - <</if>> + <<if $slaves[_i].relation != 0>> + <<set _seed = 0, _rt = $slaves[_i].relationTarget, _ID = $slaves[_i].ID>> + <<set _j = $slaveIndices[_rt]>> + <<if def _j && $slaves[_j].relationTarget == _ID>> + <<set _seed = 1>> <</if>> - <<if $slaves[_i].relationship > 0>> - <<set _seed = 0, _rt = $slaves[_i].relationshipTarget, _ID = $slaves[_i].ID>> - <<set _j = $slaveIndices[_rt]>> - <<if def _j && $slaves[_j].relationshipTarget == _ID>> - <<set _seed = 1>> - <</if>> - <<if _seed == 0>> - <<set $slaves[_i].relationship = 0, $slaves[_i].relationshipTarget = 0>> - <</if>> + <<if _seed == 0>> + <<set $slaves[_i].relation = 0, $slaves[_i].relationTarget = 0>> + <</if>> + <</if>> + <<if $slaves[_i].relationship > 0>> + <<set _seed = 0, _rt = $slaves[_i].relationshipTarget, _ID = $slaves[_i].ID>> + <<set _j = $slaveIndices[_rt]>> + <<if def _j && $slaves[_j].relationshipTarget == _ID>> + <<set _seed = 1>> + <</if>> + <<if _seed == 0>> + <<set $slaves[_i].relationship = 0, $slaves[_i].relationshipTarget = 0>> <</if>> + <</if>> <</for>> <<for _i = 0; _i < _SL; _i++>> - <<if $familyTesting == 1>> - <<if $slaves[_i].canRecruit == 1>> - /*<<set $recruiters.push($slaves[_i])>>*/ + <<if $familyTesting == 1>> + <<if $slaves[_i].canRecruit == 1>> + /*<<set $recruiters.push($slaves[_i])>>*/ + <</if>> + <<else>> + <<if $slaves[_i].relation == 0>> + <<if random(1,100) <= 5>> + <<set $slaves[_i].recruiter = "twin">> + <<elseif ($slaves[_i].actualAge > 32) && (random(1,100) <= 41)>> + <<set $slaves[_i].recruiter = "mother">> + <<elseif ($slaves[_i].actualAge < 24) && (random(1,100) <= 40)>> + <<set $slaves[_i].recruiter = "daughter">> + <<elseif ($slaves[_i].actualAge < 43) && (random(1,100) <= 20)>> + <<set $slaves[_i].recruiter = "older sister">> + <<elseif ($slaves[_i].actualAge < 25) && ($slaves[_i].actualAge > 18) && (random(1,100) <= 20)>> + <<set $slaves[_i].recruiter = "young sister">> <</if>> <<else>> - <<if $slaves[_i].relation == 0>> - <<if random(1,100) <= 5>> - <<set $slaves[_i].recruiter = "twin">> - <<elseif ($slaves[_i].actualAge > 32) && (random(1,100) <= 41)>> - <<set $slaves[_i].recruiter = "mother">> - <<elseif ($slaves[_i].actualAge < 24) && (random(1,100) <= 40)>> - <<set $slaves[_i].recruiter = "daughter">> - <<elseif ($slaves[_i].actualAge < 43) && (random(1,100) <= 20)>> - <<set $slaves[_i].recruiter = "older sister">> - <<elseif ($slaves[_i].actualAge < 25) && ($slaves[_i].actualAge > 18) && (random(1,100) <= 20)>> - <<set $slaves[_i].recruiter = "young sister">> - <</if>> - <<else>> - <<set $slaves[_i].recruiter = 0>> - <</if>> - <</if>> /*closes family mode */ - <<set $slaves[_i].milk = 0>> - <<set $slaves[_i].cum = 0>> - <<set $slaves[_i].births = 0>> - <<set $slaves[_i].mammaryCount = 0>> - <<set $slaves[_i].penetrativeCount = 0>> - <<set $slaves[_i].oralCount = 0>> - <<set $slaves[_i].analCount = 0>> - <<set $slaves[_i].vaginalCount = 0>> + <<set $slaves[_i].recruiter = 0>> + <</if>> + <</if>> /*closes family mode */ + <<set $slaves[_i].milk = 0>> + <<set $slaves[_i].cum = 0>> + <<set $slaves[_i].births = 0>> + <<set $slaves[_i].mammaryCount = 0>> + <<set $slaves[_i].penetrativeCount = 0>> + <<set $slaves[_i].oralCount = 0>> + <<set $slaves[_i].analCount = 0>> + <<set $slaves[_i].vaginalCount = 0>> <</for>> <<set $slavesOriginal = []>> /* not used by pregmod */ <<if ndef $PC.intelligence>> @@ -243,9 +237,9 @@ You should have received a copy of the GNU General Public License along with thi <<set $slaves = []>> <<set $slavesOriginal = []>> /* not used by pregmod */ <<set $genePool = []>> - <<set $slaveIndices = slaves2indices()>> <</if>> +<<set $slaveIndices = slaves2indices()>> <<set $organs = []>> <<set $ArcadeiIDs = [], $BrothiIDs = [], $CellBiIDs = [], $CliniciIDs = [], $ClubiIDs = [], $DairyiIDs = [], $HGSuiteiIDs = [], $MastSiIDs = [], $SchlRiIDs = [], $ServQiIDs = [], $SpaiIDs = []>> @@ -273,7 +267,6 @@ You should have received a copy of the GNU General Public License along with thi <<set $seeBestiality = 0>> <<set $seeHyperPreg = 0>> <<set $seePreg = 1>> - <<set $dangerousPregancy = 1>> <<set $seeCircumcision = 1>> <<set $seeAge = 1>> <<set $seeDicks = 25>> @@ -428,11 +421,6 @@ You should have received a copy of the GNU General Public License along with thi <<if ndef _getFather>> <<set $PC.pregSource = 0>> <</if>> - <<for _sInit = 0; _sInit < $PC.womb.length; _sInit++>> - <<if $PC.womb[_sInit].fatherID > 0>> - <<set $PC.womb[_sInit].fatherID += 1200000>> - <</if>> - <</for>> <</if>> <<else>> <<initPC>> @@ -614,6 +602,12 @@ DairyRestraintsSetting($dairyRestraintsSetting) <<set $farmyardStable = 0>> <<set $farmyardKennels = 0>> <<set $farmyardCages = 0>> +<<set $defaultCanine = "wolf">> +<<set $defaultHooved = "horse">> +<<set $defaultFeline = "cougar">> +<<set $defaultCaninePlural = "wolves">> +<<set $defaultHoovedPlural = "horses">> +<<set $defaultFelinePlural = "cougars">> <<set $activeCanine = "wolf">> <<set $activeHooved = "horse">> <<set $activeFeline = "cougar">> @@ -634,6 +628,13 @@ DairyRestraintsSetting($dairyRestraintsSetting) <<set $farmyardName = "the Farmyard">> <<set $farmyardNameCaps = "The Farmyard">> +<<set $nursery = 0>> +<<set $nurserySlaves = 0>> +<<set $nurseryBabies = 0>> +<<set $nurseryDecoration = "standard">> +<<set $nurseryName = "the Nursery">> +<<set $nurseryNameCaps = "The Nursery">> + <<set $HGSuite = 0>> <<set $HGSuiteSlaves = 0>> <<set $HGSuiteSurgery = 1>> @@ -644,6 +645,8 @@ DairyRestraintsSetting($dairyRestraintsSetting) <<set $HGSuiteNameCaps = "The Head Girl Suite">> <<set $fighterIDs = []>> <<set $pitBG = 0>> +<<set $pitAnimal = 0>> +<<set $pitAnimalType = 0>> <<set $pitAudience = "none">> <<set $pitLethal = 0>> <<set $pitVirginities = 0>> @@ -932,6 +935,7 @@ DairyRestraintsSetting($dairyRestraintsSetting) <<set $Nurse = 0>> <<set $Wardeness = 0>> <<set $Concubine = 0>> +<<set $Matron = 0>> <<set $assistant = 0>> <<set $assistantPower = 0>> <<set $economicUncertainty = 10>> @@ -956,7 +960,7 @@ DairyRestraintsSetting($dairyRestraintsSetting) <<set $fixedRace = 0>> <<set $ui = "start">> -<<set $brandTarget = "buttock">> +<<set $brandTarget = "buttocks">> <<set $brandDesign = "your initials">> <<set $oralTotal = 0>> -- GitLab