From 4a6bfd157e85ccfda5278b9800b872b0baef6712 Mon Sep 17 00:00:00 2001
From: lowercasedonkey <lowercasedonkey@gmail.com>
Date: Tue, 31 Mar 2020 01:44:46 -0400
Subject: [PATCH] create one list of lawless markets
---
js/003-data/miscData.js | 22 ++++++++++++++++++++++
src/uncategorized/bulkSlaveGenerate.tw | 7 +++----
src/utility/slaveCreationWidgets.tw | 2 +-
3 files changed, 26 insertions(+), 5 deletions(-)
diff --git a/js/003-data/miscData.js b/js/003-data/miscData.js
index c0f5a0eef26..af802403674 100644
--- a/js/003-data/miscData.js
+++ b/js/003-data/miscData.js
@@ -2687,6 +2687,28 @@ App.Data.misc.nationalityPoolSelector = {
"Brazil": App.Data.misc.southamericaNationalities
};
+// these markets are exempt from law compliance
+App.Data.misc.lawlessMarkets = [
+ "gangs and smugglers",
+ "heap",
+ "indentures",
+ "LDE",
+ "low tier criminals",
+ "military prison",
+ "neighbor",
+ "wetware",
+ "white collar",
+ // Schools
+ "GRI",
+ "HA",
+ "NUL",
+ "SCP",
+ "TCR",
+ "TFS",
+ "TGA",
+ "TSS"
+];
+
App.Data.weather = {
nice: [
{name: "Sunny", severity: 1},
diff --git a/src/uncategorized/bulkSlaveGenerate.tw b/src/uncategorized/bulkSlaveGenerate.tw
index d6ea111a136..9945317d0bb 100644
--- a/src/uncategorized/bulkSlaveGenerate.tw
+++ b/src/uncategorized/bulkSlaveGenerate.tw
@@ -73,12 +73,11 @@
<</switch>>
/* Determine if Law Compliance effects must be applied to this transaction */
-<<switch $slaveMarket>>
-<<case "gangs and smugglers" "GRI" "HA" "heap" "indentures" "LDE" "low tier criminals" "military prison" "neighbor" "NUL" "SCP" "TCR" "TFS" "TGA" "TSS" "wetware" "white collar">> /* these markets are exempt from law compliance */
+<<if App.Data.misc.lawlessMarkets.includes($slaveMarket)>>
<<set $applyLaw = 0>>
-<<default>> /* all other markets are not exempt: corporate, hunters, kidnappers, raiders, trainers */
+<<else>>
<<set $applyLaw = 1>>
-<</switch>>
+<</if>>
<<for _i = 0; _i < $numSlaves; _i++>>
<<set $activeSlave = (generateMarketSlave($slaveMarket, $numArcology)).slave>>
diff --git a/src/utility/slaveCreationWidgets.tw b/src/utility/slaveCreationWidgets.tw
index 427e5da8fba..a9e812bfb15 100644
--- a/src/utility/slaveCreationWidgets.tw
+++ b/src/utility/slaveCreationWidgets.tw
@@ -914,7 +914,7 @@
<br>[[Finish your order of slaves|Bulk Slave Intro]]
<</if>>
<br><br>
-<<if $slaveMarket != "indentures" && $slaveMarket != "neighbor" && $slaveMarket != "heap" && $slaveMarket != "wetware">>
+<<if App.Data.misc.lawlessMarkets.includes($slaveMarket)>>
<<set $applyLaw = 1>>
<</if>>
<<set $saleDescription = 1>><<include "Long Slave Description">>
--
GitLab