From 04b082031564d3e3784528a2ea89000b01ddf871 Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Mon, 24 Apr 2017 23:04:09 -0400
Subject: [PATCH] Fixes, mostly vanilla.
---
slave variables documentation - Pregmod.txt | 3 +-
src/npc/startingGirls/startingGirls.tw | 22 ++++----
src/uncategorized/BackwardsCompatibility.tw | 18 +++++++
src/uncategorized/RESS.tw | 5 +-
src/uncategorized/neighborDescription.tw | 2 +-
src/uncategorized/remoteSurgery.tw | 11 ++--
src/uncategorized/saChoosesOwnClothes.tw | 57 ++++++++++++++++++++-
src/uncategorized/surgeryDegradation.tw | 2 +-
src/utility/artWidgets.tw | 14 ++---
src/utility/slaveCreationWidgets.tw | 3 +-
10 files changed, 105 insertions(+), 32 deletions(-)
diff --git a/slave variables documentation - Pregmod.txt b/slave variables documentation - Pregmod.txt
index 49e0b8049c3..79f5d46fe08 100644
--- a/slave variables documentation - Pregmod.txt
+++ b/slave variables documentation - Pregmod.txt
@@ -1700,7 +1700,7 @@ choosesOwnClothes:
clothes:
may accept strings, use at own risk
-"none"
+"no clothing"
"a Fuckdoll suit"
"attractive lingerie"
"a string bikini"
@@ -1727,7 +1727,6 @@ may accept strings, use at own risk
"a latex catsuit"
"a military uniform"
"a minidress"
-"a very tight corset"
"conservative clothing"
"chains"
"a cheerleader outfit"
diff --git a/src/npc/startingGirls/startingGirls.tw b/src/npc/startingGirls/startingGirls.tw
index cf70690aac0..84465162a17 100644
--- a/src/npc/startingGirls/startingGirls.tw
+++ b/src/npc/startingGirls/startingGirls.tw
@@ -413,19 +413,21 @@ __You are customizing this slave:__
<<link "High.">><<set $activeSlave.voice = 3>><<replace "#voice">>High.<</replace>><<StartingGirlsCost>><</link>>
<br>
-<<if $activeSlave.voice != 0>>
-''$language:''
<span id="language">
-<<if $activeSlave.accent == 0>>Unaccented.
-<<elseif $activeSlave.accent == 1>>Pretty $activeSlave.nationality accent.
-<<elseif $activeSlave.accent == 2>>Thick $activeSlave.nationality accent.
-<<else>>Not fluent.
+<<if $activeSlave.voice != 0>>
+ ''$language:''
+ <<if $activeSlave.accent == 0>>Unaccented.
+ <<elseif $activeSlave.accent == 1>>Pretty $activeSlave.nationality accent.
+ <<elseif $activeSlave.accent == 2>>Thick $activeSlave.nationality accent.
+ <<else>>Not fluent.
+ <</if>>
<</if>>
</span>
-<<link "Unaccented">><<set $activeSlave.accent = 0>><<replace "#language">>Unaccented.<</replace>><<StartingGirlsCost>><</link>> |
-<<link "Accent">><<set $activeSlave.accent = 1>><<replace "#language">>Pretty $activeSlave.nationality accent.<</replace>><<StartingGirlsCost>><</link>> |
-<<link "Heavy accent">><<set $activeSlave.accent = 2>><<replace "#language">>Thick $activeSlave.nationality accent.<</replace>><<StartingGirlsCost>><</link>> |
-<<link "Poor">><<set $activeSlave.accent = 3>><<replace "#language">>Not fluent.<</replace>><<StartingGirlsCost>><</link>>
+<<if $activeSlave.voice != 0>>
+ <<link "Unaccented">><<set $activeSlave.accent = 0>><<replace "#language">>Unaccented.<</replace>><<StartingGirlsCost>><</link>> |
+ <<link "Accent">><<set $activeSlave.accent = 1>><<replace "#language">>Pretty $activeSlave.nationality accent.<</replace>><<StartingGirlsCost>><</link>> |
+ <<link "Heavy accent">><<set $activeSlave.accent = 2>><<replace "#language">>Thick $activeSlave.nationality accent.<</replace>><<StartingGirlsCost>><</link>> |
+ <<link "Poor">><<set $activeSlave.accent = 3>><<replace "#language">>Not fluent.<</replace>><<StartingGirlsCost>><</link>>
<</if>>
<br>''Age:''
diff --git a/src/uncategorized/BackwardsCompatibility.tw b/src/uncategorized/BackwardsCompatibility.tw
index 60e4af99dcc..ae24600ee50 100644
--- a/src/uncategorized/BackwardsCompatibility.tw
+++ b/src/uncategorized/BackwardsCompatibility.tw
@@ -469,6 +469,24 @@ Setting missing global variables:
<<if ndef $menialDemandFactor>>
<<set $menialDemandFactor = 0>>
<</if>>
+<<if ndef nicaeaAnnounceable>>
+ <<set $nicaeaAnnounceable = 0>>
+<</if>>
+<<if ndef $nicaeaAnnounced>>
+ <<set $nicaeaAnnounced = 0>>
+<</if>>
+<<if ndef $nicaeaPreparation>>
+ <<set $nicaeaPreparation = 0>>
+<</if>>
+<<if ndef $nicaeaInvolvement>>
+ <<set $nicaeaInvolvement = -1>>
+<</if>>
+<<if ndef $nicaeaPower>>
+ <<set $nicaeaPower = 0>>
+<</if>>
+<<if ndef $nicaeaHeld>>
+ <<set $nicaeaHeld = 0>>
+<</if>>
<<if ndef $AProsperityCap>>
<<set $AProsperityCap to 60>>
diff --git a/src/uncategorized/RESS.tw b/src/uncategorized/RESS.tw
index 7321d98fe05..406620d3dea 100644
--- a/src/uncategorized/RESS.tw
+++ b/src/uncategorized/RESS.tw
@@ -5718,7 +5718,10 @@ You tell her kindly that you understand, and that she'll be trained to address t
she's happy to take it up the ass, though there's no sign of an erection from her useless sissy dick.
<<elseif $activeSlave.vagina == -1>>
she's obviously ready and willing to get buttfucked, even if her body has no physically obvious way to shot it off.
- <<else>>she's wet and ready and moans happily as you enter her.<</if>> There's no hesitation or fear at all on her face when she sees you're returning her to your penthouse; @@.mediumaquamarine;her trust in you has increased.@@
+ <<else>>
+ she's wet and ready and moans happily as you enter her.
+ <</if>>
+ There's no hesitation or fear at all on her face when she sees you're returning her to your penthouse; @@.mediumaquamarine;her trust in you has increased.@@
<<set $activeSlave.trust += 4>>
<<if ($activeSlave.vagina > -1)>>
<<VaginalVCheck>>
diff --git a/src/uncategorized/neighborDescription.tw b/src/uncategorized/neighborDescription.tw
index 5825e7c06d1..e8397bcdeda 100644
--- a/src/uncategorized/neighborDescription.tw
+++ b/src/uncategorized/neighborDescription.tw
@@ -30,7 +30,7 @@
Its leadership has control of approximately <<print Math.trunc(($arcologies[$i].ownership*random(100-$economicUncertainty,100+$economicUncertainty))/100)>>% of the arcology<<if $arcologies[$i].minority > $arcologies[$i].ownership-10>>, a dangerously narrow margin over competition with a <<print Math.trunc(($arcologies[$i].minority*random(100-$economicUncertainty,100+$economicUncertainty))/100)>>% share<</if>>.
<</if>>
<</if>>
-<<if $arcologies[$i].PCminority > 0>>You own $arcologies[$i].PCminority% of this arcology<</if>><<if ($arcologies[$i].government == "your trustees") || ($arcologies[$i].government == "your agent")>><<if $arcologies[$i].minority > $arcologies[$i].PCminority-10>>, a dangerously narrow margin over competition with a <<print Math.trunc(($arcologies[$i].minority*random(100-$economicUncertainty,100+$economicUncertainty))/100)>>% share<</if>><</if>>.
+<<if $arcologies[$i].PCminority > 0>>You own $arcologies[$i].PCminority% of this arcology<</if>><<if ($arcologies[$i].government == "your trustees") || ($arcologies[$i].government == "your agent")>><<if $arcologies[$i].minority > $arcologies[$i].PCminority-10>>, a dangerously narrow margin over competition with a <<print Math.trunc(($arcologies[$i].minority*random(100-$economicUncertainty,100+$economicUncertainty))/100)>>% share<</if>>.<</if>>
<<set $economicUncertainty -= 2*$assistantPower>>
The arcology has an estimated GSP of @@.yellowgreen;¤<<print Math.trunc((0.1*$arcologies[$i].prosperity*random(100-$economicUncertainty,100+$economicUncertainty))/100)>>m,@@
<<if Math.abs($arcologies[$i].prosperity - $averageProsperity) < 5>>
diff --git a/src/uncategorized/remoteSurgery.tw b/src/uncategorized/remoteSurgery.tw
index c9ec561ed17..03fad67c1e3 100644
--- a/src/uncategorized/remoteSurgery.tw
+++ b/src/uncategorized/remoteSurgery.tw
@@ -562,14 +562,11 @@ $pronounCap has
<<elseif ($activeSlave.dick != 0) && ($activeSlave.vagina != -1)>>
<br>$pronounCap has a penis and an artificial vagina.
<</if>>
-<<if ($activeSlave.dick != 0) && ($activeSlave.vagina == -1)>>
- <<if $activeSlave.indentureRestrictions < 1>>
- [[Convert genitalia to female|Surgery Degradation][$activeSlave.dick = 0,$activeSlave.dickAccessory = "none",$activeSlave.foreskin = 0,$activeSlave.scrotum = 0,$activeSlave.balls = 0,$activeSlave.vagina = 0,$activeSlave.preg = -2,$activeSlave.vaginalSkill = 0,$cash -= $surgeryCost, $activeSlave.health -= 40, $surgeryType = "mtf"]]
- <</if>>
-<<elseif ($activeSlave.dick != 0) && ($activeSlave.vagina != -1)>>
- <<if $activeSlave.indentureRestrictions < 1>>
- [[Remove penis|Surgery Degradation][$activeSlave.dick = 0,$activeSlave.dickAccessory = "none",$activeSlave.foreskin = 0,$activeSlave.scrotum = 0,$activeSlave.balls = 0,$activeSlave.vaginalSkill = 0,$cash -= $surgeryCost, $activeSlave.health -= 20, $surgeryType = "chop"]] //This will reset $possessive sexual skills//
+<<if $activeSlave.indentureRestrictions < 1 && $activeSlave.breedingMark != 1>>
+ <<if $activeSlave.vagina == -1>>
+ [[Convert genitalia to female|Surgery Degradation][$activeSlave.dick = 0,$activeSlave.dickAccessory = "none",$activeSlave.foreskin = 0,$activeSlave.scrotum = 0,$activeSlave.balls = 0,$activeSlave.vagina = 0,$activeSlave.preg = -2,$activeSlave.vaginalSkill = 0,$cash -= $surgeryCost, $activeSlave.health -= 40, $surgeryType = "mtf"]] |
<</if>>
+ [[Remove penis|Surgery Degradation][$activeSlave.dick = 0,$activeSlave.dickAccessory = "none",$activeSlave.foreskin = 0,$activeSlave.scrotum = 0,$activeSlave.balls = 0,$activeSlave.vaginalSkill = 0,$cash -= $surgeryCost, $activeSlave.health -= 20, $surgeryType = "chop"]]
<</if>>
<<if ($activeSlave.dick != 0) && ($activeSlave.vagina == -1) && ($surgeryUpgrade == 1)>>
<<if $activeSlave.indentureRestrictions < 1>>
diff --git a/src/uncategorized/saChoosesOwnClothes.tw b/src/uncategorized/saChoosesOwnClothes.tw
index 208445dda22..95c1c1986f2 100644
--- a/src/uncategorized/saChoosesOwnClothes.tw
+++ b/src/uncategorized/saChoosesOwnClothes.tw
@@ -3,12 +3,65 @@
<<set $bellyAccessory = $slaves[$i].bellyAccessory>>
<<if $slaves[$i].fetish == "mindbroken">>
- She is fundamentally broken, but still follows some faint memories of standing within the wardrobe. She chooses to put on underwear, the reasons lost to her, and moves on.
- <<set $slaves[$i].clothes = "attractive lingerie">>
+ She is fundamentally broken, but still follows some faint memories of standing within the wardrobe.
<<if $slaves[$i].amp != 1 && $slaves[$i].heels == 1>>
She finds she can inexplicably walk if she wears heels; a daily lesson for her, as she forgets shortly after leaving.
<<set $slaves[$i].shoes = either("heels", "extreme heels", "boots")>>
<</if>>
+ <<if ($arcologies[0].FSRepopulationFocus > 0) && ($slaves[$i].preg <= 10) && ($slaves[$i].bellyImplant < 2000) && ($slaves[$i].inflation == 0)>>
+ She sees the fake bellies; since every girl she has ever met has a rounded middle, it's only natuaral she is compelled to wear one.
+ <<set $slaves[$i].bellyAccessory = "a large empathy belly">>
+ <</if>>
+ Faced with so many choices and no thought on the matter;
+ <<if ($arcologies[0].FSChattelReligionist > 0)>>
+ she commonly sees others wearing chattel habits and is drawn to doing so herself.
+ <<set $slaves[$i].clothes = "a chattel habit">>
+ <<elseif ($arcologies[0].FSEgyptianRevivalist > 0) && (random(1,3) == 1)>>
+ she commonly sees others wearing nothing but jewelry and is drawn to doing so herself.
+ <<set $slaves[$i].clothes = "slutty jewelry">>
+ <<elseif ($arcologies[0].FSRomanRevivalist > 0) && (random(1,3) == 1)>>
+ she commonly sees others wearing togas and is drawn to doing so herself.
+ <<set $slaves[$i].clothes = "a toga">>
+ <<elseif ($arcologies[0].FSEdoRevivalist > 0) && (random(1,3) == 1)>>
+ she commonly sees others wearing kimonos and is drawn to doing so herself.
+ <<set $slaves[$i].clothes = "a kimono">>
+ <<elseif ($arcologies[0].FSArabianRevivalist > 0) && (random(1,3) == 1)>>
+ she commonly sees others wearing silk and is drawn to doing so herself.
+ <<set $slaves[$i].clothes = "harem gauze">>
+ <<elseif ($arcologies[0].FSChineseRevivalist > 0) && (random(1,3) == 1)>>
+ she commonly sees others wearing qipaos and is drawn to doing so herself.
+ <<set $slaves[$i].clothes = "a slutty qipao">>
+ <<elseif ($arcologies[0].FSGenderFundamentalist > 0) && (random(1,3) == 1)>>
+ she commonly sees cheerleaders around and instinctually follows along.
+ <<set $slaves[$i].clothes = either("a cheerleader outfit", "a schoolgirl outfit")>>
+ <<elseif ($arcologies[0].FSGenderFundamentalist > 0) && (random(1,3) == 1)>>
+ she commonly sees bunnies around and instinctually follows along.
+ <<set $slaves[$i].clothes = "a bunny outfit">>
+ <<elseif ($arcologies[0].FSPaternalist > 0) && (random(1,3) == 1)>>
+ she commonly sees others wearing clothing and is drawn to doing so herself.
+ <<set $slaves[$i].clothes = "conservative clothing">>
+ <<elseif ($arcologies[0].FSMaturityPreferentialist > 0) && (random(1,3) == 1)>>
+ she commonly sees others wearing suits and is drawn to doing so herself.
+ <<set $slaves[$i].clothes = either("slutty business attire", "a nice maid outfit", "a military uniform", "nice business attire")>>
+ <<elseif ($arcologies[0].FSYouthPreferentialist > 0) && (random(1,3) == 1)>>
+ she commonly sees schoolgirls around and instinctually follows along.
+ <<set $slaves[$i].clothes = either("a schoolgirl outfit", "a cheerleader outfit")>>
+ <<elseif ($arcologies[0].FSDegradationist > 0) && (random(1,3) == 1)>>
+ she commonly sees others wearing chains and is drawn to doing so herself.
+ <<set $slaves[$i].clothes = either("chains", "uncomfortable straps", "shibari ropes")>>
+ <<elseif ($arcologies[0].FSPhysicalIdealist > 0) && (random(1,3) == 1)>>
+ she commonly sees naked girls around and seldom realizes they are coated in oil.
+ <<set $slaves[$i].clothes = either("body oil", "no clothing", "no clothing")>>
+ <<elseif ($arcologies[0].FSPastoralist > 0) && (random(1,3) == 1)>>
+ she commonly sees cowgirls around and instinctually follows along.
+ <<set $slaves[$i].clothes = "Western clothing">>
+ <<elseif ($arcologies[0].FSBodyPurist > 0) && (random(1,3) == 1)>>
+ she commonly sees others wearing tight, form fitting clothes and is drawn to doing so herself.
+ <<set $slaves[$i].clothes = either("a leotard", "a string bikini", "a slave gown", "a comfortable bodysuit", "restrictive latex", "clubslut netting", "a leotard", "a halter top dress")>>
+ <<else>>
+ she chooses to put on underwear, the reasons lost to her, and moves on.
+ <<set $slaves[$i].clothes = "attractive lingerie">>
+ <</if>>
<<else>>
<<if ($slaves[$i].devotion <= 20)>>
diff --git a/src/uncategorized/surgeryDegradation.tw b/src/uncategorized/surgeryDegradation.tw
index 7b31eb4a91c..0789749fa00 100644
--- a/src/uncategorized/surgeryDegradation.tw
+++ b/src/uncategorized/surgeryDegradation.tw
@@ -821,7 +821,7 @@ Even though creating an artificial scar is a trivial process, @@.red;her health
<<elseif $activeSlave.devotion > 95>>
Doubt, fear, and even nausea play across her face, but she's so worshipful of you that she masters them all, accepting that this is your will. There's surprisingly little mental effect on her. The horror of having her dick cut off is so strong that it breaks through to her, and the only way she can find to deal with it is to think about it as little as possible. She falls back on worshipful duty.
<<elseif $activeSlave.devotion > 50>>
- She's devoted to you, but doubt and fear play across her face as she comes to terms with what's happened. She does not see how having her dick removed will improve her sexual slavery. She does not rage or scream, but she does cry, @@.mediumorchid;sadly wondering@@ whether she's valuable to you at all, or if she's just a surgical plaything to be degraded. SHe's @@.gold;very frightened@@ that you'll cut off more of her remaining parts.
+ She's devoted to you, but doubt and fear play across her face as she comes to terms with what's happened. She does not see how having her dick removed will improve her sexual slavery. She does not rage or scream, but she does cry, @@.mediumorchid;sadly wondering@@ whether she's valuable to you at all, or if she's just a surgical plaything to be degraded. She's @@.gold;very frightened@@ that you'll cut off more of her remaining parts.
<<set $activeSlave.trust -= 10, $activeSlave.devotion -= 10>>
<<elseif $activeSlave.devotion > 20>>
She's properly broken to slavery, but this is much too far. Having her dick cut off cuts straight through her conditioning, and tears roll down her face as the horrible permanence of what's happened to her really sinks in. @@.mediumorchid;Open anger@@ begins to become apparent through her tears; she thought that her obedience merited better than this, and she's @@.gold;extremely terrified@@ to find that despite being a decent slave, she remains a surgical playground.
diff --git a/src/utility/artWidgets.tw b/src/utility/artWidgets.tw
index 3861b2631fb..34b19c3220a 100644
--- a/src/utility/artWidgets.tw
+++ b/src/utility/artWidgets.tw
@@ -258,13 +258,6 @@ $args[2]: icon UI Display for vector art, 1 for on.
<</if>>
<</if>>
-/% Head base image %/
-<<if $args[0].fuckdoll != 0>>
- <<print "<object type='image/svg+xml' data=" + _folderLoc + "/outfit/head latex.svg'" + "/></object>">>
-<<else>>
- <<print "<object type='image/svg+xml' data=" +_imgSkinLoc + "/head.svg'" + "/></object>">>
-<</if>>
-
/% Collar %/
<<switch $args[0].collar>>
<<case "bowtie">>
@@ -273,6 +266,13 @@ $args[2]: icon UI Display for vector art, 1 for on.
<<print "<object type='image/svg+xml' data=" + _folderLoc + "/outfit/" + $args[0].collar + ".svg'" + "/></object>">>
<</switch>>
+/% Head base image %/
+<<if $args[0].fuckdoll != 0>>
+ <<print "<object type='image/svg+xml' data=" + _folderLoc + "/outfit/head latex.svg'" + "/></object>">>
+<<else>>
+ <<print "<object type='image/svg+xml' data=" +_imgSkinLoc + "/head.svg'" + "/></object>">>
+<</if>>
+
/% Glasses %/
<<if $args[0].eyewear == "corrective glasses" or $args[0].eyewear == "glasses" or $args[0].eyewear == "blurring glasses">>
<<print "<object type='image/svg+xml' data=" + _folderLoc + "/outfit/glasses.svg'" + "/></object>">>
diff --git a/src/utility/slaveCreationWidgets.tw b/src/utility/slaveCreationWidgets.tw
index 33f441c6a94..a6308d0f10e 100644
--- a/src/utility/slaveCreationWidgets.tw
+++ b/src/utility/slaveCreationWidgets.tw
@@ -66,7 +66,8 @@
<</replace>>
<<replace "#language">>
- <<if $activeSlave.accent == 0>>Unaccented.
+ <<if $activeSlave.voice == 0>>
+ <<elseif $activeSlave.accent == 0>>Unaccented.
<<elseif $activeSlave.accent == 1>>Pretty $activeSlave.nationality accent.
<<elseif $activeSlave.accent == 2>>Thick $activeSlave.nationality accent.
<<else>>Not fluent.
--
GitLab