diff --git a/src/art/assistantArt.js b/src/art/assistantArt.js
index 1b8b1175ce1d15172092b0c9335f72a6bf931862..9588a5dcfdb7330c280e0a90acc7373966577683 100644
--- a/src/art/assistantArt.js
+++ b/src/art/assistantArt.js
@@ -8,7 +8,7 @@ window.assistantArt = function assistantArt(sizePlacement) {
const V = State.variables;
let fileName = "";
- if (V.seeAvatar !== 1) {return;}
+ if (V.seeAvatar !== 1) { return; }
if (V.imageChoice === 0 || V.imageChoice === 1) {
if (V.imageChoice === 1) {
diff --git a/src/art/vector_revamp/vectorRevampedArtControl.js b/src/art/vector_revamp/vectorRevampedArtControl.js
index cd88ec52e2bbb7e562cdd0355f8cd7f706cab5b8..ac04a40c9e17caa7be2b7a3e8dd94e5f15e5f84c 100644
--- a/src/art/vector_revamp/vectorRevampedArtControl.js
+++ b/src/art/vector_revamp/vectorRevampedArtControl.js
@@ -34,26 +34,24 @@ class ArtStyleEntry {
this.name = name;
}
- toString()
- {
+ toString() {
let keys = Object.keys(this);
let styleArray = [];
- if (keys !== null && keys !== undefined)
- {
+ if (keys !== null && keys !== undefined) {
let styleObj = this;
keys.forEach(function(key) {
- if(key !== "name") {
+ if (key !== "name") {
let value = styleObj[key];
- styleArray.push(key + ":" + value);
+ styleArray.push(`${key}:${value}`);
}
});
- let styleValue = styleArray.join(";") + ";";
+ let styleValue = `${styleArray.join(";")};`;
- let cssDef = "{ " + styleValue + " }"; // not sure if there should be padding here
+ let cssDef = `{ ${styleValue} }`; // not sure if there should be padding here
if (this.name.length > 0)
- cssDef = "." + this.name + cssDef;
+ cssDef = `.${this.name}${cssDef}`;
return cssDef;
}
@@ -78,8 +76,7 @@ class ArtStyleControl {
let lipsColor = this.lips.fill;
let lipsOpacity = this.lips["fill-opacity"];
- switch(this.artSlave.makeup)
- {
+ switch (this.artSlave.makeup) {
case 1:
// Nice
lipsColor = "#ff69b4";
@@ -145,8 +142,7 @@ class ArtStyleControl {
let eyeLens = eyeColorSplit[0];
- switch(eyeLens)
- {
+ switch (eyeLens) {
case "demonic":
this.eyeball.fill = this.iris.fill;
break;
@@ -371,9 +367,9 @@ class ArtStyleControl {
let artDisplayClass = this.artDisplayClass;
- stylesValues.push("." + artDisplayClass + " " + mainStyle.toString());
+ stylesValues.push(`.${artDisplayClass} ${mainStyle.toString()}`);
this.styles.forEach(function(style) {
- stylesValues.push("." + artDisplayClass + " " + style.toString());
+ stylesValues.push(`.${artDisplayClass} ${style.toString()}`);
});
return stylesValues.join(" ");
@@ -396,23 +392,23 @@ class ClothingControl {
showHeadHighlight: true
},
styleSettings: {
- skin: { fill: defaultOutfitColor },
- arm: { fill: defaultOutfitColor },
- penis: { fill: defaultOutfitColor },
- legsSkin: { fill: defaultOutfitColor },
- feetSkin: { fill: defaultOutfitColor },
- torso: { fill: defaultOutfitColor },
- buttSkin: { fill: defaultOutfitColor },
- head: { fill: defaultOutfitColor },
- neckSkin: { fill: defaultOutfitColor },
- boob: { fill: defaultOutfitColor },
- areola: { fill: areolaColor },
- labia: { fill: areolaColor },
- bellySkin: { fill: defaultOutfitColor },
- bellyUpperSkin: { fill: defaultOutfitColor },
- shoe: { fill: defaultOutfitColor },
- labiaSkin: { fill: defaultOutfitColor },
- lips: { fill: areolaColor }
+ skin: {fill: defaultOutfitColor},
+ arm: {fill: defaultOutfitColor},
+ penis: {fill: defaultOutfitColor},
+ legsSkin: {fill: defaultOutfitColor},
+ feetSkin: {fill: defaultOutfitColor},
+ torso: {fill: defaultOutfitColor},
+ buttSkin: {fill: defaultOutfitColor},
+ head: {fill: defaultOutfitColor},
+ neckSkin: {fill: defaultOutfitColor},
+ boob: {fill: defaultOutfitColor},
+ areola: {fill: areolaColor},
+ labia: {fill: areolaColor},
+ bellySkin: {fill: defaultOutfitColor},
+ bellyUpperSkin: {fill: defaultOutfitColor},
+ shoe: {fill: defaultOutfitColor},
+ labiaSkin: {fill: defaultOutfitColor},
+ lips: {fill: areolaColor}
}
};
}
@@ -429,9 +425,9 @@ class ClothingControl {
showNipplesPiercings: false
},
styleSettings: {
- bellySkin: { fill: "#FFFFFF" },
- bellyUpperSkin: { fill: "#FFFFFF" },
- bellyDetails: { "fill-opacity": 0 }
+ bellySkin: {fill: "#FFFFFF"},
+ bellyUpperSkin: {fill: "#FFFFFF"},
+ bellyDetails: {"fill-opacity": 0}
}
};
}
@@ -442,8 +438,8 @@ class ClothingControl {
showBellyPiercings: false
},
styleSettings: {
- bellySkin: { fill: "#FFFFFF" },
- bellyDetails: { "fill-opacity": 0 }
+ bellySkin: {fill: "#FFFFFF"},
+ bellyDetails: {"fill-opacity": 0}
}
};
}
@@ -465,17 +461,17 @@ class ClothingControl {
showBellyPiercings: false
},
styleSettings: {
- skin: { fill: defaultOutfitColor },
- arm: { fill: defaultOutfitColor },
- legsSkin: { fill: defaultOutfitColor },
- feetSkin: { fill: defaultOutfitColor },
- torso: { fill: defaultOutfitColor },
- buttSkin: { fill: defaultOutfitColor },
- head: { fill: defaultOutfitColor },
- neckSkin: { fill: defaultOutfitColor },
- bellySkin: { fill: defaultOutfitColor },
- bellyUpperSkin: { fill: defaultOutfitColor },
- shoe: { fill: defaultOutfitColor }
+ skin: {fill: defaultOutfitColor},
+ arm: {fill: defaultOutfitColor},
+ legsSkin: {fill: defaultOutfitColor},
+ feetSkin: {fill: defaultOutfitColor},
+ torso: {fill: defaultOutfitColor},
+ buttSkin: {fill: defaultOutfitColor},
+ head: {fill: defaultOutfitColor},
+ neckSkin: {fill: defaultOutfitColor},
+ bellySkin: {fill: defaultOutfitColor},
+ bellyUpperSkin: {fill: defaultOutfitColor},
+ shoe: {fill: defaultOutfitColor}
}
};
}
@@ -497,23 +493,23 @@ class ClothingControl {
showNipplesPiercings: false
},
styleSettings: {
- skin: { fill: defaultOutfitColor },
- scrotum: { fill: defaultOutfitColor },
- arm: { fill: defaultOutfitColor },
- penis: { fill: defaultOutfitColor },
- legsSkin: { fill: defaultOutfitColor },
- feetSkin: { fill: defaultOutfitColor },
- torso: { fill: defaultOutfitColor },
- buttSkin: { fill: defaultOutfitColor },
-
- neckSkin: { fill: defaultOutfitColor },
- boob: { fill: defaultOutfitColor },
- areola: { fill: areolaColor },
- labia: { fill: areolaColor },
- bellySkin: { fill: defaultOutfitColor },
- bellyUpperSkin: { fill: defaultOutfitColor },
- shoe: { fill: defaultOutfitColor },
- labiaSkin: { fill: defaultOutfitColor }
+ skin: {fill: defaultOutfitColor},
+ scrotum: {fill: defaultOutfitColor},
+ arm: {fill: defaultOutfitColor},
+ penis: {fill: defaultOutfitColor},
+ legsSkin: {fill: defaultOutfitColor},
+ feetSkin: {fill: defaultOutfitColor},
+ torso: {fill: defaultOutfitColor},
+ buttSkin: {fill: defaultOutfitColor},
+
+ neckSkin: {fill: defaultOutfitColor},
+ boob: {fill: defaultOutfitColor},
+ areola: {fill: areolaColor},
+ labia: {fill: areolaColor},
+ bellySkin: {fill: defaultOutfitColor},
+ bellyUpperSkin: {fill: defaultOutfitColor},
+ shoe: {fill: defaultOutfitColor},
+ labiaSkin: {fill: defaultOutfitColor}
}
};
}
@@ -524,7 +520,7 @@ class ClothingControl {
showLegHighlight: true,
showTorsoHighlight: true,
showBoobsHighlight: true,
- showHeadHighlight:true,
+ showHeadHighlight: true,
},
styleSettings: {
@@ -545,21 +541,21 @@ class ClothingControl {
showNipplesPiercings: false
},
styleSettings: {
- skin: { fill: defaultOutfitColor },
- scrotum: { fill: defaultOutfitColor },
- arm: { fill: defaultOutfitColor },
- penis: { fill: defaultOutfitColor },
- legsSkin: { fill: defaultOutfitColor },
- feetSkin: { fill: defaultOutfitColor },
- torso: { fill: defaultOutfitColor },
- buttSkin: { fill: defaultOutfitColor },
- boob: { fill: defaultOutfitColor },
- areola: { fill: defaultOutfitColor },
- bellySkin: { fill: defaultOutfitColor },
- bellyUpperSkin: { fill: defaultOutfitColor },
- shoe: { fill: defaultOutfitColor },
- muscleTone: { "fill-opacity": 0 },
- bellyDetails: { "fill-opacity": 0 }
+ skin: {fill: defaultOutfitColor},
+ scrotum: {fill: defaultOutfitColor},
+ arm: {fill: defaultOutfitColor},
+ penis: {fill: defaultOutfitColor},
+ legsSkin: {fill: defaultOutfitColor},
+ feetSkin: {fill: defaultOutfitColor},
+ torso: {fill: defaultOutfitColor},
+ buttSkin: {fill: defaultOutfitColor},
+ boob: {fill: defaultOutfitColor},
+ areola: {fill: defaultOutfitColor},
+ bellySkin: {fill: defaultOutfitColor},
+ bellyUpperSkin: {fill: defaultOutfitColor},
+ shoe: {fill: defaultOutfitColor},
+ muscleTone: {"fill-opacity": 0},
+ bellyDetails: {"fill-opacity": 0}
}
};
}
@@ -578,16 +574,16 @@ class ClothingControl {
showNipples: false
},
styleSettings: {
- skin: { fill: defaultOutfitColor },
- scrotum: { fill: defaultOutfitColor },
- penis: { fill: defaultOutfitColor },
- torso: { fill: defaultOutfitColor },
- boob: { fill: defaultOutfitColor },
- areola: { fill: defaultOutfitColor },
- bellySkin: { fill: defaultOutfitColor },
- bellyUpperSkin: { fill: defaultOutfitColor },
- muscleTone: { "fill-opacity": 0 },
- bellyDetails: { "fill-opacity": 0 }
+ skin: {fill: defaultOutfitColor},
+ scrotum: {fill: defaultOutfitColor},
+ penis: {fill: defaultOutfitColor},
+ torso: {fill: defaultOutfitColor},
+ boob: {fill: defaultOutfitColor},
+ areola: {fill: defaultOutfitColor},
+ bellySkin: {fill: defaultOutfitColor},
+ bellyUpperSkin: {fill: defaultOutfitColor},
+ muscleTone: {"fill-opacity": 0},
+ bellyDetails: {"fill-opacity": 0}
}
};
}
@@ -638,23 +634,20 @@ class RevampedArtControl {
this.pubicTattooText = "";
let clothing = this.getClothing();
- if (clothing !== null)
- {
+ if (clothing !== null) {
if (clothing.bodySettings !== null)
this.applyClothingSettings(clothing.bodySettings);
if (clothing.styleSettings !== null)
this.applyClothingStyleSettings(clothing.styleSettings);
}
- if (!globalShowHighlights)
- {
+ if (!globalShowHighlights) {
this.showLegHighlight = false;
this.showTorsoHighlight = false;
this.showBoobsHighlight = false;
this.showHeadHighlight = false;
}
- if (!globalShowBodyMods)
- {
+ if (!globalShowBodyMods) {
this.showPussyPiercings = false;
this.showBellyPiercings = false;
this.showPenisPiercings = false;
@@ -685,7 +678,7 @@ class RevampedArtControl {
if (this.artSlave.fuckdoll > 0)
return this.clothingControl.fuckdoll;
let clothing = null;
- switch(this.artSlave.clothes) {
+ switch (this.artSlave.clothes) {
case "a nice maid outfit":
clothing = this.clothingControl.niceMaid;
break;
@@ -729,11 +722,9 @@ class RevampedArtControl {
if (this.artSlave.waist < -40) {
torsoSize = this.artSlave.weight > 30 ? "Hourglass" : "Unnatural";
- }
- else if (this.artSlave.waist <= 10) {
+ } else if (this.artSlave.waist <= 10) {
torsoSize = this.artSlave.weight > 30 ? "Normal" : "Hourglass";
- }
- else {
+ } else {
torsoSize = "Normal";
}
@@ -745,17 +736,13 @@ class RevampedArtControl {
if (this.artSlave.devotion > 50) {
leftArmType = "High";
- }
- else if (this.artSlave.trust >= -20) {
+ } else if (this.artSlave.trust >= -20) {
if (this.artSlave.devotion <= 20) {
leftArmType = "Low";
- }
- else
- {
+ } else {
leftArmType = "Mid";
}
- }
- else {
+ } else {
leftArmType = "Mid";
}
@@ -767,17 +754,13 @@ class RevampedArtControl {
if (this.artSlave.devotion > 50) {
rightArmType = "High";
- }
- else if (this.artSlave.trust >= -20) {
+ } else if (this.artSlave.trust >= -20) {
if (this.artSlave.devotion <= 20) {
rightArmType = "Low";
- }
- else
- {
+ } else {
rightArmType = "High";
}
- }
- else {
+ } else {
rightArmType = "Mid";
}
@@ -819,47 +802,46 @@ class RevampedArtControl {
if (this.artSlave.hLength === 0)
return result;
- switch(this.artSlave.hStyle)
- {
+ switch (this.artSlave.hStyle) {
case "neat":
- result.push("Art_Vector_Revamp_Hair_Back_Neat_" + this.hairLength);
+ result.push(`Art_Vector_Revamp_Hair_Back_Neat_${this.hairLength}`);
break;
case "bun":
case "up":
- result.push("Art_Vector_Revamp_Hair_Back_Bun_" + this.hairLength);
+ result.push(`Art_Vector_Revamp_Hair_Back_Bun_${this.hairLength}`);
break;
case "tails":
- result.push("Art_Vector_Revamp_Hair_Back_Tails_" + this.hairLength);
+ result.push(`Art_Vector_Revamp_Hair_Back_Tails_${this.hairLength}`);
break;
case "ponytail":
- result.push("Art_Vector_Revamp_Hair_Back_Ponytail_" + this.hairLength);
+ result.push(`Art_Vector_Revamp_Hair_Back_Ponytail_${this.hairLength}`);
break;
case "braided":
- result.push("Art_Vector_Revamp_Hair_Back_Braids_" + this.hairLength);
+ result.push(`Art_Vector_Revamp_Hair_Back_Braids_${this.hairLength}`);
break;
case "curled":
- result.push("Art_Vector_Revamp_Hair_Back_Curled_" + this.hairLength);
+ result.push(`Art_Vector_Revamp_Hair_Back_Curled_${this.hairLength}`);
break;
case "cornrows":
- result.push("Art_Vector_Revamp_Hair_Back_Cornrows_" + this.hairLength);
+ result.push(`Art_Vector_Revamp_Hair_Back_Cornrows_${this.hairLength}`);
break;
case "strip":
- result.push("Art_Vector_Revamp_Hair_Back_Shaved_Sides_" + this.hairLength);
+ result.push(`Art_Vector_Revamp_Hair_Back_Shaved_Sides_${this.hairLength}`);
break;
case "luxurious":
- result.push("Art_Vector_Revamp_Hair_Back_Luxurious_" + this.hairLength);
+ result.push(`Art_Vector_Revamp_Hair_Back_Luxurious_${this.hairLength}`);
break;
case "afro":
- result.push("Art_Vector_Revamp_Hair_Back_Afro_" + this.hairLength);
+ result.push(`Art_Vector_Revamp_Hair_Back_Afro_${this.hairLength}`);
break;
case "permed":
- result.push("Art_Vector_Revamp_Hair_Back_Permed_" + this.hairLength);
+ result.push(`Art_Vector_Revamp_Hair_Back_Permed_${this.hairLength}`);
break;
case "dreadlocks":
- result.push("Art_Vector_Revamp_Hair_Back_Dreadlocks_" + this.hairLength);
+ result.push(`Art_Vector_Revamp_Hair_Back_Dreadlocks_${this.hairLength}`);
break;
default:
- result.push("Art_Vector_Revamp_Hair_Back_Messy_" + this.hairLength);
+ result.push(`Art_Vector_Revamp_Hair_Back_Messy_${this.hairLength}`);
}
return result;
@@ -873,16 +855,13 @@ class RevampedArtControl {
if (this.artSlave.amp === 1) {
result.push("Art_Vector_Revamp_Arm_Stump");
- }
- else {
- result.push("Art_Vector_Revamp_Arm_Right_"+this.rightArmType);
- result.push("Art_Vector_Revamp_Arm_Left_"+this.leftArmType);
+ } else {
+ result.push(`Art_Vector_Revamp_Arm_Right_${this.rightArmType}`);
+ result.push(`Art_Vector_Revamp_Arm_Left_${this.leftArmType}`);
}
- if (this.showArmHair && (this.artSlave.amp === 1 || (this.leftArmType === "High" && this.artSlave.amp !== 1)))
- {
- switch(this.artSlave.underArmHStyle)
- {
+ if (this.showArmHair && (this.artSlave.amp === 1 || (this.leftArmType === "High" && this.artSlave.amp !== 1))) {
+ switch (this.artSlave.underArmHStyle) {
case "bushy":
result.push("Art_Vector_Revamp_Arm_Up_Hair_Bushy");
break;
@@ -911,7 +890,7 @@ class RevampedArtControl {
else
buttSize = 0;
- result.push("Art_Vector_Revamp_Butt_" + buttSize);
+ result.push(`Art_Vector_Revamp_Butt_${buttSize}`);
return result;
}
@@ -921,24 +900,20 @@ class RevampedArtControl {
if (this.artSlave.amp === 1) {
result.push("Art_Vector_Revamp_Stump");
- }
- else {
+ } else {
let legSize = "Normal";
if (this.artSlave.hips < 0) {
legSize = this.artSlave.weight > 95 ? "Normal" : "Narrow";
- }
- else if (this.artSlave.hips === 0) {
+ } else if (this.artSlave.hips === 0) {
legSize = this.artSlave.weight > 95 ? "Wide" : "Normal";
- }
- else if (this.artSlave.hips > 0) {
+ } else if (this.artSlave.hips > 0) {
legSize = "Wide";
}
- result.push("Art_Vector_Revamp_Leg_" + legSize);
+ result.push(`Art_Vector_Revamp_Leg_${legSize}`);
- if (this.showLegHighlight)
- {
+ if (this.showLegHighlight) {
result.push("Art_Vector_Revamp_Leg_Highlights2");
result.push("Art_Vector_Revamp_Leg_Highlights1");
}
@@ -954,8 +929,7 @@ class RevampedArtControl {
return result;
}
- switch(this.artSlave.shoes)
- {
+ switch (this.artSlave.shoes) {
case "heels":
result.push("Art_Vector_Revamp_Shoes_Heel");
break;
@@ -978,18 +952,15 @@ class RevampedArtControl {
get torsoLayer() {
let result = [];
- result.push("Art_Vector_Revamp_Torso_" + this.torsoSize);
+ result.push(`Art_Vector_Revamp_Torso_${this.torsoSize}`);
result.push("Art_Vector_Revamp_Clavicle");
- if (this.showTorsoHighlight)
- {
+ if (this.showTorsoHighlight) {
result.push("Art_Vector_Revamp_Torso_Highlights2");
result.push("Art_Vector_Revamp_Torso_Highlights1");
}
- if (this.showArmHair && this.leftArmType !== "High" && this.artSlave.amp !== 1)
- {
- switch(this.artSlave.underArmHStyle)
- {
+ if (this.showArmHair && this.leftArmType !== "High" && this.artSlave.amp !== 1) {
+ switch (this.artSlave.underArmHStyle) {
case "bushy":
result.push("Art_Vector_Revamp_Arm_Down_Hair_Bushy");
break;
@@ -1021,13 +992,11 @@ class RevampedArtControl {
if (this.artSlave.physicalAge < 12)
return result;
- if (this.artSlave.vaginaTat === "rude words")
- {
+ if (this.artSlave.vaginaTat === "rude words") {
this.pubicTattooText = this.artSlave.dick !== 0 ? "Useless" : "Fucktoy";
result.push("Art_Vector_Revamp_Pussy_Tattoo");
}
- switch(this.artSlave.pubicHStyle)
- {
+ switch (this.artSlave.pubicHStyle) {
case "strip":
case "in a strip":
result.push("Art_Vector_Revamp_Pubic_Hair_Strip");
@@ -1095,16 +1064,15 @@ class RevampedArtControl {
get torsoOutfitLayer() {
let result = [];
- switch(this.artSlave.clothes)
- {
+ switch (this.artSlave.clothes) {
case "uncomfortable straps":
- result.push("Art_Vector_Revamp_Torso_Outfit_Straps_" + this.torsoSize);
+ result.push(`Art_Vector_Revamp_Torso_Outfit_Straps_${this.torsoSize}`);
break;
case "a nice maid outfit":
- result.push("Art_Vector_Revamp_Torso_Outfit_Maid_" + this.torsoSize);
+ result.push(`Art_Vector_Revamp_Torso_Outfit_Maid_${this.torsoSize}`);
break;
case "a slutty maid outfit":
- result.push("Art_Vector_Revamp_Torso_Outfit_Maid_Lewd_" + this.torsoSize);
+ result.push(`Art_Vector_Revamp_Torso_Outfit_Maid_Lewd_${this.torsoSize}`);
break;
default:
}
@@ -1131,7 +1099,7 @@ class RevampedArtControl {
else
ballsSize = 0;
- result.push("Art_Vector_Revamp_Balls_" + ballsSize);
+ result.push(`Art_Vector_Revamp_Balls_${ballsSize}`);
return result;
}
@@ -1139,23 +1107,18 @@ class RevampedArtControl {
get bellyLayer() {
let result = [];
- if (this.bellyLevel > 0)
- {
- result.push("Art_Vector_Revamp_Belly_" + this.bellyLevel);
+ if (this.bellyLevel > 0) {
+ result.push(`Art_Vector_Revamp_Belly_${this.bellyLevel}`);
- if (this.showBellyPiercings)
- {
+ if (this.showBellyPiercings) {
if (this.artSlave.navelPiercing >= 1)
- result.push("Art_Vector_Revamp_Belly_" + this.bellyLevel + "_Piercing");
+ result.push(`Art_Vector_Revamp_Belly_${this.bellyLevel}_Piercing`);
if (this.artSlave.navelPiercing === 2)
- result.push("Art_Vector_Revamp_Belly_" + this.bellyLevel + "_Piercing_Heavy");
+ result.push(`Art_Vector_Revamp_Belly_${this.bellyLevel}_Piercing_Heavy`);
}
- }
- else
- {
- if (this.showBellyPiercings)
- {
+ } else {
+ if (this.showBellyPiercings) {
if (this.artSlave.navelPiercing >= 1)
result.push("Art_Vector_Revamp_Navel_Piercing");
@@ -1195,24 +1158,21 @@ class RevampedArtControl {
if (!this.showPenis || penisSize < 0)
return result;
- if (canAchieveErection(this.artSlave) && (this.artSlave.chastityPenis !== 1))
- {
- result.push("Art_Vector_Revamp_Penis_" + penisSize);
+ if (canAchieveErection(this.artSlave) && (this.artSlave.chastityPenis !== 1)) {
+ result.push(`Art_Vector_Revamp_Penis_${penisSize}`);
if (!this.showPenisPiercings)
return result;
if (this.artSlave.dickPiercing === 1)
- result.push("Art_Vector_Revamp_Penis_" + penisSize + "_Piercing");
+ result.push(`Art_Vector_Revamp_Penis_${penisSize}_Piercing`);
else if (this.artSlave.dickPiercing === 2)
- result.push("Art_Vector_Revamp_Penis_" + penisSize + "_Piercing_Heavy");
- }
- else
- {
- result.push("Art_Vector_Revamp_Flaccid_" + penisSize);
+ result.push(`Art_Vector_Revamp_Penis_${penisSize}_Piercing_Heavy`);
+ } else {
+ result.push(`Art_Vector_Revamp_Flaccid_${penisSize}`);
if (this.artSlave.chastityPenis === 1) {
- result.push("Art_Vector_Revamp_Chastity_Cage_" + penisSize);
+ result.push(`Art_Vector_Revamp_Chastity_Cage_${penisSize}`);
}
}
@@ -1222,14 +1182,11 @@ class RevampedArtControl {
get boobLayer() {
let result = [];
- if (this.artSlave.boobs < 300)
- {
- if (this.showNipples)
- {
+ if (this.artSlave.boobs < 300) {
+ if (this.showNipples) {
let areolaeShape = "Normal";
- switch(this.artSlave.areolae)
- {
+ switch (this.artSlave.areolae) {
case 0:
areolaeShape = "Normal";
break;
@@ -1244,8 +1201,7 @@ class RevampedArtControl {
break;
default:
}
- switch(this.artSlave.areolaeShape)
- {
+ switch (this.artSlave.areolaeShape) {
case "heart":
areolaeShape = "Heart";
break;
@@ -1255,18 +1211,16 @@ class RevampedArtControl {
default:
}
- result.push("Art_Vector_Revamp_Boob_None_Areola_" + areolaeShape);
+ result.push(`Art_Vector_Revamp_Boob_None_Areola_${areolaeShape}`);
}
- }
- else
- {
+ } else {
let artScaleFactor = 0.804354*Math.log(0.00577801*this.artSlave.boobs);
let boobRightArtTranslationX = 270*((-1*artScaleFactor) + 1);
let boobLeftArtTranslationX = 320*((-1*artScaleFactor) + 1);
let artTranslationX = -283.841*artScaleFactor+285.349;
let artTranslationY = 198*((-1*artScaleFactor) + 1);
- let artBoobTransform = "matrix(" + artScaleFactor +",0,0," + artScaleFactor + "," + artTranslationX + "," + artTranslationY + ")";
+ let artBoobTransform = `matrix(${artScaleFactor},0,0,${artScaleFactor},${artTranslationX},${artTranslationY})`;
this.artTransform = artBoobTransform;
@@ -1275,35 +1229,29 @@ class RevampedArtControl {
let size = "Small";
- if (this.artSlave.boobs < 600)
- {
+ if (this.artSlave.boobs < 600) {
artScaleFactor = 0.360674*Math.log(0.0266667*this.artSlave.boobs);
boobRightArtTranslationX = 240*((-1*artScaleFactor) + 1);
boobLeftArtTranslationX = 300*((-1*artScaleFactor) + 1);
artTranslationY = 250*((-1*artScaleFactor) + 1);
size = "Small";
- }
- else if (this.artSlave.boobs < 15000)
- {
+ } else if (this.artSlave.boobs < 15000) {
size = "Medium";
- }
- else {
+ } else {
size = "Huge";
boobRightArtTranslationX = 252*((-1*artScaleFactor) + 1);
boobLeftArtTranslationX = 315*((-1*artScaleFactor) + 1);
}
- this.boobRightArtTransform = "matrix(" + artScaleFactor +",0,0," + artScaleFactor + "," + boobRightArtTranslationX + "," + artTranslationY + ")";
- this.boobLeftArtTransform = "matrix(" + artScaleFactor +",0,0," + artScaleFactor + "," + boobLeftArtTranslationX + "," + artTranslationY + ")";
- result.push("Art_Vector_Revamp_Boob_" + size);
+ this.boobRightArtTransform = `matrix(${artScaleFactor},0,0,${artScaleFactor},${boobRightArtTranslationX},${artTranslationY})`;
+ this.boobLeftArtTransform = `matrix(${artScaleFactor},0,0,${artScaleFactor},${boobLeftArtTranslationX},${artTranslationY})`;
+ result.push(`Art_Vector_Revamp_Boob_${size}`);
- if (this.showNipples)
- {
+ if (this.showNipples) {
let areolaeShape = "Normal";
- switch(this.artSlave.areolae)
- {
+ switch (this.artSlave.areolae) {
case 0:
areolaeShape = "Normal";
break;
@@ -1318,8 +1266,7 @@ class RevampedArtControl {
break;
default:
}
- switch(this.artSlave.areolaeShape)
- {
+ switch (this.artSlave.areolaeShape) {
case "heart":
areolaeShape = "Heart";
break;
@@ -1329,13 +1276,12 @@ class RevampedArtControl {
default:
}
- result.push("Art_Vector_Revamp_Boob_" + size + "_Areolae_" + areolaeShape);
- result.push("Art_Vector_Revamp_Boob_" + size + "_Nipples");
+ result.push(`Art_Vector_Revamp_Boob_${size}_Areolae_${areolaeShape}`);
+ result.push(`Art_Vector_Revamp_Boob_${size}_Nipples`);
}
- if (this.showBoobsHighlight)
- {
- result.push("Art_Vector_Revamp_Boob_" + size + "_Highlights2");
- result.push("Art_Vector_Revamp_Boob_" + size + "_Highlights1");
+ if (this.showBoobsHighlight) {
+ result.push(`Art_Vector_Revamp_Boob_${size}_Highlights2`);
+ result.push(`Art_Vector_Revamp_Boob_${size}_Highlights1`);
}
}
@@ -1345,88 +1291,71 @@ class RevampedArtControl {
get boobAddonLayer() {
let result = [];
- if (this.showNipplesPiercings)
- {
+ if (this.showNipplesPiercings) {
let size = "Small";
- if (this.artSlave.boobs < 600)
- {
+ if (this.artSlave.boobs < 600) {
size = "Small";
- }
- else if (this.artSlave.boobs < 15000)
- {
+ } else if (this.artSlave.boobs < 15000) {
size = "Medium";
- }
- else {
+ } else {
size = "Huge";
}
- if (this.artSlave.nipplesPiercing === 1)
- {
+ if (this.artSlave.nipplesPiercing === 1) {
if (this.artSlave.boobs < 300)
result.push("Art_Vector_Revamp_Boob_None_Piercing");
else
- result.push("Art_Vector_Revamp_Boob_" + size + "_Piercing");
- }
- else if (this.artSlave.nipplesPiercing === 2)
- {
+ result.push(`Art_Vector_Revamp_Boob_${size}_Piercing`);
+ } else if (this.artSlave.nipplesPiercing === 2) {
if (this.artSlave.boobs < 300)
result.push("Art_Vector_Revamp_Boob_None_Piercing_Heavy");
else
- result.push("Art_Vector_Revamp_Boob_" + size + "_Piercing_Heavy");
+ result.push(`Art_Vector_Revamp_Boob_${size}_Piercing_Heavy`);
}
- if (this.artSlave.areolaePiercing === 1)
- {
+ if (this.artSlave.areolaePiercing === 1) {
if (this.artSlave.boobs < 300)
result.push("Art_Vector_Revamp_Boob_None_Areola_Piercing");
else
- result.push("Art_Vector_Revamp_Boob_" + size + "_Areola_Piercing");
- }
- else if (this.artSlave.areolaePiercing === 2)
- {
+ result.push(`Art_Vector_Revamp_Boob_${size}_Areola_Piercing`);
+ } else if (this.artSlave.areolaePiercing === 2) {
if (this.artSlave.boobs < 300)
result.push("Art_Vector_Revamp_Boob_None_Areola_Piercing_Heavy");
else
- result.push("Art_Vector_Revamp_Boob_" + size + "_Areola_Piercing_Heavy");
+ result.push(`Art_Vector_Revamp_Boob_${size}_Areola_Piercing_Heavy`);
}
}
- switch(this.artSlave.clothes)
- {
+ switch (this.artSlave.clothes) {
case "uncomfortable straps":
// if (this.artSlave.boobs >= 300)
// result.push("Art_Vector_Revamp_Boob_Outfit_Straps");
break;
case "a nice maid outfit":
- if (this.artSlave.boobs >= 300)
- {
- if (this.artSlave.boobs < 600)
- {
+ if (this.artSlave.boobs >= 300) {
+ if (this.artSlave.boobs < 600) {
let artScaleFactor = 0.288539*Math.log(0.106667*this.artSlave.boobs);
let artTranslationX = 270*((-1*artScaleFactor) + 1);
let artTranslationY = 198*((-1*artScaleFactor) + 1);// -198.438*artScaleFactor+203.274;
- let artBoobTransform = "matrix(" + artScaleFactor +",0,0," + artScaleFactor + "," + artTranslationX + "," + artTranslationY + ")";
+ let artBoobTransform = `matrix(${artScaleFactor},0,0,${artScaleFactor},${artTranslationX},${artTranslationY})`;
this.boobOutfitArtTransform = artBoobTransform;
result.push("Art_Vector_Revamp_Boob_Small_Outfit_Maid");
- }
- else if (this.artSlave.boobs < 15000)
- {
+ } else if (this.artSlave.boobs < 15000) {
let artScaleFactor = 0.155334*Math.log(1.04167*this.artSlave.boobs);
let artTranslationX = 270*((-1.25*artScaleFactor) + 1.25);
let artTranslationY = 198*((-0.8*artScaleFactor) + 0.8);// -198.438*artScaleFactor+203.274;
- let artBoobTransform = "matrix(" + artScaleFactor +",0,0," + artScaleFactor + "," + artTranslationX + "," + artTranslationY + ")";
+ let artBoobTransform = `matrix(${artScaleFactor},0,0,${artScaleFactor},${artTranslationX},${artTranslationY})`;
this.boobOutfitArtTransform = artBoobTransform;
result.push("Art_Vector_Revamp_Boob_Medium_Outfit_Maid");
- }
- else {
+ } else {
let artScaleFactor = 1.56609*Math.log(0.00017373*this.artSlave.boobs);
let artTranslationX = 340*((-1*artScaleFactor) + 1);
let artTranslationY = 153*((-1*artScaleFactor) + 1);// -198.438*artScaleFactor+203.274;
- let artBoobTransform = "matrix(" + artScaleFactor +",0,0," + artScaleFactor + "," + artTranslationX + "," + artTranslationY + ")";
+ let artBoobTransform = `matrix(${artScaleFactor},0,0,${artScaleFactor},${artTranslationX},${artTranslationY})`;
this.boobOutfitArtTransform = artBoobTransform;
result.push("Art_Vector_Revamp_Boob_Huge_Outfit_Maid");
@@ -1451,8 +1380,7 @@ class RevampedArtControl {
get collarLayer() {
let result = [];
- switch(this.artSlave.collar)
- {
+ switch (this.artSlave.collar) {
case "leather with cowbell":
result.push("Art_Vector_Revamp_Collar_Cowbell");
break;
@@ -1519,50 +1447,39 @@ class RevampedArtControl {
if (!this.showEyes)
return result;
- if (this.artSlave.devotion > 50)
- {
+ if (this.artSlave.devotion > 50) {
result.push("Art_Vector_Revamp_Eyes_Happy");
result.push("Art_Vector_Revamp_Eyes_Happy_Highlights");
- if (this.showHeadPiercings)
- {
+ if (this.showHeadPiercings) {
if (this.artSlave.eyebrowPiercing === 1)
result.push("Art_Vector_Revamp_Head_Eyebrow_Happy_Piercing");
else if (this.artSlave.eyebrowPiercing === 2)
result.push("Art_Vector_Revamp_Head_Eyebrow_Happy_Piercing_Heavy");
}
- }
- else if (this.artSlave.devotion >= 0)
- {
+ } else if (this.artSlave.devotion >= 0) {
result.push("Art_Vector_Revamp_Eyes_Shy");
result.push("Art_Vector_Revamp_Eyes_Shy_Highlights");
- if (this.showHeadPiercings)
- {
+ if (this.showHeadPiercings) {
if (this.artSlave.eyebrowPiercing === 1)
result.push("Art_Vector_Revamp_Head_Eyebrow_Shy_Piercing");
else if (this.artSlave.eyebrowPiercing === 2)
result.push("Art_Vector_Revamp_Head_Eyebrow_Shy_Piercing_Heavy");
}
- }
- else if (this.artSlave.devotion >= -50)
- {
+ } else if (this.artSlave.devotion >= -50) {
result.push("Art_Vector_Revamp_Eyes_Closed");
- if (this.showHeadPiercings)
- {
+ if (this.showHeadPiercings) {
if (this.artSlave.eyebrowPiercing === 1)
result.push("Art_Vector_Revamp_Head_Eyebrow_Closed_Piercing");
else if (this.artSlave.eyebrowPiercing === 2)
result.push("Art_Vector_Revamp_Head_Eyebrow_Closed_Piercing_Heavy");
}
- }
- else
- {
+ } else {
result.push("Art_Vector_Revamp_Eyes_Angry");
result.push("Art_Vector_Revamp_Eyes_Angry_Highlights");
- if (this.showHeadPiercings)
- {
+ if (this.showHeadPiercings) {
if (this.artSlave.eyebrowPiercing === 1)
result.push("Art_Vector_Revamp_Head_Eyebrow_Angry_Piercing");
else if (this.artSlave.eyebrowPiercing === 2)
@@ -1593,26 +1510,21 @@ class RevampedArtControl {
else
lipsSize = "Thin";
- if (this.artSlave.trust > 20)
- {
- result.push("Art_Vector_Revamp_Makeup_Mouth_Happy_" + lipsSize);
- result.push("Art_Vector_Revamp_Mouth_Happy_" + lipsSize);
+ if (this.artSlave.trust > 20) {
+ result.push(`Art_Vector_Revamp_Makeup_Mouth_Happy_${lipsSize}`);
+ result.push(`Art_Vector_Revamp_Mouth_Happy_${lipsSize}`);
- if (this.showHeadPiercings)
- {
+ if (this.showHeadPiercings) {
if (this.artSlave.lipsPiercing === 1)
result.push("Art_Vector_Revamp_Head_Mouth_Happy_Piercing");
else if (this.artSlave.lipsPiercing === 2)
result.push("Art_Vector_Revamp_Head_Mouth_Happy_Piercing_Heavy");
}
- }
- else
- {
- result.push("Art_Vector_Revamp_Makeup_Mouth_Angry_" + lipsSize);
- result.push("Art_Vector_Revamp_Mouth_Angry_" + lipsSize);
+ } else {
+ result.push(`Art_Vector_Revamp_Makeup_Mouth_Angry_${lipsSize}`);
+ result.push(`Art_Vector_Revamp_Mouth_Angry_${lipsSize}`);
- if (this.showHeadPiercings)
- {
+ if (this.showHeadPiercings) {
if (this.artSlave.lipsPiercing === 1)
result.push("Art_Vector_Revamp_Head_Mouth_Angry_Piercing");
else if (this.artSlave.lipsPiercing === 2)
@@ -1626,8 +1538,7 @@ class RevampedArtControl {
let result = [];
if (this.showEyes) {
- switch(this.artSlave.eyewear)
- {
+ switch (this.artSlave.eyewear) {
case "corrective glasses":
case "glasses":
case "blurring glasses":
@@ -1637,10 +1548,8 @@ class RevampedArtControl {
}
}
- if (this.showMouth)
- {
- switch(this.artSlave.collar)
- {
+ if (this.showMouth) {
+ switch (this.artSlave.collar) {
case "dildo gag":
result.push("Art_Vector_Revamp_Dildo_Gag");
break;
@@ -1664,8 +1573,7 @@ class RevampedArtControl {
if (this.artSlave.hLength === 0)
return result;
- switch(this.artSlave.hStyle)
- {
+ switch (this.artSlave.hStyle) {
case "neat":
result.push("Art_Vector_Revamp_Hair_Fore_Neat");
break;
diff --git a/src/endWeek/saServeThePublic.js b/src/endWeek/saServeThePublic.js
index 1bc85472b47026ea2386a96533f92c9ca35f1870..51482125667352efccb6996ed5e778e0a7bd9056 100644
--- a/src/endWeek/saServeThePublic.js
+++ b/src/endWeek/saServeThePublic.js
@@ -999,19 +999,19 @@ window.saServeThePublic = (function saServeThePublic() {
slave.need -= slave.sexAmount;
} else if (slave.energy > 80) {
r += ` With ${his} powerful sex drive ${he} rarely has to fake an orgasm.`;
- slave.need -= (slave.sexAmount * .9);
+ slave.need -= (slave.sexAmount * 0.9);
} else if (slave.aphrodisiacs > 0 || slave.inflationType === "aphrodisiac") {
r += ` With ${his} aphrodisiac boosted libido, it's barely possible to discern ${him} from a natural nymphomaniac.`;
- slave.need -= (slave.sexAmount * .9);
+ slave.need -= (slave.sexAmount * 0.9);
} else if (slave.energy > 60) {
r += ` With ${his} good sex drive ${he} often orgasms with citizens.`;
- slave.need -= (slave.sexAmount * .8);
+ slave.need -= (slave.sexAmount * 0.8);
} else if (slave.energy > 40) {
r += ` With ${his} average sex drive ${he} occasionally orgasms with citizens.`;
- slave.need -= (slave.sexAmount * .5);
+ slave.need -= (slave.sexAmount * 0.5);
} else if (slave.energy > 20) {
r += ` With ${his} poor sex drive ${he} almost never orgasms with citizens.`;
- slave.need -= (slave.sexAmount * .1);
+ slave.need -= (slave.sexAmount * 0.1);
} else {
r += ` Since ${he}'s frigid, ${he} rarely experiences authentic arousal with citizens.`;
}
diff --git a/src/endWeek/saWhore.js b/src/endWeek/saWhore.js
index e06de99988a3c4b88a01ba70b27ab853449f6b74..4e1c1f70eaf6ae538e25be637f4d0b6aa402a2c6 100644
--- a/src/endWeek/saWhore.js
+++ b/src/endWeek/saWhore.js
@@ -227,9 +227,9 @@ window.saWhore = (function saWhore() {
beauty = Math.trunc(beauty * beautyMultiplier);
if ((slave.hears === -1 && slave.earwear !== "hearing aids") || (slave.hears === 0 && slave.earwear === "muffling ear plugs") ||(slave.hears === -2)) {
if (!canHear(slave)) {
- beauty *= .75;
+ beauty *= 0.75;
} else {
- beauty *= .90;
+ beauty *= 0.90;
}
}
if (beauty > 210) {
@@ -1164,19 +1164,19 @@ window.saWhore = (function saWhore() {
slave.need -= beauty;
} else if (slave.energy > 80) {
r += ` With ${his} powerful sex drive ${he} rarely has to fake an orgasm.`;
- slave.need -= (beauty * .9);
+ slave.need -= (beauty * 0.9);
} else if (slave.aphrodisiacs > 0 || slave.inflationType === "aphrodisiac") {
r += ` With ${his} aphrodisiac boosted libido, it's barely possible to discern ${him} from a natural nymphomaniac.`;
- slave.need -= (beauty * .9);
+ slave.need -= (beauty * 0.9);
} else if (slave.energy > 60) {
r += ` With ${his} good sex drive ${he} often orgasms with customers.`;
- slave.need -= (beauty * .8);
+ slave.need -= (beauty * 0.8);
} else if (slave.energy > 40) {
r += ` With ${his} average sex drive ${he} occasionally orgasms with customers.`;
- slave.need -= (beauty * .5);
+ slave.need -= (beauty * 0.5);
} else if (slave.energy > 20) {
r += ` With ${his} poor sex drive ${he} almost never orgasms with customers.`;
- slave.need -= (beauty * .1);
+ slave.need -= (beauty * 0.1);
} else {
r += ` Since ${he}'s frigid, ${he} rarely experiences authentic arousal at work.`;
}
diff --git a/src/js/eventSelectionJS.js b/src/js/eventSelectionJS.js
index 2b13cd2b66d9ee1ab67fe31f743395df8618439b..0da9de9f17661dd952ac24e1dd78d72120fe83cb 100644
--- a/src/js/eventSelectionJS.js
+++ b/src/js/eventSelectionJS.js
@@ -873,7 +873,7 @@ window.generateRandomEventPoolStandard = function(eventSlave) {
if (eventSlave.ovaries === 1) {
if (eventSlave.pubertyXX === 0) {
if (eventSlave.preg === 0) {
- if (eventSlave.physicalAge >= eventSlave.pubertyAgeXX - .5) {
+ if (eventSlave.physicalAge >= eventSlave.pubertyAgeXX - 0.5) {
State.variables.RESSevent.push("first period");
State.variables.RESSevent.push("first period");
State.variables.RESSevent.push("first period");
@@ -891,7 +891,7 @@ window.generateRandomEventPoolStandard = function(eventSlave) {
if (canPenetrate(eventSlave)) {
if (eventSlave.balls > 0) {
if (eventSlave.pubertyXY === 0) {
- if (eventSlave.physicalAge >= eventSlave.pubertyAgeXY - .5) {
+ if (eventSlave.physicalAge >= eventSlave.pubertyAgeXY - 0.5) {
State.variables.RESSevent.push("wet dreams");
State.variables.RESSevent.push("wet dreams");
State.variables.RESSevent.push("wet dreams");
@@ -1103,7 +1103,7 @@ window.generateRandomEventPoolStandard = function(eventSlave) {
}
if (eventSlave.boobs > 800) {
- if (Math.floor(eventSlave.boobsImplant / eventSlave.boobs) >= .60) {
+ if (Math.floor(eventSlave.boobsImplant / eventSlave.boobs) >= 0.60) {
if (eventSlave.devotion > 20) {
State.variables.RESSevent.push("implant inspection");
}
@@ -2331,7 +2331,7 @@ window.generateRandomEventPoolServant = function(eventSlave) {
if (eventSlave.ovaries === 1) {
if (eventSlave.pubertyXX === 0) {
if (eventSlave.preg === 0) {
- if (eventSlave.physicalAge >= eventSlave.pubertyAgeXX - .5) {
+ if (eventSlave.physicalAge >= eventSlave.pubertyAgeXX - 0.5) {
State.variables.RESSevent.push("first period");
State.variables.RESSevent.push("first period");
State.variables.RESSevent.push("first period");
@@ -2349,7 +2349,7 @@ window.generateRandomEventPoolServant = function(eventSlave) {
if (canPenetrate(eventSlave)) {
if (eventSlave.balls > 0) {
if (eventSlave.pubertyXY === 0) {
- if (eventSlave.physicalAge >= eventSlave.pubertyAgeXY - .5) {
+ if (eventSlave.physicalAge >= eventSlave.pubertyAgeXY - 0.5) {
State.variables.RESSevent.push("wet dreams");
State.variables.RESSevent.push("wet dreams");
State.variables.RESSevent.push("wet dreams");
diff --git a/src/js/familyTreeJS.js b/src/js/familyTreeJS.js
index 86fd4260f54d20ff3ff63cf9b7071aea879f49fc..e6cc775d6bbd8e31139499d44c3e0e72056e3de5 100644
--- a/src/js/familyTreeJS.js
+++ b/src/js/familyTreeJS.js
@@ -153,7 +153,7 @@ window.renderFamilyTree = function(slaves, filterID) {
} else {
ssym = '?';
}
- return `${d.name }(${ssym})`;
+ return `${d.name}(${ssym})`;
})
.attr('dy', 4)
.attr('dx', function(d) {
@@ -179,13 +179,13 @@ window.renderFamilyTree = function(slaves, filterID) {
let ticked = function() {
link
- .attr('x1', function(d) {return d.source.x;})
- .attr('y1', function(d) {return d.source.y;})
- .attr('x2', function(d) {return d.target.x;})
- .attr('y2', function(d) {return d.target.y;});
+ .attr('x1', function(d) { return d.source.x; })
+ .attr('y1', function(d) { return d.source.y; })
+ .attr('x2', function(d) { return d.target.x; })
+ .attr('y2', function(d) { return d.target.y; });
node
- .attr("transform", function(d) {return `translate(${ d.x }, ${ d.y })`;});
+ .attr("transform", function(d) { return `translate(${d.x}, ${d.y})`; });
};
simulation.nodes(data.nodes)
@@ -229,7 +229,7 @@ window.buildFamilyTree = function(slaves = State.variables.slaves, filterID) {
let kids = {};
let fake_pc = {
- slaveName: `${State.variables.PC.name }(You)`,
+ slaveName: `${State.variables.PC.name}(You)`,
mother: State.variables.PC.mother,
father: State.variables.PC.father,
dick: State.variables.PC.dick,
@@ -548,8 +548,13 @@ window.updateFamilyTree = function(activeSlave = lastActiveSlave, slaves = lastS
function getSlave(id, expectedGenes) {
if (id === -1) {
return {
-"slaveName": "YOU", "ID": id, "physicalAge": PC.physicalAge, "genes": PC.genes, "father": PC.father, "mother": PC.mother
-};
+ "slaveName": "YOU",
+ "ID": id,
+ "physicalAge": PC.physicalAge,
+ "genes": PC.genes,
+ "father": PC.father,
+ "mother": PC.mother
+ };
}
if (id === 0) {
return {"slaveName": "-", "ID": id, "genes": expectedGenes};
@@ -641,14 +646,14 @@ window.updateFamilyTree = function(activeSlave = lastActiveSlave, slaves = lastS
let children = shouldAddChildren?spouseToChild[key]:[];
let spouse = getSlave(key, (slaves.genes === "XX") ? "unknownXY" : (slaves.genes === "XY") ? "unknownXX" : "unknown");
let spouseName;
- if (spouse.ID !== slave.ID){
- spouseName = spouse.slaveName + (spouse.physicalAge?(` (${ spouse.physicalAge })`):"");
+ if (spouse.ID !== slave.ID) {
+ spouseName = spouse.slaveName + (spouse.physicalAge?(` (${spouse.physicalAge})`):"");
} else {
spouseName = (spouse.ID === -1) ? "(yourself)" : "(themselves)";
}
let marriage = {
"spouse": {"name": spouseName, "class": spouse.genes},
- "children": children.map(function(x) {return slaveInfo_(x, activeSlaveId, slavesAdded, depth + 1);}),
+ "children": children.map(function(x) { return slaveInfo_(x, activeSlaveId, slavesAdded, depth + 1); }),
};
data.marriages.push(marriage);
}
diff --git a/src/neighbor/arcologyOpinion.js b/src/neighbor/arcologyOpinion.js
index 7984ae34aa4a54911c93b3d6ad91fa70611bd814..b5cbc5905bf858a0fc77c4610d92902d89d27a64 100644
--- a/src/neighbor/arcologyOpinion.js
+++ b/src/neighbor/arcologyOpinion.js
@@ -1,8 +1,8 @@
window.arcologyOpinion = function() {
const V = State.variables;
- if (typeof V.activeArcology.FSNull === "undefined") {V.activeArcology.FSNull = "unset";}
- if (typeof V.targetArcology.FSNull === "undefined") {V.targetArcology.FSNull = "unset";}
+ if (typeof V.activeArcology.FSNull === "undefined") { V.activeArcology.FSNull = "unset"; }
+ if (typeof V.targetArcology.FSNull === "undefined") { V.targetArcology.FSNull = "unset"; }
let opinion = 0;