diff --git a/devNotes/gitSetup.md b/devNotes/gitSetup.md index 75b62dd46b452fa46ceaf4ecca05890c567419b8..e9b1db3335c94a2921940420a0b8acb19006a502 100644 --- a/devNotes/gitSetup.md +++ b/devNotes/gitSetup.md @@ -25,7 +25,7 @@ * Via terminal: `git remote add upstream https://gitgud.io/pregmodfan/fc-pregmod.git` 6. Make your local `pregmod-master` track the main repository, makes getting future updates easier. - * Via terminal `git branch --set-upstream-to=upstream` + * Via terminal `git branch --set-upstream-to=upstream/pregmod-master` ## Typical cycle with Git: diff --git a/js/003-data/gameVariableData.js b/js/003-data/gameVariableData.js index 9bd02d3faa2a7e57b5fe478baeeee8961119a028..d3f5e5039484d90d2223c7b32fdf81a81bab004f 100644 --- a/js/003-data/gameVariableData.js +++ b/js/003-data/gameVariableData.js @@ -337,7 +337,8 @@ App.Data.CorpInitData = { ExpandToken: 0, Spec: 0, SpecToken: 0, - SpecRaces: [] + SpecRaces: [], + disableOverhead: 0, }; App.Data.projectN = { diff --git a/src/Corporation/manageCorporation.js b/src/Corporation/manageCorporation.js index d6681cf9be196cc6db6d145feede1c7820b1dcb5..3344902cb215ab24ab89550ece63deee94fba920 100644 --- a/src/Corporation/manageCorporation.js +++ b/src/Corporation/manageCorporation.js @@ -62,7 +62,6 @@ App.Corporate.manage = function() { const divisionsByFoundingCost = App.Corporate.divisionList.concat().sort(function(a, b) { return a.founding.startingPrice - b.founding.startingPrice; }); const optionsText = ["to found a slave corporation", "for most options", "for many options", "for some options", "for the final option"]; - V.corp.disableOverhead = 0; // Picking a starting division let personalShares = 8000; let publicShares = 7000; diff --git a/src/gui/options/options.js b/src/gui/options/options.js index 99ba6086b849844a5563266b8af677d0f6f87f6d..0e52f7032f9141a7943d67d1ad2d0f1a4d2c34a0 100644 --- a/src/gui/options/options.js +++ b/src/gui/options/options.js @@ -425,7 +425,9 @@ App.UI.optionsPassage = function() { function cheat() { const el = new DocumentFragment(); const options = new App.UI.OptionsGroup(); - options.addOption("Player Corp overhead is included within the profit calc.", "disableOverhead", V.corp).addValue("No", 1).on().addValue("Yes", 0).off(); + options.addOption("Corporation: Divisions generate overhead costs", "disableOverhead", V.corp) + .addValue("Yes", 0).on() + .addValue("No", 1).off(); options.addOption("Arcology sex slaves", "NPCSlaves").showTextBox(); options.addOption("Arcology prosperity cap", "AProsperityCap").showTextBox(); options.addOption("Shelter Abuse Counter", "shelterAbuse").showTextBox(); diff --git a/src/npc/surgery/surgery.js b/src/npc/surgery/surgery.js index 62969500cee4622e729da384eb0c14e3b4e533ae..b2f9e18754410990f8ea59f2e2966c1f2c0d438e 100644 --- a/src/npc/surgery/surgery.js +++ b/src/npc/surgery/surgery.js @@ -653,6 +653,10 @@ globalThis.setEyeColor = function(slave, color, side = "both") { return; } + if (!slave.eye[side]) { + return; + } + slave.eye[side].iris = color; }; @@ -676,6 +680,10 @@ globalThis.setEyeColorFull = function(slave, iris = "brown", pupil = "circular", return; } + if (!slave.eye[side]) { + return; + } + if (iris !== "") { slave.eye[side].iris = iris; }