From 2d98b232ea66c61505408898cfcd39b377b510a7 Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Fri, 19 Oct 2018 00:34:12 -0400
Subject: [PATCH] fixes and missed incubus variant
---
devNotes/VersionChangeLog-Premod+LoliMod.txt | 5 +++++
devNotes/clothing hair and accessory passages.txt | 3 +++
devNotes/twine JS.txt | 8 --------
src/events/intro/introSummary.tw | 6 +++---
src/gui/Encyclopedia/encyclopedia.tw | 9 +++++----
src/js/DefaultRules.tw | 5 -----
src/js/slaveSummaryWidgets.tw | 3 ---
src/pregmod/fLickPussy.tw | 2 +-
src/pregmod/theBlackMarket.tw | 1 -
src/uncategorized/officeDescription.tw | 2 ++
src/uncategorized/personalAssistantAppearance.tw | 8 ++++++--
src/uncategorized/storyCaption.tw | 2 +-
12 files changed, 26 insertions(+), 28 deletions(-)
diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt
index 9e9985f0136..2adf8d77503 100644
--- a/devNotes/VersionChangeLog-Premod+LoliMod.txt
+++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt
@@ -2,6 +2,11 @@
0.10.7.1-0.10.x
+10/19/2018
+
+ 24
+ -fixes
+
10/18/2018
23
diff --git a/devNotes/clothing hair and accessory passages.txt b/devNotes/clothing hair and accessory passages.txt
index 704e4230ed1..769ea074b78 100644
--- a/devNotes/clothing hair and accessory passages.txt
+++ b/devNotes/clothing hair and accessory passages.txt
@@ -47,6 +47,7 @@ Clothes:
Possible:
artWidgets.tw
+ saClothes.tw
saChoosesOwnClothes.tw
eventSelectionJS.tw
saLiveWithHG.tw
@@ -66,6 +67,7 @@ Shoes:
Possible:
saLongTermEffects.tw
+ saClothes.tw
saChoosesOwnClothes.tw
eventSelectionJS.tw
RESS.tw
@@ -94,6 +96,7 @@ Collars:
Possible:
saLongTermEffects.tw
+ saClothes.tw
saDevotion.tw
raWidgets.tw
artWidgets.tw
diff --git a/devNotes/twine JS.txt b/devNotes/twine JS.txt
index 572c0646598..8015d2efcfd 100644
--- a/devNotes/twine JS.txt
+++ b/devNotes/twine JS.txt
@@ -13896,11 +13896,6 @@ window.DefaultRules = (function() {
flag = false;
break;
- case "hyper butt injections":
- if (!(slave.butt < 20))
- flag = false;
- break;
-
case "nipple atrophiers":
if (!(["huge", "puffy", "cute"].includes(slave.nipples)))
flag = false;
@@ -20949,9 +20944,6 @@ window.SlaveSummaryUncached = (function(){
case "dark olive":
r += `D. Oli`;
break;
- case "pure white":
- r += `P. Whi`;
- break;
case "lightened":
r += `Ltnd`;
break;
diff --git a/src/events/intro/introSummary.tw b/src/events/intro/introSummary.tw
index b3d91545122..f4068c7fb5e 100644
--- a/src/events/intro/introSummary.tw
+++ b/src/events/intro/introSummary.tw
@@ -379,12 +379,12 @@ Should you be able to surgically attach a penis to your female slaves and starti
<</if>>
<br>
-<<if ($dangerousPregancy == 0)>>
+<<if ($dangerousPregnancy == 0)>>
Advanced pregnancy complications such as miscarriage and premature birth are currently ''disabled''.
- [[Enable|Intro Summary][$dangerousPregancy = 1]]
+ [[Enable|Intro Summary][$dangerousPregnancy = 1]]
<<else>>
Advanced pregnancy complications such as miscarriage and premature birth are currently ''enabled''.
- [[Disable|Intro Summary][$dangerousPregancy = 0]]
+ [[Disable|Intro Summary][$dangerousPregnancy = 0]]
<</if>>
<br>
diff --git a/src/gui/Encyclopedia/encyclopedia.tw b/src/gui/Encyclopedia/encyclopedia.tw
index 04806e20984..52a589a1a65 100644
--- a/src/gui/Encyclopedia/encyclopedia.tw
+++ b/src/gui/Encyclopedia/encyclopedia.tw
@@ -2596,7 +2596,7 @@ LORE: INTERVIEWS
<br>''Faraen'' for a full vector art variant.
<br>''anon'' for more hair vectors for the external art.
<br>''Vas'' for massive JS work and completely redoing the RA.
- <br>''deepmurk'' for a massive expansion in conjunction with Nox to the original embedded vector art. Also more hairs, shoes, clothes, and descriptions. Overhauled skin colors too.
+ <br>''deepmurk'' for a massive expansion in conjunction with Nox to the original embedded vector art. Also more hairs, clothes, shoes, clothes, descriptions and clothes. Overhauled skin colors too.
<br>''Channel8'' for FCTV content (and likely giving the spellCheck an aneurysm).
<br>''Channel13'' for FCTV content.
<br>''kidkinster'' for slave management ui stuff and induced NCS.
@@ -2605,7 +2605,8 @@ LORE: INTERVIEWS
<br>''Autistic Boi'' for Mediterranean market preset.
<br>''anon'' for the PA subjugationsist and supremacist FS appearances.
<br>''Editoranon and Milkanon?'' for prison markets and the nursing handjob scene.
- <br>''DCoded'' for bestiality content, scenes, facilities and fixes.
+ <br>''DCoded'' for bestiality content, scenes, facilities and fixes. Also the future nursery and a pussy licking scene.
+ <br>''HiveBro'' for giving hyperpregnant slaves some serious loving.
<br>''git contributors lost to time'' for their submissions and work through pregmod's git.
<br>''Bane70'' optimized huge swaths of code with notable professionalism.
<br>''Circle Tritagonist'' provided several new collars and outfits.
@@ -2616,7 +2617,7 @@ LORE: INTERVIEWS
<br>''Dej'' coded better diet logic for the RA.
<br>''Flooby Badoop'' wrote and coded a random recruitment event.
<br>''FC_BourbonDrinker'' went into the code to locate and fix bugs.
- <br>''Shokushu'' created a rendered imagepack comprising 775 images, and assisted with the code necessary to display them.
+ <br>''Shokushu'' created a rendered imagepack comprising 775 images, and assisted with the code necessary to display them. Also maybe the dinner party event?
<br>''NovX'' created a vector art system.
<br>''Mauve'' contributed vector collars and pubic hair.
<br>''Rodziel'' contributed the cybernetics mod.
@@ -2624,7 +2625,7 @@ LORE: INTERVIEWS
<br>''freecitiesbandit'' wrote a number of recruitment, future society, mercenary and random events, provided tailed buttplugs, new eyes and tattoos, and contributed the code for the mercenary raiders policy.
<br>''DrNoOne'' wrote the bulk slave purchase and persistent summary code.
<br>''Mauve'' provided vector art for chastity belts and limp dicks.
- <br>''Klorpa'' for dozens of new nationalities and boundless new names and nicknames. Also monokinis, middle eastern clothing and aprons. Also the hearing overhaul
+ <br>''Klorpa'' for dozens of new nationalities and boundless new names and nicknames. Also monokinis, middle eastern clothing and aprons. Also the hearing overhaul.
<br>''amomynous0'' for bug reports and testing in addition to SFmod unit descriptions.
<br>''wepsrd'' for QOL (hormonal balance cheat and lactation adaptation to new menu) fixes.
diff --git a/src/js/DefaultRules.tw b/src/js/DefaultRules.tw
index 8bbbffe3140..7148316c647 100644
--- a/src/js/DefaultRules.tw
+++ b/src/js/DefaultRules.tw
@@ -1234,11 +1234,6 @@ window.DefaultRules = (function() {
flag = false;
break;
- case "hyper butt injections":
- if (!(slave.butt < 20))
- flag = false;
- break;
-
case "nipple atrophiers":
if (!(["huge", "puffy", "cute"].includes(slave.nipples)))
flag = false;
diff --git a/src/js/slaveSummaryWidgets.tw b/src/js/slaveSummaryWidgets.tw
index 1ce78199296..d0873a06df0 100644
--- a/src/js/slaveSummaryWidgets.tw
+++ b/src/js/slaveSummaryWidgets.tw
@@ -1757,9 +1757,6 @@ window.SlaveSummaryUncached = (function(){
case "dark olive":
r += `D. Oli`;
break;
- case "pure white":
- r += `P. Whi`;
- break;
case "lightened":
r += `Ltnd`;
break;
diff --git a/src/pregmod/fLickPussy.tw b/src/pregmod/fLickPussy.tw
index bee46b35bf5..a29259c202a 100644
--- a/src/pregmod/fLickPussy.tw
+++ b/src/pregmod/fLickPussy.tw
@@ -20,6 +20,6 @@
You have $activeSlave.slaveName brought into your office and placed on your couch.
<</if>>
-After $he is situated, you go over to $him<<if $activeSlave.clothes != "no clothing">> and take off $his clothing, causing $him to <<if _devotion > 50>>give you a soft smile<<else>>give you an angry glare<</if>><</if>>. You suddenly grab $his hips and pull $his crotch to your face, causing $him to give a shriek of surprise. Looking at $him directly in the eyes, you begin to run your tongue along $his labia, drawing a soft moan from $him. The combination of the pleasure and the intense look from the <<if $PC.title == 0>>wo<</if>>man $he<<if _devotion > 95>> loves <<elseif _devotion > 50>>'s accepted as $his <<= WrittenMaster($activeSlave)>><<else>>hates/*not sure what to use for "reluctant"*/<</if>> makes $him blush, but you don't let up. You give $his clit a few expiremental tweaks, causing $his moans to intensify<<if canWalk($activeSlave)>> and $his legs to tighten around your head<</if>>. Before $he cums, though, you pull back, causing $him to whine in frustration. You begin again, then pull back again just before $he orgasms. You repeat this several more times, each time causing $him to become more and more frustrated. Finally, one last stroke of your tongue causes $him to go over the edge, making $him scream out <<if _devotion > 50>>your name<</if>> in ecstasy. You send $him back to $his assignment before calling in another slave to clean up the mess.
+After $he is situated, you go over to $him<<if $activeSlave.clothes != "no clothing">> and take off $his clothing, causing $him to <<if _devotion > 50>>give you a soft smile<<else>>give you an angry glare<</if>><</if>>. You suddenly grab $his hips and pull $his crotch to your face, causing $him to give a shriek of surprise. Looking at $him directly in the eyes, you begin to run your tongue along $his labia, drawing a soft moan from $him. The combination of the pleasure and the intense look from the <<if $PC.title == 0>>wo<</if>>man $he<<if _devotion > 95>> loves <<elseif _devotion > 50>>'s accepted as $his <<= WrittenMaster($activeSlave)>><<else>> hates/*not sure what to use for "reluctant"*/<</if>> makes $him blush, but you don't let up. You give $his clit a few expiremental tweaks, causing $his moans to intensify<<if canWalk($activeSlave)>> and $his legs to tighten around your head<</if>>. Before $he cums, though, you pull back, causing $him to whine in frustration. You begin again, then pull back again just before $he orgasms. You repeat this several more times, each time causing $him to become more and more frustrated. Finally, one last stroke of your tongue causes $him to go over the edge, making $him scream out <<if _devotion > 50>>your name<</if>> in ecstasy. You send $him back to $his assignment before calling in another slave to clean up the mess.
<<set $activeSlave.vaginalCount++, $vaginalTotal++>>
\ No newline at end of file
diff --git a/src/pregmod/theBlackMarket.tw b/src/pregmod/theBlackMarket.tw
index 3c3ec761067..d7f6ebc96b3 100644
--- a/src/pregmod/theBlackMarket.tw
+++ b/src/pregmod/theBlackMarket.tw
@@ -142,7 +142,6 @@ Of all the wonders present, the thing that catches your eye the most is a shady
<<if $thisWeeksIllegalFSWares[_bim] == "childhoodFertilityInducedNCS">>
<<if $minimumSlaveAge <= 15>>
<dt>@@.cyan;Childhood Fertility Induced NCS (Induced Neotenic Complex Syndrome or Syndrome X modified for fertility).@@</dt>
- <dd>
<<if $minimumSlaveAge > 8>>
Illegal information for the Childhood Fertility @@.orange;Induced NCS@@ (genetic engineering and hormonal blend) research recipe.<br>
"I'm sorry, I can't sell this product to you, even if I wanted to," he says. "I have this technology, which if applied, would make slaves appear younger than the legal age of majority. I picked it up from an exotics dealer, who picked it up from some old world government research center. And yes, I know, this is a black market, and I would be happy to sell it to you, except, you see, too many of the wrong people know I have it, and while the knowledge isn't illegal, selling or using it is. See if I sell this to you, you'd start getting younger looking slaves, and those people would try to take us both down, and since I'm not the master of an arcology, I would probably end up enslaved, and I'm not interested in that. If only the laws were more open about who could have sex with who, I could sell this to anyone interested."
diff --git a/src/uncategorized/officeDescription.tw b/src/uncategorized/officeDescription.tw
index 3ea9f1a61b7..0f8951e500f 100644
--- a/src/uncategorized/officeDescription.tw
+++ b/src/uncategorized/officeDescription.tw
@@ -136,6 +136,8 @@
her anus. A pair of heavy balls hangs from her crotch.
<<elseif $arcologies[0].FSGenderRadicalistLawFuta == 3>>
her gigantic ass.
+ <<elseif $arcologies[0].FSGenderRadicalistLawFuta == 4>>
+ her anus. A tiny pair of balls hangs from her crotch.
<<else>>
her rear.
<</if>>
diff --git a/src/uncategorized/personalAssistantAppearance.tw b/src/uncategorized/personalAssistantAppearance.tw
index 26af241db8c..68cc0f5ac9c 100644
--- a/src/uncategorized/personalAssistantAppearance.tw
+++ b/src/uncategorized/personalAssistantAppearance.tw
@@ -1346,7 +1346,7 @@ She's a cute little <<if $arcologies[0].FSSupremacist != "unset" && $assistantFS
<<elseif $marketAssistantRelationship == "nonconsensual">>
$assistantName has her test subject stripped and bound. She focuses a spell on a single of the girls breasts and records the results as it steadily begins swelling, leaving its twin behind. The market assistant moans as an egg pushes its way out of her erect nipple.
<<elseif $marketAssistantRelationship == "incestuous">>
- $assistantName is lustfully groping her sister's plush breasts. Upon noticing your gaze, she channels her magic and <<if _paSeedicks != 0>>sprouts a huge dick straight into her sister's plump rear<<else>>begins to enlarge the already lovely handfuls<</if>>. The market assistant can only finger herself in response, oblivious to everything going on.
+ $assistantName is lustfully groping her sister's plush breasts. Upon noticing your gaze, she channels her magic and <<if $seedicks != 0>>sprouts a huge dick straight into her sister's plump rear<<else>>begins to enlarge the already lovely handfuls<</if>>. The market assistant can only finger herself in response, oblivious to everything going on.
<<else>>
They've pulled open each other's robes and are gently tribbing. Upon noticing you, $assistantName casts a spell to triple the market assistant's sensitivity and braces for the impending orgasm. She cums so hard she passes out; $assistantName gently pulls her into a close embrace until she recovers.
<</if>>
@@ -1485,7 +1485,7 @@ She's a cute little <<if $arcologies[0].FSSupremacist != "unset" && $assistantFS
<<case "repopulation focus">>
Her belly is round with child and is in a constant struggle with her erect cock over which gets to protrude out her front.
<<case "eugenics">>
- She's become even more irresistible lately; <<if $PC.vagina == 1>>you can help but think of that perfect cock cumming deep in your pussy and your belly rounding with a gorgeous child<<else>>the children sired by a stud are unimaginable<</if>>.
+ She's become even more irresistible lately; <<if $PC.vagina == 1>>you can help but think of that perfect cock cumming deep in your pussy and your belly rounding with a gorgeous child<<else>>the children sired by such a stud are unimaginable<</if>>.
<<case "gender radicalist">>
<<if $arcologies[0].FSGenderRadicalistLawFuta == 1>>
She is wearing nothing at all and has recently rendered herself slightly more feminine. She makes sure to make exaggerated motions to show off the pussy hidden beneath her swinging nuts.
@@ -1493,6 +1493,8 @@ She's a cute little <<if $arcologies[0].FSSupremacist != "unset" && $assistantFS
She has recently increased the size of her genitals and has given up trying to wear pants; they just get in the way of her prominent erection.
<<elseif $arcologies[0].FSGenderRadicalistLawFuta == 3>>
She is wearing nothing at all; not that anything could fit her. Her cock and balls are utterly dwarfed by her door-jamming hips, massive ass and extra thick thighs.
+ <<elseif $arcologies[0].FSGenderRadicalistLawFuta == 4>>
+ She is wearing loose clothing and has recently rendered herself slightly more feminine. She does her best to appear the perfect little femboy despite what's slipping down her pant leg.
<<else>>
She is wearing nothing at all and has recently rendered herself even more handsome, since she was already a perfect fit for society.
<</if>>
@@ -1581,6 +1583,8 @@ She's a cute little <<if $arcologies[0].FSSupremacist != "unset" && $assistantFS
She's leaning back with both hands wrapped around her huge cock, struggling to jack off. When she notices you watching, she invites you to lend a hand or two to help her out.
<<elseif $arcologies[0].FSGenderRadicalistLawFuta == 3>>
She is laying on her stomach, her ass and legs jiggling delightfully as she gives herself a thighjob. When she notices you watching, she struggles to roll onto her side and waves her throbbing erection at you, imploring you to finish her off.
+ <<elseif $arcologies[0].FSGenderRadicalistLawFuta == 4>>
+ She's got her hands down her pants absentmindedly jerking off. When she notices you watching, she quickly stops, but it does little to hide the large wetspot forming on her tented pants.
<<else>>
She's absentmindedly jerking off. When she notices you watching, she waves her throbbing erection at you, imploring you to finish her off.
<</if>>
diff --git a/src/uncategorized/storyCaption.tw b/src/uncategorized/storyCaption.tw
index 229d621da53..e32eaacc8f8 100644
--- a/src/uncategorized/storyCaption.tw
+++ b/src/uncategorized/storyCaption.tw
@@ -135,7 +135,7 @@
<<if $arcologies[0].ownership >= $arcologies[0].minority>>
<<if $arcologies[0].ownership >= $arcologies[0].minority+5>>
<<if $arcologies[0].ownership < 100>>
- <<if $assistantPower >= 1>> (@@.yellowgreen;<<print $arcologies[0].ownership>>%@@:<<print $arcologies[0].minority>>%) <<else>> (@@.yellowgreen;<<print $arcologies[0].ownership>>%) <</if>>
+ <<if $assistantPower >= 1>> (@@.yellowgreen;<<print $arcologies[0].ownership>>%@@:<<print $arcologies[0].minority>>%) <<else>> (@@.yellowgreen;<<print $arcologies[0].ownership>>%@@) <</if>>
<<else>> (<<print $arcologies[0].ownership>>%)
<</if>>
<<else>>
--
GitLab