From 5153cddc9aa37e5652931d98aa0151d28b029013 Mon Sep 17 00:00:00 2001
From: Svornost <11434-svornost@users.noreply.gitgud.io>
Date: Tue, 25 Feb 2020 23:48:52 -0800
Subject: [PATCH] Fix some requirements so items that you haven't acquired
don't show up in slave interact.
---
js/003-data/miscData.js | 14 +++++++-------
src/js/itemAvailability.js | 2 +-
src/js/rulesAssistantOptions.js | 4 ++--
3 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/js/003-data/miscData.js b/js/003-data/miscData.js
index 4662677c0af..3e751a96be9 100644
--- a/js/003-data/miscData.js
+++ b/js/003-data/miscData.js
@@ -2289,19 +2289,19 @@ App.Data.misc = {
name: "Platforms",
value: "platform shoes",
fs: "FSStatuesqueGlorification",
- rs: "boughtShoes"
+ rs: "shoesBoughtHeels"
},
{
name: "Platform heels",
value: "platform heels",
fs: "FSStatuesqueGlorification",
- rs: "boughtShoes"
+ rs: "shoesBoughtHeels"
},
{
name: "Painfully extreme platform heels",
value: "extreme platform heels",
fs: "FSStatuesqueGlorification",
- rs: "boughtShoes"
+ rs: "shoesBoughtHeels"
}
],
@@ -2314,25 +2314,25 @@ App.Data.misc = {
name: "1st Trimester belly",
value: "a small empathy belly",
fs: "FSRepopulationFocus",
- rs: "boughtBelly"
+ rs: "clothesBoughtBelly"
},
{
name: "2nd Trimester belly",
value: "a medium empathy belly",
fs: "FSRepopulationFocus",
- rs: "boughtBelly"
+ rs: "clothesBoughtBelly"
},
{
name: "3rd Trimester belly",
value: "a large empathy belly",
fs: "FSRepopulationFocus",
- rs: "boughtBelly"
+ rs: "clothesBoughtBelly"
},
{
name: "3rd Trimester twins belly",
value: "a huge empathy belly",
fs: "FSRepopulationFocus",
- rs: "boughtBelly"
+ rs: "clothesBoughtBelly"
}
],
diff --git a/src/js/itemAvailability.js b/src/js/itemAvailability.js
index ba595d9ddff..b36116bdda1 100644
--- a/src/js/itemAvailability.js
+++ b/src/js/itemAvailability.js
@@ -321,7 +321,7 @@ window.isClothingAccessible = (function() {
eitherCheck++;
}
} else {
- if (item.rs.either.nestedRequirement === V.nestedRequirement) {
+ if (item.rs.either[nestedRequirement] === V[nestedRequirement]) {
eitherCheck++;
}
}
diff --git a/src/js/rulesAssistantOptions.js b/src/js/rulesAssistantOptions.js
index 7fa48dc20ea..a37c8a59993 100644
--- a/src/js/rulesAssistantOptions.js
+++ b/src/js/rulesAssistantOptions.js
@@ -1831,7 +1831,7 @@ window.rulesAssistantOptions = (function() {
shoes.push([acc.name, acc.value]);
} else if (acc.fs === "statuesque" && V.arcologies[0].FSStatuesqueGlorification !== "unset") {
shoes.push([`${acc.name} (FS)`, acc.value]);
- } else if (acc.rs === "boughtShoes" && V.shoesBoughtHeels === 1) {
+ } else if (acc.rs === "shoesBoughtHeels" && V.shoesBoughtHeels === 1) {
shoes.push([`${acc.name} (Purchased)`, acc.value]);
}
});
@@ -1849,7 +1849,7 @@ window.rulesAssistantOptions = (function() {
bellies.push([acc.name, acc.value]);
} else if (acc.fs === "repopulation" && V.arcologies[0].FSRepopulationFocus !== "unset") {
bellies.push([`${acc.name} (FS)`, acc.value]);
- } else if (acc.rs === "boughtBelly" && V.clothesBoughtBelly === 1) {
+ } else if (acc.rs === "clothesBoughtBelly" && V.clothesBoughtBelly === 1) {
bellies.push([`${acc.name} (Purchased)`, acc.value]);
}
});
--
GitLab