From c8e38ff47b535b4f51f7474f437e3a59a757e011 Mon Sep 17 00:00:00 2001 From: Guilherme Gois Pereira Date: Tue, 25 Nov 2025 12:46:44 -0300 Subject: [PATCH] DarkEdif: Refactor setIndexSelected getters and setters for consistency --- .../HTML5/DarkEdif_Template.js | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/DarkEdif/DarkEdif Template/HTML5/DarkEdif_Template.js b/DarkEdif/DarkEdif Template/HTML5/DarkEdif_Template.js index 1c989f34..33f206b6 100644 --- a/DarkEdif/DarkEdif Template/HTML5/DarkEdif_Template.js +++ b/DarkEdif/DarkEdif Template/HTML5/DarkEdif_Template.js @@ -135,11 +135,11 @@ globalThis['darkEdif'] = (globalThis['darkEdif'] && globalThis['darkEdif'].sdkVe // Name property JSON index that will appear in list when switching set entry setNameJSONPropIndex: rsDV.getUint16(1 + (2 * 3), true), // Current set index selected (0+), present at runtime too, but not used there - get setIndexSelected() { - return rsDV.getUint16(1 + (2 * 4), true); + getIndexSelected: function() { + return rsDV.getUint16(1 + (2 * 4), true); }, - set setIndexSelected(i) { - rsDV.setUint16(1 + (2 * 4), i, true); + setIndexSelected: function(i) { + rsDV.setUint16(1 + (2 * 4), i, true); }, // Set name, as specified in JSON. Don't confuse with user-specified set name. setName: that.textDecoder.decode(data.propData.slice(1 + (2 * 5))), @@ -182,13 +182,13 @@ globalThis['darkEdif'] = (globalThis['darkEdif'] && globalThis['darkEdif'].sdkVe } // It's within this set's range else if (jsonIdx >= rs.firstSetJSONPropIndex && jsonIdx <= rs.lastSetJSONPropIndex) { - if (rs.setIndexSelected > 0) { + if (rs.getIndexSelected() > 0) { for (let j = 0; ;) { data = that.props[++i]; // Skip until end of this entry, then move to next prop if (data.propJSONIndex == rs.lastSetJSONPropIndex) { - if (++j == rs.setIndexSelected) { + if (++j == rs.getIndexSelected()) { data = that.props[++i]; break; } @@ -339,7 +339,7 @@ globalThis['darkEdif'] = (globalThis['darkEdif'] && globalThis['darkEdif'].sdkVe this.runSetEntry = runSetEntry; this.runPropSet = new RuntimePropSet(runSetEntry); - this.runPropSet.setIndexSelected = 0; + this.runPropSet.setIndexSelected(0); this.firstIt = true; let thatToo = this; this.next = function() { @@ -347,11 +347,11 @@ globalThis['darkEdif'] = (globalThis['darkEdif'] && globalThis['darkEdif'].sdkVe if (thatToo.firstIt) { thatToo.firstIt = false; } else { - ++thatToo.runPropSet.setIndexSelected; + thatToo.runPropSet.setIndexSelected(thatToo.runPropSet.getIndexSelected() + 1); } return { - value: thatToo.runPropSet.setIndexSelected, - done: thatToo.runPropSet.setIndexSelected >= thatToo.runPropSet.numRepeats + value: thatToo.runPropSet.getIndexSelected(), + done: thatToo.runPropSet.getIndexSelected() >= thatToo.runPropSet.numRepeats }; }; this[Symbol.iterator] = function () { return this; };