From a31eac0194c558f101d3f2bcfa021b71b70888b3 Mon Sep 17 00:00:00 2001
From: Arkerthan <arkerthan@mailbox.org>
Date: Wed, 15 Feb 2023 14:47:18 +0100
Subject: [PATCH] Fix rival not set correctly when killed/captured by
infiltration
---
src/events/nonRandom/rival/pRivalryActions.js | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/src/events/nonRandom/rival/pRivalryActions.js b/src/events/nonRandom/rival/pRivalryActions.js
index 4d21a330346..03d1efafd09 100644
--- a/src/events/nonRandom/rival/pRivalryActions.js
+++ b/src/events/nonRandom/rival/pRivalryActions.js
@@ -3562,19 +3562,23 @@ App.Events.pRivalryActions = function() {
arc.rival = 0;
arc.government = "direct democracy";
if (rivalCaptured) {
- V.rival.state = 3;
if (arc.FSSupremacist > 20) {
+ // @ts-ignore
V.rival.race = arc.FSSupremacistRace;
} else if (arc.FSSubjugationist > 20) {
V.rival.race = Array.from(App.Data.misc.filterRacesPublic.keys()).filter(race => race !== arc.FSSubjugationistRace).random();
}
- } else {
- V.rival.state = 4;
}
break;
}
}
}
+ if (rivalCaptured) {
+ V.rival.state = 3;
+ } else {
+ V.rival.state = 4;
+ }
+
if (V.rival.hostageState === 1) {
r.push(`${V.assistant.name} pauses. "Also confirm package is secure."`);
V.rival.hostageState = 2;
--
GitLab