diff --git a/css/general/textColors.css b/css/general/textColors.css index 097192bde6509dd4fc9dfaafaf1274760c00b8ab..19bd5b3c11b50bdcbd32ad0bd0f128cf373d6aaf 100644 --- a/css/general/textColors.css +++ b/css/general/textColors.css @@ -213,3 +213,7 @@ div > span.warning.notification::after { .khaki, .libido.dec { color: khaki } + +.race, .nationality { + color: tan +} \ No newline at end of file diff --git a/src/npc/children/childSummary.js b/src/npc/children/childSummary.js index e73b5bdaed9d130a7ea7a0731701bd639a6ae322..6f934d8127220da86c520f2bb2b3c5563332b722 100644 --- a/src/npc/children/childSummary.js +++ b/src/npc/children/childSummary.js @@ -55,7 +55,7 @@ App.Facilities.Nursery.ChildSummary = function(child) { const desc = capFirstChar(SlaveTitle(child)); r += `<strong><span class="coral">${desc}${abbreviate.physicals === 2? '.' : ''}</span></strong> `; if (V.seeRace) { - r += `<span class="tan">`; + r += `<span class="race">`; if (abbreviate.race === 1) { shortRace(child); } else if (abbreviate.race === 2) { @@ -891,7 +891,7 @@ App.Facilities.Nursery.ChildSummary = function(child) { */ function longDrugs(child) { if ((child.drugs !== "no drugs") && (child.drugs !== "none")) { - r += `<span class="tan">On ${child.drugs}.</span> `; + r += `<span class="race">On ${child.drugs}.</span> `; } r += `<span class="lightgreen">`; if (child.curatives === 2) { @@ -1094,7 +1094,7 @@ App.Facilities.Nursery.ChildSummary = function(child) { * @param {App.Entity.SlaveState} child */ function shortNationality(child) { - r += `<span class="tan">`; + r += `<span class="nationality">`; switch (child.nationality) { case "Afghan": r += `Afg`; @@ -1771,7 +1771,7 @@ App.Facilities.Nursery.ChildSummary = function(child) { * @param {App.Entity.SlaveState} child */ function longNationality(child) { - r += `<span class="tan">`; + r += `<span class="race">`; switch (child.nationality) { case "a Cook Islander": r += `Cook Islander. `; diff --git a/src/npc/children/longChildDescription.js b/src/npc/children/longChildDescription.js index 2e2affb81a041ec702828f956c191f9dd41d37f1..9a99a5cee811541a0579c871d97add1424c87a39 100644 --- a/src/npc/children/longChildDescription.js +++ b/src/npc/children/longChildDescription.js @@ -4350,13 +4350,13 @@ App.Facilities.Nursery.LongChildDescription = function(child, {market = 0, event } else if (child.nationality === "Stateless") { r += `${He} has spent so much time in the Free Cities that their statelessness is effectively ${his} nationality; ethnically, ${he}'s `; } else if (child.nationality === "Zimbabwean" && child.race === "white") { - r += `${He}'s originally <span class="tan">Rhodesian;</span> ethnically, ${he}'s `; + r += `${He}'s originally <span class="nationality">Rhodesian;</span> ethnically, ${he}'s `; } else if (child.nationality === "Vatican") { - r += `${He}'s originally <span class="tan">from Vatican City;</span> ethnically, ${he}'s `; + r += `${He}'s originally <span class="nationality">from Vatican City;</span> ethnically, ${he}'s `; } else { - r += `${He}'s originally <span class="tan">${child.nationality};</span> ethnically, ${he}'s `; + r += `${He}'s originally <span class="nationality">${child.nationality};</span> ethnically, ${he}'s `; } - r += `<span class="tan">${child.race},</span> and ${his} skin is ${child.skin}${child.markings === "freckles" ? ` and lightly ${freckled}${skinToneLevel(child.skin) > 5 && skinToneLevel(child.skin < 10) && child.hColor === "red" ? `, an attractive combination` : ``}` : child.markings === "heavily freckled" ? `and heavily ${freckled}${skinToneLevel(child.skin > 5) && skinToneLevel(child.skin) < 10 && child.hColor === "red" ? `, an attractive combination` : ``}. ` : `. `}`; + r += `<span class="race">${child.race},</span> and ${his} skin is ${child.skin}${child.markings === "freckles" ? ` and lightly ${freckled}${skinToneLevel(child.skin) > 5 && skinToneLevel(child.skin < 10) && child.hColor === "red" ? `, an attractive combination` : ``}` : child.markings === "heavily freckled" ? `and heavily ${freckled}${skinToneLevel(child.skin > 5) && skinToneLevel(child.skin) < 10 && child.hColor === "red" ? `, an attractive combination` : ``}. ` : `. `}`; r += `${child.skin === "sun tanned" || child.skin === "spray tanned" ? `${His} ${skintype} has been tanned ${child.skin === "sun tanned" ? `to a natural, healthy-looking tone` : `with obvious, garish-looking makeup`}.` : ``}`; @@ -4376,7 +4376,7 @@ App.Facilities.Nursery.LongChildDescription = function(child, {market = 0, event } } } else if (V.seeRace) { - r += `Ethnically, ${he}'s <span class="tan">${child.race},</span> and ${his} skin is ${child.skin}${child.markings === "freckles" ? ` and lightly ${freckled}${skinToneLevel(child.skin) > 5 && skinToneLevel(child.skin < 10) && child.hColor === "red" ? `, an attractive combination` : ``}` : child.markings === "heavily freckled" ? `and heavily ${freckled}${skinToneLevel(child.skin > 5) && skinToneLevel(child.skin) < 10 && child.hColor === "red" ? `, an attractive combination` : ``}. ` : `. `}`; + r += `Ethnically, ${he}'s <span class="race">${child.race},</span> and ${his} skin is ${child.skin}${child.markings === "freckles" ? ` and lightly ${freckled}${skinToneLevel(child.skin) > 5 && skinToneLevel(child.skin < 10) && child.hColor === "red" ? `, an attractive combination` : ``}` : child.markings === "heavily freckled" ? `and heavily ${freckled}${skinToneLevel(child.skin > 5) && skinToneLevel(child.skin) < 10 && child.hColor === "red" ? `, an attractive combination` : ``}. ` : `. `}`; r += `${child.skin === "sun tanned" || child.skin === "spray tanned" ? `${His} ${skintype} has been tanned ${child.skin === "sun tanned" ? `to a natural, healthy-looking tone` : `with obvious, garish-looking makeup`}. ` : ``}`; diff --git a/src/npc/descriptions/skin.js b/src/npc/descriptions/skin.js index 475efeb2404f2f56e89ba13f20fd58a6f0be0684..fa0473b8e397ffffeb036e211286a7180472ba4e 100644 --- a/src/npc/descriptions/skin.js +++ b/src/npc/descriptions/skin.js @@ -24,16 +24,16 @@ App.Desc.skin = function(slave, descType) { } else if (slave.nationality === "Stateless") { r.push(`${He} has spent so much time in the Free Cities that their statelessness is effectively ${his} nationality; ethnically, ${he}'s`); } else if (slave.nationality === "Zimbabwean" && slave.race === "white") { - r.push(`${He}'s originally <span class="tan">Rhodesian;</span> ethnically, ${he}'s`); + r.push(`${He}'s originally <span class="nationality">Rhodesian;</span> ethnically, ${he}'s`); } else if (slave.nationality === "Vatican") { - r.push(`${He}'s originally <span class="tan">from Vatican City;</span> ethnically, ${he}'s`); + r.push(`${He}'s originally <span class="nationality">from Vatican City;</span> ethnically, ${he}'s`); } else { - r.push(`${He}'s originally <span class="tan">${slave.nationality};</span> ethnically, ${he}'s`); + r.push(`${He}'s originally <span class="tnationalityan">${slave.nationality};</span> ethnically, ${he}'s`); } - r.push(`<span class="tan">${slave.race},</span> and ${his} ${skin} is`); + r.push(`<span class="race">${slave.race},</span> and ${his} ${skin} is`); r.push(...freckles(), ...tanned(), ...changedRace()); } else if (V.seeRace === 1) { - r.push(`Ethnically, ${he}'s <span class="tan">${slave.race},</span> and ${his} ${skin} is`); + r.push(`Ethnically, ${he}'s <span class="race">${slave.race},</span> and ${his} ${skin} is`); r.push(...freckles(), ...tanned(), ...changedRace()); } else { r.push(`${His} ${skin} is`); diff --git a/src/npc/infants/infantSummary.js b/src/npc/infants/infantSummary.js index f7a51076d0d739abf38926d2b6f1cbaafc6b190f..e17f68532a9df9f92742633ea7a2d1f7b02e1122 100644 --- a/src/npc/infants/infantSummary.js +++ b/src/npc/infants/infantSummary.js @@ -102,7 +102,7 @@ App.Facilities.Nursery.InfantSummary = function(child) { let r = ``; if (V.seeRace) { - r += `<span class="tan">`; + r += `<span class="race">`; if (abbreviate.race === 1) { r += shortRace(); @@ -984,7 +984,7 @@ App.Facilities.Nursery.InfantSummary = function(child) { } function longNationality() { - let r = `<span class="tan">`; + let r = `<span class="nationality">`; switch (child.nationality) { case "a Cook Islander":