From 14ced087149e37ee2d1680b21414d321d2f6b3e4 Mon Sep 17 00:00:00 2001
From: lowercasedonkey <lowercasedonkey@gmail.com>
Date: Thu, 22 Oct 2020 12:45:06 -0400
Subject: [PATCH] simplify school check
---
src/markets/bulkSlave/bulkSlaveIntro.js | 88 +++++++------------------
1 file changed, 22 insertions(+), 66 deletions(-)
diff --git a/src/markets/bulkSlave/bulkSlaveIntro.js b/src/markets/bulkSlave/bulkSlaveIntro.js
index 42a55744c01..f69148c86bb 100644
--- a/src/markets/bulkSlave/bulkSlaveIntro.js
+++ b/src/markets/bulkSlave/bulkSlaveIntro.js
@@ -186,72 +186,28 @@ App.Markets.bulkSlaveIntro = function() {
/* Discount calculation. Gives 5% on top of slave school discount */
let discount = 475;
let opinion;
- switch (V.market.slaveMarket) {
- case "TSS":
- if (V.TSS.schoolUpgrade !== 0) {
- discount = 375;
- }
- break;
- case "TUO":
- if (V.TUO.schoolUpgrade !== 0) {
- discount = 375;
- }
- break;
- case "GRI":
- if (V.GRI.schoolUpgrade !== 0) {
- discount = 375;
- }
- break;
- case "SCP":
- if (V.SCP.schoolUpgrade !== 0) {
- discount = 375;
- }
- break;
- case "LDE":
- if (V.LDE.schoolUpgrade !== 0) {
- discount = 375;
- }
- break;
- case "TGA":
- if (V.TGA.schoolUpgrade !== 0) {
- discount = 375;
- }
- break;
- case "HA":
- if (V.HA.schoolUpgrade !== 0) {
- discount = 375;
- }
- break;
- case "NUL":
- if (V.NUL.schoolUpgrade !== 0) {
- discount = 375;
- }
- break;
- case "TCR":
- if (V.TCR.schoolUpgrade !== 0) {
- discount = 375;
- }
- break;
- case "TFS":
- if (V.TFS.schoolUpgrade !== 0) {
- discount = 300;
- } else {
- discount = 380;
- }
- break;
- case "corporate":
- if (V.corp.Market === 1) {
- discount = 350;
- }
- break;
- case "neighbor":
- if (V.market.numArcology >= V.arcologies.length) {
- V.market.numArcology = 1;
- }
- opinion = App.Neighbor.opinion(0, V.market.numArcology);
- opinion = Math.clamp(Math.trunc(opinion/20), -10, 10);
- discount -= (opinion * 25);
- break;
+
+ if (V.market.slaveMarket === "TFS") {
+ if (V.TFS.schoolUpgrade !== 0) {
+ discount = 300;
+ } else {
+ discount = 380;
+ }
+ } else if (V.market.slaveMarket === "corporate") {
+ if (V.corp.Market === 1) {
+ discount = 350;
+ }
+ } else if (V.market.slaveMarket === "neighbor") {
+ if (V.market.numArcology >= V.arcologies.length) {
+ V.market.numArcology = 1;
+ }
+ opinion = App.Neighbor.opinion(0, V.market.numArcology);
+ opinion = Math.clamp(Math.trunc(opinion/20), -10, 10);
+ discount -= (opinion * 25);
+ } else if (App.Data.misc.schools.includes(V.market.slaveMarket)) {
+ if (V[V.market.slaveMarket].schoolUpgrade !== 0) {
+ discount = 375;
+ }
}
return discount;
}
--
GitLab