diff --git a/js/003-data/miscData.js b/js/003-data/miscData.js index 3bd3bc81ee5395a8f25100bd6d9c4a089b7d8695..0c336abdf84effeb125fad245d046d915da634cb 100644 --- a/js/003-data/miscData.js +++ b/js/003-data/miscData.js @@ -1954,9 +1954,10 @@ App.Data.misc = { name: "Kimono", value: "a kimono", fs: "FSEdoRevivalist", - isUnlocked: function(slave) { - if (V.clothesBoughtKimono > 0 || V.continent === "Japan") { - return true; + rs: { + either: { + clothesBoughtKimono: 1, + continent: "Japan" } } }, @@ -2026,36 +2027,41 @@ App.Data.misc = { { name: "Burqa", value: "a burqa", - isUnlocked: function(slave) { - if (V.clothesBoughtMiddleEastern > 0 || V.continent === "the Middle East") { - return true; + rs: { + either: { + clothesBoughtMiddleEastern: 1, + continent: "the Middle East" } } }, { name: "Niqab and abaya", value: "a niqab and abaya", - isUnlocked: function(slave) { - if (V.clothesBoughtMiddleEastern > 0 || V.continent === "the Middle East") { - return true; + rs: { + either: { + clothesBoughtMiddleEastern: 1, + continent: "the Middle East" } } }, { name: "Hijab and blouse", value: "a hijab and blouse", - isUnlocked: function(slave) { - if (V.clothesBoughtConservative > 0 && (V.clothesBoughtMiddleEastern > 0 || V.continent === "the Middle East")) { - return true; + rs: { + either: { + clothesBoughtConservative: 1, + continent: "the Middle East" } } }, { name: "Burkini", value: "a burkini", - isUnlocked: function(slave) { - if (V.clothesBoughtSwimwear > 0 && (V.clothesBoughtMiddleEastern > 0 || V.continent === "the Middle East")) { - return true; + rs: { + clothesBoughtSwimwear: 1, + either: { + clothesBoughtMiddleEastern: 1, + continent: "the Middle East" } } }, @@ -2072,9 +2078,10 @@ App.Data.misc = { { name: "Maid (nice)", value: "a nice maid outfit", - isUnlocked: function(slave) { - if (V.clothesBoughtCareer > 0 || V.PC.career === "servant") { - return true; + rs: { + either: { + clothesBoughtCareer: 1, + "PC.career": "servant" //TODO: this shit right? } } }, @@ -2113,37 +2120,33 @@ App.Data.misc = { { name: "Leather pants and pasties", value: "leather pants and pasties", - isUnlocked: function(slave) { - if (V.clothesBoughtUnderwear > 0 && V.clothesBoughtCasual > 0) { - return true; - } + rs: { + clothesBoughtUnderwear: 1, + clothesBoughtCasual: 1 } }, { name: "T-shirt and thong", value: "a t-shirt and thong", - isUnlocked: function(slave) { - if (V.clothesBoughtUnderwear > 0 && V.clothesBoughtCasual > 0) { - return true; - } + rs: { + clothesBoughtUnderwear: 1, + clothesBoughtCasual: 1 } }, { name: "Tube top and thong", value: "a tube top and thong", - isUnlocked: function(slave) { - if (V.clothesBoughtUnderwear > 0 && V.clothesBoughtCasual > 0) { - return true; - } + rs: { + clothesBoughtUnderwear: 1, + clothesBoughtCasual: 1 } }, { name: "Oversized t-shirt and boyshorts", value: "an oversized t-shirt and boyshorts", - isUnlocked: function(slave) { - if (V.clothesBoughtUnderwear > 0 && V.clothesBoughtCasual > 0) { - return true; - } + rs: { + clothesBoughtUnderwear: 1, + clothesBoughtCasual: 1 } }, {name: "Sport shorts and a sports bra", value: "sport shorts and a sports bra", rs: "clothesBoughtSports"}, @@ -2152,10 +2155,9 @@ App.Data.misc = { { name: "Sport shorts and a t-shirt", value: "sport shorts and a t-shirt", - isUnlocked: function(slave) { - if (V.clothesBoughtSports && V.clothesBoughtCasual) { - return true; - } + rs: { + clothesBoughtSports: 1, + clothesBoughtCasual: 1 } }, {name: "Pony outfit (nice)", value: "a nice pony outfit", rs: "clothesBoughtPony"}, @@ -2167,27 +2169,30 @@ App.Data.misc = { { name: "Striped bra", value: "a striped bra", - isUnlocked: function(slave) { - if (V.clothesBoughtPantsu > 0 || V.continent === "Japan") { - return true; + rs: { + either: { + clothesBoughtPantsu: 1, + continent: "Japan" } } }, { name: "Striped panties", value: "striped panties", - isUnlocked: function(slave) { - if (V.clothesBoughtPantsu > 0 || V.continent === "Japan") { - return true; + rs: { + either: { + clothesBoughtPantsu: 1, + continent: "Japan" } } }, { name: "Striped underwear", value: "striped underwear", - isUnlocked: function(slave) { - if (V.clothesBoughtPantsu > 0 || continent === "Japan") { - return true; + rs: { + either: { + clothesBoughtPantsu: 1, + continent: "Japan" } } },