From efb618aaa51cb3d11f2f331dc95541631ab7c3e1 Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Mon, 13 Feb 2017 13:58:59 -0500
Subject: [PATCH] Bug fixes.
---
src/uncategorized/costsReport.tw | 2 +-
src/uncategorized/saLongTermEffects.tw | 53 +++++++++++++-------------
2 files changed, 28 insertions(+), 27 deletions(-)
diff --git a/src/uncategorized/costsReport.tw b/src/uncategorized/costsReport.tw
index fa10f912f69..e1be574462e 100644
--- a/src/uncategorized/costsReport.tw
+++ b/src/uncategorized/costsReport.tw
@@ -56,7 +56,7 @@
<br>__Servants' Quarters__ maintenance: ¤<<print (0.2*$servantsQuartersUpgradeMonitoring*$servantsQuarters*$facilityCost)>>
<</if>>
<<if $incubator > 0>>
- <br>__Incubation Facility__ maintenance and resource drain: ¤<<print ((10*$incubator*$facilityCost)+(0.2*$incubatorUpgradeWeight*$incubator*$facilityCost)+(0.2*$incubatorUpgradeMuscles*$incubator*$facilityCost)+(0.2*$incubatorUpgradeReproduction*$incubator*$facilityCost)+(0.5*$incubatorUpgrageSpeed*$incubator*$facilityCost))>>
+ <br>__Incubation Facility__ maintenance and resource drain: ¤<<print (10*$incubator*$facilityCost)+(0.2*$incubatorUpgradeWeight*$incubator*$facilityCost)+(0.2*$incubatorUpgradeMuscles*$incubator*$facilityCost)+(0.2*$incubatorUpgradeReproduction*$incubator*$facilityCost)+(0.5*$incubatorUpgradeSpeed*$incubator*$facilityCost)>>
<<if $incubatorWeightSetting+$incubatorMusclesSetting+$incubatorReproductionSetting > 0>>
<br> Additional monitoring and maintenance costs for growing children: ¤<<print (($incubatorWeightSetting+$incubatorMusclesSetting+$incubatorReproductionSetting)*500)>>
<</if>>
diff --git a/src/uncategorized/saLongTermEffects.tw b/src/uncategorized/saLongTermEffects.tw
index 90628677b88..ebf876602da 100644
--- a/src/uncategorized/saLongTermEffects.tw
+++ b/src/uncategorized/saLongTermEffects.tw
@@ -127,16 +127,6 @@
<<set $slaves[$i].devotion += 1>>
<</if>>
<</if>>
-<<case "a string bikini" "clubslut netting">>
-<<if $slaves[$i].fetish is "humiliation">>
- <<if ($slaves[$i].fetishStrength > 60)>>
- She pretends to be embarrassed by her extremely revealing clothing but @@color:hotpink;openly gets off on it.@@
- <<set $slaves[$i].devotion += 2>>
- <<else>>
- She pretends to be embarrassed by her extremely revealing clothing but @@color:hotpink;secretly gets off on it.@@
- <<set $slaves[$i].devotion += 1>>
- <</if>>
-<</if>>
<<case "a penitent nuns habit">>
The mortification of the flesh she endures from wearing her sackcloth habit slowly and painfully @@color:hotpink;purifies her mind@@ of any but devoted, @@color:gold;fearful@@ thoughts. It's also @@color:red;unhealthy.@@
<<set $slaves[$i].devotion += 2, $slaves[$i].trust -= 2, $slaves[$i].health -= 3>>
@@ -229,23 +219,32 @@
The ropes she's wearing restrict her without pain, rendering her @@color:hotpink;susceptible to control@@ and @@color:gold;afraid@@.
<<set $slaves[$i].devotion += 1, $slaves[$i].trust -= 1>>
<</if>>
-<</switch>>
-<<if ($slaves[$i].devotion <= 20)>>
- She is @@color:mediumorchid;inappropriately proud@@ of the nice clothes she's wearing, @@color:mediumaquamarine;building her confidence.@@
- <<set $slaves[$i].devotion -= 5, $slaves[$i].trust += 3>>
-<<elseif ($slaves[$i].clothes is "attractive lingerie") && ($slaves[$i].dick > 0)>>
- She is @@color:hotpink;proud@@ of the pretty lingerie she's wearing, but she constantly has to adjust her g-string to cover her penis.
- <<set $slaves[$i].devotion += 1>>
+<<default>>
+ <<if ($slaves[$i].devotion <= 20)>>
+ She is @@color:mediumorchid;inappropriately proud@@ of the nice clothes she's wearing, @@color:mediumaquamarine;building her confidence.@@
+ <<set $slaves[$i].devotion -= 5, $slaves[$i].trust += 3>>
+ <<elseif $slaves[$i].fetish is "humiliation" && ($slaves[$i].clothes is "a string bikini" || $slaves[$i].clothes is "clubslut netting")>>
+ <<if ($slaves[$i].fetishStrength > 60)>>
+ She pretends to be embarrassed by her extremely revealing clothing but @@color:hotpink;openly gets off on it.@@
+ <<set $slaves[$i].devotion += 2>>
+ <<else>>
+ She pretends to be embarrassed by her extremely revealing clothing but @@color:hotpink;secretly gets off on it.@@
+ <<set $slaves[$i].devotion += 1>>
+ <</if>>
+ <<elseif ($slaves[$i].clothes is "attractive lingerie") && ($slaves[$i].dick > 0)>>
+ She is @@color:hotpink;proud@@ of the pretty lingerie she's wearing, but she constantly has to adjust her g-string to cover her penis.
+ <<set $slaves[$i].devotion += 1>>
<<elseif ($slaves[$i].clothes is "attractive lingerie for a pregnant woman") && ($slaves[$i].dick > 0)>>
She is @@color:hotpink;proud@@ of the pretty lingerie she's wearing, but she constantly has to adjust her panties to cover her penis.
<<set $slaves[$i].devotion += 1>>
-<<elseif ($slaves[$i].clothes is "a string bikini") && ($slaves[$i].dick > 0)>>
- She is @@color:hotpink;proud@@ of the slutty lingerie she's wearing, but she constantly has to adjust her string bikini bottom in a vain effort to cover her penis.
- <<set $slaves[$i].devotion += 1>>
-<<else>>
- She is @@color:hotpink;proud@@ and @@color:mediumaquamarine;confident@@ of the nice clothes she's wearing.
- <<set $slaves[$i].devotion += 1, $slaves[$i].trust += 1>>
-<</if>>
+ <<elseif ($slaves[$i].clothes is "a string bikini") && ($slaves[$i].dick > 0)>>
+ She is @@color:hotpink;proud@@ of the slutty lingerie she's wearing, but she constantly has to adjust her string bikini bottom in a vain effort to cover her penis.
+ <<set $slaves[$i].devotion += 1>>
+ <<else>>
+ She is @@color:hotpink;proud@@ and @@color:mediumaquamarine;confident@@ of the nice clothes she's wearing.
+ <<set $slaves[$i].devotion += 1, $slaves[$i].trust += 1>>
+ <</if>>
+<</switch>>
<<if ($slaves[$i].fetishKnown == 0)>>
<<if ($slaves[$i].fetish is "humiliation")>>
@@ -2954,6 +2953,7 @@ and ($slaves[$i].clothes != "a slutty qipao") and ($slaves[$i].clothes != "restr
<</if>>
<</if>>
+<<if $slaves[$i].diet == "muscle building">>
<<if ($slaves[$i].muscles > 30)>>
<<if (($slaves[$i].face-$slaves[$i].faceImplant) > 1) && (random(1,100) > 95)>>
All the hormones in $possessive system from $possessive heavy workouts @@color:orange;harden $possessive beautiful face a little.@@
@@ -2966,6 +2966,7 @@ and ($slaves[$i].clothes != "a slutty qipao") and ($slaves[$i].clothes != "restr
<</if>>
<</if>>
<</if>>
+<</if>>
<<if $slaves[$i].addict > 2>>
<<if $slaves[$i].addict > random(0,100)>>
@@ -3139,7 +3140,7 @@ and ($slaves[$i].clothes != "a slutty qipao") and ($slaves[$i].clothes != "restr
<</if>>
<</if>>
- <<if ($slaves[$i].physicalAge < $slaves[$i].pubertyAgeXX+1) && ($slaves[$i].physicalAge > $slaves[$i].pubertyAgeXX) && ($slaves[$i].pubertyAgeXX < $fertilityAge)>>
+ <<if ($slaves[$i].physicalAge < $slaves[$i].pubertyAgeXX) && ($slaves[$i].physicalAge > $slaves[$i].pubertyAgeXX-3) && ($slaves[$i].pubertyAgeXX < $fertilityAge)>>
$possessiveCap body is showing signs of @@color:orange;early puberty@@.
<</if>>
@@ -3219,7 +3220,7 @@ and ($slaves[$i].clothes != "a slutty qipao") and ($slaves[$i].clothes != "restr
<</if>>
<</if>>
- <<if ($slaves[$i].physicalAge < $slaves[$i].pubertyAgeXY+1) && ($slaves[$i].physicalAge > $slaves[$i].pubertyAgeXY) && ($slaves[$i].pubertyAgeXY < $fertilityAge)>>
+ <<if ($slaves[$i].physicalAge < $slaves[$i].pubertyAgeXY) && ($slaves[$i].physicalAge > $slaves[$i].pubertyAgeXY-3) && ($slaves[$i].pubertyAgeXY < $potencyAge)>>
$possessiveCap body is showing signs of @@color:orange;early puberty@@.
<</if>>
--
GitLab