From 190eb94c92dd333121c11085c43dbd988e90c199 Mon Sep 17 00:00:00 2001
From: klorpa <30924131+klorpa@users.noreply.github.com>
Date: Tue, 30 Apr 2019 14:31:53 -0500
Subject: [PATCH] LawFix
---
src/pregmod/seFCTVremote.tw | 10 ++++------
src/uncategorized/REroyalblood.tw | 6 ++++++
src/uncategorized/reRecruit.tw | 2 --
3 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/src/pregmod/seFCTVremote.tw b/src/pregmod/seFCTVremote.tw
index c628247c6c0..5fa8aeab729 100644
--- a/src/pregmod/seFCTVremote.tw
+++ b/src/pregmod/seFCTVremote.tw
@@ -6,10 +6,10 @@
<<set $activeSlaveOneTimeMaxAge = 35>>
<<set $one_time_age_overrides_pedo_mode = 1>>
<<set $oneTimeDisableDisability = 1>>
-<<if $arcologies[0].FSSubjugationistLawME == 1>>
- <<set $fixedRace = $arcologies[0].FSSubjugationistRace>>
-<<elseif $arcologies[0].FSSupremacistLawME == 1>>
- <<set _races = setup.filterRacesLowercase.filter(race => race !== $arcologies[0].FSSupremacistRace)>>
+<<if $arcologies[0].FSSupremacistLawME == 1>>
+ <<set $fixedRace = $arcologies[0].FSSupremacistRace>>
+<<elseif $arcologies[0].FSSubjugationistLawME == 1>>
+ <<set _races = setup.filterRacesLowercase.filter(race => race !== $arcologies[0].FSSubjugationistRace)>>
<<set $fixedRace = _races.random()>>
<</if>>
<<set $activeSlave = GenerateNewSlave()>>
@@ -76,8 +76,6 @@ $He unboxes the new remote and turns $his back to you, eagerly demonstrating how
<<elseif $arcologies[0].FSSubjugationistLawME == 1>>
<<set _races = setup.filterRacesLowercase.filter(race => race !== $arcologies[0].FSSubjugationistRace)>>
<<set $fixedRace = _races.random()>>
-<<else>>
- <<set $fixedRace = "black">>
<</if>>
<<if $seeDicks == 0>>
<<set _customer = GenerateNewSlave("XX")>>
diff --git a/src/uncategorized/REroyalblood.tw b/src/uncategorized/REroyalblood.tw
index bd8abf6a63d..61985c92464 100644
--- a/src/uncategorized/REroyalblood.tw
+++ b/src/uncategorized/REroyalblood.tw
@@ -331,6 +331,7 @@ Time is short, but you are well placed to acquire some choice slaves. With an ad
<<set $activeSlaveOneTimeMinAge = 21>>
<<set $activeSlaveOneTimeMaxAge = ($retirementAge-2)>>
<<set $oneTimeDisableDisability = 1>>
+ <<set $fixedNationality = _princess.nationality>>
<<set $activeSlave = GenerateNewSlave("XX")>>
<<set _origin = "She was a member of the court in an ancient kingdom, till it was overthrown and she was sold to you in exchange for credits.">>
<<set $activeSlave.origin = _origin>>
@@ -382,6 +383,7 @@ Time is short, but you are well placed to acquire some choice slaves. With an ad
<<set $activeSlaveOneTimeMinAge = 21>>
<<set $activeSlaveOneTimeMaxAge = ($retirementAge-2)>>
<<set $oneTimeDisableDisability = 1>>
+ <<set $fixedNationality = _princess.nationality>>
<<set $activeSlave = GenerateNewSlave("XX")>>
<<set _origin = "She was a member of the court in an ancient kingdom, till it was overthrown and she was acquired by "+$SF.Lower+".">>
<<set $activeSlave.origin = _origin>>
@@ -558,6 +560,7 @@ Time is short, but you are well placed to acquire some choice slaves. With an ad
<<set $activeSlaveOneTimeMinAge = 21>>
<<set $activeSlaveOneTimeMaxAge = ($retirementAge-2)>>
<<set $oneTimeDisableDisability = 1>>
+ <<set $fixedNationality = _princess.nationality>>
<<set $activeSlave = GenerateNewSlave("XX")>>
<<set _origin = "She was a member of the court in an ancient kingdom, till it was overthrown and she was sold for credits.">>
<<set $activeSlave.origin = _origin>>
@@ -617,6 +620,7 @@ Time is short, but you are well placed to acquire some choice slaves. With an ad
<<set $activeSlaveOneTimeMinAge = 21>>
<<set $activeSlaveOneTimeMaxAge = ($retirementAge-2)>>
<<set $oneTimeDisableDisability = 1>>
+ <<set $fixedNationality = _princess.nationality>>
<<set $activeSlave = GenerateNewSlave("XX")>>
<<set _origin = "She was a member of the court in an ancient kingdom, till it was overthrown and she was acquired by "+$SF.Lower+".">>
<<set $activeSlave.origin = _origin>>
@@ -674,6 +678,7 @@ Time is short, but you are well placed to acquire some choice slaves. With an ad
<<set $activeSlaveOneTimeMinAge = 21>>
<<set $activeSlaveOneTimeMaxAge = ($retirementAge-2)>>
<<set $oneTimeDisableDisability = 1>>
+ <<set $fixedNationality = _princess.nationality>>
<<set $activeSlave = GenerateNewSlave("XX")>>
<<set _origin = "She was a member of the court in an ancient kingdom, till it was overthrown and she was sold for credits.">>
<<set $activeSlave.origin = _origin>>
@@ -751,6 +756,7 @@ Time is short, but you are well placed to acquire some choice slaves. With an ad
<<for $i = 0; $i < 3; $i++>>
<<set $activeSlaveOneTimeMinAge = 21>>
<<set $activeSlaveOneTimeMaxAge = ($retirementAge-2)>>
+ <<set $fixedNationality = _princess.nationality>>
<<set $oneTimeDisableDisability = 1>>
<<set $activeSlave = GenerateNewSlave("XX")>>
<<set _origin = "She was a member of the court in an ancient kingdom, till it was overthrown and she was acquired by "+$SF.Lower+".">>
diff --git a/src/uncategorized/reRecruit.tw b/src/uncategorized/reRecruit.tw
index f1285c8f933..5f5d536fca1 100644
--- a/src/uncategorized/reRecruit.tw
+++ b/src/uncategorized/reRecruit.tw
@@ -2188,8 +2188,6 @@ It isn't just all natural females either, as a few men also jumped on the bandwa
<<case "gang leader">>
-<<setPlayerPronouns>>
-
Your desk flags a video message as coming from an... interesting source. It is from one of the minor gangs on the lower levels of your arcology — or not so minor any more, as a pop-up tells you of the power-grab they made barely an hour ago. Curious what they might want, you take the call.
<br><br>
A tough-looking man with multiple tattoos and a wife-beater shirt on appears on the screen, nodding in recognition. "Hey there, boss-<<if def $PC.customTitle>>$PC.customTitle<<else>>_womanP<</if>>! Just calling to pay my respects. Those weak-ass punks that were squatting in this section won't bother you any more... we took care of 'em. Now it's just all law-abiding citizens and shit down here — so you don't have to send your security goons to check us out, you know." Your assistant throws up a list of the gang's numerous criminal activities, as well as the estimates what other enterprises they've just taken over. Nothing much out of the ordinary and with the shape the world is in, you've got bigger problems. The recommendation is to observe but mostly ignore them, which you casually confirm with a flick of your finger.
--
GitLab