From 101bc8dd8b1c82761bd0a493bb72edca94d1b37c Mon Sep 17 00:00:00 2001
From: Svornost <11434-svornost@users.noreply.gitgud.io>
Date: Wed, 18 May 2022 19:14:12 -0400
Subject: [PATCH] Fix P Aid Invitation trigger so it will show correctly on
games that have BC run before week 29.
---
src/data/backwardsCompatibility/backwardsCompatibility.js | 3 ---
src/events/nonRandom/pAidInvitation.js | 4 ++--
2 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/src/data/backwardsCompatibility/backwardsCompatibility.js b/src/data/backwardsCompatibility/backwardsCompatibility.js
index c104e5d782e..d661272f9eb 100644
--- a/src/data/backwardsCompatibility/backwardsCompatibility.js
+++ b/src/data/backwardsCompatibility/backwardsCompatibility.js
@@ -951,9 +951,6 @@ App.Update.globalVariables = function(node) {
if (V.week > 11 && V.assistant.personality === 0) {
V.assistant.personality = -1;
}
- if (V.week > 29 && V.eventResults.aid === 0) {
- V.eventResults.aid = -1;
- }
App.Update.FCTV();
if (jQuery.isEmptyObject(V.arcologyUpgrade)) {
V.arcologyUpgrade = {
diff --git a/src/events/nonRandom/pAidInvitation.js b/src/events/nonRandom/pAidInvitation.js
index 362de9d1634..2c58bbc85e8 100644
--- a/src/events/nonRandom/pAidInvitation.js
+++ b/src/events/nonRandom/pAidInvitation.js
@@ -11,14 +11,14 @@ App.Events.pAidInvitation = class pAidInvitation extends App.Events.BaseEvent {
return [
() => V.plot === 1,
() => V.week >= 29,
- () => !V.eventResults.hasOwnProperty("aid")
+ () => !V.eventResults.aid
];
}
execute(node) {
const trapped = [];
let r = [];
- V.eventResults.aid = 0; // Mark event as seen.
+ V.eventResults.aid = -2; // Mark event as seen.
if (V.seeDicks <= 75) {
trapped.push("convent");
trapped.push("school");
--
GitLab