From 5c94848289d0319a3cd254ad3a8ce61be0d22205 Mon Sep 17 00:00:00 2001
From: DCoded <dcoded@live.com>
Date: Fri, 29 Mar 2019 17:06:12 -0400
Subject: [PATCH] FIxed undefined variable, shut ESlint up
---
.eslintrc.json | 2 +-
src/SpecialForce/SpecialForce.js | 104 ++++++++++++++++---------------
src/interaction/main/toychest.js | 29 ++++-----
src/js/datatypeCleanupJS.js | 7 ++-
src/js/descriptionWidgets.js | 5 +-
src/js/slaveCostJS.js | 16 +++++
6 files changed, 94 insertions(+), 69 deletions(-)
diff --git a/.eslintrc.json b/.eslintrc.json
index 7daf6f00e69..52ea40bb78d 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -35,7 +35,7 @@
"camelcase": "warn",
"comma-spacing": "error",
"comma-style": "error",
- "object-curly-newline": "error",
+ "object-curly-newline": "off",
"object-curly-spacing": "error",
"no-var": "error",
"spaced-comment": "warn",
diff --git a/src/SpecialForce/SpecialForce.js b/src/SpecialForce/SpecialForce.js
index 7db09805e1f..87e092d1387 100644
--- a/src/SpecialForce/SpecialForce.js
+++ b/src/SpecialForce/SpecialForce.js
@@ -4,7 +4,7 @@
window.Main = function() {
const V = State.variables;
V.SF = {
- Toggle:V.SF.Toggle,Active:-1,Depravity:0, Size:0, Upgrade:0, Gift:0,
+ Toggle:V.SF.Toggle, Active:-1, Depravity:0, Size:0, Upgrade:0, Gift:0,
UC:{Assign:0, Lock:0, num:0}, ROE:"hold", Target:"recruit", Regs:"strict",
Caps:"The Special Force", Lower:"the special force", Subsidy:1, BadOutcome:""
};
@@ -45,32 +45,32 @@ window.SFInit = function() {
window.SFBC = function() {
function jsDel(input) {
while (input.length > 0) {
- delete input[0]; input.splice(input[0],1);
+ delete input[0]; input.splice(input[0], 1);
}
}
const V = State.variables;
function InitClean() {
- jsDel([V.SFMODToggle,V.securityForceActive,V.securityForceCreate,V.securityForceEventSeen]);
+ jsDel([V.SFMODToggle, V.securityForceActive, V.securityForceCreate, V.securityForceEventSeen]);
}
function MainClean() {
- jsDel([V.securityForceActive,V.securityForceRecruit,V.securityForceTrade,V.securityForceBooty,V.securityForceIncome]);
- jsDel([V.securityForceMissionEfficiency,V.securityForceProfitable,V.TierTwoUnlock,V.securityForceDepravity,V.SFAO]);
- jsDel([V.securityForceUpgradeTokenReset,V.securityForceUpgradeToken,V.securityForceGiftToken,V.securityForceRulesOfEngagement]);
- jsDel([V.securityForceFocus,V.securityForceAccountability,V.securityForceName,V.SubsidyActive]);
+ jsDel([V.securityForceActive, V.securityForceRecruit, V.securityForceTrade, V.securityForceBooty, V.securityForceIncome]);
+ jsDel([V.securityForceMissionEfficiency, V.securityForceProfitable, V.TierTwoUnlock, V.securityForceDepravity, V.SFAO]);
+ jsDel([V.securityForceUpgradeTokenReset, V.securityForceUpgradeToken, V.securityForceGiftToken, V.securityForceRulesOfEngagement]);
+ jsDel([V.securityForceFocus, V.securityForceAccountability, V.securityForceName, V.SubsidyActive]);
}
function ColonelClean() {
- jsDel([V.SubsidyActive,V.ColonelCore,V.securityForceColonelToken,V.securityForceColonelSexed,V.ColonelRelationship]);
+ jsDel([V.SubsidyActive, V.ColonelCore, V.securityForceColonelToken, V.securityForceColonelSexed, V.ColonelRelationship]);
}
function TradeShowClean() {
- jsDel([V.OverallTradeShowAttendance,V.CurrentTradeShowAttendance,V.TradeShowIncome,V.TotalTradeShowIncome]);
- jsDel([V.TradeShowHelots,V.TotalTradeShowHelots]);
+ jsDel([V.OverallTradeShowAttendance, V.CurrentTradeShowAttendance, V.TradeShowIncome, V.TotalTradeShowIncome]);
+ jsDel([V.TradeShowHelots, V.TotalTradeShowHelots]);
}
function UnitsClean() {
- jsDel([V.securityForceInfantryPower,V.securityForceArcologyUpgrades,V.securityForceVehiclePower,V.securityForceDronePower]);
- jsDel([V.securityForceStimulantPower,V.securityForceHeavyBattleTank,V.securityForceAircraftPower,V.securityForceSpacePlanePower]);
- jsDel([V.securityForceAC130,V.securityForceSatellitePower,V.securityForceGiantRobot,V.securityForceMissileSilo,V.securityForceAircraftCarrier]);
- jsDel([V.securityForceSubmarine,V.securityForceHeavyAmphibiousTransport,V.securityForcePersonnel]);
+ jsDel([V.securityForceInfantryPower, V.securityForceArcologyUpgrades, V.securityForceVehiclePower, V.securityForceDronePower]);
+ jsDel([V.securityForceStimulantPower, V.securityForceHeavyBattleTank, V.securityForceAircraftPower, V.securityForceSpacePlanePower]);
+ jsDel([V.securityForceAC130, V.securityForceSatellitePower, V.securityForceGiantRobot, V.securityForceMissileSilo, V.securityForceAircraftCarrier]);
+ jsDel([V.securityForceSubmarine, V.securityForceHeavyAmphibiousTransport, V.securityForcePersonnel]);
}
if (V.SF === undefined) {
@@ -165,7 +165,7 @@ window.SFBC = function() {
if (V.SF.UC === undefined) {
if (V.SF.SpecOps !== undefined && V.SF.SpecOpsLock !== undefined) {
V.SF.UC = {Assign:V.SF.SpecOps, Lock:V.SF.SpecOpsLock};
- jsDel([V.SF.SpecOps,V.SF.SpecOpsLock]);
+ jsDel([V.SF.SpecOps, V.SF.SpecOpsLock]);
} else if (V.SF.UC === {}) {
V.SF.UC = {Assign:0, Lock:0};
}
@@ -191,7 +191,7 @@ window.SFBC = function() {
if (V.SFUnit !== undefined) {
if (V.SFUnit.AT !== undefined) V.SFUnitTA = 0;
V.SF.Squad.Satellite = V.SF.Squad.Sat;
- jsDel([V.SF.Squad.Sat,V.SatLaunched,V.SFUnit.AT]);
+ jsDel([V.SF.Squad.Sat, V.SatLaunched, V.SFUnit.AT]);
V.SF.Squad.Satellite = V.SF.Squad.Sat; delete V.SF.Squad.Sat;
if (V.SFTradeShow !== undefined) V.SF.MercCon = V.SFTradeShow; delete V.SFTradeShow;
if (V.SFColonel !== undefined) V.SF.Colonel = V.SFColonel; delete V.SFColonel;
@@ -199,7 +199,7 @@ window.SFBC = function() {
if (V.SF.Squad.Satellite !== undefined && V.SatLaunched === undefined) {
V.SF.Squad.Sat = {lv:0, InOrbit:0};
V.SF.Squad.Satellite = V.SF.Squad.Sat;
- jsDel([V.SF.Squad.Sat,V.SatLaunched,V.SFUnit]);
+ jsDel([V.SF.Squad.Sat, V.SatLaunched, V.SFUnit]);
}
}
if (V.SF.Squad !== undefined && V.SF.Squad.Satellite.lv === undefined) {
@@ -216,21 +216,21 @@ window.SFReport = function() {
const target = 50000, baseLine = 5000; let profit = 0, upkeep = 0, income = 0;
let Multiplier = {action:1, troop:1, unit:1, depravity:1};
let FNG = 10, unitCap = 2500, Trade = 0.025;
- let cost = {a:0.01,b:2.5}, NO = 1+(V.SF.Size/5), N1 = 1+(V.SF.Size/5);
+ let cost = {a:0.01, b:2.5}, NO = 1+(V.SF.Size/5), N1 = 1+(V.SF.Size/5);
V.SF.UC.num = 0; Count(); let r = ``, deaths = 0, SFD = V.SF.Depravity;
if (profit < 1) cost.a = 10; cost.b = 0.1; NO = 1; N1 = 0.1;
if (S.Troops > unitCap) S.Troops = unitCap;
if (S.Troops < 100) {
- S.Troops += Math.ceil(jsRandom(2,5));
+ S.Troops += Math.ceil(jsRandom(2, 5));
} else {
if (V.SF.Target === "recruit") {
- S.Troops -= Math.ceil(jsRandom(1*S.Troops/1000,0));
+ S.Troops -= Math.ceil(jsRandom(1*S.Troops/1000, 0));
} else if (V.SF.Target === "raiding") {
- S.Troops -= Math.ceil(jsRandom(1.15*S.Troops/1000,-1.20*S.Troops/1000));
+ S.Troops -= Math.ceil(jsRandom(1.15*S.Troops/1000, -1.20*S.Troops/1000));
} else {
- S.Troops -= Math.ceil(jsRandom(1.10*S.Troops/1000,-1.15*S.Troops/1000));
+ S.Troops -= Math.ceil(jsRandom(1.10*S.Troops/1000, -1.15*S.Troops/1000));
}
}
if (V.SF.UC.Assign > 0) {
@@ -251,62 +251,62 @@ window.SFReport = function() {
}
if (S.Firebase > 0) {
- FNG += S.Firebase; Trade += 0.5*S.Firebase; Multiplier.unit += 7.5*S.Firebase+2*Math.pow(S.Firebase,2)*cost.a; upkeep += (95*10+S.Firebase)*cost.b;
+ FNG += S.Firebase; Trade += 0.5*S.Firebase; Multiplier.unit += 7.5*S.Firebase+2*Math.pow(S.Firebase, 2)*cost.a; upkeep += (95*10+S.Firebase)*cost.b;
}
if (S.Armoury > 0) {
- FNG += 2*S.Armoury; Trade += 0.25*S.Armoury; Multiplier.unit += 7.5*S.Armoury+2*Math.pow(S.Armoury,2)*cost.a; upkeep += (55*S.Armoury)*cost.b;
+ FNG += 2*S.Armoury; Trade += 0.25*S.Armoury; Multiplier.unit += 7.5*S.Armoury+2*Math.pow(S.Armoury, 2)*cost.a; upkeep += (55*S.Armoury)*cost.b;
}
if (S.Drugs > 0) {
- FNG += S.Drugs; Trade += 0.25*S.Drugs; Multiplier.unit += 7.5*S.Drugs+2*Math.pow(S.Drugs,2)*cost.a; upkeep += (35*S.Drugs)*cost.b;
+ FNG += S.Drugs; Trade += 0.25*S.Drugs; Multiplier.unit += 7.5*S.Drugs+2*Math.pow(S.Drugs, 2)*cost.a; upkeep += (35*S.Drugs)*cost.b;
}
if (S.Firebase >= 1) {
if (S.AV > 0) {
- FNG += S.AV; Trade += 0.25*S.AV; Multiplier.unit += 7.5*S.AV+2*Math.pow(S.AV,2)*cost.a; upkeep += (89*S.AV)*cost.b;
+ FNG += S.AV; Trade += 0.25*S.AV; Multiplier.unit += 7.5*S.AV+2*Math.pow(S.AV, 2)*cost.a; upkeep += (89*S.AV)*cost.b;
}
if (S.TV > 0) {
- FNG += S.TV; Trade += 0.25*S.TV; Multiplier.unit += 7.5*S.TV+2*Math.pow(S.TV,2)*cost.a; upkeep += (89*S.TV)*cost.b;
+ FNG += S.TV; Trade += 0.25*S.TV; Multiplier.unit += 7.5*S.TV+2*Math.pow(S.TV, 2)*cost.a; upkeep += (89*S.TV)*cost.b;
}
if (S.PGT > 0) {
- FNG += S.PGT; Trade += 0.25*S.PGT; Multiplier.unit += 15*S.PGT+3*Math.pow(S.PGT,2)*cost.a; upkeep += (100*S.PGT)*cost.b;
+ FNG += S.PGT; Trade += 0.25*S.PGT; Multiplier.unit += 15*S.PGT+3*Math.pow(S.PGT, 2)*cost.a; upkeep += (100*S.PGT)*cost.b;
}
}
if (S.Firebase >= 2 && S.Drones > 0) {
- FNG += S.Drones; Trade += 0.5*S.Drones; Multiplier.unit += 7.5*S.Drones+2*Math.pow(S.Drones,2)*cost.a; upkeep += (50*S.Drones)*cost.b;
+ FNG += S.Drones; Trade += 0.5*S.Drones; Multiplier.unit += 7.5*S.Drones+2*Math.pow(S.Drones, 2)*cost.a; upkeep += (50*S.Drones)*cost.b;
}
if (S.Firebase >= 4) {
if (S.AA > 0) {
- FNG += S.AA; Trade += 0.25*S.AA; Multiplier.unit += 7.5*S.AA+2*Math.pow(S.AA,2)*cost.a; upkeep += (100*S.AA)*cost.b;
+ FNG += S.AA; Trade += 0.25*S.AA; Multiplier.unit += 7.5*S.AA+2*Math.pow(S.AA, 2)*cost.a; upkeep += (100*S.AA)*cost.b;
}
if (S.TA > 0) {
- FNG += S.TA; Trade += 0.25*S.TA; Multiplier.unit += 7.5*S.TA+2*Math.pow(S.TA,2)*cost.a; upkeep += (100*S.TA)*cost.b;
+ FNG += S.TA; Trade += 0.25*S.TA; Multiplier.unit += 7.5*S.TA+2*Math.pow(S.TA, 2)*cost.a; upkeep += (100*S.TA)*cost.b;
}
if (S.SpacePlane > 0) {
- FNG += S.SpacePlane; Trade += 0.25*S.SpacePlane; Multiplier.unit += 7.5*S.SpacePlane+2*Math.pow(S.SpacePlane,2)*cost.a; upkeep += (100*S.SpacePlane)*cost.b;
+ FNG += S.SpacePlane; Trade += 0.25*S.SpacePlane; Multiplier.unit += 7.5*S.SpacePlane+2*Math.pow(S.SpacePlane, 2)*cost.a; upkeep += (100*S.SpacePlane)*cost.b;
}
if (S.GunS > 0) {
- FNG += S.GunS; Trade += 0.25*S.GunS; Multiplier.unit += 12*S.GunS+3*Math.pow(S.GunS,2)*cost.a; upkeep += 70*S.GunS;
+ FNG += S.GunS; Trade += 0.25*S.GunS; Multiplier.unit += 12*S.GunS+3*Math.pow(S.GunS, 2)*cost.a; upkeep += 70*S.GunS;
}
if (S.Satellite.lv > 0 && S.Satellite.InOrbit > 0) {
- FNG += S.Satellite.lv; Trade += 0.25*S.Satellite.lv; Multiplier.unit += 15*S.Satellite.lv+5*Math.pow(S.Satellite.lv,2)*cost.a; upkeep += (85*S.Satellite.lv)*cost.b;
+ FNG += S.Satellite.lv; Trade += 0.25*S.Satellite.lv; Multiplier.unit += 15*S.Satellite.lv+5*Math.pow(S.Satellite.lv, 2)*cost.a; upkeep += (85*S.Satellite.lv)*cost.b;
}
if (S.GiantRobot > 0) {
- FNG += S.GiantRobot; Trade += 0.25*S.GiantRobot; Multiplier.unit += 15*S.GiantRobot+5*Math.pow(S.GiantRobot,2)*cost.a; upkeep += (95*S.GiantRobot)*cost.b;
+ FNG += S.GiantRobot; Trade += 0.25*S.GiantRobot; Multiplier.unit += 15*S.GiantRobot+5*Math.pow(S.GiantRobot, 2)*cost.a; upkeep += (95*S.GiantRobot)*cost.b;
}
if (S.MissileSilo > 0) {
- FNG += S.MissileSilo; Trade += 0.25*S.MissileSilo; Multiplier.unit += 15*S.MissileSilo+5*Math.pow(S.MissileSilo,2)*cost.a; upkeep += (100*S.MissileSilo)*cost.b;
+ FNG += S.MissileSilo; Trade += 0.25*S.MissileSilo; Multiplier.unit += 15*S.MissileSilo+5*Math.pow(S.MissileSilo, 2)*cost.a; upkeep += (100*S.MissileSilo)*cost.b;
}
}
if (S.AircraftCarrier > 0) {
- FNG += S.AircraftCarrier; Trade += 0.25*S.AircraftCarrier; Multiplier.unit += 9*S.AircraftCarrier+3*Math.pow(S.AircraftCarrier,2)*cost.a; upkeep += (80*S.AircraftCarrier)*cost.b;
+ FNG += S.AircraftCarrier; Trade += 0.25*S.AircraftCarrier; Multiplier.unit += 9*S.AircraftCarrier+3*Math.pow(S.AircraftCarrier, 2)*cost.a; upkeep += (80*S.AircraftCarrier)*cost.b;
}
if (S.Sub > 0) {
- FNG += S.Sub; Trade += 0.25*S.Sub; Multiplier.unit += 7.5*S.Sub+2*Math.pow(S.Sub,2)*cost.a; upkeep += (90*S.Sub)*cost.b;
+ FNG += S.Sub; Trade += 0.25*S.Sub; Multiplier.unit += 7.5*S.Sub+2*Math.pow(S.Sub, 2)*cost.a; upkeep += (90*S.Sub)*cost.b;
}
if (S.HAT > 0) {
- FNG += S.HAT; Trade += 0.25*S.HAT; Multiplier.unit += 7.5*S.HAT+2*Math.pow(S.HAT,2)*cost.a; upkeep += (70*S.HAT)*cost.b;
+ FNG += S.HAT; Trade += 0.25*S.HAT; Multiplier.unit += 7.5*S.HAT+2*Math.pow(S.HAT, 2)*cost.a; upkeep += (70*S.HAT)*cost.b;
}
switch (V.SF.Colonel.Core) {
@@ -315,6 +315,8 @@ window.SFReport = function() {
case "brazen": FNG += 15; Multiplier.unit += 0.5; break;
case "jaded": Trade -= 0.05; SFD += 0.05; break;
case "shell shocked": Trade += 0.05; SFD -= 0.05; Multiplier.unit -= 0.5; break;
+ default:
+ break;
}
if (V.SF.Target === "raiding") {
@@ -369,7 +371,7 @@ window.SFReport = function() {
} else if (S.Drugs >= 10) {
survivalChance += 5;
}
- if (jsRandom(0,100) > survivalChance) deaths = jsRandom(0,((S.Drugs*2)+4));
+ if (jsRandom(0, 100) > survivalChance) deaths = jsRandom(0, ((S.Drugs*2)+4));
if (deaths > 0) S.Troops -= deaths;
}
if (V.SF.UC.Assign === 1 && V.SF.UC.Lock < 1) V.SF.UC.Assign = 0;
@@ -424,7 +426,7 @@ window.SFReport = function() {
if (V.SF.MercCon.CanAttend === 1) {
V.SF.MercCon.Income = 0; V.SF.MercCon.Menials = 0;
let tradeShowAttendes = 200, menialGiftsPerAttendee = 5, NewMercs = 0;
- let menialGifts = Math.ceil(jsRandom(1,((tradeShowAttendes*menialGiftsPerAttendee)/10)));
+ let menialGifts = Math.ceil(jsRandom(1, ((tradeShowAttendes*menialGiftsPerAttendee)/10)));
let TSProfit = Math.ceil(500000*(1+(V.SF.Size/1000))*(1+(V.arcologies[0].prosperity/1000))*T.Env);
V.SF.MercCon.Menials += menialGifts; V.SF.MercCon.TotalMenials += menialGifts;
@@ -434,7 +436,7 @@ window.SFReport = function() {
if (V.secExp > 0 && V.mercenaries > 0) {
V.SF.MercCon.Mercs = 0;
- NewMercs = jsRandom(1,(tradeShowAttendes/10));
+ NewMercs = jsRandom(1, (tradeShowAttendes/10));
V.mercFreeManpower += NewMercs; V.SF.MercCon.TotalMercs += NewMercs;
V.SF.MercCon.Mercs += NewMercs;
r += `<br>''TradeShow'': During a break, The Colonel managed to sell some generic schematics to the ${tradeShowAttendes} attendees, some of whom decided to also give a few menial slaves as a bonus.<br>`;
@@ -503,17 +505,17 @@ window.SFNameCapsCheck = function() {
if (V.SF.Lower !== "the special force") V.SF.Caps = V.SF.Lower.replace("the ", "The ");
};
-window.SFUpgradeCost = function(cost,unit) {
- "use strict"; const V = State.variables,T = State.temporary,S = V.SF.Squad; let value = 0;
+window.SFUpgradeCost = function(cost, unit) {
+ "use strict"; const V = State.variables, T = State.temporary, S = V.SF.Squad; let value = 0;
value = cost*T.Env*(1.15+(V.SF.Size/10))*(1.15+(unit/100));
- if ([S.Sub,S.AircraftCarrier,S.MissileSilo,S.GiantRobot,S.Satellite.lv,S.GunS,S.SpacePlane,S.Drones].includes(unit)) value *= V.HackingSkillMultiplier;
+ if ([S.Sub, S.AircraftCarrier, S.MissileSilo, S.GiantRobot, S.Satellite.lv, S.GunS, S.SpacePlane, S.Drones].includes(unit)) value *= V.HackingSkillMultiplier;
return Math.ceil(value);
};
-window.progress = function(x,max) {
+window.progress = function(x, max) {
"use strict"; let out = `â`, z, i;
if (max === undefined) {
- Math.clamp(x,0,10);
+ Math.clamp(x, 0, 10);
if (State.variables.SF.Size < 30) {
z = 5 - x;
for (i = 0;i<x;i++) out += `â–ˆâ`;
@@ -524,7 +526,7 @@ window.progress = function(x,max) {
for (i = 0;i<x;i++) out += `â–ˆâ`;
for (i = 0;i<z;i++) out += `<span style='opacity: 0;'>â–ˆ</span>â`;}}
else {
- Math.clamp(x,0,max);
+ Math.clamp(x, 0, max);
x = Math.floor(10*x/max);
z = 10 - x;
for (i = 0;i<x;i++) out += `â–ˆâ`;
@@ -626,6 +628,8 @@ window.BadOutcome = function() {
r += `<br>When you climb the crates to take it and read it, you see The Colonel's handwritten sentiments about the way things turned out; her gratitude for taking her in when you did, her disappointment in your actions, a detailed account of your failings, her regrets that things had to end this way, and finally, her well wishes for your future endeavors.`;
r += `<br>Disgusted, you pocket the gift card and leave your employees and menials to gather up the valuables here before stalking back to your Penthouse. The former Firebase is returned to being a warehouse facility.`;
break;
+ default:
+ break;
}
};
@@ -971,8 +975,10 @@ window.UnitText = function(input) {
return `${text17} An air cushion transport vehicle, or hovercraft ${recom2} is parked on the pier of the Naval Yard, ready to ferry ${tons} tons of soldiers and vehicles. ${guns} ${guns2} ${fans} ${turbines} ${speed} ${skirt} ${armor10} ${ramps} ${HATframe} ${loadout}`;
}
break;
+ default:
+ break;
}
- /*if (V.SF.Facility.Toggle > 0 && V.SF.Facility.Active > 0) { r += `<br><br>''${V.SF.Facility.Caps}:''`;
+ /* if (V.SF.Facility.Toggle > 0 && V.SF.Facility.Active > 0) { r += `<br><br>''${V.SF.Facility.Caps}:''`;
if (passage() === "Firebase") {
r += `<br>[[Enter the building|<<= SFReport()>>][]]`;
}
diff --git a/src/interaction/main/toychest.js b/src/interaction/main/toychest.js
index 56e233ca6d3..93dbadc1b03 100644
--- a/src/interaction/main/toychest.js
+++ b/src/interaction/main/toychest.js
@@ -1,22 +1,19 @@
-/* eslint-disable no-unused-vars */
-/* eslint-disable no-undef */
-
-/** breaks in the last case in switches are not required, but are highly recommended */
-
/* OPEN TOYCHEST */
App.Interact.ToyChest = function(slave) {
"use strict";
const V = State.variables;
let r = ``;
- var pronouns = getPronouns(slave);
- var he = pronouns.pronoun;
- var him = pronouns.object;
- var his = pronouns.possessive;
- var hers = pronouns.possessivePronoun;
- var himself = pronouns.objectReflexive;
- var boy = pronouns.noun;
- var He = capFirstChar(he);
- var His = capFirstChar(his);
+ /* eslint-disable */
+ let pronouns = getPronouns(slave);
+ let he = pronouns.pronoun;
+ let him = pronouns.object;
+ let his = pronouns.possessive;
+ let hers = pronouns.possessivePronoun;
+ let himself = pronouns.objectReflexive;
+ let boy = pronouns.noun;
+ let He = capFirstChar(he);
+ let His = capFirstChar(his);
+ /* eslint-enable */
r = `${slave.slaveName} `;
if (slave.fuckdoll) {
@@ -63,7 +60,7 @@ App.Interact.ToyChest = function(slave) {
} else if (slave.devotion <= 50) {
r += `has positioned ${himself} nearby to offer you ${his} body. `;
}
- let pose = random(1,100);
+ let pose = random(1, 100);
if (slave.fuckdoll) {
r += `${His} holes are, as always, available. `;
} else if (slave.fetish === "mindbroken") {
@@ -356,4 +353,4 @@ App.Interact.ToyChest = function(slave) {
}
}
return r;
-}
\ No newline at end of file
+}
diff --git a/src/js/datatypeCleanupJS.js b/src/js/datatypeCleanupJS.js
index ccd173225e9..c9547c4f06f 100644
--- a/src/js/datatypeCleanupJS.js
+++ b/src/js/datatypeCleanupJS.js
@@ -76,7 +76,10 @@ window.SlaveDatatypeCleanup = (function SlaveDatatypeCleanup() {
let V;
return SlaveDatatypeCleanup;
- /** @param {App.Entity.SlaveState} slave */
+ /**
+ * @param {App.Entity.SlaveState} slave
+ * @param {number} isIncubatorSlave
+ */
function SlaveDatatypeCleanup(slave, isIncubatorSlave) {
V = State.variables;
if (isIncubatorSlave !== true)
@@ -1784,4 +1787,4 @@ App.Entity.Utils.GenePoolRecordCleanup = (function () {
"slaveCost"
].forEach((s) => delete slave[s]);
}
-})();
\ No newline at end of file
+})();
diff --git a/src/js/descriptionWidgets.js b/src/js/descriptionWidgets.js
index 70dba1525e4..e7df578afb4 100644
--- a/src/js/descriptionWidgets.js
+++ b/src/js/descriptionWidgets.js
@@ -1,4 +1,4 @@
-App.Desc.eyes = /** @param {App.Entity.SlaveState} slave */ function (slave) {
+App.Desc.eyes = /** @param {App.Entity.SlaveState} slave @return {string} */ function (slave) {
"use strict";
const V = State.variables;
let r = ``;
@@ -254,6 +254,7 @@ App.Desc.ageAndHealth = /** @param {App.Entity.SlaveState} slave */ function (sl
"use strict";
const V = State.variables;
let r = ``;
+ let woman;
/* eslint-disable */
let pronouns = getPronouns(slave);
let he = pronouns.pronoun;
@@ -266,6 +267,8 @@ App.Desc.ageAndHealth = /** @param {App.Entity.SlaveState} slave */ function (sl
let His = capFirstChar(his);
/* eslint-enable */
+ (boy === "girl" ? woman = "woman" : woman = "man");
+
if (!slave.fuckdoll) {
if (slave.health < -90) {
r += `${He} is nearly unresponsive. ${He}'s obviously <span class=red>dangerously sick,</span>`;
diff --git a/src/js/slaveCostJS.js b/src/js/slaveCostJS.js
index 6aa1f816d27..70505104d06 100644
--- a/src/js/slaveCostJS.js
+++ b/src/js/slaveCostJS.js
@@ -118,6 +118,8 @@ window.Beauty = (function() {
case "cute":
beauty += 8/3;
break;
+ default:
+ break;
}
}
@@ -146,6 +148,8 @@ window.Beauty = (function() {
case "mixed":
beauty -= 1;
break;
+ default:
+ break;
}
}
@@ -218,6 +222,8 @@ window.Beauty = (function() {
}
}
break;
+ default:
+ break;
}
}
@@ -496,6 +502,8 @@ window.Beauty = (function() {
beauty += 1;
}
break;
+ default:
+ break;
}
}
@@ -711,6 +719,8 @@ window.Beauty = (function() {
beauty -= 2;
}
break;
+ default:
+ break;
}
switch (slave.pubicHStyle) {
case "hairless":
@@ -739,6 +749,8 @@ window.Beauty = (function() {
beauty -= 6;
}
break;
+ default:
+ break;
}
}
}
@@ -903,6 +915,8 @@ window.Beauty = (function() {
}
}
break;
+ default:
+ break;
}
}
@@ -1029,6 +1043,8 @@ window.Beauty = (function() {
case -4:
beauty -= 2;
break;
+ default:
+ break;
}
}
--
GitLab