diff --git a/src/facilities/nursery/widgets/infants/infantSummary.js b/src/facilities/nursery/widgets/infants/infantSummary.js
index 56768d5cb8a6c6ba3d2388015db3f541bfc76d41..24f3a36477eba695c9b09cc391449861933f18d0 100644
--- a/src/facilities/nursery/widgets/infants/infantSummary.js
+++ b/src/facilities/nursery/widgets/infants/infantSummary.js
@@ -59,9 +59,9 @@ App.Facilities.Nursery.InfantSummary = function(child) {
// function health() {
// if (abbreviate.health === 1) {
- // return shortHealth(child);
+ // return shortHealth();
// } else if (abbreviate.health === 2) {
- // return longHealth(child);
+ // return longHealth();
// }
// }
@@ -108,9 +108,9 @@ App.Facilities.Nursery.InfantSummary = function(child) {
r += `<span class="tan">`;
if (abbreviate.race === 1) {
- r += shortRace(child);
+ r += shortRace();
} else if (abbreviate.race === 2) {
- r += longRace(child);
+ r += longRace();
}
r += `</span> `;
}
@@ -120,73 +120,73 @@ App.Facilities.Nursery.InfantSummary = function(child) {
function nationality() {
if (abbreviate.nationality === 1) {
- return shortNationality(child);
+ return shortNationality();
} else if (abbreviate.nationality === 2) {
- return longNationality(child);
+ return longNationality();
}
}
function skin() {
if (abbreviate.physicals === 1) {
- return shortSkin(child);
+ return shortSkin();
} else {
- return `<span class="pink">${child.skin.charAt(0).toUpperCase() + child.skin.slice(1)} skin.</span> `;
+ return longSkin();
}
}
function age() {
if (abbreviate.physicals === 1) {
- return shortAge(child);
+ return shortAge();
} else if (abbreviate.physicals === 2) {
- return longAge(child);
+ return longAge();
}
}
function face() {
if (abbreviate.physicals === 1) {
- return shortFace(child);
+ return shortFace();
} else if (abbreviate.physicals === 2) {
- return longFace(child);
+ return longFace();
}
}
function intelligence() {
if (abbreviate.skills === 1) {
- return shortIntelligence(child);
+ return shortIntelligence();
} else if (abbreviate.skills === 2) {
- return longIntelligence(child);
+ return longIntelligence();
}
}
function prestige() {
if (abbreviate.skills === 1) {
- return shortPrestige(child);
+ return shortPrestige();
} else if (abbreviate.skills === 2) {
- return longPrestige(child);
+ return longPrestige();
}
}
function pornPrestige() {
if (abbreviate.skills === 1) {
- return shortPornPrestige(child);
+ return shortPornPrestige();
} else if (abbreviate.skills === 2) {
- return longPornPrestige(child);
+ return longPornPrestige();
}
}
function behavioralFlaw() {
if (abbreviate.mental === 1) {
- return shortBehaviorFlaw(child);
+ return shortBehaviorFlaw();
} else if (abbreviate.mental === 2) {
- return longBehaviorFlaw(child);
+ return longBehaviorFlaw();
}
}
function sexualFlaw() {
if (abbreviate.mental === 1) {
- return shortSexFlaw(child);
+ return shortSexFlaw();
} else if (abbreviate.mental === 2) {
- return longSexFlaw(child);
+ return longSexFlaw();
}
}
@@ -195,20 +195,20 @@ App.Facilities.Nursery.InfantSummary = function(child) {
let r = ``;
r += `<span class="lightgreen">`;
- shortExtendedFamily(child);
+ shortExtendedFamily();
r += `</span> `;
return r;
} else if (abbreviate.mental === 2) {
- return longExtendedFamily(child);
+ return longExtendedFamily();
}
}
function rival() {
if (abbreviate.mental === 1) {
- return shortRival(child);
+ return shortRival();
} else if (abbreviate.mental === 2) {
- return longRival(child);
+ return longRival();
}
}
@@ -227,7 +227,7 @@ App.Facilities.Nursery.InfantSummary = function(child) {
// /** TODO: add health to infants
- // function shortHealth(child) {
+ // function shortHealth() {
// if (child.health.condition < -20) {
// r += `<strong><span class="red">H ${V.summaryStats ? `[${child.health.condition}]` : ''}</span></strong> `;
// } else if (child.health.condition <= 20) {
@@ -238,7 +238,7 @@ App.Facilities.Nursery.InfantSummary = function(child) {
// r += " ";
// }
- // function longHealth(child) {
+ // function longHealth() {
// if (child.health.condition < -90) {
// r += `<span class="red">On the edge of death ${V.summaryStats ? `[${child.health.condition}]` : ''}.</span> `;
// } else if (child.health.condition < -50) {
@@ -257,7 +257,7 @@ App.Facilities.Nursery.InfantSummary = function(child) {
// r += " ";
// }
- function shortRace(child) {
+ function shortRace() {
let r = ``;
switch (child.race) {
@@ -305,7 +305,7 @@ App.Facilities.Nursery.InfantSummary = function(child) {
return r;
}
- function longRace(child) {
+ function longRace() {
let r = ``;
switch (child.race) {
@@ -353,7 +353,7 @@ App.Facilities.Nursery.InfantSummary = function(child) {
return r;
}
- function shortNationality(child) {
+ function shortNationality() {
let r = `<span class="tan">`;
switch (child.nationality) {
@@ -1031,7 +1031,7 @@ App.Facilities.Nursery.InfantSummary = function(child) {
return r;
}
- function longNationality(child) {
+ function longNationality() {
let r = `<span class="tan">`;
switch (child.nationality) {
@@ -1070,8 +1070,9 @@ App.Facilities.Nursery.InfantSummary = function(child) {
return r;
}
- function shortSkin(child) {
+ function shortSkin() {
let r = `<span class="pink">`;
+
switch (child.skin) {
case "pure white":
r += `P. Whi`;
@@ -1132,7 +1133,11 @@ App.Facilities.Nursery.InfantSummary = function(child) {
return r;
}
- function shortAge(child) {
+ function longSkin() {
+ return `<span class="pink">${child.skin.charAt(0).toUpperCase() + child.skin.slice(1)} skin.</span> `;
+ }
+
+ function shortAge() {
let r = `<span class="pink">`;
if (V.showAgeDetail === 1) {
@@ -1154,29 +1159,7 @@ App.Facilities.Nursery.InfantSummary = function(child) {
return r;
}
- function shortFace(child) {
- let r = ``;
-
- if (child.face < -95) {
- r += `<span class="red">Face---${V.summaryStats ? `[${child.face}]` : ''}</span> `;
- } else if (child.face < -40) {
- r += `<span class="red">Face--${V.summaryStats ? `[${child.face}]` : ''}</span> `;
- } else if (child.face < -10) {
- r += `<span class="red">Face-${V.summaryStats ? `[${child.face}]` : ''}</span> `;
- } else if (child.face <= 10) {
- r += `Face${V.summaryStats ? `[${child.face}]` : ''}`;
- } else if (child.face <= 40) {
- r += `<span class="pink">Face+${V.summaryStats ? `[${child.face}]` : ''}</span> `;
- } else if (child.face <= 95) {
- r += `<span class="pink">Face++${V.summaryStats ? `[${child.face}]` : ''}</span> `;
- } else {
- r += `<span class="pink">Face+++${V.summaryStats ? `[${child.face}]` : ''}</span> `;
- }
-
- return r;
- }
-
- function longAge(child) {
+ function longAge() {
let r = `<span class="pink">`;
if (V.showAgeDetail) {
@@ -1203,7 +1186,29 @@ App.Facilities.Nursery.InfantSummary = function(child) {
return r;
}
- function longFace(child) {
+ function shortFace() {
+ let r = ``;
+
+ if (child.face < -95) {
+ r += `<span class="red">Face---${V.summaryStats ? `[${child.face}]` : ''}</span> `;
+ } else if (child.face < -40) {
+ r += `<span class="red">Face--${V.summaryStats ? `[${child.face}]` : ''}</span> `;
+ } else if (child.face < -10) {
+ r += `<span class="red">Face-${V.summaryStats ? `[${child.face}]` : ''}</span> `;
+ } else if (child.face <= 10) {
+ r += `Face${V.summaryStats ? `[${child.face}]` : ''}`;
+ } else if (child.face <= 40) {
+ r += `<span class="pink">Face+${V.summaryStats ? `[${child.face}]` : ''}</span> `;
+ } else if (child.face <= 95) {
+ r += `<span class="pink">Face++${V.summaryStats ? `[${child.face}]` : ''}</span> `;
+ } else {
+ r += `<span class="pink">Face+++${V.summaryStats ? `[${child.face}]` : ''}</span> `;
+ }
+
+ return r;
+ }
+
+ function longFace() {
let r = `Likely to have `;
if (child.face < -95) {
@@ -1226,7 +1231,7 @@ App.Facilities.Nursery.InfantSummary = function(child) {
return r;
}
- function shortIntelligence(child) {
+ function shortIntelligence() {
let
intelligence = child.intelligence,
r = ``;
@@ -1292,37 +1297,7 @@ App.Facilities.Nursery.InfantSummary = function(child) {
return r;
}
- function shortPrestige(child) {
- let r = `<span class="green">`;
-
- if (child.prestige > 2) {
- r += `Prest++`;
- } else if (child.prestige === 2) {
- r += `Prest+`;
- } else if (child.prestige === 1) {
- r += `Prest`;
- }
- r += `</span> `;
-
- return r;
- }
-
- function shortPornPrestige(child) {
- let r = `<span class="green">`;
-
- if (child.pornPrestige > 2) {
- r += `PPrest++`;
- } else if (child.pornPrestige === 2) {
- r += `PPrest+`;
- } else if (child.pornPrestige === 1) {
- r += `PPrest`;
- }
- r += `</span> `;
-
- return r;
- }
-
- function longIntelligence(child) {
+ function longIntelligence() {
let
intelligence = child.intelligence,
r = ``;
@@ -1350,7 +1325,22 @@ App.Facilities.Nursery.InfantSummary = function(child) {
return r;
}
- function longPrestige(child) {
+ function shortPrestige() {
+ let r = `<span class="green">`;
+
+ if (child.prestige > 2) {
+ r += `Prest++`;
+ } else if (child.prestige === 2) {
+ r += `Prest+`;
+ } else if (child.prestige === 1) {
+ r += `Prest`;
+ }
+ r += `</span> `;
+
+ return r;
+ }
+
+ function longPrestige() {
let r = `<span class="green">`;
if (child.prestige > 2) {
@@ -1365,7 +1355,22 @@ App.Facilities.Nursery.InfantSummary = function(child) {
return r;
}
- function longPornPrestige(child) {
+ function shortPornPrestige() {
+ let r = `<span class="green">`;
+
+ if (child.pornPrestige > 2) {
+ r += `PPrest++`;
+ } else if (child.pornPrestige === 2) {
+ r += `PPrest+`;
+ } else if (child.pornPrestige === 1) {
+ r += `PPrest`;
+ }
+ r += `</span> `;
+
+ return r;
+ }
+
+ function longPornPrestige() {
let r = `<span class="green">`;
if (child.pornPrestige > 2) {
@@ -1380,7 +1385,7 @@ App.Facilities.Nursery.InfantSummary = function(child) {
return r;
}
- function shortBehaviorFlaw(child) {
+ function shortBehaviorFlaw() {
let r = `<span class="red">`;
switch (child.behavioralFlaw) {
@@ -1420,7 +1425,47 @@ App.Facilities.Nursery.InfantSummary = function(child) {
return r;
}
- function shortSexFlaw(child) {
+ function longBehaviorFlaw() {
+ let r = `<span class="red">`;
+
+ switch (child.behavioralFlaw) {
+ case "arrogant":
+ r += `Arrogant. `;
+ break;
+ case "bitchy":
+ r += `Bitchy. `;
+ break;
+ case "odd":
+ r += `Odd. `;
+ break;
+ case "hates men":
+ r += `Hates men. `;
+ break;
+ case "hates women":
+ r += `Hates women. `;
+ break;
+ case "gluttonous":
+ r += `Stress eater. `;
+ break;
+ case "anorexic":
+ r += `Anorexic. `;
+ break;
+ case "devout":
+ r += `Devoutly religious. `;
+ break;
+ case "liberated":
+ r += `Mentally liberated. `;
+ break;
+ default:
+ child.behavioralFlaw = "none";
+ break;
+ }
+ r += `</span> `;
+
+ return r;
+ }
+
+ function shortSexFlaw() {
let r = ``;
switch (child.sexualFlaw) {
@@ -1486,47 +1531,7 @@ App.Facilities.Nursery.InfantSummary = function(child) {
return r;
}
- function longBehaviorFlaw(child) {
- let r = `<span class="red">`;
-
- switch (child.behavioralFlaw) {
- case "arrogant":
- r += `Arrogant. `;
- break;
- case "bitchy":
- r += `Bitchy. `;
- break;
- case "odd":
- r += `Odd. `;
- break;
- case "hates men":
- r += `Hates men. `;
- break;
- case "hates women":
- r += `Hates women. `;
- break;
- case "gluttonous":
- r += `Stress eater. `;
- break;
- case "anorexic":
- r += `Anorexic. `;
- break;
- case "devout":
- r += `Devoutly religious. `;
- break;
- case "liberated":
- r += `Mentally liberated. `;
- break;
- default:
- child.behavioralFlaw = "none";
- break;
- }
- r += `</span> `;
-
- return r;
- }
-
- function longSexFlaw(child) {
+ function longSexFlaw() {
let r = ``;
switch (child.sexualFlaw) {
@@ -1592,7 +1597,7 @@ App.Facilities.Nursery.InfantSummary = function(child) {
return r;
}
- function shortExtendedFamily(child) {
+ function shortExtendedFamily() {
let
handled = 0,
r = ``;
@@ -1711,31 +1716,7 @@ App.Facilities.Nursery.InfantSummary = function(child) {
return r;
}
- function shortRival(child) {
- let r = ``;
-
- if (child.rivalry !== 0) {
- r += ` `;
- const _ssj = V.slaves.findIndex(function(s) {
- return s.ID === child.rivalryTarget;
- });
- if (_ssj !== -1) {
- r += `<span class="lightsalmon">`;
- if (child.rivalry <= 1) {
- r += `Disl ${SlaveFullName(V.slaves[_ssj])}`;
- } else if (child.rivalry <= 2) {
- r += `${SlaveFullName(V.slaves[_ssj])}'s rival`;
- } else {
- r += `Hates ${SlaveFullName(V.slaves[_ssj])}`;
- }
- r += `</span> `;
- }
- }
-
- return r;
- }
-
- function longExtendedFamily(child) {
+ function longExtendedFamily() {
let
handled = 0,
r = ``;
@@ -1869,7 +1850,31 @@ App.Facilities.Nursery.InfantSummary = function(child) {
return r;
}
- function longRival(child) {
+ function shortRival() {
+ let r = ``;
+
+ if (child.rivalry !== 0) {
+ r += ` `;
+ const _ssj = V.slaves.findIndex(function (s) {
+ return s.ID === child.rivalryTarget;
+ });
+ if (_ssj !== -1) {
+ r += `<span class="lightsalmon">`;
+ if (child.rivalry <= 1) {
+ r += `Disl ${SlaveFullName(V.slaves[_ssj])}`;
+ } else if (child.rivalry <= 2) {
+ r += `${SlaveFullName(V.slaves[_ssj])}'s rival`;
+ } else {
+ r += `Hates ${SlaveFullName(V.slaves[_ssj])}`;
+ }
+ r += `</span> `;
+ }
+ }
+
+ return r;
+ }
+
+ function longRival() {
let r = ``;
if (child.rivalry !== 0) {
@@ -1893,5 +1898,5 @@ App.Facilities.Nursery.InfantSummary = function(child) {
return r;
}
- return InfantSummaryUncached(child);
+ return InfantSummaryUncached();
};