From 6e52a38f6c1ab5232e1fd2aa07a954c945bc8e8f Mon Sep 17 00:00:00 2001
From: Svornost <11434-svornost@users.noreply.gitgud.io>
Date: Wed, 24 Feb 2021 18:21:22 -0800
Subject: [PATCH] clear `rivalSet` if the rival arcology doesn't exist or is
the player arcology.
---
src/endWeek/nextWeek/nextWeek.js | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/endWeek/nextWeek/nextWeek.js b/src/endWeek/nextWeek/nextWeek.js
index ac272771ac3..19cc42c1eda 100644
--- a/src/endWeek/nextWeek/nextWeek.js
+++ b/src/endWeek/nextWeek/nextWeek.js
@@ -4,11 +4,11 @@ App.EndWeek.nextWeek = function() {
V.upgradeMultiplierMedicine = upgradeMultiplier('medicine');
V.upgradeMultiplierTrade = upgradeMultiplier('trading');
- if (V.rivalOwner !== 0) {
- const rival = V.arcologies.find(function(s) { return s.rival === 1; });
- if (rival) {
- V.rivalOwner = rival.prosperity;
- }
+ const rival = V.arcologies.find(function(s) { return s.direction !== 0 && s.rival === 1; });
+ if (rival && V.rivalOwner !== 0) {
+ V.rivalOwner = rival.prosperity;
+ } else if (!rival) {
+ V.rivalSet = 0;
}
if (V.playerAging !== 0) {
--
GitLab