diff --git a/src/arcologyBuilding/ManageArcology.js b/src/arcologyBuilding/ManageArcology.js index a1824177c6acd800da2307d4265e45204278be24..1c90aa3291c092bf860ed9fcebc568460713e6c9 100644 --- a/src/arcologyBuilding/ManageArcology.js +++ b/src/arcologyBuilding/ManageArcology.js @@ -249,7 +249,7 @@ App.UI.manageArcology = function() { App.UI.DOM.appendNewElement("div", node, ""); node.append("You can have your ", applyArcUpgrade("citizens pay", "receiver", 20000, "light subsidy"), ` for the fiber optic upgrades, reducing the cost to ${cashFormat(arcUpgradeCost(20000, "receiver subsidy"))}.`); App.UI.DOM.appendNewElement("div", node, ""); - node.append("You can also have them ", applyArcUpgrade("heavily subsidize", "receiver", 10000, "Heavy subsidy"), ` installation, they will be upset about it, but it will only cost ${cashFormat(arcUpgradeCost(10000, "receiver subsidy"))}.`); + node.append("You can also have them ", applyArcUpgrade("heavily subsidize", "receiver", 10000, "Heavy subsidy"), ` installation. They will be upset about it, but it will only cost ${cashFormat(arcUpgradeCost(10000, "receiver subsidy"))}.`); } else { r = []; r.push("You have installed the FCTV receiver and have access to the full range of FCTV's programs."); @@ -262,10 +262,10 @@ App.UI.manageArcology = function() { } App.UI.DOM.appendNewElement("div", node, r.join(" ")); } + if (V.PC.skill.engineering >= 100 || V.PC.career === "arcology owner") { - node.append("Arcology upgrades are less expensive due to your ", - App.UI.DOM.makeElement("span", `${V.PC.career === "arcology owner" ? "experience in the Free Cities" : "arcology engineering training"}.`, ["player", "skill"]) - ); + const div = App.UI.DOM.appendNewElement("div", node, "Arcology upgrades are less expensive due to your "); + App.UI.DOM.appendNewElement("span", div, `${V.PC.career === "arcology owner" ? "experience in the Free Cities" : "arcology engineering training"}.`, ["player", "skill"]); } if (V.secExpEnabled === 0) { @@ -399,33 +399,35 @@ App.UI.manageArcology = function() { if (V.personalArms === 0 && V.mercenaries === 0 && V.assistant.personality <= 0) { App.UI.DOM.makeElement("div", `${arcName} has no special upgrades.`, "note"); } else { - r = []; if (V.personalArms > 0) { + r = []; r.push(`You own a prototype powered exoskeleton that mounts armor and a smart mortar system, and has rifles mounted into its forearms.`); if (V.personalArms > 1) { r.push(`Furthermore, your security drones can rearm with small-caliber guns if necessary.`); } + App.UI.DOM.appendNewElement("div", node, r.join(" "), "indent"); } - App.UI.DOM.appendNewElement("div", node, r.join(" "), "indent"); - r = []; - if (V.mercenaries.isBetween(1, 5)) { - r.push(`A ${V.mercenaries === 1 ? "squad" : "full platoon"} of mercenaries is permanently quartered in ${arcName}.`); - } else if (V.mercenaries >= 5) { - r.push(`You have permanently settled a full company of mercenaries in ${arcName} as your ${V.mercenariesTitle}.`); + if (V.mercenaries > 0) { + r = []; + if (V.mercenaries.isBetween(1, 5)) { + r.push(`A ${V.mercenaries === 1 ? "squad" : "full platoon"} of mercenaries is permanently quartered in ${arcName}.`); + } else if (V.mercenaries >= 5) { + r.push(`You have permanently settled a full company of mercenaries in ${arcName} as your ${V.mercenariesTitle}.`); + } + r.push(`They are grim men and women${V.mercenaries < 5 ? ", heavily armed and armored" : " who appreciate their luxurious life here and train hard to keep their skills with their prototype armor sharp"}.`); + App.UI.DOM.appendNewElement("div", node, r.join(" "), "indent"); } - r.push(`They are grim men and women${V.mercenaries < 5 ? ", heavily armed and armored" : " who appreciate their luxurious life here and train hard to keep their skills with their prototype armor sharp"}.`); - App.UI.DOM.appendNewElement("div", node, r.join(" "), "indent"); - r = []; if (V.assistant.personality > 0) { + r = []; const {hisA, heA} = getPronouns(assistant.pronouns().main).appendSuffix("A"); r.push(`${capFirstChar(V.assistant.name)} is using an alternative personality setting, speaking in a sultry, sexual voice, and talking as though the penthouse's sex toys are ${hisA} body.`); if (V.assistant.personality > 1) { r.push(`${heA} also has charge of all smart piercings in the arcology, and is using ${hisA} adaptations to sexual duties to improve their effectiveness.`); } + App.UI.DOM.appendNewElement("div", node, r.join(" "), "indent"); } - App.UI.DOM.appendNewElement("div", node, r.join(" "), "indent"); } App.UI.DOM.appendNewElement("h2", node, "Slaves"); diff --git a/src/events/RESS/review/inconvenientLabia.js b/src/events/RESS/review/inconvenientLabia.js index 7a1e0aec8577e7de3ef0d4d0bd98b11dfa542fa3..8cad0b2ad6bcdaded0c1fa7b8d7c55d3cb6da1cc 100644 --- a/src/events/RESS/review/inconvenientLabia.js +++ b/src/events/RESS/review/inconvenientLabia.js @@ -74,7 +74,7 @@ App.Events.RESSInconvenientLabia = class RESSInconvenientLabia extends App.Event function labiaplasty() { r = []; - r.push(`When you assent, ${he} cheers up immediately, looking remarkably happy for a ${girl} who's just learned ${his} vagina is about to have a surgical operation performed on it. Then again, having those huge pussylips constantly getting in ${his} way when ${he} runs must be extremely uncomfortable, so it's not shocking ${he} would consider a radical solution to ${his} problem. When ${he} exits the remote surgery, ${he} looks <span class="health.dec">sorer than ever,</span> of course, but ${he} <span class="devotion inc">smiles gratefully</span> at you the next time ${he}`); + r.push(`When you assent, ${he} cheers up immediately, looking remarkably happy for a ${girl} who's just learned ${his} vagina is about to have a surgical operation performed on it. Then again, having those huge pussylips constantly getting in ${his} way when ${he} runs must be extremely uncomfortable, so it's not shocking ${he} would consider a radical solution to ${his} problem. When ${he} exits the remote surgery, ${he} looks <span class="health dec">sorer than ever,</span> of course, but ${he} <span class="devotion inc">smiles gratefully</span> at you the next time ${he}`); if (canSee(eventSlave)) { r.push(`sees`); } else {