diff --git a/src/endWeek/economics/persBusiness.js b/src/endWeek/economics/persBusiness.js
index 32f71e4c5872f0506a07173941b8f672143d892d..6695d7f84930e7005412669a493260d4387c303e 100644
--- a/src/endWeek/economics/persBusiness.js
+++ b/src/endWeek/economics/persBusiness.js
@@ -47,7 +47,7 @@ App.EndWeek.personalBusiness = function() {
}
}
if (V.foodMarket) {
- if (V.food < App.Facilities.Farmyard.foodConsumption() && V.cash < App.Facilities.Farmyard.foodConsumption() * V.foodCost) {
+ if (V.food < App.Facilities.Farmyard.foodConsumption() && V.cash < (App.Facilities.Farmyard.foodConsumption() * V.foodCost)) {
r.push(`<span class="red">WARNING: your arcology will starve in the coming week unless action is taken.</span>`);
if (V.foodWarned) {
V.gameover = "starving citizens";
diff --git a/src/endWeek/saSocialEffects.js b/src/endWeek/saSocialEffects.js
index 6e83d548e3e7d8c7f2110060d415b5fd483db84d..d7ac64c90c783fdeb9faa1e6787fa6ed4a81973a 100644
--- a/src/endWeek/saSocialEffects.js
+++ b/src/endWeek/saSocialEffects.js
@@ -186,7 +186,7 @@ App.SlaveAssignment.saSocialEffects = function(slave) {
function repopRacialPregnancy() {
if (V.arcologies[0].FSSubjugationist !== "unset" && (slave.race === V.arcologies[0].FSSubjugationistRace)) {
t.push(new SocialEffect("Repopulationist", 0, "Undesirable race (Subjugationist)",
- `They just wish it wasn't ${V.arcologies[0].FSSubjugationistRace}, of course.`));
+ `They just wish ${he} wasn't ${V.arcologies[0].FSSubjugationistRace}, of course.`));
} else if (V.arcologies[0].FSSupremacist !== "unset" && (slave.race === V.arcologies[0].FSSupremacistRace)) {
t.push(new SocialEffect("Repopulationist", 0, "Desirable race (Supremacist)",
`The fact that ${he} is ${V.arcologies[0].FSSupremacistRace} only makes it better.`));
diff --git a/src/facilities/farmyard/farmyard.js b/src/facilities/farmyard/farmyard.js
index 99f831d25f959ba136e7033c19781d4ad40db551..ffe025ec518e6522ef3092d22ed41b811d1dacba 100644
--- a/src/facilities/farmyard/farmyard.js
+++ b/src/facilities/farmyard/farmyard.js
@@ -484,7 +484,7 @@ App.Facilities.Farmyard.farmyard = class Farmyard extends App.Facilities.Facilit
let canines = '';
if (CL === 1) {
- dogs = `${V.canine[0]}s`;
+ dogs = `${V.canine[0].name}s`;
if (V.canine[0].species === "dog") {
canines = V.canine[0].name;
@@ -545,7 +545,7 @@ App.Facilities.Farmyard.farmyard = class Farmyard extends App.Facilities.Facilit
const HL = V.hooved.length;
const hooved = HL === 1
- ? `${V.hooved[0]}s` : HL < 3
+ ? `${V.hooved[0].name}s` : HL < 3
? `several different types of hooved animals`
: `all kinds of hooved animals`;
@@ -592,7 +592,7 @@ App.Facilities.Farmyard.farmyard = class Farmyard extends App.Facilities.Facilit
let felines = '';
if (FL === 1) {
- cats = `${V.feline[0]}s`;
+ cats = `${V.feline[0].name}s`;
if (V.feline[0].species === "cat") {
felines = V.feline[0].name;
diff --git a/src/facilities/farmyard/food/food.js b/src/facilities/farmyard/food/food.js
index e155534a0788bc930b57701bc0f969f45e641add..a413fe998130a8d5a3c1e023f7b49b490ddab5e0 100644
--- a/src/facilities/farmyard/food/food.js
+++ b/src/facilities/farmyard/food/food.js
@@ -121,8 +121,12 @@ App.Facilities.Farmyard.foodProduction = function() {
/** The total amount of food consumed in a given week. */
App.Facilities.Farmyard.foodConsumption = function() {
function citizenConsumption() {
- return ((V.lowerClass * V.foodRate.lower) + (V.middleClass * V.foodRate.middle) +
- (V.upperClass * V.foodRate.upper) + (V.topClass * V.foodRate.top));
+ return (
+ (V.lowerClass * V.foodRate.lower) +
+ (V.middleClass * V.foodRate.middle) +
+ (V.upperClass * V.foodRate.upper) +
+ (V.topClass * V.foodRate.top)
+ );
}
function slaveConsumption() {
diff --git a/src/personalAssistant/assistantAppearance.js b/src/personalAssistant/assistantAppearance.js
index 0a3c40999fff40118eb8180eeeff4519edb5d512..e713166e86c5b3cec0dcb9fc1afcef2b61a1bae4 100644
--- a/src/personalAssistant/assistantAppearance.js
+++ b/src/personalAssistant/assistantAppearance.js
@@ -38,7 +38,7 @@ globalThis.PersonalAssistantAppearance = function() {
switch (V.assistant.appearance) {
case "monstergirl":
r.push(`${HeA}'s a cute little ${assistantRace()} monster ${girlA} with ${assistantRaceSkin("pale")} skin, perky breasts, green tentacles instead of hair, and two dicks. ${HisA} eyes are large, expressive, and surprisingly innocent.`);
- if (V.assistant.fsOptions) {
+ if (V.assistant.fsOptions && V.assistant.fsAppearance !== "default") {
r.push(FSfunc());
}
if (V.cockFeeder === 1 && paSeed === 1) {
@@ -70,7 +70,7 @@ globalThis.PersonalAssistantAppearance = function() {
break;
case "shemale":
r.push(`${HeA}'s a cute little ${assistantRace()} bimbo shemale with bleached blonde hair, ${assistantRaceSkin("tanned")} skin, huge lips, and ridiculous tits. ${HisA} cock hangs past ${hisA} knees when limp.`);
- if (V.assistant.fsOptions) {
+ if (V.assistant.fsOptions && V.assistant.fsAppearance !== "default") {
r.push(FSfunc());
}
if (V.cockFeeder === 1 && paSeed === 1) {
@@ -108,7 +108,7 @@ globalThis.PersonalAssistantAppearance = function() {
break;
case "amazon":
r.push(`${HeA}'s a cute little ${assistantRace()} amazon`);
- if (V.assistant.fsOptions) {
+ if (V.assistant.fsOptions && V.assistant.fsAppearance !== "default") {
r.push(FSfunc());
} else {
r.push(`with long flowing hair, tribal tattoos, shredded abs, and bone jewelry. ${HeA} has bigger natural tits than anyone that ripped could possibly maintain.`);
@@ -142,7 +142,7 @@ globalThis.PersonalAssistantAppearance = function() {
break;
case "businesswoman":
r.push(`${HeA}'s a cute little ${assistantRace()} business ${womanA}`);
- if (V.assistant.fsOptions) {
+ if (V.assistant.fsOptions && V.assistant.fsAppearance !== "default") {
r.push(FSfunc());
} else {
r.push(`wearing a nice suit, with chopsticks holding ${hisA} silver hair back in a bun. ${HisA} clothes are conservative, but they can't hide ${hisA} generous curves.`);
@@ -176,7 +176,7 @@ globalThis.PersonalAssistantAppearance = function() {
break;
case "goddess":
r.push(`${HeA}'s a cute little ${assistantRace()} fertility goddess,`);
- if (V.assistant.fsOptions) {
+ if (V.assistant.fsOptions && V.assistant.fsAppearance !== "default") {
r.push(FSfunc());
} else {
r.push(`with swollen hips and breasts and a big pregnant belly. ${HeA}'s nude aside from a crown of flowers, ${hisA} modesty protected only by ${hisA} flowing hair.`);
@@ -216,7 +216,7 @@ globalThis.PersonalAssistantAppearance = function() {
break;
case "schoolgirl":
r.push(`${HeA}'s a cute little ${assistantRace()} school ${girlA}`);
- if (V.assistant.fsOptions) {
+ if (V.assistant.fsOptions && V.assistant.fsAppearance !== "default") {
r.push(FSfunc());
} else {
r.push(`wearing a plaid skirt and a white shirt. ${HisA} breasts strain against the material, and ${hisA} skirt is short enough to show off a bit of bottom.`);
@@ -250,7 +250,7 @@ globalThis.PersonalAssistantAppearance = function() {
break;
case "hypergoddess":
r.push(`${HeA}'s a cute "little" ${assistantRace()} fertility goddess, with monstrously wide hips, enormous milky breasts and a room filling belly. ${HisA} overfull stomach bulges and squirms from ${hisA} hundreds of occupants, as well as parts ${hisA} milk swollen breasts to either side.`);
- if (V.assistant.fsOptions) {
+ if (V.assistant.fsOptions && V.assistant.fsAppearance !== "default") {
r.push(FSfunc());
} else {
r.push(`${HeA}'s nude aside from a crown of flowers, ${hisA} modesty protected only by ${hisA} massive belly. Occasionally a stream of liquid pours from ${hisA} crotch along with a healthy baby.`);
@@ -290,7 +290,7 @@ globalThis.PersonalAssistantAppearance = function() {
break;
case "loli":
r.push(`${HeA}'s a cute little ${assistantRace()}`);
- if (V.assistant.fsOptions) {
+ if (V.assistant.fsOptions && V.assistant.fsAppearance !== "default") {
r.push(FSfunc());
} else {
r.push(`${girlA} wearing shorts and a white shirt.`);
@@ -324,7 +324,7 @@ globalThis.PersonalAssistantAppearance = function() {
break;
case "preggololi":
r.push(`${HeA}'s a cute little ${assistantRace()} ${girlA} with a large pregnant`);
- if (V.assistant.fsOptions) {
+ if (V.assistant.fsOptions && V.assistant.fsAppearance !== "default") {
r.push(FSfunc());
} else {
r.push(`belly wearing shorts and a white shirt that rides up ${hisA} growing belly.`);
@@ -358,7 +358,7 @@ globalThis.PersonalAssistantAppearance = function() {
break;
case "fairy":
r.push(`${HeA}'s a cute little`);
- if (V.assistant.fsOptions) {
+ if (V.assistant.fsOptions && V.assistant.fsAppearance !== "default") {
r.push(FSfunc());
} else {
r.push(`fairy wearing ${hisA} birthday suit, with ${hisA} nude form obscured by the light ${heA}'s giving off.`);
@@ -398,7 +398,7 @@ globalThis.PersonalAssistantAppearance = function() {
break;
case "pregnant fairy":
r.push(`${HeA}'s a cute little fairy with a swollen belly`);
- if (V.assistant.fsOptions) {
+ if (V.assistant.fsOptions && V.assistant.fsAppearance !== "default") {
r.push(FSfunc());
} else {
r.push(`wearing ${hisA} birthday suit, with ${hisA} nude form obscured by the light coming from ${hisA} belly. ${HisA} silky golden hair cascades down ${hisA} back.`);
@@ -432,7 +432,7 @@ globalThis.PersonalAssistantAppearance = function() {
break;
case "slimegirl":
r.push(`${HeA}'s a girlish shaped figure, bearing a crimson core, made entirely out of`);
- if (V.assistant.fsOptions) {
+ if (V.assistant.fsOptions && V.assistant.fsAppearance !== "default") {
r.push(FSfunc());
} else {
r.push(`slime.`);
@@ -467,7 +467,7 @@ globalThis.PersonalAssistantAppearance = function() {
r.push(`white`);
}
r.push(`wings as large as ${himA} when they are folded.`);
- if (V.assistant.fsOptions) {
+ if (V.assistant.fsOptions && V.assistant.fsAppearance !== "default") {
r.push(FSfunc());
} else {
r.push(`${HeA} wears a simple white linen dress that, while concealing, shows off ${hisA} pleasant curves.`);
@@ -507,7 +507,7 @@ globalThis.PersonalAssistantAppearance = function() {
r.push(`white`);
}
r.push(`wings.`);
- if (V.assistant.fsOptions) {
+ if (V.assistant.fsOptions && V.assistant.fsAppearance !== "default") {
r.push(FSfunc());
} else {
r.push(`${HeA} wears a simple white linen dress with a short skirt that frequently lets you catch glimpses of ${hisA} panties.`);
@@ -541,7 +541,7 @@ globalThis.PersonalAssistantAppearance = function() {
break;
case "imp":
r.push(`${HeA}'s a cute little ${assistantRace()} imp with black hair and comically tiny bat-like wings.`);
- if (V.assistant.fsOptions) {
+ if (V.assistant.fsOptions && V.assistant.fsAppearance !== "default") {
r.push(FSfunc());
} else {
r.push(`${HeA} wears only a belt, tightly bound, over ${hisA} tiny breasts and a simple loincloth over ${hisA} crotch, leaving most of ${hisA} body in plain, but arousing, sight.`);
@@ -575,7 +575,7 @@ globalThis.PersonalAssistantAppearance = function() {
break;
case "witch":
r.push(`${HeA}'s a cute little ${assistantRace()} witch with thin, flowing robes and a wide brimmed, if rather stereotypical, witch's hat.`);
- if (V.assistant.fsOptions) {
+ if (V.assistant.fsOptions && V.assistant.fsAppearance !== "default") {
r.push(FSfunc());
} else {
r.push(`${HeA} frequently carries a tome of new and erotic spells.`);
@@ -615,7 +615,7 @@ globalThis.PersonalAssistantAppearance = function() {
break;
case "ERROR_1606_APPEARANCE_FILE_CORRUPT":
r.push(`${HeA}'s an odd little ${girlA}, with slightly off mannerisms,`);
- if (V.assistant.fsOptions) {
+ if (V.assistant.fsOptions && V.assistant.fsAppearance !== "default") {
r.push(FSfunc());
} else {
r.push(`wearing absolutely nothing. ${HeA} periodically twitches when you aren't looking and you swear you see movement under ${hisA} skin.`);
@@ -649,7 +649,7 @@ globalThis.PersonalAssistantAppearance = function() {
break;
case "incubus":
r.push(`${HeA}'s a handsome little sex demon with a big dick and heavy balls.`);
- if (V.assistant.fsOptions) {
+ if (V.assistant.fsOptions && V.assistant.fsAppearance !== "default") {
r.push(FSfunc());
} else {
r.push(`${HeA} enjoys wearing absolutely nothing but an enormous hard-on. ${HeA} frequently, and openly, masturbates to your naked body.`);
@@ -783,7 +783,7 @@ globalThis.PersonalAssistantAppearance = function() {
break;
case "succubus":
r.push(`${HeA}'s a beautiful little sex demoness with an ideal figure.`);
- if (V.assistant.fsOptions) {
+ if (V.assistant.fsOptions && V.assistant.fsAppearance !== "default") {
r.push(FSfunc());
} else {
r.push(`${HeA} enjoys using a tight strip of leather to support ${hisA} ample bosom and a minuscule thong to cover ${hisA} crotch. ${HeA} commonly strikes sexy poses, ${hisA} spaded tail wrapping around ${hisA} legs seductively, hoping to catch ${hisA} ${properMaster()}'s eye.`);
diff --git a/src/personalAssistant/assistantOptions.js b/src/personalAssistant/assistantOptions.js
index 9c8be5465dcd7452fc7b705ac6c49770c2bcd689..21211544daa5c96cd76cb28f9a73609ea50832d2 100644
--- a/src/personalAssistant/assistantOptions.js
+++ b/src/personalAssistant/assistantOptions.js
@@ -295,7 +295,10 @@ App.UI.personalAssistantOptions = function() {
function makeFSlink(selection) {
const link = App.UI.DOM.link(
selection,
- () => V.assistant.fsAppearance = selection
+ () => {
+ V.assistant.fsAppearance = selection;
+ App.UI.reload();
+ }
);
link.style.textTransform = "capitalize";
linkArray.push(link);