From ebc9edcba44d3bc9467443ba577a6bd6c4f22851 Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Mon, 21 Aug 2017 23:07:47 -0400
Subject: [PATCH] fixes
---
src/pregmod/fMarry.tw | 2 +-
src/pregmod/managePersonalAffairs.tw | 1 -
src/uncategorized/BackwardsCompatibility.tw | 8 ++++----
src/uncategorized/brothelReport.tw | 2 ++
src/uncategorized/randomNonindividualEvent.tw | 4 ++--
src/uncategorized/saLongTermEffects.tw | 5 ++++-
src/uncategorized/seWedding.tw | 4 ++--
src/uncategorized/servantsQuartersReport.tw | 2 ++
src/uncategorized/wardrobeUse.tw | 2 +-
9 files changed, 18 insertions(+), 12 deletions(-)
diff --git a/src/pregmod/fMarry.tw b/src/pregmod/fMarry.tw
index b178fec4c54..c4cb010d838 100644
--- a/src/pregmod/fMarry.tw
+++ b/src/pregmod/fMarry.tw
@@ -523,7 +523,7 @@ You tell $activeSlave.slaveName that you're going to marry her. (A proposal, of
Her erection tents the front of her lacy g-string.
<</if>>
<<elseif ($activeSlave.dick > 0)>>
- <<if if $activeSlave.dick > 10>>
+ <<if $activeSlave.dick > 10>>
Her huge soft cock is allowed to dangle freely as no g-string could hope to contain it.
<<elseif $activeSlave.dick > 4>>
Her big soft cock forms a lewd mass, stuffed into her lacy g-string.
diff --git a/src/pregmod/managePersonalAffairs.tw b/src/pregmod/managePersonalAffairs.tw
index afedcdd0e28..e4d4ef0d727 100644
--- a/src/pregmod/managePersonalAffairs.tw
+++ b/src/pregmod/managePersonalAffairs.tw
@@ -499,7 +499,6 @@ In total, you have given birth to:
<<else>>
<<if $PC.slavesFathered > 0>>
<br>
-
<<if $PC.dick == 1>>
You've fathered $PC.slavesFathered new slaves as an arcology owner so far.
<<else>>
diff --git a/src/uncategorized/BackwardsCompatibility.tw b/src/uncategorized/BackwardsCompatibility.tw
index 02d3fe40fe8..ae1d1fcffb0 100644
--- a/src/uncategorized/BackwardsCompatibility.tw
+++ b/src/uncategorized/BackwardsCompatibility.tw
@@ -1163,11 +1163,11 @@ Setting missing global variables:
<<set $masterSuiteDecoration = "standard">>
<</if>>
-<<if ndef $HGSuiteiIDs>>
- <<set $HGSuiteiIDs = []>>
+<<if ndef $HGSuiteIDs>>
+ <<set $HGSuiteIDs = []>>
<</if>>
-<<if $HGSuiteiIDs.length > 0 && typeof $HGSuiteiIDs[0] === 'object'>>
- <<set $HGSuiteiIDs = $HGSuiteiIDs.map(function(a) { return a.ID; })>>
+<<if $HGSuiteIDs.length > 0 && typeof $HGSuiteIDs[0] === 'object'>>
+ <<set $HGSuiteIDs = $HGSuiteIDs.map(function(a) { return a.ID; })>>
<</if>>
<<if ndef $HGSuiteName>>
<<set $HGSuiteName = "the Head Girl Suite">>
diff --git a/src/uncategorized/brothelReport.tw b/src/uncategorized/brothelReport.tw
index 9dfc08c7288..715cc435540 100644
--- a/src/uncategorized/brothelReport.tw
+++ b/src/uncategorized/brothelReport.tw
@@ -72,6 +72,8 @@
<<if ($Madam.actualAge > 35)>>
Her age and experience also contribute.
<<set $madamCashBonus += 0.05>>
+ <<elseif $AgePenalty == 0>>
+ <<set $madamCashBonus += 0.05>>
<</if>>
<<if setup.madamCareers.includes($Madam.career)>>
She has experience from her life before she was a slave that helps her in the seedy business of selling other people's bodies for sex.
diff --git a/src/uncategorized/randomNonindividualEvent.tw b/src/uncategorized/randomNonindividualEvent.tw
index 84bbd8c47de..72e20af4d4f 100644
--- a/src/uncategorized/randomNonindividualEvent.tw
+++ b/src/uncategorized/randomNonindividualEvent.tw
@@ -391,11 +391,11 @@
<</if>>
<</if>>
-<<if ($Stewardess != 0) && ($servantsQuartersSlaves > 0) && ($Stewardess.actualAge >= 35)>>
+<<if ($Stewardess != 0) && ($servantsQuartersSlaves > 0) && ($Stewardess.actualAge >= 35 || $AgePenalty == 0)>>
<<set $PETSevent.push("stewardess beating")>>
<</if>>
-<<if ($Madam != 0) && ($brothelSlaves >= 5) && ($Madam.actualAge >= 35) && ($Madam.whoreSkill >= 100)>>
+<<if ($Madam != 0) && ($brothelSlaves >= 5) && ($Madam.actualAge >= 35 || $AgePenalty == 0) && ($Madam.whoreSkill >= 100)>>
<<set $PESSevent.push("madam strategy")>>
<</if>>
diff --git a/src/uncategorized/saLongTermEffects.tw b/src/uncategorized/saLongTermEffects.tw
index d22b5c21557..a5e5fe38e1f 100644
--- a/src/uncategorized/saLongTermEffects.tw
+++ b/src/uncategorized/saLongTermEffects.tw
@@ -502,11 +502,14 @@
<<set $slaves[$i].devotion += 4>>
<</if>>
<<else>>
- <<if $slaves[$i].waist < -95>>
+ <<if $slaves[$i].waist <= -95>>
Her waist is so absurd that her extreme corsetage does not affect her further.
<<else>>
@@.lime;The extreme corseting narrows her waist.@@
<<set $slaves[$i].waist -= 5>>
+ <<if waist < -95>> /*can only get here if waist was previously > -95 */
+ <<set $slaves[$i].waist = -95>>
+ <</if>>
<<if $slaves[$i].waist >= -40>>
It's so tight that it's @@.red;unhealthy.@@
<<set $slaves[$i].health -= 5>>
diff --git a/src/uncategorized/seWedding.tw b/src/uncategorized/seWedding.tw
index 7a221efd8e0..b722a138c9d 100644
--- a/src/uncategorized/seWedding.tw
+++ b/src/uncategorized/seWedding.tw
@@ -296,7 +296,7 @@
Her erection tents the front of her lacy g-string.
<</if>>
<<elseif ($activeSlave.dick > 0)>>
- <<if if $activeSlave.dick > 10>>
+ <<if $activeSlave.dick > 10>>
Her huge soft cock is allowed to dangle freely as no g-string could hope to contain it.
<<elseif $activeSlave.dick > 4>>
Her big soft cock forms a lewd mass, stuffed into her lacy g-string.
@@ -637,7 +637,7 @@
Her erection tents the front of her lacy g-string.
<</if>>
<<elseif ($activeSlave.dick > 0)>>
- <<if if $activeSlave.dick > 10>>
+ <<if $activeSlave.dick > 10>>
Her huge soft cock is allowed to dangle freely as no g-string could hope to contain it.
<<elseif $activeSlave.dick > 4>>
Her big soft cock forms a lewd mass, stuffed into her lacy g-string.
diff --git a/src/uncategorized/servantsQuartersReport.tw b/src/uncategorized/servantsQuartersReport.tw
index a2c520764bf..0d88477ea39 100644
--- a/src/uncategorized/servantsQuartersReport.tw
+++ b/src/uncategorized/servantsQuartersReport.tw
@@ -81,6 +81,8 @@
<<if ($Stewardess.actualAge > 35)>>
<<set $stewardessBonus += 25>>
Her age and experience give her added effectiveness.
+ <<elseif $AgePenalty == 0>>
+ <<set $stewardessBonus +=25>>
<</if>>
<<if ($Stewardess.intelligence > 0)>>
<<set $stewardessBonus += 25*$Stewardess.intelligence>>
diff --git a/src/uncategorized/wardrobeUse.tw b/src/uncategorized/wardrobeUse.tw
index 94a8f999b30..f77bb65e9da 100644
--- a/src/uncategorized/wardrobeUse.tw
+++ b/src/uncategorized/wardrobeUse.tw
@@ -726,7 +726,7 @@ Anal accessory: ''<span id="buttplug">$activeSlave.buttplug</span>.''
<</link>>
all descriptions to show what she is currently wearing?
-<<elseif if $activeSlave.fuckdoll == 1>>
+<<elseif $activeSlave.fuckdoll == 1>>
//<<ClothingDescription>>//
<br><br> There are no changes you can make to her at this time.
<</if>> /* CLOSES FUCKDOLL CHECK */
--
GitLab