From b2e8bf84d3657e31cf47a514979037ed0e6a4ff1 Mon Sep 17 00:00:00 2001
From: kopareigns <kopareigns@gmail.com>
Date: Wed, 24 Oct 2018 22:44:37 -0400
Subject: [PATCH] Better corporate slave gen fix
---
devNotes/twine JS.txt | 2 +-
src/js/generateNewSlaveJS.tw | 2 +-
src/uncategorized/bulkSlaveGenerate.tw | 4 ----
3 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/devNotes/twine JS.txt b/devNotes/twine JS.txt
index bddebe2fff2..f12de815385 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 6b487a4ecaf..af062551f9e 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 bd8014b099f..3463cd1777f 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>>
--
GitLab