diff --git a/src/facilities/masterSuite/masterSuiteFramework.js b/src/facilities/masterSuite/masterSuiteFramework.js index ccfaa1b637b79c131b3eb6d40dc05afa0b250cdd..e2cd09cac5bb4ff3b4999e5d439505fe3f55d507 100644 --- a/src/facilities/masterSuite/masterSuiteFramework.js +++ b/src/facilities/masterSuite/masterSuiteFramework.js @@ -40,6 +40,10 @@ App.Entity.Facilities.MasterSuiteFuckToyJob = class extends App.Entity.Facilitie return r; } + + get _employeeIDsVariableName() { + return "MastSiIDs"; + } }; App.Entity.Facilities.ConcubineJob = class extends App.Entity.Facilities.ManagingJob { diff --git a/src/js/slaveListing.js b/src/js/slaveListing.js index 0b97e20f5f8f393af42e132535223c155b4b1f90..b76da962f4a9f0a14fdfe1d5eed1ef27afe5eede 100644 --- a/src/js/slaveListing.js +++ b/src/js/slaveListing.js @@ -816,10 +816,10 @@ App.UI.SlaveList.slaveSelectionList = function () { /** * Displays assignment filter links, whose action are generated by the callback * @param {assignmentFilterGenerateCallback} callback - * @param {boolean} includeExperianced + * @param {boolean} includeExperienced * @returns {string} */ - function _assignmentFilter(callback, includeExperianced) { + function _assignmentFilter(callback, includeExperienced) { let filters = { all: "All" }; @@ -837,14 +837,14 @@ App.UI.SlaveList.slaveSelectionList = function () { for (const f in filters) { links.push(App.UI.passageLink(filters[f], passage, callback(f))); } - if (includeExperianced) { - links.push(`<span class="lime">${App.UI.passageLink('Experianced', passage, callback('experianced'))}</span>`); + if (includeExperienced) { + links.push(`<span class="lime">${App.UI.passageLink('Experienced', passage, callback('experienced'))}</span>`); }*/ for (const f in filters) { links.push(`<<link "${filters[f]}">>${callback(f)}<</link>>`); } - if (includeExperianced) { - links.push(`<span class="lime"><<link "Experianced">>${callback('experianced')}<</link>></span>`); + if (includeExperienced) { + links.push(`<span class="lime"><<link "Experienced">>${callback('experienced')}<</link>></span>`); } return links.join(' | '); @@ -864,7 +864,7 @@ App.UI.SlaveList.slaveSelectionList = function () { case 'all': unfilteredIndices = Array.from({length: slaves.length}, (v, i) => i); break; - case 'experianced': + case 'experienced': unfilteredIndices = slaves.reduce((acc, s, idx) => { if (options.expCheck(s)) { acc.push(idx); diff --git a/src/uncategorized/BackwardsCompatibility.tw b/src/uncategorized/BackwardsCompatibility.tw index e9526a8d4db17ebb360fa8779f279bda104a662f..c83886f6583382ad41a7c54a5546414212aadea1 100644 --- a/src/uncategorized/BackwardsCompatibility.tw +++ b/src/uncategorized/BackwardsCompatibility.tw @@ -3518,9 +3518,14 @@ Updating gene pool records: <<set _Slave.eyes = -4>> <</if>> - <<if ndef _Slave.custom>> - <<set _Slave.custom = {tattoo: _Slave.customTat}>> /* should be the only thing needed */ - <</if>> + <<if ndef _Slave.custom>> <<set _Slave.custom = {}>> <</if>> + <<set _Slave.custom.tattoo = _Slave.customTat || "">> + <<set _Slave.custom.label = _Slave.custom.label || "">> + <<set _Slave.custom.desc = _Slave.custom.desc || "">> + <<set _Slave.custom.title = _Slave.custom.title || "">> + <<set _Slave.custom.titleLisp = _Slave.custom.titleLisp || "">> + <<set _Slave.custom.hairVector = _Slave.custom.hairVector || 0>> + <<set _Slave.custom.image = _Slave.custom.image || null>> <<run App.Entity.Utils.GenePoolRecordCleanup(_Slave)>> <<set $genePool[_bci] = _Slave>> diff --git a/src/uncategorized/bgSelect.tw b/src/uncategorized/bgSelect.tw index f892a8721469061dd5cbb5e131595c1846bdb482..118ae1a2bb5b47846a6075d0530d4c13761c577a 100644 --- a/src/uncategorized/bgSelect.tw +++ b/src/uncategorized/bgSelect.tw @@ -12,4 +12,4 @@ <br><br>''Appoint a bodyguard from your devoted slaves:'' <br><br>[[None|Bodyguard Workaround][$i = -1]] <br><br> -<<print App.UI.SlaveList.facilityManagerSelection(App.Entity.facilities.armory, "BG Workaround")>> +<<print App.UI.SlaveList.facilityManagerSelection(App.Entity.facilities.armory, "Bodyguard Workaround")>>