From e3c506d4abe95596531cb86179ff4ad0e6660f7f Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Mon, 4 Sep 2017 15:54:23 -0400
Subject: [PATCH] Fixes and continued conversion.
---
src/init/setupVars.tw | 2 +-
src/pregmod/generateChild.tw | 2 +-
src/utility/descriptionWidgets.tw | 2 +-
src/utility/descriptionWidgetsPiercings.tw | 2 +-
src/utility/descriptionWidgetsStyle.tw | 18 +++++++++---------
src/utility/descriptionWidgetsTattoos.tw | 20 ++++++++++----------
6 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/src/init/setupVars.tw b/src/init/setupVars.tw
index 2d53f382cde..f151f48dab8 100644
--- a/src/init/setupVars.tw
+++ b/src/init/setupVars.tw
@@ -163,7 +163,7 @@
"Tuvaluan": weightedArray({"pacific islander": 9, "mixed race": 1}),
"Zambian": weightedArray({black: 9, "mixed race": 1}),
"Albanian": weightedArray({white: 9, "mixed race": 1}),
- "Bruneian": weightedArray({malay: 30, asiaa: 12, "indo-aryan": 8, "mixed race": 1}),
+ "Bruneian": weightedArray({malay: 30, asian: 12, "indo-aryan": 8, "mixed race": 1}),
"Singaporean": weightedArray({asian: 30, malay: 12, "indo-aryan": 8, "mixed race": 1}),
"": weightedArray({white: 9, "mixed race": 1}), /* default mix */
/* The following two are NOT in the game, but were referenced in NationalityToRace */
diff --git a/src/pregmod/generateChild.tw b/src/pregmod/generateChild.tw
index d9f52e7ec1e..5d09a4616e2 100644
--- a/src/pregmod/generateChild.tw
+++ b/src/pregmod/generateChild.tw
@@ -530,7 +530,7 @@
<<set $activeSlave.belly = 0>>
<<set $activeSlave.bellyPreg = 0>>
<<set $activeSlave.bellyFluid = 0>>
-<<set $activeSlave.bellyImplant = 0>>
+<<set $activeSlave.bellyImplant = -1>>
<<set $activeSlave.clitPiercing = 0>>
<<set $activeSlave.dickPiercing = 0>>
<<set $activeSlave.makeup = 0>>
diff --git a/src/utility/descriptionWidgets.tw b/src/utility/descriptionWidgets.tw
index 45880733dd3..46f782bc7c3 100644
--- a/src/utility/descriptionWidgets.tw
+++ b/src/utility/descriptionWidgets.tw
@@ -180,7 +180,7 @@
a large poppy, its pod glistening with black opiate juice.
<<elseif $activeSlave.vagina == 0>>
a white lily, pure and unspoiled.
-<<elseif $activeSlave.pregType > 3>>
+<<elseif $activeSlave.pregType > 3 && $activeSlave.pregKnown == 1>>
a pink lotus, beautiful and fertile.
<<elseif $activeSlave.energy > 95>>
a flamboyant tiger lily.
diff --git a/src/utility/descriptionWidgetsPiercings.tw b/src/utility/descriptionWidgetsPiercings.tw
index 24084677b3c..685b7232337 100644
--- a/src/utility/descriptionWidgetsPiercings.tw
+++ b/src/utility/descriptionWidgetsPiercings.tw
@@ -220,7 +220,7 @@
<</if>>
<<else>>
<<if $activeSlave.navelPiercing > 0>>
- <<if $activeSlave.preg > 20>>
+ <<if $activeSlave.belly >= 10000>>
<<if $activeSlave.navelPiercing == 1>>
$possessiveCap popped navel bears a simple stud.
<<elseif $activeSlave.navelPiercing == 2>>
diff --git a/src/utility/descriptionWidgetsStyle.tw b/src/utility/descriptionWidgetsStyle.tw
index 130c31d2ce0..be3dc822dfe 100644
--- a/src/utility/descriptionWidgetsStyle.tw
+++ b/src/utility/descriptionWidgetsStyle.tw
@@ -307,10 +307,10 @@ $activeSlave.slaveName is
"Virgin!" across the front in large letters.
<<elseif ($activeSlave.anus == 0)>>
"Anal Virgin!" across the front in large letters.
- <<elseif ($activeSlave.preg > 0)>>
+ <<elseif ($activeSlave.pregKnown == 1)>>
"I'm Pregnant!" across the front in large letters.
<<else>>
- "Property Of $PC.name<<if $PC.surname>> $PC.surname<</if>>" across the front.
+ "Property of <<PlayerName>>" across the front.
<</if>>
<<if ($activeSlave.amp == 1)>>
/* no description yet */
@@ -2238,25 +2238,25 @@ $possessiveCap
$pronounCap is wearing a sturdy leather collar that continues up to restrict $possessive jaw as well. It acts as an anchor for an enormous inward-facing dildo that reaches deep down $possessive throat. The sheer size of the phallus forces $possessive mouth as wide as it will go and considerably bulges $possessive throat. Fortunatly for $object, it is designed to allow $object to be able to breath through $possessive nose; though when removed, the poor girl finds <<print $object>>self incapable of closing $possessive mouth for some time.
<<case "preg biometrics">>
<<if $activeSlave.pregSource > 0>>
- <<set _daddy = $slaves.find(function(s) { returns.ID == $activeSlave.pregSource; }), _daddy = _daddy.slaveName>>
+ <<set _daddy = $slaves.find(function(s) { return.ID == $activeSlave.pregSource; }), _daddy = _daddy.slaveName>>
<</if>>
<<set _pregCollar = either(1, 2, 3)>>
$pronounCap is wearing a heavy metal collar with a digital display; it currently reads:
- <<if $activeSlave.preg > 0 && $activeSlave.preg < 4>>
+ <<if $activeSlave.preg > 0 && $activeSlave.pregKnown == 0>>
"I might be preggers! Rub my belly for luck!"
<<else>>
<<if _pregCollar == 1>>
- <<if $activeSlave.preg >= 0 && $activeSlave.preg < 4>>
+ <<if $activeSlave.pregKnown == 0>>
"Knock me up!"
<<elseif $activeSlave.pregType >= 50>>
"ERROR? random(322,344) bab<<if $activeSlave.pregType > 1>>ies<<else>>y<</if>> on board!"
- <<elseif $activeSlave.preg > 0>>
+ <<elseif $activeSlave.pregKnown == 1>>
"<<if $activeSlave.pregType == 0>>1<<else>>$activeSlave.pregType<</if>> bab<<if $activeSlave.pregType > 1>>ies<<else>>y<</if>> on board!"
<<else>>
"I'm infertile!"
<</if>>
<<elseif _pregCollar == 2>>
- <<if $activeSlave.preg > 4>>
+ <<if $activeSlave.pregKnown == 1>>
<<if $activeSlave.pregType >= 50>>
"<<print 31-$activeSlave.preg>>
<<else>>
@@ -2267,8 +2267,8 @@ $possessiveCap
"My womb needs filling!"
<</if>>
<<else>>
- <<if $activeSlave.preg >= 0 && $activeSlave.preg < 4>>
- "Womb available!"
+ <<if $activeSlave.pregKnown == 0>>
+ "Put a baby in me today!"
<<elseif $activeSlave.pregSource == -1>>
"Womb claimed by my <<WrittenMaster>>!"
<<elseif ($activeSlave.pregSource == -2 || $activeSlave.pregSource == 0)>>
diff --git a/src/utility/descriptionWidgetsTattoos.tw b/src/utility/descriptionWidgetsTattoos.tw
index 0a2fc460409..adabd3c171f 100644
--- a/src/utility/descriptionWidgetsTattoos.tw
+++ b/src/utility/descriptionWidgetsTattoos.tw
@@ -285,11 +285,11 @@
<<case "Asian art">>
A traditional Asian household scene is tattooed on $possessive lower back, showing a rendition of $activeSlave.slaveName, dressed in rich silks, having sex with a <<if $PC.title == 1>>gentleman<<else>>lady<</if>>. The slave and the <<if $PC.title == 1>>gentleman<<else>>lady<</if>> are kissing passionately as <<if $PC.title == 1>>he<<else>>she<</if>>
<<if $activeSlave.vagina < 0>>
- penetrates the slave's anus.
- <<elseif $activeSlave.preg > 5>>
- embraces the slave's pregnant belly.
+ penetrates the slave's anus.
+ <<elseif $activeSlave.bellyPreg >= 1500 || $activeSlave.bellyImplant >= 1500>>
+ embraces the slave's <<if $activeSlave.pregKnown == 1>>pregnant<<else>>rounded<</if>> belly.
<<else>>
- penetrates the slave's vagina.
+ penetrates the slave's vagina.
<</if>>
<<case "degradation">>
$pronounCap has a tramp stamp formed from gothic lettering that reads 'Anal Whore.'
@@ -401,15 +401,15 @@
<<case "Asian art">>
$pronounCap has formal Asian characters tattooed across $possessive abdomen. To those who do not know the language, they look elegant, but roughly translated, they read
<<if ($activeSlave.dick > 0) && canAchieveErection($activeSlave)>>
- 'dick girl slut.'
+ 'dick girl slut.'
<<elseif $activeSlave.dick > 0>>
- 'limp dick slut.'
- <<elseif $activeSlave.preg > 5>>
- 'pregnant cow.'
+ 'limp dick slut.'
+ <<elseif $activeSlave.pregKnown == 1 && $activeSlave.bellyPreg >= 100>>
+ 'pregnant cow.'
<<elseif $activeSlave.physicalAge > 35>>
- 'horny old bitch.'
+ 'horny old bitch.'
<<else>>
- 'sex slave.'
+ 'sex slave.'
<</if>>
<<case "possessive">>
$possessiveCap abdomen is tattooed with
--
GitLab