From d15ca7717d933340ca0d9e680657a86652d1775f Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Tue, 22 Aug 2017 18:10:46 -0400
Subject: [PATCH] fixes
---
src/pregmod/widgets/bodyswapWidgets.tw | 5 +++--
src/uncategorized/nonRandomEvent.tw | 2 +-
src/uncategorized/reFSAcquisition.tw | 2 +-
src/uncategorized/rieEligibilityCheck.tw | 7 ++++---
4 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/src/pregmod/widgets/bodyswapWidgets.tw b/src/pregmod/widgets/bodyswapWidgets.tw
index 959ae6b2ebe..549ccd9b442 100644
--- a/src/pregmod/widgets/bodyswapWidgets.tw
+++ b/src/pregmod/widgets/bodyswapWidgets.tw
@@ -2,13 +2,13 @@
/* It's too fucking big jesus christ */
-/* first arg is slave getting swapped, second is body she is being swapped to */
+/* first arg is slave getting swapped, second is body she is being swapped to. The second body's physical traits overwrite the originals */
<<widget "BodySwap">>
<<if $args[1].origin != "You reserved a mindless slave like her from the Flesh Heap.">>
<<if $args[0].origBodyOwner == "">>
<<set $args[0].origBodyOwner = ("The body of the slave " + $args[1].slaveName)>>
<<else>>
- <<set $args[0].origBodyOwnder = $args[1].origBodyOwner>>
+ <<set $args[0].origBodyOwner = $args[1].origBodyOwner>>
<</if>>
<</if>>
<<set $args[0].genes = $args[1].genes>>
@@ -154,6 +154,7 @@
<<set $args[0].breastMesh = $args[1].breastMesh>>
<<set $args[0].buttplugAttachment = $args[1].buttplugAttachment>>
<<set $args[0].vasectomy = $args[1].vasectomy>>
+<<set $args[0].haircuts = $args[1].haircuts>>
<<set $args[0].canRecruit = 0>>
diff --git a/src/uncategorized/nonRandomEvent.tw b/src/uncategorized/nonRandomEvent.tw
index e15e87c6ce3..6a0f3d44709 100644
--- a/src/uncategorized/nonRandomEvent.tw
+++ b/src/uncategorized/nonRandomEvent.tw
@@ -158,7 +158,7 @@
<<else>>
-<<if random(1,200) > _effectiveWeek+100>>
+<<if random(1,200) > _effectiveWeek+100 || $hostageRescued == 1>>
<<goto "RIE Eligibility Check">>
<<else>>
<<goto "Random Nonindividual Event">>
diff --git a/src/uncategorized/reFSAcquisition.tw b/src/uncategorized/reFSAcquisition.tw
index 10c02b241cd..274c27ebfea 100644
--- a/src/uncategorized/reFSAcquisition.tw
+++ b/src/uncategorized/reFSAcquisition.tw
@@ -382,10 +382,10 @@
<<case "Maturity Preferentialist Two">>
<<set $contractCost = 3000>>
-<<include "Generate New Slave">>
<<set $activeSlaveOneTimeMinAge = 25>>
<<set $activeSlaveOneTimeMaxAge = 42>>
<<set $one_time_age_overrides_pedo_mode = 1>>
+<<include "Generate New Slave">>
<<set $activeSlave.origin = "She was sold to you by her son, in order to raise funds for his business.">>
<<set $activeSlave.boobs = random(4,6)*200>>
<<set $activeSlave.weight = 20>>
diff --git a/src/uncategorized/rieEligibilityCheck.tw b/src/uncategorized/rieEligibilityCheck.tw
index 0ba369c7014..696deb559aa 100644
--- a/src/uncategorized/rieEligibilityCheck.tw
+++ b/src/uncategorized/rieEligibilityCheck.tw
@@ -12,10 +12,11 @@
<</if>>
<</for>>
-<<if $eligibleSlaves.length == 0>>
- <<goto "Next Week">>
-<<elseif $hostageRescued == 1>>
+
+<<if $hostageRescued == 1>>
<<goto "P hostage acquisition">>
+<<elseif $eligibleSlaves.length == 0>>
+ <<goto "Next Week">>
<<else>>
<<goto "Random Individual Event">>
<</if>>
--
GitLab