From c9a71640e3e3360ee175b73b0a39ac06b44deed0 Mon Sep 17 00:00:00 2001
From: lowercasedonkey <lowercasedonkey@gmail.com>
Date: Tue, 9 Mar 2021 15:35:02 -0500
Subject: [PATCH] remove underscores
---
src/events/nonRandomEvent.js | 154 +++++++++++++++++------------------
1 file changed, 77 insertions(+), 77 deletions(-)
diff --git a/src/events/nonRandomEvent.js b/src/events/nonRandomEvent.js
index cab806adc7a..84ca9ea45ae 100644
--- a/src/events/nonRandomEvent.js
+++ b/src/events/nonRandomEvent.js
@@ -1,68 +1,68 @@
globalThis.nonRandomEvent = function() {
V.activeSlave = 0;
V.eventSlave = 0;
- const _effectiveWeek = V.week - V.nationHate;
+ const effectiveWeek = V.week - V.nationHate;
if (V.plot) {
- if (_effectiveWeek === 4 && V.arcologies[0].name.indexOf("Arcology ") !== -1) {
+ if (effectiveWeek === 4 && V.arcologies[0].name.indexOf("Arcology ") !== -1) {
V.Event = "arcology naming";
Engine.play("Generic Plot Events");
- } else if (_effectiveWeek >= 5 && V.FCTV.receiver === -1) {
+ } else if (effectiveWeek >= 5 && V.FCTV.receiver === -1) {
Engine.play("SE FCTV Install");
} else if (V.projectN.status === 1) {
V.projectN.status = 2;
- V.projectN.phase1 = _effectiveWeek;
+ V.projectN.phase1 = effectiveWeek;
Engine.play("SE projectNInitialized");
- } else if ((V.bodyPuristRiot === 1) && (V.puristRiotDone === 0) && (_effectiveWeek >= V.projectN.phase1 + 1) && (V.projectN.status !== 9)) {
+ } else if ((V.bodyPuristRiot === 1) && (V.puristRiotDone === 0) && (effectiveWeek >= V.projectN.phase1 + 1) && (V.projectN.status !== 9)) {
Engine.play("SE bodypuristprotest");
V.puristRiotDone = 1;
- } else if ((V.projectN.status === 2) && (V.projectN.public === 0) && (_effectiveWeek >= V.projectN.phase1 + 3)) {
+ } else if ((V.projectN.status === 2) && (V.projectN.public === 0) && (effectiveWeek >= V.projectN.phase1 + 3)) {
Engine.play("SE projectNmomoney");
- V.projectN.phase2 = _effectiveWeek;
- } else if ((V.projectN.status === 2) && (V.projectN.public === 1) && (_effectiveWeek >= V.projectN.phase1 + 5)) {
+ V.projectN.phase2 = effectiveWeek;
+ } else if ((V.projectN.status === 2) && (V.projectN.public === 1) && (effectiveWeek >= V.projectN.phase1 + 5)) {
Engine.play("SE projectNmomoney");
- V.projectN.phase2 = _effectiveWeek;
- } else if ((V.projectN.status === 3) && (V.projectN.wellFunded === 1) && (_effectiveWeek >= V.projectN.phase2 + 4)) {
+ V.projectN.phase2 = effectiveWeek;
+ } else if ((V.projectN.status === 3) && (V.projectN.wellFunded === 1) && (effectiveWeek >= V.projectN.phase2 + 4)) {
Engine.play("SE projectNbubbles");
V.projectN.status = 4;
- V.projectN.phase3 = _effectiveWeek;
- } else if ((V.projectN.status === 3) && (V.projectN.wellFunded !== 1) && (_effectiveWeek >= V.projectN.phase2 + 6)) {
+ V.projectN.phase3 = effectiveWeek;
+ } else if ((V.projectN.status === 3) && (V.projectN.wellFunded !== 1) && (effectiveWeek >= V.projectN.phase2 + 6)) {
Engine.play("SE projectNbubbles");
V.projectN.status = 4;
- V.projectN.phase3 = _effectiveWeek;
- } else if ((V.projectN.status === 4) && (V.projectN.poorlyFunded !== 1) && (_effectiveWeek >= V.projectN.phase3 + 4)) {
+ V.projectN.phase3 = effectiveWeek;
+ } else if ((V.projectN.status === 4) && (V.projectN.poorlyFunded !== 1) && (effectiveWeek >= V.projectN.phase3 + 4)) {
Engine.play("SE projectNsaboteur");
- V.projectN.phase4 = _effectiveWeek;
- } else if ((V.projectN.status === 4) && (V.projectN.public === 1) && (V.projectN.poorlyFunded === 1) && (_effectiveWeek >= V.projectN.phase3 + 6)) {
+ V.projectN.phase4 = effectiveWeek;
+ } else if ((V.projectN.status === 4) && (V.projectN.public === 1) && (V.projectN.poorlyFunded === 1) && (effectiveWeek >= V.projectN.phase3 + 6)) {
Engine.play("SE projectNsaboteur");
- V.projectN.phase4 = _effectiveWeek;
- } else if ((V.projectN.status === 4) && (V.projectN.public === 0) && (V.projectN.poorlyFunded === 1) && (_effectiveWeek >= V.projectN.phase3 + 6)) {
+ V.projectN.phase4 = effectiveWeek;
+ } else if ((V.projectN.status === 4) && (V.projectN.public === 0) && (V.projectN.poorlyFunded === 1) && (effectiveWeek >= V.projectN.phase3 + 6)) {
Engine.play("SE projectNblowingthelid");
- V.projectN.phase4 = _effectiveWeek;
- } else if ((V.puristsFurious === 1) && (V.puristRiotDone === 0) && (_effectiveWeek >= V.projectN.phase4 + 1 && (V.projectN.status !== 9))) {
+ V.projectN.phase4 = effectiveWeek;
+ } else if ((V.puristsFurious === 1) && (V.puristRiotDone === 0) && (effectiveWeek >= V.projectN.phase4 + 1 && (V.projectN.status !== 9))) {
Engine.play("SE bodypuristriot");
V.puristRiotDone = 1;
- } else if ((V.projectN.status === 5) && (_effectiveWeek >= V.projectN.phase4 + 4)) {
+ } else if ((V.projectN.status === 5) && (effectiveWeek >= V.projectN.phase4 + 4)) {
Engine.play("SE projectNcomplete");
- } else if ((V.projectN.status >= 6) && (V.projectN.status !== 9) && V.projectN.decisionMade !== 1 && (_effectiveWeek >= V.projectN.phase4 + 5)) {
+ } else if ((V.projectN.status >= 6) && (V.projectN.status !== 9) && V.projectN.decisionMade !== 1 && (effectiveWeek >= V.projectN.phase4 + 5)) {
Engine.play("SE projectNtechrelease");
} else if ((V.projectN.status === 7) && (V.growingNewCat === 0)) {
Engine.play("SE vatcatgirl");
} else if (V.projectN.status === 8 && V.growingNewCat === 0) {
Engine.play("SE vatcatboy");
- } else if (_effectiveWeek === 6) {
+ } else if (effectiveWeek === 6) {
V.Event = "strip club closing";
Engine.play("Generic Plot Events");
- } else if (_effectiveWeek === 8) {
+ } else if (effectiveWeek === 8) {
V.Event = "strip club aftermath";
Engine.play("Generic Plot Events");
- } else if (_effectiveWeek === 11) {
+ } else if (effectiveWeek === 11) {
V.Event = "assistant";
Engine.play("Assistant Events");
- } else if ((_effectiveWeek === 12) && V.raped === -1 && V.arcologyUpgrade.drones !== 1 && V.BodyguardID === 0 && V.PC.career !== "arcology owner") {
+ } else if ((effectiveWeek === 12) && V.raped === -1 && V.arcologyUpgrade.drones !== 1 && V.BodyguardID === 0 && V.PC.career !== "arcology owner") {
Engine.play("P raped");
- } else if (_effectiveWeek === 14 && V.badC !== 1) {
- const _valid = V.slaves.find(function(s) { return s.curatives > 1 || s.inflationType === "curative"; });
- if (_valid) {
+ } else if (effectiveWeek === 14 && V.badC !== 1) {
+ const valid = V.slaves.find(function(s) { return s.curatives > 1 || s.inflationType === "curative"; });
+ if (valid) {
V.badC = 1;
V.Event = "bad curatives";
Engine.play("Generic Plot Events");
@@ -70,47 +70,47 @@ globalThis.nonRandomEvent = function() {
V.badC = 1;
Engine.play("Nonrandom Event");
}
- } else if ((_effectiveWeek >= 15) && (V.arcologies[0].FSNeoImperialistLaw1 === 1) && V.assholeKnight !== 1) {
+ } else if ((effectiveWeek >= 15) && (V.arcologies[0].FSNeoImperialistLaw1 === 1) && V.assholeKnight !== 1) {
V.assholeKnight = 1;
- V.imperialEventWeek = _effectiveWeek;
+ V.imperialEventWeek = effectiveWeek;
Engine.play("SE assholeknight");
- } else if (_effectiveWeek === 17) {
+ } else if (effectiveWeek === 17) {
V.Event = "shoot invitation";
Engine.play("Generic Plot Events");
- } else if (_effectiveWeek === 20) {
+ } else if (effectiveWeek === 20) {
V.Event = "slave food";
Engine.play("Generic Plot Events");
- } else if (_effectiveWeek === 24) {
+ } else if (effectiveWeek === 24) {
V.Event = "militia";
Engine.play("Generic Plot Events");
} else if (V.week === 29) {
V.Event = "aid invitation";
Engine.play("Generic Plot Events");
- } else if (_effectiveWeek === 31 && V.mercenaries === 0) {
+ } else if (effectiveWeek === 31 && V.mercenaries === 0) {
Engine.play("P mercenaries");
- } else if (_effectiveWeek === 35 && V.mercenaries > 0) {
+ } else if (effectiveWeek === 35 && V.mercenaries > 0) {
Engine.play("P snatch and grab");
- } else if (_effectiveWeek === 43) {
+ } else if (effectiveWeek === 43) {
Engine.play("P invasion");
- } else if ((_effectiveWeek === 44) && (V.mercenaries > 0) && V.mercRomeo !== 1) {
- const _valid = V.slaves.find(function(s) { return (["serve the public", "serve in the club", "whore", "work in the brothel"].includes(s.assignment) || s.counter.publicUse >= 50) && s.fetish !== "mindbroken" && s.fuckdoll === 0; });
+ } else if ((effectiveWeek === 44) && (V.mercenaries > 0) && V.mercRomeo !== 1) {
+ const valid = V.slaves.find(function(s) { return (["serve the public", "serve in the club", "whore", "work in the brothel"].includes(s.assignment) || s.counter.publicUse >= 50) && s.fetish !== "mindbroken" && s.fuckdoll === 0; });
V.mercRomeo = 1;
- if (_valid) {
+ if (valid) {
Engine.play("P mercenary romeo");
} else {
Engine.play("Nonrandom Event");
}
- } else if (_effectiveWeek === 46 && V.mercenaries > 0) {
+ } else if (effectiveWeek === 46 && V.mercenaries > 0) {
Engine.play("P raid invitation");
- } else if (_effectiveWeek === 48 && V.experimental.food === 1) {
+ } else if (effectiveWeek === 48 && V.experimental.food === 1) {
V.foodCrisis = 1;
Engine.play("P food crisis");
- } else if (_effectiveWeek === 50 && V.rations > 0) {
+ } else if (effectiveWeek === 50 && V.rations > 0) {
V.foodCrisis = 2;
Engine.play("P food crisis");
- } else if ((_effectiveWeek === 52) && (V.seeHyperPreg === 1) && V.seePreg !== 0 && V.badB !== 1) {
- const _valid = V.slaves.find(function(s) { return s.drugs === "breast injections" || s.drugs === "hyper breast injections" || s.drugs === "intensive breast injections"; });
- if (_valid) {
+ } else if ((effectiveWeek === 52) && (V.seeHyperPreg === 1) && V.seePreg !== 0 && V.badB !== 1) {
+ const valid = V.slaves.find(function(s) { return s.drugs === "breast injections" || s.drugs === "hyper breast injections" || s.drugs === "intensive breast injections"; });
+ if (valid) {
V.badB = 1;
V.Event = "bad breasts";
Engine.play("Generic Plot Events");
@@ -118,53 +118,53 @@ globalThis.nonRandomEvent = function() {
V.badB = 1;
Engine.play("Nonrandom Event");
}
- } else if (_effectiveWeek === 54 && (V.peacekeepers) && V.peacekeepers.attitude >= 0) {
+ } else if (effectiveWeek === 54 && (V.peacekeepers) && V.peacekeepers.attitude >= 0) {
Engine.play("P peacekeepers deficit");
- } else if (_effectiveWeek === 56) {
+ } else if (effectiveWeek === 56) {
V.collaboration = 0;
V.traitor = 0;
V.hackerSupport = 0;
Engine.play("P underground railroad");
- } else if (_effectiveWeek === 58 && V.traitor === 0) {
+ } else if (effectiveWeek === 58 && V.traitor === 0) {
Engine.play("P bombing");
- } else if (_effectiveWeek === 60 && V.rations > 0) {
+ } else if (effectiveWeek === 60 && V.rations > 0) {
V.foodCrisis = 3;
Engine.play("P food crisis");
- } else if (_effectiveWeek === 61 && V.traitor !== 0) {
+ } else if (effectiveWeek === 61 && V.traitor !== 0) {
Engine.play("P traitor message");
- } else if (_effectiveWeek === 62 && V.mercenaries < 3) {
+ } else if (effectiveWeek === 62 && V.mercenaries < 3) {
Engine.play("P defense fears");
- } else if (_effectiveWeek === 65 && V.mercenaries >= 3) {
+ } else if (effectiveWeek === 65 && V.mercenaries >= 3) {
Engine.play("P citizens and civilians");
- } else if (_effectiveWeek === 67 && V.traitor !== 0) {
+ } else if (effectiveWeek === 67 && V.traitor !== 0) {
Engine.play("P collaboration choice");
- } else if (_effectiveWeek === 69) {
+ } else if (effectiveWeek === 69) {
Engine.play("P hacker support");
- } else if (_effectiveWeek === 70 && V.collaboration === 1 && V.traitorType !== "trapper") {
+ } else if (effectiveWeek === 70 && V.collaboration === 1 && V.traitorType !== "trapper") {
Engine.play("P coup collaboration");
- } else if (_effectiveWeek === 71) {
- const _doubleAgent = (V.traitorType !== "agent" && V.traitorType !== "trapper") ? 0 : 1;
+ } else if (effectiveWeek === 71) {
+ const doubleAgent = (V.traitorType !== "agent" && V.traitorType !== "trapper") ? 0 : 1;
if (V.traitorType === "trapper") {
Engine.play("P coup betrayal");
- } else if (V.mercenaries + V.personalArms + V.hackerSupport + _doubleAgent < 5) {
+ } else if (V.mercenaries + V.personalArms + V.hackerSupport + doubleAgent < 5) {
Engine.play("P coup loss");
} else {
Engine.play("P coup attempt");
}
- } else if (_effectiveWeek === 72) {
+ } else if (effectiveWeek === 72) {
Engine.play("P coup aftermath");
- } else if (V.SF.Toggle && V.SF.Active === -1 && _effectiveWeek >= 72) {
+ } else if (V.SF.Toggle && V.SF.Active === -1 && effectiveWeek >= 72) {
Engine.play("Security Force Proposal");
} else if (V.arcologies[0].FSRestart !== "unset" && V.failedElite > 300 && V.eugenicsFullControl !== 1) {
Engine.play("eliteTakeOver");
- } else if (_effectiveWeek > 5 && V.rep > 3000 && V.FSAnnounced === 0) {
+ } else if (effectiveWeek > 5 && V.rep > 3000 && V.FSAnnounced === 0) {
Engine.play("P FS Announcement");
- } else if (_effectiveWeek > 18 && V.assistant.personality > 0 && !V.assistant.options) {
+ } else if (effectiveWeek > 18 && V.assistant.personality > 0 && !V.assistant.options) {
V.Event = "assistant SP";
Engine.play("Assistant Events");
- } else if (_effectiveWeek > 45 && V.bodyswapAnnounced === 0 && V.surgeryUpgrade === 1) {
+ } else if (effectiveWeek > 45 && V.bodyswapAnnounced === 0 && V.surgeryUpgrade === 1) {
Engine.play("P Bodyswap Reveal");
- } else if (_effectiveWeek > 48 && V.invasionVictory > 0 && V.peacekeepers === 0 && V.peacekeepersGone !== 1) {
+ } else if (effectiveWeek > 48 && V.invasionVictory > 0 && V.peacekeepers === 0 && V.peacekeepersGone !== 1) {
Engine.play("P peacekeepers intro");
} else if (V.arcologies[0].prosperity > 80 && App.Utils.schoolCounter() === 0 && V.schoolSuggestion === 0) {
Engine.play("P school suggestion");
@@ -177,9 +177,9 @@ globalThis.nonRandomEvent = function() {
} else if (!V.assistant.market && V.assistant.power > 1) {
V.Event = "market assistant";
Engine.play("Assistant Events");
- } else if (_effectiveWeek > 70 && V.corp.Incorporated > 0 && V.rivalOwnerEnslaved > 0 && V.mercenaries >= 3 && V.mercenariesHelpCorp === 0 && V.corp.DivExtra > 0) {
+ } else if (effectiveWeek > 70 && V.corp.Incorporated > 0 && V.rivalOwnerEnslaved > 0 && V.mercenaries >= 3 && V.mercenariesHelpCorp === 0 && V.corp.DivExtra > 0) {
Engine.play("P Mercs Help Corp");
- } else if (_effectiveWeek > 75 && (V.peacekeepers) && V.peacekeepers.strength < 50 && V.rivalOwner === 0 && V.peacekeepersFate !== 1) {
+ } else if (effectiveWeek > 75 && (V.peacekeepers) && V.peacekeepers.strength < 50 && V.rivalOwner === 0 && V.peacekeepersFate !== 1) {
Engine.play("P peacekeepers independence");
} else if ((V.peacekeepers) && V.peacekeepers.strength >= 50 && V.peacekeepers.influenceAnnounced === 0) {
Engine.play("P peacekeepers influence");
@@ -211,38 +211,38 @@ globalThis.nonRandomEvent = function() {
Engine.play("P slave medic");
} else if (V.eventResults.pit === 1 && V.BodyguardID !== 0) {
Engine.play("PE pit fight");
- } else if ((_effectiveWeek >= 37) && (V.arcologies[0].FSNeoImperialistLaw1 === 1) && (V.arcologies[0].FSNeoImperialistLaw2 === 1) && V.poorKnight !== 1 && _effectiveWeek >= V.imperialEventWeek + 3) {
+ } else if ((effectiveWeek >= 37) && (V.arcologies[0].FSNeoImperialistLaw1 === 1) && (V.arcologies[0].FSNeoImperialistLaw2 === 1) && V.poorKnight !== 1 && effectiveWeek >= V.imperialEventWeek + 3) {
V.poorKnight = 1;
- V.imperialEventWeek = _effectiveWeek;
+ V.imperialEventWeek = effectiveWeek;
Engine.play("SE poorknight");
- } else if ((_effectiveWeek >= 40) && (V.arcologies[0].prosperity > 80) && (V.arcologies[0].FSNeoImperialistLaw2 === 1) && V.newBaron !== 1 && _effectiveWeek >= V.imperialEventWeek + 3) {
+ } else if ((effectiveWeek >= 40) && (V.arcologies[0].prosperity > 80) && (V.arcologies[0].FSNeoImperialistLaw2 === 1) && V.newBaron !== 1 && effectiveWeek >= V.imperialEventWeek + 3) {
V.newBaron = 1;
- V.imperialEventWeek = _effectiveWeek;
+ V.imperialEventWeek = effectiveWeek;
Engine.play("SE newBaron");
- } else if (V.rivalOwner === 0 && V.secExpEnabled > 0 && (_effectiveWeek >= 74 && V.SecExp.smilingMan.progress === 0 || _effectiveWeek >= 77 && V.SecExp.smilingMan.progress === 1 || _effectiveWeek >= 82 && V.SecExp.smilingMan.progress === 2 || V.SecExp.smilingMan.progress === 3)) {
+ } else if (V.rivalOwner === 0 && V.secExpEnabled > 0 && (effectiveWeek >= 74 && V.SecExp.smilingMan.progress === 0 || effectiveWeek >= 77 && V.SecExp.smilingMan.progress === 1 || effectiveWeek >= 82 && V.SecExp.smilingMan.progress === 2 || V.SecExp.smilingMan.progress === 3)) {
Engine.play("secExpSmilingMan");
} else if (V.rivalOwner === 0 && V.seeFCNN === 1 && V.FCNNstation === 0 && V.week > 95 && V.cash > 200000 && V.rep > 7500) {
Engine.play("SE FCNN Station");
- } else if (_effectiveWeek >= V.murderAttemptWeek) {
+ } else if (effectiveWeek >= V.murderAttemptWeek) {
Engine.play("Murder Attempt");
} else if (V.illegalDeals.slave !== 0 && V.illegalDeals.slave !== -1) {
V.event = "slave trade";
Engine.play("Murder Attempt");
- } else if (V.illegalDeals.trade !== 0 && V.illegalDeals.trade !== -1 && _effectiveWeek >= V.illegalDeals.trade.week) {
+ } else if (V.illegalDeals.trade !== 0 && V.illegalDeals.trade !== -1 && effectiveWeek >= V.illegalDeals.trade.week) {
V.event = "trade deal";
Engine.play("Murder Attempt");
- } else if (V.illegalDeals.military !== 0 && V.illegalDeals.military !== -1 && _effectiveWeek >= V.illegalDeals.military.week) {
+ } else if (V.illegalDeals.military !== 0 && V.illegalDeals.military !== -1 && effectiveWeek >= V.illegalDeals.military.week) {
V.event = "military deal";
Engine.play("Murder Attempt");
} else {
- if (random(1, 100) > _effectiveWeek + 25) {
+ if (random(1, 100) > effectiveWeek + 25) {
Engine.play("RIE Eligibility Check");
} else {
Engine.play("Random Nonindividual Event");
}
}
} else {
- if (random(1, 200) > _effectiveWeek + 100 || V.hostageRescued === 1) {
+ if (random(1, 200) > effectiveWeek + 100 || V.hostageRescued === 1) {
Engine.play("RIE Eligibility Check");
} else {
Engine.play("Random Nonindividual Event");
--
GitLab