diff --git a/src/art/vector/Belly.tw b/src/art/vector/Belly.tw index 2edf5462175218f70f1256f37166665d6ab167bb..d89cb2dfcac6591f14f075205138000a940f978b 100644 --- a/src/art/vector/Belly.tw +++ b/src/art/vector/Belly.tw @@ -2,7 +2,7 @@ <<set _showNavelPiercings = $showBodyMods == 1 && _artSlave.clothes != "restrictive latex" && _artSlave.clothes != "a latex catsuit">> -<<if _artSlave.preg > 0>> +<<if _artSlave.belly >= 1500>> <<include Art_Vector_Belly>> /* shiny clothings */ diff --git a/src/pregmod/fMarry.tw b/src/pregmod/fMarry.tw index 5748b5bb4997d256ea2e062ad6b53d17cbd498e0..282819da2c02b0c1a8843655047b4997b367010a 100644 --- a/src/pregmod/fMarry.tw +++ b/src/pregmod/fMarry.tw @@ -512,7 +512,7 @@ You tell $activeSlave.slaveName that you're going to marry her. (A proposal, of <<elseif ($activeSlave.bellyImplant >= 2000)>> Her <<print $activeSlave.bellyImplant>>cc belly implant protrudes her middle out the front of her bridal wear. <</if>> - <<if $activeSlave.dickAccessory == ("chastity")>> + <<if $activeSlave.dickAccessory == ("chastity") || $activeSlave.dickAccessory == ("combined chastity")>> Her slave dick is hidden by its chastity cage. <<elseif canAchieveErection($activeSlave)>> <<if ($activeSlave.dick > 4) && ($activeSlave.bellyPreg >= 5000)>> diff --git a/src/uncategorized/BackwardsCompatibility.tw b/src/uncategorized/BackwardsCompatibility.tw index 3901121a98eae0ee0d7596d9504c0e73cbb2ec2a..e0548fbbdb57f1c9faddb19b498705dd3e8d0d49 100644 --- a/src/uncategorized/BackwardsCompatibility.tw +++ b/src/uncategorized/BackwardsCompatibility.tw @@ -271,6 +271,279 @@ <<if ndef $breederOrphanageTotal>> <<set $breederOrphanageTotal = 0>> <</if>> +<<if ndef $newDescriptions>> + <<set $newDescriptions = 0>> +<</if>> +<<if ndef $specialSlavesPriceOverride>> + <<set $specialSlavesPriceOverride = 0>> +<</if>> +<<if ndef $pregAccessibility>> + <<set $pregAccessibility = 0>> +<</if>> +<<if ndef $dickAccessibility>> + <<set $dickAccessibility = 0>> +<</if>> +<<if ndef $ballsAccessibility>> + <<set $ballsAccessibility = 0>> +<</if>> +<<if ndef $buttAccessibility>> + <<set $buttAccessibility = 0>> +<</if>> +<<if ndef $loliGrow>> + <<set $loliGrow = 1>> +<</if>> +<<if ndef $ageMode>> + <<set $ageMode = 0>> +<</if>> +<<if ndef $enema>> + <<set $enema = 0>> +<</if>> +<<if ndef $medicalEnema>> + <<set $medicalEnema = 0>> +<</if>> +<<if ndef $dairyPiping>> + <<set $dairyPiping = 0>> +<</if>> +<<if ndef $inflatedSlavesMilk>> + <<set $inflatedSlavesMilk = 0>> +<</if>> +<<if ndef $inflatedSlavesCum>> + <<set $inflatedSlavesCum = 0>> +<</if>> +<<if ndef $milkPipeline>> + <<set $milkPipeline = 0>> +<</if>> +<<if ndef $cumPipeline>> + <<set $cumPipeline = 0>> +<</if>> +<<if ndef $burstee>> + <<set $burstee = 0>> +<</if>> +<<if ndef $slaveDeath>> + <<set $slaveDeath = 0>> +<</if>> +<<if ndef $clinicInflateBelly>> + <<set $clinicInflateBelly = 0>> +<</if>> +<<if ndef $playerBred>> + <<set $playerBred = 0>> +<</if>> +<<if ndef $propOutcome>> + <<set $propOutcome = 0>> +<</if>> +<<if ndef $EliteSires>> + <<set $EliteSires = ["moves", "quick", "crazy", "virgin", "futa", "preggo"]>> +<</if>> +<<if ndef $startingPoint>> + <<set $startingPoint = -1>> +<</if>> +<<if ndef $PhysicalRetirementAgePolicy>> + <<set $PhysicalRetirementAgePolicy = 0>> +<</if>> +<<if ndef $raped>> + <<set $raped = -1>> +<</if>> +<<if ndef $familyTesting>> + <<set $familyTesting = 0>> +<</if>> +<<if ndef $children>> + <<set $children = []>> +<</if>> +<<if ndef $missingParentID>> + <<set $missingParentID = -10000>> +<</if>> +<<if ndef $startingSlaveRelative>> + <<set $startingSlaveRelative = 0>> +<</if>> +<<if ndef $mom>> + <<set $mom = 0>> +<</if>> +<<if ndef $animalParts>> + <<set $animalParts = 0>> +<</if>> +<<if ndef $showBestiality>> + <<set $showBestiality = 0>> +<</if>> +<<if ndef $inbreeding>> + <<set $inbreeding = 1>> +<</if>> +<<if ndef $originOveride>> + <<set $originOveride = 0>> +<</if>> +<<if ndef $playerAging>> + <<set $playerAging = 2>> +<</if>> +<<if ndef $pregSpeedControl>> + <<set $pregSpeedControl = 0>> +<</if>> +<<if ndef $clinicSpeedGestation>> + <<set $clinicSpeedGestation = 0>> +<</if>> +<<if ndef $playerSurgery>> + <<set $playerSurgery = 0>> +<</if>> +<<if ndef $bodyswapAnnounced>> + <<set $bodyswapAnnounced = 0>> +<</if>> +<<if ndef $allowFamilyTitles>> + <<set $allowFamilyTitles = 0>> +<</if>> +<<if ndef $FCTVshow>> + <<set $FCTVshow = 0>> +<</if>> +<<if ndef $randShow>> + <<set $randShow = 0>> +<</if>> +<<if ndef $genePool>> + <<set $genePool = []>> +<</if>> +<<if ndef $useSummaryCache>> + <<set $useSummaryCache = true>> +<</if>> +<<if ndef $seeHyperPreg>> + <<set $seeHyperPreg = 0>> +<</if>> +<<if ndef $retainCareer>> + <<set $retainCareer = 1>> +<</if>> +<<if ndef $freshPC>> + <<set $freshPC = 0>> +<</if>> +<<if ndef $brothelAdsPreg>> + <<set $brothelAdsPreg = 0>> +<</if>> +<<if ndef $dairyHyperPregRemodel>> + <<set $dairyHyperPregRemodel = 0>> +<</if>> +<<if ndef $clubAdsPreg>> + <<set $clubAdsPreg = 0>> +<</if>> +<<if ndef $spaFix>> + <<set $spaFix = 0>> +<</if>> +<<if ndef $incubator>> + <<set $incubator = 0>> +<</if>> +<<if ndef $incubatorSlaves>> + <<set $incubatorSlaves = 0>> +<</if>> +<<if ndef $incubatorUpgradeSpeed>> + <<set $incubatorUpgradeSpeed = 5>> +<</if>> +<<if ndef $incubatorUpgradeWeight>> + <<set $incubatorUpgradeWeight = 0>> +<</if>> +<<if ndef $incubatorUpgradeMuscles>> + <<set $incubatorUpgradeMuscles = 0>> +<</if>> +<<if ndef $incubatorUpgradeReproduction>> + <<set $incubatorUpgradeReproduction = 0>> +<</if>> +<<if ndef $incubatorWeightSetting>> + <<set $incubatorWeightSetting = 0>> +<</if>> +<<if ndef $incubatorMusclesSetting>> + <<set $incubatorMusclesSetting = 0>> +<</if>> +<<if ndef $incubatorReproductionSetting>> + <<set $incubatorReproductionSetting = 0>> +<</if>> +<<if ndef $incubatorName>> + <<set $incubatorName = "the Incubator">> +<</if>> +<<if ndef $incubatorNameCaps>> + <<set $incubatorNameCaps = "The Incubator">> +<</if>> +<<if ndef $reservedChildren>> + <<set $reservedChildren = 0>> +<</if>> +<<if ndef $tanks>> + <<set $tanks = []>> +<</if>> +<<if ndef $clinicUpgradePurge>> + <<set $clinicUpgradePurge = 0>> +<</if>> +<<if ndef $masterSuiteHyperPregnancy>> + <<set $masterSuiteHyperPregnancy = 0>> +<</if>> +<<if ndef $legendaryWombID>> + <<set $legendaryWombID = 0>> +<</if>> +<<if ndef $FSCreditCount>> + <<set $FSCreditCount = 5>> +<</if>> +<<if ndef $FSCreditCountString>> + <<set $FSCreditCountString = "five">> +<</if>> +<<if ndef $FSGotRepCreditFive>> + <<set $FSGotRepCreditFive = 0>> +<</if>> +<<if ndef $FSGotRepCreditSix>> + <<set $FSGotRepCreditSix = 0>> +<</if>> +<<if ndef $makeDicks>> + <<set $makeDicks = 0>> +<</if>> +<<if ndef $showEconomicDetails>> + <<set $showEconomicDetails = 0>> +<</if>> +<<if ndef $assignFilter>> + <<set $assignFilter = 0>> +<</if>> +<<if ndef $personalAttention>> + <<set $personalAttention = "sex">> +<</if>> +<<if ndef $assistantExtra1>> + <<set $assistantExtra1 = 0>> +<</if>> +<<if ndef $assistantExtra2>> + <<set $assistantExtra2 = 0>> +<</if>> +<<if ndef $assistantBodyDesire>> + <<set $assistantBodyDesire = 0>> +<</if>> +<<if ndef $huskSlaveOrdered>> + <<set $huskSlaveOrdered = 0>> +<</if>> +<<if ndef $huskSlave>> + <<set $huskSlave = {age: 18, nationality: "slave", race: "white", sex: 1, virgin: 0}>> +<</if>> +<<if ndef $pedo_mode>> + <<set $pedo_mode = 0>> +<</if>> +<<if ndef $one_time_age_overrides_pedo_mode>> + <<set $one_time_age_overrides_pedo_mode = 0>> +<</if>> +<<if ndef $minimumSlaveAge>> + <<set $minimumSlaveAge = 16>> +<</if>> +<<if ndef $fertilityAge>> + <<set $fertilityAge = 13>> +<</if>> +<<if ndef $potencyAge>> + <<set $potencyAge = 13>> +<</if>> +<<if ndef $activeSlaveOneTimeMinAge>> + <<set $activeSlaveOneTimeMinAge = 0>> +<</if>> +<<if ndef $activeSlaveOneTimeMaxAge>> + <<set $activeSlaveOneTimeMaxAge = 999>> +<</if>> +<<if ndef $AgePenalty>> + <<set $AgePenalty = 1>> +<</if>> +<<if ndef $precociousPuberty>> + <<set $precociousPuberty = 0>> +<</if>> +<<if ndef $targetAge>> + <<set $targetAge = $minimumSlaveAge>> +<</if>> +<<if ndef $disableLisping>> + <<set $disableLisping = 0>> +<</if>> +<<if ndef $cheatModeM>> + <<set $cheatModeM = 1>> +<</if>> <<if ndef $arcologies[0].FSAztecRevivalist>> <<for _bci = 0; _bci < $arcologies.length; _bci++>> @@ -1316,6 +1589,21 @@ Setting missing global variables: <<if ndef $clothesBoughtEgypt>> <<set $clothesBoughtEgypt = 0>> <</if>> +<<if ndef $buckets>> + <<set $buckets = 0>> +<</if>> + +<<if ndef $clothesBoughtMaternityDress>> + <<set $clothesBoughtMaternityDress = 0>> +<</if>> + +<<if ndef $clothesBoughtMaternityLingerie>> + <<set $clothesBoughtMaternityLingerie = 0>> +<</if>> + +<<if ndef $clothesBoughtLazyClothes>> + <<set $clothesBoughtLazyClothes = 0>> +<</if>> <<if ndef $assistantFSAppearance>> <<set $assistantFSAppearance = "default">> @@ -1354,6 +1642,45 @@ Setting missing global variables: <<if ndef $limbsCompleted>> <<set $limbsCompleted = 0>> <</if>> +<<if ndef $dispensaryUpgrade>> + <<set $dispensaryUpgrade = 0>> +<</if>> +<<if ndef $ImplantProductionUpgrade>> + <<set $ImplantProductionUpgrade = 0>> +<</if>> +<<if ndef $permaPregImplant>> + <<set $permaPregImplant = 0>> +<</if>> +<<if ndef $pubertyHormones>> + <<set $pubertyHormones = 0>> +<</if>> +<<if ndef $dietXXY>> + <<set $dietXXY = 0>> +<</if>> +<<if ndef $dietCleanse>> + <<set $dietCleanse = 0>> +<</if>> +<<if ndef $cumProDiet>> + <<set $cumProDiet = 0>> +<</if>> +<<if ndef $aphrodisiacUpgradeRefine>> + <<set $aphrodisiacUpgradeRefine = 0>> +<</if>> +<<if ndef $healthyDrugsUpgrade>> + <<set $healthyDrugsUpgrade = 0>> +<</if>> +<<if ndef $superFertilityDrugs>> + <<set $superFertilityDrugs = 0>> +<</if>> +<<if ndef $bellyImplants>> + <<set $bellyImplants = 0>> +<</if>> +<<if ndef $cervixImplants>> + <<set $cervixImplants = 0>> +<</if>> +<<if ndef $prostateImplants>> + <<set $prostateImplants = 0>> +<</if>> <<if ndef $trinkets>> <<set $trinkets = []>> @@ -1407,6 +1734,9 @@ Setting missing global variables: <<if ndef $TGA>> <<set $TGA = {schoolUpgrade: 0, schoolPresent: 0, schoolProsperity: 0, subsidize: 0, schoolAnnexed: 0, studentsBought: 0, schoolSale: 0}>> <</if>> +<<if ndef $TCR>> + <<set $TCR = {schoolUpgrade: 0, schoolPresent: 0, schoolProsperity: 0, subsidize: 0, schoolAnnexed: 0, studentsBought: 0, schoolSale: 0}>> +<</if>> <<if ndef $TFS>> <<set $TFS = {schoolUpgrade: 0, schoolPresent: 0, schoolProsperity: 0, subsidize: 0, schoolAnnexed: 0, studentsBought: 0, schoolSale: 0}>> <</if>> @@ -1468,6 +1798,30 @@ Setting missing global variables: <<if ndef $EducationSMR>> <<set $EducationSMR = 0>> <</if>> +<<if ndef $FrigiditySMR>> +<<set $FrigiditySMR = 0>> +<</if>> +<<if ndef $BasicBeautySMR>> +<<set $BasicBeautySMR = 0>> +<</if>> +<<if ndef $QualityBeautySMR>> +<<set $QualityBeautySMR = 0>> +<</if>> +<<if ndef $BasicWeightSMR>> +<<set $BasicWeightSMR = 0>> +<</if>> +<<if ndef $BasicIntelligenceSMR>> +<<set $BasicIntelligenceSMR = 0>> +<</if>> +<<if ndef $QualityIntelligenceSMR>> +<<set $QualityIntelligenceSMR = 0>> +<</if>> +<<if ndef $BasicHeightSMR>> +<<set $BasicHeightSMR = 0>> +<</if>> +<<if ndef $AdvancedHeightSMR>> +<<set $AdvancedHeightSMR = 0>> +<</if>> <<if ndef $IntelligenceEugenicsSMR>> <<set $IntelligenceEugenicsSMR = 0>> <</if>> @@ -1510,6 +1864,9 @@ Setting missing global variables: <<if ndef $RepForCash>> <<set $RepForCash = 0>> <</if>> +<<if ndef $Cash4Babies>> +<<set $Cash4Babies = 0>> +<</if>> <<if ndef $PAPublic>> <<set $PAPublic = 0>> <</if>> diff --git a/src/uncategorized/reBoomerang.tw b/src/uncategorized/reBoomerang.tw index a91a8749753abec8ff65d6f98c3103aee8699c84..96ce07df28dbba5ebe20236f5deeef53a99bd700 100644 --- a/src/uncategorized/reBoomerang.tw +++ b/src/uncategorized/reBoomerang.tw @@ -36,7 +36,7 @@ brings up the relevant feeds. There's a naked body crumpled pathetically against <<set $activeSlave.birthWeek = 0>> <<if $seeAge == 1>> <<set $activeSlave.physicalAge += 1, $activeSlave.actualAge += 1, $activeSlave.visualAge += 1>> - <<set $slaves[_i].ovaryAge += either(.8, .9, .9, 1, 1, 1, 1.1)>> + <<set $activeSlave.ovaryAge += either(.8, .9, .9, 1, 1, 1, 1.1)>> <<if $activeSlave.physicalAge <= 18 && $loliGrow == 1>> <<PhysicalDevelopment $activeSlave>> <</if>> diff --git a/src/uncategorized/saPleaseYou.tw b/src/uncategorized/saPleaseYou.tw index a1a5d13fe8e27aff9ade30e689afba162f7f2987..05e4b2e73983a40b8e9fc6e5a7305381d8076229 100644 --- a/src/uncategorized/saPleaseYou.tw +++ b/src/uncategorized/saPleaseYou.tw @@ -625,7 +625,7 @@ serves you this week. mouth <</if>> available for you at all times. - <<if ($slaves[$i].dick != 0) && canPenetrate($slaves[$i])>> + <<if ($slaves[$i].dick != 0) && canAchieveErection($slaves[$i]) && $slaves[$i].dickAccessory != "chastity" && $slaves[$i].dickAccessory != "combined chastity">> Every time $possessive beloved <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Master<<else>>Mistress<</if>> fucks $object, $pronoun gets a hardon. <<elseif ($slaves[$i].dick != 0) && canDoAnal($slaves[$i])>> $pronounCap doesn't get a hardon as you use $object, but $pronoun comes from the prostate stimulation when $possessive beloved <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Master<<else>>Mistress<</if>> uses $possessive butt. @@ -661,7 +661,7 @@ serves you this week. <<elseif ($slaves[$i].devotion > 20)>> Whenever you feel the need, you use whichever of $possessive available holes that appears most appealing at the moment, since $pronoun's up for anything. - <<if ($slaves[$i].dick != 0) && canPenetrate($slaves[$i])>> + <<if ($slaves[$i].dick != 0) && canAchieveErection($slaves[$i]) && $slaves[$i].dickAccessory != "chastity" && $slaves[$i].dickAccessory != "combined chastity">> By the end of the week $pronoun gets a hardon when you use $object. <</if>> <<if ($fuckSlaves <= $PC.sexualEnergy/2)>> @@ -701,7 +701,7 @@ serves you this week. mouth <</if>> to save herself from worse treatment than mere rape. - <<if ($slaves[$i].dick != 0) && canPenetrate($slaves[$i])>> + <<if ($slaves[$i].dick != 0) && canAchieveErection($slaves[$i]) && $slaves[$i].dickAccessory != "chastity" && $slaves[$i].dickAccessory != "combined chastity">> By the end of the week $pronoun gets a hardon when you use $object. <</if>> <<if ($fuckSlaves <= $PC.sexualEnergy/2)>> diff --git a/src/uncategorized/slaveSummary.tw b/src/uncategorized/slaveSummary.tw index df09d8a6e0a25e4c551e11df1c9376b0ced9a0c7..04d7fd0980206b13ba6e4e151c8a33128ea603ee 100644 --- a/src/uncategorized/slaveSummary.tw +++ b/src/uncategorized/slaveSummary.tw @@ -352,7 +352,7 @@ <</if>> <<case "Stewardess Select">> <br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>> - [[_slaveName|Stewardess Workaround][$i = _ssi]]> + [[_slaveName|Stewardess Workaround][$i = _ssi]] <<case "Master Suite">> <<if $Flag == 0>> <<if $masterSuite <= $masterSuiteSlaves>><<continue>><</if>>