Skip to content
Snippets Groups Projects
Commit c2eb729b authored by Pregmodder's avatar Pregmodder
Browse files

Merge branch 'dcoded-dev' into 'pregmod-master'

No need to display minority holders if they don't exist

See merge request pregmodfan/fc-pregmod!10663
parents 068648cf 0222cac8
No related branches found
No related tags found
1 merge request!10663No need to display minority holders if they don't exist
Pipeline #47191 passed
...@@ -35,7 +35,7 @@ App.UI.neighborDescription = function(i) { ...@@ -35,7 +35,7 @@ App.UI.neighborDescription = function(i) {
} }
let economicUncertainty = App.Utils.economicUncertainty(i); let economicUncertainty = App.Utils.economicUncertainty(i);
if (V.arcologies[i].direction === 0) { if (V.arcologies[i].direction === 0) {
r.push(`You control <span class="lime">${V.arcologies[i].ownership}%</span> of the arcology, and the largest minority holder controls <span class="orange">${V.arcologies[i].minority}%.</span>`); r.push(`You control <span class="lime">${V.arcologies[i].ownership}%</span> of the arcology${V.arcologies[0].ownership !== 100 ? `, and the largest minority holder controls <span class="orange">${V.arcologies[i].minority}%.</span>` : `.`}`);
} else if ((V.arcologies[i].government !== "your trustees") && (V.arcologies[i].government !== "your agent")) { } else if ((V.arcologies[i].government !== "your trustees") && (V.arcologies[i].government !== "your agent")) {
r.push(`Its leadership has control of approximately <span class="orange">${Math.trunc(V.arcologies[i].ownership*economicUncertainty)}%</span> of the arcology${(V.arcologies[i].minority > V.arcologies[i].ownership-10) ? `, a dangerously narrow margin over competition with a <span class="tan">${Math.trunc(V.arcologies[i].minority*economicUncertainty)}%</span> share` : ``}.`); r.push(`Its leadership has control of approximately <span class="orange">${Math.trunc(V.arcologies[i].ownership*economicUncertainty)}%</span> of the arcology${(V.arcologies[i].minority > V.arcologies[i].ownership-10) ? `, a dangerously narrow margin over competition with a <span class="tan">${Math.trunc(V.arcologies[i].minority*economicUncertainty)}%</span> share` : ``}.`);
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment