From 9a7ab2074144764fab950b21e46ea625c21f6eff Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Tue, 27 Mar 2018 20:41:25 -0400
Subject: [PATCH] little fixes

---
 src/uncategorized/RESS.tw              |  2 +-
 src/uncategorized/pRivalryActions.tw   | 21 +++------------------
 src/uncategorized/saDevotion.tw        |  4 ++--
 src/uncategorized/saLongTermEffects.tw |  2 +-
 4 files changed, 7 insertions(+), 22 deletions(-)

diff --git a/src/uncategorized/RESS.tw b/src/uncategorized/RESS.tw
index dbbdf11afb3..be0f132fada 100644
--- a/src/uncategorized/RESS.tw
+++ b/src/uncategorized/RESS.tw
@@ -14583,7 +14583,7 @@ You tell her kindly that you understand, and that she'll be trained to address t
 	<<if $activeSlave.belly >= 750000>>
 		"Oh <<Master>>! I'm <<s>>welling <<s>>o fast with imp<<s>> for you! There'<<s>> <<s>>o many in me... Oh god, it feel<<s>> like I'm going to bur<<s>>t! <<S>>o many... <<Master>> <<s>>ure i<<s>> potent! I hope <<if $PC.title == 1>>he<<else>><<sh>>e<</if>> can handle them all!" She groans, cradling her _belly belly and pretending to be forced to the ground by her pregnancy growing ever larger. "<<Master>>! They won't <<s>>top! Oh... <<S>>o full... I can't <<s>>top con<<c>>eiving!" She roles onto her back and clutches her absurd stomach. "<<S>>o tight! <<S>>o full! <<S>>o Good! I need more! Oh, <<Master>>..." She may be getting a little too into the fantasy.
 		<<if $activeSlave.broodmother == 2 && $activeSlave.preg > 37>>
-			A gush of fluid flows from her pussy, snapping her out of her roleplay. "<<Master>>! I need... One'<<s>> coming now!" You rub her contracting stomach, enjoying the feeling of the life within shifting to take advantage of the free space. You sigh and lean down, the vessel of your spawn needs help after pinning herself in such a compromising position. Holding her belly clear of her crotch, you watch her steadily push out her child before spasming with orgasm and pushing ti effortlessly into the world. After collecting it for a servant to handle, you help the exhausted girl back to her feet. She thanks you sincerely for the assist before going to clean herself up. You barely have time to turn away before another splash catches your attention. "<<Master>>... Another'<<s>>, mmmmh, coming...".
+			A gush of fluid flows from her pussy, snapping her out of her roleplay. "<<Master>>! I need... One'<<s>> coming now!" You rub her contracting stomach, enjoying the feeling of the life within shifting to take advantage of the free space. You sigh and lean down, the vessel of your spawn needs help after pinning herself in such a compromising position. Holding her belly clear of her crotch, you watch her steadily push out her child before spasming with orgasm and freeing it effortlessly into the world. After collecting it for a servant to handle, you help the exhausted girl back to her feet. She thanks you sincerely for the assist before going to clean herself up. You barely have time to turn away before another splash catches your attention. "<<Master>>... Another'<<s>>, mmmmh, coming...".
 		<</if>>
 	<<elseif $activeSlave.belly >= 600000>>
 		"Oh <<Master>>! I'm <<s>>welling <<s>>o fast with imp<<s>> for you! There'<<s>> <<s>>o many in me... Oh god, it feel<<s>> like I'm going to bur<<s>>t! <<S>>o many... <<Master>> <<s>>ure i<<s>> potent! I hope <<if $PC.title == 1>>he<<else>><<sh>>e<</if>> can handle them all!" She teases, cradling her _belly belly and pretending to be forced to the ground by her pregnancy growing ever larger.
diff --git a/src/uncategorized/pRivalryActions.tw b/src/uncategorized/pRivalryActions.tw
index 984014b382c..5eb63fc2158 100644
--- a/src/uncategorized/pRivalryActions.tw
+++ b/src/uncategorized/pRivalryActions.tw
@@ -3851,26 +3851,11 @@ You remind yourself that success in this conflict will not be defined by the tra
 	<</replace>>
 <</link>>
 <<if $arcologies[0].FSRestartDecoration == 100>>
