diff --git a/js/003-data/gameVariableData.js b/js/003-data/gameVariableData.js index f97db9e298519340d0621a729b45e69cb122d17d..eaa9166114018b19e638d8919d206239478fe6a4 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 2e817515e0c8f3b24a5a2eb9351e6476641e36b5..848d2d1075723ed5618c2b0f2784781343473b1b 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 78a3ab8d9547cfbeec017b63b501fb4d0af9fef0..74afdf8a9efbeb945498c52b3becc6af0eb0e39e 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 16137a83babf5b16b5648596ae94bb1d40d0ab8c..20af42798c6c2a92bb13bec0d48036ea290d25b8 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"),