From 7c63473c5f4fd1d5384e9a730eb6717d81444635 Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Fri, 19 Jan 2018 16:58:21 -0500
Subject: [PATCH] Fixes
---
src/events/intro/introSummary.tw | 2 +-
src/uncategorized/saLongTermEffects.tw | 60 ++++++++++++--------------
2 files changed, 28 insertions(+), 34 deletions(-)
diff --git a/src/events/intro/introSummary.tw b/src/events/intro/introSummary.tw
index aa7bc8501a4..68f40d6b799 100644
--- a/src/events/intro/introSummary.tw
+++ b/src/events/intro/introSummary.tw
@@ -686,7 +686,7 @@ __''Player Character''__
<<if $PC.boobs > 0>>
Your breasts are ''$PCCreationBoobSize''
- and ''$PCCreationBreast''.
+ and ''<<print $PCCreationBreast>>''.
<<if $PC.boobsBonus == 0>>
[[Go bigger|Intro Summary][$PC.boobsBonus = 2, $PC.boobsImplant = 0]] | [[Get implants|Intro Summary][$PC.boobsBonus = 2, $PC.boobsImplant = 1]] | [[Go smaller|Intro Summary][$PC.boobsBonus = -1, $PC.boobsImplant = 0]]
<<elseif $PC.boobsBonus == 2>>
diff --git a/src/uncategorized/saLongTermEffects.tw b/src/uncategorized/saLongTermEffects.tw
index 1d3c29492de..115da1201d7 100644
--- a/src/uncategorized/saLongTermEffects.tw
+++ b/src/uncategorized/saLongTermEffects.tw
@@ -2358,7 +2358,7 @@
even if she can't understand why.
<<case "a breeder">>
<<if $slaves[$i].pregKnown == 1 && $arcologies[0].FSRepopulation != "unset">>
- Her life used to revolve around being pregnant all the time and nothing has changed. However, being surrounded with happy, heavily pregnant women leaves her @@.hotpink;slightly more accepting@@ of her fate and @@.mediumaquamarine;hopeful@@ that her trained body will be useful to you.
+ Her life used to revolve around being pregnant all the time and nothing has changed. However, being surrounded with happy, heavily pregnant women leaves her @@.hotpink;slightly more accepting@@ of her fate and @@.mediumaquamarine;hopeful@@ that her trained body will be useful to you.
<<set $slaves[$i].trust += 1, $slaves[$i].devotion += 1>>
<<elseif $slaves[$i].pregControl == "speed up">>
Her life used to revolve around being pregnant all the time and nothing has changed. She @@.gold;watches in horror@@ as her middle visibly swells before her eyes. She @@.hotpink;slips more into submission@@ as the pressure in her womb increases.
@@ -2375,26 +2375,26 @@
<<set $slaves[$i].trust += 1, $slaves[$i].devotion += 1>>
<<case "a Futanari Sister">>
<<if $masterSuiteUpgradeLuxury == 2>>
- <<if $slaves[$i].assignment == "serve in the master suite">>
- She knows that $masterSuiteName features a fuckpit much like the one she spent years enjoying as a Futanari Sister, and @@.hotpink;does her best@@ to be a good girl in the hope you'll send her there someday.
- <<set $slaves[$i].devotion += 1>>
- <<else>>
- As a former Futanari Sister, the fuckpit in $masterSuiteName feels like home to her, and she has @@.mediumaquamarine;no desire to ever leave.@@
- <<set $slaves[$i].trust += 1>>
- <</if>>
+ <<if $slaves[$i].assignment == "serve in the master suite">>
+ As a former Futanari Sister, the fuckpit in $masterSuiteName feels like home to her, and she has @@.mediumaquamarine;no desire to ever leave.@@
+ <<set $slaves[$i].trust += 1>>
+ <<else>>
+ She knows that $masterSuiteName features a fuckpit much like the one she spent years enjoying as a Futanari Sister, and @@.hotpink;does her best@@ to be a good girl in the hope you'll send her there someday.
+ <<set $slaves[$i].devotion += 1>>
+ <</if>>
<</if>>
<<default>>
<<if $slaves[$i].trust >= -50>>
<<if setup.gratefulCareers.includes($slaves[$i].career)>>
- <<set $slaves[$i].trust += 1>>
- She remembers how hard her life was before she was a slave, and
- <<if $slaves[$i].trust > 50>>
- @@.mediumaquamarine;trusts you a bit more@@ for improving it.
- <<elseif $slaves[$i].trust > -20>>
- @@.mediumaquamarine;trusts you a bit more@@ because of it.
- <<else>>
- @@.mediumaquamarine;fears you a little less@@ because of it.
- <</if>>
+ <<set $slaves[$i].trust += 1>>
+ She remembers how hard her life was before she was a slave, and
+ <<if $slaves[$i].trust > 50>>
+ @@.mediumaquamarine;trusts you a bit more@@ for improving it.
+ <<elseif $slaves[$i].trust > -20>>
+ @@.mediumaquamarine;trusts you a bit more@@ because of it.
+ <<else>>
+ @@.mediumaquamarine;fears you a little less@@ because of it.
+ <</if>>
<</if>>
<</if>>
<<if $slaves[$i].devotion >= -50>>
@@ -4932,7 +4932,7 @@
<</if>>
<<if $arcologies[0].FSSubjugationist != "unset">>
- <<if ($slaves[$i].race is $arcologies[0].FSSubjugationistRace)>>
+ <<if ($slaves[$i].race == $arcologies[0].FSSubjugationistRace)>>
<<if $arcologies[0].FSSubjugationist >= $FSLockinLevel*0.5>>
Society @@.green;approves@@ of your keeping a slave of the subject $arcologies[0].FSSubjugationistRace race; this also advances $arcologies[0].FSSubjugationistRace inferiority.
<<else>>
@@ -4940,28 +4940,22 @@
<</if>>
<<FSChangePorn "Subjugationist" 1>>
<<if $slaves[$i].ovaries == 0>>
- <<if $slaves[$i].balls == 0 || $slaves[$i].vasectomy == 1>>
- Society @@.green;approves@@ of $slaves[$i].slaveName's <<if $slaves[$i].vasectomy == 1 && $slaves[$i].balls > 0>>vasectomy<<elseif $slaves[$i].dick > 0>>gelding<<else>>sterilization<</if>>, which ensures that $pronoun will not propagate the $arcologies[0].FSSubjugationistRace race.
- <<FSChangePorn "Subjugationist" 1>>
- <</if>>
+ <<if $slaves[$i].balls == 0 || $slaves[$i].vasectomy == 1>>
+ Society @@.green;approves@@ of $slaves[$i].slaveName's <<if $slaves[$i].vasectomy == 1 && $slaves[$i].balls > 0>>vasectomy<<elseif $slaves[$i].dick > 0>>gelding<<else>>sterilization<</if>>, which ensures that $pronoun will not propagate the $arcologies[0].FSSubjugationistRace race.
+ <<FSChangePorn "Subjugationist" 1>>
+ <</if>>
<</if>>
<<if $slaves[$i].fuckdoll > 0>>
Society @@.green;approves@@ of your keeping a Fuckdoll of the $arcologies[0].FSSubjugationistRace race.
<<FSChangePorn "Subjugationist" 1>>
<</if>>
<<else>>
- <<if $slaves[$i].pregKnown == 1>>
- <<if $slaves[$i].pregSource > 0>>
- <<for $j = 0; $j < $slaves.length; $j++>>
- <<if $slaves[$i].pregSource == $slaves[$j].ID>>
- <<if $slaves[$j].race is $arcologies[0].FSSubjugationistRace>>
- Society @@.red;strongly disapproves@@ of your allowing $slaves[$j].slaveName to be miscegenated by a $arcologies[0].FSSubjugationistRace subhuman like $slaves[$i].slaveName.
- <<FSChangePorn "Subjugationist" -2>>
- <</if>>
- <<break>>
+ <<if $slaves[$i].pregKnown == 1 && $slaves[$i].pregSource > 0>>
+ <<set _lte = $slaves.findIndex(function(s) { return $slaves[$i].pregSource == s.ID; })>>
+ <<if $slaves[_lte].race == $arcologies[0].FSSubjugationistRace>>
+ Society @@.red;strongly disapproves@@ of your allowing $slaves[$i].slaveName to be miscegenated by a $arcologies[0].FSSubjugationistRace subhuman like $slaves[_lte].slaveName.
+ <<FSChangePorn "Subjugationist" -2>>
<</if>>
- <</for>>
- <</if>>
<</if>>
<</if>>
<</if>>
--
GitLab