-<<if $rep >= 10000>>
+<<if $rep >= 15000>>
 <br><<link "Use your connections to throttle your rival's arcology">>
 	<<replace "#result">>
-	With every external, and several internal, supply lines severed, <<if _num < $seeDicks>>his<<else>>her<</if>> tenants are @@.green;faced with imminent destruction@@ and rise up against their hapless landlord. <<if _num < $seeDicks>>He<<else>>She<</if>> is quickly disposed in an effort to appease you.
-	<<if $rivalSet != 0>>
-	  <<for _pra = 0; _pra < $arcologies.length; _pra++>>
-		<<if $arcologies[_pra].rival == 1>>
-		  <<set $arcologies[_pra].embargo = 0>>
-		  <<set $arcologies[_pra].embargoTarget = -1>>
-		  <<set $arcologies[_pra].influenceTarget = -1>>
-		  <<set $arcologies[_pra].rival = 0>>
-		  <<set $arcologies[_pra].government = "direct democracy">>
-		  <<break>>
-		<</if>>
-	  <</for>>
-	<</if>>
-	<<if $hostageAnnounced == 1>>
-		They also present <<if _num < $seeDicks>>her<<else>>his<</if>> hostage in hopes of being released from your iron grasp.
-		<<set $hostageRescued = 1>>
-	<</if>>
+	With every external, and several internal, supply lines severed, <<if _num < $seeDicks>>his<<else>>her<</if>> tenants are faced with imminent destruction and @@.green;rise up@@ against their hapless landlord. <<if _num < $seeDicks>>He<<else>>She<</if>> will not be able to weather such a siege for long. 
+	<<set $rivalryPower += 10>>
 	<</replace>>
 <</link>>
 <br>&nbsp;&nbsp;&nbsp;&nbsp;//This option is available due to your @@.springgreen;societal connections,@@ and will economically devastate your rival//
diff --git a/src/uncategorized/saDevotion.tw b/src/uncategorized/saDevotion.tw
index b6717db8ef8..8eb50dbfa26 100644
--- a/src/uncategorized/saDevotion.tw
+++ b/src/uncategorized/saDevotion.tw
@@ -115,10 +115,10 @@
 <<if $slaves[$i].devotion <= 20 && $slaves[$i].devotion >= -50>>
 	<<if $slaves[$i].trust > 20>>
 		$slaves[$i].slaveName does not like you and believes that you will not punish her severely, and her @@.mediumorchid;regard for you is severely reduced@@ by this lack of respect.
-		<<set $slaves[$i].trust -= 4>>
+		<<set $slaves[$i].devotion -= 4>>
 	<<elseif $slaves[$i].trust >= -20>>
 		$slaves[$i].slaveName neither likes nor fears you, and her @@.mediumorchid;regard for you is reduced@@ by this lack of respect.
-		<<set $slaves[$i].trust -= 2>>
+		<<set $slaves[$i].devotion -= 2>>
 	<</if>>
 <</if>>
 
diff --git a/src/uncategorized/saLongTermEffects.tw b/src/uncategorized/saLongTermEffects.tw
index 48acd0552d8..7c69369e911 100644
--- a/src/uncategorized/saLongTermEffects.tw
+++ b/src/uncategorized/saLongTermEffects.tw
@@ -4135,7 +4135,7 @@
 		<</if>>
 	<</if>> /* closes .preg >= 10 */
 
-	<<if ($slaves[$i].preg > 0 && $slaves[$i].pregType == 0)>> //Catch for strange cases - now with checking.
+	<<if ($slaves[$i].preg > 0 && $slaves[$i].pregType == 0)>> /*Catch for strange cases - now with checking.*/
 	 	<<set $slaves[$i].pregType = setPregType($slaves[$i])>>
 	 	<<set WombImpregnate($slaves[$i], $slaves[$i].pregType, $slaves[$i].pregSource, $slaves[$i].preg)>>
 	<</if>>
-- 
GitLab