From 83216de9591a289baaba2cf6826626fc85b85d9e Mon Sep 17 00:00:00 2001
From: lowercasedonkey <lowercasedonkey@gmail.com>
Date: Thu, 25 Jun 2020 19:46:21 -0400
Subject: [PATCH] fix for complex retire display
---
js/003-data/policiesData.js | 6 +++---
src/interaction/policies/policies.js | 21 +++++++++++++--------
2 files changed, 16 insertions(+), 11 deletions(-)
diff --git a/js/003-data/policiesData.js b/js/003-data/policiesData.js
index 38616e081e0..f56724711a4 100644
--- a/js/003-data/policiesData.js
+++ b/js/003-data/policiesData.js
@@ -664,10 +664,10 @@ App.Data.Policies.Selection = {
{
title: "No Menial Retirement Plan",
activatedTitle: "",
- text: " without defining a retirement age for menial slaves they will remain slaves until death or freed otherwise.",
+ text: "without defining a retirement age for menial slaves they will remain slaves until death or freed otherwise.",
activatedText: "",
policy: "policies.retirement.menial2Citizen",
- requirements: function() { return "hide if activated"; },
+ hide:{button: 1, ifActivated: 1, ifDeactivated: 0}
}
],
[
@@ -694,7 +694,7 @@ App.Data.Policies.Selection = {
},
activatedText: "",
policy: "policies.retirement.menial2Citizen",
- requirements: function() { return "hide if activated"; },
+ hide:{button: 1, ifActivated: 1, ifDeactivated: 0}
}
],
[
diff --git a/src/interaction/policies/policies.js b/src/interaction/policies/policies.js
index b84355e4565..da15f63e84d 100644
--- a/src/interaction/policies/policies.js
+++ b/src/interaction/policies/policies.js
@@ -127,6 +127,9 @@ globalThis.policy = function(category) {
// apply
for (let i = 0; i < selectedPolicy.length; i++) {
const p = selectedPolicy[i];
+ if (p.hasOwnProperty("hide") && p.hide.ifDeactivated === 1) {
+ continue;
+ }
testArray(p);
div = document.createElement("div");
span = document.createElement("span");
@@ -143,22 +146,24 @@ globalThis.policy = function(category) {
// link
if (policyValue === 0) {
let enable;
- if (i === 1 && selectedPolicy.length === 2) {
+ if (p.hasOwnProperty("enable")) {
+ enable = p.enable;
+ } else if (i === 1 && selectedPolicy.length === 2) {
enable = -1;
} else {
enable = i + 1;
}
- if (p.hasOwnProperty("requirements")) {
+ if (p.hasOwnProperty("hide") && (p.hide.button === 1)) {
+ el.append(div);
+ } else if (p.hasOwnProperty("requirements")) {
const req = p.requirements();
if (req === true) {
implement(p, enable);
- } else if (p.requirements() !== "hide") {
+ } else {
link = App.UI.DOM.disabledLink("Implement", [`You do not meet the requirments, or passed a conflicting policy already`]);
link.style.color = "white";
div.append(link);
el.append(div);
- } else {
- el.append(div);
}
} else {
implement(p, enable);
@@ -180,8 +185,8 @@ globalThis.policy = function(category) {
i = policyValue - 1;
}
const p = selectedPolicy[i];
- if (p.hasOwnProperty("requirements")) {
- if (p.requirements() === "hide if activated") {
+ if (p.hasOwnProperty("hide")) {
+ if (p.hide.ifActivated === 1) {
return el;
}
}
@@ -233,7 +238,7 @@ globalThis.policy = function(category) {
function repeal(p) {
// repeal
let check = canAfford();
- if (!p.hasOwnProperty("requirements") || p.requirements() !== "hide") {
+ if (!(p.hasOwnProperty("hide") && p.hide.button === 1)) {
if (check === true) {
link = App.UI.DOM.link(
"Repeal",
--
GitLab