diff --git a/src/art/vector_revamp/vectorRevampedArtControl.js b/src/art/vector_revamp/vectorRevampedArtControl.js index 74618f9c8e545fd3fe483b4c2499940d2e6936f5..8f2034c3491625e53a2521adde66e560055cb252 100644 --- a/src/art/vector_revamp/vectorRevampedArtControl.js +++ b/src/art/vector_revamp/vectorRevampedArtControl.js @@ -442,7 +442,7 @@ class ClothingControl { get restrictiveLatex() { let defaultOutfitColor = "#515351"; - let areolaColor = "#383838"; + // let areolaColor = "#383838"; return { bodySettings: { showEyes: false, @@ -836,8 +836,8 @@ class RevampedArtControl { get armLayer() { let result = []; - let leftArmType = ""; - let rightArmType = ""; + // let leftArmType = ""; + // let rightArmType = ""; if (this.artSlave.amp === 1) { result.push("Art_Vector_Revamp_Arm_Stump"); diff --git a/src/js/rulesAssistantOptions.js b/src/js/rulesAssistantOptions.js index 25d61249ed8bd5a3160199142c87ae452d60fa88..0c594685f783456ded3e3624d5a396f454180a37 100644 --- a/src/js/rulesAssistantOptions.js +++ b/src/js/rulesAssistantOptions.js @@ -665,11 +665,11 @@ window.rulesAssistantOptions = (function() { this.show_custom_editor(CustomEditor, current_rule.condition.data); } else if (this.betweenP(value)) { current_rule.condition.function = "between"; - current_rule.condition.data = { attribute: value, value: [null, null] }; + current_rule.condition.data = {attribute: value, value: [null, null]}; this.show_custom_editor(RangeEditor, current_rule.condition.function, current_rule.condition.data); } else if (this.belongsP(value)) { current_rule.condition.function = "belongs"; - current_rule.condition.data = { attribute: value, value: [] }; + current_rule.condition.data = {attribute: value, value: []}; this.show_custom_editor(ItemEditor, current_rule.condition.function, current_rule.condition.data); } } @@ -1311,7 +1311,7 @@ window.rulesAssistantOptions = (function() { const bellies = []; setup.bellyAccessories.forEach(acc => { if (acc.fs === undefined && acc.rs === undefined) { - bellies.push([acc.name, acc.value]) + bellies.push([acc.name, acc.value]); } else if (acc.fs === "repopulation" && V.arcologies[0].FSRepopulationFocus !== "unset") { bellies.push([`${acc.name} (FS)`, acc.value]); } else if (acc.rs === "boughtBelly" && V.clothesBoughtBelly === 1) { bellies.push([`${acc.name} (Purchased)`, acc.value]); } @@ -1354,7 +1354,7 @@ window.rulesAssistantOptions = (function() { const accs = []; setup.vaginalAccessories.forEach(acc => { if (acc.fs === undefined && acc.rs === undefined) { - accs.push([acc.name, acc.value]) + accs.push([acc.name, acc.value]); } else if (acc.rs === "buyBigDildos" && V.toysBoughtDildos === 1) { accs.push([`${acc.name} (Purchased)`, acc.value]); } }); super("Vaginal accessories for virgins", accs); @@ -1368,7 +1368,7 @@ window.rulesAssistantOptions = (function() { const accs = []; setup.vaginalAccessories.forEach(acc => { if (acc.fs === undefined && acc.rs === undefined) { - accs.push([acc.name, acc.value]) + accs.push([acc.name, acc.value]); } else if (acc.rs === "buyBigDildos" && V.toysBoughtDildos === 1) { accs.push([`${acc.name} (Purchased)`, acc.value]); } }); super("Vaginal accessories for anal virgins", accs); @@ -1382,7 +1382,7 @@ window.rulesAssistantOptions = (function() { const accs = []; setup.vaginalAccessories.forEach(acc => { if (acc.fs === undefined && acc.rs === undefined) { - accs.push([acc.name, acc.value]) + accs.push([acc.name, acc.value]); } else if (acc.rs === "buyBigDildos" && V.toysBoughtDildos === 1) { accs.push([`${acc.name} (Purchased)`, acc.value]); } }); super("Vaginal accessories for other slaves", accs); @@ -1396,7 +1396,7 @@ window.rulesAssistantOptions = (function() { const accs = []; setup.vaginalAttachments.forEach(acc => { if (acc.fs === undefined && acc.rs === undefined) { - accs.push([acc.name, acc.value]) + accs.push([acc.name, acc.value]); } else if (acc.rs === "buyVaginalAttachments" && V.toysBoughtVaginalAttachments === 1) { accs.push([`${acc.name} (Purchased)`, acc.value]); } }); super("Vaginal attachments for slaves with vaginal accessories", accs); @@ -1452,7 +1452,7 @@ window.rulesAssistantOptions = (function() { const accs = []; setup.buttplugs.forEach(acc => { if (acc.fs === undefined && acc.rs === undefined) { - accs.push([acc.name, acc.value]) + accs.push([acc.name, acc.value]); } else if (acc.rs === "buyBigPlugs" && V.toysBoughtButtPlugs === 1) { accs.push([`${acc.name} (Purchased)`, acc.value]); } }); super("Buttplugs for anal virgins", accs); @@ -1466,7 +1466,7 @@ window.rulesAssistantOptions = (function() { const accs = []; setup.buttplugs.forEach(acc => { if (acc.fs === undefined && acc.rs === undefined) { - accs.push([acc.name, acc.value]) + accs.push([acc.name, acc.value]); } else if (acc.rs === "buyBigPlugs" && V.toysBoughtButtPlugs === 1) { accs.push([`${acc.name} (Purchased)`, acc.value]); } }); super("Buttplugs for other slaves", accs); @@ -1480,7 +1480,7 @@ window.rulesAssistantOptions = (function() { const accs = []; setup.buttplugAttachments.forEach(acc => { if (acc.fs === undefined && acc.rs === undefined) { - accs.push([acc.name, acc.value]) + accs.push([acc.name, acc.value]); } else if (acc.rs === "buyTails" && V.toysBoughtButtPlugTails === 1) { accs.push([`${acc.name} (Purchased)`, acc.value]); } }); super("Buttplug attachments for slaves with buttplugs", accs); @@ -1937,13 +1937,13 @@ window.rulesAssistantOptions = (function() { constructor() { // TODO: better data structure? const pairs = [ - ["No default setting", { cum: "no default setting", milk: "no default setting" }], - ["Normal Diet", { cum: 0, milk: 0 }], - ["Cum Added", { cum: 1, milk: 0 }], - ["Milk Added", { cum: 0, milk: 1 }], - ["Cum & Milk Added", { cum: 1, milk: 1 }], - ["Cum-Based", { cum: 2, milk: 0 }], - ["Milk-Based", { cum: 0, milk: 2 }], + ["No default setting", {cum: "no default setting", milk: "no default setting"}], + ["Normal Diet", {cum: 0, milk: 0}], + ["Cum Added", {cum: 1, milk: 0}], + ["Milk Added", {cum: 0, milk: 1}], + ["Cum & Milk Added", {cum: 1, milk: 1}], + ["Cum-Based", {cum: 2, milk: 0}], + ["Milk-Based", {cum: 0, milk: 2}], ]; super("Diet base", pairs); this.setValue(this.value2string(current_rule.set.dietCum, current_rule.set.dietMilk)); diff --git a/src/js/utilJS.js b/src/js/utilJS.js index 666387529fc5f9b0cebd98f3596dacfc23adacef..0d561f892452980f438d6cf55921c8b380b503f0 100644 --- a/src/js/utilJS.js +++ b/src/js/utilJS.js @@ -542,6 +542,7 @@ window.Height = (function() { }; /** + * FIXME: JSdoc syntax error * Helper method - table lookup for nationality/race combinations * @param {{ [table: string]: number; }} table * @param {string|Object} nationality @@ -699,6 +700,7 @@ window.Height = (function() { * @param {any} race * @param {string} genes * @param {number} age + * @returns {Function} // I think */ const _randomHeight = function(nationality, race, genes, age) { const mean = _meanHeight(nationality, race, genes, age); @@ -782,6 +784,7 @@ window.Intelligence = (function() { let maxIntelligence = 100; /** + * FIXME: JSdoc syntax error * Configuration method for the above values * @param {{ mean: number; limitMult: number[]; limitIntelligence: number[]; skew: number; spread: number; } | { limitMult: number[]; limitIntelligence: number[]; skew: number; spread: number; mean?: undefined; }} [conf] */ @@ -858,6 +861,7 @@ window.Intelligence = (function() { }; /** + * FIXME: JSdoc syntax error * @param {{ mean: number; limitMult: number[]; limitIntelligence: number[]; skew: number; spread: number; } | { limitMult: number[]; limitIntelligence: number[]; skew: number; spread: number; mean?: undefined; }} settings * @returns {number} */ diff --git a/src/js/wombJS.js b/src/js/wombJS.js index e6b7f87aa3818189e50740016b900a31d397cb68..ea4191d54d1d483ce1d1e5455624514380552169 100644 --- a/src/js/wombJS.js +++ b/src/js/wombJS.js @@ -325,8 +325,9 @@ window.WombGetVolume = function(actor) { // most legacy code from pregJS.tw with WombInit(actor); alert("WombGetVolume warning - " + actor.slaveName + " " + err); } - if (wombSize < 0) // catch for strange cases, to avoid messing with outside code. - { wombSize = 0; } + if (wombSize < 0) { // catch for strange cases, to avoid messing with outside code. + wombSize = 0; + } return wombSize; } @@ -342,8 +343,9 @@ window.WombGetVolume = function(actor) { // most legacy code from pregJS.tw with wombSize += targetData.size * targetData.rate; }); - if (wombSize < 0) // catch for strange cases, to avoid messing with outside code. - { wombSize = 0; } + if (wombSize < 0) { // catch for strange cases, to avoid messing with outside code. + wombSize = 0; + } return wombSize; } @@ -359,8 +361,9 @@ window.WombGetVolume = function(actor) { // most legacy code from pregJS.tw with wombSize += targetData.size; }); - if (wombSize < 0) // catch for strange cases, to avoid messing with outside code. - { wombSize = 0; } + if (wombSize < 0) { // catch for strange cases, to avoid messing with outside code. + wombSize = 0; + } return wombSize; } @@ -748,19 +751,22 @@ window.BCReserveInit = function() { SV.slaves.forEach(function(slave) { slave.womb.forEach(function(ft) { if (typeof ft.reserve !== 'string') { ft.reserve = ""; } - if (typeof ft.motherID !== 'number') // setting missing biological mother ID for fetus. - { ft.motherID = slave.ID; } + if (typeof ft.motherID !== 'number') { // setting missing biological mother ID for fetus. + ft.motherID = slave.ID; + } if (ft.ID === undefined) { ft.ID = generateNewID(); } - if (typeof ft.realAge !== 'number') // setting missing chronological age - { ft.realAge = ft.age; } + if (typeof ft.realAge !== 'number') { // setting missing chronological age + ft.realAge = ft.age; + } }); }); SV.PC.womb.forEach(function(ft) { if (typeof ft.reserve !== 'string') { ft.reserve = ""; } if (typeof ft.motherID !== 'number') { ft.motherID = SV.PC.ID; } - if (typeof ft.realAge !== 'number') // setting missing chronological age - { ft.realAge = ft.age; } + if (typeof ft.realAge !== 'number') { // setting missing chronological age + ft.realAge = ft.age; + } }); };