From 311b9f99e064c28aacccd99d45d67cad79b4ba14 Mon Sep 17 00:00:00 2001 From: Pregmodder <pregmodder@gmail.com> Date: Mon, 11 Jun 2018 22:19:28 -0400 Subject: [PATCH] fixes and corrections --- devNotes/VersionChangeLog-Premod+LoliMod.txt | 3 +++ src/SecExp/securityReport.tw | 11 +++++++++-- src/SecExp/weaponsManufacturing.tw | 2 +- src/gui/Encyclopedia/encyclopedia.tw | 8 +++++--- src/init/storyInit.tw | 2 +- src/pregmod/fFeet.tw | 14 +++++++------- src/pregmod/seFCTVshows.tw | 4 ++-- src/uncategorized/RESS.tw | 2 +- 8 files changed, 29 insertions(+), 17 deletions(-) diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt index 03254a8da03..c29c8b24fc9 100644 --- a/devNotes/VersionChangeLog-Premod+LoliMod.txt +++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt @@ -4,6 +4,9 @@ 6/11/2018 + 17 + -yet more various fixes and corrections + 16 -more various fixes and corrections diff --git a/src/SecExp/securityReport.tw b/src/SecExp/securityReport.tw index 6e8943dc8c7..e23c3a0eafa 100644 --- a/src/SecExp/securityReport.tw +++ b/src/SecExp/securityReport.tw @@ -550,7 +550,14 @@ <<if $currentUpgrade.time > 0>> <br> <br> - In the research lab, <<print $currentUpgrade.name>> is being developed, with the objective to enhance + In the research lab, <<print $currentUpgrade.name>> + <<switch $currentUpgrade.name>> + <<case "adaptive armored frames" "advanced synthetic alloys" "ceramo-metallic alloys" "rapid action stimulants" "universal cyber enhancements" "remote neural links" "combined training regimens with the special force">> + are + <<default>> + is + <</switch>> + being developed, with the objective to enhance <<if $currentUpgrade.type == "attack">> attack power <<elseif $currentUpgrade.type == "defense">> @@ -607,7 +614,7 @@ <<set $currentUpgrade.type = " ">> <<set $currentUpgrade.unit = -1>> <<set $currentUpgrade.time = 0>> - in the next days. + in the following days. <<recalcBaseStats>> <<set $completedUpgrades.push($currentUpgrade.ID)>> <<else>> diff --git a/src/SecExp/weaponsManufacturing.tw b/src/SecExp/weaponsManufacturing.tw index 8cb1a5d5dbf..87a8c7b51ec 100644 --- a/src/SecExp/weaponsManufacturing.tw +++ b/src/SecExp/weaponsManufacturing.tw @@ -392,7 +392,7 @@ __Upgrades__: <<elseif $currentUpgrade.type == "hpAndMorale">> morale and survivability. <<elseif $currentUpgrade.type == "all">> - offensive,defensive effectiveness in addition to morale and survivability. + offensive, defensive effectiveness in addition to morale and survivability. <</if>> Estimated completion time is <<print $currentUpgrade.time>> weeks. <</if>> diff --git a/src/gui/Encyclopedia/encyclopedia.tw b/src/gui/Encyclopedia/encyclopedia.tw index b05a026597b..a7ccc33ca1e 100644 --- a/src/gui/Encyclopedia/encyclopedia.tw +++ b/src/gui/Encyclopedia/encyclopedia.tw @@ -2821,7 +2821,7 @@ LORE: INTERVIEWS <h4>The Black Market</h4> You may be the ruler of your arcology, but you don't exist in a vacuum. You can do all kinds of thing and get lots of things that regular citizens can't. So the Black Market, is a chance for less prominent citizens to do or get stuff like an arcology leader might experience. But for a ruler like yourself, it's a chance to avoid the severe scrutiny you're subject to on a regular basis, and to get a hold of bleeding edge or illegal research and technologies. The market itself is always moving from place to place, but if you're reputable enough, you can find it when you need it. <br><br> - You will be able to find all manner of Future Society Technologies, while not exactly illegal, they are hard to get through regular channels. Every week, the dealers will have a few for you to purchase if you like. But for the truly illegal or unethical items, Your only choice is to go to the Black Market. + You will be able to find all manner of Future Society technologies which are not exactly illegal, but difficult to get through regular channels. Every week, the dealers will have a few for you to purchase, but for the truly illegal or unethical items, your only choice is to go to the Black Market. <br><br> <dl> <dt>Black market specialty goods:</dt> @@ -2832,7 +2832,7 @@ LORE: INTERVIEWS <dl> <dt>Childhood Fertility Induced NCS</dt> <dd> - This uses a designer retrograde virus to set the genetic markers for the Neotenic Complex Syndrome, a syndrome originally called Syndrome X discovered in the early 2000's. In layman's terms, it @@.gold;suppresses the growth and secondary sexual characteristics of slaves@@; both male and female. The original condition was usually fatal or dangerous. This modified version of the genetic flaw is not harmful (relatively speaking), and in addition to the growth blockage, it permits the slave to continue the @@.lime;development of gonads@@ at a slightly faster than normal pace. Secondary sexual characteristics are also reversed, though interestingly enough, pregnancy is still possible.Slaves put on this genetic engineered blend will be permanently changed and will no longer grow in stature or assets without severe chemical assistance, and even then at a reduced rate when compared to non-NCS-induced slaves, and should their ongoing growth treatments stop they will slowly regress back to the physicality of a child.<br><br> + This uses a designer retrograde virus to set the genetic markers for the Neotenic Complex Syndrome, a syndrome originally called Syndrome X discovered in the early 2000s. In layman's terms, it @@.gold;suppresses the growth and secondary sexual characteristics of slaves@@; both male and female. The original condition was usually fatal or dangerous. This modified version of the genetic flaw is not harmful (relatively speaking), and in addition to the growth blockage, it permits the slave to continue the @@.lime;development of gonads@@ at a slightly faster than normal pace. Secondary sexual characteristics are also reversed, though interestingly enough, pregnancy is still possible.Slaves put on this genetic engineered blend will be permanently changed and will no longer grow in stature or assets without severe chemical assistance, and even then at a reduced rate when compared to non-NCS-induced slaves, and should their ongoing growth treatments stop they will slowly regress back to the physicality of a child.<br><br> @@.red;The genetic tampering is considered illegal,@@ but there is also a @@.yellow;moral question as this abrogates the rights of slaves to ever grow up.@@<br><br> Can only be purchased in [[The Black Market|Encyclopedia][$encyclopedia = "The Black Market"]]. </dd> @@ -2891,9 +2891,10 @@ Error: bad title. | [[Gingering|Encyclopedia][$encyclopedia = "Gingering"]] <</if>> -<<if ["Obtaining Slaves","Kidnapped Slaves","Slave Schools","Stables","Household Liquidations","Direct Sales","Pre-Owned Slaves","The Corporation"].includes($encyclopedia)>> +<<if ["Obtaining Slaves","Kidnapped Slaves","Slave Schools","Stables","Household Liquidations","Direct Sales","Pre-Owned Slaves","The Corporation","Wetware CPUs"].includes($encyclopedia)>> <br><br>//Obtaining slaves//<br> [[Kidnapped Slaves|Encyclopedia][$encyclopedia = "Kidnapped Slaves"]] + | [[Wetware CPUs|Encyclopedia][$encyclopedia = "Wetware CPUs"]] | [[Slave Schools|Encyclopedia][$encyclopedia = "Slave Schools"]] | [[Stables|Encyclopedia][$encyclopedia = "Stables"]] | [[Household Liquidations|Encyclopedia][$encyclopedia = "Household Liquidations"]] @@ -3217,6 +3218,7 @@ Error: bad title. | <<link "Nipple Conversion - Penetratable">><<set $encyclopedia = "Nipple Conversion - Penetratable">><<goto "Encyclopedia">><</link>> | <<link "Ejaculation Boosting Prostate Implant">><<set $encyclopedia = "Ejaculation Boosting Prostate Implant">><<goto "Encyclopedia">><</link>> | <<link "The Flesh Heap">><<set $encyclopedia = "The Flesh Heap">><<goto "Encyclopedia">><</link>> + | <<link "Wetware CPUs">><<set $encyclopedia = "Wetware CPUs">><<goto "Encyclopedia">><</link>> | <<link "The Job Fulfillment Center">><<set $encyclopedia = "The Job Fulfillment Center">><<goto "Encyclopedia">><</link>> | <<link "The Black Market">><<set $encyclopedia = "The Black Market">><<goto "Encyclopedia">><</link>> diff --git a/src/init/storyInit.tw b/src/init/storyInit.tw index ba7d13239e5..21e989a3587 100644 --- a/src/init/storyInit.tw +++ b/src/init/storyInit.tw @@ -1099,7 +1099,7 @@ DairyRestraintsSetting($dairyRestraintsSetting) /*non-vanilla shit*/ <<set $pedo_mode = 0>> <<set $one_time_age_overrides_pedo_mode = 0>> -<<set $minimumSlaveAge = 16>> +<<set $minimumSlaveAge = 18>> <<set $fertilityAge = 13>> <<silently>> FertilityAge($fertilityAge) diff --git a/src/pregmod/fFeet.tw b/src/pregmod/fFeet.tw index 489e3b8b2a3..906f4e1aa72 100644 --- a/src/pregmod/fFeet.tw +++ b/src/pregmod/fFeet.tw @@ -374,7 +374,7 @@ You call $activeSlave.slaveName to your office, telling $his to use $his feet to <<elseif $activeSlave.fetish == "humiliation" && $activeSlave.fetishKnown == 1 && $activeSlave.fetishStrength >= 60>> $activeSlave.slaveName slowly strokes your cock with $his feet, getting off on the degrading use of $his feet and avoiding your gaze. $He is showing an embarrassed smile<<if $activeSlave.skin == 'black'>>, and if $his skin was any lighter you would see $his<<else>> and<</if>> bright blushing cheeks. <<elseif $activeSlave.fetish == "boobs" && $activeSlave.fetishKnown == 1 && $activeSlave.fetishStrength >= 60>> - As $activeSlave.slaveName deftly strokes your cock with $his feet, $his hands plays with $his <<if $activeSlave.boobs < 299>>erect nipples. <<elseif $activeSlave.boobs < 499>>small chest. <<elseif $activeSlave.boobs >= 18000>>_boobs breasts, though $he can't reach $his nipples. <<else>>_boobs breasts and erect nipples. <</if>> $He is certainly giving you plenty of sexy options for you to watch. + As $activeSlave.slaveName deftly strokes your cock with $his feet, $his hands plays with $his <<if $activeSlave.boobs < 300>>erect nipples. <<elseif $activeSlave.boobs < 500>>small chest. <<elseif $activeSlave.boobs >= 18000>>_boobs breasts, though $he can't reach $his nipples. <<else>>_boobs breasts and erect nipples. <</if>> $He is certainly giving you plenty of sexy options for you to watch. <<elseif $activeSlave.fetish == "sadist" && $activeSlave.fetishKnown == 1 && $activeSlave.fetishStrength >= 60>> $activeSlave.slaveName is a sadist, and $his deft footjob toys with the boundaries of pain and pleasure. $His devoted yet belittling <<if canSee($activeSlave)>>gaze carefully watches your face<<else>>expressions are clear as $he feels<</if>> for every reaction. <<elseif $activeSlave.fetish == "dom" && $activeSlave.fetishKnown == 1 && $activeSlave.fetishStrength >= 60>> @@ -395,9 +395,9 @@ You call $activeSlave.slaveName to your office, telling $his to use $his feet to <<if $activeSlave.fetish != "mindbroken" && canWalk($activeSlave) && $activeSlave.sexualQuirk == "tease" && $activeSlave.devotion >= 60>> <<if canSee($activeSlave)>>Seeing <<else>>Feeling <</if>>you near your orgasm, $he <<if _footSeed < 40>> - <<if $activeSlave.boobs < 299>> + <<if $activeSlave.boobs < 300>> presses $his hands on $his flat chest, - <<elseif $activeSlave.boobs < 499>> + <<elseif $activeSlave.boobs < 500>> puts $his hands under $his small chest, <<else>> cups $his _boobs breasts with $his hands, @@ -456,7 +456,7 @@ You call $activeSlave.slaveName to your office, telling $his to use $his feet to Your massive load quickly covers $his face as $he moans and twitches in pleasure, semen dripping down $his <<if $activeSlave.boobs < 300>> flat chest - <<elseif $activeSlave.boobs < 499>> + <<elseif $activeSlave.boobs < 500>> small chest <<else>> _boobs breasts @@ -464,9 +464,9 @@ You call $activeSlave.slaveName to your office, telling $his to use $his feet to and _belly belly onto $his thighs. <<else>> Your large load coats $his face in sticky semen, some dripping onto $his - <<if $activeSlave.boobs < 299>> + <<if $activeSlave.boobs < 300>> flat chest. - <<elseif $activeSlave.boobs < 499>> + <<elseif $activeSlave.boobs < 500>> small chest. <<else>> _boobs breasts. @@ -492,7 +492,7 @@ You call $activeSlave.slaveName to your office, telling $his to use $his feet to but you know $his wanted to involve $his _butt butt and your cum, if your orgasm had more volume. <</if>> <<elseif $activeSlave.fetish == "boobs" && $activeSlave.fetishKnown == 1 && $activeSlave.fetishStrength >= 60>> - You eventually cum all over $his _skin feet<<if $PC.balls >= 2>>, _legs legs, and even $his _belly belly with your massive load<<elseif $PC.balls >= 1>> and _legs legs with your large load<</if>>, and $he <<if $activeSlave.boobs < 299>>pinches both $his erect nipples <<elseif $activeSlave.boobs < 499>>rubs $his hands across $his small chest <<else>>squeezes $his _boobs breasts tightly <</if>>while moaning in pleasure. + You eventually cum all over $his _skin feet<<if $PC.balls >= 2>>, _legs legs, and even $his _belly belly with your massive load<<elseif $PC.balls >= 1>> and _legs legs with your large load<</if>>, and $he <<if $activeSlave.boobs < 300>>pinches both $his erect nipples <<elseif $activeSlave.boobs < 500>>rubs $his hands across $his small chest <<else>>squeezes $his _boobs breasts tightly <</if>>while moaning in pleasure. <<elseif $activeSlave.fetish == "sadist" && $activeSlave.fetishKnown == 1 && $activeSlave.fetishStrength >= 60>> You eventually cum all over $his _skin feet<<if $PC.balls >= 2>>, _legs legs, and even $his _belly belly with your massive load<<elseif $PC.balls >= 1>> and _legs legs with your large load<</if>>, and $he gasps slightly and condescendingly smiles as you soil $his feet with semen. <<elseif $activeSlave.fetish == "dom" && $activeSlave.fetishKnown == 1 && $activeSlave.fetishStrength >= 60>> diff --git a/src/pregmod/seFCTVshows.tw b/src/pregmod/seFCTVshows.tw index 253a9c55f3b..589a0b18b20 100644 --- a/src/pregmod/seFCTVshows.tw +++ b/src/pregmod/seFCTVshows.tw @@ -80,8 +80,8 @@ Tired after a long day, you tell <<if $Concubine != 0>>@@.pink;$Concubine.slaveN <br><br>... <</if>> <<case 1>> - <<set $showTwo += 1, $lastShow = 1>> - It looks like the random function chose to play <<if $showTwo < 12>>the newest episode of a<<else>>a repeat of the<</if>> popular competitive reality show<<if $showTwo > 0>>: Next Top Breeder.<<else>>where several female citizens are competing for something.<</if>> The intro sequence shows a succession of beautiful ladies either participating in a mixture of contrived competitions, or talking and going about their lives in a sorority-like setting. The montage is overlaid with a narrator's voice: "12 of Canadia Arcology's most attractive women are all competing for the privilege of having the arcology owner's children. Clint Miles has desirable genes, and these ladies are determined to prove their worth as gestators. And here in Canadia, there are no restrictions on fertility drugs for the winner, so the competition this season is fierce! <<if $showTwo < 12>>random(2,10)<<else>>$showTwo<</if>> lad<<if $showTwo > 0>>ies have<<else>>y has<</if>> already been sent packing, who will be Canadia's... Next Top Breeder!?" The title finally pops up, redundantly labeling the show as 'Next Top Breeder: Canadia'. + <<set $showTwo += 1, $lastShow = 1>><<set _rerun = random(2,10)>> + It looks like the random function chose to play <<if $showTwo < 12>>the newest episode of a<<else>>a repeat of the<</if>> popular competitive reality show<<if $showTwo > 0>>: Next Top Breeder.<<else>>where several female citizens are competing for something.<</if>> The intro sequence shows a succession of beautiful ladies either participating in a mixture of contrived competitions, or talking and going about their lives in a sorority-like setting. The montage is overlaid with a narrator's voice: "12 of Canadia Arcology's most attractive women are all competing for the privilege of having the arcology owner's children. Clint Miles has desirable genes, and these ladies are determined to prove their worth as gestators. And here in Canadia, there are no restrictions on fertility drugs for the winner, so the competition this season is fierce! <<if $showTwo < 12>>_rerun<<else>>$showTwo<</if>> lad<<if $showTwo > 0>>ies have<<else>>y has<</if>> already been sent packing, who will be Canadia's... Next Top Breeder!?" The title finally pops up, redundantly labeling the show as 'Next Top Breeder: Canadia'. <br><br> <<if $masterSuiteSlaves > 1 && $Concubine != 0>> You don't spend very much time actually watching the show; the randy opening, perverted competitions, and constant talk of creampies quickly has @@.pink;$Concubine.slaveName@@ eager for some attention from her own arcology owner. Of course, the same could be said for the other eager slaves living in your bedroom, and the situation quickly devolves into a lust-filled orgy. diff --git a/src/uncategorized/RESS.tw b/src/uncategorized/RESS.tw index 997673b0580..27d49d4808a 100644 --- a/src/uncategorized/RESS.tw +++ b/src/uncategorized/RESS.tw @@ -15700,7 +15700,7 @@ You tell her kindly that you understand, and that she'll be trained to address t @@.hotpink;submissive@@ voice. <<set $activeSlave.devotion += 4, $activeSlave.mammaryCount++, $mammaryTotal++>> <</replace>> -<</link>> +<</link>><<if $PC.dick == 1>><<if canDoVaginal($activeSlave) && ($activeSlave.vagina == 0)>>//This option will take virginity//<<elseif !canDoVaginal($activeSlave) && canDoAnal($activeSlave) && ($activeSlave.anus == 0)>> //This option will take anal virginity//<</if>><</if>> <<case "refreshment delivery">> -- GitLab