From 2cc5719ab29b57dc362d21a4375890cf68fa40f4 Mon Sep 17 00:00:00 2001
From: Svornost <11434-svornost@users.noreply.gitgud.io>
Date: Mon, 5 Apr 2021 20:11:44 -0700
Subject: [PATCH] Drop $nicea.announceable flag in favor of a direct predicate
---
js/003-data/gameVariableData.js | 1 -
src/data/backwardsCompatibility/backwardsCompatibility.js | 1 -
src/endWeek/economics/fsDevelopments.js | 4 ----
src/events/nonRandomEvent.js | 2 +-
4 files changed, 1 insertion(+), 7 deletions(-)
diff --git a/js/003-data/gameVariableData.js b/js/003-data/gameVariableData.js
index f97db9e2985..eaa91661140 100644
--- a/js/003-data/gameVariableData.js
+++ b/js/003-data/gameVariableData.js
@@ -1148,7 +1148,6 @@ App.Data.resetOnNGPlus = {
FSSupLawTrigger: 0,
FSSubLawTrigger: 0,
nicaea: {
- announceable: 0,
announced: 0,
preparation: 0,
involvement: -2,
diff --git a/src/data/backwardsCompatibility/backwardsCompatibility.js b/src/data/backwardsCompatibility/backwardsCompatibility.js
index 2e817515e0c..848d2d10757 100644
--- a/src/data/backwardsCompatibility/backwardsCompatibility.js
+++ b/src/data/backwardsCompatibility/backwardsCompatibility.js
@@ -1313,7 +1313,6 @@ App.Update.globalVariables = function(node) {
if (!(typeof V.nicaea === 'object' && V.nicaea !== null)) { // Taking over the old V.nicaea which defaulted to 0 and was unused.
V.nicaea = {};
}
- V.nicaea.announceable = V.nicaea.announceable || V.nicaeaAnnounceable || 0;
V.nicaea.announced = V.nicaea.announced || V.nicaeaAnnounced || 0;
V.nicaea.preparation = V.nicaea.preparation || V.nicaeaPreparation || 0;
V.nicaea.involvement = V.nicaea.involvement || V.nicaeaInvolvement || -2;
diff --git a/src/endWeek/economics/fsDevelopments.js b/src/endWeek/economics/fsDevelopments.js
index 78a3ab8d954..74afdf8a9ef 100644
--- a/src/endWeek/economics/fsDevelopments.js
+++ b/src/endWeek/economics/fsDevelopments.js
@@ -305,10 +305,6 @@ App.EndWeek.FSDevelopments = function() {
}
}
- if (arc.FSChattelReligionist !== "unset" && arc.FSChattelReligionist >= V.FSLockinLevel) {
- V.nicaea.announceable = 1;
- }
-
App.UI.SlaveSummary.societyChanged();
App.Events.addNode(el, r, "div");
return el;
diff --git a/src/events/nonRandomEvent.js b/src/events/nonRandomEvent.js
index 16137a83bab..20af42798c6 100644
--- a/src/events/nonRandomEvent.js
+++ b/src/events/nonRandomEvent.js
@@ -86,7 +86,7 @@ App.Events.getNonrandomEvents = function() {
new App.Events.TwineEvent().wrapPassage([
() => V.nicaea.held !== 1,
() => V.arcologies[0].FSChattelReligionist !== "unset",
- () => V.nicaea.announceable === 1,
+ () => V.arcologies[0].FSChattelReligionist >= V.FSLockinLevel,
() => V.nicaea.announced !== 1,
() => V.nicaea.eventWeek !== V.week
], "SE nicaea announcement"),
--
GitLab