diff --git a/src/Mods/SecExp/buildings/riotControlCenter.js b/src/Mods/SecExp/buildings/riotControlCenter.js
index 428a4352280136372cd6adbb11065cfa2466d21d..7c649a455e8bfb3a2c1c6b8b8712351e8dbaf320 100644
--- a/src/Mods/SecExp/buildings/riotControlCenter.js
+++ b/src/Mods/SecExp/buildings/riotControlCenter.js
@@ -226,7 +226,7 @@ App.Mods.SecExp.riotCenter = (function() {
deploy.append("Spend: ", App.UI.DOM.generateLinksStrip(r));
return deploy;
/**
- * @param {string} cost
+ * @param {string} cost
* @returns {HTMLSpanElement}
*/
function menu(cost) {
diff --git a/src/Mods/SecExp/events/secExpSmilingMan0.js b/src/Mods/SecExp/events/secExpSmilingMan0.js
index 32685d4c074440fc78db3d991434aac8fef992a9..6a1253f641268dbfa8cb43fbe1c54d7b97d43fbd 100644
--- a/src/Mods/SecExp/events/secExpSmilingMan0.js
+++ b/src/Mods/SecExp/events/secExpSmilingMan0.js
@@ -58,6 +58,6 @@ App.Events.secExpSmilingMan0 = class secExpSmilingMan0 extends App.Events.BaseEv
App.Events.queueEvent(3, new App.Events.secExpSmilingMan1());
return `You do not consider this individual a threat.`;
}
-
+
}
};
diff --git a/src/Mods/SecExp/js/Unit.js b/src/Mods/SecExp/js/Unit.js
index b3d0d76aa149bb174bf9826f26f85d98495cf375..c01268796433498e23b4812ddf93bdc676bcb5de 100644
--- a/src/Mods/SecExp/js/Unit.js
+++ b/src/Mods/SecExp/js/Unit.js
@@ -220,7 +220,7 @@ App.Mods.SecExp.unit = (function() {
if (V.peacekeepers.state === 3 && type !== "bots") {
const unitAdjust = Math.ceil((unit.troops / 10) + (unit.maxTroops / 10) + (unit.training / 10) + unit.equip + unit.commissars + unit.cyber + unit.medics + unit.SF);
const cost = forceNeg(25000 * (1.5 + unitAdjust));
- linkArray.push(App.UI.DOM.link(`Send this unit to improve your relationship with General ${V.peacekeepers.generalName}. Costs ${cashFormat(cost)}.`, () => {
+ linkArray.push(App.UI.DOM.link(`Send this unit to improve your relationship with General ${V.peacekeepers.generalName}. Costs ${cashFormat(cost)}.`, () => {
V.peacekeepers.attitude += Math.ceil(unitAdjust / 5);
cashX(cost, "securityExpansion");
unitFree(type).add(unit.troops);
diff --git a/src/Mods/SecExp/js/secExpObject.js b/src/Mods/SecExp/js/secExpObject.js
index de68ab601b0932f6d3a1b9584deaeaade9451faf..451730fa1bec95ef232f747de2564354d4471a79 100644
--- a/src/Mods/SecExp/js/secExpObject.js
+++ b/src/Mods/SecExp/js/secExpObject.js
@@ -31,7 +31,7 @@ App.Mods.SecExp.Obj = (function() {
V.SecExp.settings.rebellion = V.SecExp.settings.rebellion || {};
V.SecExp.buildings = V.SecExp.buildings || {};
V.SecExp.proclamation = V.SecExp.proclamation || {};
-
+
V.SecExp.edicts.alternativeRents = V.SecExp.edicts.alternativeRents || V.alternativeRents || 0;
V.SecExp.edicts.enslavementRights = V.SecExp.edicts.enslavementRights || V.enslavementRights || 0;
V.SecExp.edicts.sellData = V.SecExp.edicts.sellData || V.sellData || 0;
@@ -46,11 +46,11 @@ App.Mods.SecExp.Obj = (function() {
if (typeof V.SecExp.edicts.weaponsLaw !== "number") {
V.SecExp.edicts.weaponsLaw = V.weaponsLaw || 3;
}
-
+
V.SecExp.edicts.defense.soldierWages = V.SecExp.edicts.defense.soldierWages || V.soldierWages || 1;
V.SecExp.edicts.defense.slavesOfficers = V.SecExp.edicts.defense.slavesOfficers || V.slavesOfficers || 0;
V.SecExp.edicts.defense.discountMercenaries = V.SecExp.edicts.defense.discountMercenaries || V.discountMercenaries || 0;
-
+
V.SecExp.edicts.defense.militia = V.SecExp.edicts.defense.militia || 0;
if (V.militiaFounded) {
V.SecExp.edicts.defense.militia = 1;
@@ -67,13 +67,13 @@ App.Mods.SecExp.Obj = (function() {
if (V.militarizedSociety) {
V.SecExp.edicts.defense.militia = 5;
}
-
+
V.SecExp.edicts.defense.militaryExemption = V.SecExp.edicts.defense.militaryExemption || V.militaryExemption || 0;
V.SecExp.edicts.defense.noSubhumansInArmy = V.SecExp.edicts.defense.noSubhumansInArmy || V.noSubhumansInArmy || 0;
V.SecExp.edicts.defense.pregExemption = V.SecExp.edicts.defense.pregExemption || V.pregExemption || 0;
V.SecExp.edicts.defense.liveTargets = V.SecExp.edicts.defense.liveTargets || V.liveTargets || 0;
V.SecExp.edicts.defense.pregExemption = V.SecExp.edicts.defense.pregExemption || V.pregExemption || 0;
-
+
// Units
V.SecExp.edicts.defense.martialSchool = V.SecExp.edicts.defense.martialSchool || V.martialSchool || 0;
V.SecExp.edicts.defense.eliteOfficers = V.SecExp.edicts.defense.eliteOfficers || V.eliteOfficers || 0;
@@ -84,7 +84,7 @@ App.Mods.SecExp.Obj = (function() {
V.SecExp.edicts.defense.sunTzu = V.SecExp.edicts.defense.sunTzu || V.sunTzu || 0;
V.SecExp.edicts.defense.mamluks = V.SecExp.edicts.defense.mamluks || V.mamluks || 0;
V.SecExp.edicts.defense.pharaonTradition = V.SecExp.edicts.defense.pharaonTradition || V.pharaonTradition || 0;
-
+
// Priv
V.SecExp.edicts.defense.privilege = V.SecExp.edicts.defense.privilege || {};
V.SecExp.edicts.defense.privilege.militiaSoldier = V.SecExp.edicts.defense.privilege.militiaSoldier || V.militiaSoldier || 0;
@@ -114,11 +114,11 @@ App.Mods.SecExp.Obj = (function() {
u.SF = 0;
}
}
-
+
if (unit !== 'bots' && u.platoonName.contains('undefined')) {
u.platoonName = u.platoonName.replace('undefined', data.defaultName);
}
-
+
App.Mods.SecExp.unit.genID(u, unit);
u.equip = u.equip || 0;
delete u.isDeployed;
@@ -132,14 +132,14 @@ App.Mods.SecExp.Obj = (function() {
V.SecExp.units.mercs.free = 30;
}
}
-
+
if (V.SecExp.defaultNames) {
V.SecExp.units.slaves.defaultName = V.SecExp.defaultNames.slaves;
V.SecExp.units.militia.defaultName = V.SecExp.defaultNames.milita || V.SecExp.defaultNames.militia;
V.SecExp.units.mercs.defaultName = V.SecExp.defaultNames.mercs;
delete V.SecExp.defaultNames;
}
-
+
V.SecExp.smilingMan.progress = V.SecExp.smilingMan.progress || V.smilingManProgress || 0;
if (jsDef(V.smilingManFate)) {
if (V.smilingManFate === 0) { // Offer $him a new life
@@ -150,7 +150,7 @@ App.Mods.SecExp.Obj = (function() {
V.SecExp.smilingMan.progress = 30;
}
}
-
+
if (V.SecExp.smilingMan.progress === 4) {
V.SecExp.smilingMan.progress = 10;
} else if (V.SecExp.smilingMan.progress < 4) {
@@ -164,11 +164,11 @@ App.Mods.SecExp.Obj = (function() {
V.SecExp.smilingMan.globalCrisisWeeks = V.globalCrisisWeeks;
}
}
-
+
delete V.SecExp.core.crimeCap;
V.SecExp.core.trade = V.SecExp.core.trade || V.trade || 0;
initTrade();
-
+
V.SecExp.core.authority = V.SecExp.core.authority || V.authority || 0;
V.SecExp.core.security = V.SecExp.core.security || V.security || 100;
if (jsDef(V.SecExp.security)) {
@@ -176,12 +176,12 @@ App.Mods.SecExp.Obj = (function() {
delete V.SecExp.security;
}
V.SecExp.core.totalKills = +V.SecExp.core.totalKills || V.totalKills || 0;
-
+
if (V.week === 1 || !jsDef(V.SecExp.core.crimeLow)) {
V.SecExp.core.crimeLow = 30;
}
V.SecExp.core.crimeLow = Math.clamp(V.SecExp.core.crimeLow, 0, 100) || V.crime || 0;
-
+
V.SecExp.battles.slaveVictories = V.SecExp.battles.slaveVictories || V.slaveVictories || [];
V.SecExp.battles.major = V.SecExp.battles.major || 0;
if (jsDef(V.majorBattlesCount)) {
@@ -200,7 +200,7 @@ App.Mods.SecExp.Obj = (function() {
V.SecExp.battles.saved = V.SecExp.battles.saved || {};
V.SecExp.battles.saved.commander = V.SecExp.battles.saved.commander || V.SavedLeader || "";
V.SecExp.battles.saved.sfSupport = V.SecExp.battles.saved.sfSupport || V.SavedSFI || 0;
-
+
V.SecExp.rebellions.tension = V.SecExp.rebellions.tension || V.tension || 0;
V.SecExp.rebellions.slaveProgress = V.SecExp.rebellions.slaveProgress || V.slaveProgress || 0;
V.SecExp.rebellions.citizenProgress = V.SecExp.rebellions.citizenProgress || V.citizenProgress || 0;
@@ -211,7 +211,7 @@ App.Mods.SecExp.Obj = (function() {
V.SecExp.rebellions.sfArmor = V.SFGear;
}
V.SecExp.settings.difficulty = V.difficulty || V.SecExp.settings.difficulty || 1;
-
+
if (!jsDef(V.SecExp.settings.battle.enabled)) {
V.SecExp.settings.battle.enabled = 1;
}
@@ -219,25 +219,25 @@ App.Mods.SecExp.Obj = (function() {
V.SecExp.settings.battle.enabled = V.battlesEnabled;
}
delete V.SecExp.battle;
-
+
V.SecExp.settings.battle.frequency = V.battleFrequency || V.SecExp.settings.battle.frequency || 1;
V.SecExp.settings.battle.force = V.forceBattle || V.SecExp.settings.battle.force || 0;
-
+
if (V.readiness && V.readiness === 10 || V.sectionInFirebase) {
V.SecExp.sectionInFirebase = 1;
}
-
+
V.SecExp.settings.unitDescriptions = V.SecExp.settings.unitDescriptions || 0;
-
+
if (!jsDef(V.SecExp.settings.battle.allowSlavePrestige)) {
V.SecExp.settings.battle.allowSlavePrestige = 1;
}
if (jsDef(V.allowPrestigeFromBattles)) {
V.SecExp.settings.battle.allowSlavePrestige = V.allowPrestigeFromBattles;
}
-
+
V.SecExp.settings.battle.major.enabled = V.majorBattlesEnabled || V.SecExp.settings.battle.major.enabled || 0;
-
+
if (!jsDef(V.SecExp.settings.battle.major.gameOver)) {
V.SecExp.settings.battle.major.gameOver = 1;
}
@@ -246,14 +246,14 @@ App.Mods.SecExp.Obj = (function() {
}
V.SecExp.settings.battle.major.force = V.forceMajorBattle || V.SecExp.settings.battle.major.force || 0;
V.SecExp.settings.battle.major.mult = V.SecExp.settings.battle.major.mult || 1;
-
+
if (!jsDef(V.SecExp.settings.rebellion.enabled)) {
V.SecExp.settings.rebellion.enabled = 1;
}
if (jsDef(V.rebellionsEnabled)) {
V.SecExp.settings.rebellion.enabled = V.rebellionsEnabled;
}
-
+
V.SecExp.settings.rebellion.force = V.forceRebellion || V.SecExp.settings.rebellion.force || 0;
if (!jsDef(V.SecExp.settings.rebellion.gameOver)) {
V.SecExp.settings.rebellion.gameOver = 1;
@@ -261,24 +261,24 @@ App.Mods.SecExp.Obj = (function() {
if (jsDef(V.rebellionGameOver)) {
V.SecExp.settings.rebellion.gameOver = V.rebellionGameOver;
}
-
+
V.SecExp.settings.rebellion.speed = V.rebellionSpeed || V.SecExp.settings.rebellion.speed || 1;
V.SecExp.settings.showStats = V.showBattleStatistics || V.SecExp.settings.showStats || 0;
-
+
App.Mods.SecExp.BC.propHub();
App.Mods.SecExp.BC.barracks();
App.Mods.SecExp.BC.secHub();
App.Mods.SecExp.BC.transportHub();
App.Mods.SecExp.BC.riotCenter();
App.Mods.SecExp.BC.weaponsManufacturing();
-
+
V.SecExp.proclamation.cooldown = V.SecExp.proclamation.cooldown || V.proclamationsCooldown || 0;
V.SecExp.proclamation.currency = V.SecExp.proclamation.currency || V.proclamationCurrency || "";
V.SecExp.proclamation.type = V.SecExp.proclamation.type || "crime";
if (jsDef(V.proclamationType) && V.proclamationType !== "none") {
V.SecExp.proclamation.type = V.proclamationType;
}
-
+
V.SecExp.rebellions.repairTime = V.SecExp.rebellions.repairTime || {};
if (jsDef(V.garrison)) {
if (V.garrison.waterwayTime > 0) {
@@ -294,7 +294,7 @@ App.Mods.SecExp.Obj = (function() {
if (V.arcRepairTime && V.arcRepairTime > 0) {
V.SecExp.rebellions.repairTime.arc = V.arcRepairTime;
}
-
+
delete V.SecExp.settings.show;
};
diff --git a/src/Mods/SpecialForce/AfterActionReport.js b/src/Mods/SpecialForce/AfterActionReport.js
index bc01d9490402d727d234162877b02e003d9f573e..dd65b78f79f10d36c4bb366300c0c38bd3896318 100644
--- a/src/Mods/SpecialForce/AfterActionReport.js
+++ b/src/Mods/SpecialForce/AfterActionReport.js
@@ -352,7 +352,7 @@ App.Mods.SF.AAR = function() {
V.SF.MercCon.CanAttend = -1;
}
return [node, upkeep, profit];
-
+
function weeklyOptions() {
const choices = document.createElement("span");
App.UI.DOM.appendNewElement("div", choices, `The Colonel looks down a list on her tablet. "There's some things we can do to help you out, boss.`);
diff --git a/src/Mods/SpecialForce/FireBase.js b/src/Mods/SpecialForce/FireBase.js
index 0cc6dcd35c16ab2b9a5efbff16d762505ed20fd1..05e600775b1e03ec055441dec2df7ad3ac2ced0e 100644
--- a/src/Mods/SpecialForce/FireBase.js
+++ b/src/Mods/SpecialForce/FireBase.js
@@ -100,7 +100,7 @@ App.UI.FireBase = function() {
App.UI.DOM.appendNewElement("p", node, ROE());
App.UI.DOM.appendNewElement("p", node, Accountability());
App.Events.addParagraph(node, ["Force depravity is a measure of how cruel and indifferent solders of the force are. This affects trade, how the force is viewed and or acts during some situations. Lower values lead to more ideal outcomes."]);
-
+
if (V.SF.MercCon.CanAttend === 0 || V.SF.MercCon.History >= 1 && repeatTrigger) {
r.push(`Her expression changes as something jogs her memory. "Before we begin, ${isBrazen ? `${properTitle()}` : 'boss'},`);
if (V.SF.MercCon.CanAttend === 0) {
@@ -176,10 +176,10 @@ App.UI.FireBase = function() {
const text = new DocumentFragment();
let focus = document.createElement("span");
App.UI.DOM.appendNewElement("span", focus, mapping());
-
+
App.UI.DOM.appendNewElement("span", text, "Deployment focus: ");
App.UI.DOM.appendNewElement("span", text, focus, "bold");
-
+
App.UI.DOM.appendNewElement("div", text, App.UI.DOM.link("Recruiting and Training",
() => {
V.SF.Target = "recruit";
@@ -187,7 +187,7 @@ App.UI.FireBase = function() {
}, [], "",
"Increases the amount of FNGs at the cost of revenue."
), "indent");
-
+
App.UI.DOM.appendNewElement("div", text, App.UI.DOM.link("Securing Trade Routes",
() => {
V.SF.Target = "secure";
@@ -195,7 +195,7 @@ App.UI.FireBase = function() {
}, [], "",
"Increases trade and reputation at the cost of revenue."
), "indent");
-
+
App.UI.DOM.appendNewElement("div", text, App.UI.DOM.link("Raiding and Slaving",
() => {
V.SF.Target = "raiding";
@@ -203,9 +203,9 @@ App.UI.FireBase = function() {
}, [], "",
"Increases revenue at the cost of less FNGs and increased force depravity."
), "indent");
-
+
return text;
-
+
function mapping() {
switch (V.SF.Target) {
case "recruit":
@@ -217,15 +217,15 @@ App.UI.FireBase = function() {
}
}
}
-
+
function ROE() {
const text = new DocumentFragment();
let focus = document.createElement("span");
App.UI.DOM.appendNewElement("span", focus, mapping());
-
+
App.UI.DOM.appendNewElement("span", text, "Rules of Engagements: ");
App.UI.DOM.appendNewElement("span", text, focus, "bold");
-
+
App.UI.DOM.appendNewElement("div", text, App.UI.DOM.link("Hold Fire",
() => {
V.SF.ROE = "hold";
@@ -233,7 +233,7 @@ App.UI.FireBase = function() {
}, [], "",
"Reduces force depravity."
), "indent");
-
+
App.UI.DOM.appendNewElement("div", text, App.UI.DOM.link("limited Fire",
() => {
V.SF.ROE = "limited";
@@ -241,7 +241,7 @@ App.UI.FireBase = function() {
}, [], "",
"Does not adjust force depravity."
), "indent");
-
+
App.UI.DOM.appendNewElement("div", text, App.UI.DOM.link("Free Fire",
() => {
V.SF.ROE = "free";
@@ -249,9 +249,9 @@ App.UI.FireBase = function() {
}, [], "",
"Increases force depravity."
), "indent");
-
+
return text;
-
+
function mapping() {
switch (V.SF.ROE) {
case "hold":
@@ -263,15 +263,15 @@ App.UI.FireBase = function() {
}
}
}
-
+
function Accountability() {
const text = new DocumentFragment();
let focus = document.createElement("span");
App.UI.DOM.appendNewElement("span", focus, mapping());
-
+
App.UI.DOM.appendNewElement("span", text, "Rules of Engagements: ");
App.UI.DOM.appendNewElement("span", text, focus, "bold");
-
+
App.UI.DOM.appendNewElement("div", text, App.UI.DOM.link("Strict Accountability",
() => {
V.SF.Regs = "strict";
@@ -279,7 +279,7 @@ App.UI.FireBase = function() {
}, [], "",
"Reduces force depravity."
), "indent");
-
+
App.UI.DOM.appendNewElement("div", text, App.UI.DOM.link("Some Accountability",
() => {
V.SF.Regs = "some";
@@ -287,7 +287,7 @@ App.UI.FireBase = function() {
}, [], "",
"Does not adjust force depravity."
), "indent");
-
+
App.UI.DOM.appendNewElement("div", text, App.UI.DOM.link("No Accountability",
() => {
V.SF.Regs = "none";
@@ -295,9 +295,9 @@ App.UI.FireBase = function() {
}, [], "",
"Increases force depravity."
), "indent");
-
+
return text;
-
+
function mapping() {
switch (V.SF.Regs) {
case "strict":
diff --git a/src/Mods/SpecialForce/SpecialForceFS.js b/src/Mods/SpecialForce/SpecialForceFS.js
index ce94d1dba85b8970f2eaa21d9fd098fdc39d59bd..37937314e597a0dba2981fd821369555376e8562 100644
--- a/src/Mods/SpecialForce/SpecialForceFS.js
+++ b/src/Mods/SpecialForce/SpecialForceFS.js
@@ -777,7 +777,7 @@ App.Mods.SF.fsIntegration = (function() {
if (passage() === "Economics" && !firstExecution) {
App.UI.DOM.appendNewElement("div", t, `This week your arcology lost a bit of prosperity and large amount of reputation, due to the looming threat that The Colonel and her forces may resurface.`, ["red"]);
}
-
+
let type;
switch (V.SF.Colonel.Core) {
case "kind":
diff --git a/src/art/webgl/art.js b/src/art/webgl/art.js
index d84de114fb5d7aa8a99d37bdf2cb214a4b6f891b..be76df5f30366f869f1af1d01243461839dc67e6 100644
--- a/src/art/webgl/art.js
+++ b/src/art/webgl/art.js
@@ -1143,7 +1143,7 @@ App.Art.applySurfaces = function(slave, scene, p) {
torsoLayers.push("tattoo_breeding");
}
- if (slave.birthsTat > 0 && slave.birthsTat >= 100) {
+ if (slave.birthsTat > 0 && slave.birthsTat >= 100) {
let location = "left abdomen";
let [, center, layer] = getDecalArea(location);
if (layer !== null) {
diff --git a/src/art/webgl/contents.txt b/src/art/webgl/contents.txt
index 0aa0767332dc4c4e86335373c8d1b11c01ed808a..0653f90fda9706580bfdfe2ea843ee97e8d23110 100644
--- a/src/art/webgl/contents.txt
+++ b/src/art/webgl/contents.txt
@@ -1,7 +1,7 @@
OUTDATED!!!
///////////////// MORPHS /////////////////
-General
+General
physicalAgeYoung
physicalAgeOld
weight
@@ -22,14 +22,14 @@ General
dickRemove
vaginaRemove - just closes the vagina
-amputee
+amputee
leftArm
rightArm
leftLeg
rightLeg
boobShape
- small
+ small
normal
perky
saggy
@@ -42,7 +42,7 @@ nipples
huge
puffy
-faceShape
+faceShape
normal
masculine
androgynous
@@ -50,15 +50,15 @@ faceShape
sensual
exotic
-lips
+lips
thin
normal
pretty
plush
huge
facepussy
-
-eyes
+
+eyes
normal
wide
round
@@ -66,16 +66,16 @@ eyes
slit
small
open
-
-nose
+
+nose
normal
wide
forward
flat
triangular
small
-
-forehead
+
+forehead
normal
round
small
@@ -84,7 +84,7 @@ expressions
happy
fear
-race
+race
white
asian
latina
@@ -97,7 +97,7 @@ race
indo-aryan (aryan)
malay
-poses
+poses
high
mid
low
@@ -110,7 +110,7 @@ general
makeup
fingernails
-skin color
+skin color
pure white (Ceridwen)
ivory (Ceridwen)
white (Ceridwen)
diff --git a/src/art/webgl/engine.js b/src/art/webgl/engine.js
index a89db2b1a5df24998f3057ee8e93f5e4f8ddae34..075f31981811d1bea76c65ff6ebb3d500f84e522 100644
--- a/src/art/webgl/engine.js
+++ b/src/art/webgl/engine.js
@@ -46,7 +46,7 @@ App.Art.Engine = class {
if (map_d < 0.85)
discard;
-
+
gPosition = pos;
gNormal = normalize(normal);
}`;
@@ -81,7 +81,7 @@ App.Art.Engine = class {
if (map_d < 0.85)
discard;
-
+
gShadowDepth = gl_FragCoord.z;
}`;
}
@@ -139,19 +139,19 @@ App.Art.Engine = class {
{
// get sample position
vec3 samplePos = TBN * samples[i]; // from tangent to view-space
- samplePos = pos + samplePos * radius;
-
+ samplePos = pos + samplePos * radius;
+
// project sample position
vec4 offset = vec4(samplePos, 1.0);
offset = projection * offset; // from view to clip-space
offset.xy /= offset.w; // perspective divide
offset.xy = offset.xy * 0.5 + 0.5; // transform to range 0.0 - 1.0
-
+
float sampleDepth = texture(gPosition, offset.xy).z;
-
+
// range check & accumulate
float rangeCheck = smoothstep(0.0, 1.0, radius / abs(pos.z - sampleDepth));
- occlusion += (sampleDepth <= samplePos.z + bias ? 1.0 : 0.0) * rangeCheck;
+ occlusion += (sampleDepth <= samplePos.z + bias ? 1.0 : 0.0) * rangeCheck;
}
ao = 1.0 - (occlusion / scale);
}`;
@@ -166,14 +166,14 @@ App.Art.Engine = class {
uniform sampler2D ssaoInput;
uniform float blur;
-
- void main()
+
+ void main()
{
vec2 texelSize = 1.0 / vec2(textureSize(ssaoInput, 0));
float result = 0.0;
- for (float x = -blur; x <= blur; x++)
+ for (float x = -blur; x <= blur; x++)
{
- for (float y = -blur; y <= blur; y++)
+ for (float y = -blur; y <= blur; y++)
{
vec2 offset = vec2(x, y) * texelSize;
result += texture(ssaoInput, textureCoord + offset).r;
@@ -222,19 +222,19 @@ App.Art.Engine = class {
{
// get sample position
vec3 samplePos = TBN * samples[i]; // from tangent to view-space
- samplePos = pos + samplePos * radius;
-
+ samplePos = pos + samplePos * radius;
+
// project sample position
vec4 offset = vec4(samplePos, 1.0);
offset = projection * offset; // from view to clip-space
offset.xy /= offset.w; // perspective divide
offset.xy = offset.xy * 0.5 + 0.5; // transform to range 0.0 - 1.0
-
+
float sampleDepth = texture(gPosition, offset.xy).z;
-
+
// range check & accumulate
float rangeCheck = smoothstep(0.0, 1.0, radius / abs(pos.z - sampleDepth));
- occlusion += (sampleDepth <= samplePos.z + bias ? 1.0 : 0.0) * rangeCheck;
+ occlusion += (sampleDepth <= samplePos.z + bias ? 1.0 : 0.0) * rangeCheck;
}
iao = 1.0 - (occlusion / scale);
}`;
@@ -249,14 +249,14 @@ App.Art.Engine = class {
uniform sampler2D sssInput;
uniform float blur;
-
- void main()
+
+ void main()
{
vec2 texelSize = 1.0 / vec2(textureSize(sssInput, 0));
float result = 0.0;
- for (float x = -blur; x <= blur; x++)
+ for (float x = -blur; x <= blur; x++)
{
- for (float y = -blur; y <= blur; y++)
+ for (float y = -blur; y <= blur; y++)
{
vec2 offset = vec2(x, y) * texelSize;
result += texture(sssInput, textureCoord + offset).r;
@@ -269,7 +269,7 @@ App.Art.Engine = class {
getFsSourceForwardPass(dl, pl) {
return `#version 300 es
precision highp float;
-
+
uniform float lightInt[${dl}];
uniform vec3 lightAmb[${dl}];
uniform vec3 lightColor[${dl}];
@@ -327,7 +327,7 @@ App.Art.Engine = class {
uniform float sSSS;
uniform float overlay;
-
+
uniform vec3 cameraPos;
uniform sampler2D textSampler[10];
@@ -341,23 +341,23 @@ App.Art.Engine = class {
const float PI = 3.14159265359;
- vec2 poissonDisk[16] = vec2[](
- vec2( -0.94201624, -0.39906216 ),
- vec2( 0.94558609, -0.76890725 ),
- vec2( -0.094184101, -0.92938870 ),
- vec2( 0.34495938, 0.29387760 ),
- vec2( -0.91588581, 0.45771432 ),
- vec2( -0.81544232, -0.87912464 ),
- vec2( -0.38277543, 0.27676845 ),
- vec2( 0.97484398, 0.75648379 ),
- vec2( 0.44323325, -0.97511554 ),
- vec2( 0.53742981, -0.47373420 ),
- vec2( -0.26496911, -0.41893023 ),
- vec2( 0.79197514, 0.19090188 ),
- vec2( -0.24188840, 0.99706507 ),
- vec2( -0.81409955, 0.91437590 ),
- vec2( 0.19984126, 0.78641367 ),
- vec2( 0.14383161, -0.14100790 )
+ vec2 poissonDisk[16] = vec2[](
+ vec2( -0.94201624, -0.39906216 ),
+ vec2( 0.94558609, -0.76890725 ),
+ vec2( -0.094184101, -0.92938870 ),
+ vec2( 0.34495938, 0.29387760 ),
+ vec2( -0.91588581, 0.45771432 ),
+ vec2( -0.81544232, -0.87912464 ),
+ vec2( -0.38277543, 0.27676845 ),
+ vec2( 0.97484398, 0.75648379 ),
+ vec2( 0.44323325, -0.97511554 ),
+ vec2( 0.53742981, -0.47373420 ),
+ vec2( -0.26496911, -0.41893023 ),
+ vec2( 0.79197514, 0.19090188 ),
+ vec2( -0.24188840, 0.99706507 ),
+ vec2( -0.81409955, 0.91437590 ),
+ vec2( 0.19984126, 0.78641367 ),
+ vec2( 0.14383161, -0.14100790 )
);
float distributionGGX(vec3 N, vec3 H, float roughness)
@@ -366,22 +366,22 @@ App.Art.Engine = class {
float a2 = a*a;
float NdotH = max(dot(N, H), 0.0);
float NdotH2 = NdotH*NdotH;
-
+
float num = a2;
float denom = (NdotH2 * (a2 - 1.0) + 1.0);
denom = PI * denom * denom;
-
+
return num / denom;
}
-
+
float geometrySchlickGGX(float NdotV, float roughness)
{
float r = (roughness + 1.0);
float k = (r*r) / 8.0;
-
+
float num = NdotV;
float denom = NdotV * (1.0 - k) + k;
-
+
return num / denom;
}
@@ -391,7 +391,7 @@ App.Art.Engine = class {
float NdotL = max(dot(N, L), 0.0);
float ggx2 = geometrySchlickGGX(NdotV, roughness);
float ggx1 = geometrySchlickGGX(NdotL, roughness);
-
+
return ggx1 * ggx2;
}
@@ -429,15 +429,15 @@ App.Art.Engine = class {
float S1 = m + a * l0;
float C2 = (a * P) / (P - S1);
float CP = -C2 / P;
-
+
vec3 w0 = 1.0 - smoothstep(0.0, m, x);
vec3 w2 = step(m + l0, x);
vec3 w1 = 1.0 - w0 - w2;
-
+
vec3 T = m * pow(x / m, vec3(c)) + b;
vec3 S = P - (P - S1) * exp(CP * (x - S0));
vec3 L = m + a * (x - m);
-
+
return T * w0 + L * w1 + S * w2;
}
@@ -466,7 +466,7 @@ App.Art.Engine = class {
coord = vec2(coord.x * cos(angle) - coord.y * sin(angle), coord.x * sin(angle) + coord.y * cos(angle));
coord = coord / scale;
coord = coord + vec2(0.5, 0.5);
-
+
if (sAlpha == 1.0)
map_d = d * texture(textSampler[1], coord).r;
@@ -500,7 +500,7 @@ App.Art.Engine = class {
if (sShadows == 1.0) {
vec3 projCoords = shadowMap.xyz/shadowMap.w * 0.5 + 0.5;
float currentDepth = projCoords.z;
- float bias = max(shadowBiasMax * (1.0 - dot(new_normal, shadowDir)), shadowBiasMin);
+ float bias = max(shadowBiasMax * (1.0 - dot(new_normal, shadowDir)), shadowBiasMin);
vec2 texelSize = 1.0 / vec2(textureSize(textSampler[8], 0));
for (int i=0;i<16;i++){
@@ -530,21 +530,21 @@ App.Art.Engine = class {
// calculate per-light radiance
vec3 L = -lightVect[i];
vec3 H = normalize(V + L);
- vec3 radiance = lightColor[i] * lightInt[i];
-
+ vec3 radiance = lightColor[i] * lightInt[i];
+
// cook-torrance brdf
- float NDF = distributionGGX(N, H, roughness);
- float G = geometrySmith(N, V, L, roughness);
- vec3 F = fresnelSchlickRoughness(max(dot(H, V), 0.0), F0, roughness);
-
+ float NDF = distributionGGX(N, H, roughness);
+ float G = geometrySmith(N, V, L, roughness);
+ vec3 F = fresnelSchlickRoughness(max(dot(H, V), 0.0), F0, roughness);
+
vec3 numerator = NDF * G * F;
float denominator = 4.0 * max(dot(N, V), 0.0) * max(dot(N, L), 0.0) + 0.00001;
- vec3 specular = numerator / denominator;
+ vec3 specular = numerator / denominator;
// kS is equal to Fresnel
vec3 kD = vec3(1.0) - F;
- kD *= 1.0 - metallic;
-
+ kD *= 1.0 - metallic;
+
// add to outgoing radiance Lo
float NdotL = max(dot(N, L), 0.0);
if (map_d >= 0.85 || overlay == 1.0) {
@@ -579,21 +579,21 @@ App.Art.Engine = class {
// calculate per-light radiance
vec3 L = normalize(pointLightPos[i] - pos);
vec3 H = normalize(V + L);
- vec3 radiance = pointLightColor[i] * pointLightInt[i];
-
+ vec3 radiance = pointLightColor[i] * pointLightInt[i];
+
// cook-torrance brdf
- float NDF = distributionGGX(N, H, roughness);
- float G = geometrySmith(N, V, L, roughness);
- vec3 F = fresnelSchlickRoughness(max(dot(H, V), 0.0), F0, roughness);
-
+ float NDF = distributionGGX(N, H, roughness);
+ float G = geometrySmith(N, V, L, roughness);
+ vec3 F = fresnelSchlickRoughness(max(dot(H, V), 0.0), F0, roughness);
+
vec3 numerator = NDF * G * F;
float denominator = 4.0 * max(dot(N, V), 0.0) * max(dot(N, L), 0.0) + 0.00001;
- vec3 specular = numerator / denominator;
+ vec3 specular = numerator / denominator;
// kS is equal to Fresnel
vec3 kD = vec3(1.0) - F;
- kD *= 1.0 - metallic;
-
+ kD *= 1.0 - metallic;
+
// add to outgoing radiance Lo
float NdotL = max(dot(N, L), 0.0);
if (map_d >= 0.85 || overlay == 1.0) {
@@ -637,7 +637,7 @@ App.Art.Engine = class {
if (sGamma == 1.0)
c = pow(c, vec3(1.0/gammaY));
-
+
if (sNormals == 1.0)
c = new_normal*0.5+0.5;
diff --git a/src/data/backwardsCompatibility/policiesBC.js b/src/data/backwardsCompatibility/policiesBC.js
index 3143dead083184a99bfb780f95dc95c043f9c31d..b967d1a122b2587ddfd5216c1c2f29b8a0131a85 100644
--- a/src/data/backwardsCompatibility/policiesBC.js
+++ b/src/data/backwardsCompatibility/policiesBC.js
@@ -17,7 +17,7 @@ App.Update.policies = function() {
gumjobFetishism: 0,
gumjobFetishismSMR: 0,
idealAge: 0
- });
+ });
// Spelling fixes:
V.policies.sexualOpenness = V.policies.sexualOpenness || V.policies.sexualOpeness || 0;
diff --git a/src/endWeek/economics/neighborsDevelopment.js b/src/endWeek/economics/neighborsDevelopment.js
index bc3c6c994dd7f3d1b1bac02183f54d7741c97a0a..3e97621a7646f96a23bfe81c5ea222d098c84c15 100644
--- a/src/endWeek/economics/neighborsDevelopment.js
+++ b/src/endWeek/economics/neighborsDevelopment.js
@@ -2083,7 +2083,7 @@ App.EndWeek.neighborsDevelopment = function() {
}
/* CROSS-FS ADOPTION */
- /** Map from source to an array of destination FSes. On the destination side, order matters; adoption is attempted in sequence through the array.
+ /** Map from source to an array of destination FSes. On the destination side, order matters; adoption is attempted in sequence through the array.
* If several destination FSes should be equally likely at a particular stage, put them in a nested array.
* @typedef {{fs: FC.FutureSociety, prereqs?: () => boolean, msg: string}} crossFSDest
* @type {Map<FC.FutureSociety, (crossFSDest|crossFSDest[])[]>} */
@@ -2569,7 +2569,7 @@ App.EndWeek.neighborsDevelopment = function() {
r.push(`${arc.name} is aligned with ${toSentence(aligned)} socially, encouraging it to consider adopting more of ${aligned.length > 1 ? 'their' : 'its'} cultural values.`);
}
if (opposed.length > 0) {
- r.push(`${arc.name} is culturally opposed with ${toSentence(opposed)} socially, encouraging it to resist adopting ${opposed.length > 1 ? 'their' : 'its'} cultural values.`);
+ r.push(`${arc.name} is culturally opposed with ${toSentence(opposed)} socially, encouraging it to resist adopting ${opposed.length > 1 ? 'their' : 'its'} cultural values.`);
}
if (usableCandidates.length > 0) {
const chosen = usableCandidates.random();
diff --git a/src/endWeek/economics/personalNotes.js b/src/endWeek/economics/personalNotes.js
index de0869c2201b1067d0ed56f573cc7f6efca57864..cfa10672ce78e75ca72b1ace1686e036d02d0685 100644
--- a/src/endWeek/economics/personalNotes.js
+++ b/src/endWeek/economics/personalNotes.js
@@ -36,7 +36,7 @@ App.EndWeek.personalNotes = function() {
App.Events.addParagraph(el, r);
r = [];
-
+
if (V.useTabs === 1) {
App.UI.DOM.appendNewElement("h2", el, `Diet`);
}
diff --git a/src/endWeek/nextWeek/nextWeek.js b/src/endWeek/nextWeek/nextWeek.js
index 38fba02bc6d292e18cc6a362f77f24915339f809..9207235f9ade89d98055f674cd56fdad4e775fde 100644
--- a/src/endWeek/nextWeek/nextWeek.js
+++ b/src/endWeek/nextWeek/nextWeek.js
@@ -330,7 +330,7 @@ App.EndWeek.nextWeek = function() {
V.pSurgery.nursePreg = -3;
}
}
-
+
if (V.doctor.state > 1) {
V.doctor.state = 1;
}
diff --git a/src/endWeek/player/prDiet.js b/src/endWeek/player/prDiet.js
index 178dfc59d925e94d0bc6a53c103104565be0a632..f470ac257defd11256285a3ffe69ed61a841d100 100644
--- a/src/endWeek/player/prDiet.js
+++ b/src/endWeek/player/prDiet.js
@@ -87,7 +87,7 @@ App.EndWeek.Player.diet = function(PC = V.PC) {
if (PC.vagina >= 0 && PC.vaginaLube === 0 && PC.energy > 20 && random(1, 100) > (100 - (PC.energy / 4))) {
r.push(`It also gets the juices flowing; <span class="change positive">your pussy is no longer so dry.</span>`);
PC.vaginaLube = 1;
- } else if (PC.energy > 95 && random(1, 100) > 40 + ((100 - PC.energy) * 10)) {
+ } else if (PC.energy > 95 && random(1, 100) > 40 + ((100 - PC.energy) * 10)) {
r.push(`It also gets the juices really flowing; <span class="change positive">your pussy has become so wet</span> that you're soaked with arousal by the end of your meal.`);
PC.vaginaLube = 2;
}
diff --git a/src/endWeek/player/prDrugs.js b/src/endWeek/player/prDrugs.js
index 96bc58a56f88a7ded585e86870e229e2e127dacd..2d8e40b9f22054602d7367074f240704f79bcd70 100644
--- a/src/endWeek/player/prDrugs.js
+++ b/src/endWeek/player/prDrugs.js
@@ -1343,7 +1343,7 @@ App.EndWeek.Player.drugs = function(PC = V.PC) {
r.push(`Your massive <span class="change positive">cock shrinks dully,</span> becoming noticeably shorter and thinner.`);
shrinkage = 2;
} else if ((PC.geneMods.NCS === 1) || (random(1, 100) > 40 - (V.injectionUpgrade * 10) - (PC.dick * 5) && PC.dick > 1)) {
- r.push(`Your <span class="change positive">cock shrinks dully,</span> becoming shorter and thinner.`);
+ r.push(`Your <span class="change positive">cock shrinks dully,</span> becoming shorter and thinner.`);
shrinkage = 1;
}
if (PC.geneMods.NCS === 1 && PC.dick > 2) {
@@ -1379,7 +1379,7 @@ App.EndWeek.Player.drugs = function(PC = V.PC) {
r.push(`Your enormous <span class="change positive">balls shrink dully,</span> losing mass inside your scrotum.`);
shrinkage = 1;
} else if ((PC.geneMods.NCS === 1) || (random(1, 100) > 40 - (V.injectionUpgrade * 10) - (PC.balls * 2) && PC.balls > 1)) {
- r.push(`Your <span class="change positive">balls shrink dully,</span> becoming smaller and filling out your scrotum less.`);
+ r.push(`Your <span class="change positive">balls shrink dully,</span> becoming smaller and filling out your scrotum less.`);
shrinkage = 1;
}
if (PC.geneMods.NCS === 1 && PC.balls > 2) {
@@ -1623,7 +1623,7 @@ App.EndWeek.Player.drugs = function(PC = V.PC) {
healthDamage(PC, 10);
r.push(`Since you've passed your due date, something your body is well aware of, the drugs begin having a <span class="health dec">negative affect on your health.</span>`);
} else if (WombBirthReady(PC, PC.pregData.normalBirth * .90) > 0) {
- r.push(`You're getting close to your intended due date, so it may be time to stop taking the drugs and "pop the cork," so to speak.`);
+ r.push(`You're getting close to your intended due date, so it may be time to stop taking the drugs and "pop the cork," so to speak.`);
}
}
}
diff --git a/src/endWeek/player/prHormones.js b/src/endWeek/player/prHormones.js
index 3092dc196038a7b164524bfe6145bb27fad1375f..f33394534f119213f69ddcd5bb00667b82d4b98f 100644
--- a/src/endWeek/player/prHormones.js
+++ b/src/endWeek/player/prHormones.js
@@ -125,8 +125,8 @@ App.EndWeek.Player.hormones = function(PC, selfManufactured, hormonePower) {
const slimModBreasts = (V.arcologies[0].FSSlimnessEnthusiastFoodLaw === 1 && !canEatFood(PC)) ? 0.45 : 1; // 600 average breast target, 270 target, 475 @ 350 hormone
const slimModButts = (V.arcologies[0].FSSlimnessEnthusiastFoodLaw === 1 && !canEatFood(PC)) ? 0.6 : 1; // 2.5 average butt, 1.5 target
/* 'Expected' breast size based on weight for feminine-bodied player. Masculine-bodied takes a small hit. */
- normBreasts = Math.trunc((100 + (PC.weight + 100) * 5 + 2 * PC.lactationAdaptation) * (0.85 + PC.hormoneBalance / 400) * gigantomastiaMod * slimModBreasts / Math.max(PC.title * 1.25, 1));
- normButt = ((PC.weight + 100) * 0.025 * (0.9 + PC.hormoneBalance / 600) * (rearLipedemaMod / 2 + 1) * slimModButts / Math.max(PC.title * 1.10, 1));
+ normBreasts = Math.trunc((100 + (PC.weight + 100) * 5 + 2 * PC.lactationAdaptation) * (0.85 + PC.hormoneBalance / 400) * gigantomastiaMod * slimModBreasts / Math.max(PC.title * 1.25, 1));
+ normButt = ((PC.weight + 100) * 0.025 * (0.9 + PC.hormoneBalance / 600) * (rearLipedemaMod / 2 + 1) * slimModButts / Math.max(PC.title * 1.10, 1));
}
if (PC.hormoneBalance >= 350) {
diff --git a/src/endWeek/reports/penthouseReport.js b/src/endWeek/reports/penthouseReport.js
index 053be20e10e8a2f1d1f07a7264ba34f6919e79ae..e2b8133c83a421fba0bb102d81f97ed18821f84c 100644
--- a/src/endWeek/reports/penthouseReport.js
+++ b/src/endWeek/reports/penthouseReport.js
@@ -61,7 +61,7 @@ App.EndWeek.penthouseReport = function() {
} = getPronouns(slave);
let r = [];
let milkResults;
-
+
r.push(App.SlaveAssignment.saSlaveIntro(slave, ''));
if (slave.choosesOwnAssignment) {
r.push(He); // starts new sentence
diff --git a/src/endWeek/saChoosesOwnClothes.js b/src/endWeek/saChoosesOwnClothes.js
index c2794b7b947ac1063ef0b79801ead1efe25dfa58..d82d70518886c64e8f0c7882e6b232cba504f74f 100644
--- a/src/endWeek/saChoosesOwnClothes.js
+++ b/src/endWeek/saChoosesOwnClothes.js
@@ -997,7 +997,7 @@ App.SlaveAssignment.choosesOwnClothes = function saChoosesOwnClothes(slave) {
}
}
if (V.arcologies[0].FSChattelReligionist > 0) {
- // Chattel religionism is currently the only FS with a hard advancement link to clothing. Accepting slaves should never voluntarily select an outfit that won't help.
+ // Chattel religionism is currently the only FS with a hard advancement link to clothing. Accepting slaves should never voluntarily select an outfit that won't help.
clothing.deleteWith(c => !ChattelReligionistClothingPass(c.clothes));
if (clothing.length < 1) {
if (V.arcologies[0].FSChattelReligionistLaw2 === 1) {
diff --git a/src/endWeek/saSocialEffects.js b/src/endWeek/saSocialEffects.js
index f44a50ee2530698c00314dbac824a7f897a1575c..7001dd37118c4f5addaf765f0849c89d263fb0a0 100644
--- a/src/endWeek/saSocialEffects.js
+++ b/src/endWeek/saSocialEffects.js
@@ -1070,7 +1070,7 @@ App.SlaveAssignment.saSocialEffects = function(slave) {
// temporarily enact the FS at full strength
V.arcologies[0][proposedFS] = 100;
// see what the slave's social effects would be under the proposed FS
- const newSocialEffects = [...makeSocialEffects(), ...makeShelterGirlEffects()];
+ const newSocialEffects = [...makeSocialEffects(), ...makeShelterGirlEffects()];
// undo the temporary FS enactment
V.arcologies[0][proposedFS] = "unset";
// return the differences between the current and new states
diff --git a/src/endWeek/standardSlaveReport.js b/src/endWeek/standardSlaveReport.js
index 9890556c28192c4147d8b311487fd6c9d449df12..b4962282ac7d0b102ac28f303ab1d80308975157 100644
--- a/src/endWeek/standardSlaveReport.js
+++ b/src/endWeek/standardSlaveReport.js
@@ -65,7 +65,7 @@ App.SlaveAssignment.saSlaveName = function(slave) {
/**
* Render linkified slave name with job assignment statement.
* @param {App.Entity.SlaveState} slave
- * @param {string} def - this statement will be used if the slave ISN'T choosing her own job. Generally, something like "is <verb>ing in <facility>." Note that penthouse jobs do not have a default job statement, instead leading directly into the job text if the slave is not choosing her own job.
+ * @param {string} def - this statement will be used if the slave ISN'T choosing her own job. Generally, something like "is <verb>ing in <facility>." Note that penthouse jobs do not have a default job statement, instead leading directly into the job text if the slave is not choosing her own job.
*/
App.SlaveAssignment.saSlaveIntro = function(slave, def) {
const frag = this.saSlaveName(slave);
diff --git a/src/events/JE/jeSlaveDisputeBreedingDeal.js b/src/events/JE/jeSlaveDisputeBreedingDeal.js
index c59d2d39e0203472f848a4150bd3769f686418da..521f0125e325de0652f30e559bef9e32e9605d69 100644
--- a/src/events/JE/jeSlaveDisputeBreedingDeal.js
+++ b/src/events/JE/jeSlaveDisputeBreedingDeal.js
@@ -99,7 +99,7 @@ App.Events.JESlaveDisputeBreedingDeal = class JESlaveDisputeBreedingDeal extends
const frag = new DocumentFragment();
let r = [];
cashX(forceNeg(contractCost), "slaveTransfer");
- r.push(`You offer to buy out the deal, paying the breeder and taking the slave yourself, and passing the child off to the buyer. The citizen gets what he wants and speaks <span class="green">kindly</span> in public about how you helped smooth over a rather rough dispute. The breeder sends a <span class="green">positive note</span> around the industry to the effect that slavers trading with your arcology can expect to be aided in times of need; though the loss of a star mother always stings.`);
+ r.push(`You offer to buy out the deal, paying the breeder and taking the slave yourself, and passing the child off to the buyer. The citizen gets what he wants and speaks <span class="green">kindly</span> in public about how you helped smooth over a rather rough dispute. The breeder sends a <span class="green">positive note</span> around the industry to the effect that slavers trading with your arcology can expect to be aided in times of need, though the loss of a star mother always stings.`);
V.arcologies[0].prosperity += 3;
repX(300, "event");
App.Events.addParagraph(frag, r);
diff --git a/src/events/PE/foodplay.js b/src/events/PE/foodplay.js
index 512371f58de5db63b621032ac68d453c63f89693..fbd1d709c3c1db3f3c842a07ea868a6560ca09db 100644
--- a/src/events/PE/foodplay.js
+++ b/src/events/PE/foodplay.js
@@ -42,7 +42,7 @@ App.Events.PEFoodplay = class PEFoodplay extends App.Events.BaseEvent {
r.push(`You summon`);
r.push(contextualIntro(V.PC, eventSlave, true));
- r.push(`to your office and order her to lie down on your desk.`);
+ r.push(`to your office and order ${him} to lie down on your desk.`);
if (hasAnyLegs(eventSlave)){
if (eventSlave.devotion > 50){
r.push(`${He} complies with a smile, excited to see what you have in store for ${him}.`);
@@ -84,7 +84,7 @@ App.Events.PEFoodplay = class PEFoodplay extends App.Events.BaseEvent {
r.toParagraph();
- r.push(`Two pieces are laid onto her`);
+ r.push(`Two pieces are laid onto ${his}`);
if (eventSlave.boobs > 40000) {
r.push(`gargantuan`);
} else if (eventSlave.boobs > 25000) {
@@ -111,7 +111,7 @@ App.Events.PEFoodplay = class PEFoodplay extends App.Events.BaseEvent {
}
if (eventSlave.areolae > 2){
- r.push(`, barely covering her huge areolas`);
+ r.push(`, barely covering ${his} huge areolas`);
}
r.push(`and ${eventSlave.nipples} nipples.`);
@@ -270,7 +270,7 @@ App.Events.PEFoodplay = class PEFoodplay extends App.Events.BaseEvent {
r.toParagraph();
- r.push(`Under your eager attention, ${eventSlave.slaveName} collapses in a moaning, writhing puddle on your desk. You clean your mouth with a handkerchief and tell her to get back to her assignment before calling in another slave to clean up the mess.`);
+ r.push(`Under your eager attention, ${eventSlave.slaveName} collapses in a moaning, writhing puddle on your desk. You clean your mouth with a handkerchief and tell ${him} to get back to ${his} assignment before calling in another slave to clean up the mess.`);
r.toParagraph();
diff --git a/src/events/intro/newGamePlusPassage.js b/src/events/intro/newGamePlusPassage.js
index d787e2814074565d44dd06fe6935e76bf3a4a021..f2b27c4f23d9903b776116f85fa32c0a1e262123 100644
--- a/src/events/intro/newGamePlusPassage.js
+++ b/src/events/intro/newGamePlusPassage.js
@@ -12,7 +12,7 @@ App.Intro.newGamePlus = function() {
if (V.cash >= fee) {
App.Events.addNode(node, [`You have allocated funds to bring up to ${V.slavesToImportMax} slaves with you (or your equivalent) to a new arcology. It will cost <span class="yellowgreen">${cashFormat(fee)}</span> to ensure another slave's safe transfer. You have <span class="yellowgreen">${cashFormat(V.cash)}</span> to spend.`], "div");
App.UI.DOM.appendNewElement("div", node, makePurchase(
- "Increase slave import capacity by 1.", fee, "capEx",
+ "Increase slave import capacity by 1.", fee, "capEx",
{handler: () => { V.slavesToImportMax++; }}
));
} else {
diff --git a/src/events/nonRandom/pAbducted.js b/src/events/nonRandom/pAbducted.js
index ffce82a2caa1f7bb95ff8db1a3b8b0de7985d0a6..58314473eb082c4dd6b1dd2986ac1425fb8d4087 100644
--- a/src/events/nonRandom/pAbducted.js
+++ b/src/events/nonRandom/pAbducted.js
@@ -29,7 +29,7 @@ App.Events.pAbducted = class pAbducted extends App.Events.BaseEvent {
abductor.skill.oral = 0;
abductor.skill.anal = 0;
abductor.muscles = Math.max(abductor.muscles, 40);
- abductor.origin = `You sentenced $him to enslavement for the attempted abduction of a child.`;
+ abductor.origin = `You sentenced $him to enslavement for the attempted abduction of a child - you, to be exact.`;
abductor.devotion = -100;
abductor.trust = -100;
setHealth(abductor, jsRandom(-40, -20), normalRandInt(15, 3), undefined, 1, random(30, 80));
@@ -39,10 +39,10 @@ App.Events.pAbducted = class pAbducted extends App.Events.BaseEvent {
const {
He,
- his, he, him
+ his, he, him, himself, woman
} = getPronouns(abductor);
- r.push(`While returning from a meeting with a prospective investor, an unfortunate wrong turn has led you into a rather seedy area of your arcology. You feel distinctly uncomfortable for some reason. You suspicions are quickly confirmed as a bag is swung over your head. Your grab your assailant's wrists and struggle to keep them from completely engulfing you,`);
+ r.push(`While returning from a meeting with a prospective investor, an unfortunate wrong turn has led you into a rather seedy area of your arcology. You feel distinctly uncomfortable for some reason. Your suspicions are quickly confirmed as a bag is swung over your head. Your grab your assailant's wrists and struggle to keep them from completely engulfing you,`);
if (overpowerCheck(abductor, V.PC) >= random(1, 100)) {
r.push(`only to find that you're quite capable of keeping them at bay.`);
@@ -60,7 +60,7 @@ App.Events.pAbducted = class pAbducted extends App.Events.BaseEvent {
r.push(`You cry out as you yank the weapon from your body, and clutching the gushing wound, hobble back the way you came — the way back to safety. The world spins as you lose consciousnesses.`);
App.Events.addParagraph(node, r);
r = [];
- r.push(`You awaken on a hard cot, staring face to face with a rather haggard looking man. You leap in shock, sending the man swearing and tearing your stitches open. As you regain composure, and get restitched, you realize that you are in a particularly shitty clinic known for their outrageous treatment fees. The wound was minor and should heal readily, but it will keep you out of commission for a little. `);
+ r.push(`You awaken on a hard cot, staring face to face with a rather haggard looking man. You leap in shock, sending the man swearing and tearing your stitches open. As you regain your composure, and get restitched, you realize that you are in a particularly shitty clinic known for their outrageous treatment fees. The wound was minor and should heal readily, but it will keep you out of commission for a little. `);
if (V.PC.preg > 2 && V.PC.pregKnown) {
r.push(`You're just glad it didn't harm your womb. This could have been a lot worse.`);
}
@@ -79,7 +79,7 @@ App.Events.pAbducted = class pAbducted extends App.Events.BaseEvent {
}
App.Events.addParagraph(node, r);
r = [];
- r.push(`It would be prudent to up security in your arcology. That or take a guard along when you leave the penthouse. You are undeniably a high-value target for wealthy collectors and would rather avoid any future attempts and or stabbings. Even with a full description of them, your assailant got away; there was just nobody interested in tracking him down.`);
+ r.push(`It would be prudent to up security in your arcology. That or take a guard along when you leave the penthouse. You are undeniably a high-value target for wealthy collectors and would rather avoid any future attempts and or stabbings. Even with a full description of him, your assailant got away; there was just nobody interested in tracking him down.`);
App.Events.addParagraph(node, r);
cashX(-1000, "event");
}
@@ -124,7 +124,7 @@ App.Events.pAbducted = class pAbducted extends App.Events.BaseEvent {
const node = new DocumentFragment();
const bounty = 500 * random(3, 6);
let r = [];
- r.push(`Calling for help when it's just you and your abductor is nothing short of an invitation for trouble, so you keep your mouth shut and wait for an opportunity. There's only so many ways in and out of the arcology, and there's bound to be people going about their business through them at this hour. After an uncomfortably cramped ride and having to put up with your captive merrily humming to himself and arriving at a suitably populated loading dock, the thought occurs to you; what if they don't believe you are anything more than an unbroken slave?`);
+ r.push(`Calling for help when it's just you and your abductor is nothing short of an invitation for trouble, so you keep your mouth shut and wait for an opportunity. There's only so many ways in and out of the arcology, and there's bound to be people going about their business through them at this hour. After an uncomfortably cramped ride and having to put up with your captive merrily humming to himself and arriving at a suitably populated loading dock, the thought occurs to you: what if they don't believe you are anything more than an unbroken slave?`);
if (V.PC.actualAge < V.minimumSlaveAge) {
r.push(`Fortunately, you are actually underage, so your screams for help quickly attract concerned workers. They corner the man and pry the lid off your box, allowing you to clamber back onto solid ground. Your would-be captor makes a short lived escape attempt straight into a fist once he realizes his plans are ruined. He's quickly tied up and presented to you for revenge.`);
abductor.minorInjury = "black eye";
@@ -140,7 +140,7 @@ App.Events.pAbducted = class pAbducted extends App.Events.BaseEvent {
App.Utils.scheduleSidebarRefresh();
V.fcnn.push("...plans for increased security measures following the unsuccessful abduction of...");
- App.UI.DOM.appendNewElement("div", node, `Now the only remaining question is what to do with the would-be kidnapper. You could toss them out of the arcology, but it might be more fun to turn the tables on ${him}.`);
+ App.UI.DOM.appendNewElement("div", node, `Now the only remaining question is what to do with the would-be kidnapper. You could toss ${him} out of the arcology, but it might be more fun to turn the tables on ${him}.`);
App.UI.DOM.appendNewElement("div", node, `Applying enslavement as punishment will cost ${cashFormat(contractCost)}. Doing so and then selling ${him} immediately will bring in approximately ${cashFormat(slaveCost(abductor) - contractCost)}.`, ["note"]);
node.append(App.Desc.longSlave(abductor, {market: "generic"}));
diff --git a/src/events/nonRandom/pFSAnnouncement.js b/src/events/nonRandom/pFSAnnouncement.js
index 10b47e27cc9339832b6a3cbaea41bb9b3942bc7c..36bca5e37c0a6aec29220e3cda1f18839609be24 100644
--- a/src/events/nonRandom/pFSAnnouncement.js
+++ b/src/events/nonRandom/pFSAnnouncement.js
@@ -15,7 +15,7 @@ App.Events.PFSAnnouncement = class PFSAnnouncement extends App.Events.BaseEvent
App.Events.drawEventArt(node, "assistant");
- const {heA} = getPronouns(assistant.pronouns().main).appendSuffix("A"); // Assistant Awakens doesn't have a rep requirement, but this event does. It's possible for them to trigger in either order.
+ const {heA} = getPronouns(assistant.pronouns().main).appendSuffix("A"); // Assistant Awakens doesn't have a rep requirement, but this event does. It's possible for them to trigger in either order.
App.Events.addParagraph(node, [`The simple pleasure of power has to be experienced to be understood. You often take a moment to stand on a balcony overlooking an interior atrium, watching the living, breathing, flowing current of your demesne. ${capFirstChar(V.assistant.name)} knows to allow you these moments of peace.`]);
App.Events.addParagraph(node, [`You immediately pay attention, therefore, when ${heA} interrupts. "${properTitle()}," ${heA} says, "this is an appropriate moment to bring a serious matter to your attention. I monitor conversations, social media, and general opinion within the arcology where I can. You are respected, and the inhabitants of this arcology are starting to look to you to give direction to society."`]);
diff --git a/src/events/nonRandom/pInvasion.js b/src/events/nonRandom/pInvasion.js
index 79786343ba72deb84f78e55b6a105d921def84f2..e97fc9a0debc75c3f3fb49e2774b5581f9bc9c37 100644
--- a/src/events/nonRandom/pInvasion.js
+++ b/src/events/nonRandom/pInvasion.js
@@ -83,11 +83,11 @@ App.Events.PInvasion = class PInvasion extends App.Events.BaseEvent {
}
r.push(`It's going well. Whoever's in command of the attackers sees that their fire is having no effect, and orders an advance. The mortars and other artillery systems maintain their fire, trying to occupy as many guns as possible.`);
App.Events.addParagraph(node, r);
-
+
r = [];
r.push(`The loose militia lately organized by the arcology owners has been called out to defend the city. Its commander, seeing that the attackers have more passion than tactical skill, orders an immediate counterattack by anyone able${(V.terrain === "marine" || V.terrain === "oceanic") ? " to push the invaders landing in the dock areas back into the sea" : ""}. Technology has advanced to the point that rich militiamen who buy their own gear can form a powerful fighting force. With luck, the counterattack should shatter the enemy.`);
App.Events.addParagraph(node, r);
-
+
r = [];
if (V.personalArms === 0) {
r.push(`Since you are not well armed or armored, you stay back and oversee the defense of your own arcology.`);
@@ -97,7 +97,7 @@ App.Events.PInvasion = class PInvasion extends App.Events.BaseEvent {
r.push(`Since you are well armed and armored and your drones are combat ready, you take part in the counterattack. You are preceded into combat by a wedge of your drones, which lack the intelligence to take good cover but are remorseless and highly accurate. Your exoskeleton mounts a smart mortar system that independently targets and eliminates enemy groups even as you lay down fire from the guns mounted on your forearms.`);
}
App.Events.addParagraph(node, r);
-
+
r = [];
if (V.mercenaries === 0) {
r.push(`You are alone in contributing to the defense of your home.`);
@@ -108,7 +108,7 @@ App.Events.PInvasion = class PInvasion extends App.Events.BaseEvent {
}
}
App.Events.addParagraph(node, r);
-
+
r = [];
if (V.mercenaries + V.personalArms < 2) {
r.push(`<span class="red">The counterattack fails.</span> The enemy is eventually defeated, but only after they get mired in urban combat in the streets of the Free City. <span class="red">${V.arcologies[0].name} takes considerable damage from`);
diff --git a/src/events/nonRandom/rival/pRivalryHostage.js b/src/events/nonRandom/rival/pRivalryHostage.js
index 6953beab2b1e3f79485a36bf2b2b94ade8e3a476..a28f33a52f895717a4d6201bb74a7f1b3eac82f4 100644
--- a/src/events/nonRandom/rival/pRivalryHostage.js
+++ b/src/events/nonRandom/rival/pRivalryHostage.js
@@ -429,7 +429,7 @@ App.Events.pRivalryHostage = function() {
params.race = "nonslave";
params.disableDisability = 1;
- /** The hostage is always a peer of a young PC, but younger than an adult PC. Find the appropriate age range for slave generation.
+ /** The hostage is always a peer of a young PC, but younger than an adult PC. Find the appropriate age range for slave generation.
* @param {number} adultMin
* @param {number} adultMax
*/
diff --git a/src/events/recETS/recetsIncestTwinsMixed.js b/src/events/recETS/recetsIncestTwinsMixed.js
index da82a05d02f9cc6568edb6973acbe3d802197aca..b8f46f391e77f63a4c5b6854ae8a61af278e4013 100644
--- a/src/events/recETS/recetsIncestTwinsMixed.js
+++ b/src/events/recETS/recetsIncestTwinsMixed.js
@@ -62,7 +62,7 @@ App.Events.recetsIncestTwinsMixed = class recetsIncestTwinsMixed extends App.Eve
bro.clothes = "conservative clothing";
bro.relationship = 3;
bro.relationshipTarget = sis.ID;
-
+
sis.relationshipTarget = bro.ID;
if (V.seePreg) {
diff --git a/src/events/scheduled/assholeKnight.js b/src/events/scheduled/assholeKnight.js
index 8375dbf0a44ed8047c3e50dc5a7f4e1c61d8b480..2e4953c0e69c3eb0fc55249e41c403acfccbbe3d 100644
--- a/src/events/scheduled/assholeKnight.js
+++ b/src/events/scheduled/assholeKnight.js
@@ -39,7 +39,7 @@ App.Events.SEAssholeKnight = class SEAssholeKnight extends App.Events.BaseEvent
assholeKnight.boobs = Math.min(assholeKnight.boobs, 450);
}
assholeKnight.accent = random(0, 1);
-
+
const {he, his, him, woman} = getPronouns(assholeKnight);
App.Events.drawEventArt(node, assholeKnight, "Imperial Plate");
diff --git a/src/events/scheduled/pitFightLethal.js b/src/events/scheduled/pitFightLethal.js
index a3d2f056ab1b8df690d4cd995054537f76a1d4d1..fd05d6e975dced3dea4d4ce7cb1a4fc466513887 100644
--- a/src/events/scheduled/pitFightLethal.js
+++ b/src/events/scheduled/pitFightLethal.js
@@ -16,7 +16,7 @@ App.Facilities.Pit.lethalFight = function(fighters) {
animals.push(V.active.feline);
}
- if (V.pit.fighters === 2 || V.pit.slaveFightingAnimal) {
+ if (V.pit.fighters === 2 || V.pit.slaveFightingAnimal) {
animal = V.pit.animal === 'random'
? getAnimal(animals.random())
: getAnimal(V.pit.animal);
diff --git a/src/facilities/salon/salonPassage.js b/src/facilities/salon/salonPassage.js
index 70974df9f6d32f10cbec07ec904bb287f42381ac..0e73768577eea7e04a69458f8c8d7a5310db09b9 100644
--- a/src/facilities/salon/salonPassage.js
+++ b/src/facilities/salon/salonPassage.js
@@ -673,7 +673,7 @@ App.UI.salon = function(slave, cheat = false, startingGirls = false) {
option = options.addOption("Effect color", "tailEffectColor", slave);
for (const color of filtered) {
- option.addValue(capFirstChar(color.value), color.value, billMod);
+ option.addValue(capFirstChar(color.value), color.value, billMod);
}
option.pulldown();
diff --git a/src/facilities/surgery/analyzePregnancy.js b/src/facilities/surgery/analyzePregnancy.js
index 7ed19d59c5e90f27c505f4de9a465aa26f53a063..2beb1a23541d70a6120c16e879fe2a39fafa827d 100644
--- a/src/facilities/surgery/analyzePregnancy.js
+++ b/src/facilities/surgery/analyzePregnancy.js
@@ -109,12 +109,12 @@ globalThis.analyzePregnancies = function(mother, cheat) {
el.append(fetusAbnormalities());
}
if(V.inbreeding && genes.inbreedingCoeff!==undefined)
- {
+ {
option = options.addOption(`Inbreeding coefficient: ${genes.inbreedingCoeff}`, "inbreedingCoeff", genes);
if (cheat) {
option.showTextBox();
}
- }
+ }
} else {
if (fetus.age > 13) {
App.UI.DOM.appendNewElement("div", el, `Gender: ${genes.gender}`);
diff --git a/src/gui/Encyclopedia/encyclopediaFutureSocities.js b/src/gui/Encyclopedia/encyclopediaFutureSocities.js
index 492d280f0225106faecfff752914bf1e9293e879..dc082f4b248b196419adccb29402780bf4aab260 100644
--- a/src/gui/Encyclopedia/encyclopediaFutureSocities.js
+++ b/src/gui/Encyclopedia/encyclopediaFutureSocities.js
@@ -56,7 +56,7 @@ App.Encyclopedia.addArticle("Gender Radicalism", function() {
r.toNode("div");
App.Events.addNode(t, ["Improves the value of slaves with dicks and slaves with balls."], "div", ["indent"]);
App.Events.addNode(t, ["Can be developed to affect the biology seen in the slave market, and subtly influence arcology society."], "div", ["indent"]);
- App.Events.addNode(t, [`Provides demand for; slaves with dicks, hormonally treated slaves and futanari${V.seeDicks !== 0 ? ' and ballsless bitches' : ''} from`, App.Encyclopedia.Dialog.linkDOM("The Corporation.", "The Corporation")]);
+ App.Events.addNode(t, [`Provides demand for; slaves with dicks, hormonally treated slaves and futanari${V.seeDicks !== 0 ? ' and ballsless bitches' : ''} from`, App.Encyclopedia.Dialog.linkDOM("The Corporation.", "The Corporation")]);
App.Events.addNode(t, ["Mutually exclusive with", App.Encyclopedia.Dialog.linkDOM("Gender Fundamentalism.", "Gender Fundamentalism")]);
return t;
}, "FutureSocities");
diff --git a/src/gui/Encyclopedia/encyclopediaMods.js b/src/gui/Encyclopedia/encyclopediaMods.js
index ca3076dd6a491908e2c67acc9690a29b59efa69a..d5c875dab6bacb7d4464432127e2ac2f548876ea 100644
--- a/src/gui/Encyclopedia/encyclopediaMods.js
+++ b/src/gui/Encyclopedia/encyclopediaMods.js
@@ -283,7 +283,7 @@ App.Encyclopedia.addArticle("The Incubation Facility", function() {
const r = new SpacedTextAccumulator(f);
r.push("A facility used to rapidly age children kept within its aging tanks using a combination of growth hormones, accelerants, stem cells and other chemicals; slaves that come out of it are rarely healthy. The Incubator requires a massive amount of electricity to run, though once powered contains a battery backup that can last at least a day. It can be upgraded to combat malnutrition and thinness caused by a body growing far beyond any natural rate. Hormones can also be added to encourage puberty and even sex organ development. Growth control systems include cost saving overrides, though enabling them may result in bloated, sex crazed slaves barely capable of moving.");
r.toNode("div");
-
+
App.Events.addNode(f, ["Please click", App.Encyclopedia.Dialog.linkDOM("here", "Facilities Overview"), "for an overview of other facilities."], "p");
return f;
}, "Mods");
diff --git a/src/js/economyJS.js b/src/js/economyJS.js
index cb4149763c063c0ebfa54121f11e7b0a0f35debd..763fca1727132d8874b9cc5bc14cd167ea4e0f5d 100644
--- a/src/js/economyJS.js
+++ b/src/js/economyJS.js
@@ -841,22 +841,22 @@ globalThis.calculateCosts = (function() {
break;
}
if (V.PC.geneticQuirks.fertility === 2 && V.PC.geneticQuirks.hyperFertility === 2 && V.PC.preg === 0 && (V.PC.ovaries === 1 || V.PC.mpreg === 1)) {
- costs += Math.trunc(foodCost * 0.5);
+ costs += Math.trunc(foodCost * 0.5);
}
if (V.PC.geneticQuirks.rearLipedema === 2) {
- costs += Math.trunc(foodCost * 0.2);
+ costs += Math.trunc(foodCost * 0.2);
}
if (V.PC.geneticQuirks.macromastia === 2) {
- costs += Math.trunc(foodCost * 0.2);
+ costs += Math.trunc(foodCost * 0.2);
}
if (V.PC.geneticQuirks.gigantomastia === 2) {
- costs += Math.trunc(foodCost * 0.2);
+ costs += Math.trunc(foodCost * 0.2);
}
if (V.PC.geneticQuirks.mGain === 2 && V.PC.geneticQuirks.mLoss !== 2) {
- costs += Math.trunc(foodCost * 0.2);
+ costs += Math.trunc(foodCost * 0.2);
}
if (V.PC.geneticQuirks.wGain === 2 && V.PC.geneticQuirks.wLoss !== 2) {
- costs += Math.trunc(foodCost * 0.2);
+ costs += Math.trunc(foodCost * 0.2);
}
if (V.PC.drugs === 'appetite suppressors') {
costs -= foodCost;
@@ -944,7 +944,7 @@ globalThis.calculateCosts = (function() {
costs += Math.trunc(drugsCost * Math.abs(V.PC.hormones) * (V.consumerDrugs ? 0.5 : 1));
}
if (V.PC.bodySwap > 0) {
- costs += Math.trunc(drugsCost * V.PC.bodySwap * 10);
+ costs += Math.trunc(drugsCost * V.PC.bodySwap * 10);
}
if (V.PC.preg === -1) {
costs += Math.trunc(drugsCost * 0.5);
diff --git a/src/js/ibcJS.js b/src/js/ibcJS.js
index e7dde696f7298466afb896af1a0883916ed344ae..3573a465ba6499084c9e339643c0a9a87aebae6a 100644
--- a/src/js/ibcJS.js
+++ b/src/js/ibcJS.js
@@ -112,7 +112,7 @@ globalThis.ibc = (() => {
if (vs1 === undefined)
vs1 = vs[id1] = [];
- // cache format, conceptually: a set of arrays of numbers. the top-level set is indexed by id1. a lower-level array has the format
+ // cache format, conceptually: a set of arrays of numbers. the top-level set is indexed by id1. a lower-level array has the format
// [id, kinship value, id, kinship value, ...] with the id in an entry corresponding to id2 here and with the pairs in the array being kept invariably sorted by id.
return this.kinship_cache(vs1, id2, calculateValue);
}
diff --git a/src/js/rulesAutosurgery.js b/src/js/rulesAutosurgery.js
index cbda4cf5bbb2e64ffaf65c5ae4410a822cdfb150..06eaddbf73fb5d937155a664f58c9d2043048a1c 100644
--- a/src/js/rulesAutosurgery.js
+++ b/src/js/rulesAutosurgery.js
@@ -138,7 +138,7 @@ globalThis.rulesAutosurgery = (function() {
}
const [diff, reaction] = surgeryResult;
- const result1 = reaction.reaction(slave, diff);
+ const result1 = reaction.reaction(slave, diff);
const result2 = reaction.outro(slave, diff, result1);
App.Utils.Diff.applyDiff(slave, diff);
diff --git a/src/markets/specificMarkets/householdLiquidator.js b/src/markets/specificMarkets/householdLiquidator.js
index 4892ac3ee2e545be04b3edfc2f4194d8abcc22c8..4d2ad2477d4b8e177de66dd23a2038fc1ccf971d 100644
--- a/src/markets/specificMarkets/householdLiquidator.js
+++ b/src/markets/specificMarkets/householdLiquidator.js
@@ -18,7 +18,7 @@ App.Markets["Household Liquidator"] = function() {
App.UI.DOM.appendNewElement("p", el, `The household liquidator is offering a set of siblings for sale. You are permitted to inspect both slaves.`);
const relativeSlave = generateRelatedSlave(slave, "younger sibling", oppositeSex);
-
+
newSlaves = prepSlaveSale(3.0, slave, relativeSlave);
} else if (jsRandom(1, 100) > 20) {
// Old enough to have a child who can be a slave.
diff --git a/src/neighbor/neighborDescription.js b/src/neighbor/neighborDescription.js
index dcf022157697b8d756144bc960186584b1c8d853..cc97a4a1c3f75d0e8c82056f108261766ca6545a 100644
--- a/src/neighbor/neighborDescription.js
+++ b/src/neighbor/neighborDescription.js
@@ -161,7 +161,7 @@ App.UI.neighborDescription = function(i) {
40: `quite a sight, since its citizens and slaves all lift constantly`,
0: `the site of a musclegirl fetish community`,
},
- FSHedonisticDecadence: {
+ FSHedonisticDecadence: {
95: `very well known as a place where every imaginable desire and fantasy can be fulfilled`,
40: `importing huge amounts of food and alcohol`,
0: `the site of a large number of lazy individuals`,
diff --git a/src/npc/descriptions/descriptionWidgets.js b/src/npc/descriptions/descriptionWidgets.js
index 16701381534e21b997c705b917a905d47bd6fcd1..047dcd6391a4f1a9fd08d81dcafab26ba57425f8 100644
--- a/src/npc/descriptions/descriptionWidgets.js
+++ b/src/npc/descriptions/descriptionWidgets.js
@@ -1253,16 +1253,16 @@ App.Desc.longLimbs = function(slave) {
r += "cyber ";
break;
case 7:
- r += "quadruped feline ";
+ r += "quadruped feline ";
break;
case 8:
- r += "quadruped canine ";
+ r += "quadruped canine ";
break;
case 9:
- r += "feline combat ";
+ r += "feline combat ";
break;
case 10:
- r += "canine combat ";
+ r += "canine combat ";
break;
}
if (count > 1) {
diff --git a/src/npc/descriptions/ears.js b/src/npc/descriptions/ears.js
index 29f4fadf1fae867e10a02ea35450c4795c54eb40..c009f8e22d69c0bc967a582a4117f18dc85ab4f2 100644
--- a/src/npc/descriptions/ears.js
+++ b/src/npc/descriptions/ears.js
@@ -76,9 +76,9 @@ App.Desc.ears = function(slave) {
r.push(`hairless.`);
} else {
r.push(`covered in soft, ${slave.earTColor} colored fur that has`);
- if (slave.earTEffect !== "none") {
+ if (slave.earTEffect !== "none") {
r.push(`${slave.earTEffect} and`);
- }
+ }
r.push(`${slave.patternColor} leopard spots; they`);
}
if (slave.earImplant === 1) {
@@ -96,9 +96,9 @@ App.Desc.ears = function(slave) {
r.push(`hairless but`);
} else {
r.push(`covered in dense, ${slave.earTColor} colored fur that has`);
- if (slave.earTEffect !== "none") {
+ if (slave.earTEffect !== "none") {
r.push(`${slave.earTEffect} and`);
- }
+ }
r.push(`distinct ${slave.patternColor} vertical stripes. They`);
}
if (slave.earImplant === 1) {
@@ -116,9 +116,9 @@ App.Desc.ears = function(slave) {
r.push(`hairless`);
} else {
r.push(`covered in ${slave.earTColor} colored fur that`);
- if (slave.earTEffect !== "none") {
+ if (slave.earTEffect !== "none") {
r.push(`has ${slave.earTEffect} and`);
- }
+ }
r.push(`is packed with ${slave.patternColor} rosettes that have dots in their center. They`);
}
if (slave.earImplant === 1) {
@@ -136,10 +136,10 @@ App.Desc.ears = function(slave) {
r.push(`hairless.`);
} else {
r.push(`covered in ${slave.earTColor} colored fur.`);
- if (slave.earTEffect !== "none") {
+ if (slave.earTEffect !== "none") {
r.push(`that has ${slave.earTEffect}.`);
- }
- r.push(`The ears have tufts of ${slave.hColor} hair sprouting from their base and`);
+ }
+ r.push(`The ears have tufts of ${slave.hColor} hair sprouting from their base and`);
}
if (slave.earImplant === 1) {
r.push(`perk up at`);
diff --git a/src/npc/generate/lawCompliance.js b/src/npc/generate/lawCompliance.js
index eea740cead582bf5285805268ac25bbfa341e7ec..d67ff08d971afaff42bc95806a0fd2ab942f9863 100644
--- a/src/npc/generate/lawCompliance.js
+++ b/src/npc/generate/lawCompliance.js
@@ -146,7 +146,7 @@ App.Desc.lawCompliance = function(slave, market = 0) {
if (market !== "Elite Slave" && policies.countEugenicsSMRs() > 0) {
r.push(eugenicsSMRsCount());
}
-
+
SlaveStatClamp(slave);
return r.join(" ");
diff --git a/src/npc/interaction/fAnimal.js b/src/npc/interaction/fAnimal.js
index e641a278ab04976a1069705d9e0d9ee6a83ad116..b19e5cc1572d4952f23e1b8ae12f66588f4d56ee 100644
--- a/src/npc/interaction/fAnimal.js
+++ b/src/npc/interaction/fAnimal.js
@@ -505,7 +505,7 @@ App.Interact.fAnimal = function(slave, type, act) {
break;
case V.active.feline:
if (act === Acts.ORAL) {
- text.push(`${slave.slaveName} gets to work, ${his} head bobbing back and forth rhythmically as ${he} works on bringing the ${animal.name} to orgasm. ${His} efforts pay off after a few minutes when the ${animal.name} begins to pant as its orgasm approaches. After a few minutes of painful coupling, the ${animal.species}'s thrusts finally slow, then stop completely as its ${animal.species !== "cat" ? `large` : ``} cock erupts down ${slave.slaveName}'s throat. With a ${animal.species !== "cat" ? `deep bellow` : `loud meow`}, he finally dismounts, gives you a long look, then stalks off.`);
+ text.push(`${slave.slaveName} gets to work, ${his} head bobbing back and forth rhythmically as ${he} works on bringing the ${animal.name} to orgasm. ${His} efforts pay off after a few minutes when the ${animal.name} begins to pant as its orgasm approaches. After a few minutes of painful coupling, the ${animal.species}'s thrusts finally slow, then stop completely as its ${animal.species !== "cat" ? `large` : ``} cock erupts down ${slave.slaveName}'s throat. With a ${animal.species !== "cat" ? `deep bellow` : `loud meow`}, he finally dismounts, gives you a long look, then stalks off.`);
} else {
text.push(`The ${animal.name} begins to move, thrusting faster and faster. The ${girl} underneath it can't stop a groan of pain from escaping ${his} lips as the ${animal.species}'s barbed dick rubs the inside of ${his} ${orifice()} raw. After a few minutes of painful coupling, the ${animal.species}'s thrusts finally slow, then stop completely as its ${animal.species !== "cat" ? `large` : ``} cock erupts, filling ${slave.slaveName} with its sperm. With a ${animal.species !== "cat" ? `deep bellow` : `loud meow`}, he finally dismounts, gives you a long look, then stalks off.`);
}
diff --git a/src/npc/startingGirls/startingGirlsPassage.js b/src/npc/startingGirls/startingGirlsPassage.js
index 96255d073c26c050399fc84d55492892337ecef3..fce85cf53638b1ceec619dada51250f788e68add 100644
--- a/src/npc/startingGirls/startingGirlsPassage.js
+++ b/src/npc/startingGirls/startingGirlsPassage.js
@@ -32,7 +32,7 @@ App.StartingGirls.passage = function() {
for (const slave of V.slaves) {
const cost = slave.slaveCost;
App.Events.addNode(el, [
- App.UI.DOM.slaveDescriptionDialog(slave),
+ App.UI.DOM.slaveDescriptionDialog(slave),
`costing: ${cashFormatColor(cost)}`,
App.UI.DOM.generateLinksStrip([
App.UI.DOM.link("Delete", () => {
diff --git a/src/player/desc/pLongBody.js b/src/player/desc/pLongBody.js
index e30a5aa5736bd4ccfb90fee434abaedec0ba2d7a..1643a76f78a2be309fa37b2ffd72103c4c8bd357 100644
--- a/src/player/desc/pLongBody.js
+++ b/src/player/desc/pLongBody.js
@@ -203,7 +203,7 @@ App.Desc.Player.body = function(PC = V.PC) {
r.push(`However, you're so powerfully built that you can do it with effort, though you're out of breath just standing here.`);
} else if (PC.muscles > 30) {
r.push(`You're strong enough to get to your feet, but given you're currently leaning against a chair to take some of the load off, that may not be for much longer.`);
- } else {
+ } else {
r.push(`It takes a lot to get on your feet, so you try to avoid that if possible.`);
}
}
diff --git a/src/player/desc/pLongBoobs.js b/src/player/desc/pLongBoobs.js
index 158b94d126021e02ba4b982f756f1d68db7399ce..74281dcbd63d26e779169a2c732502a4158f23aa 100644
--- a/src/player/desc/pLongBoobs.js
+++ b/src/player/desc/pLongBoobs.js
@@ -408,7 +408,7 @@ App.Desc.Player.boobs = function(PC = V.PC) {
r.push(`However, you're so powerfully built that you can comfortably stand up straight, though you definitely feel it in the morning.`);
} else if (PC.muscles > 30) {
r.push(`Your back is strong enough to support their weight, but you frequently catch yourself slouching under their weight, so you may be nearing your limit.`);
- } else {
+ } else {
r.push(`It takes a lot of effort to keep upright with them, so you're most comfortable letting them rest on something when you have the chance.`);
}
} else if (PC.boobs >= dwarfSize) {
diff --git a/src/player/desc/pLongButt.js b/src/player/desc/pLongButt.js
index 3e97350ec3291ccebfcb674e1cee37343b5179ac..70caba5619dd62e104ed0ef5400ed81eb45c668e 100644
--- a/src/player/desc/pLongButt.js
+++ b/src/player/desc/pLongButt.js
@@ -1,7 +1,7 @@
App.Desc.Player.butt = function(PC = V.PC) {
const r = [];
const implantRatio = PC.buttImplant / PC.butt;
- const implantType = PC.buttImplantType !== "normal" ? PC.buttImplantType : "";
+ const implantType = PC.buttImplantType !== "normal" ? PC.buttImplantType : "";
const {girlP} = getPronouns(PC).appendSuffix("P");
function hips() {
@@ -238,7 +238,7 @@ App.Desc.Player.butt = function(PC = V.PC) {
}
} else if (PC.muscles > 30) {
r.push(`Your legs are strong enough to support its weight, but it's still much more comfortable to remain seated; it's either time to work your quads harder or consider a reduction.`);
- } else {
+ } else {
r.push(`It takes a lot of effort to not be forced into a sitting position with it, so you're most comfortable just letting it rest on something when you have the chance.`);
}
r.push(buttAccessibility());
diff --git a/src/player/electiveSurgery.js b/src/player/electiveSurgery.js
index cf8db44f21b05c13bdd5eed6176b5b436ad52e3d..649debccc9a751b5f4773008361e64a8896abc4c 100644
--- a/src/player/electiveSurgery.js
+++ b/src/player/electiveSurgery.js
@@ -15,7 +15,7 @@ App.UI.electiveSurgery = function() {
nurse.race = arcology.FSSupremacistRace;
nurse.devotion = 100;
nurse.trust = 100;
- if (["white", "asian", "semitic", "southern european"].includes(nurse.race)) {
+ if (["asian", "semitic", "southern european", "white"].includes(nurse.race)) {
nurse.skin = "light";
} else {
nurse.skin = "brown";
diff --git a/src/player/pcSalon.js b/src/player/pcSalon.js
index 4b9d02da9c5419c7e1df26417eebf904f6a4790b..2f2404674fc40ab8d7e23bb0cfd3ef19a56cdfad 100644
--- a/src/player/pcSalon.js
+++ b/src/player/pcSalon.js
@@ -508,7 +508,7 @@ App.UI.playerSalon = function(PC) {
option = options.addOption("Effect color", "tailEffectColor", PC);
for (const color of filtered) {
- option.addValue(capFirstChar(color.value), color.value);
+ option.addValue(capFirstChar(color.value), color.value);
}
option.pulldown();