diff --git a/devNotes/twine JS.txt b/devNotes/twine JS.txt index bddebe2fff26a2f98a82e9fb3f8d1f9c073138cb..f12de815385a4c4776b330a4dda0881741a8d81e 100644 --- a/devNotes/twine JS.txt +++ b/devNotes/twine JS.txt @@ -31569,7 +31569,7 @@ window.GenerateNewSlave = (function(){ generateSkills(); generateDisabilities(); generatePronouns(slave); - if (passage() == "Corporate Market" && V.slaveMarket == "corporate" && V.captureUpgradeRace != "unselected" && V.captureUpgradeRace != "none") { + if ((passage() == "Corporate Market" || (passage() = "Bulk Slave Generate" && V.slaveMarket == "corporate")) && V.captureUpgradeRace != "unselected" && V.captureUpgradeRace != "none") { slave.race = V.captureUpgradeRace; } slave.origRace = slave.race; diff --git a/src/js/generateNewSlaveJS.tw b/src/js/generateNewSlaveJS.tw index 6b487a4ecafd244c3573d3aafd8e1c5e0c9bc96d..af062551f9e11a8d38cc24803f929e6c2263aeb3 100644 --- a/src/js/generateNewSlaveJS.tw +++ b/src/js/generateNewSlaveJS.tw @@ -61,7 +61,7 @@ window.GenerateNewSlave = (function(){ generateSkills(); generateDisabilities(); generatePronouns(slave); - if (passage() == "Corporate Market" && V.slaveMarket == "corporate" && V.captureUpgradeRace != "unselected" && V.captureUpgradeRace != "none") { + if ((passage() == "Corporate Market" || passage() = "Bulk Slave Generate") && V.slaveMarket == "corporate" && V.captureUpgradeRace != "unselected" && V.captureUpgradeRace != "none") { slave.race = V.captureUpgradeRace; } slave.origRace = slave.race; diff --git a/src/uncategorized/bulkSlaveGenerate.tw b/src/uncategorized/bulkSlaveGenerate.tw index bd8014b099f8160c988428fb5f62104d9bb48e46..3463cd1777f4956fdc88da7ecffeff6758510d64 100644 --- a/src/uncategorized/bulkSlaveGenerate.tw +++ b/src/uncategorized/bulkSlaveGenerate.tw @@ -88,10 +88,6 @@ <<silently>> <<GenerateMarketSlave $slaveMarket $numArcology>> <</silently>> - <<if $slaveMarket == "corporate" && $captureUpgradeRace != "unselected" && $captureUpgradeRace != "none">> /* corporate race override */ - <<set $activeSlave.race = $captureUpgradeRace>> - <<set $activeSlave.origRace = $activeSlave.race>> - <</if>> <<set $slavesSeen += 1>> <<if $applyLaw == 0>> <<slaveCost $activeSlave>>