From db5e1b8da74743ad743eeee32e0c05a400e53210 Mon Sep 17 00:00:00 2001
From: Arkerthan <arkerthan@gmail.com>
Date: Thu, 24 Oct 2019 21:55:09 +0200
Subject: [PATCH] use <span> instead of @@
---
src/Corporation/corporate-divisionAcquiring.js | 6 +++---
src/Corporation/corporate-divisionProcessing.js | 4 ++--
src/Corporation/corporate-divisionWorking.js | 8 ++++----
src/Corporation/corporate.js | 4 ++--
src/Corporation/manageCorporation.tw | 2 +-
src/facilities/nursery/nurseryWidgets.js | 6 +++---
src/js/utilJS.js | 4 ++--
7 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/src/Corporation/corporate-divisionAcquiring.js b/src/Corporation/corporate-divisionAcquiring.js
index 66b22415dfc..bdf5a516446 100644
--- a/src/Corporation/corporate-divisionAcquiring.js
+++ b/src/Corporation/corporate-divisionAcquiring.js
@@ -27,7 +27,7 @@ App.Corporate.Init_DivisionAcquiring = function(shared) {
get nounFinishedSlave() { return "slave"; }
get nounSlaveFromMarket() { return "slave"; }
messageSlaveCount() {
- return `It averages @@.green;${numberWithPluralNonZero(this.developmentCount, "new slave")}@@ each week.`;
+ return `It averages <span class="green">${numberWithPluralNonZero(this.developmentCount, "new slave")}</span> each week.`;
}
messageSlaveOutput() {
return shared.MessageSlaveToMarket(this);
@@ -35,11 +35,11 @@ App.Corporate.Init_DivisionAcquiring = function(shared) {
message_endWeek_Slaves(divLedger) {
let newSlaves = divLedger.slaves.value;
if(newSlaves > 0) {
- return `@@.green;acquired ${numberWithPlural(newSlaves, "slave")}@@`
+ return `<span class="green">acquired ${numberWithPlural(newSlaves, "slave")}</span>`
+ (this.hadMercenaryHelp ? " with the help of your mercenaries" : "");
}
else {
- return `@@.red;failed to acquire any slaves@@`
+ return `<span class="red">failed to acquire any slaves</span>`
+ (this.hadMercenaryHelp ? " even with the help of your mercenaries" : "");
}
}
diff --git a/src/Corporation/corporate-divisionProcessing.js b/src/Corporation/corporate-divisionProcessing.js
index 3631deaffb3..a5870ac1cb2 100644
--- a/src/Corporation/corporate-divisionProcessing.js
+++ b/src/Corporation/corporate-divisionProcessing.js
@@ -38,10 +38,10 @@ App.Corporate.Init_DivisionProcessing = function(shared) {
//The division
let retval = this._const.slaveProcessType.past; //exploited
if(newSlaves <= 0) {
- retval += " @@.red;none of its slaves@@";
+ retval += " <span class='red'>none of its slaves</span>";
}
else {
- retval += ` @@.green;${numberWithPlural(newSlaves, 'slave')}@@`;
+ retval += ` <span class="green">${numberWithPlural(newSlaves, 'slave')}</span>`;
}
retval += ". The division ";
if(this.activeSlaves) {
diff --git a/src/Corporation/corporate-divisionWorking.js b/src/Corporation/corporate-divisionWorking.js
index 62f0ea48455..4527bbd6a92 100644
--- a/src/Corporation/corporate-divisionWorking.js
+++ b/src/Corporation/corporate-divisionWorking.js
@@ -28,7 +28,7 @@ App.Corporate.Init_DivisionWorking = function(shared) {
}
messageSlaveOutput() {
/* TODO: originally some divisions had a slight description for what the work was; ie, "the escorts generate" */
- return `The division generates @@.yellowgreen;${cashFormat(this.slaveRevenue)}@@ per slave on average.`;
+ return `The division generates <span class="yellowgreen">${cashFormat(this.slaveRevenue)}</span> per slave on average.`;
}
endWeek_Slaves(divLedger) {
let slaves = shared.EndWeekProcessing_Slaves(this.activeSlaves, this._const.attrition);
@@ -39,13 +39,13 @@ App.Corporate.Init_DivisionWorking = function(shared) {
let lostSlaves = divLedger.slaves.value;
let retval = '';//The division
if(this.activeSlaves <= 0) {
- retval += `has @@.red;no slaves@@ to ${this._const.slaveWorkDescription.future}`;
+ retval += `has <span class="red">no slaves</span> to ${this._const.slaveWorkDescription.future}`;
}
else {
- retval += `is ${this._const.slaveWorkDescription.present} @@.green;${numberWithPlural(this.activeSlaves, 'slave')}@@`;
+ retval += `is ${this._const.slaveWorkDescription.present} <span class="green">${numberWithPlural(this.activeSlaves, 'slave')}</span>`;
}
if(lostSlaves > 0) {
- retval += `. During operations @@.red;${numberWithPlural(lostSlaves, 'slave')}@@ ${this._const.slaveWorkDescription.past}`;
+ retval += `. During operations <span class="red">${numberWithPlural(lostSlaves, 'slave')}</span> ${this._const.slaveWorkDescription.past}`;
}
return retval;
}
diff --git a/src/Corporation/corporate.js b/src/Corporation/corporate.js
index db453c5b519..05457b8d234 100644
--- a/src/Corporation/corporate.js
+++ b/src/Corporation/corporate.js
@@ -413,10 +413,10 @@ App.Corporate.Init = function() {
let procCount = Math.trunc(division.developmentCount * division.processRate);
let slaveCountedNoun = numberWithPluralNonZero(procCount, "slave");
- return `It ${verbPhrase} approximately @@.${color};${slaveCountedNoun}@@ each week when operating at capacity (${division.developmentCount})`;
+ return `It ${verbPhrase} approximately <span class="${color}">${slaveCountedNoun}</span> each week when operating at capacity (${division.developmentCount})`;
},
MessageSlaveToMarket: function(division) {
- return `The slaves from this division can be sold for @@.yellowgreen;${cashFormat(division.soldSlaveValue * menialSlaveCost())}@@ each.`;
+ return `The slaves from this division can be sold for <span class='yellowgreen'>${cashFormat(division.soldSlaveValue * menialSlaveCost())}</span> each.`;
},
EndWeekProcessing_Slaves: function(processingCount, rate) {
const perDevPair = rate.roll();
diff --git a/src/Corporation/manageCorporation.tw b/src/Corporation/manageCorporation.tw
index 220018e0a5d..2b7641e6e10 100644
--- a/src/Corporation/manageCorporation.tw
+++ b/src/Corporation/manageCorporation.tw
@@ -174,7 +174,7 @@
/* Expanding the division*/
<<set _depExpandCost = _div.sizeCost * 1000>>
- <div>Expanding the division costs @@.red;<<print cashFormat(_depExpandCost)>>@@. Downsizing recoups 80% of the investment; slaves will be sold at the going rate.</div>
+ <div>Expanding the division costs <span class="red"><<print cashFormat(_depExpandCost)>></span>. Downsizing recoups 80% of the investment; slaves will be sold at the going rate.</div>
<div>
<<set _buyDevArray = [
{ 'name': 'Expand Division' , 'count':1},
diff --git a/src/facilities/nursery/nurseryWidgets.js b/src/facilities/nursery/nurseryWidgets.js
index 72c75aa42b7..7639cce78e5 100644
--- a/src/facilities/nursery/nurseryWidgets.js
+++ b/src/facilities/nursery/nurseryWidgets.js
@@ -19139,7 +19139,7 @@ App.Facilities.Nursery.nurseryReport = function nurseryReport() {
if (FLsFetish === 1) {
r += `${He} ${V.nurseryChildren ? `seems to have a real soft spot for children, and enjoys working with the child${V.nurseryChildren > 1 ? `ren` : ``} in ${V.nurseryName} and raising ${V.nurseryChildren > 1 ? `them` : V.cribs[0].genes === "XX" ? `her` : `him`} to be ${V.nurseryChildren > 1 ? `good slaves` : `a good slave`}` : ``/* TODO: */}. ${He} finds real satisfaction in helping your slaves find sexual gratification, and <span class="lightsalmon">becomes more caring.</span> `;
} else if (FLsFetish === 2) {
- r += `Every new slave in the nursery is a new person ${he} gets to connect with and serve. Sexually. @@.lightsalmon;${He} becomes more caring.@@`; // TODO:
+ r += `Every new slave in the nursery is a new person ${he} gets to connect with and serve. Sexually. <span class='lightsalmon'>${He} becomes more caring.</span>`; // TODO:
}
// TODO:
@@ -19179,11 +19179,11 @@ App.Facilities.Nursery.nurseryReport = function nurseryReport() {
if (NL < V.nursery) {
let seed = jsRandom(1, 10) + ((V.nursery - NL) * (jsRandom(150, 170) + (idleBonus * 10)));
cashX(seed, "nursery", Matron);
- r += `<br> Since ${he} doesn't have enough children to occupy all ${his} time, ${V.nurseryName} takes in citizens' children on a contract basis and ${he} cares for them too, earning @@.yellowgreen;${cashFormat(seed)}.@@ `;
+ r += `<br> Since ${he} doesn't have enough children to occupy all ${his} time, ${V.nurseryName} takes in citizens' children on a contract basis and ${he} cares for them too, earning <span class='yellowgreen'>${cashFormat(seed)}.</span> `;
}
if (arcology.FSRepopulationFocus > 0 && V.nurseryBabies > 0) {
- r += `Society @@.green;loves@@ the way you are raising more children for ${arcology.name}. `;
+ r += `Society <span class='green'>loves</span> the way you are raising more children for ${arcology.name}. `;
FSChange("Repopulationist", 2);
}
diff --git a/src/js/utilJS.js b/src/js/utilJS.js
index 93b31ad169b..f634c97780d 100644
--- a/src/js/utilJS.js
+++ b/src/js/utilJS.js
@@ -1252,9 +1252,9 @@ window.cashFormatColor = function(s, invert = false) {
//Display red if the value is negative, unless invert is true
if((s > 0) == invert)
{
- return `@@.red;${cashFormat(s)}@@`;
+ return `<span class='red'>${cashFormat(s)}</span>`;
}
- return `@@.yellowgreen;${cashFormat(s)}@@`;
+ return `<span class='yellowgreen'>${cashFormat(s)}</span>`;
};
/**
--
GitLab