diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt index 2ffe3e448d83f14cd6ccc396564b54ce709dbf1a..212f78e3150f61926cf32f31204421a0ed12f8fc 100644 --- a/devNotes/VersionChangeLog-Premod+LoliMod.txt +++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt @@ -2,6 +2,15 @@ 0.10.7.0/1 +2/24/18 + + 368 + -added missing dairy broodmother birth + -hacking skill allows you to pose as a medical expert to gain access to some of surgeon's starting bonuses + -reduced hacking bonus to be in line with other bonuses + -tons of logic fixes in scenes + -updated RA to use itemAccessibility JS + 2/23/18 367 diff --git a/src/npc/descriptions/fButt.tw b/src/npc/descriptions/fButt.tw index 56f7458224b430142b9f04a91fc531e75a326af0..0065c85373112c7d7b4eeefc8ec611e152dc3b3b 100644 --- a/src/npc/descriptions/fButt.tw +++ b/src/npc/descriptions/fButt.tw @@ -3,7 +3,7 @@ <<ClearSummaryCache $activeSlave>> You call her over so you can -<<if ($activeSlave.vagina == -1)>> +<<if !canDoVaginal($activeSlave)>> use her sole fuckhole. <<elseif ($activeSlave.vagina > 3)>> fuck her gaping holes. @@ -126,15 +126,29 @@ Her anus is invitingly bleached, <</if>> <<BothVCheck>> <<else>> - <<if ($activeSlave.amp != 1)>>She kneels on the floor<<else>>You lay her on the floor<</if>> so you can take her at will<<if ($PC.dick == 0)>>, and don a strap-on<</if>>. You finger her <<if $seeRace == 1>>$activeSlave.race <</if>>ass while <<if ($activeSlave.vagina != -1)>>fucking her pussy<<else>>frotting her<</if>> for a bit and then switch to her now-ready anus. <<if ($activeSlave.anus == 1)>>Her ass is so tight that you have to work yourself in.<<elseif ($activeSlave.anus == 2)>>Your cock slides easily up her ass.<<else>>You slide into her already-gaping asspussy with ease.<</if>> You fuck her there for a while before repeatedly pulling out and stuffing yourself back in. She moans each time you fill a waiting hole. + <<if ($activeSlave.amp != 1)>>She kneels on the floor<<else>>You lay her on the floor<</if>> so you can take her at will<<if ($PC.dick == 0)>>, and don a strap-on<</if>>. You finger her <<if $seeRace == 1>>$activeSlave.race <</if>>ass while + <<if canDoVaginal($activeSlave)>> + fucking her pussy + <<else>> + frotting her + <</if>> + for a bit and then switch to her now-ready anus. + <<if ($activeSlave.anus == 1)>> + Her ass is so tight that you have to work yourself in. + <<elseif ($activeSlave.anus == 2)>> + Your cock slides easily up her ass. + <<else>> + You slide into her already-gaping asspussy with ease. + <</if>> + You fuck her there for a while before repeatedly pulling out and stuffing yourself back in. She moans each time you fill <<if canDoVaginal($activeSlave)>>a<<else>>her<</if>> waiting hole. <<if ($activeSlave.dick != 0) && canAchieveErection($activeSlave)>> - <<if $activeSlave.dickAccessory == "chastity">> + <<if ["chastity", "combined chastity"].includes($activeSlave.dickAccessory)>> Whenever she starts to get hard, her dick chastity gives her an awful twinge of pain. You do your best to be up her butt when this happens so you can experience the resulting spasm. <<else>> Every time you penetrate, her erect dick jerks up and slaps her stomach. <</if>> <<elseif ($activeSlave.dick !== 0)>> - <<if $activeSlave.dickAccessory == "chastity">> + <<if ["chastity", "combined chastity"].includes($activeSlave.dickAccessory)>> Her dick chastity keeps her girly bitchclit hidden, just like it belongs. <<else>> Every time you penetrate, her limp dick flops around lamely. @@ -221,10 +235,6 @@ Her anus is invitingly bleached, <</if>> <<if passage() !== "Slave Interact">> -<<for _i = 0; _i < $slaves.length; _i++>> - <<if $slaves[_i].ID == $activeSlave.ID>> + <<set _i = $slaves.findIndex(function(s) { return s.ID == $activeSlave.ID; })>> <<set $slaves[_i] = $activeSlave>> - <<break>> - <</if>> -<</for>> <</if>> diff --git a/src/pregmod/csec.tw b/src/pregmod/csec.tw index 57f930a1b18bb542031537efc246436ae3673810..7f0b834a853f2f7ab0f504b20c9d67a774cd6d14 100644 --- a/src/pregmod/csec.tw +++ b/src/pregmod/csec.tw @@ -166,7 +166,7 @@ Performing a cesarean section is trivial for the remote surgery for the remote s <<if $activeSlave.fetish == "mindbroken" || $activeSlave.fuckdoll > 0>> has few thoughts about the matter. <<elseif $activeSlave.devotion > 95>> - loves you already, but <<print she>>'ll @@.hotpink;love you even more@@ for this. She can't wait to see her child<<if _curBabies > 1>>ren<</if>> proudly furthering your cause. + loves you already, but she'll @@.hotpink;love you even more@@ for this. She can't wait to see her child<<if _curBabies > 1>>ren<</if>> proudly furthering your cause. <<set $activeSlave.devotion += 4>> <<elseif $activeSlave.devotion > 50>> heard about these and will be @@.hotpink;happy that her child<<if $activeSlave.pregType > 1>>ren<</if>> will have a purpose in your society other than slavery.@@ She will miss her child<<if $activeSlave.pregType > 1>>ren<</if>>, but she expected that. @@ -189,7 +189,7 @@ Performing a cesarean section is trivial for the remote surgery for the remote s <<if $activeSlave.fetish == "mindbroken" || $activeSlave.fuckdoll > 0>> has few thoughts about the matter. <<elseif $activeSlave.devotion > 95>> - loves you already, but <<print she>>'ll @@.hotpink;love you even more@@ for this. + loves you already, but she'll @@.hotpink;love you even more@@ for this. <<elseif $activeSlave.devotion > 50>> knows about these and will be @@.hotpink;overjoyed.@@ She will miss her child<<if _curBabies > 1>>ren<</if>>, but she expected that. <<elseif $activeSlave.devotion > 20>> @@ -212,7 +212,7 @@ Performing a cesarean section is trivial for the remote surgery for the remote s <<elseif $activeSlave.devotion > 50>> understands that this is the best possible outcome for the offspring of slave, and will be @@.hotpink;overjoyed.@@ <<elseif $activeSlave.devotion > 20>> - will miss her child<<if _curBabies > 1>>ren<</if>>, but will be @@.hotpink;very grateful,@@ since <<print she>>'ll understand this is the best possible outcome for a slave mother. + will miss her child<<if _curBabies > 1>>ren<</if>>, but will be @@.hotpink;very grateful,@@ since she'll understand this is the best possible outcome for a slave mother. <<else>> will resent being separated from her child<<if _curBabies > 1>>ren<</if>>, but @@.hotpink;should understand and be grateful@@ that this is the best possible outcome here. <</if>> @@ -235,7 +235,7 @@ Performing a cesarean section is trivial for the remote surgery for the remote s She @@.mediumorchid;despises@@ you for using her body to bear your children. <<set $activeSlave.devotion -= 10>> <<elseif $activeSlave.devotion > 50>> - <<print She>>'s @@.hotpink;so proud@@ to have successfully carried children for you. + She's @@.hotpink;so proud@@ to have successfully carried children for you. <<set $activeSlave.devotion += 3>> <</if>> <</if>> diff --git a/src/pregmod/widgets/pregmodWidgets.tw b/src/pregmod/widgets/pregmodWidgets.tw index 05ef37813e2f13f7036b17a7028e4c48862d32ce..36be3568b6fe213390b8f273468dac9344126725 100644 --- a/src/pregmod/widgets/pregmodWidgets.tw +++ b/src/pregmod/widgets/pregmodWidgets.tw @@ -1931,12 +1931,12 @@ Call as <<HSM>> <<elseif $PC.hacking <= 25>> <<set $HackingSkillMultiplier = .95>> <<elseif $PC.hacking <= 50>> - <<set $HackingSkillMultiplier = .75>> + <<set $HackingSkillMultiplier = .90>> <<elseif $PC.hacking <= 75>> - <<set $HackingSkillMultiplier = .65>> + <<set $HackingSkillMultiplier = .85>> <<elseif $PC.hacking < 100>> - <<set $HackingSkillMultiplier = .6>> + <<set $HackingSkillMultiplier = .80>> <<elseif $PC.hacking >= 100>> - <<set $HackingSkillMultiplier = .5>> + <<set $HackingSkillMultiplier = .75>> <</if>> <</widget>> \ No newline at end of file diff --git a/src/uncategorized/RESS.tw b/src/uncategorized/RESS.tw index f48f846d6789a937895b5c0536c28d9bb81c817d..ade8c40b13fe7ed474973079926d0894ce9b0ac0 100644 --- a/src/uncategorized/RESS.tw +++ b/src/uncategorized/RESS.tw @@ -163,7 +163,7 @@ Your slaves are required to take very good care of themselves, and your best gir <<if $activeSlave.belly >= 600000>> her _belly belly coming to rest on the floor as she spreads her legs around it, <<elseif $activeSlave.belly >= 400000>> - her _belly belly forcing her to really sread her legs, + her _belly belly forcing her to really spread her legs, <<elseif $activeSlave.belly >= 100000>> her _belly belly forcing her legs wide as she goes, <<elseif $activeSlave.belly >= 10000>> @@ -185,19 +185,46 @@ She shifts her <</if>> hips innocently and moves up to her lower legs. But then, as she slowly massages the lotion into her <<if $activeSlave.muscles > 30>>muscled<<elseif $activeSlave.weight > 10>>plush<<else>>cute<</if>> calves, she arches her back and cocks her hips a little. This causes <<if ["chastity", "combined chastity"].includes($activeSlave.dickAccessory)>> - the bottom of her chastity cage to become visible, a reminder that she's a butthole slave. + the bottom of her chastity cage to become visible, a reminder that + <<if canDoAnal($activeSlave) && canDoVaginal($activeSlave)>> + only her holes are to be used. + <<elseif canDoAnal($activeSlave) && !canDoVaginal($activeSlave)>> + she's a butthole slave. + <<elseif canDoVaginal($activeSlave)>> + the focus is her pussy, not dick. + <<else>> + with her ass in chastity, she's forbidden from release. + <</if>> <<elseif $activeSlave.belly >= 100000>> - the underside of her <<if $activeSlave.bellyPreg >= 3000>>pregnancy<<else>>belly<</if>> and her flushed pussy to become visible, glistening with moisture. + the underside of her <<if $activeSlave.bellyPreg >= 3000>>pregnancy<<else>>belly<</if>> and + <<if canDoAnal($activeSlave) && canDoVaginal($activeSlave)>> + her flushed, glistening pussy and <<if $activeSlave.anus == 0>>virgin<<else>>hungry<</if>> anus to become visible. + <<elseif canDoVaginal($activeSlave)>> + her flushed pussy to become visible, glistening with moisture. + <<else>> + her <<if $activeSlave.anus == 0>>virgin<<else>>hungry<</if>> anus to become visible. + <</if>> <<elseif $activeSlave.belly >= 5000>> - the underside of her <<if $activeSlave.bellyPreg >= 3000>>pregnancy<<else>>belly<</if>> and her flushed pussy to appear for a moment, glistening with moisture, before she hugs her thighs together, sighing as she flexes them a little to put gentle pressure on her womanhood. + the underside of her <<if $activeSlave.bellyPreg >= 3000>>pregnancy<<else>>belly<</if>> and + <<if canDoAnal($activeSlave) && canDoVaginal($activeSlave)>> + her flushed, glistening pussy and <<if $activeSlave.anus == 0>>virgin<<else>>hungry<</if>> anus to become visible, before she hugs her thighs together, sighing as she flexes them a little to put gentle pressure on her womanhood. + <<elseif canDoVaginal($activeSlave)>> + her flushed pussy to appear for a moment, glistening with moisture, before she hugs her thighs together, sighing as she flexes them a little to put gentle pressure on her womanhood. + <<else>> + her <<if $activeSlave.anus == 0>>virgin<<else>>hungry<</if>> anus to become visible. + <</if>> +<<elseif !canAchieveErection($activeSlave) && $activeSlave.dick > 10>> + her giant, soft dick to swing back between her legs; she hugs her thighs together again and traps it back behind her, enjoying the sensation along its length. <<elseif !canAchieveErection($activeSlave) && $activeSlave.dick > 0>> her thighs to come tightly together, hiding her soft dick. <<elseif $activeSlave.dick > 0>> her stiff dick to swing back between her legs; she hugs her thighs together again and traps it back behind her, showing off how hard she is. -<<elseif $activeSlave.vagina == -1>> - it to become apparent that her hungry asspussy serves as her only genitalia. -<<else>> +<<elseif canDoAnal($activeSlave) && canDoVaginal($activeSlave)>> + her flushed, glistening pussy and <<if $activeSlave.anus == 0>>virgin<<else>>hungry<</if>> anus to become visible, before she hugs her thighs together, sighing as she flexes them a little to put gentle pressure on her womanhood. +<<elseif canDoVaginal($activeSlave>> her flushed pussy to appear for a moment, glistening with moisture, before she hugs her thighs together, sighing as she flexes them a little to put gentle pressure on her womanhood. +<<else>> + it to become apparent that her hungry asspussy serves as her only genitalia. <</if>> With her back arched and her thighs together her <<if $activeSlave.butt > 5>>massive buttocks part a little, showing a hint of<<elseif $activeSlave.butt > 2>>big buttocks part, revealing<<else>>cute buttocks are spread wide apart, displaying<</if>> her <<if $activeSlave.anus > 2>>lewd anal slit<<elseif $activeSlave.anus == 2>>big butthole<<else>>tight anus<</if>>. <<if canSee($activeSlave)>><<if $activeSlave.belly >= 50000>>Her _belly stomach is far too large to see around, but given her held pose, she's waiting to see what you do<<elseif $activeSlave.belly >= 5000>>She peeks around the edge of her belly, checking your crotch to see if you are watching<<else>>She peeks between her legs again, checking to see if you're watching<</if>><<else>>Her ears perk up, listening to see if you are still there<</if>>. @@ -11332,7 +11359,7 @@ You tell her kindly that you understand, and that she'll be trained to address t <</if>> <<elseif ($activeSlave.fetish == "dom") && ($activeSlave.fetishKnown == 1)>> activate the ink gun, its low buzzing drawing a moan of anticipation out of $activeSlave.slaveName. Working at a touchscreen, you exercise your artistic talents, making the side of her face fierce with tribal patterns. Tattooing over such thin and sensitive skin is intensely painful, but she tolerates it, permitting nothing but a low and continuing growl to escape. She's obviously tired out by the pain when she's finally allowed to rise, but she <<if canSee($activeSlave)>>looks at herself in the mirror<<else>>listens to your description<</if>> with @@.hotpink;obvious approval.@@ - <<set $activeSlave.lipsTat = "tribal">> + <<set $activeSlave.lipsTat = "tribal patterns">> <<elseif ($activeSlave.fetish == "sadist") && ($activeSlave.fetishKnown == 1)>> <<if canAchieveErection($activeSlave)>> take hold of her most intimate parts and put a set of massive piercings straight through her shaft. She shrieks with agony, the noise going on and on before diminishing into breathless sobbing. Much later, when she gets gingerly up from the chair, she doesn't look eager to stick her cock in anything, diff --git a/src/uncategorized/RETS.tw b/src/uncategorized/RETS.tw index 2f17b38ba399ee4a99eff8fc2f1c612d779341d5..431345ff7e771f906f95caf650e96274cad8fb86 100644 --- a/src/uncategorized/RETS.tw +++ b/src/uncategorized/RETS.tw @@ -681,7 +681,7 @@ $subSlave.slaveName keeps her eyes clamped shut and her hands down at her sides, <<set _belly = bellyAdjective($subSlave)>> As you pass the showers, you hear what sounds like a muffled altercation over the noise of the showers running. You look in to see $subSlave.slaveName's $subSlave.skin body facing you, pressed hard up against the glass wall of one of the showers. Her <<if $subSlave.face > 95>>gorgeous<<elseif $subSlave.face > 40>>beautiful<<elseif $subSlave.face > 10>>pretty<<elseif $subSlave.face >= -10>>attractive<<else>>homely<</if>> face<<if $subSlave.belly >= 5000>> and <<if $subSlave.bellyPreg >= 5000>>pregnant<<else>>_belly<</if>> belly are<<else>> is<</if>> smashed against the glass, <<if $subSlave.belly >= 5000>>her face <</if>>contorted in pain and fear. The apparent mystery is solved when you notice that there are four legs visible: there's a pair of <<if ($activeSlave.muscles > 95)>>ripped<<elseif ($activeSlave.muscles > 30)>>muscular<<elseif ($activeSlave.muscles > 5)>>toned<<else>>soft<</if>> $activeSlave.skin calves behind $subSlave.slaveName's. <span id="name"><<print "[[$activeSlave.slaveName|Long Slave Description][$nextLink to passage(), $eventDescription to 1]]">></span>'s face appears at $subSlave.slaveName's ear, and though you can't hear exactly what she says, it's something along the lines of "Take it, you whiny little bitch." She's clearly got <<if canPenetrate($activeSlave)>>her cock<<else>>a couple of fingers<</if>> up $subSlave.slaveName's asshole. <br><br> -Both slaves notice you at the same time. $subSlave.slaveName's <<if canSee($subSlave)>>$subSlave.eyes eyes widen<<else>>face lights up<</if>>, but her momentary look of hope is snuffed out when she remembers who you are. $activeSlave.slaveName, on the other hand, looks a little doubtful. The rules allow her to fuck your other slaves, but she isn't quite sure what the right thing to do is, since she isn't the most dominant force in the showers any more. +Both slaves notice you at the same time. $subSlave.slaveName's <<if canSee($subSlave)>>$subSlave.eyeColor eyes widen<<else>>face lights up<</if>>, but her momentary look of hope is snuffed out when she remembers who you are. $activeSlave.slaveName, on the other hand, looks a little doubtful. The rules allow her to fuck your other slaves, but she isn't quite sure what the right thing to do is, since she isn't the most dominant force in the showers any more. <<case "repressed anal virgin">> diff --git a/src/uncategorized/dispensary.tw b/src/uncategorized/dispensary.tw index 1d48691c6d5ab7174f621eb74a2648cedc545cef..0bc9ddc793c6629a26adb0f410316aaebccbd84d 100644 --- a/src/uncategorized/dispensary.tw +++ b/src/uncategorized/dispensary.tw @@ -1,4 +1,5 @@ :: Dispensary [nobr] + <<HSM>> <<set $nextButton = "Back", $nextLink = "Manage Penthouse", $showEncyclopedia = 1, $encyclopedia = "The Pharmaceutical Fab.",_PCSkillCheck = Math.max($upgradeMultiplierMedicine, $HackingSkillMultiplier)>> @@ -28,7 +29,7 @@ The Dispensary <br> The Organ Farm <hr> -<<if ($organFarmUpgrade < 3) && ($rep <= 10000*$upgradeMultiplierMedicine)>> +<<if ($organFarmUpgrade < 3) && ($rep <= 10000*$_PCSkillCheck)>> //You lack the reputation to access experimental organ farm parts// <br> <<elseif $dispensaryUpgrade == 0 && $organFarmUpgrade == 2>> @@ -37,19 +38,19 @@ The Organ Farm <<elseif $organs.length > 0>> //The organ farm can not be upgraded while it is use// <br> -<<elseif ($organFarmUpgrade == 2) && ($rep > 10000*$upgradeMultiplierMedicine)>> - [[Upgrade to the organ farm to the cutting edge model|Dispensary][$cash -= 150000*$upgradeMultiplierMedicine, $organFarmUpgrade = 3]] - //Costs <<print cashFormat(150000*$upgradeMultiplierMedicine)>>// +<<elseif ($organFarmUpgrade == 2) && ($rep > 10000*$_PCSkillCheck)>> + [[Upgrade to the organ farm to the cutting edge model|Dispensary][$cash -= 150000*$_PCSkillCheck, $organFarmUpgrade = 3]] + //Costs <<print cashFormat(150000*$_PCSkillCheck)>>// <br> //Will allow the organ farm to rapidly grow organs without risk to the implantee's health.// <br> -<<elseif ($organFarmUpgrade == 1) && ($rep > 10000*$upgradeMultiplierMedicine)>> - [[Upgrade the organ farm with an experimental growth accelerator|Dispensary][$cash -= 50000*$upgradeMultiplierMedicine, $organFarmUpgrade = 2]] - //Costs <<print cashFormat(50000*$upgradeMultiplierMedicine)>>// +<<elseif ($organFarmUpgrade == 1) && ($rep > 10000*$_PCSkillCheck)>> + [[Upgrade the organ farm with an experimental growth accelerator|Dispensary][$cash -= 50000*$_PCSkillCheck, $organFarmUpgrade = 2]] + //Costs <<print cashFormat(50000*$_PCSkillCheck)>>// <br> //Will allow the organ farm to quickly grow organs. Implanted organs may cause health issues.// <br> -<<elseif ($organFarmUpgrade == 0) && ($rep > 10000*$upgradeMultiplierMedicine)>> - [[Upgrade the fabricator with an experimental organ farm|Dispensary][$cash -= 50000*$upgradeMultiplierMedicine, $organFarmUpgrade = 1]] - //Costs <<print cashFormat(50000*$upgradeMultiplierMedicine)>>// +<<elseif ($organFarmUpgrade == 0) && ($rep > 10000*$_PCSkillCheck)>> + [[Upgrade the fabricator with an experimental organ farm|Dispensary][$cash -= 50000*$_PCSkillCheck, $organFarmUpgrade = 1]] + //Costs <<print cashFormat(50000*$_PCSkillCheck)>>// <br> //Will allow the fabrication of tailored organs using the autosurgery.// <br> <</if>> @@ -121,12 +122,12 @@ It is currently working on the following organs: <</if>> <<if $organFarmUpgrade > 0>> - <<if ($youngerOvaries != 1) && ($rep <= 10000*$upgradeMultiplierMedicine)>> + <<if ($youngerOvaries != 1) && ($rep <= 10000*$_PCSkillCheck)>> //You lack the reputation to access designs for cloning fertile ovaries for menopausal slaves.// <br> - <<elseif ($youngerOvaries != 1) && ($rep > 10000*$upgradeMultiplierMedicine)>> - [[Purchase designs for cloning fertile ovaries for menopausal slaves|Dispensary][$cash -= 30000*$upgradeMultiplierMedicine, $youngerOvaries = 1]] - //Costs <<print cashFormat(30000*$upgradeMultiplierMedicine)>>// + <<elseif ($youngerOvaries != 1) && ($rep > 10000*$_PCSkillCheck)>> + [[Purchase designs for cloning fertile ovaries for menopausal slaves|Dispensary][$cash -= 30000*$_PCSkillCheck, $youngerOvaries = 1]] + //Costs <<print cashFormat(30000*$_PCSkillCheck)>>// <br> //Will allow the growth of younger, fertile ovaries for menopausal slaves. Restored fertility will only last for a couple years at most.// <br> <<elseif ($youngerOvaries > 0)>> @@ -153,8 +154,8 @@ The fabricator is producing <<elseif $injectionUpgrade == 1>> prototype growth hormones. <<if $rep > 10000>> - [[Upgrade the fabricator to customize each slave's growth hormones|Dispensary][$cash -= 50000*$upgradeMultiplierMedicine, $injectionUpgrade = 2]] - //Costs <<print cashFormat(50000*$upgradeMultiplierMedicine)>>// + [[Upgrade the fabricator to customize each slave's growth hormones|Dispensary][$cash -= 50000*$_PCSkillCheck, $injectionUpgrade = 2]] + //Costs <<print cashFormat(50000*$_PCSkillCheck)>>// <br> //Should improve the reliability of growth injections of all kinds.// <<else>> //You lack the reputation to obtain prototype fabricator upgrades// @@ -162,8 +163,8 @@ The fabricator is producing <<elseif $injectionUpgrade == 2>> prototype growth hormones. <<if $rep > 14000>> - [[Upgrade the fabricator with prototype biomechanical microfactories|Dispensary][$cash -= 100000*$upgradeMultiplierMedicine, $injectionUpgrade = 3]] - //Costs <<print cashFormat(100000*$upgradeMultiplierMedicine)>>// + [[Upgrade the fabricator with prototype biomechanical microfactories|Dispensary][$cash -= 100000*$_PCSkillCheck, $injectionUpgrade = 3]] + //Costs <<print cashFormat(100000*$_PCSkillCheck)>>// <br> //Should improve the reliability of growth injections of all kinds.// <br> <<else>> @@ -179,8 +180,8 @@ The fabricator is producing <<if $hormoneUpgradeMood == 0>> standardized hormone replacement therapies. <<if $rep > 2000>> - [[Upgrade for individualized therapy|Dispensary][$cash -= 10000*$upgradeMultiplierMedicine, $hormoneUpgradeMood = 1]] - //Costs <<print cashFormat(10000*$upgradeMultiplierMedicine)>>// + [[Upgrade for individualized therapy|Dispensary][$cash -= 10000*$_PCSkillCheck, $hormoneUpgradeMood = 1]] + //Costs <<print cashFormat(10000*$_PCSkillCheck)>>// <br> //Should eliminate the occasional moodiness and sexual disinterest caused by generalized therapy.// <br> <<else>> @@ -227,10 +228,10 @@ The hormone replacement therapies <</if>> <<if $precociousPuberty == 1>> - <<if ($pubertyHormones == 0) && ($rep <= 4500*$upgradeMultiplierMedicine)>> + <<if ($pubertyHormones == 0) && ($rep <= 4500*$_PCSkillCheck)>> //You lack the reputation to fund forced puberty drugs// <br> - <<elseif ($pubertyHormones == 0) && ($rep > 4500*$upgradeMultiplierMedicine)>> + <<elseif ($pubertyHormones == 0) && ($rep > 4500*$_PCSkillCheck)>> [[Fund research into powerful hormonal injections to jumpstart puberty|Dispensary][$cash -= 30000*$upgradeMultiplierMedicine, $pubertyHormones = 1]] //Costs <<print cashFormat(30000*$upgradeMultiplierMedicine)>>// <br> //Will allow the production of powerful hormonal drugs designed to force a slave through puberty without regard for side effects. // @@ -245,10 +246,10 @@ The hormone replacement therapies Dietary Upgrades <hr> <<if $feeder == 1>> - <<if ($dietXXY == 0) && ($rep <= 3500*$upgradeMultiplierMedicine)>> + <<if ($dietXXY == 0) && ($rep <= 3500*$_PCSkillCheck)>> //You lack the reputation to fund research into hermaphrodite hormones// <br> - <<elseif ($dietXXY == 0) && ($rep > 3500*$upgradeMultiplierMedicine)>> + <<elseif ($dietXXY == 0) && ($rep > 3500*$_PCSkillCheck)>> [[Fund research into developing hermaphrodite hormone therapies|Dispensary][$cash -= 10000*$upgradeMultiplierMedicine, $dietXXY = 1]] //Costs <<print cashFormat(10000*$upgradeMultiplierMedicine)>>// <br> //Will allow for specially balanced meals to be served in the cafeteria designed to promote both halves of a herm's sexuality. // @@ -285,7 +286,7 @@ Dietary Upgrades <br> Pharmacological Upgrades <hr> -<<if ($curativeUpgrade == 0) && ($rep > 6000*$upgradeMultiplierMedicine)>> +<<if ($curativeUpgrade == 0) && ($rep > 6000*$_PCSkillCheck)>> [[Purchase data on advanced curatives|Dispensary][$cash -= 25000*_PCSkillCheck, $curativeUpgrade = 1]] //Costs <<print cashFormat(25000*_PCSkillCheck)>>// <br> //Should improve the effectiveness of curative treatment.// @@ -295,7 +296,7 @@ Pharmacological Upgrades <br> <</if>> -<<if ($growthStim == 0) && ($rep > 6000*$upgradeMultiplierMedicine)>> +<<if ($growthStim == 0) && ($rep > 6000*$_PCSkillCheck)>> [[Purchase data on growth stimulants|Dispensary][$cash -= 20000*_PCSkillCheck, $growthStim = 1]] //Costs <<print cashFormat(20000*_PCSkillCheck)>>// <br> //Will allow the manufacturing of drugs to encourage growth in slave height.// @@ -305,7 +306,7 @@ Pharmacological Upgrades <br> <</if>> -<<if ($aphrodisiacUpgradeRefine == 0) && ($rep > 6000*$upgradeMultiplierMedicine)>> +<<if ($aphrodisiacUpgradeRefine == 0) && ($rep > 6000*$_PCSkillCheck)>> [[Purchase data on refined aphrodisiacs|Dispensary][$cash -= 20000*_PCSkillCheck, $aphrodisiacUpgradeRefine = 1]] //Costs <<print cashFormat(20000*_PCSkillCheck)>>// <br> //Will prevent most physical side effects of aphrodisiacs. Once the formulas are changed they can not be changed back.// @@ -315,7 +316,7 @@ Pharmacological Upgrades <br> <</if>> -<<if ($aphrodisiacUpgrade == 0) && ($rep > 6000*$upgradeMultiplierMedicine)>> +<<if ($aphrodisiacUpgrade == 0) && ($rep > 6000*$_PCSkillCheck)>> [[Purchase data on aphrodisiac withdrawal treatment|Dispensary][$cash -= 10000*_PCSkillCheck, $aphrodisiacUpgrade = 1]] //Costs <<print cashFormat(10000*_PCSkillCheck)>>// <br> //Should prevent most negative effects of withdrawal.// @@ -327,7 +328,7 @@ Pharmacological Upgrades <<if ($healthyDrugsUpgrade == 0)>> <<if (($organFarmUpgrade >= 1) && ($injectionUpgrade != 0) && ($curativeUpgrade == 1) && ($aphrodisiacUpgrade == 1))>> - <<if ($rep >= 15000*$upgradeMultiplierMedicine)>> + <<if ($rep >= 15000*$_PCSkillCheck)>> [[Fund research into drug formulations without negative physical side effects|Dispensary][$cash -= 500000*$upgradeMultiplierMedicine,$healthyDrugsUpgrade = 1]] //Costs <<print cashFormat(500000*$upgradeMultiplierMedicine)>>// <br> //Will prevent the negative side effects of excessive drug usage on your slaves.// @@ -356,12 +357,12 @@ Pharmacological Upgrades Fertility Focused Pharmacology <hr> <<if $seeHyperPreg == 1>> - <<if $superFertilityDrugs == 1 && ($rep > 10000*$upgradeMultiplierMedicine) && $pregSpeedControl != 1>> + <<if $superFertilityDrugs == 1 && ($rep > 10000*$_PCSkillCheck) && $pregSpeedControl != 1>> [[Fund research pregnancy speed control methods|Dispensary][$cash -= 200000*$upgradeMultiplierMedicine, $pregSpeedControl = 1, $clinicSpeedGestation = 0]] //Costs <<print cashFormat(200000*$upgradeMultiplierMedicine)>>// <br> // Fund underground research labs to develop methods for controlling pregnancy progress. // <br> - <<elseif ($rep <= 10000*$upgradeMultiplierMedicine) && $pregSpeedControl != 1>> + <<elseif ($rep <= 10000*$_PCSkillCheck) && $pregSpeedControl != 1>> //You lack the reputation required to contact underground research labs to develop methods for controlling pregnancy progress.// <br> <<elseif ($pregSpeedControl == 1)>> @@ -369,12 +370,12 @@ Fertility Focused Pharmacology <br> <</if>> <<elseif $birthsTotal > 10>> - <<if ($rep > 10000*$upgradeMultiplierMedicine) && $pregSpeedControl != 1>> + <<if ($rep > 10000*$_PCSkillCheck) && $pregSpeedControl != 1>> [[Fund research pregnancy speed control methods|Dispensary][$cash -= 200000*$upgradeMultiplierMedicine, $pregSpeedControl = 1, $clinicSpeedGestation = 0]] //Costs <<print cashFormat(200000*$upgradeMultiplierMedicine)>>// <br> // Fund underground research labs to develop methods for controlling pregnancy progress. // <br> - <<elseif ($rep <= 10000*$upgradeMultiplierMedicine) && $pregSpeedControl != 1>> + <<elseif ($rep <= 10000*$_PCSkillCheck) && $pregSpeedControl != 1>> //You lack the reputation required to contact underground research labs to develop methods for controlling pregnancy progress.// <br> <<elseif ($pregSpeedControl == 1)>> @@ -386,7 +387,7 @@ Fertility Focused Pharmacology <br> <</if>> -<<if ($superFertilityDrugs == 0) && ($rep > 2500*$upgradeMultiplierMedicine) && $seeHyperPreg == 1>> +<<if ($superFertilityDrugs == 0) && ($rep > 2500*$_PCSkillCheck) && $seeHyperPreg == 1>> [[Purchase data on powerful fertility drugs|Dispensary][$cash -= 20000*_PCSkillCheck, $superFertilityDrugs = 1]] //Costs <<print cashFormat(20000*_PCSkillCheck)>>// <br> //Should improve the likelihood of conception and multiples. // @@ -400,14 +401,14 @@ Fertility Focused Pharmacology <br> Implant Production <hr> -<<if ($ImplantProductionUpgrade == 0) && ($rep <= 2000*$upgradeMultiplierMedicine)>> +<<if ($ImplantProductionUpgrade == 0) && ($rep <= 2000*$_PCSkillCheck)>> //You lack the reputation to access experimental implant manufacturer parts// <br> <</if>> -<<if ($ImplantProductionUpgrade == 0) && ($rep > 2000*$upgradeMultiplierMedicine)>> - [[Upgrade the fabricator with an experimental implant manufacturer|Dispensary][$cash -= 20000*$upgradeMultiplierMedicine, $ImplantProductionUpgrade = 1]] - //Costs <<print cashFormat(20000*$upgradeMultiplierMedicine)>>// +<<if ($ImplantProductionUpgrade == 0) && ($rep > 2000*$_PCSkillCheck)>> + [[Upgrade the fabricator with an experimental implant manufacturer|Dispensary][$cash -= 20000*$_PCSkillCheck, $ImplantProductionUpgrade = 1]] + //Costs <<print cashFormat(20000*$_PCSkillCheck)>>// <br> //Will allow the fabrication of special implants using the autosurgery.// <br> <<elseif ($ImplantProductionUpgrade > 0)>> @@ -416,11 +417,11 @@ Implant Production <</if>> <<if $ImplantProductionUpgrade == 1 && $seeHyperPreg == 1 && $seeExtreme == 1 && $seePreg != 0>> - <<if ($permaPregImplant == 0) and ($rep <= 4000*$upgradeMultiplierMedicine)>> + <<if ($permaPregImplant == 0) and ($rep <= 4000*$_PCSkillCheck)>> //You lack the reputation to access experimental pregnancy generator schematics// <br> <</if>> - <<if ($permaPregImplant == 0) && ($rep > 4000*$upgradeMultiplierMedicine)>> + <<if ($permaPregImplant == 0) && ($rep > 4000*$_PCSkillCheck)>> [[Purchase schematics for an experimental implantable pregnancy generator|Dispensary][$cash -= 30000*_PCSkillCheck, $permaPregImplant = 1]] //Costs <<print cashFormat(30000*_PCSkillCheck)>>// <br> //Will allow the fabrication of implants that force perpetual pregnancy.// @@ -432,12 +433,12 @@ Implant Production <</if>> <<if $ImplantProductionUpgrade == 1>> - <<if ($bellyImplants == 0) && ($rep <= 2000*$upgradeMultiplierMedicine)>> + <<if ($bellyImplants == 0) && ($rep <= 2000*$_PCSkillCheck)>> //You lack the reputation to access experimental fillable abdominal implants// <br> <</if>> - <<if ($bellyImplants == 0) && ($rep > 2000*$upgradeMultiplierMedicine)>> + <<if ($bellyImplants == 0) && ($rep > 2000*$_PCSkillCheck)>> [[Purchase schematics for fillable abdominal implants|Dispensary][$cash -= 20000*_PCSkillCheck, $bellyImplants = 1]] //Costs <<print cashFormat(20000*_PCSkillCheck)>>// <br> //Will allow the fabrication of fillable abdominal implants using the autosurgery.// @@ -447,12 +448,12 @@ Implant Production <br> <</if>> - <<if ($bellyImplants == 1) && ($cervixImplants != 1) && ($rep <= 6000*$upgradeMultiplierMedicine)>> /* show only after belly implants already researched */ + <<if ($bellyImplants == 1) && ($cervixImplants != 1) && ($rep <= 6000*$_PCSkillCheck)>> /* show only after belly implants already researched */ //You lack the reputation to access experimental cervix filter micropumps schematics for abdominal implants// <br> <</if>> - <<if ($bellyImplants == 1) && ($cervixImplants != 1) && ($rep >6000*$upgradeMultiplierMedicine)>> /* nanotech like technology much more impressive and costly than simple implant */ + <<if ($bellyImplants == 1) && ($cervixImplants != 1) && ($rep >6000*$_PCSkillCheck)>> /* nanotech like technology much more impressive and costly than simple implant */ [[Purchase schematics for cervix filter micropumps|Dispensary][$cash -= 70000*_PCSkillCheck, $cervixImplants = 1]] //Costs <<print cashFormat(70000*_PCSkillCheck)>>// <br> //Will allow the fabrication of cervix filter micropumps for fillable abdominal implants using the autosurgery.// @@ -462,11 +463,11 @@ Implant Production <br> <</if>> - <<if ($prostateImplants != 1) && ($rep <= 3000*$upgradeMultiplierMedicine)>> + <<if ($prostateImplants != 1) && ($rep <= 3000*$_PCSkillCheck)>> //You lack the reputation to access plans for prostate implants// <br> <</if>> - <<if ($prostateImplants != 1) && ($rep > 3000*$upgradeMultiplierMedicine)>> + <<if ($prostateImplants != 1) && ($rep > 3000*$_PCSkillCheck)>> [[Purchase plans for ejaculation enhancing prostate implants|Dispensary][$cash -= 30000*_PCSkillCheck, $prostateImplants = 1]] //Costs <<print cashFormat(30000*_PCSkillCheck)>>// <br> //Will allow the fabrication of a prostate implant designed to stimulate fluid production for massive ejaculations. Beware of leaking and dehydration.// @@ -476,11 +477,11 @@ Implant Production <br> <</if>> - <<if ($meshImplants != 1) && ($rep <= 10000*$upgradeMultiplierMedicine)>> + <<if ($meshImplants != 1) && ($rep <= 10000*$_PCSkillCheck)>> //You lack the reputation to access plans for supportive breast implants// <</if>> - <<if ($meshImplants != 1) && ($rep > 10000*$upgradeMultiplierMedicine)>> + <<if ($meshImplants != 1) && ($rep > 10000*$_PCSkillCheck)>> [[Purchase plans for supportive mesh breast implants|Dispensary][$cash -= 40000*_PCSkillCheck, $meshImplants = 1]] //Costs <<print cashFormat(40000*_PCSkillCheck)>>// <br> //Will allow the fabrication of organic and supportive mesh breast implants.// @@ -499,7 +500,7 @@ Future Societies Research <<if $seePreg != 0>> <<if $arcologies[0].FSGenderRadicalistDecoration == 100 && $organFarmUpgrade > 0>> <<if ($arcologies[0].FSGenderRadicalistResearch == 0)>> - <<if ($rep >= 10000*$upgradeMultiplierMedicine)>> + <<if ($rep >= 10000*$_PCSkillCheck)>> [[Fund research into developing male pregnancy methods|Dispensary][$cash -= 50000*$upgradeMultiplierMedicine,$arcologies[0].FSGenderRadicalistResearch = 1]] //Costs <<print cashFormat(50000*$upgradeMultiplierMedicine)>>. Will allow cloning and production of anal uteri and ovaries.// <br> <<else>> @@ -520,7 +521,7 @@ Future Societies Research <</if>> <<if ($ImplantProductionUpgrade == 1) and ($arcologies[0].FSTransformationFetishistDecoration >= 100)>> - <<if ($arcologies[0].FSTransformationFetishistResearch == 0) and ($rep <= 5000*$upgradeMultiplierMedicine)>> + <<if ($arcologies[0].FSTransformationFetishistResearch == 0) and ($rep <= 5000*$_PCSkillCheck)>> //You lack the reputation to access experimental gigantic implants and elasticizing filler.// <br> <<elseif ($arcologies[0].FSTransformationFetishistResearch == 0)>> @@ -542,7 +543,7 @@ Future Societies Research <<if $arcologies[0].FSAssetExpansionistDecoration == 100>> <<if ($arcologies[0].FSAssetExpansionistResearch == 0)>> - <<if ($rep >= 5000*$upgradeMultiplierMedicine)>> + <<if ($rep >= 5000*$_PCSkillCheck)>> [[Fund research into drug formulations for growth without limit|Dispensary][$cash -= 30000*$upgradeMultiplierMedicine,$arcologies[0].FSAssetExpansionistResearch = 1]] //Costs <<print cashFormat(30000*$upgradeMultiplierMedicine)>>. Will allow creation of drugs to push assets to unthinkable sizes.// <br> <<else>> @@ -563,7 +564,7 @@ Future Societies Research <<if $arcologies[0].FSSlimnessEnthusiastDecoration == 100>> <<if ($arcologies[0].FSSlimnessEnthusiastResearch == 0)>> - <<if ($rep >= 5000*$upgradeMultiplierMedicine)>> + <<if ($rep >= 5000*$_PCSkillCheck)>> [[Fund research into drug formulations for slimming slaves|Dispensary][$cash -= 30000*$upgradeMultiplierMedicine,$arcologies[0].FSSlimnessEnthusiastResearch = 1]] //Costs <<print cashFormat(30000*$upgradeMultiplierMedicine)>>. Will allow creation of drugs to shrink assets.// <br> <<else>> @@ -584,7 +585,7 @@ Future Societies Research <<if $arcologies[0].FSYouthPreferentialistDecoration == 100>> <<if ($arcologies[0].FSYouthPreferentialistResearch == 0)>> - <<if ($rep >= 5000*$upgradeMultiplierMedicine)>> + <<if ($rep >= 5000*$_PCSkillCheck)>> [[Fund research into skin care designed to reverse the effects of aging|Dispensary][$cash -= 30000*$upgradeMultiplierMedicine,$arcologies[0].FSYouthPreferentialistResearch = 1]] //Costs <<print cashFormat(30000*$upgradeMultiplierMedicine)>>. Will allow creation of beauty creams designed to make slaves look young again.// <br> <<else>> diff --git a/src/uncategorized/rulesAssistant.tw b/src/uncategorized/rulesAssistant.tw index 6374695dc82a1f064afe7e4688f4dfac9961b90d..0f959eeb97f2ff51115fabcdf89bf6606ce7f1d9 100644 --- a/src/uncategorized/rulesAssistant.tw +++ b/src/uncategorized/rulesAssistant.tw @@ -561,7 +561,7 @@ Clothes: <<RARuleModified>> <</link>> | -<<if ($arcologies[0].FSPhysicalIdealist != "unset") || ($cheatMode == 1) || ($clothesBoughtOil == 1)>> +<<if isItemAccessible("body oil")>> //FS// <<link "Body oil">> <<set $currentRule.clothes = "body oil">> @@ -570,7 +570,7 @@ Clothes: <</link>> | <</if>> -<<if ($arcologies[0].FSGenderFundamentalist != "unset") || ($cheatMode == 1) || ($clothesBoughtBunny == 1)>> +<<if isItemAccessible("a bunny outfit")>> //FS// <<link "Bunny outfit">> <<set $currentRule.clothes = "a bunny outfit">> @@ -579,7 +579,7 @@ Clothes: <</link>> | <</if>> -<<if ($arcologies[0].FSChattelReligionist != "unset") || ($cheatMode == 1) || ($clothesBoughtHabit == 1)>> +<<if isItemAccessible("a chattel habit")>> //FS// <<link "Chattel habit">> <<set $currentRule.clothes = "a chattel habit">> @@ -588,7 +588,7 @@ Clothes: <</link>> | <</if>> -<<if ($arcologies[0].FSPaternalist != "unset") || ($cheatMode == 1) || ($clothesBoughtConservative == 1)>> +<<if isItemAccessible("conservative clothing")>> //FS// <<link "Conservative clothing">> <<set $currentRule.clothes = "conservative clothing">> @@ -597,7 +597,7 @@ Clothes: <</link>> | <</if>> -<<if ($arcologies[0].FSArabianRevivalist != "unset") || ($cheatMode == 1) || ($clothesBoughtHarem == 1)>> +<<if isItemAccessible("harem gauze")>> //FS// <<link "Harem gauze">> <<set $currentRule.clothes = "harem gauze">> @@ -606,16 +606,16 @@ Clothes: <</link>> | <</if>> -<<if ($arcologies[0].FSAztecRevivalist != "unset") || ($cheatMode == 1) || ($clothesBoughtHuipil == 1)>> +<<if isItemAccessible("a huipil")>> //FS// <<link "Huipil">> - <<set $currentRule.clothes = "a huipil", $currentRule.choosesOwnClothes = 0>> + <<set $currentRule.clothes = "a huipil">> <<RAChangeClothes>> <<RARuleModified>> <</link>> | <</if>> -<<if ($arcologies[0].FSEdoRevivalist != "unset") || ($cheatMode == 1) || ($clothesBoughtKimono == 1)>> +<<if isItemAccessible("a kimono")>> //FS// <<link "Kimono">> <<set $currentRule.clothes = "a kimono">> @@ -624,7 +624,7 @@ Clothes: <</link>> | <</if>> -<<if ($arcologies[0].FSRepopulationFocus != "unset") || ($cheatMode == 1) || ($clothesBoughtMaternityDress == 1)>> +<<if isItemAccessible("a maternity dress")>> //FS// <<link "Maternity dress">> <<set $currentRule.clothes = "a maternity dress">> @@ -633,7 +633,7 @@ Clothes: <</link>> | <</if>> -<<if ($arcologies[0].FSRepopulationFocus != "unset") || ($cheatMode == 1) || ($clothesBoughtMaternityLingerie == 1)>> +<<if isItemAccessible("attractive lingerie for a pregnant woman")>> //FS// <<link "Maternity lingerie">> <<set $currentRule.clothes = "attractive lingerie for a pregnant woman">> @@ -642,7 +642,7 @@ Clothes: <</link>> | <</if>> -<<if ($arcologies[0].FSChineseRevivalist != "unset") || ($cheatMode == 1) || ($clothesBoughtQipao == 1)>> +<<if isItemAccessible("a slutty qipao")>> //FS// <<link "Slutty qipao">> <<set $currentRule.clothes = "a slutty qipao">> @@ -651,7 +651,7 @@ Clothes: <</link>> | <</if>> -<<if ($arcologies[0].FSHedonisticDecadence != "unset") || ($cheatMode == 1) || ($clothesBoughtLazyClothes == 1)>> +<<if isItemAccessible("stretch pants and a crop-top")>> //FS// <<link "Stretch pants and a crop-top">> <<set $currentRule.clothes = "stretch pants and a crop-top">> @@ -660,7 +660,7 @@ Clothes: <</link>> | <</if>> -<<if ($arcologies[0].FSRomanRevivalist != "unset") || ($cheatMode == 1) || ($clothesBoughtToga == 1)>> +<<if isItemAccessible("a toga")>> //FS// <<link "Toga">> <<set $currentRule.clothes = "a toga">> @@ -669,7 +669,7 @@ Clothes: <</link>> | <</if>> -<<if ($arcologies[0].FSPastoralist != "unset") || ($cheatMode == 1) || ($clothesBoughtWestern == 1)>> +<<if isItemAccessible("Western clothing")>> //FS// <<link "Western clothing">> <<set $currentRule.clothes = "Western clothing">> @@ -685,7 +685,7 @@ Clothes: <<RAChangeClothes>> <<RARuleModified>> <</link>> -<<if ($arcologies[0].FSDegradationist != "unset") || ($cheatMode == 1) || ($clothesBoughtChains == 1)>> +<<if isItemAccessible("chains")>> | //FS// <<link "Chains">> <<set $currentRule.clothes = "chains">> @@ -778,7 +778,7 @@ Collar: <span id="collar">''$currentRule.collar.''</span> <<RAChangeCollar>> <<RARuleModified>> <</link>> -<<if ($arcologies[0].FSGenderFundamentalist != "unset") || ($cheatMode == 1) || ($clothesBoughtBunny == 1)>> +<<if isItemAccessible("bowtie")>> | //FS// <<link "Bowtie collar">> <<set $currentRule.collar = "bowtie">> @@ -786,7 +786,7 @@ Collar: <span id="collar">''$currentRule.collar.''</span> <<RARuleModified>> <</link>> <</if>> -<<if ($arcologies[0].FSEgyptianRevivalist != "unset") || ($cheatMode == 1) || ($clothesBoughtEgypt == 1)>> +<<if isItemAccessible("ancient Egyptian")>> | //FS// <<link "Ancient Egyptian">> <<set $currentRule.collar = "ancient Egyptian">>