diff --git a/js/003-data/miscData.js b/js/003-data/miscData.js index c0f5a0eef2669038a724a2ec248302276259dd7d..af8024036740a4e803cc99aacf3bd04e978d9ad9 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 d6ea111a136f544e976382374bb795b5f4056f66..9945317d0bb59463708c82a203457e991970896b 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 427e5da8fbaabe473bd14fb170fb0f4cd95b0327..a9e812bfb150365eb559e783da3d17eedfc41772 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">>