From b55d0cc0ec77b4414a68e8e85c124ed440eba7b8 Mon Sep 17 00:00:00 2001
From: Skriv <skrivelese@gmail.com>
Date: Tue, 23 Apr 2019 18:06:29 +0200
Subject: [PATCH] spacing and semis
---
src/js/slaveSummaryWidgets.js | 75 ++++++++++++++++++-----------------
1 file changed, 38 insertions(+), 37 deletions(-)
diff --git a/src/js/slaveSummaryWidgets.js b/src/js/slaveSummaryWidgets.js
index 8a3a619f689..66540c34f0b 100644
--- a/src/js/slaveSummaryWidgets.js
+++ b/src/js/slaveSummaryWidgets.js
@@ -18,10 +18,11 @@ window.SlaveSummary = /** @param {App.Entity.SlaveState} slave */ function Slave
}
//this.output.appendChild(setup.summaryCache[State.temporary.Slave.ID].cloneNode(true))
return setup.summaryCache[slave.ID];
- } else return SlaveSummaryUncached(slave);
+ }
+ return SlaveSummaryUncached(slave);
};
-window.SlaveSummaryUncached = (function () {
+window.SlaveSummaryUncached = (function() {
"use strict";
let V;
let r;
@@ -3850,7 +3851,7 @@ window.SlaveSummaryUncached = (function () {
function short_extended_family(slave) {
let handled = 0;
if (slave.mother > 0) {
- const _ssj = V.slaves.findIndex(function (s) {
+ const _ssj = V.slaves.findIndex(function(s) {
return s.ID === slave.mother;
});
if (_ssj !== -1) {
@@ -3876,7 +3877,7 @@ window.SlaveSummaryUncached = (function () {
r += `${V.missingTable[slave.mother].fullName}'s daughter `;
}
if (slave.father > 0 && slave.father !== slave.mother) {
- const _ssj = V.slaves.findIndex(function (s) {
+ const _ssj = V.slaves.findIndex(function(s) {
return s.ID === slave.father;
});
if (_ssj !== -1) {
@@ -3902,7 +3903,7 @@ window.SlaveSummaryUncached = (function () {
r += `${V.missingTable[slave.father].fullName}'s daughter`;
}
if (slave.daughters === 1) {
- let _ssj = V.slaves.findIndex(function (s) {
+ let _ssj = V.slaves.findIndex(function(s) {
return s.mother === slave.ID;
});
if (_ssj !== -1) {
@@ -3914,7 +3915,7 @@ window.SlaveSummaryUncached = (function () {
}
}
r += " ";
- _ssj = V.slaves.findIndex(function (s) {
+ _ssj = V.slaves.findIndex(function(s) {
return s.father === slave.ID;
});
if (_ssj !== -1) {
@@ -3930,7 +3931,7 @@ window.SlaveSummaryUncached = (function () {
r += `multiple daughters `;
}
if (slave.sisters === 1) {
- const _ssj = V.slaves.findIndex(function (s) {
+ const _ssj = V.slaves.findIndex(function(s) {
return areSisters(s, slave) > 0;
});
if (_ssj !== -1) {
@@ -3946,7 +3947,7 @@ window.SlaveSummaryUncached = (function () {
r += `multiple sisters `;
}
if (slave.relationship > 0 && handled !== 1) {
- const _ssj = V.slaves.findIndex(function (s) {
+ const _ssj = V.slaves.findIndex(function(s) {
return s.ID === slave.relationshipTarget;
});
if (_ssj !== -1) {
@@ -3967,7 +3968,7 @@ window.SlaveSummaryUncached = (function () {
/** @param {App.Entity.SlaveState} slave */
function short_legacy_family(slave) {
if (slave.relation !== 0) {
- const _ssj = V.slaves.findIndex(function (s) {
+ const _ssj = V.slaves.findIndex(function(s) {
return s.ID === slave.relationTarget;
});
if (_ssj !== -1) {
@@ -3975,7 +3976,7 @@ window.SlaveSummaryUncached = (function () {
}
}
if (slave.relationship > 0) {
- const _ssj = V.slaves.findIndex(function (s) {
+ const _ssj = V.slaves.findIndex(function(s) {
return s.ID === slave.relationshipTarget;
});
if (_ssj !== -1) {
@@ -4007,7 +4008,7 @@ window.SlaveSummaryUncached = (function () {
function short_rival(slave) {
if (slave.rivalry !== 0) {
r += ` `;
- const _ssj = V.slaves.findIndex(function (s) {
+ const _ssj = V.slaves.findIndex(function(s) {
return s.ID === slave.rivalryTarget;
});
if (_ssj !== -1) {
@@ -4028,7 +4029,7 @@ window.SlaveSummaryUncached = (function () {
function long_extended_family(slave) {
let handled = 0;
if (slave.mother > 0) {
- const _ssj = V.slaves.findIndex(function (s) {
+ const _ssj = V.slaves.findIndex(function(s) {
return s.ID === slave.mother;
});
if (_ssj !== -1) {
@@ -4055,7 +4056,7 @@ window.SlaveSummaryUncached = (function () {
r += `${V.missingTable[slave.mother].fullName}'s <span class="lightgreen">daughter.</span> `;
}
if (slave.father > 0 && slave.father !== slave.mother) {
- const _ssj = V.slaves.findIndex(function (s) {
+ const _ssj = V.slaves.findIndex(function(s) {
return s.ID === slave.father;
});
if (_ssj !== -1) {
@@ -4082,7 +4083,7 @@ window.SlaveSummaryUncached = (function () {
r += `${V.missingTable[slave.father].fullName}'s <span class="lightgreen">daughter.</span> `;
}
if (slave.daughters === 1) {
- let _ssj = V.slaves.findIndex(function (s) {
+ let _ssj = V.slaves.findIndex(function(s) {
return s.mother === slave.ID;
});
if (_ssj !== -1) {
@@ -4094,7 +4095,7 @@ window.SlaveSummaryUncached = (function () {
}
r += `.</span> `;
}
- _ssj = V.slaves.findIndex(function (s) {
+ _ssj = V.slaves.findIndex(function(s) {
return s.father === slave.ID;
});
if (_ssj !== -1) {
@@ -4116,7 +4117,7 @@ window.SlaveSummaryUncached = (function () {
}
}
if (slave.sisters === 1) {
- const _ssj = V.slaves.findIndex(function (s) {
+ const _ssj = V.slaves.findIndex(function(s) {
return areSisters(s, slave) > 0;
});
if (_ssj !== -1) {
@@ -4138,7 +4139,7 @@ window.SlaveSummaryUncached = (function () {
}
}
if (slave.relationship > 0 && handled !== 1) {
- const _ssj = V.slaves.findIndex(function (s) {
+ const _ssj = V.slaves.findIndex(function(s) {
return s.ID === slave.relationshipTarget;
});
if (_ssj !== -1) {
@@ -4158,7 +4159,7 @@ window.SlaveSummaryUncached = (function () {
/** @param {App.Entity.SlaveState} slave */
function long_legacy_family(slave) {
if (slave.relation !== 0) {
- const _ssj = V.slaves.findIndex(function (s) {
+ const _ssj = V.slaves.findIndex(function(s) {
return s.ID === slave.relationTarget;
});
if (_ssj !== -1) {
@@ -4174,7 +4175,7 @@ window.SlaveSummaryUncached = (function () {
}
}
if (slave.relationship > 0) {
- const _ssj = V.slaves.findIndex(function (s) {
+ const _ssj = V.slaves.findIndex(function(s) {
return s.ID === slave.relationshipTarget;
});
if (_ssj !== -1) {
@@ -4206,7 +4207,7 @@ window.SlaveSummaryUncached = (function () {
function long_rival(slave) {
if (slave.rivalry !== 0) {
r += ` `;
- const _ssj = V.slaves.findIndex(function (s) {
+ const _ssj = V.slaves.findIndex(function(s) {
return s.ID === slave.rivalryTarget;
});
if (_ssj !== -1) {
@@ -4615,7 +4616,7 @@ window.SlaveSummaryUncached = (function () {
break;
case "porcelain mask":
r += `Porcelain mask.`;
- break
+ break;
default:
break;
}
@@ -4843,9 +4844,9 @@ App.UI.PassageSlaveFilers = {
"Spa": s => ((s.assignmentVisible === 1 && s.fuckdoll <= 0 && (
(State.variables.SlaveSummaryFiler === "assignable" && s.assignment !== "rest in the spa") ||
(State.variables.SlaveSummaryFiler === "occupying" && s.assignment === "rest in the spa") ||
- (State.variables.SlaveSummaryFiler === "leading" && s.ID === State.variables.Attendant.ID))) ||
+ (State.variables.SlaveSummaryFiler === "leading" && s.ID === State.variables.Attendant.ID))) ||
(s.assignmentVisible === 0 && s.fuckdoll <= 0 && (
- (State.variables.SlaveSummaryFiler === "transferable" && s.assignment !== "rest in the spa")))),
+ (State.variables.SlaveSummaryFiler === "transferable" && s.assignment !== "rest in the spa")))),
"Attendant Select": s => ((s.assignmentVisible === 1 && s.fuckdoll === 0 && s.devotion > 50 && canWalk(s) && canHear(s)) &&
((State.variables.SlaveSummaryFiler !== "experienced") ||
(State.variables.SlaveSummaryFiler === "experienced" && (s.skill[App.Data.Facilities.spa.manager.skill] >= State.variables.masteredXP) || (typeof s.career === 'string' && App.Data.Facilities.spa.manager.careers.includes(s.career))))),
@@ -4875,8 +4876,8 @@ App.UI.PassageSlaveFilers = {
(State.variables.SlaveSummaryFiler === "occupying" && s.assignment === "get treatment in the clinic") ||
(State.variables.SlaveSummaryFiler === "leading" && s.ID === State.variables.Nurse.ID))) ||
(s.assignmentVisible === 0 && s.fuckdoll <= 0 && (
- (State.variables.SlaveSummaryFiler === "transferable" && s.assignment !== "get treatment in the clinic")))),
- "Nurse Select": s => ((s.assignmentVisible === 1 && s.fuckdoll === 0 && s.devotion > 50 && canWalk(s) && canSee(s)) &&
+ (State.variables.SlaveSummaryFiler === "transferable" && s.assignment !== "get treatment in the clinic")))),
+ "Nurse Select": s => ((s.assignmentVisible === 1 && s.fuckdoll === 0 && s.devotion > 50 && canWalk(s) && canSee(s)) &&
((State.variables.SlaveSummaryFiler !== "experienced") ||
(State.variables.SlaveSummaryFiler === "experienced" && (s.skill[App.Data.Facilities.clinic.manager.skill] >= State.variables.masteredXP) || (typeof s.career === 'string' && App.Data.Facilities.clinic.manager.careers.includes(s.career))))),
"Schoolroom": s => ((s.assignmentVisible === 1 && s.fuckdoll <= 0 && (
@@ -4884,7 +4885,7 @@ App.UI.PassageSlaveFilers = {
(State.variables.SlaveSummaryFiler === "occupying" && s.assignment === "learn in the schoolroom") ||
(State.variables.SlaveSummaryFiler === "leading" && s.ID === State.variables.Schoolteacher.ID))) ||
(s.assignmentVisible === 0 && s.fuckdoll <= 0 && (
- (State.variables.SlaveSummaryFiler === "transferable" && s.assignment !== "learn in the schoolroom")))),
+ (State.variables.SlaveSummaryFiler === "transferable" && s.assignment !== "learn in the schoolroom")))),
"Schoolteacher Select": s => ((s.assignmentVisible === 1 && s.fuckdoll === 0 && s.devotion > 50 && canTalk(s) && canHear(s) && canSee(s)) &&
((State.variables.SlaveSummaryFiler !== "experienced") ||
(State.variables.SlaveSummaryFiler === "experienced" && (s.skill[App.Data.Facilities.schoolroom.manager.skill] >= State.variables.masteredXP) || (typeof s.career === 'string' && App.Data.Facilities.schoolroom.manager.careers.includes(s.career))))),
@@ -4950,7 +4951,7 @@ App.UI.PassageSlaveFilers = {
* @param {string} passageName
* @returns {string}
*/
-App.UI.slaveSummaryList = function (passageName) {
+App.UI.slaveSummaryList = function(passageName) {
'use strict';
const V = State.variables;
@@ -5012,15 +5013,15 @@ App.UI.slaveSummaryList = function (passageName) {
return r.join("");
}
- const _filteredSlaveIdxs = slaves.map(function (slave, idx) {
+ const _filteredSlaveIdxs = slaves.map(function(slave, idx) {
return _passagePreFilter(slave) ? idx : null;
- }).filter(function (idx) {
+ }).filter(function(idx) {
return idx !== null;
});
- const _indexSlavesIdxs = slaves.map(function (slave, idx) {
+ const _indexSlavesIdxs = slaves.map(function(slave, idx) {
return _passagePreFilter(slave) ? idx : null;
- }).filter(function (idx) {
+ }).filter(function(idx) {
return idx !== null;
});
@@ -5124,10 +5125,10 @@ App.UI.slaveSummaryList = function (passageName) {
"HG Select": makeSelectionPassageInfo(App.Entity.facilities.headGirlSuite, "HG Workaround"),
"BG Select": makeSelectionPassageInfo(App.Entity.facilities.armory, "Bodyguard Workaround"),
"Attendant Select": makeSelectionPassageInfo(App.Entity.facilities.spa, "Attendant Workaround"),
- "Concubine Select": makeSelectionPassageInfo(App.Entity.facilities.masterSuite, "Concubine Workaround"),
+ "Concubine Select": makeSelectionPassageInfo(App.Entity.facilities.masterSuite, "Concubine Workaround"),
"Matron Select": makeSelectionPassageInfo(App.Entity.facilities.nursery, "Matron Workaround"),
"Madam Select": makeSelectionPassageInfo(App.Entity.facilities.brothel, "Madam Workaround"),
- "Milkmaid Select": makeSelectionPassageInfo(App.Entity.facilities.dairy, "Milkmaid Workaround"),
+ "Milkmaid Select": makeSelectionPassageInfo(App.Entity.facilities.dairy, "Milkmaid Workaround"),
"Nurse Select": makeSelectionPassageInfo(App.Entity.facilities.clinic, "Nurse Workaround"),
"DJ Select": makeSelectionPassageInfo(App.Entity.facilities.club, "DJ Workaround"),
"Farmer Select": makeSelectionPassageInfo(App.Entity.facilities.farmyard, "Farmer Workaround"),
@@ -5294,7 +5295,7 @@ App.UI.slaveSummaryList = function (passageName) {
}
const _numFacilities = V.brothel + V.club + V.dairy + V.farmyard + V.servantsQuarters + V.masterSuite + V.spa + V.clinic + V.schoolroom + V.cellblock + V.arcade + V.HGSuite;
-
+
if (_numFacilities > 0) {
if (passageName === "Main" || passageName === "Head Girl Suite" || passageName === "Spa" || passageName === "Brothel" || passageName === "Club" || passageName === "Arcade" || passageName === "Clinic" || passageName === "Schoolroom" || passageName === "Dairy" || passageName === "Farmyard" || passageName === "Servants' Quarters" || passageName === "Master Suite" || passageName === "Cellblock") {
V.returnTo = passageName;
@@ -5327,7 +5328,7 @@ App.UI.slaveSummaryList = function (passageName) {
res.push(`<<link "Send ${_Slave.object} to ${passageFacility.name}" "Assign">><<set $i = ${_ssi}>><</link>>`);
} else if (V.SlaveSummaryFiler === "occupying") {
res.push(`<<link "Remove ${_Slave.object} from ${passageFacility.name}" "Retrieve">><<set $i = ${_ssi}>><</link>>`);
- } else if (passageFacility.desc.manager !== null){
+ } else if (passageFacility.desc.manager !== null) {
const managerCapName = capFirstChar(passageFacility.desc.manager.position);
res.push(`[[Change or remove ${managerCapName}|${managerCapName} Select]]`);
}
@@ -5379,7 +5380,7 @@ App.UI.slaveSummaryList = function (passageName) {
* Adds/removes a slave with the given id to/from the personal attention array
* @param {number} id slave id
*/
-App.UI.selectSlaveForPersonalAttention = function (id) {
+App.UI.selectSlaveForPersonalAttention = function(id) {
const V = State.variables;
if (!Array.isArray(V.personalAttention)) {
@@ -5389,7 +5390,7 @@ App.UI.selectSlaveForPersonalAttention = function (id) {
trainingRegimen: "undecided"
}];
} else {
- const _pai = V.personalAttention.findIndex(function (s) {
+ const _pai = V.personalAttention.findIndex(function(s) {
return s.ID === id;
});
if (_pai === -1) {
--
GitLab