diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt index fd966fca22b383998cfb71d0d6950baa10215876..45149371d23ae214e98e682484900e559eea23a8 100644 --- a/devNotes/VersionChangeLog-Premod+LoliMod.txt +++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt @@ -4,6 +4,10 @@ 2/12/18 + 344 + -fixed several text issues + -added menopause reversal + 343 -fixed missed closing ifs in seBirth -fixed mishandled rude title in fearful balls event diff --git a/src/SecExp/securityHQ.tw b/src/SecExp/securityHQ.tw index 5fedbc9136b98c453ad7e193f65ad3308329c4ef..1b30a2e520821051628ba66cab786f3954fbd3c4 100644 --- a/src/SecExp/securityHQ.tw +++ b/src/SecExp/securityHQ.tw @@ -266,7 +266,7 @@ Considering the current upgrades the maximum level of crime is <<print $crimeCap <br> <<if $readinessUpgrades.rapidVehicles == 0>> [[Buy rapid armored transport vehicles|securityHQ][$cash -= Math.trunc(7500*$upgradeMultiplierArcology*_HistoryDiscount), $readinessUpgrades.rapidVehicles = 1, $readiness += 2, $reqHelots += 5, $secHQUpkeep += $upgradeUpkeep]] - <br>//Costs <<print cashFormat(Math.trunc(75000*$upgradeMultiplierArcology*_HistoryDiscount))>>. Will increase readiness by 2, but will require 5 extra slaves in the headquarters and increases upkeep.// + <br>//Costs <<print cashFormat(Math.trunc(7500*$upgradeMultiplierArcology*_HistoryDiscount))>>. Will increase readiness by 2, but will require 5 extra slaves in the headquarters and increases upkeep.// <<else>> You have bought rapid armored transport vehicles able to bring your troops to battle much quicker than before. <</if>> diff --git a/src/gui/Encyclopedia/encyclopedia.tw b/src/gui/Encyclopedia/encyclopedia.tw index 6dc94b1f0115f2fea38b4388d12a4923fd2c8cf6..74705d195af3afe4500e8c6fadbca99502419a6f 100644 --- a/src/gui/Encyclopedia/encyclopedia.tw +++ b/src/gui/Encyclopedia/encyclopedia.tw @@ -2774,7 +2774,7 @@ Specialized creams built off of stem cells and several ingredients known for red More of a trash heap than a slave market, the "Flesh Heap" is a dumping ground for thoroughly broken slaves. Relatively healthy bodies are usually scooped up for medical testing or other purposes; several that one wouldn't want to waste a valuable slave on. Anything with some sort of life in it is up for sale, usually at extremely low prices, though one gets what they pay for; most slaves are nothing more than vegetables. One would have to place a reserve should they want a mindless, healthy slave for whatever they seek. <<case "The Job Fulfillment Center">> -If you are looking for a slave for a slave qualified for a specific role, look no further than the Traders Union that makes up the Job Fulfillment Center. Leave the job description and a list of desired traits and before long a suitable slave will be delivered to your doorstep and ready to serve you. Due to the nature of the business, these slaves are not cheap and usually not perfect, but they always fulfill their job adequately and obediantly. +If you are looking for a slave qualified for a specific role, look no further than the Traders Union that makes up the Job Fulfillment Center. Leave the job description and a list of desired traits and before long a suitable slave will be delivered to your doorstep and ready to serve you. Due to the nature of the business, these slaves are not cheap and usually not perfect, but they always fulfill their job adequately and obediantly. <<case "Gestation Drugs and Labor Suppressants">> Not all drugs are applied directly to your slavegirl. In this case, gestation accelerants and deccelerants are passed through the mother into her unborn children to control the rate of fetal growth. While slightly unhealthy for the mother, gestation slowing drugs are relatively harmless, though an unwilling mother may become more distraut when she realizes her pregnancy will last even longer. Due to the extended duration of the pregnancy, the mother's body may become accustomed to being so round, leading towards a sagging middle once birth occurs. On the other hand, gestation hastening drugs are extremely dangerous to the mother. It is strongly recommended to keep her under the observation and care of an experienced doctor or nurse. Failure to do so will cause her body to struggle to keep up with the rate of growth of her children, harming her physical and mental health, as well as potentially bursting her uterus later in her pregnancy. Labor suppresants are exactly that; they prevent the mother from entering labor, thus allowing the child to grow longer than a normal pregnancy. Excessive use may lead to health complications, especially during childbirth, though going even further may result in the slave's body suddenly entering labor and rapidly birthing her children, often without giving the slave time to prepare or even get undressed. diff --git a/src/init/storyInit.tw b/src/init/storyInit.tw index 86aa40937cae81d2183f831780e77161222e9bb6..725e4dbf1437eec0da22f9ca0c19ab76ad8d45fc 100644 --- a/src/init/storyInit.tw +++ b/src/init/storyInit.tw @@ -853,6 +853,7 @@ DairyRestraintsSetting($dairyRestraintsSetting) <<set $cervixImplants = 0>> <<set $meshImplants = 0>> <<set $prostateImplants = 0>> +<<set $youngerOvaries = 0>> <<set $prostheticsUpgrade = 0>> <<set $surgeryUpgrade = 0>> diff --git a/src/pregmod/organFarmOptions.tw b/src/pregmod/organFarmOptions.tw index 74fd8c61e84f1c008331e8e3180a1d74a946ce72..e8ae85dc82fae578b2608960644b7bd6d862f467 100644 --- a/src/pregmod/organFarmOptions.tw +++ b/src/pregmod/organFarmOptions.tw @@ -9,6 +9,7 @@ dogTesticles: 0, foreskin: 0, ovaries: 0, + freshOvaries: 0, prostate: 0, pigOvaries: 0, dogOvaries: 0, @@ -49,6 +50,8 @@ <<set $slaveOrgans.mpregPig = 1>> <<elseif $organs[_i].type == "mpregDog">> <<set $slaveOrgans.mpregDog = 1>> + <<elseif $organs[_i].type == "freshOvaries">> + <<set $slaveOrgans.freshOvaries = 1>> <</if>> <</if>> <</for>> @@ -122,16 +125,6 @@ The fabricator is ready to grow an organ for $object. Extract tissue to begin gr <</if>> <</if>> <</if>> -<<if $slaveOrgans.ovaries != 1>> - <br> - <<link "Ovaries">> - <<set $cash -= 10000>> - <<set _newOrgan = {type: "ovaries", weeksToCompletion: "10", ID: 0}>> - <<set _newOrgan.ID = $activeSlave.ID>> - <<set $organs.push(_newOrgan)>> - <<goto "Remote Surgery">> - <</link>> //Costs <<print cashFormat(10000)>> and requires a vagina for successful implantation// -<</if>> <<if $slaveOrgans.prostate != 1>> <br> <<link "Prostate">> @@ -142,6 +135,16 @@ The fabricator is ready to grow an organ for $object. Extract tissue to begin gr <<goto "Remote Surgery">> <</link>> //Costs <<print cashFormat(5000)>> and does not require the presence any specific organ for successful implantation// <</if>> +<<if $slaveOrgans.ovaries != 1>> + <br> + <<link "Ovaries">> + <<set $cash -= 10000>> + <<set _newOrgan = {type: "ovaries", weeksToCompletion: "10", ID: 0}>> + <<set _newOrgan.ID = $activeSlave.ID>> + <<set $organs.push(_newOrgan)>> + <<goto "Remote Surgery">> + <</link>> //Costs <<print cashFormat(10000)>> and requires a vagina for successful implantation// +<</if>> <<if $animalParts != 0>> <<if $slaveOrgans.pigOvaries != 1>> <br> @@ -153,7 +156,7 @@ The fabricator is ready to grow an organ for $object. Extract tissue to begin gr <<goto "Remote Surgery">> <</link>> //Costs <<print cashFormat(10000)>> and requires a vagina for successful implantation// <</if>> - <<if $slaveOrgans.pigOvaries != 1>> + <<if $slaveOrgans.dogOvaries != 1>> <br> <<link "Dog ovaries">> <<set $cash -= 10000>> @@ -164,6 +167,18 @@ The fabricator is ready to grow an organ for $object. Extract tissue to begin gr <</link>> //Costs <<print cashFormat(10000)>> and requires a vagina for successful implantation// <</if>> <</if>> +<<if $youngerOvaries == 1>> + <<if $slaveOrgans.freshOvaries != 1>> + <br> + <<link "Fertile Ovaries">> + <<set $cash -= 10000>> + <<set _newOrgan = {type: "fertile ovaries", weeksToCompletion: "10", ID: 0}>> + <<set _newOrgan.ID = $activeSlave.ID>> + <<set $organs.push(_newOrgan)>> + <<goto "Remote Surgery">> + <</link>> //Costs <<print cashFormat(10000)>> and requires a womb for successful implantation// + <</if>> +<</if>> <<if $slaveOrgans.eyes != 1>> <<if $activeSlave.eyes <= -2 && $activeSlave.eyes != "implant">> <br> @@ -600,6 +615,43 @@ The fabricator is ready to grow an organ for $object. Extract tissue to begin gr | <<link "Discard">><<for $i = 0; $i < $completedOrgans.length; $i++>><<if $activeSlave.ID == $completedOrgans[$i].ID>><<set $completedOrgans.deleteAt($i)>><<break>><</if>><</for>><<goto "Remote Surgery">><</link>> <</if>> + <<elseif $completedOrgans[_i].type == "freshOvaries">> + <<if ($activeSlave.mpreg == 0 && $activeSlave.ovaries == 0) || $activeSlave.bellyImplant != -1>> + <br> + ERROR: this slave lacks a viable womb. + <<link "Discard">><<for $i = 0; $i < $completedOrgans.length; $i++>><<if $activeSlave.ID == $completedOrgans[$i].ID>><<set $completedOrgans.deleteAt($i)>><<break>><</if>><</for>><<goto "Remote Surgery">><</link>> + <<else>> + <br> + <<link "Implant">> + <<set $cash -= $surgeryCost>> + <<for $i = 0; $i < $completedOrgans.length; $i++>><<if $activeSlave.ID == $completedOrgans[$i].ID>><<set $completedOrgans.deleteAt($i)>><<break>><</if>><</for>> + <<if $activeSlave.ovaryAge >= 47>> + <<set $activeSlave.ovaryAge = 45>> + <<else>> + <<set $activeSlave.ovaryAge -= 2>> /* It shouldn't matter if this goes negative as it is just a signal for menopause to occur. */ + <</if>> + <<set $activeSlave.preg = 0>> + <<set $activeSlave.health -= 20>> + <<if $organFarmUpgrade == 2>> + <<set $activeSlave.chem += 20>> + <</if>> + <<if $activeSlave.pubertyXX == 0>> + <<if $precociousPuberty == 1>> + <<if $activeSlave.physicalAge >= $fertilityAge>> + <<set $activeSlave.pubertyAgeXX = ($activeSlave.physicalAge+1)>> + <</if>> + <<else>> + <<if $activeSlave.physicalAge >= $fertilityAge>> + <<set $activeSlave.pubertyXX = 1>> + <</if>> + <</if>> + <</if>> + <<set $surgeryType = "freshOvaries">> + <<goto "Surgery Degradation">> + <</link>> + | + <<link "Discard">><<for $i = 0; $i < $completedOrgans.length; $i++>><<if $activeSlave.ID == $completedOrgans[$i].ID>><<set $completedOrgans.deleteAt($i)>><<break>><</if>><</for>><<goto "Remote Surgery">><</link>> + <</if>> <<elseif $completedOrgans[_i].type == "prostate">> <<if $activeSlave.prostate != 0>> <br> diff --git a/src/uncategorized/BackwardsCompatibility.tw b/src/uncategorized/BackwardsCompatibility.tw index a54032516e25deecd234957b21df882aa051ee98..b2f4efa5057190b7ce62f7a354ad26e7be3c204f 100644 --- a/src/uncategorized/BackwardsCompatibility.tw +++ b/src/uncategorized/BackwardsCompatibility.tw @@ -1965,6 +1965,9 @@ Setting missing global variables: <<if ndef $sexualOpeness>> <<set $sexualOpeness = 0>> <</if>> +<<if ndef $youngerOvaries>> + <<set $youngerOvaries = 0>> +<</if>> /* Job Fulfillment Center */ <<if ndef $JFCOrder>> diff --git a/src/uncategorized/dispensary.tw b/src/uncategorized/dispensary.tw index 5ee145e056854558e41dc6fd14750f281941d7d7..30e926d619ab42d6a7c54f5b18b275ceb857916e 100644 --- a/src/uncategorized/dispensary.tw +++ b/src/uncategorized/dispensary.tw @@ -120,6 +120,21 @@ It is currently working on the following organs: <br> <</if>> +<<if $organFarmUpgrade > 0>> + <<if ($youngerOvaries != 1) && ($rep <= 10000*$upgradeMultiplierMedicine)>> + //You lack the reputation to access designs for cloning fertile ovaries for postmenopausal slaves.// + <br> + <<elseif ($youngerOvaries != 1) && ($rep > 10000*$upgradeMultiplierMedicine)>> + [[Purchase plans for ejaculation enhancing prostate implants|Dispensary][$cash -= 30000*$upgradeMultiplierMedicine, $youngerOvaries = 1]] + //Costs <<print cashFormat(30000*$upgradeMultiplierMedicine)>>// + <br> //Will allow the growth of younger, fertile ovaries for menopausal slaves. Resotered fertility will only last a couple years at most.// + <br> + <<elseif ($youngerOvaries > 0)>> + The fabricator is capable of growing fertile ovaries for postmenopausal slaves. + <br> + <</if>> +<</if>> + <br> Hormones Upgrades <hr> diff --git a/src/uncategorized/multiImplant.tw b/src/uncategorized/multiImplant.tw index 3db6686af54650588719908d3fa4feb22204957a..5993ab73f6df52e08b069383d713cdf240913b56 100644 --- a/src/uncategorized/multiImplant.tw +++ b/src/uncategorized/multiImplant.tw @@ -13,6 +13,7 @@ You head down to your <<if $surgeryUpgrade == 1>>heavily upgraded and customized dogTesticles: 0, foreskin: 0, ovaries: 0, + freshOvaries: 0, prostate: 0, pigOvaries: 0, dogOvaries: 0, @@ -45,6 +46,9 @@ You head down to your <<if $surgeryUpgrade == 1>>heavily upgraded and customized <<elseif $completedOrgans[_j].type == "ovaries">> <<set _slaveOrgans.ovaries = $completedOrgans[_j]>> <<set $completedOrgans.deleteAt(_j),_j-->> + <<elseif $completedOrgans[_j].type == "freshOvaries">> + <<set _slaveOrgans.freshOvaries = $completedOrgans[_j]>> + <<set $completedOrgans.deleteAt(_j),_j-->> <<elseif $completedOrgans[_j].type == "prostate">> <<set _slaveOrgans.prostate = $completedOrgans[_j]>> <<set $completedOrgans.deleteAt(_j),_j-->> @@ -431,6 +435,40 @@ You head down to your <<if $surgeryUpgrade == 1>>heavily upgraded and customized <<set $completedOrgans.push(_slaveOrgans.mpregDog)>> <</if>> <</if>> + /* ovary renewal */ + <<if _slaveOrgans.freshOvaries != 0>> + <<if ($activeSlave.ovaries == 0) && ($activeSlave.vagina < 0) && ($activeSlave.mpreg == 0) && ($activeSlave.bellyImplant == -1)>> + <<set $cash -= $surgeryCost>> + <<if $activeSlave.ovaryAge >= 47>> + <<set $activeSlave.ovaryAge = 45>> + <<else>> + <<set $activeSlave.ovaryAge -= 2>> /* It shouldn't matter if this goes negative as it is just a signal for menopause to occur. */ + <</if>> + <<set $activeSlave.preg = 0>> + <<set $activeSlave.health -= 20>> + <<if $organFarmUpgrade == 2>> + <<set $activeSlave.chem += 20>> + <</if>> + <<if $activeSlave.pubertyXX == 0>> + <<if $precociousPuberty == 1>> + <<if $activeSlave.physicalAge >= $fertilityAge>> + <<set $activeSlave.pubertyAgeXX = ($activeSlave.physicalAge+1)>> + <</if>> + <<else>> + <<if $activeSlave.physicalAge >= $fertilityAge>> + <<set $activeSlave.pubertyXX = 1>> + <</if>> + <</if>> + <</if>> + <<set $surgeryType = "freshOvaries">> + <br><hr> + <<include "Surgery Degradation">> + <<elseif ($activeSlave.mpreg == 0 && $activeSlave.ovaries == 0) || $activeSlave.bellyImplant != -1>> + <br><hr> + @@.red;This slave lacks a viable womb to accept fertile ovaries.@@ + <<set $completedOrgans.push(_slaveOrgans.freshOvaries)>> + <</if>> + <</if>> /* penis */ <<if _slaveOrgans.penis != 0>> <<if $activeSlave.dick == 0>> diff --git a/src/uncategorized/surgeryDegradation.tw b/src/uncategorized/surgeryDegradation.tw index ee96e7efda91affb98b892cc18fe36c8e812c216..e6662c2be7658aa2b84e26d749b07e6e69ba6787 100644 --- a/src/uncategorized/surgeryDegradation.tw +++ b/src/uncategorized/surgeryDegradation.tw @@ -414,6 +414,25 @@ As the remote surgery's long recovery cycle completes, </span> <</if>> +<<case "freshOvaries">> + <<if $activeSlave.ovaryAge >= 45>> + <<if (($activeSlave.fetish == "pregnancy") && ($activeSlave.fetishStrength > 60) && ($activeSlave.fetishKnown == 1)) || $activeSlave.origin == "She sold herself to you in the hope of someday bearing children.">> + She leaves the surgery with nothing but a nonspecific ache, yet a familiar warmth, in her lower abdomen, but she knows enough about surgery and sex slaves to know that it means she now has a chance to get pregnant once more. She is @@.hotpink;filled with joy@@ whenever she thinks about the fact that she'll have the chance to feel a life growing within her again. She's so pleased that she now @@.mediumaquamarine;trusts@@ your plans for her body. As with all surgery @@.red;her health has been slightly affected.@@ + <<set $activeSlave.trust += 4, $activeSlave.devotion += 5>> + <<elseif ($activeSlave.devotion > 50)>> + She leaves the surgery with nothing but a nonspecific ache, yet a familiar warmth, in her lower abdomen, but she knows enough about surgery and sex slaves to know that it means she now has the chance to get pregnant again. She's @@.hotpink;grateful@@ that you think her worthy of extending her fertility, and even a little nervous about how she'll perform as a mother that has tasted menopause. As with all surgery @@.red;her health has been slightly affected.@@ + <<set $activeSlave.devotion += 4>> + <<elseif ($activeSlave.devotion >= -20)>> + She leaves the surgery with nothing but a nonspecific ache, yet a familiar warmth, in her lower abdomen, but she knows enough about surgery and sex slaves to know that it means she may now be impregnated once more. She understands the realities of her life as a slave, but didn't expect to have her waning fertility renewed. As with all surgery @@.red;her health has been slightly affected.@@ She is @@.gold;sensibly fearful@@ of your total power over her body. + <<set $activeSlave.trust -= 5>> + <<else>> + She leaves the surgery with nothing but a nonspecific ache, yet a familiar warmth, in her lower abdomen, but she knows enough about surgery and sex slaves to believe you have forced fertility upon her again. She does not understand the realities of her life as a slave at a core level, so she's @@.mediumorchid;terrified and angry@@ at the potential that she'll be forced to carry children. As with all surgery @@.red;her health has been slightly affected.@@ She is @@.gold;sensibly fearful@@ of your total power over her body. + <<set $activeSlave.trust -= 5, $activeSlave.devotion -= 5>> + <</if>> + <<else>> + She leaves the surgery with nothing but a nonspecific ache in her lower abdomen; it won't be clear to her that menopause is an even more distant event now. As with all surgery @@.red;her health has been slightly affected.@@ + <</if>> + <<case "mpreg">> <<if ($activeSlave.fetish == "pregnancy") && ($activeSlave.fetishStrength > 60) && ($activeSlave.fetishKnown == 1)>> She leaves the surgery with a certain fullness in her lower abdomen, she knows that she can now get pregnant. She is @@.hotpink; filled with joy@@ about the possibility of becoming pregnant and gleefully rubs her softer belly. She's so pleased that she now @@.mediumaquamarine;trusts@@ your plans for her body. As with all surgery @@.red;her health has been slightly affected.@@ diff --git a/src/utility/descriptionWidgetsStyle.tw b/src/utility/descriptionWidgetsStyle.tw index bc26a5af76eae9ed9d7ec80a15e9feabea663e2a..9ff64efc312265efaa035606d09dd0fbdf4c2d00 100644 --- a/src/utility/descriptionWidgetsStyle.tw +++ b/src/utility/descriptionWidgetsStyle.tw @@ -3238,7 +3238,6 @@ $possessiveCap <<elseif $activeSlave.bellyAccessory == "an extreme corset">> $possessiveCap bunny outfit has extreme corsetage built into it. <</if>> - a strapless satin teddy with a beribboned rosette over $possessive left hip, printed with $possessive name. <<case "a slutty maid outfit">> <<if $activeSlave.bellyAccessory == "a corset">>