diff --git a/src/facilities/farmyard/farmyard.js b/src/facilities/farmyard/farmyard.js
index 0d843c23caaf99217aaa67e2c255008ccca352fb..9e46fa5bad00be717fbe3c2a5be237763691fa47 100644
--- a/src/facilities/farmyard/farmyard.js
+++ b/src/facilities/farmyard/farmyard.js
@@ -26,14 +26,11 @@ App.Facilities.Farmyard.farmyard = function() {
const
frag = new DocumentFragment(),
- desc = document.createElement("div"),
- link = document.createElement("div"),
+ desc = App.UI.DOM.makeElement("div", '', "scene-intro"),
+ link = App.UI.DOM.makeElement("div", '', "indent"),
count = App.Entity.facilities.farmyard.totalEmployeesCount;
- desc.classList.add("scene-intro");
- link.classList.add("indent");
-
desc.append(`${V.farmyardNameCaps} is an oasis of growth in the midst of the jungle of steel and concrete that is ${V.arcologies[0].name}. Animals are kept in pens, tended to by your slaves, while ${V.farmyardUpgrades.hydroponics ? `rows of hydroponics equipment` : `makeshift fields`} grow crops. `);
switch (V.farmyardDecoration) {
@@ -179,17 +176,13 @@ App.Facilities.Farmyard.farmyard = function() {
frag = new DocumentFragment(),
desc = document.createElement("div"),
- link = document.createElement("div"),
- note = document.createElement("span"),
- cost = document.createElement("span"),
+ link = App.UI.DOM.makeElement("div", '', "indent"),
+ note = App.UI.DOM.makeElement("span", '', "note"),
+ cost = App.UI.DOM.makeElement("span", '', "yellowgreen"),
upgradeCost = Math.trunc(V.farmyard * 1000 * V.upgradeMultiplierArcology),
farmhands = App.Entity.facilities.farmyard.totalEmployeesCount;
- link.classList.add("indent");
- note.classList.add("note");
- cost.classList.add("yellowgreen");
-
cost.append(cashFormat(upgradeCost));
desc.append(`It can support ${V.farmyard} farmhands. Currently there ${farmhands === 1 ? `is` : `are`} ${farmhands} ${farmhands === 1 ? `farmhand` : `farmhands`} in ${V.farmyardName}. `);
@@ -207,15 +200,12 @@ App.Facilities.Farmyard.farmyard = function() {
if (V.farmyardFarmers || V.farmyardShowgirls) {
const
- removeLink = document.createElement("div"),
- warning = document.createElement("span"),
+ removeLink = App.UI.DOM.makeElement("div", '', "indent"),
+ warning = App.UI.DOM.makeElement("span", '', "red"),
count = App.Entity.facilities.farmyard.totalEmployeesCount,
newPop = count + V.dormitoryPopulation;
- removeLink.classList.add("indent");
- warning.classList.add("red");
-
warning.append(` Dormitory capacity will be exceeded.`);
removeLink.append(App.UI.DOM.passageLink("Remove all slaves", "Farmyard", () => {
@@ -249,14 +239,12 @@ App.Facilities.Farmyard.farmyard = function() {
frag = new DocumentFragment(),
links = [],
- linksDiv = document.createElement("div"),
+ linksDiv = App.UI.DOM.makeElement("div", '', "indent"),
menials = V.menials,
farmMenials = V.farmMenials,
farmMenialsSpace = V.farmMenialsSpace;
- linksDiv.classList.add("indent");
-
if (farmMenials) {
frag.append(`Assigned to ${V.farmyardName} ${farmMenials === 1 ? `is` : `are`} ${farmMenials} menial ${farmMenials === 1 ? `slave` : `slaves`}, working to produce as much food for your arcology as they can. `);
}
@@ -323,7 +311,7 @@ App.Facilities.Farmyard.farmyard = function() {
frag = new DocumentFragment(),
links = [],
- linksDiv = document.createElement("div"),
+ linksDiv = App.UI.DOM.makeElement("div", '', "indent"),
menials = V.menials,
farmMenials = V.farmMenials,
@@ -333,8 +321,6 @@ App.Facilities.Farmyard.farmyard = function() {
menialPrice = Math.trunc(menialSlaveCost()),
maxMenials = Math.trunc(Math.clamp(V.cash / menialPrice, 0, bulkMax));
- linksDiv.classList.add("indent");
-
if (farmMenialsSpace) {
MenialPopCap();
@@ -378,16 +364,12 @@ App.Facilities.Farmyard.farmyard = function() {
frag = new DocumentFragment(),
desc = document.createElement("div"),
- link = document.createElement("div"),
- note = document.createElement("span"),
- cost = document.createElement("span"),
+ link = App.UI.DOM.makeElement("div", '', "indent"),
+ note = App.UI.DOM.makeElement("span", '', "note"),
+ cost = App.UI.DOM.makeElement("span", '', "yellowgreen"),
unitCost = Math.trunc(1000 * V.upgradeMultiplierArcology);
- link.classList.add("indent");
- note.classList.add("note");
- cost.classList.add("yellowgreen");
-
cost.append(cashFormat(unitCost));
if (V.farmMenialsSpace < 500) {
@@ -414,9 +396,7 @@ App.Facilities.Farmyard.farmyard = function() {
const
desc = document.createElement("div"),
option = document.createElement("span"),
- bold = document.createElement("span");
-
- bold.classList.add("bold");
+ bold = App.UI.DOM.makeElement("span", '', "bold");
desc.append(`Slaves `);
bold.append(`are`);
@@ -436,9 +416,7 @@ App.Facilities.Farmyard.farmyard = function() {
const
desc = document.createElement("div"),
option = document.createElement("span"),
- bold = document.createElement("span");
-
- bold.classList.add("bold");
+ bold = App.UI.DOM.makeElement("span", '', "bold");
desc.append(`Slaves `);
bold.append(`are`);
@@ -457,9 +435,7 @@ App.Facilities.Farmyard.farmyard = function() {
const
desc = document.createElement("div"),
option = document.createElement("span"),
- bold = document.createElement("span");
-
- bold.classList.add("bold");
+ bold = App.UI.DOM.makeElement("span", '', "bold");
bold.append(`All of the slaves`);
desc.append(` are being restrained. `);
@@ -478,9 +454,7 @@ App.Facilities.Farmyard.farmyard = function() {
const
desc = document.createElement("div"),
option = document.createElement("span"),
- bold = document.createElement("span");
-
- bold.classList.add("bold");
+ bold = App.UI.DOM.makeElement("span", '', "bold");
bold.append(`Only disobedient slaves`);
desc.append(` are being restrained. `);
@@ -500,9 +474,7 @@ App.Facilities.Farmyard.farmyard = function() {
const
desc = document.createElement("div"),
option = document.createElement("span"),
- bold = document.createElement("span");
-
- bold.classList.add("bold");
+ bold = App.UI.DOM.makeElement("span", '', "bold");
desc.append(`Slaves `);
bold.append(`are not`);
@@ -522,9 +494,7 @@ App.Facilities.Farmyard.farmyard = function() {
const
desc = document.createElement("div"),
option = document.createElement("span"),
- bold = document.createElement("span");
-
- bold.classList.add("bold");
+ bold = App.UI.DOM.makeElement("span", '', "bold");
desc.append(`Slaves `);
bold.append(`are not`);
@@ -558,13 +528,9 @@ App.Facilities.Farmyard.farmyard = function() {
if (!farmyardUpgrades.pump) {
const
desc = document.createElement("div"),
- upgrade = document.createElement("div"),
- note = document.createElement("span"),
- cost = document.createElement("span");
-
- upgrade.classList.add("indent");
- note.classList.add("note");
- cost.classList.add("yellowgreen");
+ upgrade = App.UI.DOM.makeElement("div", '', "indent"),
+ note = App.UI.DOM.makeElement("span", '', "note"),
+ cost = App.UI.DOM.makeElement("span", '', "yellowgreen");
cost.append(cashFormat(pumpCost));
@@ -588,13 +554,9 @@ App.Facilities.Farmyard.farmyard = function() {
if (!farmyardUpgrades.fertilizer) {
const
- upgrade = document.createElement("div"),
- note = document.createElement("span"),
- cost = document.createElement("span");
-
- upgrade.classList.add("indent");
- note.classList.add("note");
- cost.classList.add("yellowgreen");
+ upgrade = App.UI.DOM.makeElement("div", '', "indent"),
+ note = App.UI.DOM.makeElement("span", '', "note"),
+ cost = App.UI.DOM.makeElement("span", '', "yellowgreen");
cost.append(cashFormat(fertilizerCost));
@@ -615,13 +577,9 @@ App.Facilities.Farmyard.farmyard = function() {
if (!farmyardUpgrades.hydroponics) {
const
- upgrade = document.createElement("div"),
- note = document.createElement("span"),
- cost = document.createElement("span");
-
- upgrade.classList.add("indent");
- note.classList.add("note");
- cost.classList.add("yellowgreen");
+ upgrade = App.UI.DOM.makeElement("div", '', "indent"),
+ note = App.UI.DOM.makeElement("span", '', "note"),
+ cost = App.UI.DOM.makeElement("span", '', "yellowgreen");
cost.append(cashFormat(hydroponicsCost));
@@ -643,13 +601,9 @@ App.Facilities.Farmyard.farmyard = function() {
if (!farmyardUpgrades.seeds) {
const
- upgrade = document.createElement("div"),
- note = document.createElement("span"),
- cost = document.createElement("span");
-
- upgrade.classList.add("indent");
- note.classList.add("note");
- cost.classList.add("yellowgreen");
+ upgrade = App.UI.DOM.makeElement("div", '', "indent"),
+ note = App.UI.DOM.makeElement("span", '', "note"),
+ cost = App.UI.DOM.makeElement("span", '', "yellowgreen");
cost.append(cashFormat(seedsCost));
@@ -671,13 +625,9 @@ App.Facilities.Farmyard.farmyard = function() {
if (!farmyardUpgrades.machinery) {
const
- upgrade = document.createElement("div"),
- note = document.createElement("span"),
- cost = document.createElement("span");
-
- upgrade.classList.add("indent");
- note.classList.add("note");
- cost.classList.add("yellowgreen");
+ upgrade = App.UI.DOM.makeElement("div", '', "indent"),
+ note = App.UI.DOM.makeElement("span", '', "note"),
+ cost = App.UI.DOM.makeElement("span", '', "yellowgreen");
cost.append(cashFormat(machineryCost));
@@ -734,13 +684,9 @@ App.Facilities.Farmyard.farmyard = function() {
`all kinds of canines`,
kennels = document.createElement("div"),
- kennelsCost = document.createElement("span"),
- kennelsNote = document.createElement("span"),
- kennelsUpgrade = document.createElement("div");
-
- kennelsCost.classList.add("yellowgreen");
- kennelsNote.classList.add("note");
- kennelsUpgrade.classList.add("indent");
+ kennelsUpgrade = App.UI.DOM.makeElement("div", '', "indent"),
+ kennelsNote = App.UI.DOM.makeElement("span", '', "note"),
+ kennelsCost = App.UI.DOM.makeElement("span", '', "yellowgreen");
if (farmyardKennels === 0) {
kennels.append(App.UI.DOM.passageLink("Add kennels", "Farmyard",
@@ -787,13 +733,9 @@ App.Facilities.Farmyard.farmyard = function() {
`all kinds of hooved animals`,
stables = document.createElement("div"),
- stablesCost = document.createElement("span"),
- stablesNote = document.createElement("span"),
- stablesUpgrade = document.createElement("div");
-
- stablesCost.classList.add("yellowgreen");
- stablesNote.classList.add("note");
- stablesUpgrade.classList.add("indent");
+ stablesUpgrade = App.UI.DOM.makeElement("div", '', "indent"),
+ stablesNote = App.UI.DOM.makeElement("span", '', "note"),
+ stablesCost = App.UI.DOM.makeElement("span", '', "yellowgreen");
if (farmyardStables === 0) {
stables.append(App.UI.DOM.passageLink("Add stables", "Farmyard",
@@ -846,13 +788,9 @@ App.Facilities.Farmyard.farmyard = function() {
`all kinds of felines`,
cages = document.createElement("div"),
- cagesCost = document.createElement("span"),
- cagesNote = document.createElement("span"),
- cagesUpgrade = document.createElement("div");
-
- cagesCost.classList.add("yellowgreen");
- cagesNote.classList.add("note");
- cagesUpgrade.classList.add("indent");
+ cagesUpgrade = App.UI.DOM.makeElement("div", '', "indent"),
+ cagesNote = App.UI.DOM.makeElement("span", '', "note"),
+ cagesCost = App.UI.DOM.makeElement("span", '', "yellowgreen");
if (farmyardCages === 0) {
cages.append(App.UI.DOM.passageLink("Add cages", "Farmyard",
@@ -893,14 +831,11 @@ App.Facilities.Farmyard.farmyard = function() {
const
removeHousing = document.createElement("div"),
- removeHousingNote = document.createElement("span"),
- removeHousingCost = document.createElement("span"),
+ removeHousingNote = App.UI.DOM.makeElement("span", '', "note"),
+ removeHousingCost = App.UI.DOM.makeElement("span", '', "yellowgreen"),
removeHousingPrice = ((farmyardKennels + farmyardStables + farmyardCages) * 5000) * V.upgradeMultiplierArcology;
- removeHousingNote.classList.add("note");
- removeHousingCost.classList.add("yellowgreen");
-
if (farmyardKennels || farmyardStables || farmyardCages) {
removeHousing.append(document.createElement("br"));
@@ -936,11 +871,8 @@ App.Facilities.Farmyard.farmyard = function() {
const
frag = new DocumentFragment(),
- renameDiv = document.createElement("div"),
- renameNote = document.createElement("span");
-
- renameDiv.classList.add("farmyard-rename");
- renameNote.classList.add("note");
+ renameDiv = App.UI.DOM.makeElement("div", '', "farmyard-rename"),
+ renameNote = App.UI.DOM.makeElement("span", '', "note");
renameDiv.append(`Rename ${V.farmyardName}: `);
renameNote.append(` Use a noun or similar short phrase`);