diff --git a/src/endWeek/persBusiness.js b/src/endWeek/persBusiness.js
index 6c0dfbf1a48f8b632cdc0a2cc8cabfb35634f1c6..b8d19902d741a5c5e770ef7c6d0b7363244435b6 100644
--- a/src/endWeek/persBusiness.js
+++ b/src/endWeek/persBusiness.js
@@ -1,3 +1,6 @@
+/**
+ * @returns {DocumentFragment}
+ */
App.EndWeek.personalBusiness = function() {
const el = new DocumentFragment();
let r = [];
@@ -6,7 +9,7 @@ App.EndWeek.personalBusiness = function() {
let _Cal;
let _X;
let _windfall;
- let _Catchtchance;
+ let CatchTChance;
let _upgradeCount;
let _dataGain;
if (V.useTabs === 0) {
@@ -375,7 +378,7 @@ App.EndWeek.personalBusiness = function() {
break;
case"imperial law":
_income += random(2000, 3000);
- r.push(`With Imperial Knights contantly patrolling the streets and a strict noble hierarchy flowing up from your Barons directly to you, you have a great deal of room to play with legal codes and edifices - which, of course, are constantly being modified to be eternally in your favor. The Barons and Knights who maintain your arcology happily turn a blind eye as you skim trade income directly into your pockets - after all, they're going to benefit from your success too. Sly manipulation of trade codes has earned you <span class="yellowgreen">${cashFormat(_income)}.</span>`);
+ r.push(`With Imperial Knights constantly patrolling the streets and a strict noble hierarchy flowing up from your Barons directly to you, you have a great deal of room to play with legal codes and edifices - which, of course, are constantly being modified to be eternally in your favor. The Barons and Knights who maintain your arcology happily turn a blind eye as you skim trade income directly into your pockets - after all, they're going to benefit from your success too. Sly manipulation of trade codes has earned you <span class="yellowgreen">${cashFormat(_income)}.</span>`);
break;
case"imperial":
_income += random(1500, 2500);
@@ -765,26 +768,26 @@ App.EndWeek.personalBusiness = function() {
_windfall = Math.trunc((150 * V.PC.skill.hacking) + random(100, 2500));
_X = 0;
if (V.PC.skill.hacking === -100) {
- _Catchtchance = 10;
+ CatchTChance = 10;
} else if (V.PC.skill.hacking <= -75) {
- _Catchtchance = 30;
+ CatchTChance = 30;
} else if (V.PC.skill.hacking <= -50) {
- _Catchtchance = 40;
+ CatchTChance = 40;
} else if (V.PC.skill.hacking <= -25) {
- _Catchtchance = 45;
+ CatchTChance = 45;
} else if (V.PC.skill.hacking === 0) {
- _Catchtchance = 50;
+ CatchTChance = 50;
} else if (V.PC.skill.hacking <= 25) {
- _Catchtchance = 60;
+ CatchTChance = 60;
} else if (V.PC.skill.hacking <= 50) {
- _Catchtchance = 70;
+ CatchTChance = 70;
} else if (V.PC.skill.hacking <= 75) {
- _Catchtchance = 85;
+ CatchTChance = 85;
} else if (V.PC.skill.hacking >= 100) {
- _Catchtchance = 100;
+ CatchTChance = 100;
}
r.push(`This week your services to the highest bidder earned you <span class="yellowgreen">${cashFormat(_windfall)}.</span>`);
- if (random(0, 100) >= _Catchtchance) {
+ if (random(0, 100) >= CatchTChance) {
r.push(`However, since the source of the attack was traced back to your arcology, your`);
if (V.secExpEnabled > 0) {
_X = 1;
@@ -875,8 +878,7 @@ App.EndWeek.personalBusiness = function() {
_dataGain = _upgradeCount * 200;
if (!Number.isInteger(_dataGain)) {
- // <br>
- r.push(`<span class="red">Error, dataGain is NaN</span>`);
+ r.push(App.UI.DOM.makeElement("div", `Error, dataGain is NaN`, "red"));
} else {
r.push(`You are selling the data collected by your security department, which earns a discreet sum of <span class="yellowgreen">${cashFormat(_dataGain)}.</span>`);
cashX(_dataGain, "personalBusiness");
@@ -904,9 +906,10 @@ App.EndWeek.personalBusiness = function() {
V.arcRepairTime--;
IncreasePCSkills('engineering', 0.1);
}
+ App.Events.addParagraph(el, r);
if (V.SecExp.buildings.weapManu) {
- // <br><br>
+ r = [];
r.push(`The weapons manufacturing complex produces armaments`);
if (V.SecExp.buildings.weapManu.productivity <= 2) {
r.push(` at a steady pace.`);
@@ -944,12 +947,9 @@ App.EndWeek.personalBusiness = function() {
_income += Math.round(V.peacekeepers.strength * _price * 10 * _factoryMod);
}
_income = Math.trunc(_income * 0.5);
- r.push(`This week we made <span class="yellowgreen">`);
- cashFormat(_income);
- r.push(`.</span>`);
+ r.push(`This week we made <span class="yellowgreen">${cashFormat(_income)}.</span>`);
if (!Number.isInteger(_income)) {
- // <br>
- r.push(`<span class="red">Error failed to calculate income</span>`);
+ r.push(App.UI.DOM.makeElement("div", `Error failed to calculate income`, "red"));
} else {
cashX(_income, "personalBusiness");
}
@@ -957,13 +957,12 @@ App.EndWeek.personalBusiness = function() {
if (V.SecExp.edicts.taxTrade === 1) {
const _tradeTax = Math.ceil(V.SecExp.core.trade * random(80, 120));
- // <br>
- r.push(`Fees on transitioning goods this week made <span class="yellowgreen">${cashFormat(_tradeTax)}.</span>`);
+ r.push(App.UI.DOM.makeElement("div", `Fees on transitioning goods this week made <span class="yellowgreen">${cashFormat(_tradeTax)}.</span>`));
cashX(Math.ceil(_tradeTax), "personalBusiness");
}
- // <br>
+ App.Events.addParagraph(el, r);
}
-
+ r = [];
r.push(`Routine upkeep of your demesne costs <span class="yellow">${cashFormat(V.costs)}.</span>`);
if (V.plot === 1) {
if (V.week > 10) {
@@ -1021,114 +1020,109 @@ App.EndWeek.personalBusiness = function() {
V.costs = Math.trunc(Math.abs(calculateCosts.bill()) * 100) / 100;
/* overwrite the prediction and actually pay the bill. GetCost should return a negative. Round to two decimal places.*/
if (isNaN(V.costs)) {
- // <br>
- r.push(`<span class="red">Error, costs is NaN</span>`);
+ r.push(App.UI.DOM.makeElement("div", `Error, costs is NaN`, "red"));
}
+ App.Events.addParagraph(el, r);
/* Adding random changes to slave demand and supply*/
endWeekSlaveMarket();
+ r = [];
if (V.menialDemandFactor <= -35000) {
- // <br>
- r.push(`Demand for slaves is approaching a <span class="red">''historic low'',</span> forecasts predict`);
+ r.push(`Demand for slaves is approaching a <span class="red bold">historic low,</span> forecasts predict`);
if (V.deltaDemand > 0) {
- r.push(`the market will turn soon and <span class="green">''demand will rise''.</span>`);
+ r.push(`the market will turn soon and <span class="green bold">demand will rise.</span>`);
} else if (V.deltaDemand < 0) {
- r.push(`<span class="red">''demand will continue to weaken'',</span> but warn the bottom is in sight.`);
+ r.push(`<span class="red bold">demand will continue to weaken,</span> but warn the bottom is in sight.`);
} else {
- r.push(`the current demand will <span class="yellow">''stabilize''.</span>`);
+ r.push(`the current demand will <span class="yellow bold">stabilize.</span>`);
}
} else if (V.menialDemandFactor <= -20000) {
- // <br>
- r.push(`Demand for slaves is <span class="red">''very low'',</span> forecasts predict`);
+ r.push(`Demand for slaves is <span class="red bold">very low,</span> forecasts predict`);
if (V.deltaDemand > 0) {
- r.push(`the market will turn soon and <span class="green">''demand will rise''.</span>`);
+ r.push(`the market will turn soon and <span class="green bold">demand will rise.</span>`);
} else if (V.deltaDemand < 0) {
- r.push(`<span class="red">''demand will continue to weaken''.</span>`);
+ r.push(`<span class="red bold">demand will continue to weaken.</span>`);
} else {
- r.push(`the current demand will <span class="yellow">''stabilize''.</span>`);
+ r.push(`the current demand will <span class="yellow bold">stabilize.</span>`);
}
} else if (V.menialDemandFactor >= 35000) {
- // <br>
- r.push(`Demand for slaves is approaching a <span class="green">''historic high'',</span> forecasts predict`);
+ r.push(`Demand for slaves is approaching a <span class="green bold">historic high,</span> forecasts predict`);
if (V.deltaDemand > 0) {
- r.push(`<span class="green">''demand will continue to rise'',</span> but warn the peak is in sight.`);
+ r.push(`<span class="green bold">demand will continue to rise,</span> but warn the peak is in sight.`);
} else if (V.deltaDemand < 0) {
- r.push(`the market will turn soon and <span class="red">''demand will weaken''.</span>`);
+ r.push(`the market will turn soon and <span class="red bold">demand will weaken.</span>`);
} else {
- r.push(`the current demand will <span class="yellow">''stabilize''.</span>`);
+ r.push(`the current demand will <span class="yellow bold">stabilize.</span>`);
}
} else if (V.menialDemandFactor >= 20000) {
- // <br>
- r.push(`Demand for slaves is <span class="green">''very high'',</span> forecasts predict`);
+ r.push(`Demand for slaves is <span class="green bold">very high,</span> forecasts predict`);
if (V.deltaDemand > 0) {
- r.push(`<span class="green">''demand will continue to rise''.</span>`);
+ r.push(`<span class="green bold">demand will continue to rise.</span>`);
} else if (V.deltaDemand < 0) {
- r.push(`the market will turn soon and <span class="red">''demand will weaken''.</span>`);
+ r.push(`the market will turn soon and <span class="red bold">demand will weaken.</span>`);
} else {
- r.push(`the current demand will <span class="yellow">''stabilize''.</span>`);
+ r.push(`the current demand will <span class="yellow bold">stabilize.</span>`);
}
} else {
- // <br>
- r.push(`Demand for slaves is <span class="yellow">''average'',</span> forecasts predict`);
+ r.push(`Demand for slaves is <span class="yellow bold">average,</span> forecasts predict`);
if (V.deltaDemand > 0) {
- r.push(`the market will see <span class="green">''rising demand''.</span>`);
+ r.push(`the market will see <span class="green bold">rising demand.</span>`);
} else if (V.deltaDemand < 0) {
- r.push(`the market will see <span class="red">''weakening demand''.</span>`);
+ r.push(`the market will see <span class="red bold">weakening demand.</span>`);
} else {
- r.push(`it will <span class="yellow">''remain stable''</span> for the coming months.`);
+ r.push(`it will <span class="yellow bold">remain stable</span> for the coming months.`);
}
}
+ App.Events.addParagraph(el, r);
+ r = [];
if (V.menialSupplyFactor <= -35000) {
- // <br>
- r.push(`Supply of slaves is approaching a <span class="green">''historic low'',</span> forecasts predict`);
+ r.push(`Supply of slaves is approaching a <span class="green bold">historic low,</span> forecasts predict`);
if (V.deltaSupply > 0) {
- r.push(`the market will turn soon and <span class="red">''supply will rise''.</span>`);
+ r.push(`the market will turn soon and <span class="red bold">supply will rise.</span>`);
} else if (V.deltaSupply < 0) {
- r.push(`<span class="green">''supply will continue to weaken'',</span> but warn the bottom is in sight.`);
+ r.push(`<span class="green bold">supply will continue to weaken,</span> but warn the bottom is in sight.`);
} else {
- r.push(`the current supply will <span class="yellow">''stabilize''.</span>`);
+ r.push(`the current supply will <span class="yellow bold">stabilize.</span>`);
}
} else if (V.menialSupplyFactor <= -20000) {
- // <br>
- r.push(`Supply for slaves is <span class="green">''very low'',</span> forecasts predict`);
+ r.push(`Supply for slaves is <span class="green bold">very low,</span> forecasts predict`);
if (V.deltaSupply > 0) {
- r.push(`the market will turn soon and <span class="red">''supply will rise''.</span>`);
+ r.push(`the market will turn soon and <span class="red bold">supply will rise.</span>`);
} else if (V.deltaSupply < 0) {
- r.push(`<span class="green">''supply will continue to weaken''.</span>`);
+ r.push(`<span class="green bold">supply will continue to weaken.</span>`);
} else {
- r.push(`the current supply will <span class="yellow">''stabilize''.</span>`);
+ r.push(`the current supply will <span class="yellow bold">stabilize.</span>`);
}
} else if (V.menialSupplyFactor >= 35000) {
- // <br>
- r.push(`Supply for slaves is approaching a <span class="red">''historic high'',</span> forecasts predict`);
+ r.push(`Supply for slaves is approaching a <span class="red bold">historic high,</span> forecasts predict`);
if (V.deltaSupply > 0) {
- r.push(`<span class="red">''supply will continue to rise'',</span> but warn the peak is in sight.`);
+ r.push(`<span class="red bold">supply will continue to rise,</span> but warn the peak is in sight.`);
} else if (V.deltaSupply < 0) {
- r.push(`the market will turn soon and <span class="green">''supply will weaken''.</span>`);
+ r.push(`the market will turn soon and <span class="green bold">supply will weaken.</span>`);
} else {
- r.push(`the current supply will <span class="yellow">''stabilize''.</span>`);
+ r.push(`the current supply will <span class="yellow bold">stabilize.</span>`);
}
} else if (V.menialSupplyFactor >= 20000) {
- // <br>
- r.push(`Supply for slaves is <span class="red">''very high'',</span> forecasts predict`);
+ r.push(`Supply for slaves is <span class="red bold">very high,</span> forecasts predict`);
if (V.deltaSupply > 0) {
- r.push(`<span class="red">''supply will continue to rise''.</span>`);
+ r.push(`<span class="red bold">supply will continue to rise.</span>`);
} else if (V.deltaSupply < 0) {
- r.push(`the market will turn soon and <span class="green">''supply will weaken''.</span>`);
+ r.push(`the market will turn soon and <span class="green bold">supply will weaken.</span>`);
} else {
- r.push(`the current supply will <span class="yellow">''stabilize''.</span>`);
+ r.push(`the current supply will <span class="yellow bold">stabilize.</span>`);
}
} else {
- // <br>
- r.push(`Supply for slaves is <span class="yellow">''average'',</span> forecasts predict`);
+ r.push(`Supply for slaves is <span class="yellow bold">average,</span> forecasts predict`);
if (V.deltaSupply > 0) {
- r.push(`the market will see <span class="red">''rising supply''.</span>`);
+ r.push(`the market will see <span class="red bold">rising supply.</span>`);
} else if (V.deltaSupply < 0) {
- r.push(`the market will see <span class="green">''weakening supply''.</span>`);
+ r.push(`the market will see <span class="green bold">weakening supply.</span>`);
} else {
- r.push(`it will <span class="yellow">''remain stable''</span> for the coming months.`);
+ r.push(`it will <span class="yellow bold">remain stable</span> for the coming months.`);
}
}
+ App.Events.addParagraph(el, r);
+ r = [];
/* Menial and regular slave markets are part of the same market, e.a. if (menial)slave supply goes up, all slave prices fall.
The RomanFS may need further tweaking (it probably got weaker). Could increase the slave supply cap if this FS is chosen to fix. */
@@ -1136,14 +1130,10 @@ App.EndWeek.personalBusiness = function() {
V.slaveCostFactor = menialSlaveCost() / 1000;
if (V.arcologies[0].FSRomanRevivalist > random(1, 150)) {
if (V.slaveCostFactor > 0.8) {
- // <br><br>
- r.push(`<span class="yellow">Your Roman Revivalism is having an effect on the slave market and has driven local prices down</span> by convincing slave traders that this is a staunchly pro-slavery area.`);
- // <br>
+ App.UI.DOM.appendNewElement("p", el, `<span class="yellow">Your Roman Revivalism is having an effect on the slave market and has driven local prices down</span> by convincing slave traders that this is a staunchly pro-slavery area.`);
V.menialSupplyFactor += 2000;
} else {
- // <br><br>
- r.push(`<span class="yellow">Your Roman Revivalism is having an effect on the slave market and is holding local prices down</span> by convincing slave traders that this is a staunchly pro-slavery area.`);
- // <br>
+ App.UI.DOM.appendNewElement("p", el, `<span class="yellow">Your Roman Revivalism is having an effect on the slave market and is holding local prices down</span> by convincing slave traders that this is a staunchly pro-slavery area.`);
}
}
@@ -1179,7 +1169,6 @@ App.EndWeek.personalBusiness = function() {
if (V.weatherToday.severity === 3) {
V.localEcon -= 1;
V.econWeatherDamage += 1;
- // <br><br>
r.push(`This week's terrible weather did a number on the region, <span class="red">hurting the local economy.</span> `);
if (V.disasterResponse === 0) {
r.push(App.UI.DOM.makeElement("span", `Investing in a disaster response unit will speed up recovery`, "note"));
@@ -1187,7 +1176,6 @@ App.EndWeek.personalBusiness = function() {
} else if (V.weatherToday.severity > 3) {
V.localEcon -= 3;
V.econWeatherDamage += 3;
- // <br><br>
r.push(`This week's extreme weather ravaged the region, <span class="red">the local economy is seriously disrupted.</span>`);
if (V.disasterResponse === 0) {
r.push(App.UI.DOM.makeElement("span", `Investing in a disaster response unit will speed up recovery`, "note"));
@@ -1195,8 +1183,10 @@ App.EndWeek.personalBusiness = function() {
}
}
}
+ App.Events.addParagraph(el, r);
if (V.SF.Toggle && V.SF.Active >= 1) {
- r.push(App.SF.AAR());
+ el.append(App.SF.AAR());
}
+ return el;
};
diff --git a/src/uncategorized/economics.tw b/src/uncategorized/economics.tw
index ea6bbff754a76de376bf1194f0933ad43bb4a394..63a0e062bd2b55ed00e9183216bbd5c3ef36f769 100644
--- a/src/uncategorized/economics.tw
+++ b/src/uncategorized/economics.tw
@@ -38,7 +38,7 @@
<</if>>
<<include "Reputation">>
-<br> <<include "Personal Business">>
+<br> <<includeDOM App.EndWeek.personalBusiness()>>
<<if $PC.boobs >= 1000 || $PC.pregKnown == 1 || $playerAging != 0>>
<br><br>
@@ -118,7 +118,7 @@
<div id="Business" class="tab-content">
<div class="content">
- <<include "Personal Business">>
+ <<includeDOM App.EndWeek.personalBusiness()>>
</div>
</div>