From 3fea1bb290dfe47f487f6e949b6e21f3a92f6df6 Mon Sep 17 00:00:00 2001 From: Pregmodder <pregmodder@gmail.com> Date: Thu, 9 Mar 2017 17:35:33 -0500 Subject: [PATCH] Bugfixes. --- src/uncategorized/matchmaking.tw | 2 +- src/uncategorized/randomIndividualEvent.tw | 2 +- src/uncategorized/saLongTermEffects.tw | 2 +- src/uncategorized/seNonlethalPit.tw | 12 ++++++------ src/uncategorized/seWedding.tw | 4 ++-- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/uncategorized/matchmaking.tw b/src/uncategorized/matchmaking.tw index 49354e2e78c..6824910cf95 100644 --- a/src/uncategorized/matchmaking.tw +++ b/src/uncategorized/matchmaking.tw @@ -274,7 +274,7 @@ Despite her devotion and trust, she is still a slave, and probably knows that he <<set $cash -= 10000>> <</replace>> <</click>> -<<if ($eventSlave.vagina != 0) && ($eventSlave.anus != 0)>> +<<if ($eventSlave.vagina != 0) && ($eventSlave.anus != 0) && $eventSlave.breedingMark != 1>> <br> <<click "Orgiastic ceremony">> <<replace "#result2">> You order $assistantName to invite deserving citizens to an orgiastic ceremony for a slave being married to a slaveowner, and to make the arrangements. The wedding orgy will take place during the upcoming week. diff --git a/src/uncategorized/randomIndividualEvent.tw b/src/uncategorized/randomIndividualEvent.tw index 9c54764c797..1acd692293f 100644 --- a/src/uncategorized/randomIndividualEvent.tw +++ b/src/uncategorized/randomIndividualEvent.tw @@ -519,7 +519,7 @@ <</if>> <</if>> -<<if ($seeAge == 1)>> +<<if ($seeAge != 0)>> <<if ($eventSlave.devotion > 50)>> <<if ($eventSlave.speechRules != "restrictive")>> <<if ($week-$eventSlave.birthWeek >= 51)>> diff --git a/src/uncategorized/saLongTermEffects.tw b/src/uncategorized/saLongTermEffects.tw index 8bf8734f77b..be54047a47d 100644 --- a/src/uncategorized/saLongTermEffects.tw +++ b/src/uncategorized/saLongTermEffects.tw @@ -2662,7 +2662,7 @@ and ($slaves[$i].clothes != "a slutty qipao") and ($slaves[$i].clothes != "restr <<if $slaves[$i].sexualFlaw != "abusive">> <<if $slaves[$i].aphrodisiacs > 0>> <<if $slaves[$i].addict > 2>> - Her aphrodisiac addiction makes her dependent on pain in others to get off. She's become @@@color:yellow;sexually abusive, getting off on the thrill of forcing herself on other slaves.@@ + Her aphrodisiac addiction makes her dependent on pain in others to get off. She's become @@color:yellow;sexually abusive, getting off on the thrill of forcing herself on other slaves.@@ <<set $slaves[$i].sexualFlaw = "abusive">> <</if>> <</if>> diff --git a/src/uncategorized/seNonlethalPit.tw b/src/uncategorized/seNonlethalPit.tw index 7ed358be3de..adb76e092ed 100644 --- a/src/uncategorized/seNonlethalPit.tw +++ b/src/uncategorized/seNonlethalPit.tw @@ -612,7 +612,7 @@ You throw the victor's strap-on down to _winner.slaveName. <<if _loser.devotion >= 20>> She accepts her mother, _winner.slaveName, having to rape her, but she @@color:gold;fears@@ that it will happen again. <<set _loser.trust -= 10>> - <</else>> + <<else>> She @@color:mediumorchid;hates@@ having to accept rape from her own mother, _winner.slaveName, and @@color:gold;fears@@ that it will happen again. <<set _loser.devotion -= 10>> <<set _loser.trust -= 10>> @@ -621,7 +621,7 @@ You throw the victor's strap-on down to _winner.slaveName. <<if _loser.devotion >= 20>> She accepts her father, _winner.slaveName, having to rape her, but she @@color:gold;fears@@ that it will happen again. <<set _loser.trust -= 10>> - <</else>> + <<else>> She @@color:mediumorchid;hates@@ having to accept rape from her own father, _winner.slaveName, and @@color:gold;fears@@ that it will happen again. <<set _loser.devotion -= 10>> <<set _loser.trust -= 10>> @@ -630,7 +630,7 @@ You throw the victor's strap-on down to _winner.slaveName. <<if _loser.devotion >= 20>> She accepts her daughter, _winner.slaveName, having to rape her, but she @@color:gold;fears@@ that it will happen again. <<set _loser.trust -= 10>> - <</else>> + <<else>> She @@color:mediumorchid;hates@@ having to accept rape from her own daughter, _winner.slaveName, and @@color:gold;fears@@ that it will happen again. <<set _loser.devotion -= 10>> <<set _loser.trust -= 10>> @@ -640,7 +640,7 @@ You throw the victor's strap-on down to _winner.slaveName. <<if _loser.devotion >= 20>> She accepts her twin sister, _winner.slaveName, having to rape her, but she @@color:gold;fears@@ that it will happen again. <<set _loser.trust -= 10>> - <</else>> + <<else>> She @@color:mediumorchid;hates@@ having to accept rape from her own twin, _winner.slaveName, and @@color:gold;fears@@ that it will happen again. <<set _loser.devotion -= 10>> <<set _loser.trust -= 10>> @@ -649,7 +649,7 @@ You throw the victor's strap-on down to _winner.slaveName. <<if _loser.devotion >= 20>> She accepts her sister, _winner.slaveName, having to rape her, but she @@color:gold;fears@@ that it will happen again. <<set _loser.trust -= 10>> - <</else>> + <<else>> She @@color:mediumorchid;hates@@ having to accept rape from her own sister, _winner.slaveName, and @@color:gold;fears@@ that it will happen again. <<set _loser.devotion -= 10>> <<set _loser.trust -= 10>> @@ -658,7 +658,7 @@ You throw the victor's strap-on down to _winner.slaveName. <<if _loser.devotion >= 20>> She accepts her half-sister, _winner.slaveName, having to rape her, but she @@color:gold;fears@@ that it will happen again. <<set _loser.trust -= 10>> - <</else>> + <<else>> She @@color:mediumorchid;hates@@ having to accept rape from her own half-sister, _winner.slaveName, and @@color:gold;fears@@ that it will happen again. <<set _loser.devotion -= 10>> <<set _loser.trust -= 10>> diff --git a/src/uncategorized/seWedding.tw b/src/uncategorized/seWedding.tw index 0d21d43fa3d..0958083e665 100644 --- a/src/uncategorized/seWedding.tw +++ b/src/uncategorized/seWedding.tw @@ -17,7 +17,7 @@ <</if>> <<if $weddingPlanned is 3>> - The ceremony to bind $activeSlave.slaveName to you as your slave wife, and her womb to you as your private breeding ground, is a polite affair which you host in the lower floor of your penthouse. <<if $arcologies[0].FSRestart != "unset">>Barely anyone is there, mostly lower-class citizens, several accompanied by their slaves. Many of your other slaves, that is your slaves who are not being married and fucked pregnant tonight, are present to serve your guests, but are dressed more conservatively than usual. There is a distinct air of unrest in the room, as if the absent Elites' distaste of your actions came in their place.<<else>>All the arcology's most prominent citizens are there, most with a favored slave or two and some even with their slave wives. Many of your other slaves, that is your slaves who are not being married and fucked pregnant tonight, are present to serve your guests, but are dressed more conservatively than usual. When assignations between citizen and slave develop, guests are politely encouraged to perform them in side rooms rather than out in view of the main gathering<</if>>. + The ceremony to bind $activeSlave.slaveName to you as your slave wife, and her womb to you as your private breeding ground, is a polite affair which you host in the lower floor of your penthouse. <<if $arcologies[0].FSRestart != "unset" && $activeSlave.breedingMark == 0>>Barely anyone is there, mostly lower-class citizens, several accompanied by their slaves. Many of your other slaves, that is your slaves who are not being married and fucked pregnant tonight, are present to serve your guests, but are dressed more conservatively than usual. There is a distinct air of unrest in the room, as if the absent Elites' distaste of your actions came in their place.<<else>>All the arcology's most prominent citizens are there, most with a favored slave or two and some even with their slave wives. Many of your other slaves, that is your slaves who are not being married and fucked pregnant tonight, are present to serve your guests, but are dressed more conservatively than usual. When assignations between citizen and slave develop, guests are politely encouraged to perform them in side rooms rather than out in view of the main gathering<</if>>. <br><br> $activeSlave.slaveName appears after everyone has had a chance to socialize,<<if ($activeSlave.amp == 1)>> carried by another slave since she's a quadruple amputee and she cannot walk,<</if>> wearing beautiful bridal lingerie in <<if ($activeSlave.vagina == 0)>> @@ -107,7 +107,7 @@ <<set $rep += 750>> <<set $desc = "a framed shot of you impregnating " + $activeSlave.slaveName + " at your wedding">> <<set $trinkets.push($desc)>> - <<if $arcologies[0].FSRestart != "unset">> + <<if $arcologies[0].FSRestart != "unset" && $activeSlave.breedingMark == 0>> You have @@color:red;angered@@ the Societal Elite by this public showing of everything they stand against. <<set $failedElite += 250>> <</if>> -- GitLab