diff --git a/js/003-data/miscData.js b/js/003-data/miscData.js
index f9d2c1c3b32043d20d6f3fbd8076891a74174130..4f2e16fbde98a304c22fb337f66c62c8d3000acd 100644
--- a/js/003-data/miscData.js
+++ b/js/003-data/miscData.js
@@ -453,8 +453,7 @@ App.Data.misc = {
badNames: ["Ass Kisser", "Ass Licker", "Ass", "Assfucker", "Asshole", "Ballsack", "Bastard", "Bitch", "Cock", "Cocksucker", "Coward", "Creep", "Cum Rag", "Cunt", "Degenerate", "Despoiler", "Dick", "Dickhead", "Dicksucker", "Dickweed", "Dipshit", "Douchebag", "Dumbass", "DumbFuck", "Dunderfuck", "Faggot", "Fucker", "Fuckface", "Fuckhead", "Fucko", "Fucktard", "Fuckwit", "Idiot", "Inbred", "Jackass", "Jerk", "Jizz Stain", "Moron", "Motherfucker", "Nutsack", "Pissbaby", "Prick", "Pussy", "Rapist", "Ratfuck", "Retard", "Ruiner", "Schmuck", "Scumbag", "Shitbird", "Shithead", "Slave", "Slaver", "Sleazeball", "Slut", "Sodomite", "Thundercunt", "Traitor", "Trash", "Whore"],
clothes: [
- { name: "Cruel retirement counter", value: "cruel retirement counter", unlock: {seeAge: 1} },
- {name: "attractive lingerie for a pregnant woman", value: "attractive lingerie for a pregnant woman", unlock: {FSRepopulationFocus: 1, clothesBoughtMaternityLingerie: 1} },
+ {name: "attractive lingerie for a pregnant woman", value: "attractive lingerie for a pregnant woman", fs: "FSRepopulationFocus", unlock: {clothesBoughtMaternityLingerie: 1} },
{name: "a bunny outfit", value: "a bunny outfit", fs: "FSGenderFundamentalist", unlock: {clothesBoughtBunny: 1} },
{name: "body oil", value: "body oil", fs: "FSPhysicalIdealist", unlock: {clothesBoughtOil: 1} },
{name: "chains", value: "chains", fs: "FSDegradationist", unlock: {clothesBoughtChains: 1} },
@@ -466,12 +465,12 @@ App.Data.misc = {
{name: "a maternity dress", value: "a maternity dress", fs: "FSRepopulationFocus", unlock: {clothesBoughtMaternityDress: 1} },
{name: "a slutty qipao", value: "a slutty qipao", fs: "FSChineseRevivalist", unlock: {clothesBoughtQipao: 1} },
{name: "a long qipao", value: "a long qipao", fs: "FSChineseRevivalist", unlock: {clothesBoughtCultural: 1} },
- {name: "stretch pants and a crop-top", value: "stretch pants and a crop-top", unlock: {FSHedonisticDecadence: 1, clothesBoughtLazyClothes: 1} },
- {name: "a toga", value: "a toga", unlock: {FSRomanRevivalist: 1, clothesBoughtToga: 1} },
- {name: "Western clothing", value: "Western clothing", unlock: {FSPastoralist: 1, clothesBoughtWestern: 1} },
- {name: "a courtesan dress", value: "a courtesan dress", unlock: {FSSlaveProfessionalism: 1, clothesBoughtCourtesan: 1} },
- {name: "a bimbo outfit", value: "a bimbo outfit", unlock: {FSIntellectualDependency: 1, clothesBoughtBimbo: 1} },
- {name: "petite admi outfit", value: "petite admi outfit", unlock: {FSPetiteAdmiration: 1, clothesBoughtPetite: 1} },
+ {name: "stretch pants and a crop-top", value: "stretch pants and a crop-top", fs: "FSHedonisticDecadence", unlock: {clothesBoughtLazyClothes: 1} },
+ {name: "a toga", value: "a toga", fs: "FSRomanRevivalist", unlock: {clothesBoughtToga: 1} },
+ {name: "Western clothing", value: "Western clothing", fs: "FSPastoralist", unlock: {clothesBoughtWestern: 1} },
+ {name: "a courtesan dress", value: "a courtesan dress", fs: "FSSlaveProfessionalism", unlock: {clothesBoughtCourtesan: 1} },
+ {name: "a bimbo outfit", value: "a bimbo outfit", fs: "FSIntellectualDependency", unlock: {clothesBoughtBimbo: 1} },
+ {name: "petite admi outfit", value: "petite admi outfit", fs: "FSPetiteAdmiration", unlock: {clothesBoughtPetite: 1} },
{name: "battlearmor", value: "battlearmor", unlock: {clothesBoughtMilitary: 1} },
{name: "a military uniform", value: "a military uniform", unlock: {clothesBoughtMilitary: 1} },
{name: "a red army uniform", value: "a red army uniform", unlock: {clothesBoughtMilitary: 1} },
@@ -587,7 +586,8 @@ App.Data.misc = {
- /*
+ /* { name: "Cruel retirement counter", value: "cruel retirement counter", unlock: {seeAge: 1} },
+
{name: "massive dildo gag", value: "massive dildo gag", fs: "", unlock: {: 1, : 1} },
return (V.toysBoughtGags === 1);
{name: "a small empathy belly", value: "a small empathy belly", fs: "", unlock: {: 1, : 1} },
diff --git a/src/js/itemAvailability.js b/src/js/itemAvailability.js
index 80308c2d119b144e0c3db4ac9f138b98cde53d08..14f4f64e3947783a117ae9fb78723cf79be43397 100644
--- a/src/js/itemAvailability.js
+++ b/src/js/itemAvailability.js
@@ -9,17 +9,6 @@ window.isItemAccessible = function(string) {
if (V.cheatMode === 1) {
return true;
}
- /*if (setup.clothes.includes(string)) {
- console.log(`${string} is in setup!`);
- } else {
- console.log(`${string} is not in setup!`);
- }*/
- setup.clothes.forEach(item => {
- if (item.value === string) {
- console.log(`${string} is in setup!`);
- if (item.fs V.arcologies[0][item.fs]
- }
- });
switch (string) {
/* no breaks needed because we always return */
case "attractive lingerie for a pregnant woman":
@@ -209,7 +198,47 @@ window.isItemAccessible = function(string) {
console.log(`${string} not found`);
return true;
}
-}
+};
+
+window.isClothingAccessible = function(string) {
+ if (V.cheatMode === 1) {
+ return true;
+ }
+
+ let test = setup.clothes.forEach(item => {
+ if (item.value === string) {
+ if (!(item.hasOwnProperty("unlock")) && !(item.hasOwnProperty("fs"))) {
+ console.log(`${string} is free for everyone!`);
+ return true;
+ }
+ if (item.hasOwnProperty("fs")) {
+ if (V.arcologies[0][item.fs] > 0) {
+ console.log(`${string} is in FS!`);
+ return true;
+ }
+ }
+ if (item.hasOwnProperty("unlock")) {
+ let keys = Object.keys(item.unlock);
+ for (let key in keys) {
+ if (key === "continent" && V.continent === item.unlock[key]) {
+ console.log(`${string} is in continent!`);
+ return true;
+ } else if (V[key] > 0 ) {
+ console.log(`${string} ${key} is true for us!`);
+ return true;
+ }
+ }
+ }
+ console.log("this sucks, we couldn't get: ");
+ console.log(item);
+ }
+ return false;
+ });
+ console.log(test);
+ if (test === true) {
+ return true;
+ }
+};
/**
* @param {App.Entity.SlaveState} slave
diff --git a/src/js/wardrobeUse.js b/src/js/wardrobeUse.js
index dcf25c19cc8a8d513f5de57510427ed4c1d0988a..480ed843758d5fc6ae2ce9f0eaac93034e3e038d 100644
--- a/src/js/wardrobeUse.js
+++ b/src/js/wardrobeUse.js
@@ -19,7 +19,6 @@ App.UI.Wardrobe.clothes = function(slave) {
// Nice options:
niceOptionsArray.push({text: `Apron`, updateSlave: {clothes: `an apron`}});
niceOptionsArray.push({text: `Ballgown`, updateSlave: {clothes: `a ball gown`}});
- niceOptionsArray.push({text: `Ballgown`, updateSlave: {clothes: `a ball gown`}});
niceOptionsArray.push({text: `Bangles`, updateSlave: {clothes: `slutty jewelry`}});
niceOptionsArray.push({text: `Battlearmor`, updateSlave: {clothes: `battlearmor`}});
niceOptionsArray.push({text: `Battledress`, updateSlave: {clothes: `battledress`}});
@@ -185,8 +184,9 @@ App.UI.Wardrobe.clothes = function(slave) {
break;
}
}
- if (isItemAccessible(array[i].updateSlave.clothes)) {
+ if (isClothingAccessible(array[i].updateSlave.clothes)) {
// is it just text?
+ console.log("IT WORKED");
if (array[i].disabled) {
link = App.UI.DOM.disabledLink(array[i].text, [array[i].disabled]);
} else {