From 63f66d4ca5fa5292b84a0e782240d2ae14081acf Mon Sep 17 00:00:00 2001 From: Pregmodder <pregmodder@gmail.com> Date: Fri, 23 Mar 2018 13:44:39 -0400 Subject: [PATCH] fixes and setPregType partial --- devNotes/VersionChangeLog-Premod+LoliMod.txt | 8 ++++++- src/init/storyInit.tw | 2 +- src/pregmod/managePersonalAffairs.tw | 2 +- src/pregmod/newChildIntro.tw | 2 +- src/uncategorized/BackwardsCompatibility.tw | 13 +++++++----- src/uncategorized/newSlaveIntro.tw | 5 ++--- src/uncategorized/pCoupAttempt.tw | 2 +- src/uncategorized/pHostageAcquisition.tw | 2 +- src/uncategorized/pRivalInitiation.tw | 2 +- src/uncategorized/pRivalryActions.tw | 2 +- src/uncategorized/saServeYourOtherSlaves.tw | 12 +++++------ src/uncategorized/seRaiding.tw | 22 ++++++++++---------- src/uncategorized/slaveShelter.tw | 2 +- src/utility/miscWidgets.tw | 4 ++-- src/utility/slaveCreationWidgets.tw | 8 +++---- 15 files changed, 48 insertions(+), 40 deletions(-) diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt index d34b13599b6..4e98cca9bfc 100644 --- a/devNotes/VersionChangeLog-Premod+LoliMod.txt +++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt @@ -4,6 +4,12 @@ 3/23/2018 + 1 + -many spelling corrections + -fixes to decreasing custom nationality weighting + -fixes to bad versionID setting + -partial implementaion of setPregType() + 0.1 -minor fix to generateXYslave @@ -11,7 +17,7 @@ -fixes severe issues with customized slave trade *Requires backwards compatibility - no exceptions - v1022 (10.7.1-0.1.0) + v1022 (0.10.7.1-0.1.0) 3/22/2018 diff --git a/src/init/storyInit.tw b/src/init/storyInit.tw index 6ea739615d0..78c38f4b9a4 100644 --- a/src/init/storyInit.tw +++ b/src/init/storyInit.tw @@ -1222,7 +1222,7 @@ FertilityAge($fertilityAge) /* FacilitySupport */ <<set $Lieutenantcolonel = 0>> /* Has a slave been selected to be a Lieutenant colonel? */ <<set $FacilitySupportSlaves = 0>> /* How many slaves are assiting in the facility support? */ -<<set $FacilitySupportfficiency = 0>> /* How efficient is the support facility? */ +<<set $FacilitySupportEfficiency = 0>> /* How efficient is the support facility? */ <<set $FacilitySupportUpgrade = 0>> /* How many support facility upgrades has the play brought? */ <<set $FacilitySupportCapacity = 5>> /* How many slaves can the support facility house? */ diff --git a/src/pregmod/managePersonalAffairs.tw b/src/pregmod/managePersonalAffairs.tw index 27e8076af85..48649f13b3a 100644 --- a/src/pregmod/managePersonalAffairs.tw +++ b/src/pregmod/managePersonalAffairs.tw @@ -456,7 +456,7 @@ In total, you have given birth to: <br><br> The tap connected to $dairyName is calling to you. Begging to let it fill you with cum again. If you wanted to try and go bigger, that is. <br>[[Sounds fun!|FSelf]] - <br><<link "You only want to get pregnant.">><<set $PC.preg = 1, $PC.pregWeek = 1, $PC.pregSource = 0, $PC.pregKnown = 1>><<SetPregType $PC>><<set WombImpregnate($PC, $PC.pregType, 0, 1)>><<goto "Manage Personal Affairs">><</link>> + <br><<link "You only want to get pregnant.">><<set $PC.preg = 1, $PC.pregWeek = 1, $PC.pregSource = 0, $PC.pregKnown = 1>><<set $PC.pregType = setPregType($PC)>><<set WombImpregnate($PC, $PC.pregType, 0, 1)>><<goto "Manage Personal Affairs">><</link>> <</if>> <</if>> <<if $PC.vagina == 1 && $PC.dick == 1>> diff --git a/src/pregmod/newChildIntro.tw b/src/pregmod/newChildIntro.tw index 460dc3cd7d8..2390967bbbf 100644 --- a/src/pregmod/newChildIntro.tw +++ b/src/pregmod/newChildIntro.tw @@ -658,7 +658,7 @@ You slowly strip down, gauging her reactions to your show, until you are fully n <<FSChange "GenderFundamentalist" 2>> <</if>> <<set $activeSlave.preg = 1>> - <<SetPregType $activeSlave>> + <<set $activeSlave.pregType = setPregType($activeSlave)>> <<set $activeSlave.pregSource = -1>> <<set $activeSlave.pregKnown = 1>> <<set $activeSlave.pregWeek = 1>> diff --git a/src/uncategorized/BackwardsCompatibility.tw b/src/uncategorized/BackwardsCompatibility.tw index 1e1f355dc9a..dd4f38e35c7 100644 --- a/src/uncategorized/BackwardsCompatibility.tw +++ b/src/uncategorized/BackwardsCompatibility.tw @@ -2,8 +2,8 @@ <<set $nextButton = "Continue", $nextLink = "Main", $returnTo = "Main">> -<<if $releaseID == 2021 || $releaseID == 2020 || $releaseID == 2019>> - <<set $releaseID = 2022>> +<<if $releaseID == 1021 || $releaseID == 1020 || $releaseID == 1019 || $releaseID == 2022>> + <<set $releaseID = 1022>> <</if>> <<if Array.isArray($nationalities)>> @@ -30,7 +30,7 @@ <<unset $northamericaNationalities, $southamericaNationalities, $europeNationalities, $asiaNationalities, $middleeastNationalities, $africaNationalities, $australiaNationalities>> <<unset $belarusianSlaveNames, $dominicanSlaveNames, $scottishSlaveNames>> <<unset $ArcologyNamesEugenics, $ArcologyNamesRepopulationist, $ArcologyNamesHedonisticDecadence>> - <<unset $drugs, harshCollars, shoes, bellyAccessories, vaginalAccessories, dickAccessories, buttplugs>> + <<unset $drugs, $harshCollars, $shoes, $bellyAccessories, $vaginalAccessories, $dickAccessories, $buttplugs>> <</if>> <<if def $servantMilkerJobs>> @@ -757,8 +757,11 @@ <<set $FacilitySupportSlaves = 0>> <</if>> - <<if ndef $FacilitySupportfficiency>> - <<set $FacilitySupportfficiency = 0>> + <<if ndef $FacilitySupportEfficiency>> + <<set $FacilitySupportEfficiency = 0>> + <</if>> + <<if def $FacilitySupportfficiency>> + <<unset $FacilitySupportfficiency>> <</if>> <<if ndef $FacilitySupportUpgrade>> <<set $FacilitySupportUpgrade = 0>> diff --git a/src/uncategorized/newSlaveIntro.tw b/src/uncategorized/newSlaveIntro.tw index 9db679cbd95..2c07a2faf1b 100644 --- a/src/uncategorized/newSlaveIntro.tw +++ b/src/uncategorized/newSlaveIntro.tw @@ -1211,7 +1211,6 @@ The legalities completed, ''__@@.pink;<<SlaveFullName $activeSlave>>@@__'' <<if <<else>> <<VaginalVCheck>> <</if>> - <<SetPregType $activeSlave>> <<if $arcologies[0].FSRestart != "unset">> The Societal Elite @@.green;disapprove@@ of this breach of eugenics. <<set $failedElite += 5>> @@ -1224,11 +1223,11 @@ The legalities completed, ''__@@.pink;<<SlaveFullName $activeSlave>>@@__'' <<if <</if>> <</replace>> <<set $activeSlave.preg = 1>> - <<SetPregType $activeSlave>> - <<set WombImpregnate($activeSlave, $activeSlave.pregType, -1, 1)>> + <<set $activeSlave.pregType = setPregType($activeSlave)>> <<set $activeSlave.pregWeek = 1>> <<set $activeSlave.pregKnown = 1>> <<set $activeSlave.pregSource = -1>> + <<set WombImpregnate($activeSlave, $activeSlave.pregType, -1, 1)>> <</link>> <</if>> <</if>> diff --git a/src/uncategorized/pCoupAttempt.tw b/src/uncategorized/pCoupAttempt.tw index 12bf5fe1180..f68ae2f1ae8 100644 --- a/src/uncategorized/pCoupAttempt.tw +++ b/src/uncategorized/pCoupAttempt.tw @@ -186,7 +186,7 @@ You are awakened in the middle of the night by a jolt that shakes the entire arc <</if>> <</if>> <<set $traitor.health = random(-80,-60)>> - <<set $traitor.origin = "She was your slave, but you freed her, which she repaid by participating in a coup attempt against you. It failed, and she is again your chattel.">> + <<set $traitor.origin = $traitor.origin+" She was your slave, but you freed her, which she repaid by participating in a coup attempt against you. It failed, and she is again your chattel.">> <<AddSlave $traitor>> /* skip New Slave Intro */ <<set $traitor = 0, $traitorStats = 0>> <</if>> diff --git a/src/uncategorized/pHostageAcquisition.tw b/src/uncategorized/pHostageAcquisition.tw index cb13e5ab92e..43868f74fbd 100644 --- a/src/uncategorized/pHostageAcquisition.tw +++ b/src/uncategorized/pHostageAcquisition.tw @@ -53,7 +53,7 @@ Your hired mercenaries are en route now with your precious cargo. The mercenary captain quickly gags her, "My apologies, I did warn you she was a handful. Please be careful when you unbind her, I'd hate for anything to happen to my best employer." He says, as he and his group exit your penthouse, leaving you with the enraged $activeSlave.slaveName. She looks the same as you remember, but she acts nothing like the girl you used to know. Odds are high that she'll cause problems for you in the future. <</if>> <<case "Racial Supremacism">> - <<SetPregType $activeSlave>> + <<set $activeSlave.pregType = setPregType($activeSlave)>> <<set WombInit($activeSlave)>> <<if $rivalryDuration <= 5>> Upon seeing you, $activeSlave.slaveName dives into your <<if $PC.boobs == 1>>ample bust<<else>>chest<</if>> sobbing "Thank you... Thank you...". You gently wrap your arms around her in a comforting embrace. She's nearly the same as you remember her, albeit acting slightly odd and covered in scars. diff --git a/src/uncategorized/pRivalInitiation.tw b/src/uncategorized/pRivalInitiation.tw index afdbb9bbee0..8333e4fc24a 100644 --- a/src/uncategorized/pRivalInitiation.tw +++ b/src/uncategorized/pRivalInitiation.tw @@ -52,7 +52,7 @@ This is a special week, the week of your victory. <<EventNameLink $activeSlave>> <<replace "#result">> You announce that since $activeSlave.slaveName damaged the arcology, she will be taking a leading role in the reconstruction. She will be doing this by replacing one of the residents killed in the violence - by bearing a new slave, to be conceived collectively. The shame and @@.mediumorchid;horror@@ of her future as breeding stock comes home to her as she's restrained in a chair with her legs spread. Soon, the stream of fluids is running down her thoroughly-fucked pussy and over her virgin anus to pool on the floor beneath her. Modern medical imaging reveals her fertile ovum's last, losing battle against a legion of sperm in real time, and the images are projected on large screens. <<set $rep += 500, $activeSlave.preg = 1, $activeSlave.pregSource = -2, $activeSlave.pregKnown = 1, $activeSlave.pregWeek = 1, $activeSlave.devotion -= 15>> - <<SetPregType $activeSlave>> + <<set $activeSlave.pregType = setPregType($activeSlave)>> <<set WombImpregnate($activeSlave, $activeSlave.pregType, -2, 1)>> <<if $activeSlave.publicCount>><<set $activeSlave.publicCount += 47>><<else>><<set $activeSlave.publicCount = 47>><</if>> <</replace>> diff --git a/src/uncategorized/pRivalryActions.tw b/src/uncategorized/pRivalryActions.tw index 76009942fe8..984014b382c 100644 --- a/src/uncategorized/pRivalryActions.tw +++ b/src/uncategorized/pRivalryActions.tw @@ -495,7 +495,7 @@ Your inter-arcology war with the arcology owner behind the Daughters of Liberty <<case "pregnancy">> take you off your birth control, won't be long after that." <<set $hostage.preg = 1>> - <<SetPregType $hostage>> + <<set $hostage.pregType = setPregType($hostage)>> <<set WombImpregnate($hostage, $hostage.pregType, 0, 1)>> <<set $hostage.pregKnown = 1>> <<set $hostage.pregWeek = 1>> diff --git a/src/uncategorized/saServeYourOtherSlaves.tw b/src/uncategorized/saServeYourOtherSlaves.tw index 756b210e77b..d0b392f0947 100644 --- a/src/uncategorized/saServeYourOtherSlaves.tw +++ b/src/uncategorized/saServeYourOtherSlaves.tw @@ -61,7 +61,7 @@ <<set $slaves[$i].tired = 1>> <<if $slaves[$i].sexualFlaw == "self hating">> With so many other slaves taking advantage of her body, her life's purpose of @@.hotpink;being nothing more than a piece of meat@@ has come true. - <<set $slaves[$i].deovtion += 5>> + <<set $slaves[$i].devotion += 5>> <<elseif $slaves[$i].sexualFlaw == "attention whore">> With little competition for her body and so many slaves eager to use her, her dreams of being the center of attention are @@.hotpink;have come true.@@ <<if $slaves[$i].weight < 10 && $slaves[$i].belly < 100>> @@ -71,10 +71,10 @@ By the end of the day, her stomach has a noticeable bulge to it from all the "attention" bestowed upon her. <</if>> <</if>> - <<set $slaves[$i].deovtion += 5>> + <<set $slaves[$i].devotion += 5>> <<elseif $slaves[$i].energy > 95>> With so many other slaves using her body, her @@.hotpink;burning libido is finally sated.@@ - <<set $slaves[$i].deovtion += 2>> + <<set $slaves[$i].devotion += 2>> <</if>> <<else>> Since <<if $subSlave == 1>>she is the only slave<<else>>there are so few other slaves<</if>> servicing your stock, she is used to the @@.red;point of exhaustion.@@ @@ -97,7 +97,7 @@ <</if>> <<if $slaves[$i].sexualFlaw == "self hating">> With so many other slaves taking advantage of her body, her life's purpose of @@.hotpink;being nothing more than a piece of meat@@ has come true. - <<set $slaves[$i].deovtion += 5>> + <<set $slaves[$i].devotion += 5>> <<elseif $slaves[$i].sexualFlaw == "attention whore">> With little competition for her body and so many slaves eager to use her, her dreams of being the center of attention are @@.hotpink;have come true.@@ <<if $slaves[$i].weight < 10 && $slaves[$i].belly < 100>> @@ -107,10 +107,10 @@ By the end of the day, her stomach has a noticeable bulge to it from all the "attention" bestowed upon her. <</if>> <</if>> - <<set $slaves[$i].deovtion += 5>> + <<set $slaves[$i].devotion += 5>> <<elseif $slaves[$i].energy > 95>> With so many other slaves using her body, her @@.hotpink;burning libido is finally sated.@@ - <<set $slaves[$i].deovtion += 2>> + <<set $slaves[$i].devotion += 2>> <</if>> <</if>> <</if>> diff --git a/src/uncategorized/seRaiding.tw b/src/uncategorized/seRaiding.tw index 96c1b3cdcae..a0a5d1cb25b 100644 --- a/src/uncategorized/seRaiding.tw +++ b/src/uncategorized/seRaiding.tw @@ -83,7 +83,7 @@ Worthy of consideration is that although the $mercenariesTitle will enslave the <<if isFertile($activeSlave) && $seePreg != 0>> <<set $activeSlave.preg = either(-1, -1, -1, 0, 0, 0, 5, 10, 20, 30, 39)>> <<if $activeSlave.preg > 0>> - <<SetPregType $activeSlave>> + <<set $activeSlave.pregType = setPregType($activeSlave)>> <<set WombImpregnate($activeSlave, $activeSlave.pregType, 0, $activeSlave.preg)>> <<set $activeSlave.pregKnown = 1>> <<set $activeSlave.pregWeek = $activeSlave.preg>> @@ -119,7 +119,7 @@ Worthy of consideration is that although the $mercenariesTitle will enslave the <<if isFertile($activeSlave) && $seePreg != 0>> <<set $activeSlave.preg = either(-1, -1, -1, -1, -1, 0, 0, 0, 0, 0, 0, 5, 10, 20, 30, 39)>> <<if $activeSlave.preg > 0>> - <<SetPregType $activeSlave>> + <<set $activeSlave.pregType = setPregType($activeSlave)>> <<set WombImpregnate($activeSlave, $activeSlave.pregType, 0, $activeSlave.preg)>> <<set $activeSlave.pregKnown = 1>> <<set $activeSlave.pregWeek = $activeSlave.preg>> @@ -150,7 +150,7 @@ Worthy of consideration is that although the $mercenariesTitle will enslave the <<if isFertile($activeSlave) && $seePreg != 0>> <<set $activeSlave.preg = either(-1, -1, -1, -1, -1, 0, 0, 0, 0, 0, 0, 5, 10)>> <<if $activeSlave.preg > 0>> - <<SetPregType $activeSlave>> + <<set $activeSlave.pregType = setPregType($activeSlave)>> <<set WombImpregnate($activeSlave, $activeSlave.pregType, 0, $activeSlave.preg)>> <<set $activeSlave.pregKnown = 1>> <<set $activeSlave.pregWeek = $activeSlave.preg>> @@ -228,7 +228,7 @@ Worthy of consideration is that although the $mercenariesTitle will enslave the <<if isFertile($activeSlave) && $seePreg != 0>> <<set $activeSlave.preg = either(-1, -1, -1, -1, -1, 0, 0, 0, 0, 0, 0, 5, 5)>> <<if $activeSlave.preg > 0>> - <<SetPregType $activeSlave>> + <<set $activeSlave.pregType = setPregType($activeSlave)>> <<set WombImpregnate($activeSlave, $activeSlave.pregType, 0, $activeSlave.preg)>> <<set $activeSlave.pregKnown = 1>> <<set $activeSlave.pregWeek = $activeSlave.preg>> @@ -257,7 +257,7 @@ Worthy of consideration is that although the $mercenariesTitle will enslave the <<if isFertile($activeSlave) && $seePreg != 0>> <<set $activeSlave.preg = either(-1, -1, -1, -1, -1, 0, 0, 0, 0, 0, 0, 5, 10)>> <<if $activeSlave.preg > 0>> - <<SetPregType $activeSlave>> + <<set $activeSlave.pregType = setPregType($activeSlave)>> <<set WombImpregnate($activeSlave, $activeSlave.pregType, 0, $activeSlave.preg)>> <<set $activeSlave.pregKnown = 1>> <<set $activeSlave.pregWeek = $activeSlave.preg>> @@ -305,7 +305,7 @@ Worthy of consideration is that although the $mercenariesTitle will enslave the <<if isFertile($activeSlave) && $seePreg != 0>> <<set $activeSlave.preg = either(-1, -1, -1, -1, -1, 0, 0, 0, 0, 0, 0, 5, 10)>> <<if $activeSlave.preg > 0>> - <<SetPregType $activeSlave>> + <<set $activeSlave.pregType = setPregType($activeSlave)>> <<set WombImpregnate($activeSlave, $activeSlave.pregType, 0, $activeSlave.preg)>> <<set $activeSlave.pregKnown = 1>> <<set $activeSlave.pregWeek = $activeSlave.preg>> @@ -380,7 +380,7 @@ Worthy of consideration is that although the $mercenariesTitle will enslave the <<if isFertile($activeSlave) && $seePreg != 0>> <<set $activeSlave.preg = either(-1, -1, -1, -1, -1, 0, 0, 0, 0, 0, 0, 5, 5)>> <<if $activeSlave.preg > 0>> - <<SetPregType $activeSlave>> + <<set $activeSlave.pregType = setPregType($activeSlave)>> <<set WombImpregnate($activeSlave, $activeSlave.pregType, 0, $activeSlave.preg)>> <<set $activeSlave.pregKnown = 1>> <<set $activeSlave.pregWeek = $activeSlave.preg>> @@ -410,7 +410,7 @@ Worthy of consideration is that although the $mercenariesTitle will enslave the <<if isFertile($activeSlave) && $seePreg != 0>> <<set $activeSlave.preg = either(-1, -1, -1, -1, -1, 0, 0, 0, 0, 0, 0, 5, 10)>> <<if $activeSlave.preg > 0>> - <<SetPregType $activeSlave>> + <<set $activeSlave.pregType = setPregType($activeSlave)>> <<set WombImpregnate($activeSlave, $activeSlave.pregType, 0, $activeSlave.preg)>> <<set $activeSlave.pregKnown = 1>> <<set $activeSlave.pregWeek = $activeSlave.preg>> @@ -443,7 +443,7 @@ Worthy of consideration is that although the $mercenariesTitle will enslave the <<if isFertile($activeSlave) && $seePreg != 0>> <<set $activeSlave.preg = either(-1, -1, -1, -1, -1, -1, 0, 0, 0, 0, 0, 0, 0, 10, 20, 30, 39)>> <<if $activeSlave.preg > 0>> - <<SetPregType $activeSlave>> + <<set $activeSlave.pregType = setPregType($activeSlave)>> <<set WombImpregnate($activeSlave, $activeSlave.pregType, 0, $activeSlave.preg)>> <<set $activeSlave.pregKnown = 1>> <<set $activeSlave.pregWeek = $activeSlave.preg>> @@ -501,7 +501,7 @@ Worthy of consideration is that although the $mercenariesTitle will enslave the <<if isFertile($activeSlave) && $seePreg != 0>> <<set $activeSlave.preg = either(-1, -1, -1, -1, -1, -1, 0, 0, 0, 0, 0, 0, 0, 10, 20, 30, 39)>> <<if $activeSlave.preg > 0>> - <<SetPregType $activeSlave>> + <<set $activeSlave.pregType = setPregType($activeSlave)>> <<set WombImpregnate($activeSlave, $activeSlave.pregType, 0, $activeSlave.preg)>> <<set $activeSlave.pregKnown = 1>> <<set $activeSlave.pregWeek = $activeSlave.preg>> @@ -546,7 +546,7 @@ Worthy of consideration is that although the $mercenariesTitle will enslave the <<if isFertile($activeSlave) && $seePreg != 0>> <<set $activeSlave.preg = either(-1, -1, -1, -1, -1, -1, 0, 0, 0, 0, 0, 0, 0, 10, 20, 30, 39)>> <<if $activeSlave.preg > 0>> - <<SetPregType $activeSlave>> + <<set $activeSlave.pregType = setPregType($activeSlave)>> <<set WombImpregnate($activeSlave, $activeSlave.pregType, 0, $activeSlave.preg)>> <<set $activeSlave.pregKnown = 1>> <<set $activeSlave.pregWeek = $activeSlave.preg>> diff --git a/src/uncategorized/slaveShelter.tw b/src/uncategorized/slaveShelter.tw index fa7a0e19d6f..289ad31ac4d 100644 --- a/src/uncategorized/slaveShelter.tw +++ b/src/uncategorized/slaveShelter.tw @@ -187,7 +187,7 @@ You contact the Slave Shelter to review the profile of the slave the Shelter is <<set $shelterSlave.preg = either(-3, -2, -2, -2, 0, 0, 2, 3, 4, 5)>> <<if $shelterSlave.preg > 0>> <<set $shelterSlave.pregSource = -2, $shelterSlave.pregKnown = 1>> - <<SetPregType $shelterSlave>> + <<set $shelterSlave.pregType = setPregType($shelterSlave)>> <<set WombImpregnate($shelterSlave, $shelterSlave.pregType, $shelterSlave.pregSource, $shelterSlave.preg)>> <</if>> <</if>> diff --git a/src/utility/miscWidgets.tw b/src/utility/miscWidgets.tw index ecf0c6de800..f3d898ba586 100644 --- a/src/utility/miscWidgets.tw +++ b/src/utility/miscWidgets.tw @@ -2440,7 +2440,7 @@ This experience <<if $args[0].ID != -1>> <<set $args[0].pregWeek = 1>> <</if>> - <<SetPregType $args[0]>> + <<set $args[0].pregType = setPregType($args[0])>> <<set WombImpregnate($args[0], $args[0].pregType, $args[0].pregSource, 1)>> <<if $menstruation == 1>> <<elseif ndef $args[4]>> @@ -2461,7 +2461,7 @@ This experience <<if $args[0].ID != -1>> <<set $args[0].pregWeek = 1>> <</if>> - <<SetPregType $args[0]>> + <<set $args[0].pregType = setPregType($args[0])>> <<set WombImpregnate($args[0], $args[0].pregType, $args[0].pregSource, 1)>> <<if $menstruation == 1>> <<elseif ndef $args[4]>> diff --git a/src/utility/slaveCreationWidgets.tw b/src/utility/slaveCreationWidgets.tw index 27bce4a48e7..13699405762 100644 --- a/src/utility/slaveCreationWidgets.tw +++ b/src/utility/slaveCreationWidgets.tw @@ -2430,7 +2430,7 @@ <<set $activeSlave.mpreg = 1>> <<if isFertile($activeSlave)>> <<set $activeSlave.preg = random(1,39)>> - <<SetPregType $activeSlave>> + <<set $activeSlave.pregType = setPregType($activeSlave)>> <<SetBellySize $activeSlave>> <</if>> <</if>> @@ -2462,7 +2462,7 @@ <<set $activeSlave.preg = 0>> /*removing contraception of default slave generation so isFertile can work right*/ <<if isFertile($activeSlave)>> <<set $activeSlave.preg = random(1,40)>> - <<SetPregType $activeSlave>> + <<set $activeSlave.pregType = setPregType($activeSlave)>> <<SetBellySize $activeSlave>> <<set $activeSlave.lactation = random(0,1)>> <</if>> @@ -2820,7 +2820,7 @@ <<if $activeSlave.vagina > 1 && isFertile($activeSlave)>> <<set $activeSlave.preg = either(-2, -1, -1, -1, -1, -1, -1, -1, 1, 20, 40)>> <<if $activeSlave.preg > 0>> - <<SetPregType $activeSlave>> + <<set $activeSlave.pregType = setPregType($activeSlave)>> <</if>> <<SetBellySize $activeSlave>> <</if>> @@ -2856,7 +2856,7 @@ <<set $activeSlave.preg = either(-2, -1, -1, -1, -1, -1, -1, -1, 1, 1)>> <<if $activeSlave.physicalAge < $activeSlave.pubertyAgeXX>><<set $activeSlave.preg = -1>><</if>> <<if $activeSlave.preg > 0>> - <<SetPregType $activeSlave>> + <<set $activeSlave.pregType = setPregType($activeSlave)>> <</if>> <<SetBellySize $activeSlave>> <<set $activeSlave.vaginalSkill = random(15,100)>> -- GitLab