diff --git a/src/endWeek/economics/arcmgmt.js b/src/endWeek/economics/arcmgmt.js
index 92a80d4db33e2473dadd542c0609e569b9ec9ebd..8d48c579fd001ba1d355b8c7618a0402651fb717 100644
--- a/src/endWeek/economics/arcmgmt.js
+++ b/src/endWeek/economics/arcmgmt.js
@@ -568,77 +568,77 @@ globalThis.arcmgmt = function() {
r.push(`Your arcology's economy is hindered by social conflicts with ${arrayToSentence(_descNeg)}.`);
_AWeekGrowth -= _descNeg.length;
}
- if (V.policies.alwaysSubsidizeGrowth === 1) {
- r.push(`Growth was subsidized as planned.`);
+ }
+ if (V.policies.alwaysSubsidizeGrowth === 1) {
+ r.push(`Growth was subsidized as planned.`);
+ _AWeekGrowth++;
+ }
+ if (V.secExpEnabled > 0) {
+ if (V.SecExp.core.authority > 18000) {
+ r.push(`Your authority is so high it discourages new business, slowing down the economic growth of the arcology.`);
+ _AWeekGrowth--;
+ }
+ if (V.SecExp.core.security > 80) {
+ r.push(`Your arcology is extremely safe and stable. Many businesses are attracted to it because of this.`);
_AWeekGrowth++;
+ } else if (V.SecExp.core.security < 20) {
+ r.push(`Your arcology's low security is an instability factor simply too dangerous to be ignored. Many businesses avoid your arcology because of this.`);
+ _AWeekGrowth--;
}
- if (V.secExpEnabled > 0) {
- if (V.SecExp.core.authority > 18000) {
- r.push(`Your authority is so high it discourages new business, slowing down the economic growth of the arcology.`);
- _AWeekGrowth--;
- }
- if (V.SecExp.core.security > 80) {
- r.push(`Your arcology is extremely safe and stable. Many businesses are attracted to it because of this.`);
- _AWeekGrowth++;
- } else if (V.SecExp.core.security < 20) {
- r.push(`Your arcology's low security is an instability factor simply too dangerous to be ignored. Many businesses avoid your arcology because of this.`);
- _AWeekGrowth--;
- }
- if (V.SecExp.edicts.weaponsLaw === 3) {
- r.push(`The free flow of weapons in your arcology has a positive impact on its economy.`);
- _AWeekGrowth++;
- } else if (V.SecExp.edicts.weaponsLaw === 2) {
- r.push(`The fairly liberal flow of weapons in your arcology has a positive impact on its economy.`);
+ if (V.SecExp.edicts.weaponsLaw === 3) {
+ r.push(`The free flow of weapons in your arcology has a positive impact on its economy.`);
+ _AWeekGrowth++;
+ } else if (V.SecExp.edicts.weaponsLaw === 2) {
+ r.push(`The fairly liberal flow of weapons in your arcology has a positive impact on its economy.`);
+ _AWeekGrowth++;
+ }
+ if (V.SecExp.buildings.propHub && V.SecExp.buildings.propHub.upgrades.controlLeaks > 0) {
+ r.push(`The authenticity department prepares extremely accurate, but false financial reports, misleading many of your competitors, allowing your arcology more space to grow undisturbed.`);
+ _AWeekGrowth++;
+ }
+ if (V.SecExp.smilingMan.progress >= 2) {
+ if (V.SecExp.smilingMan.globalCrisisWeeks && V.SecExp.smilingMan.globalCrisisWeeks > 0) {
+ r.push(`The great global crisis ignited by The Smiling Man plan is a great weight on the shoulders of everyone, causing great harm to the prosperity of the arcology.`);
+ _AWeekGrowth -= random(2, 4);
+ V.SecExp.smilingMan.globalCrisisWeeks--;
+ } else if (V.SecExp.smilingMan.progress >= 3) {
+ r.push(`With the global economy recovering from the great crisis unleashed by the Smiling Man, there is plenty of room to grow. Your arcology's prosperity benefits from this greatly.`);
_AWeekGrowth++;
}
- if (V.SecExp.buildings.propHub && V.SecExp.buildings.propHub.upgrades.controlLeaks > 0) {
- r.push(`The authenticity department prepares extremely accurate, but false financial reports, misleading many of your competitors, allowing your arcology more space to grow undisturbed.`);
- _AWeekGrowth++;
- }
- if (V.SecExp.smilingMan.progress >= 2) {
- if (V.SecExp.smilingMan.globalCrisisWeeks && V.SecExp.smilingMan.globalCrisisWeeks > 0) {
- r.push(`The great global crisis ignited by The Smiling Man plan is a great weight on the shoulders of everyone, causing great harm to the prosperity of the arcology.`);
- _AWeekGrowth -= random(2, 4);
- V.SecExp.smilingMan.globalCrisisWeeks--;
- } else if (V.SecExp.smilingMan.progress >= 3) {
- r.push(`With the global economy recovering from the great crisis unleashed by the Smiling Man, there is plenty of room to grow. Your arcology's prosperity benefits from this greatly.`);
- _AWeekGrowth++;
- }
- if ((V.SecExp.smilingMan.globalCrisisWeeks) && V.SecExp.smilingMan.globalCrisisWeeks === 0) {
- delete V.SecExp.smilingMan.globalCrisisWeeks;
- }
- }
- if (V.garrison.reactorTime > 0) {
- r.push(`The damage to the reactor caused by the last rebellion is extensive. Businesses and private citizens struggle to operate with the unreliable and limited energy production offered by the auxiliary generators.`);
- r.push(`It will still take`);
- if (V.garrison.reactorTime > 1) {
- r.push(`${V.garrison.reactorTime} weeks`);
- } else {
- r.push(`a week`);
- }
- r.push(`to finish repair works.`);
- _AWeekGrowth -= random(1, 2);
- V.garrison.reactorTime--;
- IncreasePCSkills('engineering', 0.1);
+ if ((V.SecExp.smilingMan.globalCrisisWeeks) && V.SecExp.smilingMan.globalCrisisWeeks === 0) {
+ delete V.SecExp.smilingMan.globalCrisisWeeks;
}
}
- _AWeekGrowth = Math.trunc(0.5 * _AWeekGrowth);
- if (_AWeekGrowth > 0) {
- r.push(`Since ${V.arcologies[0].name} can support more citizens and more activity, <span class="green">its prosperity improved this week.</span>`);
- } else if (_AWeekGrowth === 0) {
- r.push(`Though ${V.arcologies[0].name} can support more citizens and more activity, <span class="yellow">growth was moribund this week.</span>`);
- } else {
- r.push(`Though ${V.arcologies[0].name} can support more citizens and more activity, <span class="red">it lost prosperity this week.</span>`);
- }
- if (isNaN(_AWeekGrowth)) {
- r.push(App.UI.DOM.makeElement("div", `Error: AWeekGrowth is NaN`, "red"));
- } else {
- V.arcologies[0].prosperity += _AWeekGrowth;
+ if (V.garrison.reactorTime > 0) {
+ r.push(`The damage to the reactor caused by the last rebellion is extensive. Businesses and private citizens struggle to operate with the unreliable and limited energy production offered by the auxiliary generators.`);
+ r.push(`It will still take`);
+ if (V.garrison.reactorTime > 1) {
+ r.push(`${V.garrison.reactorTime} weeks`);
+ } else {
+ r.push(`a week`);
+ }
+ r.push(`to finish repair works.`);
+ _AWeekGrowth -= random(1, 2);
+ V.garrison.reactorTime--;
+ IncreasePCSkills('engineering', 0.1);
}
}
+ _AWeekGrowth = Math.trunc(0.5 * _AWeekGrowth);
+ if (_AWeekGrowth > 0) {
+ r.push(`Since ${V.arcologies[0].name} can support more citizens and more activity, <span class="green">its prosperity improved this week.</span>`);
+ } else if (_AWeekGrowth === 0) {
+ r.push(`Though ${V.arcologies[0].name} can support more citizens and more activity, <span class="yellow">growth was moribund this week.</span>`);
+ } else {
+ r.push(`Though ${V.arcologies[0].name} can support more citizens and more activity, <span class="red">it lost prosperity this week.</span>`);
+ }
+ if (isNaN(_AWeekGrowth)) {
+ r.push(App.UI.DOM.makeElement("div", `Error: AWeekGrowth is NaN`, "red"));
+ } else {
+ V.arcologies[0].prosperity += _AWeekGrowth;
+ }
App.Events.addNode(el, r);
-
+ r = [];
if (V.secExpEnabled > 0) {
App.UI.DOM.appendNewElement("p", el, App.UI.DOM.renderPassage("tradeReport"));
}
@@ -649,10 +649,9 @@ globalThis.arcmgmt = function() {
if (V.assistant.market && V.assistant.market.limit > 0) {
- r = [];
let _popCap = menialPopCap();
let _menialSlaveValue = menialSlaveCost();
- const {HeM, heM} = getPronouns(assistant.pronouns().market).appendSuffix('M');
+ const { HeM, heM } = getPronouns(assistant.pronouns().market).appendSuffix('M');
// <br>
r.push(`Your <span class="bold">business assistant</span> manages the menial slave market.`);
if (_menialSlaveValue <= 900 + V.assistant.market.aggressiveness) { /* BUY */
@@ -705,6 +704,7 @@ globalThis.arcmgmt = function() {
r.push(`Prices are average, so ${heM} does not make any significant moves.`);
}
App.Events.addParagraph(el, r);
+ r = [];
}
const food = document.createElement("span");
@@ -1554,7 +1554,7 @@ globalThis.arcmgmt = function() {
} else if (_NPCSlavesSold > 0) {
appendDiv(`<span class="red">One slave</span> was sold by your inhabitants. They've got more than enough of them already.`);
}
- /* More slaves than there is work*/
+ /* More slaves than there is work*/
} else if (V.NPCSlaves > (_LSCD / _slaveProductivity) - V.menials + _SCD) {
const _NPCSlavesSold = V.NPCSlaves - Math.trunc(_LSCD / _slaveProductivity - V.menials + _SCD);
V.menialDemandFactor -= _NPCSlavesSold;
@@ -1564,7 +1564,7 @@ globalThis.arcmgmt = function() {
} else if (_NPCSlavesSold > 0) {
appendDiv(`<span class="red">One slave</span> was sold by your inhabitants. There was so little work that it failed to earn its keep.`);
}
- /* Cutting back on slaves*/
+ /* Cutting back on slaves*/
} else if (V.NPCSlaves > _SCD * 1.4) {
if (V.slaveCostFactor > 0.95) {
const _NPCSlavesSold = Math.trunc((V.NPCSlaves - _SCD) * 0.4);
@@ -1576,7 +1576,7 @@ globalThis.arcmgmt = function() {
appendDiv(`<span class="red">One slave</span> was sold by your inhabitants. They've got more than enough of them already.`);
}
}
- /* Selling excess slaves for profit*/
+ /* Selling excess slaves for profit*/
} else if (V.NPCSlaves > _SCD * 1.2) {
if (V.slaveCostFactor > 1.1) {
const _NPCSlavesSold = Math.trunc((V.NPCSlaves - _SCD) * 0.4);
@@ -1730,7 +1730,7 @@ globalThis.arcmgmt = function() {
} else if (_UCImmigration > 0) {
appendDiv(`<span class="green">One upper class citizen</span> moved to your arcology.`);
}
- /* Upper Class Citizens Emigrating*/
+ /* Upper Class Citizens Emigrating*/
} else if (V.upperClass > _UCD) {
let _UCEmigration = Math.trunc((V.upperClass - _UCD) * 0.6);
V.upperClass -= _UCEmigration;
@@ -1774,7 +1774,7 @@ globalThis.arcmgmt = function() {
} else if (_TCImmigration > 0) {
appendDiv(`<span class="green">One millionaire</span> moved to your arcology.`);
}
- /* Top Class Citizens emigrating*/
+ /* Top Class Citizens emigrating*/
} else if (V.topClass > _TCD) {
let _TCEmigration = Math.trunc((V.topClass - _TCD) * 0.6) + 1;
V.topClass -= _TCEmigration;
diff --git a/src/facilities/incubator/incubatorRetrievalWorkaround.tw b/src/facilities/incubator/incubatorRetrievalWorkaround.tw
index a7810f8c3c585395ae7e62929661fd645a05af4d..ba3b56c0f2596d1547b6206c6e4da61a9e55bfc2 100644
--- a/src/facilities/incubator/incubatorRetrievalWorkaround.tw
+++ b/src/facilities/incubator/incubatorRetrievalWorkaround.tw
@@ -1,10 +1,8 @@
:: Incubator Retrieval Workaround [nobr]
-<<set $returnTo = "Main">>
+<<set $returnTo = "Main", $nextLink = "Incubator", $nextButton = "Continue">>
<<if $readySlave != 0>>
- <<set $nextLink = "AS Dump">>
- <<run App.Utils.updateUserButton()>>
<<setLocalPronouns $readySlave>>
$readySlave.slaveName has been discharged from $incubatorName and is ready for $his first ever inspection.