From bebe6bb2f7bf920cdee5b445785ed2bc83e5bf69 Mon Sep 17 00:00:00 2001
From: Svornost <11434-svornost@users.noreply.gitgud.io>
Date: Sat, 30 May 2020 11:58:09 -0700
Subject: [PATCH] cleanup for opinion function
---
src/neighbor/arcologyDiplomacy.js | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/src/neighbor/arcologyDiplomacy.js b/src/neighbor/arcologyDiplomacy.js
index 1df56958aef..0f0a1c19621 100644
--- a/src/neighbor/arcologyDiplomacy.js
+++ b/src/neighbor/arcologyDiplomacy.js
@@ -6,13 +6,10 @@
App.Neighbor.opinion = function(activeID, targetID) {
const activeArcology = V.arcologies[activeID];
const targetArcology = V.arcologies[targetID];
- if (typeof activeArcology.FSNull === "undefined") { activeArcology.FSNull = "unset"; }
- if (typeof targetArcology.FSNull === "undefined") { targetArcology.FSNull = "unset"; }
+ const {shared, conflicting} = FutureSocieties.diplomaticFSes(activeID, targetID);
let opinion = 0;
- const {shared, conflicting} = FutureSocieties.diplomaticFSes(activeID, targetID);
-
for (const fs of shared) {
opinion += activeArcology[fs];
opinion += targetArcology[fs];
@@ -32,7 +29,7 @@ App.Neighbor.opinion = function(activeID, targetID) {
}
}
- return opinion = Number(opinion) || 0;
+ return opinion;
};
/** set a new influence target for a given arcology
--
GitLab