From 55c4a2deb56cdab50e54e6bbf2d833f8f440a84f Mon Sep 17 00:00:00 2001
From: lowercasedonkey <lowercasedonkey@gmail.com>
Date: Mon, 17 Feb 2020 02:07:24 -0500
Subject: [PATCH] fixes
---
js/003-data/miscData.js | 10 ++++++++--
src/js/itemAvailability.js | 13 ++++++++++---
src/js/wardrobeUse.js | 1 -
3 files changed, 18 insertions(+), 6 deletions(-)
diff --git a/js/003-data/miscData.js b/js/003-data/miscData.js
index 4f2e16fbde9..36f9ee9cc9a 100644
--- a/js/003-data/miscData.js
+++ b/js/003-data/miscData.js
@@ -453,6 +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: [
+ //TODO: use proper name
{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} },
@@ -485,20 +486,25 @@ App.Data.misc = {
{name: "a hijab and blouse", value: "a hijab and blouse", unlock: {clothesBoughtMiddleEastern: 1, clothesBoughtConservative: 1, continent: "the Middle East"} },
{name: "a burkini", value: "a burkini", unlock: {clothesBoughtMiddleEastern: 1, clothesBoughtSwimwear: 1, continent: "the Middle East"} },
{name: "a Santa dress", value: "a Santa dress", unlock: {clothesBoughtCostume: 1} },
+
{name: "a klan robe", value: "a klan robe", unlock: {clothesBoughtPol: 1} },
{name: "a slutty klan robe", value: "a slutty klan robe", unlock: {clothesBoughtPol: 1} },
{name: "a schutzstaffel uniform", value: "a schutzstaffel uniform", unlock: {clothesBoughtPol: 1} },
{name: "a slutty schutzstaffel uniform", value: "a slutty schutzstaffel uniform", unlock: {clothesBoughtPol: 1} },
+
{name: "nice business attire", value: "nice business attire", unlock: {clothesBoughtCareer: 1} },
{name: "a nice nurse outfit", value: "a nice nurse outfit", unlock: {clothesBoughtCareer: 1} },
{name: "a police uniform", value: "a police uniform", unlock: {clothesBoughtCareer: 1} },
{name: "a nice maid outfit", value: "a nice maid outfit", unlock: {clothesBoughtCareer: 1, "PC.career": "servant"} },
+
{name: "a ball gown", value: "a ball gown", unlock: {clothesBoughtDresses: 1} },
{name: "a gothic lolita dress", value: "a gothic lolita dress", unlock: {clothesBoughtDresses: 1} },
+
{name: "a cybersuit", value: "a cybersuit", unlock: {clothesBoughtBodysuits: 1} },
{name: "a latex catsuit", value: "a latex catsuit", unlock: {clothesBoughtBodysuits: 1} },
- {name: "a button-up shirt and panties", value: "a button-up shirt and panties", unlock: {clothesBoughtBodysuits: 1} },
- {name: "a button-up shirt", value: "a button-up shirt", unlock: {clothesBoughtBodysuits: 1} },
+
+ {name: "a button-up shirt and panties", value: "a button-up shirt and panties", unlock: {clothesBoughtCasual: 1} },
+ {name: "a button-up shirt", value: "a button-up shirt", unlock: {clothesBoughtCasual: 1} },
{name: "cutoffs", value: "cutoffs", unlock: {clothesBoughtCasual: 1} },
{name: "jeans", value: "jeans", unlock: {clothesBoughtCasual: 1} },
{name: "leather pants and a tube top", value: "leather pants and a tube top", unlock: {clothesBoughtCasual: 1} },
diff --git a/src/js/itemAvailability.js b/src/js/itemAvailability.js
index 95a4924a237..a8f3d31f52d 100644
--- a/src/js/itemAvailability.js
+++ b/src/js/itemAvailability.js
@@ -224,12 +224,19 @@ window.isClothingAccessible = function(string) {
if (item.hasOwnProperty("unlock")) {
let keys = Object.keys(item.unlock);
for (let key in keys) {
- if (key === "continent" && V.continent === item.unlock[key]) {
+ if (keys[key] === "continent" && V.continent === item.unlock[keys[key]]) {
console.log(`${string} is in continent!`);
success = 1;
return true;
- } else if (V[key] > 0 ) {
- console.log(`${string} ${key} is true for us!`);
+ } else if (V[keys[key]] > 0 ) {
+ console.log(`${string} because ${keys[key]} is true for us!`);
+ success = 1;
+ return true;
+ }
+ }
+ // special case where they must both be true
+ if (item.unlock.clothesBoughtSports && item.unlock.clothesBoughtCasual) {
+ if (V.clothesBoughtSports && V.clothesBoughtCasual) {
success = 1;
return true;
}
diff --git a/src/js/wardrobeUse.js b/src/js/wardrobeUse.js
index 480ed843758..6e112b8b519 100644
--- a/src/js/wardrobeUse.js
+++ b/src/js/wardrobeUse.js
@@ -186,7 +186,6 @@ App.UI.Wardrobe.clothes = function(slave) {
}
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 {
--
GitLab