From 6ff8bed4f1f450b4a18f3c9544d9fd4479c654d1 Mon Sep 17 00:00:00 2001 From: KJeff01 Date: Sat, 5 Aug 2023 12:49:36 -0500 Subject: [PATCH] Convert var to let for data/base where possible Without causing save issues. --- data/base/script/campaign/cam1-1.js | 16 +-- data/base/script/campaign/cam1-1s.js | 2 +- data/base/script/campaign/cam1-2.js | 8 +- data/base/script/campaign/cam1-3.js | 20 +-- data/base/script/campaign/cam1-4a.js | 10 +- data/base/script/campaign/cam1-5.js | 28 ++-- data/base/script/campaign/cam1-7.js | 30 ++-- data/base/script/campaign/cam1-d.js | 12 +- data/base/script/campaign/cam1a-c.js | 26 ++-- data/base/script/campaign/cam1a.js | 12 +- data/base/script/campaign/cam1b.js | 10 +- data/base/script/campaign/cam1c.js | 18 +-- data/base/script/campaign/cam1ca.js | 35 +++-- data/base/script/campaign/cam2-1x.js | 18 +-- data/base/script/campaign/cam2-2.js | 18 +-- data/base/script/campaign/cam2-5.js | 12 +- data/base/script/campaign/cam2-6.js | 14 +- data/base/script/campaign/cam2-7.js | 18 +-- data/base/script/campaign/cam2-8.js | 16 +-- data/base/script/campaign/cam2-a.js | 47 ++++--- data/base/script/campaign/cam2-b.js | 12 +- data/base/script/campaign/cam2-c.js | 51 ++++--- data/base/script/campaign/cam2-d.js | 14 +- data/base/script/campaign/cam2-end.js | 44 +++--- data/base/script/campaign/cam3-1.js | 38 ++--- data/base/script/campaign/cam3-2.js | 34 ++--- data/base/script/campaign/cam3-4.js | 12 +- data/base/script/campaign/cam3-a.js | 22 +-- data/base/script/campaign/cam3-ab.js | 38 ++--- data/base/script/campaign/cam3-ad1.js | 38 ++--- data/base/script/campaign/cam3-ad2.js | 41 +++--- data/base/script/campaign/cam3-b.js | 28 ++-- data/base/script/campaign/cam3-c.js | 18 +-- .../campaign/libcampaign_includes/artifact.js | 38 ++--- .../campaign/libcampaign_includes/base.js | 58 ++++---- .../campaign/libcampaign_includes/debug.js | 6 +- .../campaign/libcampaign_includes/events.js | 14 +- .../campaign/libcampaign_includes/group.js | 8 +- .../campaign/libcampaign_includes/hook.js | 2 +- .../campaign/libcampaign_includes/misc.js | 36 ++--- .../campaign/libcampaign_includes/nexus.js | 18 +-- .../libcampaign_includes/production.js | 50 +++---- .../libcampaign_includes/reinforcements.js | 22 +-- .../campaign/libcampaign_includes/research.js | 8 +- .../campaign/libcampaign_includes/tactics.js | 130 ++++++++++-------- .../libcampaign_includes/transport.js | 24 ++-- .../campaign/libcampaign_includes/truck.js | 40 +++--- .../campaign/libcampaign_includes/victory.js | 52 +++---- .../campaign/libcampaign_includes/video.js | 4 +- .../campaign/libcampaign_includes/vtol.js | 4 +- data/base/script/fastplay/fastdemo.js | 4 +- data/base/script/rules.js | 38 ++--- data/base/script/tutorial.js | 18 +-- 53 files changed, 675 insertions(+), 659 deletions(-) diff --git a/data/base/script/campaign/cam1-1.js b/data/base/script/campaign/cam1-1.js index 2b88080264e..f29b20d1434 100644 --- a/data/base/script/campaign/cam1-1.js +++ b/data/base/script/campaign/cam1-1.js @@ -9,7 +9,7 @@ const SCAVENGER_RES = [ //Ambush player from scav base - triggered from middle path camAreaEvent("scavBaseTrigger", function() { - var ambushGroup = camMakeGroup(enumArea("eastScavsNorth", SCAV_7, false)); + let ambushGroup = camMakeGroup(enumArea("eastScavsNorth", SCAV_7, false)); camManageGroup(ambushGroup, CAM_ORDER_ATTACK, { count: -1, regroup: false @@ -35,7 +35,7 @@ camAreaEvent("factoryTrigger", function() function westScavAction() { - var ambushGroup = camMakeGroup(enumArea("westScavs", SCAV_7, false)); + let ambushGroup = camMakeGroup(enumArea("westScavs", SCAV_7, false)); camManageGroup(ambushGroup, CAM_ORDER_DEFEND, { pos: camMakePos("ambush1") }); @@ -43,7 +43,7 @@ function westScavAction() function northwestScavAction() { - var ambushGroup = camMakeGroup(enumArea("northWestScavs", SCAV_7, false)); + let ambushGroup = camMakeGroup(enumArea("northWestScavs", SCAV_7, false)); camManageGroup(ambushGroup, CAM_ORDER_DEFEND, { pos: camMakePos("ambush2") }); @@ -79,7 +79,7 @@ function checkFrontBunkers() { if (getObject("frontBunkerLeft") === null && getObject("frontBunkerRight") === null) { - var ambushGroup = camMakeGroup(enumArea("eastScavsSouth", SCAV_7, false)); + let ambushGroup = camMakeGroup(enumArea("eastScavsSouth", SCAV_7, false)); camManageGroup(ambushGroup, CAM_ORDER_ATTACK, { count: -1, regroup: false @@ -101,10 +101,10 @@ function eventStartLevel() retlz: true }); - var startpos = getObject("startPosition"); - var lz = getObject("landingZone"); //player lz - var tent = getObject("transporterEntry"); - var text = getObject("transporterExit"); + let startpos = getObject("startPosition"); + let lz = getObject("landingZone"); //player lz + let tent = getObject("transporterEntry"); + let text = getObject("transporterExit"); centreView(startpos.x, startpos.y); setNoGoArea(lz.x, lz.y, lz.x2, lz.y2, CAM_HUMAN_PLAYER); startTransporterEntry(tent.x, tent.y, CAM_HUMAN_PLAYER); diff --git a/data/base/script/campaign/cam1-1s.js b/data/base/script/campaign/cam1-1s.js index 7b8ca61722e..862e9f33ed8 100644 --- a/data/base/script/campaign/cam1-1s.js +++ b/data/base/script/campaign/cam1-1s.js @@ -27,7 +27,7 @@ function secondVideo() //Has player built the power module? function powerModuleBuilt() { - var gens = enumStruct(CAM_HUMAN_PLAYER, POWER_GEN, false); + let gens = enumStruct(CAM_HUMAN_PLAYER, POWER_GEN, false); for (let x = 0, l = gens.length; x < l; ++x) { if ((gens[x].modules > 0) && (gens[x].status === BUILT)) diff --git a/data/base/script/campaign/cam1-2.js b/data/base/script/campaign/cam1-2.js index a8724103362..22d018391c0 100644 --- a/data/base/script/campaign/cam1-2.js +++ b/data/base/script/campaign/cam1-2.js @@ -67,10 +67,10 @@ function eventStartLevel() retlz: true }); - var startpos = getObject("StartPosition"); - var lz = getObject("LandingZone"); - var tent = getObject("TransporterEntry"); - var text = getObject("TransporterExit"); + let startpos = getObject("StartPosition"); + let lz = getObject("LandingZone"); + let tent = getObject("TransporterEntry"); + let text = getObject("TransporterExit"); centreView(startpos.x, startpos.y); setNoGoArea(lz.x, lz.y, lz.x2, lz.y2, CAM_HUMAN_PLAYER); startTransporterEntry(tent.x, tent.y, CAM_HUMAN_PLAYER); diff --git a/data/base/script/campaign/cam1-3.js b/data/base/script/campaign/cam1-3.js index ea693f87d92..900d8440e64 100644 --- a/data/base/script/campaign/cam1-3.js +++ b/data/base/script/campaign/cam1-3.js @@ -34,11 +34,11 @@ camAreaEvent("NorthConvoyTrigger", function(droid) camAreaEvent("SouthConvoyTrigger", function(droid) { - var scout = getObject("ScoutDroid"); + let scout = getObject("ScoutDroid"); if (camDef(scout) && scout) { camTrace("New Paradigm sensor scout retreating"); - var pos = camMakePos("ScoutDroidTarget"); + let pos = camMakePos("ScoutDroidTarget"); orderDroidLoc(scout, DORDER_MOVE, pos.x, pos.y); } }); @@ -86,9 +86,9 @@ function NPReinforce() { if (getObject("NPHQ") !== null) { - var list = []; - var count = 5 + camRand(5); - var scouts = [cTempl.nphmg, cTempl.npblc, cTempl.nppod, cTempl.nphmg, cTempl.npblc]; + let list = []; + let count = 5 + camRand(5); + let scouts = [cTempl.nphmg, cTempl.npblc, cTempl.nppod, cTempl.nphmg, cTempl.npblc]; for (let i = 0; i < count; ++i) { @@ -130,7 +130,7 @@ function eventAttacked(victim, attacker) { if (victim.player === NEW_PARADIGM) { camCallOnce("enableNP"); - var commander = getObject("NPCommander"); + let commander = getObject("NPCommander"); if (camDef(attacker) && attacker && camDef(commander) && commander && commander.order !== DORDER_SCOUT && commander.order !== DORDER_RTR) { @@ -210,10 +210,10 @@ function eventStartLevel() annihilate: true }); - var startpos = getObject("StartPosition"); - var lz = getObject("LandingZone"); - var tent = getObject("TransporterEntry"); - var text = getObject("TransporterExit"); + let startpos = getObject("StartPosition"); + let lz = getObject("LandingZone"); + let tent = getObject("TransporterEntry"); + let text = getObject("TransporterExit"); centreView(startpos.x, startpos.y); setNoGoArea(lz.x, lz.y, lz.x2, lz.y2, CAM_HUMAN_PLAYER); startTransporterEntry(tent.x, tent.y, CAM_HUMAN_PLAYER); diff --git a/data/base/script/campaign/cam1-4a.js b/data/base/script/campaign/cam1-4a.js index 3ae34f58bb0..16e83216867 100644 --- a/data/base/script/campaign/cam1-4a.js +++ b/data/base/script/campaign/cam1-4a.js @@ -51,7 +51,7 @@ camAreaEvent("LandingZoneTrigger", function() camPlayVideos(["pcv456.ogg", {video: "SB1_4_B", type: MISS_MSG}]); hackRemoveMessage("C1-4_LZ", PROX_MSG, CAM_HUMAN_PLAYER); //Remove LZ 2 blip. - var lz = getObject("LandingZone2"); // will override later + let lz = getObject("LandingZone2"); // will override later setNoGoArea(lz.x, lz.y, lz.x2, lz.y2, CAM_HUMAN_PLAYER); // Give extra 40 minutes. @@ -113,10 +113,10 @@ function eventStartLevel() retlz: true }); - var startpos = getObject("StartPosition"); - var lz = getObject("LandingZone1"); // will override later - var tent = getObject("TransporterEntry"); - var text = getObject("TransporterExit"); + let startpos = getObject("StartPosition"); + let lz = getObject("LandingZone1"); // will override later + let tent = getObject("TransporterEntry"); + let text = getObject("TransporterExit"); centreView(startpos.x, startpos.y); setNoGoArea(lz.x, lz.y, lz.x2, lz.y2, CAM_HUMAN_PLAYER); diff --git a/data/base/script/campaign/cam1-5.js b/data/base/script/campaign/cam1-5.js index 909121efff0..5c2c96ecc23 100644 --- a/data/base/script/campaign/cam1-5.js +++ b/data/base/script/campaign/cam1-5.js @@ -25,10 +25,10 @@ var useHeavyReinforcement; //Get some droids for the New Paradigm transport function getDroidsForNPLZ(args) { - var lightAttackerLimit = 8; - var heavyAttackerLimit = 3; - var unitTemplates; - var list = []; + let lightAttackerLimit = 8; + let heavyAttackerLimit = 3; + let unitTemplates; + let list = []; if (difficulty === HARD) { @@ -43,8 +43,8 @@ function getDroidsForNPLZ(args) if (useHeavyReinforcement) { - var artillery = [cTempl.npmor]; - var other = [cTempl.npmmct]; + let artillery = [cTempl.npmor]; + let other = [cTempl.npmmct]; if (camRand(2) > 0) { //Add a sensor if artillery was chosen for the heavy units @@ -61,7 +61,7 @@ function getDroidsForNPLZ(args) unitTemplates = [cTempl.nppod, cTempl.npmrl, cTempl.nphmgt]; } - var lim = useHeavyReinforcement ? heavyAttackerLimit : lightAttackerLimit; + let lim = useHeavyReinforcement ? heavyAttackerLimit : lightAttackerLimit; for (let i = 0; i < lim; ++i) { list.push(unitTemplates[camRand(unitTemplates.length)]); @@ -123,13 +123,13 @@ function activateNPLZTransporter() function sendNPTransport() { - var nearbyDefense = enumArea("LandingZone2", NEW_PARADIGM, false).filter((obj) => ( + let nearbyDefense = enumArea("LandingZone2", NEW_PARADIGM, false).filter((obj) => ( obj.type === STRUCTURE && obj.stattype === DEFENSE )); if (nearbyDefense.length > 0) { - var list = getDroidsForNPLZ(); + let list = getDroidsForNPLZ(); camSendReinforcement(NEW_PARADIGM, camMakePos("NPTransportPos"), list, CAM_REINFORCE_TRANSPORT, { entry: { x: 2, y: 42 }, exit: { x: 2, y: 42 }, @@ -181,17 +181,17 @@ function eventStartLevel() }); useHeavyReinforcement = false; //Start with a light unit reinforcement first - var lz = getObject("LandingZone1"); //player lz - var lz2 = getObject("LandingZone2"); //new paradigm lz - var tent = getObject("TransporterEntry"); - var text = getObject("TransporterExit"); + let lz = getObject("LandingZone1"); //player lz + let lz2 = getObject("LandingZone2"); //new paradigm lz + let tent = getObject("TransporterEntry"); + let text = getObject("TransporterExit"); setNoGoArea(lz.x, lz.y, lz.x2, lz.y2, CAM_HUMAN_PLAYER); setNoGoArea(lz2.x, lz2.y, lz2.x2, lz2.y2, 5); startTransporterEntry(tent.x, tent.y, CAM_HUMAN_PLAYER); setTransporterExit(text.x, text.y, CAM_HUMAN_PLAYER); //Transporter is the only droid of the player's on the map - var transporter = enumDroid(); + let transporter = enumDroid(); cameraTrack(transporter[0]); //Make sure the New Paradigm and Scavs are allies diff --git a/data/base/script/campaign/cam1-7.js b/data/base/script/campaign/cam1-7.js index c0997d04000..edb9cbe7eb1 100644 --- a/data/base/script/campaign/cam1-7.js +++ b/data/base/script/campaign/cam1-7.js @@ -54,7 +54,7 @@ camAreaEvent("NPTransportTrigger", function(droid) { if (enemyHasArtifact && droid.group === artiGroup) { - var list = [cTempl.npmrl, cTempl.npmrl]; + let list = [cTempl.npmrl, cTempl.npmrl]; camSendReinforcement(NEW_PARADIGM, camMakePos("NPTransportPos"), list, CAM_REINFORCE_TRANSPORT, { entry: { x: 39, y: 2 }, exit: { x: 32, y: 60 } @@ -81,7 +81,7 @@ function eventTransporterLanded(transport) if (transport.player === NEW_PARADIGM && enemyHasArtifact) { enemyStoleArtifact = true; - var crew = enumRange(transport.x, transport.y, 6, NEW_PARADIGM, false).filter((obj) => ( + let crew = enumRange(transport.x, transport.y, 6, NEW_PARADIGM, false).filter((obj) => ( obj.type === DROID && obj.group === artiGroup )); for (let i = 0, l = crew.length; i < l; ++i) @@ -98,7 +98,7 @@ function eventGroupLoss(obj, group, newsize) { if (obj.id === droidWithArtiID) { - var acrate = addFeature("Crate", obj.x, obj.y); + let acrate = addFeature("Crate", obj.x, obj.y); addLabel(acrate, "newArtiLabel"); camSetArtifacts({ @@ -127,15 +127,15 @@ function getArtifact() } const GRAB_RADIUS = 2; - var artifact = camGetArtifacts().filter((label) => ( + let artifact = camGetArtifacts().filter((label) => ( enemyCanTakeArtifact(label) && getObject(label) !== null )); - var artiLoc = artiMovePos; + let artiLoc = artiMovePos; if (!enemyHasArtifact && !enemyStoleArtifact && artifact.length > 0) { //Go to the artifact instead. - var realCrate = artifact[0]; + let realCrate = artifact[0]; artiLoc = camMakePos(realCrate); if (!camDef(artiLoc)) { @@ -143,13 +143,13 @@ function getArtifact() } //Find the one closest to the artifact so that one can "hold" it - var artiMembers = enumGroup(artiGroup); - var idx = 0; - var dist = Infinity; + let artiMembers = enumGroup(artiGroup); + let idx = 0; + let dist = Infinity; for (let i = 0, l = artiMembers.length; i < l; ++i) { - var drDist = camDist(artiMembers[i], artiLoc); + let drDist = camDist(artiMembers[i], artiLoc); if (drDist < dist) { idx = i; @@ -190,7 +190,7 @@ function buildLancers() //Must destroy all of the New Paradigm droids and make sure the artifact is safe. function extraVictory() { - var npTransportFound = false; + let npTransportFound = false; enumDroid(NEW_PARADIGM).forEach((dr) => { if (camIsTransporter(dr)) { @@ -244,10 +244,10 @@ function eventStartLevel() enemyHasArtifact = false; enemyStoleArtifact = false; artiMovePos = "NPWayPoint"; - var startpos = getObject("startPosition"); - var lz = getObject("landingZone"); //player lz - var tent = getObject("transporterEntry"); - var text = getObject("transporterExit"); + let startpos = getObject("startPosition"); + let lz = getObject("landingZone"); //player lz + let tent = getObject("transporterEntry"); + let text = getObject("transporterExit"); centreView(startpos.x, startpos.y); setNoGoArea(lz.x, lz.y, lz.x2, lz.y2, CAM_HUMAN_PLAYER); startTransporterEntry(tent.x, tent.y, CAM_HUMAN_PLAYER); diff --git a/data/base/script/campaign/cam1-d.js b/data/base/script/campaign/cam1-d.js index 8bdbd7268da..31825f07bec 100644 --- a/data/base/script/campaign/cam1-d.js +++ b/data/base/script/campaign/cam1-d.js @@ -61,9 +61,9 @@ function transportBaseSetup() function getDroidsForNPLZ() { const LIM = 8; //Last alpha mission always has 8 transport units - var templates = [ cTempl.nphct, cTempl.nphct, cTempl.npmorb, cTempl.npmorb, cTempl.npsbb ]; + let templates = [ cTempl.nphct, cTempl.nphct, cTempl.npmorb, cTempl.npmorb, cTempl.npsbb ]; - var droids = []; + let droids = []; for (let i = 0; i < LIM; ++i) { droids.push(templates[camRand(templates.length)]); @@ -148,10 +148,10 @@ function eventStartLevel() eliminateBases: true }); - var startpos = getObject("startPosition"); - var lz = getObject("landingZone"); //player lz - var tent = getObject("transporterEntry"); - var text = getObject("transporterExit"); + let startpos = getObject("startPosition"); + let lz = getObject("landingZone"); //player lz + let tent = getObject("transporterEntry"); + let text = getObject("transporterExit"); centreView(startpos.x, startpos.y); setNoGoArea(lz.x, lz.y, lz.x2, lz.y2, CAM_HUMAN_PLAYER); startTransporterEntry(tent.x, tent.y, CAM_HUMAN_PLAYER); diff --git a/data/base/script/campaign/cam1a-c.js b/data/base/script/campaign/cam1a-c.js index bc59ad01f6c..b3d94fe5801 100644 --- a/data/base/script/campaign/cam1a-c.js +++ b/data/base/script/campaign/cam1a-c.js @@ -27,7 +27,7 @@ var switchLZ; //Counter for incrementing index every third landing //Check if all enemies are gone and win after 15 transports function extraVictoryCondition() { - var enemies = enumArea(0, 0, mapWidth, mapHeight, ENEMIES, false); + let enemies = enumArea(0, 0, mapWidth, mapHeight, ENEMIES, false); if (index === 5 && enemies.length === 0) { return true; @@ -43,9 +43,9 @@ function checkForGroundForces() const maxTanks = 16; const firstAmount = 10; - var droidGroup1 = []; //Heavy cannon mantis track units - var droidGroup2 = []; //Sensor and heavy mortar units - var templates = [ cTempl.nphct, cTempl.npmsens, cTempl.npmorb ]; + let droidGroup1 = []; //Heavy cannon mantis track units + let droidGroup2 = []; //Sensor and heavy mortar units + let templates = [ cTempl.nphct, cTempl.npmsens, cTempl.npmorb ]; for (let i = 0; i <= maxTanks; ++i) { @@ -64,7 +64,7 @@ function checkForGroundForces() } //What part of map to appear at - var pos = (index === 0) ? camMakePos("reinforceSouthEast") : camMakePos("reinforceNorth"); + let pos = (index === 0) ? camMakePos("reinforceSouthEast") : camMakePos("reinforceNorth"); camSendReinforcement(NEW_PARADIGM, pos, droidGroup1, CAM_REINFORCE_GROUND, { data: {regroup: false, count: -1,}, }); @@ -76,19 +76,19 @@ function checkForGroundForces() //New Paradigm transport appears fifteen times before mission win function sendTransport() { - var position = camMakePos(landingZoneList[index]); + let position = camMakePos(landingZoneList[index]); switchLZ += 1; // (2 or 3 or 4) pairs of each droid template. // This emulates wzcam's droid count distribution. - var count = [ 2, 3, 4, 4, 4, 4, 4, 4, 4 ][camRand(9)]; + let count = [ 2, 3, 4, 4, 4, 4, 4, 4, 4 ][camRand(9)]; - var templates = [ cTempl.npcybc, cTempl.npcybf, cTempl.npcybm ]; + let templates = [ cTempl.npcybc, cTempl.npcybf, cTempl.npcybm ]; - var droids = []; + let droids = []; for (let i = 0; i < count; ++i) { - var t = templates[camRand(templates.length)]; + let t = templates[camRand(templates.length)]; // two droids of each template droids[droids.length] = t; droids[droids.length] = t; @@ -141,8 +141,8 @@ function eventStartLevel() callback: "extraVictoryCondition" }); - var startpos = getObject("startPosition"); - var lz = getObject("landingZone"); + let startpos = getObject("startPosition"); + let lz = getObject("landingZone"); centreView(startpos.x, startpos.y); setNoGoArea(lz.x, lz.y, lz.x2, lz.y2, CAM_HUMAN_PLAYER); @@ -151,7 +151,7 @@ function eventStartLevel() // make sure player doesn't build on enemy LZs for (let i = 6; i <= 10; ++i) { - var ph = getObject("NPLZ" + i); + let ph = getObject("NPLZ" + i); setNoGoArea(ph.x, ph.y, ph.x2, ph.y2, i - 4); } diff --git a/data/base/script/campaign/cam1a.js b/data/base/script/campaign/cam1a.js index 0d0218d49c6..0ad27f918d1 100644 --- a/data/base/script/campaign/cam1a.js +++ b/data/base/script/campaign/cam1a.js @@ -29,8 +29,8 @@ camAreaEvent("launchScavAttack", function(droid) function runAway() { - var oilPatch = getObject("oilPatch"); - var droids = enumRange(oilPatch.x, oilPatch.y, 7, SCAV_7, false); + let oilPatch = getObject("oilPatch"); + let droids = enumRange(oilPatch.x, oilPatch.y, 7, SCAV_7, false); camManageGroup(camMakeGroup(droids), CAM_ORDER_ATTACK, { pos: camMakePos("scavAttack1"), fallback: camMakePos("retreat1"), @@ -88,10 +88,10 @@ function eventStructureBuilt(structure, droid) if (structure.player === CAM_HUMAN_PLAYER && structure.stattype === RESOURCE_EXTRACTOR) { // Is it in the base two area? - var objs = enumArea("scavBase2Cleanup", CAM_HUMAN_PLAYER); + let objs = enumArea("scavBase2Cleanup", CAM_HUMAN_PLAYER); for (let i = 0, l = objs.length; i < l; ++i) { - var obj = objs[i]; + let obj = objs[i]; if (obj.type === STRUCTURE && obj.stattype === RESOURCE_EXTRACTOR) { camCallOnce("raidAttack"); @@ -132,8 +132,8 @@ function enableBaseStructures() function eventStartLevel() { const PLAYER_POWER = 1300; - var startpos = getObject("startPosition"); - var lz = getObject("landingZone"); + let startpos = getObject("startPosition"); + let lz = getObject("landingZone"); camSetStandardWinLossConditions(CAM_VICTORY_STANDARD, "CAM_1B"); diff --git a/data/base/script/campaign/cam1b.js b/data/base/script/campaign/cam1b.js index 47d0374eb8c..fec85e35e84 100644 --- a/data/base/script/campaign/cam1b.js +++ b/data/base/script/campaign/cam1b.js @@ -37,7 +37,7 @@ camAreaEvent("AttackArea2", function(droid) function doNPRetreat() { - var pos = camMakePos("NPSensorTurn"); + let pos = camMakePos("NPSensorTurn"); if (NPScout) { camTrace("New Paradigm sensor droid is retreating"); @@ -61,7 +61,7 @@ function eventDestroyed(obj) camAreaEvent("NPSensorTurn", function(droid) { - var pos = camMakePos("NPSensorRemove"); + let pos = camMakePos("NPSensorRemove"); orderDroidLoc(NPScout, DORDER_MOVE, pos.x, pos.y); }); @@ -73,8 +73,8 @@ camAreaEvent("NPSensorRemove", function(droid) function eventStartLevel() { camSetStandardWinLossConditions(CAM_VICTORY_STANDARD, "SUB_1_1S"); - var startpos = getObject("startPosition"); - var lz = getObject("landingZone"); + let startpos = getObject("startPosition"); + let lz = getObject("landingZone"); centreView(startpos.x, startpos.y); setNoGoArea(lz.x, lz.y, lz.x2, lz.y2, CAM_HUMAN_PLAYER); @@ -175,6 +175,6 @@ function eventStartLevel() // New Paradigm sensor scout. Now comes with the map! NPScout = getObject("npscout"); camNeverGroupDroid(NPScout); - var pos = getObject("NPSensorWatch"); + let pos = getObject("NPSensorWatch"); orderDroidLoc(NPScout, DORDER_MOVE, pos.x, pos.y); } diff --git a/data/base/script/campaign/cam1c.js b/data/base/script/campaign/cam1c.js index 21cc6973494..3cb6f9ccaad 100644 --- a/data/base/script/campaign/cam1c.js +++ b/data/base/script/campaign/cam1c.js @@ -120,13 +120,13 @@ function camEnemyBaseEliminated_NPCentralFactory() function getDroidsForNPLZ(args) { - var scouts = [ cTempl.nppod, cTempl.nphmg ]; - var heavies = [ cTempl.npslc, cTempl.npsmct ]; - var useArtillery = (camRand(100) < 50); + let scouts = [ cTempl.nppod, cTempl.nphmg ]; + let heavies = [ cTempl.npslc, cTempl.npsmct ]; + let useArtillery = (camRand(100) < 50); - var numScouts = camRand(5) + 1; - var heavy = heavies[camRand(heavies.length)]; - var list = []; + let numScouts = camRand(5) + 1; + let heavy = heavies[camRand(heavies.length)]; + let list = []; if (useArtillery) { @@ -180,15 +180,15 @@ camAreaEvent("NPLZ2Trigger", function() function eventStartLevel() { camSetStandardWinLossConditions(CAM_VICTORY_STANDARD, "CAM_1CA"); - var startpos = getObject("startPosition"); - var lz = getObject("landingZone"); + let startpos = getObject("startPosition"); + let lz = getObject("landingZone"); centreView(startpos.x, startpos.y); setNoGoArea(lz.x, lz.y, lz.x2, lz.y2, CAM_HUMAN_PLAYER); // make sure player doesn't build on enemy LZs of the next level for (let i = 1; i <= 5; ++i) { - var ph = getObject("PhantomLZ" + i); + let ph = getObject("PhantomLZ" + i); // HACK: set LZs of bad players, namely 2...6, // note: player 1 is NP, player 7 is scavs setNoGoArea(ph.x, ph.y, ph.x2, ph.y2, i + 1); diff --git a/data/base/script/campaign/cam1ca.js b/data/base/script/campaign/cam1ca.js index 1823a7cb191..7cd3a496933 100644 --- a/data/base/script/campaign/cam1ca.js +++ b/data/base/script/campaign/cam1ca.js @@ -22,7 +22,7 @@ var totalTransportLoads; function baseEstablished() { //Now we check if there is stuff built here already from cam1-C. - var total = camCountStructuresInArea("buildArea") + + let total = camCountStructuresInArea("buildArea") + camCountStructuresInArea("buildArea2") + camCountStructuresInArea("buildArea3") + camCountStructuresInArea("buildArea4") + @@ -51,7 +51,7 @@ function baseEstablished() function extraVictoryCondition() { const MIN_TRANSPORT_RUNS = 10; - var enemies = enumArea(0, 0, mapWidth, mapHeight, ENEMIES, false); + let enemies = enumArea(0, 0, mapWidth, mapHeight, ENEMIES, false); // No enemies on map and at least eleven New Paradigm transport runs. if (baseEstablished() && (totalTransportLoads > MIN_TRANSPORT_RUNS) && !enemies.length) { @@ -68,14 +68,13 @@ function sendTransport() { lastHeavy = true; } - var list = []; - var i = 0; + let list = []; // Randomly find an LZ that is not compromised if (camRand(100) < 10) { - for (i = 0; i < landingZoneList.length; ++i) + for (let i = 0; i < landingZoneList.length; ++i) { - var lz = landingZoneList[i]; + let lz = landingZoneList[i]; if (enumArea(lz, CAM_HUMAN_PLAYER, false).length === 0) { list.push({ idx: i, label: lz }); @@ -85,21 +84,21 @@ function sendTransport() //If all are compromised (or not checking for compromised LZs) then choose the LZ randomly if (list.length === 0) { - for (i = 0; i < 2; ++i) + for (let i = 0; i < 2; ++i) { - var rnd = camRand(landingZoneList.length); + let rnd = camRand(landingZoneList.length); list.push({ idx: rnd, label: landingZoneList[rnd] }); } } - var picked = list[camRand(list.length)]; + let picked = list[camRand(list.length)]; lastLZ = picked.idx; - var pos = camMakePos(picked.label); + let pos = camMakePos(picked.label); // (2 or 3 or 4) pairs of each droid template. // This emulates wzcam's droid count distribution. - var count = [ 2, 3, 4, 4, 4, 4, 4, 4, 4 ][camRand(9)]; + let count = [ 2, 3, 4, 4, 4, 4, 4, 4, 4 ][camRand(9)]; - var templates; + let templates; if (lastHeavy) { lastHeavy = false; @@ -111,10 +110,10 @@ function sendTransport() templates = [ cTempl.npsmct, cTempl.npmor, cTempl.npsmc, cTempl.npmmct, cTempl.npmrl, cTempl.nphmg, cTempl.npsbb, cTempl.npltat ]; } - var droids = []; - for (i = 0; i < count; ++i) + let droids = []; + for (let i = 0; i < count; ++i) { - var t = templates[camRand(templates.length)]; + let t = templates[camRand(templates.length)]; // two droids of each template droids[droids.length] = t; droids[droids.length] = t; @@ -152,15 +151,15 @@ function eventStartLevel() camSetStandardWinLossConditions(CAM_VICTORY_STANDARD, "SUB_1_4AS", { callback: "extraVictoryCondition" }); - var startpos = getObject("startPosition"); - var lz = getObject("landingZone"); + let startpos = getObject("startPosition"); + let lz = getObject("landingZone"); centreView(startpos.x, startpos.y); setNoGoArea(lz.x, lz.y, lz.x2, lz.y2, CAM_HUMAN_PLAYER); // make sure player doesn't build on enemy LZs for (let i = 1; i <= 5; ++i) { - var ph = getObject("PhantomLZ" + i); + let ph = getObject("PhantomLZ" + i); // HACK: set LZs of bad players, namely 2...6, // note: player 1 is NP setNoGoArea(ph.x, ph.y, ph.x2, ph.y2, i + 2); diff --git a/data/base/script/campaign/cam2-1x.js b/data/base/script/campaign/cam2-1x.js index 929052e241c..a59fec6cc90 100644 --- a/data/base/script/campaign/cam2-1x.js +++ b/data/base/script/campaign/cam2-1x.js @@ -36,7 +36,7 @@ camAreaEvent("crashSite", function(droid) hackRemoveMessage("C21_OBJECTIVE", PROX_MSG, CAM_HUMAN_PLAYER); - var droids = enumDroid(TRANSPORT_TEAM); + let droids = enumDroid(TRANSPORT_TEAM); for (let i = 0; i < droids.length; ++i) { donateObject(droids[i], CAM_HUMAN_PLAYER); @@ -51,7 +51,7 @@ camAreaEvent("crashSite", function(droid) function preDamageUnits() { setHealth(getObject("transporter"), 40); - var droids = enumDroid(TRANSPORT_TEAM); + let droids = enumDroid(TRANSPORT_TEAM); for (let j = 0; j < droids.length; ++j) { setHealth(droids[j], 40 + camRand(20)); @@ -80,13 +80,13 @@ function setupCyborgGroups() function setCrashedTeamExp() { const DROID_EXP = 32; - var droids = enumDroid(TRANSPORT_TEAM).filter((dr) => ( + let droids = enumDroid(TRANSPORT_TEAM).filter((dr) => ( !camIsSystemDroid(dr) && !camIsTransporter(dr) )); for (let i = 0; i < droids.length; ++i) { - var droid = droids[i]; + let droid = droids[i]; setDroidExperience(droid, DROID_EXP); } @@ -118,16 +118,16 @@ function eventStartLevel() callback: "checkCrashedTeam" }); - var subLandingZone = getObject("landingZone"); - var startpos = getObject("startingPosition"); - var tent = getObject("transporterEntry"); - var text = getObject("transporterExit"); + let subLandingZone = getObject("landingZone"); + let startpos = getObject("startingPosition"); + let tent = getObject("transporterEntry"); + let text = getObject("transporterExit"); centreView(startpos.x, startpos.y); setNoGoArea(subLandingZone.x, subLandingZone.y, subLandingZone.x2, subLandingZone.y2, CAM_HUMAN_PLAYER); startTransporterEntry(tent.x, tent.y, CAM_HUMAN_PLAYER); setTransporterExit(text.x, text.y, CAM_HUMAN_PLAYER); - var enemyLz = getObject("COLandingZone"); + let enemyLz = getObject("COLandingZone"); setNoGoArea(enemyLz.x, enemyLz.y, enemyLz.x2, enemyLz.y2, THE_COLLECTIVE); //Add crash site blip and from an alliance with the crashed team. diff --git a/data/base/script/campaign/cam2-2.js b/data/base/script/campaign/cam2-2.js index ba614ab2fb7..e41fadae2a8 100644 --- a/data/base/script/campaign/cam2-2.js +++ b/data/base/script/campaign/cam2-2.js @@ -62,8 +62,8 @@ camAreaEvent("wayPoint2Rad", function(droid) return; } - var point = getObject("wayPoint3"); - var defGroup = enumRange(point.x, point.y, 10, THE_COLLECTIVE, false).filter((obj) => ( + let point = getObject("wayPoint3"); + let defGroup = enumRange(point.x, point.y, 10, THE_COLLECTIVE, false).filter((obj) => ( obj.droidType === DROID_WEAPON )); @@ -98,7 +98,7 @@ camAreaEvent("failZone", function(droid) function vtolAttack() { - var list = [cTempl.colatv, cTempl.colatv]; + let list = [cTempl.colatv, cTempl.colatv]; camSetVtolData(THE_COLLECTIVE, "vtolAppearPoint", "vtolRemovePoint", list, camChangeOnDiff(camMinutesToMilliseconds(5)), "COCommandCenter"); } @@ -117,7 +117,7 @@ function truckDefense() function showGameOver() { - var arti = camGetArtifacts(); + let arti = camGetArtifacts(); camSafeRemoveObject(arti[0], false); gameOverMessage(false); } @@ -158,16 +158,16 @@ function eventStartLevel() retlz: true }); - var startpos = getObject("startPosition"); - var lz = getObject("landingZone"); //player lz - var tent = getObject("transporterEntry"); - var text = getObject("transporterExit"); + let startpos = getObject("startPosition"); + let lz = getObject("landingZone"); //player lz + let tent = getObject("transporterEntry"); + let text = getObject("transporterExit"); centreView(startpos.x, startpos.y); setNoGoArea(lz.x, lz.y, lz.x2, lz.y2, CAM_HUMAN_PLAYER); startTransporterEntry(tent.x, tent.y, CAM_HUMAN_PLAYER); setTransporterExit(text.x, text.y, CAM_HUMAN_PLAYER); - var enemyLz = getObject("COLandingZone"); + let enemyLz = getObject("COLandingZone"); setNoGoArea(enemyLz.x, enemyLz.y, enemyLz.x2, enemyLz.y2, THE_COLLECTIVE); camSetArtifacts({ diff --git a/data/base/script/campaign/cam2-5.js b/data/base/script/campaign/cam2-5.js index b2d26f8e29e..ec17ca05760 100644 --- a/data/base/script/campaign/cam2-5.js +++ b/data/base/script/campaign/cam2-5.js @@ -34,7 +34,7 @@ function camEnemyBaseEliminated_COEastBase() //Tell everything not grouped on map to attack function camEnemyBaseDetected_COEastBase() { - var droids = enumArea(0, 0, mapWidth, mapHeight, THE_COLLECTIVE, false).filter((obj) => ( + let droids = enumArea(0, 0, mapWidth, mapHeight, THE_COLLECTIVE, false).filter((obj) => ( obj.type === DROID && obj.group === null && obj.canHitGround )); @@ -96,16 +96,16 @@ function eventStartLevel() reinforcements: camMinutesToSeconds(3) }); - var startpos = getObject("startPosition"); - var lz = getObject("landingZone"); //player lz - var tent = getObject("transporterEntry"); - var text = getObject("transporterExit"); + let startpos = getObject("startPosition"); + let lz = getObject("landingZone"); //player lz + let tent = getObject("transporterEntry"); + let text = getObject("transporterExit"); centreView(startpos.x, startpos.y); setNoGoArea(lz.x, lz.y, lz.x2, lz.y2, CAM_HUMAN_PLAYER); startTransporterEntry(tent.x, tent.y, CAM_HUMAN_PLAYER); setTransporterExit(text.x, text.y, CAM_HUMAN_PLAYER); - var enemyLz = getObject("COLandingZone"); + let enemyLz = getObject("COLandingZone"); setNoGoArea(enemyLz.x, enemyLz.y, enemyLz.x2, enemyLz.y2, THE_COLLECTIVE); camSetArtifacts({ diff --git a/data/base/script/campaign/cam2-6.js b/data/base/script/campaign/cam2-6.js index a810b6f6810..93079bbad82 100644 --- a/data/base/script/campaign/cam2-6.js +++ b/data/base/script/campaign/cam2-6.js @@ -46,7 +46,7 @@ function camEnemyBaseEliminated_COUplinkBase() //Group together attack droids in this base that are not already in a group function camEnemyBaseDetected_COMediumBase() { - var droids = enumArea("mediumBaseCleanup", THE_COLLECTIVE, false).filter((obj) => ( + let droids = enumArea("mediumBaseCleanup", THE_COLLECTIVE, false).filter((obj) => ( obj.type === DROID && obj.group === null && obj.canHitGround )); @@ -63,7 +63,7 @@ function truckDefense() return; } - var list = ["Emplacement-Howitzer105", "Emplacement-Rocket06-IDF", "Sys-CB-Tower01", "Emplacement-Howitzer105", "Emplacement-Rocket06-IDF", "Sys-SensoTower02"]; + let list = ["Emplacement-Howitzer105", "Emplacement-Rocket06-IDF", "Sys-CB-Tower01", "Emplacement-Howitzer105", "Emplacement-Rocket06-IDF", "Sys-SensoTower02"]; camQueueBuilding(THE_COLLECTIVE, list[camRand(list.length)], camMakePos("buildPos1")); camQueueBuilding(THE_COLLECTIVE, list[camRand(list.length)], camMakePos("buildPos2")); } @@ -117,16 +117,16 @@ function eventStartLevel() reinforcements: camMinutesToSeconds(3) }); - var startpos = getObject("startPosition"); - var lz = getObject("landingZone"); //player lz - var tent = getObject("transporterEntry"); - var text = getObject("transporterExit"); + let startpos = getObject("startPosition"); + let lz = getObject("landingZone"); //player lz + let tent = getObject("transporterEntry"); + let text = getObject("transporterExit"); centreView(startpos.x, startpos.y); setNoGoArea(lz.x, lz.y, lz.x2, lz.y2, CAM_HUMAN_PLAYER); startTransporterEntry(tent.x, tent.y, CAM_HUMAN_PLAYER); setTransporterExit(text.x, text.y, CAM_HUMAN_PLAYER); - var enemyLz = getObject("COLandingZone"); + let enemyLz = getObject("COLandingZone"); setNoGoArea(enemyLz.x, enemyLz.y, enemyLz.x2, enemyLz.y2, THE_COLLECTIVE); camSetArtifacts({ diff --git a/data/base/script/campaign/cam2-7.js b/data/base/script/campaign/cam2-7.js index 13a0d466629..b22ee5a34ce 100644 --- a/data/base/script/campaign/cam2-7.js +++ b/data/base/script/campaign/cam2-7.js @@ -24,7 +24,7 @@ function camEnemyBaseDetected_COBase2() { hackRemoveMessage("C27_OBJECTIVE2", PROX_MSG, CAM_HUMAN_PLAYER); - var vt = enumArea("COBase2Cleanup", THE_COLLECTIVE, false).filter((obj) => ( + let vt = enumArea("COBase2Cleanup", THE_COLLECTIVE, false).filter((obj) => ( obj.type === DROID && isVTOL(obj) )); camManageGroup(camMakeGroup(vt), CAM_ORDER_ATTACK, { @@ -44,7 +44,7 @@ function camEnemyBaseDetected_COBase4() function baseThreeVtolAttack() { - var vt = enumArea("vtolGroupBase3", THE_COLLECTIVE, false).filter((obj) => ( + let vt = enumArea("vtolGroupBase3", THE_COLLECTIVE, false).filter((obj) => ( obj.type === DROID && isVTOL(obj) )); camManageGroup(camMakeGroup(vt), CAM_ORDER_ATTACK, { @@ -54,7 +54,7 @@ function baseThreeVtolAttack() function baseFourVtolAttack() { - var vt = enumArea("vtolGroupBase4", THE_COLLECTIVE, false).filter((obj) => ( + let vt = enumArea("vtolGroupBase4", THE_COLLECTIVE, false).filter((obj) => ( obj.type === DROID && isVTOL(obj) )); camManageGroup(camMakeGroup(vt), CAM_ORDER_ATTACK, { @@ -92,7 +92,7 @@ function truckDefense() return; } - var list = ["Emplacement-Howitzer105", "Emplacement-Rocket06-IDF", "Sys-CB-Tower01", "Emplacement-Howitzer105", "Emplacement-Rocket06-IDF", "Sys-SensoTower02"]; + let list = ["Emplacement-Howitzer105", "Emplacement-Rocket06-IDF", "Sys-CB-Tower01", "Emplacement-Howitzer105", "Emplacement-Rocket06-IDF", "Sys-SensoTower02"]; camQueueBuilding(THE_COLLECTIVE, list[camRand(list.length)], camMakePos("buildPos1")); camQueueBuilding(THE_COLLECTIVE, list[camRand(list.length)], camMakePos("buildPos2")); } @@ -106,16 +106,16 @@ function eventStartLevel() reinforcements: camMinutesToSeconds(3) }); - var startpos = getObject("startPosition"); - var lz = getObject("landingZone"); //player lz - var tent = getObject("transporterEntry"); - var text = getObject("transporterExit"); + let startpos = getObject("startPosition"); + let lz = getObject("landingZone"); //player lz + let tent = getObject("transporterEntry"); + let text = getObject("transporterExit"); centreView(startpos.x, startpos.y); setNoGoArea(lz.x, lz.y, lz.x2, lz.y2, CAM_HUMAN_PLAYER); startTransporterEntry(tent.x, tent.y, CAM_HUMAN_PLAYER); setTransporterExit(text.x, text.y, CAM_HUMAN_PLAYER); - var enemyLz = getObject("COLandingZone"); + let enemyLz = getObject("COLandingZone"); setNoGoArea(enemyLz.x, enemyLz.y, enemyLz.x2, enemyLz.y2, THE_COLLECTIVE); camSetArtifacts({ diff --git a/data/base/script/campaign/cam2-8.js b/data/base/script/campaign/cam2-8.js index 3b054ecd0ff..3cf4771fc8f 100644 --- a/data/base/script/campaign/cam2-8.js +++ b/data/base/script/campaign/cam2-8.js @@ -24,10 +24,10 @@ function vtolAttack() function setupLandGroups() { - var hovers = enumArea("NWTankGroup", THE_COLLECTIVE, false).filter((obj) => ( + let hovers = enumArea("NWTankGroup", THE_COLLECTIVE, false).filter((obj) => ( obj.type === DROID && obj.propulsion === "hover01" )); - var tanks = enumArea("NWTankGroup", THE_COLLECTIVE, false).filter((obj) => ( + let tanks = enumArea("NWTankGroup", THE_COLLECTIVE, false).filter((obj) => ( obj.type === DROID && obj.propulsion !== "hover01" )); @@ -81,7 +81,7 @@ function truckDefense() return; } - var list = ["Emplacement-Rocket06-IDF", "Emplacement-Howitzer150", "CO-Tower-HvATRkt", "CO-Tower-HVCan", "Sys-CB-Tower01"]; + let list = ["Emplacement-Rocket06-IDF", "Emplacement-Howitzer150", "CO-Tower-HvATRkt", "CO-Tower-HVCan", "Sys-CB-Tower01"]; camQueueBuilding(THE_COLLECTIVE, list[camRand(list.length)], camMakePos("buildPos1")); camQueueBuilding(THE_COLLECTIVE, list[camRand(list.length)], camMakePos("buildPos2")); camQueueBuilding(THE_COLLECTIVE, list[camRand(list.length)], camMakePos("buildPos3")); @@ -95,16 +95,16 @@ function eventStartLevel() annihilate: true }); - var startpos = getObject("startPosition"); - var lz = getObject("landingZone"); //player lz - var tent = getObject("transporterEntry"); - var text = getObject("transporterExit"); + let startpos = getObject("startPosition"); + let lz = getObject("landingZone"); //player lz + let tent = getObject("transporterEntry"); + let text = getObject("transporterExit"); centreView(startpos.x, startpos.y); setNoGoArea(lz.x, lz.y, lz.x2, lz.y2, CAM_HUMAN_PLAYER); startTransporterEntry(tent.x, tent.y, CAM_HUMAN_PLAYER); setTransporterExit(text.x, text.y, CAM_HUMAN_PLAYER); - var enemyLz = getObject("COLandingZone"); + let enemyLz = getObject("COLandingZone"); setNoGoArea(enemyLz.x, enemyLz.y, enemyLz.x2, enemyLz.y2, THE_COLLECTIVE); camSetArtifacts({ diff --git a/data/base/script/campaign/cam2-a.js b/data/base/script/campaign/cam2-a.js index 33125eb3d6a..d26f3bcc9dd 100644 --- a/data/base/script/campaign/cam2-a.js +++ b/data/base/script/campaign/cam2-a.js @@ -21,33 +21,32 @@ function secondVideo() //Damage the base and droids for the player function preDamageStuff() { - var droids = enumDroid(CAM_HUMAN_PLAYER); - var structures = enumStruct(CAM_HUMAN_PLAYER); - var x = 0; + let droids = enumDroid(CAM_HUMAN_PLAYER); + let structures = enumStruct(CAM_HUMAN_PLAYER); - for (x = 0; x < droids.length; ++x) + for (let x = 0; x < droids.length; ++x) { - var droid = droids[x]; + let droid = droids[x]; if (!camIsTransporter(droid)) { setHealth(droid, 45 + camRand(20)); } } - for (x = 0; x < structures.length; ++x) + for (let x = 0; x < structures.length; ++x) { - var struc = structures[x]; + let struc = structures[x]; setHealth(struc, 45 + camRand(45)); } } function getDroidsForCOLZ() { - var droids = []; - var count = 6 + camRand(5); - var templates; - var sensors = [cTempl.comsens, cTempl.comsens]; - var usingHeavy = false; + let droids = []; + let count = 6 + camRand(5); + let templates; + let sensors = [cTempl.comsens, cTempl.comsens]; + let usingHeavy = false; if (camRand(100) < 50) { @@ -77,12 +76,12 @@ function getDroidsForCOLZ() //Send Collective transport units function sendCOTransporter() { - var tPos = getObject("COTransportPos"); - var nearbyDefense = enumRange(tPos.x, tPos.y, 15, THE_COLLECTIVE, false); + let tPos = getObject("COTransportPos"); + let nearbyDefense = enumRange(tPos.x, tPos.y, 15, THE_COLLECTIVE, false); if (nearbyDefense.length > 0) { - var list = getDroidsForCOLZ(); + let list = getDroidsForCOLZ(); camSendReinforcement(THE_COLLECTIVE, camMakePos("COTransportPos"), list, CAM_REINFORCE_TRANSPORT, { entry: { x: 125, y: 100 }, @@ -136,10 +135,10 @@ function sendPlayerTransporter() //Continuously spawns heavy units on the north part of the map every 7 minutes function mapEdgeDroids() { - var TankNum = 8 + camRand(6); - var list = [cTempl.npcybm, cTempl.npcybr, cTempl.commrp, cTempl.cohct]; + let TankNum = 8 + camRand(6); + let list = [cTempl.npcybm, cTempl.npcybr, cTempl.commrp, cTempl.cohct]; - var droids = []; + let droids = []; for (let i = 0; i < TankNum; ++i) { droids.push(list[camRand(list.length)]); @@ -150,7 +149,7 @@ function mapEdgeDroids() function vtolAttack() { - var list = [cTempl.colcbv]; + let list = [cTempl.colcbv]; camSetVtolData(THE_COLLECTIVE, "vtolAppearPos", "vtolRemoveZone", list, camChangeOnDiff(camMinutesToMilliseconds(3)), "COCommandCenter"); } @@ -313,11 +312,11 @@ function eventGameLoaded() function eventStartLevel() { const PLAYER_POWER = 5000; - var startpos = getObject("startPosition"); - var lz = getObject("landingZone"); //player lz - var enemyLz = getObject("COLandingZone"); - var tent = getObject("transporterEntry"); - var text = getObject("transporterExit"); + let startpos = getObject("startPosition"); + let lz = getObject("landingZone"); //player lz + let enemyLz = getObject("COLandingZone"); + let tent = getObject("transporterEntry"); + let text = getObject("transporterExit"); camSetStandardWinLossConditions(CAM_VICTORY_STANDARD, "SUB_2_1S"); setReinforcementTime(LZ_COMPROMISED_TIME); diff --git a/data/base/script/campaign/cam2-b.js b/data/base/script/campaign/cam2-b.js index 4f917a6dc76..535f8868c32 100644 --- a/data/base/script/campaign/cam2-b.js +++ b/data/base/script/campaign/cam2-b.js @@ -34,7 +34,7 @@ function camEnemyBaseDetected_COMiddleBase() { hackRemoveMessage("C2B_OBJ1", PROX_MSG, CAM_HUMAN_PLAYER); - var droids = enumArea("base4Cleanup", THE_COLLECTIVE, false).filter((obj) => ( + let droids = enumArea("base4Cleanup", THE_COLLECTIVE, false).filter((obj) => ( obj.type === DROID && obj.group === null )); @@ -84,8 +84,8 @@ function ambushPlayer() function vtolAttack() { - var list = [cTempl.colcbv, cTempl.colatv]; - var ext = { + let list = [cTempl.colcbv, cTempl.colatv]; + let ext = { limit: [4, 4], //paired with list array alternate: true, altIdx: 0 @@ -116,12 +116,12 @@ function eventStartLevel() { camSetStandardWinLossConditions(CAM_VICTORY_STANDARD, "SUB_2_2S"); - var startpos = getObject("startPosition"); - var lz = getObject("landingZone"); //player lz + let startpos = getObject("startPosition"); + let lz = getObject("landingZone"); //player lz centreView(startpos.x, startpos.y); setNoGoArea(lz.x, lz.y, lz.x2, lz.y2, CAM_HUMAN_PLAYER); - var enemyLz = getObject("COLandingZone"); + let enemyLz = getObject("COLandingZone"); setNoGoArea(enemyLz.x, enemyLz.y, enemyLz.x2, enemyLz.y2, THE_COLLECTIVE); setMissionTime(camChangeOnDiff(camHoursToSeconds(2))); diff --git a/data/base/script/campaign/cam2-c.js b/data/base/script/campaign/cam2-c.js index 84964bf5a6c..dc4728a2a3a 100644 --- a/data/base/script/campaign/cam2-c.js +++ b/data/base/script/campaign/cam2-c.js @@ -50,7 +50,7 @@ camAreaEvent("base3Trigger", function(droid) //Send idle droids in this base to attack when the player spots the base function camEnemyBaseDetected_COAirBase() { - var droids = enumArea("airBaseCleanup", THE_COLLECTIVE, false).filter((obj) => ( + let droids = enumArea("airBaseCleanup", THE_COLLECTIVE, false).filter((obj) => ( obj.type === DROID && obj.group === null )); @@ -134,35 +134,34 @@ function truckDefense() //when all of the shepard group members are destroyed). function captureCivilians() { - var wayPoints = [ + let wayPoints = [ "civPoint1", "civPoint2", "civPoint3", "civPoint4", "civPoint5", "civPoint6", "civPoint7", "civCapturePos" ]; - var currPos = getObject(wayPoints[civilianPosIndex]); - var shepardDroids = enumGroup(shepardGroup); + let currPos = getObject(wayPoints[civilianPosIndex]); + let shepardDroids = enumGroup(shepardGroup); if (shepardDroids.length > 0) { //add some civs - var i = 0; - var num = 1 + camRand(3); - for (i = 0; i < num; ++i) + let num = 1 + camRand(3); + for (let i = 0; i < num; ++i) { addDroid(SCAV_7, currPos.x, currPos.y, "Civilian", "B1BaBaPerson01", "BaBaLegs", "", "", "BabaMG"); } //Only count civilians that are not in the the transporter base. - var civs = enumArea(0, 0, 35, mapHeight, SCAV_7, false); + let civs = enumArea(0, 0, 35, mapHeight, SCAV_7, false); //Move them - for (i = 0; i < civs.length; ++i) + for (let i = 0; i < civs.length; ++i) { orderDroidLoc(civs[i], DORDER_MOVE, currPos.x, currPos.y); } if (civilianPosIndex <= 5) { - for (i = 0; i < shepardDroids.length; ++i) + for (let i = 0; i < shepardDroids.length; ++i) { orderDroidLoc(shepardDroids[i], DORDER_MOVE, currPos.x, currPos.y); } @@ -184,15 +183,15 @@ function captureCivilians() //before removal. function civilianOrders() { - var lz = getObject("startPosition"); - var rescueSound = "pcv612.ogg"; //"Civilian Rescued". - var civs = enumDroid(SCAV_7); - var rescued = false; + let lz = getObject("startPosition"); + let rescueSound = "pcv612.ogg"; //"Civilian Rescued". + let civs = enumDroid(SCAV_7); + let rescued = false; //Check if a civilian is close to a player droid. for (let i = 0; i < civs.length; ++i) { - var objs = enumRange(civs[i].x, civs[i].y, 6, CAM_HUMAN_PLAYER, false); + let objs = enumRange(civs[i].x, civs[i].y, 6, CAM_HUMAN_PLAYER, false); for (let j = 0; j < objs.length; ++j) { if (objs[j].type === DROID) @@ -215,9 +214,9 @@ function civilianOrders() //Capture civilans. function eventTransporterLanded(transport) { - var escaping = "pcv632.ogg"; //"Enemy escaping". - var position = getObject("COTransportPos"); - var civs = enumRange(position.x, position.y, 15, SCAV_7, false); + let escaping = "pcv632.ogg"; //"Enemy escaping". + let position = getObject("COTransportPos"); + let civs = enumRange(position.x, position.y, 15, SCAV_7, false); if (civs.length) { @@ -233,9 +232,9 @@ function eventTransporterLanded(transport) //Send Collective transport as long as the player has not entered the base. function sendCOTransporter() { - var list = [cTempl.npcybr, cTempl.npcybr]; - var tPos = getObject("COTransportPos"); - var pDroid = enumRange(tPos.x, tPos.y, 6, CAM_HUMAN_PLAYER, false); + let list = [cTempl.npcybr, cTempl.npcybr]; + let tPos = getObject("COTransportPos"); + let pDroid = enumRange(tPos.x, tPos.y, 6, CAM_HUMAN_PLAYER, false); if (!pDroid.length) { @@ -260,8 +259,8 @@ function extraVictoryCondition() } else { - var lz = getObject("startPosition"); - var civs = enumRange(lz.x, lz.y, 30, SCAV_7, false); + let lz = getObject("startPosition"); + let civs = enumRange(lz.x, lz.y, 30, SCAV_7, false); for (let i = 0; i < civs.length; ++i) { @@ -279,12 +278,12 @@ function eventStartLevel() callback: "extraVictoryCondition" }); - var startpos = getObject("startPosition"); - var lz = getObject("landingZone"); //player lz + let startpos = getObject("startPosition"); + let lz = getObject("landingZone"); //player lz centreView(startpos.x, startpos.y); setNoGoArea(lz.x, lz.y, lz.x2, lz.y2, CAM_HUMAN_PLAYER); - var enemyLz = getObject("COLandingZone"); + let enemyLz = getObject("COLandingZone"); setNoGoArea(enemyLz.x, enemyLz.y, enemyLz.x2, enemyLz.y2, 5); camSetArtifacts({ diff --git a/data/base/script/campaign/cam2-d.js b/data/base/script/campaign/cam2-d.js index 19d764e8330..5e2d16572f1 100644 --- a/data/base/script/campaign/cam2-d.js +++ b/data/base/script/campaign/cam2-d.js @@ -35,14 +35,14 @@ function truckDefense() return; } - var list = ["AASite-QuadBof", "CO-WallTower-HvCan", "CO-Tower-RotMG", "CO-Tower-HvFlame"]; + let list = ["AASite-QuadBof", "CO-WallTower-HvCan", "CO-Tower-RotMG", "CO-Tower-HvFlame"]; camQueueBuilding(THE_COLLECTIVE, list[camRand(list.length)], camMakePos("uplinkPos")); } //Attacks every 2 minutes until HQ is destroyed. function vtolAttack() { - var list = [cTempl.colatv, cTempl.commorvt]; + let list = [cTempl.colatv, cTempl.commorvt]; camSetVtolData(THE_COLLECTIVE, "vtolAppearPos", "vtolRemovePos", list, camChangeOnDiff(camMinutesToMilliseconds(2)), "COCommandCenter"); } @@ -82,16 +82,16 @@ function eventStartLevel() retlz: true }); - var startpos = getObject("startPosition"); - var lz = getObject("landingZone"); //player lz - var tent = getObject("transporterEntry"); - var text = getObject("transporterExit"); + let startpos = getObject("startPosition"); + let lz = getObject("landingZone"); //player lz + let tent = getObject("transporterEntry"); + let text = getObject("transporterExit"); centreView(startpos.x, startpos.y); setNoGoArea(lz.x, lz.y, lz.x2, lz.y2, CAM_HUMAN_PLAYER); startTransporterEntry(tent.x, tent.y, CAM_HUMAN_PLAYER); setTransporterExit(text.x, text.y, CAM_HUMAN_PLAYER); - var enemyLz = getObject("COLandingZone"); + let enemyLz = getObject("COLandingZone"); setNoGoArea(enemyLz.x, enemyLz.y, enemyLz.x2, enemyLz.y2, THE_COLLECTIVE); camSetArtifacts({ diff --git a/data/base/script/campaign/cam2-end.js b/data/base/script/campaign/cam2-end.js index 10ef0354c63..ae09b8c81ae 100644 --- a/data/base/script/campaign/cam2-end.js +++ b/data/base/script/campaign/cam2-end.js @@ -20,8 +20,8 @@ const startpos = {x: 92, y: 99}; //Remove enemy vtols when in the remove zone area. function checkEnemyVtolArea() { - var pos = {x: 127, y: 64}; - var vtols = enumRange(pos.x, pos.y, 2, THE_COLLECTIVE, false).filter((obj) => (isVTOL(obj))); + let pos = {x: 127, y: 64}; + let vtols = enumRange(pos.x, pos.y, 2, THE_COLLECTIVE, false).filter((obj) => (isVTOL(obj))); for (let i = 0, l = vtols.length; i < l; ++i) { @@ -43,11 +43,11 @@ function eventTransporterLaunch(transporter) { if (!allowWin && transporter.player === CAM_HUMAN_PLAYER) { - var cargoDroids = enumCargo(transporter); + let cargoDroids = enumCargo(transporter); for (let i = 0, len = cargoDroids.length; i < len; ++i) { - var virDroid = cargoDroids[i]; + let virDroid = cargoDroids[i]; if (virDroid && virDroid.droidType === DROID_CONSTRUCT) { @@ -62,8 +62,8 @@ function eventTransporterLaunch(transporter) function randomTemplates(list, transporterAmount, useWhirlwinds) { const WHIRLWIND_AMOUNT = 2; - var droids = []; - var size; + let droids = []; + let size; if (camDef(transporterAmount) && transporterAmount) { @@ -94,24 +94,24 @@ function randomTemplates(list, transporterAmount, useWhirlwinds) //Attack every 30 seconds. function vtolAttack() { - var vtolPositions = [ + let vtolPositions = [ {x: 99, y: 1}, {x: 127, y: 65}, {x: 127, y: 28}, {x: 36, y: 1}, {x: 1, y: 28}, ]; - var vtolRemovePos = {x: 127, y: 64}; + let vtolRemovePos = {x: 127, y: 64}; if (difficulty === INSANE) { vtolPositions = undefined; //to randomize the spawns each time } - var list = [ + let list = [ cTempl.commorv, cTempl.commorv, cTempl.comhvat, cTempl.commorvt ]; - var extras = { + let extras = { minVTOLs: (difficulty >= HARD) ? 5 : 4, maxRandomVTOLs: (difficulty >= HARD) ? 2 : 1 }; @@ -122,8 +122,8 @@ function vtolAttack() //SouthEast attackers which are mostly cyborgs. function cyborgAttack() { - var southCyborgAssembly = {x: 123, y: 125}; - var list = [cTempl.npcybr, cTempl.cocybag, cTempl.npcybc, cTempl.comhltat, cTempl.cohhpv]; + let southCyborgAssembly = {x: 123, y: 125}; + let list = [cTempl.npcybr, cTempl.cocybag, cTempl.npcybc, cTempl.comhltat, cTempl.cohhpv]; camSendReinforcement(THE_COLLECTIVE, camMakePos(southCyborgAssembly), randomTemplates(list, false, true), CAM_REINFORCE_GROUND, { data: { regroup: false, count: -1 } @@ -132,7 +132,7 @@ function cyborgAttack() function cyborgAttackRandom() { - var list = [cTempl.npcybr, cTempl.cocybag, cTempl.npcybc, cTempl.npcybc, cTempl.comrotm]; //favor cannon cyborg + let list = [cTempl.npcybr, cTempl.cocybag, cTempl.npcybc, cTempl.npcybc, cTempl.comrotm]; //favor cannon cyborg camSendReinforcement(THE_COLLECTIVE, camMakePos(camGenerateRandomMapEdgeCoordinate(startpos)), randomTemplates(list, false, true).concat(cTempl.comsens), CAM_REINFORCE_GROUND, { data: { regroup: false, count: -1 } @@ -142,8 +142,8 @@ function cyborgAttackRandom() //North road attacker consisting of powerful weaponry. function tankAttack() { - var northTankAssembly = {x: 95, y: 3}; - var list = [cTempl.comhltat, cTempl.cohact, cTempl.cohhpv, cTempl.comagt, cTempl.cohbbt]; + let northTankAssembly = {x: 95, y: 3}; + let list = [cTempl.comhltat, cTempl.cohact, cTempl.cohhpv, cTempl.comagt, cTempl.cohbbt]; camSendReinforcement(THE_COLLECTIVE, camMakePos(northTankAssembly), randomTemplates(list, false, true), CAM_REINFORCE_GROUND, { data: { regroup: false, count: -1, }, @@ -152,8 +152,8 @@ function tankAttack() function tankAttackWest() { - var westTankAssembly = {x: 3, y: 112}; //This was unused. Now part of Hard/Insane playthroughs. - var list = [cTempl.comhltat, cTempl.cohact, cTempl.cohhpv, cTempl.comagt, cTempl.cohbbt]; + let westTankAssembly = {x: 3, y: 112}; //This was unused. Now part of Hard/Insane playthroughs. + let list = [cTempl.comhltat, cTempl.cohact, cTempl.cohhpv, cTempl.comagt, cTempl.cohbbt]; camSendReinforcement(THE_COLLECTIVE, camMakePos(westTankAssembly), randomTemplates(list, true, true), CAM_REINFORCE_GROUND, { data: { regroup: false, count: -1, }, @@ -162,7 +162,7 @@ function tankAttackWest() function transporterAttack() { - var droids = [cTempl.cohact, cTempl.comhltat, cTempl.cohbbt, cTempl.cohhpv]; + let droids = [cTempl.cohact, cTempl.comhltat, cTempl.cohbbt, cTempl.cohhpv]; camSendReinforcement(THE_COLLECTIVE, camMakePos(camGenerateRandomMapCoordinate(startpos, 10, 1)), randomTemplates(droids, true, false), CAM_REINFORCE_TRANSPORT, { @@ -175,7 +175,7 @@ function transporterAttack() //NOTE: this is only called once from the library's eventMissionTimeout(). function checkIfLaunched() { - var transporters = enumArea(0, 0, mapWidth, mapHeight, CAM_HUMAN_PLAYER, false).filter((obj) => ( + let transporters = enumArea(0, 0, mapWidth, mapHeight, CAM_HUMAN_PLAYER, false).filter((obj) => ( obj.type === DROID && camIsTransporter(obj) )); if (transporters.length > 0) @@ -203,8 +203,8 @@ function eventStartLevel() camSetExtraObjectiveMessage(_("Send off as many transporters as you can and bring at least one truck")); } - var lz = {x: 86, y: 99, x2: 88, y2: 101}; - var tCoords = {xStart: 87, yStart: 100, xOut: 0, yOut: 55}; + let lz = {x: 86, y: 99, x2: 88, y2: 101}; + let tCoords = {xStart: 87, yStart: 100, xOut: 0, yOut: 55}; camSetStandardWinLossConditions(CAM_VICTORY_TIMEOUT, "CAM_3A", { reinforcements: camMinutesToSeconds(7), //Duration the transport "leaves" map. @@ -214,7 +214,7 @@ function eventStartLevel() setNoGoArea(lz.x, lz.y, lz.x2, lz.y2, CAM_HUMAN_PLAYER); camSetupTransporter(tCoords.xStart, tCoords.yStart, tCoords.xOut, tCoords.yOut); - var enemyLz = {x: 49, y: 83, x2: 51, y2: 85}; + let enemyLz = {x: 49, y: 83, x2: 51, y2: 85}; setNoGoArea(enemyLz.x, enemyLz.y, enemyLz.x2, enemyLz.y2, THE_COLLECTIVE); setMissionTime(camMinutesToSeconds(30)); diff --git a/data/base/script/campaign/cam3-1.js b/data/base/script/campaign/cam3-1.js index a36dc97cca5..62893516e92 100644 --- a/data/base/script/campaign/cam3-1.js +++ b/data/base/script/campaign/cam3-1.js @@ -63,7 +63,7 @@ camAreaEvent("hillTriggerZone", function(droid) //Setup Nexus VTOL hit and runners. function vtolAttack() { - var list = [cTempl.nxlscouv, cTempl.nxmtherv]; + let list = [cTempl.nxlscouv, cTempl.nxmtherv]; camSetVtolData(NEXUS, "vtolAppearPos", "vtolRemovePos", list, camChangeOnDiff(camMinutesToMilliseconds(5)), "NXCommandCenter"); } @@ -105,7 +105,7 @@ function missileSilosDestroyed() { const SILO_COUNT = 4; const SILO_ALIAS = "NXMissileSilo"; - var destroyed = 0; + let destroyed = 0; for (let i = 0; i < SILO_COUNT; ++i) { @@ -119,22 +119,22 @@ function missileSilosDestroyed() function nukeAndCountSurvivors() { //Avoid destroying the one base if the player opted not to destroy it themselves. - var nuked = enumArea(0, 0, mapWidth, mapHeight, ALL_PLAYERS, false).filter((obj) => ( + let nuked = enumArea(0, 0, mapWidth, mapHeight, ALL_PLAYERS, false).filter((obj) => ( obj.type !== STRUCTURE || (obj.type === STRUCTURE && obj.group === null) )); - var safeZone = enumArea("valleySafeZone", CAM_HUMAN_PLAYER, false); - var foundUnit = false; + let safeZone = enumArea("valleySafeZone", CAM_HUMAN_PLAYER, false); + let foundUnit = false; //Make em' explode! for (let i = 0, len = nuked.length; i < len; ++i) { - var nukeIt = true; - var obj1 = nuked[i]; + let nukeIt = true; + let obj1 = nuked[i]; //Check if it's in the safe area. for (let j = 0, len2 = safeZone.length; j < len2; ++j) { - var obj2 = safeZone[j]; + let obj2 = safeZone[j]; if (obj1.id === obj2.id) { @@ -181,13 +181,13 @@ function setupNextMission() function getCountdown() { const ACCEPTABLE_TIME_DIFF = 2; - var silosDestroyed = missileSilosDestroyed(); - var countdownObject = silosDestroyed ? detonateInfo : launchInfo; - var skip = false; + let silosDestroyed = missileSilosDestroyed(); + let countdownObject = silosDestroyed ? detonateInfo : launchInfo; + let skip = false; for (let i = 0, len = countdownObject.length; i < len; ++i) { - var currentTime = getMissionTime(); + let currentTime = getMissionTime(); if (currentTime <= countdownObject[0].time) { if (currentTime < (countdownObject[0].time - ACCEPTABLE_TIME_DIFF)) @@ -223,10 +223,10 @@ function enableAllFactories() //For now just make sure we have all the droids in the canyon. function unitsInValley() { - var safeZone = enumArea("valleySafeZone", CAM_HUMAN_PLAYER, false).filter((obj) => ( + let safeZone = enumArea("valleySafeZone", CAM_HUMAN_PLAYER, false).filter((obj) => ( obj.type === DROID )); - var allDroids = enumArea(0, 0, mapWidth, mapHeight, CAM_HUMAN_PLAYER, false).filter((obj) => ( + let allDroids = enumArea(0, 0, mapWidth, mapHeight, CAM_HUMAN_PLAYER, false).filter((obj) => ( obj.type === DROID )); @@ -247,10 +247,10 @@ function eventStartLevel() { camSetExtraObjectiveMessage(_("Destroy the missile silos")); - var startpos = getObject("startPosition"); - var lz = getObject("landingZone"); - var tent = getObject("transporterEntry"); - var text = getObject("transporterExit"); + let startpos = getObject("startPosition"); + let lz = getObject("landingZone"); + let tent = getObject("transporterEntry"); + let text = getObject("transporterExit"); //Time is in seconds. launchInfo = [ @@ -299,7 +299,7 @@ function eventStartLevel() setTransporterExit(text.x, text.y, CAM_HUMAN_PLAYER); setScrollLimits(0, 32, 64, 64); - var enemyLz = getObject("NXlandingZone"); + let enemyLz = getObject("NXlandingZone"); setNoGoArea(enemyLz.x, enemyLz.y, enemyLz.x2, enemyLz.y2, NEXUS); camCompleteRequiredResearch(NEXUS_RES, NEXUS); diff --git a/data/base/script/campaign/cam3-2.js b/data/base/script/campaign/cam3-2.js index 1a3ad78e627..13f4e102144 100644 --- a/data/base/script/campaign/cam3-2.js +++ b/data/base/script/campaign/cam3-2.js @@ -67,13 +67,13 @@ camAreaEvent("phantomFacTrigger", function(droid) function setAlphaExp() { const DROID_EXP = 512; //Hero rank. - var alphaDroids = enumArea("alphaPit", ALPHA, false).filter((obj) => ( + let alphaDroids = enumArea("alphaPit", ALPHA, false).filter((obj) => ( obj.type === DROID )); for (let i = 0, l = alphaDroids.length; i < l; ++i) { - var dr = alphaDroids[i]; + let dr = alphaDroids[i]; if (!camIsSystemDroid(dr)) { setDroidExperience(dr, DROID_EXP); @@ -85,13 +85,13 @@ function setAlphaExp() function getAlphaUnitIDs() { alphaUnitIDs = []; - var alphaDroids = enumArea("alphaPit", CAM_HUMAN_PLAYER, false).filter((obj) => ( + let alphaDroids = enumArea("alphaPit", CAM_HUMAN_PLAYER, false).filter((obj) => ( obj.type === DROID && obj.experience === 512 )); for (let i = 0, l = alphaDroids.length; i < l; ++i) { - var dr = alphaDroids[i]; + let dr = alphaDroids[i]; alphaUnitIDs.push(dr.id); } startExtraLoss = true; @@ -99,25 +99,25 @@ function getAlphaUnitIDs() function phantomFactoryNE() { - var list = [cTempl.nxcyrail, cTempl.nxcyscou, cTempl.nxcylas]; + let list = [cTempl.nxcyrail, cTempl.nxcyscou, cTempl.nxcylas]; sendEdgeMapDroids(6, "NE-PhantomFactory", list); } function phantomFactorySW() { - var list = [cTempl.nxcyrail, cTempl.nxcyscou, cTempl.nxcylas]; + let list = [cTempl.nxcyrail, cTempl.nxcyscou, cTempl.nxcylas]; sendEdgeMapDroids(8, "SW-PhantomFactory", list); } function phantomFactorySE() { - var list = [cTempl.nxcyrail, cTempl.nxcyscou, cTempl.nxcylas, cTempl.nxlflash, cTempl.nxmrailh, cTempl.nxmlinkh]; + let list = [cTempl.nxcyrail, cTempl.nxcyscou, cTempl.nxcylas, cTempl.nxlflash, cTempl.nxmrailh, cTempl.nxmlinkh]; sendEdgeMapDroids(10 + camRand(6), "SE-PhantomFactory", list); //10-15 units } function sendEdgeMapDroids(droidCount, location, list) { - var droids = []; + let droids = []; for (let i = 0; i < droidCount; ++i) { droids.push(list[camRand(list.length)]); @@ -200,8 +200,8 @@ function setupPatrolGroups() //Setup Nexus VTOL hit and runners. function vtolAttack() { - var list = [cTempl.nxlscouv, cTempl.nxmtherv]; - var ext = { + let list = [cTempl.nxlscouv, cTempl.nxmtherv]; + let ext = { limit: [2, 4], //paired with template list alternate: true, altIdx: 0 @@ -226,8 +226,8 @@ function alphaTeamAlive() { if (camDef(alphaUnitIDs) && startExtraLoss) { - var alphaAlive = false; - var alive = enumArea(0, 0, mapWidth, mapHeight, CAM_HUMAN_PLAYER, false).filter((obj) => ( + let alphaAlive = false; + let alive = enumArea(0, 0, mapWidth, mapHeight, CAM_HUMAN_PLAYER, false).filter((obj) => ( obj.type === DROID )); @@ -259,10 +259,10 @@ function eventStartLevel() { camSetExtraObjectiveMessage(_("Rescue Alpha team from Nexus")); - var startpos = getObject("startPosition"); - var lz = getObject("landingZone"); - var tent = getObject("transporterEntry"); - var text = getObject("transporterExit"); + let startpos = getObject("startPosition"); + let lz = getObject("landingZone"); + let tent = getObject("transporterEntry"); + let text = getObject("transporterExit"); startExtraLoss = false; camSetStandardWinLossConditions(CAM_VICTORY_OFFWORLD, "CAM3A-B", { @@ -282,7 +282,7 @@ function eventStartLevel() startTransporterEntry(tent.x, tent.y, CAM_HUMAN_PLAYER); setTransporterExit(text.x, text.y, CAM_HUMAN_PLAYER); - var enemyLz = getObject("NXlandingZone"); + let enemyLz = getObject("NXlandingZone"); setNoGoArea(enemyLz.x, enemyLz.y, enemyLz.x2, enemyLz.y2, NEXUS); camCompleteRequiredResearch(NEXUS_RES, NEXUS); diff --git a/data/base/script/campaign/cam3-4.js b/data/base/script/campaign/cam3-4.js index 933e2abf1f0..4a4f4fbfcb7 100644 --- a/data/base/script/campaign/cam3-4.js +++ b/data/base/script/campaign/cam3-4.js @@ -204,10 +204,10 @@ function enableAllFactories() function truckDefense() { - var truckNum = countDroid(NEXUS, DROID_CONSTRUCT); + let truckNum = countDroid(NEXUS, DROID_CONSTRUCT); if (truckNum > 0) { - var list = [ + let list = [ "Sys-NEXUSLinkTOW", "P0-AASite-SAM2", "Emplacement-PrisLas", "NX-Tower-ATMiss", "Sys-NX-CBTower", "Emplacement-HvART-pit", "Sys-SensoTower02" @@ -226,9 +226,9 @@ function truckDefense() function eventStartLevel() { - var startpos = getObject("startPosition"); - var tpos = getObject("transportEntryExit"); - var lz = getObject("landingZone"); + let startpos = getObject("startPosition"); + let tpos = getObject("transportEntryExit"); + let lz = getObject("landingZone"); camSetStandardWinLossConditions(CAM_VICTORY_OFFWORLD, CAM_GAMMA_OUT, { area: "RTLZ", @@ -242,7 +242,7 @@ function eventStartLevel() setTransporterExit(tpos.x, tpos.y, CAM_HUMAN_PLAYER); setMissionTime(-1); //Infinite time - var enemyLz = getObject("NXlandingZone"); + let enemyLz = getObject("NXlandingZone"); setNoGoArea(enemyLz.x, enemyLz.y, enemyLz.x2, enemyLz.y2, NEXUS); camCompleteRequiredResearch(NEXUS_RES, NEXUS); diff --git a/data/base/script/campaign/cam3-a.js b/data/base/script/campaign/cam3-a.js index 7e1bbed5b4d..7d6406f0d82 100644 --- a/data/base/script/campaign/cam3-a.js +++ b/data/base/script/campaign/cam3-a.js @@ -59,11 +59,11 @@ camAreaEvent ("middleTrigger", function(droid) function setUnitRank(transport) { const DROID_EXP = [1024, 256, 128, 64]; //Can make Hero Commanders if recycled. - var droids = enumCargo(transport); + let droids = enumCargo(transport); for (let i = 0, len = droids.length; i < len; ++i) { - var droid = droids[i]; + let droid = droids[i]; if (droid.droidType !== DROID_CONSTRUCT && droid.droidType !== DROID_REPAIR) { setDroidExperience(droid, DROID_EXP[transporterIndex - 1]); @@ -103,8 +103,8 @@ function truckDefense() return; } - var list = ["Emplacement-Howitzer150", "Emplacement-MdART-pit", "Emplacement-RotHow"]; - var position; + let list = ["Emplacement-Howitzer150", "Emplacement-MdART-pit", "Emplacement-RotHow"]; + let position; if (truckLocCounter === 0) { @@ -167,7 +167,7 @@ function sendPlayerTransporter() //Setup Nexus VTOL hit and runners. function vtolAttack() { - var list = [cTempl.nxlneedv, cTempl.nxlscouv, cTempl.nxmtherv]; + let list = [cTempl.nxlneedv, cTempl.nxlscouv, cTempl.nxmtherv]; camSetVtolData(NEXUS, "vtolAppearPos", "vtolRemovePos", list, camChangeOnDiff(camMinutesToMilliseconds(5)), "NXCommandCenter"); } @@ -242,7 +242,7 @@ function cam3Setup() //Normal and lower difficulties has Nexus start off a little bit weaker function improveNexusAlloys() { - var alloys = [ + let alloys = [ "R-Vehicle-Metals07", "R-Cyborg-Metals07", "R-Vehicle-Armor-Heat04", "R-Cyborg-Armor-Heat04" ]; @@ -252,10 +252,10 @@ function improveNexusAlloys() function eventStartLevel() { const PLAYER_POWER = 16000; - var startpos = getObject("startPosition"); - var lz = getObject("landingZone"); - var tent = getObject("transporterEntry"); - var text = getObject("transporterExit"); + let startpos = getObject("startPosition"); + let lz = getObject("landingZone"); + let tent = getObject("transporterEntry"); + let text = getObject("transporterExit"); camSetStandardWinLossConditions(CAM_VICTORY_STANDARD, "SUB_3_1S"); setMissionTime(camChangeOnDiff(camHoursToSeconds(2))); @@ -265,7 +265,7 @@ function eventStartLevel() startTransporterEntry(tent.x, tent.y, CAM_HUMAN_PLAYER); setTransporterExit(text.x, text.y, CAM_HUMAN_PLAYER); - var enemyLz = getObject("NXlandingZone"); + let enemyLz = getObject("NXlandingZone"); setNoGoArea(enemyLz.x, enemyLz.y, enemyLz.x2, enemyLz.y2, NEXUS); camSetArtifacts({ diff --git a/data/base/script/campaign/cam3-ab.js b/data/base/script/campaign/cam3-ab.js index 55fff110885..d5bfb2453e8 100644 --- a/data/base/script/campaign/cam3-ab.js +++ b/data/base/script/campaign/cam3-ab.js @@ -35,13 +35,13 @@ camAreaEvent("vtolRemoveZone", function(droid) function sendEdgeMapDroids() { - var unitCount = 16 + camRand(5); // 16 - 20. + let unitCount = 16 + camRand(5); // 16 - 20. if (difficulty === INSANE) { unitCount = 14 + camRand(3); // 14 - 16. } const EDGE = ["SWPhantomFactory", "NWPhantomFactory"]; - var list = [ + let list = [ cTempl.nxcyrail, cTempl.nxcyscou, cTempl.nxcylas, cTempl.nxlflash, cTempl.nxmrailh, cTempl.nxmlinkh, cTempl.nxmscouh, cTempl.nxmsamh, @@ -50,7 +50,7 @@ function sendEdgeMapDroids() { list = list.concat(cTempl.nxmangel); } - var droids = []; + let droids = []; if (!camDef(edgeMapCounter)) { @@ -76,8 +76,8 @@ function sendEdgeMapDroids() //Setup Nexus VTOL hit and runners. NOTE: These do not go away in this mission. function vtolAttack() { - var list = [cTempl.nxlscouv, cTempl.nxmtherv, cTempl.nxlscouv, cTempl.nxmheapv]; - var ext = { + let list = [cTempl.nxlscouv, cTempl.nxmtherv, cTempl.nxlscouv, cTempl.nxmheapv]; + let ext = { limit: [2, 4, 2, 4], alternate: true, altIdx: 0 @@ -88,19 +88,19 @@ function vtolAttack() // Order any absorbed trucks to start building defenses near themselves. function truckDefense() { - var droids = enumDroid(NEXUS, DROID_CONSTRUCT); - var defenses = [ + let droids = enumDroid(NEXUS, DROID_CONSTRUCT); + let defenses = [ "Sys-NEXUSLinkTOW", "P0-AASite-SAM2", "Emplacement-PrisLas", "NX-Tower-ATMiss", "Sys-NX-CBTower", ]; for (let i = 0, len = droids.length; i < len; ++i) { - var truck = droids[i]; + let truck = droids[i]; if (truck.order !== DORDER_BUILD) { - var defense = defenses[camRand(defenses.length)]; - var loc = pickStructLocation(truck, defense, truck.x, truck.y); + let defense = defenses[camRand(defenses.length)]; + let loc = pickStructLocation(truck, defense, truck.x, truck.y); enableStructure(defense, NEXUS); if (camDef(loc)) { @@ -124,7 +124,7 @@ function nexusManufacture() { return; } - var factoryType = [ + let factoryType = [ {structure: FACTORY, temps: [cTempl.nxmrailh, cTempl.nxmlinkh, cTempl.nxmscouh, cTempl.nxlflash,]}, {structure: CYBORG_FACTORY, temps: [cTempl.nxcyrail, cTempl.nxcyscou, cTempl.nxcylas,]}, {structure: VTOL_FACTORY, temps: [cTempl.nxlscouv, cTempl.nxmtherv, cTempl.nxmheapv,]}, @@ -132,12 +132,12 @@ function nexusManufacture() for (let i = 0; i < factoryType.length; ++i) { - var factories = enumStruct(NEXUS, factoryType[i].structure); - var templs = factoryType[i].temps; + let factories = enumStruct(NEXUS, factoryType[i].structure); + let templs = factoryType[i].temps; for (let j = 0, len = factories.length; j < len; ++j) { - var fac = factories[j]; + let fac = factories[j]; if (fac.status !== BUILT || !structureIdle(fac)) { return; @@ -151,8 +151,8 @@ function nexusManufacture() function manualGrouping() { - var vtols = enumDroid(NEXUS).filter((obj) => (obj.group === null && isVTOL(obj))); - var nonVtols = enumDroid(NEXUS).filter((obj) => (obj.group === null && !isVTOL(obj))); + let vtols = enumDroid(NEXUS).filter((obj) => (obj.group === null && isVTOL(obj))); + let nonVtols = enumDroid(NEXUS).filter((obj) => (obj.group === null && !isVTOL(obj))); if (vtols.length) { camManageGroup(camMakeGroup(vtols), CAM_ORDER_ATTACK, { regroup: false, count: -1 }); @@ -240,8 +240,8 @@ function eventStartLevel() { camSetExtraObjectiveMessage(_("Research resistance circuits and survive the assault from Nexus")); - var startpos = getObject("startPosition"); - var lz = getObject("landingZone"); + let startpos = getObject("startPosition"); + let lz = getObject("landingZone"); camSetStandardWinLossConditions(CAM_VICTORY_STANDARD, "CAM3C", { callback: "resistanceResearched" @@ -254,7 +254,7 @@ function eventStartLevel() setNoGoArea(lz.x, lz.y, lz.x2, lz.y2, CAM_HUMAN_PLAYER); setMissionTime(camChangeOnDiff(camHoursToSeconds(1))); - var enemyLz = getObject("NXlandingZone"); + let enemyLz = getObject("NXlandingZone"); setNoGoArea(enemyLz.x, enemyLz.y, enemyLz.x2, enemyLz.y2, NEXUS); camCompleteRequiredResearch(NEXUS_RES, NEXUS); diff --git a/data/base/script/campaign/cam3-ad1.js b/data/base/script/campaign/cam3-ad1.js index 9a947a6d69e..a5d62b529ff 100644 --- a/data/base/script/campaign/cam3-ad1.js +++ b/data/base/script/campaign/cam3-ad1.js @@ -90,8 +90,8 @@ function truckDefense() return; } - var list = ["Emplacement-Howitzer150", "Emplacement-MdART-pit"]; - var position; + let list = ["Emplacement-Howitzer150", "Emplacement-MdART-pit"]; + let position; if (truckLocCounter === 0) { @@ -111,8 +111,8 @@ function truckDefense() //when no target is found in the area. function vaporizeTarget() { - var target; - var targets = enumArea(0, 0, mapWidth, Math.floor(mapLimit), CAM_HUMAN_PLAYER, false).filter((obj) => ( + let target; + let targets = enumArea(0, 0, mapWidth, Math.floor(mapLimit), CAM_HUMAN_PLAYER, false).filter((obj) => ( obj.type === DROID || obj.type === STRUCTURE )); @@ -126,9 +126,9 @@ function vaporizeTarget() } else { - var dr = targets.filter((obj) => (obj.type === DROID && !isVTOL(obj))); - var vt = targets.filter((obj) => (obj.type === DROID && isVTOL(obj))); - var st = targets.filter((obj) => (obj.type === STRUCTURE)); + let dr = targets.filter((obj) => (obj.type === DROID && !isVTOL(obj))); + let vt = targets.filter((obj) => (obj.type === DROID && isVTOL(obj))); + let st = targets.filter((obj) => (obj.type === STRUCTURE)); if (dr.length) { @@ -165,14 +165,14 @@ function laserSatFuzzyStrike(obj) { const LOC = camMakePos(obj); //Initially lock onto target - var xCoord = LOC.x; - var yCoord = LOC.y; + let xCoord = LOC.x; + let yCoord = LOC.y; //Introduce some randomness if (camRand(101) < 67) { - var xRand = camRand(3); - var yRand = camRand(3); + let xRand = camRand(3); + let yRand = camRand(3); xCoord = camRand(2) ? LOC.x - xRand : LOC.x + xRand; yCoord = camRand(2) ? LOC.y - yRand : LOC.y + yRand; } @@ -242,10 +242,10 @@ function checkMissileSilos() } } - var siloArea = camMakePos(getObject("missileSilos")); - var safe = enumRange(siloArea.x, siloArea.y, 10, ALL_PLAYERS, false); - var enemies = safe.filter((obj) => (obj.player === NEXUS)); - var player = safe.filter((obj) => (obj.player === CAM_HUMAN_PLAYER)); + let siloArea = camMakePos(getObject("missileSilos")); + let safe = enumRange(siloArea.x, siloArea.y, 10, ALL_PLAYERS, false); + let enemies = safe.filter((obj) => (obj.player === NEXUS)); + let player = safe.filter((obj) => (obj.player === CAM_HUMAN_PLAYER)); if (!enemies.length && player.length) { camCallOnce("allySiloWithPlayer"); @@ -256,10 +256,10 @@ function eventStartLevel() { camSetExtraObjectiveMessage(_("Build a forward base at the silos")); - var siloZone = getObject("missileSilos"); - var startpos = getObject("startPosition"); - var lz = getObject("landingZone"); - var lz2 = getObject("landingZone2"); //LZ for cam3-4s. + let siloZone = getObject("missileSilos"); + let startpos = getObject("startPosition"); + let lz = getObject("landingZone"); + let lz2 = getObject("landingZone2"); //LZ for cam3-4s. mapLimit = 1.0; camSetStandardWinLossConditions(CAM_VICTORY_STANDARD, "CAM3A-D2", { diff --git a/data/base/script/campaign/cam3-ad2.js b/data/base/script/campaign/cam3-ad2.js index ddc9d4fe357..59213054f71 100644 --- a/data/base/script/campaign/cam3-ad2.js +++ b/data/base/script/campaign/cam3-ad2.js @@ -41,18 +41,17 @@ camAreaEvent("vtolRemoveZone", function(droid) //Return a random assortment of droids with the given templates. function randomTemplates(list) { - var i = 0; - var extras = [cTempl.nxmsens, cTempl.nxmsamh]; - var droids = []; - var size = 12 + camRand(4); //Max of 15. + let extras = [cTempl.nxmsens, cTempl.nxmsamh]; + let droids = []; + let size = 12 + camRand(4); //Max of 15. - for (i = 0; i < size; ++i) + for (let i = 0; i < size; ++i) { droids.push(list[camRand(list.length)]); } //Sensor and vindicator hovers. - for (i = 0; i < 4; ++i) + for (let i = 0; i < 4; ++i) { droids.push(extras[camRand(extras.length)]); } @@ -63,15 +62,15 @@ function randomTemplates(list) //Chose a random spawn point for the VTOLs. function vtolAttack() { - var list = [cTempl.nxmheapv, cTempl.nxlpulsev]; + let list = [cTempl.nxmheapv, cTempl.nxlpulsev]; camSetVtolData(NEXUS, VTOL_POSITIONS, "vtolRemovePos", list, camChangeOnDiff(camMinutesToMilliseconds(3))); } //Chose a random spawn point to send ground reinforcements. function phantomFactorySpawn() { - var list; - var chosenFactory; + let list; + let chosenFactory; switch (camRand(3)) { @@ -104,8 +103,8 @@ function phantomFactorySpawn() //when no target is found in the area. function vaporizeTarget() { - var target; - var targets = enumArea(0, Y_SCROLL_LIMIT, mapWidth, Math.floor(mapLimit), CAM_HUMAN_PLAYER, false).filter((obj) => ( + let target; + let targets = enumArea(0, Y_SCROLL_LIMIT, mapWidth, Math.floor(mapLimit), CAM_HUMAN_PLAYER, false).filter((obj) => ( obj.type === DROID || obj.type === STRUCTURE )); @@ -124,9 +123,9 @@ function vaporizeTarget() } else { - var dr = targets.filter((obj) => (obj.type === DROID && !isVTOL(obj))); - var vt = targets.filter((obj) => (obj.type === DROID && isVTOL(obj))); - var st = targets.filter((obj) => (obj.type === STRUCTURE)); + let dr = targets.filter((obj) => (obj.type === DROID && !isVTOL(obj))); + let vt = targets.filter((obj) => (obj.type === DROID && isVTOL(obj))); + let st = targets.filter((obj) => (obj.type === STRUCTURE)); if (dr.length) { @@ -172,14 +171,14 @@ function laserSatFuzzyStrike(obj) { const LOC = camMakePos(obj); //Initially lock onto target - var xCoord = LOC.x; - var yCoord = LOC.y; + let xCoord = LOC.x; + let yCoord = LOC.y; //Introduce some randomness. More accurate than last mission. if (camRand(101) < 33) { - var xRand = camRand(2); - var yRand = camRand(2); + let xRand = camRand(2); + let yRand = camRand(2); xCoord = camRand(2) ? LOC.x - xRand : LOC.x + xRand; yCoord = camRand(2) ? LOC.y - yRand : LOC.y + yRand; } @@ -278,8 +277,8 @@ function eventStartLevel() { camSetExtraObjectiveMessage(_("Protect the missile silos and research for the missile codes")); - var startpos = getObject("startPosition"); - var lz = getObject("landingZone"); + let startpos = getObject("startPosition"); + let lz = getObject("landingZone"); mapLimit = 137.0; winFlag = false; videoInfo = [ @@ -296,7 +295,7 @@ function eventStartLevel() setScrollLimits(0, Y_SCROLL_LIMIT, 64, 256); //Destroy everything above limits - var destroyZone = enumArea(0, 0, 64, Y_SCROLL_LIMIT, CAM_HUMAN_PLAYER, false); + let destroyZone = enumArea(0, 0, 64, Y_SCROLL_LIMIT, CAM_HUMAN_PLAYER, false); for (let i = 0, l = destroyZone.length; i < l; ++i) { camSafeRemoveObject(destroyZone[i], false); diff --git a/data/base/script/campaign/cam3-b.js b/data/base/script/campaign/cam3-b.js index 7b3f99b0818..2e0cf26ec0f 100644 --- a/data/base/script/campaign/cam3-b.js +++ b/data/base/script/campaign/cam3-b.js @@ -58,8 +58,8 @@ function camEnemyBaseEliminated_NXWestBase() //Setup Nexus VTOL hit and runners. function vtolAttack() { - var list = [cTempl.nxmheapv, cTempl.nxlscouv, cTempl.nxmtherv, cTempl.nxlscouv]; - var ext = { + let list = [cTempl.nxmheapv, cTempl.nxlscouv, cTempl.nxmtherv, cTempl.nxlscouv]; + let ext = { limit: [5, 2, 5, 2], //paired with template list alternate: true, altIdx: 0 @@ -83,9 +83,9 @@ function getDroidsForNXLZ(isTransport) } const COUNT = isTransport ? 10 : 10 + camRand(6); - var units = [cTempl.nxcyrail, cTempl.nxcyscou, cTempl.nxcylas, cTempl.nxmlinkh, cTempl.nxmrailh, cTempl.nxmsamh]; + let units = [cTempl.nxcyrail, cTempl.nxcyscou, cTempl.nxcylas, cTempl.nxmlinkh, cTempl.nxmrailh, cTempl.nxmsamh]; - var droids = []; + let droids = []; for (let i = 0; i < COUNT; ++i) { droids.push(units[camRand(units.length)]); @@ -104,9 +104,9 @@ function sendNXTransporter() } const LZ_ALIAS = "CM3B_TRANS"; //1 and 2 - var list = getDroidsForNXLZ(true); - var lzNum; - var pos; + let list = getDroidsForNXLZ(true); + let lzNum; + let pos; if (camCountStructuresInArea("NXEastBaseCleanup", NEXUS) > 0) { @@ -153,7 +153,7 @@ function sendNXlandReinforcements() function transferPower() { const AWARD = 5000; - var powerTransferSound = "power-transferred.ogg"; + let powerTransferSound = "power-transferred.ogg"; setPower(playerPower(CAM_HUMAN_PLAYER) + AWARD, CAM_HUMAN_PLAYER); playSound(powerTransferSound); } @@ -206,8 +206,8 @@ function truckDefense() return; } - var list = ["Emplacement-Howitzer105", "Emplacement-MdART-pit", "Emplacement-RotHow"]; - var position; + let list = ["Emplacement-Howitzer105", "Emplacement-MdART-pit", "Emplacement-RotHow"]; + let position; if (truckLocCounter === 0) { @@ -271,8 +271,8 @@ function eventStartLevel() trapActive = false; gammaAttackCount = 0; truckLocCounter = 0; - var startpos = getObject("startPosition"); - var lz = getObject("landingZone"); + let startpos = getObject("startPosition"); + let lz = getObject("landingZone"); camSetStandardWinLossConditions(CAM_VICTORY_STANDARD, "SUB_3_2S"); setMissionTime(camChangeOnDiff(camMinutesToSeconds(30))); // For the rescue mission. @@ -280,8 +280,8 @@ function eventStartLevel() centreView(startpos.x, startpos.y); setNoGoArea(lz.x, lz.y, lz.x2, lz.y2, CAM_HUMAN_PLAYER); - var enemyLz = getObject("NXlandingZone"); - var enemyLz2 = getObject("NXlandingZone2"); + let enemyLz = getObject("NXlandingZone"); + let enemyLz2 = getObject("NXlandingZone2"); setNoGoArea(enemyLz.x, enemyLz.y, enemyLz.x2, enemyLz.y2, NEXUS); setNoGoArea(enemyLz2.x, enemyLz2.y, enemyLz2.x2, enemyLz2.y2, 5); diff --git a/data/base/script/campaign/cam3-c.js b/data/base/script/campaign/cam3-c.js index 37673d0983f..941811d6d4f 100644 --- a/data/base/script/campaign/cam3-c.js +++ b/data/base/script/campaign/cam3-c.js @@ -79,8 +79,8 @@ function truckDefense() return; } - var list = ["Emplacement-Howitzer150", "Emplacement-MdART-pit"]; - var position; + let list = ["Emplacement-Howitzer150", "Emplacement-MdART-pit"]; + let position; if (truckLocCounter === 0) { @@ -99,7 +99,7 @@ function truckDefense() function discoverGammaBase() { reunited = true; - var lz = getObject("landingZone"); + let lz = getObject("landingZone"); setScrollLimits(0, 0, 64, 192); //top and middle portion. restoreLimboMissionData(); setNoGoArea(lz.x, lz.y, lz.x2, lz.y2, CAM_HUMAN_PLAYER); @@ -122,7 +122,7 @@ function discoverGammaBase() function findBetaUnitIds() { - var droids = enumArea("betaUnits", CAM_HUMAN_PLAYER, false).filter((obj) => ( + let droids = enumArea("betaUnits", CAM_HUMAN_PLAYER, false).filter((obj) => ( obj.type === DROID )); @@ -139,8 +139,8 @@ function betaAlive() return true; //Don't need to see if Beta is still alive if reunited with base. } - var alive = false; - var myDroids = enumDroid(CAM_HUMAN_PLAYER); + let alive = false; + let myDroids = enumDroid(CAM_HUMAN_PLAYER); for (let i = 0, l = betaUnitIds.length; i < l; ++i) { @@ -169,8 +169,8 @@ function eventStartLevel() { camSetExtraObjectiveMessage(_("Reunite a part of Beta team with a Gamma team outpost")); - var startpos = getObject("startPosition"); - var limboLZ = getObject("limboDroidLZ"); + let startpos = getObject("startPosition"); + let limboLZ = getObject("limboDroidLZ"); reunited = false; betaUnitIds = []; truckLocCounter = 0; @@ -185,7 +185,7 @@ function eventStartLevel() setNoGoArea(limboLZ.x, limboLZ.y, limboLZ.x2, limboLZ.y2, -1); setMissionTime(camChangeOnDiff(camMinutesToSeconds(10))); - var enemyLz = getObject("NXlandingZone"); + let enemyLz = getObject("NXlandingZone"); setNoGoArea(enemyLz.x, enemyLz.y, enemyLz.x2, enemyLz.y2, NEXUS); camCompleteRequiredResearch(NEXUS_RES, NEXUS); diff --git a/data/base/script/campaign/libcampaign_includes/artifact.js b/data/base/script/campaign/libcampaign_includes/artifact.js index e8519d7186b..42e1d590ca7 100644 --- a/data/base/script/campaign/libcampaign_includes/artifact.js +++ b/data/base/script/campaign/libcampaign_includes/artifact.js @@ -27,8 +27,8 @@ function camSetArtifacts(artifacts) __camArtifacts = artifacts; for (const alabel in __camArtifacts) { - var ai = __camArtifacts[alabel]; - var pos = camMakePos(alabel); + let ai = __camArtifacts[alabel]; + let pos = camMakePos(alabel); if (camDef(pos.id)) { // will place when object with this id is destroyed @@ -38,7 +38,7 @@ function camSetArtifacts(artifacts) else { // received position or area, place immediately - var acrate = addFeature("Crate", pos.x, pos.y); + let acrate = addFeature("Crate", pos.x, pos.y); addLabel(acrate, __camGetArtifactLabel(alabel)); ai.placed = true; } @@ -65,11 +65,11 @@ function camAllArtifactsPickedUp() //;; function camGetArtifacts() { - var camArti = []; + let camArti = []; for (const alabel in __camArtifacts) { - var artifact = __camArtifacts[alabel]; - var libLabel = __camGetArtifactLabel(alabel); + let artifact = __camArtifacts[alabel]; + let libLabel = __camGetArtifactLabel(alabel); //libcampaign managed artifact that was placed on the map. if (artifact.placed && getObject(libLabel) !== null) { @@ -77,7 +77,7 @@ function camGetArtifacts() } //Label for artifacts that will drop after an object gets destroyed. Or is manually managed. //NOTE: Must check for ID since "alabel" could be a AREA/POSITION label. - var obj = getObject(alabel); + let obj = getObject(alabel); if (obj !== null && camDef(obj.id)) { camArti.push(alabel); @@ -102,12 +102,12 @@ function __camGetArtifactKey(objlabel) function __camCheckPlaceArtifact(obj) { // FIXME: O(n) lookup here - var alabel = getLabel(obj); + let alabel = getLabel(obj); if (!camDef(alabel) || !alabel) { return; } - var ai = __camArtifacts[alabel]; + let ai = __camArtifacts[alabel]; if (!camDef(ai)) { return; @@ -122,7 +122,7 @@ function __camCheckPlaceArtifact(obj) camTrace("Placing multi-tech granting artifact"); for (let i = 0; i < ai.tech.length; ++i) { - var techString = ai.tech[i]; + let techString = ai.tech[i]; camTrace(i, ":", techString); } } @@ -130,7 +130,7 @@ function __camCheckPlaceArtifact(obj) { camTrace("Placing", ai.tech); } - var acrate = addFeature("Crate", obj.x, obj.y); + let acrate = addFeature("Crate", obj.x, obj.y); addLabel(acrate, __camGetArtifactLabel(alabel)); ai.placed = true; } @@ -143,8 +143,8 @@ function __camPickupArtifact(artifact) return; } // FIXME: O(n) lookup here - var alabel = __camGetArtifactKey(getLabel(artifact)); - var ai = __camArtifacts[alabel]; + let alabel = __camGetArtifactKey(getLabel(artifact)); + let ai = __camArtifacts[alabel]; if (!camDef(alabel) || !alabel || !camDef(ai)) { camTrace("Artifact", artifact.id, "is not managed"); @@ -159,7 +159,7 @@ function __camPickupArtifact(artifact) { for (let i = 0; i < ai.tech.length; ++i) { - var techString = ai.tech[i]; + let techString = ai.tech[i]; enableResearch(techString); } } @@ -170,7 +170,7 @@ function __camPickupArtifact(artifact) // bump counter before the callback, so that it was // actual during the callback ++__camNumArtifacts; - var callback = __camGlobalContext()["camArtifactPickup_" + alabel]; + let callback = __camGlobalContext()["camArtifactPickup_" + alabel]; if (camDef(callback)) { callback(); @@ -183,11 +183,11 @@ function __camLetMeWinArtifacts() { for (const alabel in __camArtifacts) { - var ai = __camArtifacts[alabel]; + let ai = __camArtifacts[alabel]; if (ai.placed) { - var label = __camGetArtifactLabel(alabel); - var artifact = getObject(label); + let label = __camGetArtifactLabel(alabel); + let artifact = getObject(label); if (!camDef(artifact) || !artifact) { continue; @@ -200,7 +200,7 @@ function __camLetMeWinArtifacts() { for (let i = 0; i < ai.tech.length; ++i) { - var techString = ai.tech[i]; + let techString = ai.tech[i]; enableResearch(techString); } } diff --git a/data/base/script/campaign/libcampaign_includes/base.js b/data/base/script/campaign/libcampaign_includes/base.js index 2a59a513544..dace2d3343e 100644 --- a/data/base/script/campaign/libcampaign_includes/base.js +++ b/data/base/script/campaign/libcampaign_includes/base.js @@ -33,7 +33,7 @@ //;; function camSetEnemyBases(bases) { - var reload = !camDef(bases); + let reload = !camDef(bases); if (!reload) { __camEnemyBases = bases; @@ -42,8 +42,8 @@ function camSetEnemyBases(bases) // convert label strings to groups and store for (const baseLabel in __camEnemyBases) { - var bi = __camEnemyBases[baseLabel]; - var obj = getObject(baseLabel); + let bi = __camEnemyBases[baseLabel]; + let obj = getObject(baseLabel); if (camDef(obj) && obj) // group already defined { if (!camDef(bi.group)) @@ -52,11 +52,11 @@ function camSetEnemyBases(bases) } else { - var structures = enumGroup(bi.group); + let structures = enumGroup(bi.group); addLabel({ type: GROUP, id: bi.group }, baseLabel); for (let idx = 0, len = structures.length; idx < len; ++idx) { - var s = structures[idx]; + let s = structures[idx]; if (s.type !== STRUCTURE || __camIsValidLeftover(s)) { continue; @@ -70,11 +70,11 @@ function camSetEnemyBases(bases) } if (!camDef(bi.cleanup)) // auto-detect cleanup area { - var objs = enumGroup(bi.group); + let objs = enumGroup(bi.group); if (objs.length > 0) { const OFFSET = 2; // increases size of the auto-detected base area a bit - var a = { + let a = { type: AREA, x: mapWidth, y: mapHeight, x2: 0, y2: 0 @@ -82,7 +82,7 @@ function camSetEnemyBases(bases) // smallest rectangle to contain all objects for (let idx = 0, len = objs.length; idx < len; ++idx) { - var o = objs[idx]; + let o = objs[idx]; if (o.x < a.x) a.x = o.x; if (o.y < a.y) a.y = o.y; if (o.x > a.x2) a.x2 = o.x; @@ -104,10 +104,10 @@ function camSetEnemyBases(bases) } bi.group = camNewGroup(); addLabel({ type: GROUP, id: bi.group }, baseLabel); - var structs = enumArea(bi.cleanup, ENEMIES, false); + let structs = enumArea(bi.cleanup, ENEMIES, false); for (let idx = 0, len = structs.length; idx < len; ++idx) { - var s = structs[idx]; + let s = structs[idx]; if (s.type !== STRUCTURE || __camIsValidLeftover(s)) { continue; @@ -143,7 +143,7 @@ function camSetEnemyBases(bases) //;; function camDetectEnemyBase(baseLabel) { - var bi = __camEnemyBases[baseLabel]; + let bi = __camEnemyBases[baseLabel]; if (bi.detected || bi.eliminated) { return; @@ -152,13 +152,13 @@ function camDetectEnemyBase(baseLabel) bi.detected = true; if (camDef(bi.detectSnd)) { - var pos = camMakePos(bi.cleanup); + let pos = camMakePos(bi.cleanup); if (!camDef(pos)) // auto-detect sound position by group object pos { - var objs = enumGroup(bi.group); + let objs = enumGroup(bi.group); if (objs.length > 0) { - var firstObject = objs[0]; + let firstObject = objs[0]; pos = camMakePos(firstObject); } } @@ -171,7 +171,7 @@ function camDetectEnemyBase(baseLabel) { hackAddMessage(bi.detectMsg, PROX_MSG, CAM_HUMAN_PLAYER, false); } - var callback = __camGlobalContext()["camEnemyBaseDetected_" + baseLabel]; + let callback = __camGlobalContext()["camEnemyBaseDetected_" + baseLabel]; if (camDef(callback)) { callback(); @@ -194,7 +194,7 @@ function camAllEnemyBasesEliminated() function __camCheckBaseSeen(seen) { - var group = seen; // group? + let group = seen; // group? if (camDef(seen.group)) // object? { group = seen.group; @@ -206,7 +206,7 @@ function __camCheckBaseSeen(seen) // FIXME: O(n) lookup here for (const baseLabel in __camEnemyBases) { - var bi = __camEnemyBases[baseLabel]; + let bi = __camEnemyBases[baseLabel]; if (bi.group !== group) { continue; @@ -236,7 +236,7 @@ function __camIsValidLeftover(obj) function __camShouldDestroyLeftover(objInfo, basePlayer) { - var object = getObject(objInfo.type, objInfo.player, objInfo.id); + let object = getObject(objInfo.type, objInfo.player, objInfo.id); if (object === null) { return false; @@ -253,8 +253,8 @@ function __camCheckBaseEliminated(group) // FIXME: O(n) lookup here for (const baseLabel in __camEnemyBases) { - var bi = __camEnemyBases[baseLabel]; - var leftovers = []; + let bi = __camEnemyBases[baseLabel]; + let leftovers = []; if (bi.eliminated || (bi.group !== group)) { continue; @@ -265,11 +265,11 @@ function __camCheckBaseEliminated(group) } if (camDef(bi.cleanup)) { - var objects = enumArea(bi.cleanup, ENEMIES, false); + let objects = enumArea(bi.cleanup, ENEMIES, false); for (let i = 0, len = objects.length; i < len; ++i) { - var object = objects[i]; - var objInfo = { + let object = objects[i]; + let objInfo = { type: object.type, player: object.player, id: object.id @@ -282,13 +282,13 @@ function __camCheckBaseEliminated(group) for (let i = 0, len = leftovers.length; i < len; ++i) { // remove with special effect - var leftover = leftovers[i]; + let leftover = leftovers[i]; camSafeRemoveObject(leftover, true); } if (camDef(bi.eliminateSnd)) { // play sound - var pos = camMakePos(bi.cleanup); + let pos = camMakePos(bi.cleanup); playSound(bi.eliminateSnd, pos.x, pos.y, 0); } } @@ -306,7 +306,7 @@ function __camCheckBaseEliminated(group) // bump counter before the callback, so that it was // actual during the callback ++__camNumEnemyBases; - var callback = __camGlobalContext()["camEnemyBaseEliminated_" + baseLabel]; + let callback = __camGlobalContext()["camEnemyBaseEliminated_" + baseLabel]; if (camDef(callback)) { callback(); @@ -320,7 +320,7 @@ function __camBasesTick() { for (const baseLabel in __camEnemyBases) { - var bi = __camEnemyBases[baseLabel]; + let bi = __camEnemyBases[baseLabel]; if (bi.eliminated || !camDef(bi.reinforce_kind)) { continue; @@ -340,8 +340,8 @@ function __camBasesTick() return; } bi.reinforce_last = gameTime; - var list = profile(bi.reinforce_callback); - var pos = camMakePos(bi.cleanup); + let list = profile(bi.reinforce_callback); + let pos = camMakePos(bi.cleanup); camSendReinforcement(bi.player, pos, list, bi.reinforce_kind, bi.reinforce_data); } } diff --git a/data/base/script/campaign/libcampaign_includes/debug.js b/data/base/script/campaign/libcampaign_includes/debug.js index 9ffd4eca004..f753c65425e 100644 --- a/data/base/script/campaign/libcampaign_includes/debug.js +++ b/data/base/script/campaign/libcampaign_includes/debug.js @@ -78,7 +78,7 @@ function camDebug(...args) //;; function camDebugOnce(...args) { - var str = debugGetCallerFuncName() + ": " + args.join(" "); + let str = debugGetCallerFuncName() + ": " + args.join(" "); if (camDef(__camDebuggedOnce[str])) { return; @@ -117,7 +117,7 @@ function camTraceOnce(...args) { return; } - var str = debugGetCallerFuncName() + ": " + args.join(" "); + let str = debugGetCallerFuncName() + ": " + args.join(" "); if (camDef(__camTracedOnce[str])) { return; @@ -171,7 +171,7 @@ function __camGenericDebug(flag, functionName, args, err, backtrace) { functionName = ""; } - var str = flag + ": " + functionName + ": " + Array.prototype.join.call(args, " "); + let str = flag + ": " + functionName + ": " + Array.prototype.join.call(args, " "); debug(str); if (camDef(err) && err) { diff --git a/data/base/script/campaign/libcampaign_includes/events.js b/data/base/script/campaign/libcampaign_includes/events.js index 33289d90398..80267e7d232 100644 --- a/data/base/script/campaign/libcampaign_includes/events.js +++ b/data/base/script/campaign/libcampaign_includes/events.js @@ -87,14 +87,14 @@ function cam_eventChat(from, to, message) { while (true) // eslint-disable-line no-constant-condition { - var research = enumResearch(); + let research = enumResearch(); if (research.length === 0) { break; } for (let i = 0, len = research.length; i < len; ++i) { - var researchName = research[i].name; + let researchName = research[i].name; completeResearch(researchName, CAM_HUMAN_PLAYER); } } @@ -263,7 +263,7 @@ function cam_eventMissionTimeout() } else { - var won = camCheckExtraObjective(); + let won = camCheckExtraObjective(); if (!won) { __camGameLost(); @@ -284,8 +284,8 @@ function cam_eventAttacked(victim, attacker) if (victim.group === null) { const DEFAULT_RADIUS = 6; - var loc = {x: victim.x, y: victim.y}; - var droids = enumRange(loc.x, loc.y, DEFAULT_RADIUS, victim.player, false).filter((obj) => ( + let loc = {x: victim.x, y: victim.y}; + let droids = enumRange(loc.x, loc.y, DEFAULT_RADIUS, victim.player, false).filter((obj) => ( obj.type === DROID && obj.group === null && (obj.canHitGround || obj.isSensor) && @@ -335,7 +335,7 @@ function cam_eventGameLoaded() //missions or else it reverts to the original texture. for (let i = 0, l = SCAV_KEVLAR_MISSIONS.length; i < l; ++i) { - var mission = SCAV_KEVLAR_MISSIONS[i]; + let mission = SCAV_KEVLAR_MISSIONS[i]; if (__camNextLevel === mission) { if (tilesetType === "ARIZONA") @@ -366,7 +366,7 @@ function cam_eventObjectTransfer(obj, from) { if (from === CAM_HUMAN_PLAYER && obj.player === NEXUS && __camNexusActivated === true) { - var snd; + let snd; if (obj.type === STRUCTURE) { if (obj.stattype === DEFENSE) diff --git a/data/base/script/campaign/libcampaign_includes/group.js b/data/base/script/campaign/libcampaign_includes/group.js index b4c9367d8e5..34d24d5e887 100644 --- a/data/base/script/campaign/libcampaign_includes/group.js +++ b/data/base/script/campaign/libcampaign_includes/group.js @@ -35,7 +35,7 @@ function camInNeverGroup(droid) } for (let i = 0, l = __camNeverGroupDroids.length; i < l; ++i) { - var neverDroidID = __camNeverGroupDroids[i]; + let neverDroidID = __camNeverGroupDroids[i]; if (droid.id === neverDroidID) { return true; @@ -59,8 +59,8 @@ function camNeverGroupDroid(what, playerFilter) { playerFilter = ENEMIES; } - var array; - var obj; + let array; + let obj; if (camIsString(what)) // label { obj = getObject(what); @@ -101,7 +101,7 @@ function camNeverGroupDroid(what, playerFilter) { for (let i = 0, l = array.length; i < l; ++i) { - var o = array[i]; + let o = array[i]; if (!camDef(o) || !o) { continue; diff --git a/data/base/script/campaign/libcampaign_includes/hook.js b/data/base/script/campaign/libcampaign_includes/hook.js index 595be36869a..22a00bb548a 100644 --- a/data/base/script/campaign/libcampaign_includes/hook.js +++ b/data/base/script/campaign/libcampaign_includes/hook.js @@ -18,7 +18,7 @@ //;; function camAreaEvent(label, callback) { - var eventName = "eventArea" + label; + let eventName = "eventArea" + label; camMarkTiles(label); __camPreHookEvent(eventName, function(droid) { diff --git a/data/base/script/campaign/libcampaign_includes/misc.js b/data/base/script/campaign/libcampaign_includes/misc.js index c0cb17c6ff5..8ba9e647ef6 100644 --- a/data/base/script/campaign/libcampaign_includes/misc.js +++ b/data/base/script/campaign/libcampaign_includes/misc.js @@ -105,7 +105,7 @@ function camMakePos(x, y) { return undefined; } - var obj = x; + let obj = x; if (camIsString(x)) { obj = getObject(x); @@ -162,7 +162,7 @@ function camDist(x1, y1, x2, y2) { return distBetweenTwoPoints(x1.x, x1.y, y1.x, y1.y); } - var pos2 = camMakePos(x2); + let pos2 = camMakePos(x2); if (camDef(pos2.x)) // x2 is pos2 { return distBetweenTwoPoints(x1, y1, pos2.x, pos2.y); @@ -204,11 +204,11 @@ function camPlayerMatchesFilter(playerId, playerFilter) //;; function camRemoveDuplicates(items) { - var prims = {"boolean":{}, "number":{}, "string":{}}; - var objs = []; + let prims = {"boolean":{}, "number":{}, "string":{}}; + let objs = []; return items.filter((item) => { - var type = typeof item; + let type = typeof item; if (type in prims) { return prims[type].hasOwnProperty(item) ? false : (prims[type][item] = true); @@ -234,11 +234,11 @@ function camCountStructuresInArea(label, playerFilter) { playerFilter = CAM_HUMAN_PLAYER; } - var list = enumArea(label, playerFilter, false); - var ret = 0; + let list = enumArea(label, playerFilter, false); + let ret = 0; for (let i = 0, l = list.length; i < l; ++i) { - var object = list[i]; + let object = list[i]; if (object.type === STRUCTURE && object.stattype !== WALL && object.status === BUILT) { ++ret; @@ -256,7 +256,7 @@ function camCountStructuresInArea(label, playerFilter) //;; function camChangeOnDiff(numericValue) { - var modifier = 0; + let modifier = 0; switch (difficulty) { @@ -323,8 +323,8 @@ function camMakeGroup(what, playerFilter) { playerFilter = ENEMIES; } - var array; - var obj; + let array; + let obj; if (camIsString(what)) // label { obj = getObject(what); @@ -363,10 +363,10 @@ function camMakeGroup(what, playerFilter) } if (camDef(array)) { - var group = camNewGroup(); + let group = camNewGroup(); for (let i = 0, l = array.length; i < l; ++i) { - var o = array[i]; + let o = array[i]; if (!camDef(o) || !o) { camDebug("Trying to add", o); @@ -579,13 +579,13 @@ function __camGlobalContext() function __camFindClusters(list, size) { // The good old cluster analysis algorithm taken from NullBot AI. - var ret = { clusters: [], xav: [], yav: [], maxIdx: 0, maxCount: 0 }; + let ret = { clusters: [], xav: [], yav: [], maxIdx: 0, maxCount: 0 }; for (let i = list.length - 1; i >= 0; --i) { - var x = list[i].x; - var y = list[i].y; - var found = false; - var n = 0; + let x = list[i].x; + let y = list[i].y; + let found = false; + let n = 0; for (let j = 0; j < ret.clusters.length; ++j) { if (camDist(ret.xav[j], ret.yav[j], x, y) < size) diff --git a/data/base/script/campaign/libcampaign_includes/nexus.js b/data/base/script/campaign/libcampaign_includes/nexus.js index 5f0396446ab..c9d5775ef30 100644 --- a/data/base/script/campaign/libcampaign_includes/nexus.js +++ b/data/base/script/campaign/libcampaign_includes/nexus.js @@ -39,21 +39,21 @@ function camAbsorbPlayer(who, to) to = NEXUS; } - var units = enumDroid(who); + let units = enumDroid(who); for (let i = 0, len = units.length; i < len; ++i) { - var droid = units[i]; + let droid = units[i]; if (!donateObject(droid, to)) { camSafeRemoveObject(droid, false); } } - var structs = enumStruct(who); + let structs = enumStruct(who); for (let i = 0, len = structs.length; i < len; ++i) { - var structure = structs[i]; + let structure = structs[i]; if (!donateObject(structure, to)) { camSafeRemoveObject(structure, false); @@ -81,8 +81,8 @@ function camHackIntoPlayer(player, to) } const GIFT_CHANCE = 70; //Else neutralized - var target; - var objects; + let target; + let objects; if (!camDef(player)) { @@ -97,7 +97,7 @@ function camHackIntoPlayer(player, to) __camLastNexusAttack = 0; } - var objects = __camChooseNexusTarget(player); + objects = __camChooseNexusTarget(player); if (objects.length === 0) { return; @@ -120,7 +120,7 @@ function camHackIntoPlayer(player, to) camTrace("Neutralized " + target.name + " at (x,y): " + target.x + " " + target.y); if (target.player === CAM_HUMAN_PLAYER) { - var sound; + let sound; //Nexus neutralize sounds if (target.type === STRUCTURE) { @@ -189,7 +189,7 @@ function __camChooseNexusTarget(player) } const TARGET_UNIT_CHANCE = (getResearch("R-Sys-Resistance-Upgrade01").done) ? 40 : 20; - var objects = []; + let objects = []; if (camRand(100) < TARGET_UNIT_CHANCE) { diff --git a/data/base/script/campaign/libcampaign_includes/production.js b/data/base/script/campaign/libcampaign_includes/production.js index 5599e1e43c5..27249c58a71 100644 --- a/data/base/script/campaign/libcampaign_includes/production.js +++ b/data/base/script/campaign/libcampaign_includes/production.js @@ -59,7 +59,7 @@ function camSetFactories(factories) //;; function camSetFactoryData(factoryLabel, factoryData) { - var structure = getObject(factoryLabel); + let structure = getObject(factoryLabel); if (!camDef(structure) || !structure) { // Not an error! It's ok if the factory is already destroyed @@ -68,13 +68,13 @@ function camSetFactoryData(factoryLabel, factoryData) return; } // remember the old factory group, if any - var droids = []; + let droids = []; if (camDef(__camFactoryInfo[factoryLabel])) { droids = enumGroup(__camFactoryInfo[factoryLabel].group); } __camFactoryInfo[factoryLabel] = factoryData; - var fi = __camFactoryInfo[factoryLabel]; + let fi = __camFactoryInfo[factoryLabel]; if (!camDef(fi.data)) { fi.data = {}; @@ -87,7 +87,7 @@ function camSetFactoryData(factoryLabel, factoryData) } for (let i = 0, l = droids.length; i < l; ++i) { - var droid = droids[i]; + let droid = droids[i]; groupAdd(fi.group, droid); } if (!camDef(fi.data.count)) @@ -106,7 +106,7 @@ function camSetFactoryData(factoryLabel, factoryData) //;; function camEnableFactory(factoryLabel) { - var fi = __camFactoryInfo[factoryLabel]; + let fi = __camFactoryInfo[factoryLabel]; if (!camDef(fi) || !fi) { camDebug("Factory not managed", factoryLabel); @@ -120,7 +120,7 @@ function camEnableFactory(factoryLabel) } camTrace("Enabling", factoryLabel); fi.enabled = true; - var obj = getObject(factoryLabel); + let obj = getObject(factoryLabel); if (!camDef(obj) || !obj) { camTrace("Factory", factoryLabel, "not found, probably already dead"); @@ -202,19 +202,19 @@ function camUpgradeOnMapTemplates(template1, template2, playerId, excluded) return; } - var droidsOnMap = enumDroid(playerId); + let droidsOnMap = enumDroid(playerId); for (let i = 0, l = droidsOnMap.length; i < l; ++i) { - var dr = droidsOnMap[i]; + let dr = droidsOnMap[i]; if (!camDef(dr.weapons[0])) { continue; //don't handle systems } - var body = dr.body; - var prop = dr.propulsion; - var weap = dr.weapons[0].name; - var skip = false; + let body = dr.body; + let prop = dr.propulsion; + let weap = dr.weapons[0].name; + let skip = false; if (body === template1.body && prop === template1.prop && weap === template1.weap) { //Check if this object should be excluded from the upgrades @@ -255,13 +255,13 @@ function camUpgradeOnMapTemplates(template1, template2, playerId, excluded) function __camFactoryUpdateTactics(flabel) { - var fi = __camFactoryInfo[flabel]; + let fi = __camFactoryInfo[flabel]; if (!fi.enabled) { camDebug("Factory", flabel, "was not enabled"); return; } - var droids = enumGroup(fi.group); + let droids = enumGroup(fi.group); if (droids.length >= fi.groupSize) { camManageGroup(fi.group, fi.order, fi.data); @@ -269,7 +269,7 @@ function __camFactoryUpdateTactics(flabel) } else { - var pos = camMakePos(fi.assembly); + let pos = camMakePos(fi.assembly); if (!camDef(pos)) { pos = camMakePos(flabel); @@ -286,19 +286,19 @@ function __camAddDroidToFactoryGroup(droid, structure) return; } // FIXME: O(n) lookup here - var flabel = getLabel(structure); + let flabel = getLabel(structure); if (!camDef(flabel) || !flabel) { return; } - var fi = __camFactoryInfo[flabel]; + let fi = __camFactoryInfo[flabel]; groupAdd(fi.group, droid); if (camDef(fi.assembly)) { // this is necessary in case droid is regrouped manually // in the scenario code, and thus DORDER_DEFEND for assembly // will not be applied in __camFactoryUpdateTactics() - var pos = camMakePos(fi.assembly); + let pos = camMakePos(fi.assembly); orderDroidLoc(droid, DORDER_MOVE, pos.x, pos.y); } __camFactoryUpdateTactics(flabel); @@ -350,11 +350,11 @@ function __camBuildDroid(template, structure) { return false; } - var prop = __camChangePropulsion(template.prop, structure.player); + let prop = __camChangePropulsion(template.prop, structure.player); makeComponentAvailable(template.body, structure.player); makeComponentAvailable(prop, structure.player); makeComponentAvailable(template.weap, structure.player); - var n = [ structure.name, structure.id, template.body, prop, template.weap ].join(" "); + let n = [ structure.name, structure.id, template.body, prop, template.weap ].join(" "); // multi-turret templates are not supported yet return buildDroid(structure, n, template.body, prop, "", "", template.weap); } @@ -375,8 +375,8 @@ function __checkEnemyFactoryProductionTick() function __camContinueProduction(structure) { - var flabel; - var struct; + let flabel; + let struct; if (camIsString(structure)) { flabel = structure; @@ -401,7 +401,7 @@ function __camContinueProduction(structure) { return; } - var fi = __camFactoryInfo[flabel]; + let fi = __camFactoryInfo[flabel]; if (camDef(fi.maxSize) && groupSize(fi.group) >= fi.maxSize) { // retry later @@ -409,7 +409,7 @@ function __camContinueProduction(structure) } if (camDef(fi.throttle) && camDef(fi.lastprod)) { - var throttle = gameTime - fi.lastprod; + let throttle = gameTime - fi.lastprod; if (throttle < fi.throttle) { // do throttle @@ -420,7 +420,7 @@ function __camContinueProduction(structure) if (fi.state === -1) { fi.state = 0; - var p = struct.player; + let p = struct.player; if (camDef(__camFactoryQueue[p]) && __camFactoryQueue[p].length > 0) { if (__camBuildDroid(__camFactoryQueue[p][0], struct)) diff --git a/data/base/script/campaign/libcampaign_includes/reinforcements.js b/data/base/script/campaign/libcampaign_includes/reinforcements.js index b8236e76351..10b6f1c23fd 100644 --- a/data/base/script/campaign/libcampaign_includes/reinforcements.js +++ b/data/base/script/campaign/libcampaign_includes/reinforcements.js @@ -28,9 +28,9 @@ //;; function camSendReinforcement(playerId, position, templates, kind, data) { - var pos = camMakePos(position); - var order = CAM_ORDER_ATTACK; - var order_data = { regroup: false, count: -1 }; + let pos = camMakePos(position); + let order = CAM_ORDER_ATTACK; + let order_data = { regroup: false, count: -1 }; if (camDef(data) && camDef(data.order)) { order = data.order; @@ -42,18 +42,21 @@ function camSendReinforcement(playerId, position, templates, kind, data) switch (kind) { case CAM_REINFORCE_GROUND: - var droids = []; + { + let droids = []; for (let i = 0, l = templates.length; i < l; ++i) { - var template = templates[i]; - var prop = __camChangePropulsion(template.prop, playerId); - var droid = addDroid(playerId, pos.x, pos.y, "Reinforcement", template.body, prop, "", "", template.weap); + let template = templates[i]; + let prop = __camChangePropulsion(template.prop, playerId); + let droid = addDroid(playerId, pos.x, pos.y, "Reinforcement", template.body, prop, "", "", template.weap); camSetDroidExperience(droid); droids.push(droid); } camManageGroup(camMakeGroup(droids), order, order_data); break; + } case CAM_REINFORCE_TRANSPORT: + { __camTransporterQueue.push({ player: playerId, position: position, @@ -64,9 +67,12 @@ function camSendReinforcement(playerId, position, templates, kind, data) }); __camDispatchTransporterSafe(); break; + } default: + { camTrace("Unknown reinforcement type"); break; + } } } @@ -91,7 +97,7 @@ function camSetBaseReinforcements(baseLabel, interval, callbackName, kind, data) { camDebug("Callback name must be a string (received", callbackName, ")"); } - var bi = __camEnemyBases[baseLabel]; + let bi = __camEnemyBases[baseLabel]; bi.reinforce_kind = kind; bi.reinforce_interval = interval; bi.reinforce_callback = callbackName; diff --git a/data/base/script/campaign/libcampaign_includes/research.js b/data/base/script/campaign/libcampaign_includes/research.js index 205a0c9c93e..69653a80576 100644 --- a/data/base/script/campaign/libcampaign_includes/research.js +++ b/data/base/script/campaign/libcampaign_includes/research.js @@ -15,7 +15,7 @@ function camEnableRes(researchIds, playerId) { for (let i = 0, l = researchIds.length; i < l; ++i) { - var researchId = researchIds[i]; + let researchId = researchIds[i]; enableResearch(researchId, playerId); completeResearch(researchId, playerId); } @@ -35,9 +35,9 @@ function camCompleteRequiredResearch(researchIds, playerId) for (let i = 0, l = researchIds.length; i < l; ++i) { - var researchId = researchIds[i]; + let researchId = researchIds[i]; dump("Searching for required research of item: " + researchId); - var reqRes = findResearch(researchId, playerId).reverse(); + let reqRes = findResearch(researchId, playerId).reverse(); if (reqRes.length === 0) { @@ -52,7 +52,7 @@ function camCompleteRequiredResearch(researchIds, playerId) reqRes = camRemoveDuplicates(reqRes); for (let s = 0, r = reqRes.length; s < r; ++s) { - var researchReq = reqRes[s].name; + let researchReq = reqRes[s].name; dump(" Found: " + researchReq); enableResearch(researchReq, playerId); completeResearch(researchReq, playerId); diff --git a/data/base/script/campaign/libcampaign_includes/tactics.js b/data/base/script/campaign/libcampaign_includes/tactics.js index 0002b283c34..d9cfb3b19ee 100644 --- a/data/base/script/campaign/libcampaign_includes/tactics.js +++ b/data/base/script/campaign/libcampaign_includes/tactics.js @@ -62,7 +62,7 @@ //;; function camManageGroup(group, order, data) { - var saneData = data; + let saneData = data; if (!camDef(saneData)) { saneData = {}; @@ -94,7 +94,7 @@ function camManageGroup(group, order, data) }; if (order === CAM_ORDER_FOLLOW) { - var commanderGroup = camMakeGroup([getObject(data.droid)]); + let commanderGroup = camMakeGroup([getObject(data.droid)]); camManageGroup(commanderGroup, data.order, data.data); } // apply orders instantly @@ -128,7 +128,7 @@ function camStopManagingGroup(group) //;; function camOrderToString(order) { - var orderString; + let orderString; switch (order) { case CAM_ORDER_ATTACK: @@ -155,9 +155,9 @@ function camOrderToString(order) //////////// privates function __camFindGroupAvgCoordinate(groupID) { - var droids = enumGroup(groupID); - var len = droids.length; - var avgCoord = {x: 0, y: 0}; + let droids = enumGroup(groupID); + let len = droids.length; + let avgCoord = {x: 0, y: 0}; if (droids.length === 0) { @@ -166,7 +166,7 @@ function __camFindGroupAvgCoordinate(groupID) for (let i = 0; i < len; ++i) { - var droid = droids[i]; + let droid = droids[i]; avgCoord.x += droid.x; avgCoord.y += droid.y; } @@ -178,38 +178,41 @@ function __camFindGroupAvgCoordinate(groupID) function __camDistToGroupAverage(obj1, obj2) { - var dist1 = distBetweenTwoPoints(__camGroupAvgCoord.x, __camGroupAvgCoord.y, obj1.x, obj1.y); - var dist2 = distBetweenTwoPoints(__camGroupAvgCoord.x, __camGroupAvgCoord.y, obj2.x, obj2.y); + let dist1 = distBetweenTwoPoints(__camGroupAvgCoord.x, __camGroupAvgCoord.y, obj1.x, obj1.y); + let dist2 = distBetweenTwoPoints(__camGroupAvgCoord.x, __camGroupAvgCoord.y, obj2.x, obj2.y); return (dist1 - dist2); } function __camPickTarget(group) { - var targets = []; - var gi = __camGroupInfo[group]; - var droids = enumGroup(group); + let targets = []; + let gi = __camGroupInfo[group]; + let droids = enumGroup(group); __camFindGroupAvgCoordinate(group); switch (gi.order) { case CAM_ORDER_ATTACK: + { if (camDef(gi.target)) { targets = enumRange(gi.target.x, gi.target.y,__CAM_TARGET_TRACKING_RADIUS, CAM_HUMAN_PLAYER, false).filter((obj) => ( obj.type === STRUCTURE || (obj.type === DROID && !isVTOL(obj)) )); } + } // fall-through! we just don't track targets on COMPROMISE case CAM_ORDER_COMPROMISE: + { if (camDef(gi.data.pos)) { for (let i = 0; i < gi.data.pos.length; ++i) { - var compromisePos = gi.data.pos[i]; + let compromisePos = gi.data.pos[i]; if (targets.length > 0) { break; } - var radius = gi.data.radius; + let radius = gi.data.radius; if (!camDef(radius)) { radius = __CAM_PLAYER_BASE_RADIUS; @@ -229,7 +232,7 @@ function __camPickTarget(group) targets = [ gi.data.pos[gi.data.pos.length - 1] ]; } } - var dr = droids[0]; + let dr = droids[0]; targets = targets.filter((obj) => ( propulsionCanReach(dr.propulsion, dr.x, dr.y, obj.x, obj.y) )); @@ -253,14 +256,16 @@ function __camPickTarget(group) } } break; + } case CAM_ORDER_DEFEND: + { if (!camDef(gi.data.pos)) { camDebug("'pos' is required for DEFEND order"); return undefined; } - var defendPos = gi.data.pos[0]; - var radius = gi.data.radius; + let defendPos = gi.data.pos[0]; + let radius = gi.data.radius; if (!camDef(radius)) { radius = __CAM_DEFENSE_RADIUS; @@ -280,16 +285,19 @@ function __camPickTarget(group) targets = [ defendPos ]; } break; + } default: + { camDebug("Unsupported group order", gi.order, camOrderToString(gi.order)); break; + } } if (targets.length === 0) { return undefined; } targets.sort(__camDistToGroupAverage); - var target = targets[0]; + let target = targets[0]; if (camDef(target) && camDef(target.type) && target.type === DROID && camIsTransporter(target)) { return undefined; @@ -300,14 +308,14 @@ function __camPickTarget(group) function __camTacticsTick() { - var dt = CAM_TICKS_PER_FRAME; + let dt = CAM_TICKS_PER_FRAME; for (const group in __camGroupInfo) { //Remove groups with no droids. if (groupSize(group) === 0) { - var remove = true; - var removable = __camGroupInfo[group].data.removable; + let remove = true; + let removable = __camGroupInfo[group].data.removable; //Useful if the group has manual management (seen in cam1-3 script). if (camDef(removable) && !removable) { @@ -330,7 +338,7 @@ function __camTacticsTick() //Return the range (in tiles) a droid will scout for stuff to attack around it. function __camScanRange(order, drType) { - var rng = __CAM_TARGET_TRACKING_RADIUS; //default + let rng = __CAM_TARGET_TRACKING_RADIUS; //default switch (order) { case CAM_ORDER_ATTACK: @@ -358,20 +366,20 @@ function __camScanRange(order, drType) function __camTacticsTickForGroup(group) { - var gi = __camGroupInfo[group]; + let gi = __camGroupInfo[group]; if (!camDef(gi)) { return; } - var rawDroids = enumGroup(group); + let rawDroids = enumGroup(group); if (rawDroids.length === 0) { return; } const CLOSE_Z = 1; - var healthyDroids = []; - var repair = { + let healthyDroids = []; + let repair = { hasFacility: enumStruct(rawDroids[0].player, REPAIR_FACILITY).length > 0, pos: camDef(gi.data.repairPos) ? gi.data.repairPos : undefined, percent: camDef(gi.data.repair) ? gi.data.repair : 66, @@ -382,8 +390,8 @@ function __camTacticsTickForGroup(group) { for (let i = 0, len = rawDroids.length; i < len; ++i) { - var droid = rawDroids[i]; - var repairLikeAction = false; + let droid = rawDroids[i]; + let repairLikeAction = false; if (droid.order === DORDER_RTR) { @@ -404,7 +412,7 @@ function __camTacticsTickForGroup(group) { if (droid.health < repair.percent) { - var loc = camMakePos(repair.pos); + let loc = camMakePos(repair.pos); orderDroidLoc(droid, DORDER_MOVE, loc.x, loc.y); repairLikeAction = true; } @@ -423,10 +431,10 @@ function __camTacticsTickForGroup(group) if (camDef(gi.data.regroup) && gi.data.regroup && healthyDroids.length > 0) { - var ret = __camFindClusters(healthyDroids, __CAM_CLUSTER_SIZE); - var groupX = ret.xav[ret.maxIdx]; - var groupY = ret.yav[ret.maxIdx]; - var droids = ret.clusters[ret.maxIdx]; + let ret = __camFindClusters(healthyDroids, __CAM_CLUSTER_SIZE); + let groupX = ret.xav[ret.maxIdx]; + let groupY = ret.yav[ret.maxIdx]; + let droids = ret.clusters[ret.maxIdx]; for (let i = 0, len = ret.clusters.length; i < len; ++i) { @@ -434,7 +442,7 @@ function __camTacticsTickForGroup(group) { for (let j = 0, len2 = ret.clusters[i].length; j < len2; ++j) { - var droid = ret.clusters[i][j]; + let droid = ret.clusters[i][j]; if (droid.order !== DORDER_RTR) { orderDroidLoc(droid, DORDER_MOVE, groupX, groupY); @@ -443,13 +451,13 @@ function __camTacticsTickForGroup(group) } } - var hitRecently = (gameTime - gi.lastHit < __CAM_FALLBACK_TIME_ON_REGROUP); + let hitRecently = (gameTime - gi.lastHit < __CAM_FALLBACK_TIME_ON_REGROUP); // not enough droids grouped? if (gi.count < 0 ? (ret.maxCount < groupSize(group) * 0.66) : (ret.maxCount < gi.count)) { for (let i = 0, len = droids.length; i < len; ++i) { - var droid = droids[i]; + let droid = droids[i]; if (droid.order === DORDER_RTR) { continue; @@ -472,8 +480,8 @@ function __camTacticsTickForGroup(group) } //Target choosing - var target; - var patrolPos; + let target; + let patrolPos; switch (gi.order) { @@ -495,13 +503,13 @@ function __camTacticsTickForGroup(group) return; } - var defending = (gi.order === CAM_ORDER_DEFEND); - var track = (gi.order === CAM_ORDER_COMPROMISE); + let defending = (gi.order === CAM_ORDER_DEFEND); + let track = (gi.order === CAM_ORDER_COMPROMISE); for (let i = 0, len = healthyDroids.length; i < len; ++i) { - var droid = healthyDroids[i]; - var vtolUnit = (droid.type === DROID && isVTOL(droid)); + let droid = healthyDroids[i]; + let vtolUnit = (droid.type === DROID && isVTOL(droid)); if (droid.player === CAM_HUMAN_PLAYER) { @@ -511,12 +519,12 @@ function __camTacticsTickForGroup(group) //Rearm vtols. if (vtolUnit) { - var arm = droid.weapons[0].armed; - var isRearming = droid.order === DORDER_REARM; + let arm = droid.weapons[0].armed; + let isRearming = droid.order === DORDER_REARM; if ((arm < 1) || (isRearming && (arm < 100 || droid.health < 100))) { - var havePads = enumStruct(droid.player, REARM_PAD).length > 0; + let havePads = enumStruct(droid.player, REARM_PAD).length > 0; if (havePads && !isRearming) { orderDroid(droid, DORDER_REARM); @@ -527,7 +535,7 @@ function __camTacticsTickForGroup(group) if (gi.order === CAM_ORDER_FOLLOW) { - var commander = getObject(gi.data.droid); + let commander = getObject(gi.data.droid); if (commander === null) { // the commander is dead? let the group execute his last will. @@ -544,9 +552,9 @@ function __camTacticsTickForGroup(group) if (gi.order === CAM_ORDER_DEFEND) { // fall back to defense position - var dPos = gi.data.pos[0]; - var dist = camDist(droid.x, droid.y, dPos.x, dPos.y); - var radius = gi.data.radius; + let dPos = gi.data.pos[0]; + let dist = camDist(droid.x, droid.y, dPos.x, dPos.y); + let radius = gi.data.radius; if (!camDef(radius)) { radius = __CAM_DEFENSE_RADIUS; @@ -574,7 +582,7 @@ function __camTacticsTickForGroup(group) if (gameTime - gi.lastmove > gi.data.interval) { // find random new position to visit - var list = []; + let list = []; for (let j = 0, len2 = gi.data.pos.length; j < len2; ++j) { if (j !== gi.lastspot) @@ -597,9 +605,9 @@ function __camTacticsTickForGroup(group) if (camDef(target) && camDist(droid.x, droid.y, target.x, target.y) >= __CAM_CLOSE_RADIUS) { - var closeByObj; - var artilleryLike = (droid.isCB || droid.hasIndirect || droid.isSensor); - var closeBy = enumRange(droid.x, droid.y, __camScanRange(gi.order, droid.droidType), CAM_HUMAN_PLAYER, track); + let closeByObj; + let artilleryLike = (droid.isCB || droid.hasIndirect || droid.isSensor); + let closeBy = enumRange(droid.x, droid.y, __camScanRange(gi.order, droid.droidType), CAM_HUMAN_PLAYER, track); if (closeBy.length > 0) { @@ -652,17 +660,18 @@ function __camTacticsTickForGroup(group) function __camCheckGroupMorale(group) { - var gi = __camGroupInfo[group]; + let gi = __camGroupInfo[group]; if (!camDef(gi.data.morale)) { return; } // morale is %. - var msize = Math.floor((100 - gi.data.morale) * gi.count / 100); - var gsize = groupSize(group); + let msize = Math.floor((100 - gi.data.morale) * gi.count / 100); + let gsize = groupSize(group); switch (gi.order) { case CAM_ORDER_ATTACK: + { if (gsize > msize) { break; @@ -670,13 +679,15 @@ function __camCheckGroupMorale(group) camTrace("Group", group, "falls back"); gi.order = CAM_ORDER_DEFEND; // swap pos and fallback - var temp = gi.data.pos; + let temp = gi.data.pos; gi.data.pos = [ camMakePos(gi.data.fallback) ]; gi.data.fallback = temp; // apply orders instantly queue("__camTacticsTickForGroup", CAM_TICKS_PER_FRAME, group); break; + } case CAM_ORDER_DEFEND: + { if (gsize <= msize) { break; @@ -684,14 +695,17 @@ function __camCheckGroupMorale(group) camTrace("Group", group, "restores"); gi.order = CAM_ORDER_ATTACK; // swap pos and fallback - var temp = gi.data.pos; + let temp = gi.data.pos; gi.data.pos = gi.data.fallback; gi.data.fallback = temp[0]; // apply orders instantly queue("__camTacticsTickForGroup", CAM_TICKS_PER_FRAME, group); break; + } default: + { camDebug("Group order doesn't support morale", camOrderToString(gi.order)); break; + } } } diff --git a/data/base/script/campaign/libcampaign_includes/transport.js b/data/base/script/campaign/libcampaign_includes/transport.js index 534747100e1..24f8a6a14f7 100644 --- a/data/base/script/campaign/libcampaign_includes/transport.js +++ b/data/base/script/campaign/libcampaign_includes/transport.js @@ -71,11 +71,11 @@ function __camDispatchTransporterUnsafe() return false; } const OFFSET = 1; //Increaze LZ "no go" zone area a bit - var args = __camTransporterQueue[0]; - var player = args.player; - var pos = args.position; - var list = args.list; - var data = args.data; + let args = __camTransporterQueue[0]; + let player = args.player; + let pos = args.position; + let list = args.list; + let data = args.data; if (camDef(__camIncomingTransports[player])) { camTrace("Transporter already on map for player", player + ", delaying."); @@ -91,13 +91,13 @@ function __camDispatchTransporterUnsafe() "V-Tol", "", "", "MG3-VTOL"); } - var trans = __camPlayerTransports[player]; - var droids = []; + let trans = __camPlayerTransports[player]; + let droids = []; for (let i = 0, l = list.length; i < l; ++i) { - var template = list[i]; - var prop = __camChangePropulsion(template.prop, player); - var droid = addDroid(player, -1, -1, "Reinforcement", template.body, prop, "", "", template.weap); + let template = list[i]; + let prop = __camChangePropulsion(template.prop, player); + let droid = addDroid(player, -1, -1, "Reinforcement", template.body, prop, "", "", template.weap); droids.push(droid); addDroidToTransporter(trans, droid); } @@ -140,7 +140,7 @@ function __camDispatchTransporterSafe(player, position, list, data) function __camLandTransporter(player, pos) { - var ti = __camIncomingTransports[player]; + let ti = __camIncomingTransports[player]; if (!camDef(ti)) { camDebug("Unhandled transporter for player", player); @@ -160,7 +160,7 @@ function __camLandTransporter(player, pos) camManageGroup(camMakeGroup(ti.droids), ti.order, ti.data); if (player !== CAM_HUMAN_PLAYER) { - for (var i = 0, len = ti.droids.length; i < len; ++i) + for (let i = 0, len = ti.droids.length; i < len; ++i) { camSetDroidExperience(ti.droids[i]); } diff --git a/data/base/script/campaign/libcampaign_includes/truck.js b/data/base/script/campaign/libcampaign_includes/truck.js index 2b63b360871..925a59dd32a 100644 --- a/data/base/script/campaign/libcampaign_includes/truck.js +++ b/data/base/script/campaign/libcampaign_includes/truck.js @@ -31,7 +31,7 @@ function camManageTrucks(playerId) //;; function camQueueBuilding(playerId, stat, position) { - var ti = __camTruckInfo[playerId]; + let ti = __camTruckInfo[playerId]; ti.queue.push({ stat: stat, pos: camMakePos(position) }); } @@ -39,11 +39,11 @@ function camQueueBuilding(playerId, stat, position) function __camEnumFreeTrucks(player) { - var rawDroids = enumDroid(player, DROID_CONSTRUCT); - var droids = []; + let rawDroids = enumDroid(player, DROID_CONSTRUCT); + let droids = []; for (let i = 0, l = rawDroids.length; i < l; ++i) { - var droid = rawDroids[i]; + let droid = rawDroids[i]; if (droid.order !== DORDER_BUILD && droid.order !== DORDER_HELPBUILD && droid.order !== DORDER_LINEBUILD) { droids.push(droid); @@ -54,23 +54,23 @@ function __camEnumFreeTrucks(player) function __camGetClosestTruck(player, pos) { - var droids = __camEnumFreeTrucks(player); + let droids = __camEnumFreeTrucks(player); if (droids.length <= 0) { return undefined; } // Find out which one is the closest. - var minDroid = droids[0]; - var minDist = camDist(minDroid, pos); + let minDroid = droids[0]; + let minDist = camDist(minDroid, pos); for (let i = 1, l = droids.length; i < l; ++i) { - var droid = droids[i]; + let droid = droids[i]; if (!droidCanReach(droid, pos.x, pos.y)) { continue; } - var dist = camDist(droid, pos); + let dist = camDist(droid, pos); if (dist < minDist) { minDist = dist; @@ -86,17 +86,17 @@ function __camTruckTick() // See comments inside the loop to understand priority. for (const playerObj in __camTruckInfo) { - var ti = __camTruckInfo[playerObj]; - var player = ti.player; - var truck; + let ti = __camTruckInfo[playerObj]; + let player = ti.player; + let truck; // First, build things that were explicitly ordered. while (ti.queue.length > 0) { - var qi = ti.queue[0]; - var pos = qi.pos; - var randx = 0; - var randy = 0; + let qi = ti.queue[0]; + let pos = qi.pos; + let randx = 0; + let randy = 0; if (camDef(pos)) { @@ -110,7 +110,7 @@ function __camTruckTick() else { // Build near any truck if pos was not specified. - var droids = __camEnumFreeTrucks(player); + let droids = __camEnumFreeTrucks(player); if (droids.length <= 0) { break; @@ -122,7 +122,7 @@ function __camTruckTick() } enableStructure(qi.stat, player); - var loc = pickStructLocation(truck, qi.stat, pos.x, pos.y); + let loc = pickStructLocation(truck, qi.stat, pos.x, pos.y); if (camDef(loc) && camDef(truck)) { if (orderDroidBuild(truck, DORDER_BUILD, qi.stat, loc.x + randx, loc.y + randy)) @@ -133,12 +133,12 @@ function __camTruckTick() } // Then, capture free oils. - var oils = enumFeature(ALL_PLAYERS, "OilResource"); + let oils = enumFeature(ALL_PLAYERS, "OilResource"); if (oils.length === 0) { continue; } - var oil = oils[0]; + let oil = oils[0]; truck = __camGetClosestTruck(player, oil); if (camDef(truck) && player !== NEXUS) { diff --git a/data/base/script/campaign/libcampaign_includes/victory.js b/data/base/script/campaign/libcampaign_includes/victory.js index be3da885ac1..66be219d1cc 100644 --- a/data/base/script/campaign/libcampaign_includes/victory.js +++ b/data/base/script/campaign/libcampaign_includes/victory.js @@ -14,14 +14,14 @@ function camNextLevel(nextLevel) { if (__camNeedBonusTime) { - var bonusTime = getMissionTime(); + let bonusTime = getMissionTime(); if (difficulty <= MEDIUM) { bonusTime = Math.floor(bonusTime * 0.75); } if (bonusTime > 0) { - var bonus = 110; + let bonus = 110; if (difficulty === HARD) { bonus = 105; @@ -129,10 +129,10 @@ function camSetStandardWinLossConditions(kind, nextLevel, data) //;; function camCheckExtraObjective() { - var extraObjMet = true; + let extraObjMet = true; if (camDef(__camVictoryData) && camDef(__camVictoryData.callback)) { - var result = __camGlobalContext()[__camVictoryData.callback](); + let result = __camGlobalContext()[__camVictoryData.callback](); if (camDef(result)) { if (!result) @@ -217,8 +217,8 @@ function __camGameWon() //in campaign at the moment. function __camPlayerDead() { - var dead = true; - var haveFactories = enumStruct(CAM_HUMAN_PLAYER, FACTORY).filter((obj) => ( + let dead = true; + let haveFactories = enumStruct(CAM_HUMAN_PLAYER, FACTORY).filter((obj) => ( obj.status === BUILT )).length > 0; @@ -255,13 +255,13 @@ function __camPlayerDead() else { //Check the transporter. - var transporter = enumDroid(CAM_HUMAN_PLAYER, DROID_SUPERTRANSPORTER); + let transporter = enumDroid(CAM_HUMAN_PLAYER, DROID_SUPERTRANSPORTER); if (transporter.length > 0) { - var cargoDroids = enumCargo(transporter[0]); + let cargoDroids = enumCargo(transporter[0]); for (let i = 0, len = cargoDroids.length; i < len; ++i) { - var virDroid = cargoDroids[i]; + let virDroid = cargoDroids[i]; if (camDef(virDroid) && virDroid && virDroid.droidType === DROID_CONSTRUCT) { dead = false; @@ -274,7 +274,7 @@ function __camPlayerDead() if (__camWinLossCallback === CAM_VICTORY_TIMEOUT) { //Make the mission fail if no units are alive on map while having no factories. - var droidCount = 0; + let droidCount = 0; enumDroid(CAM_HUMAN_PLAYER).forEach((obj) => { if (obj.droidType === DROID_SUPERTRANSPORTER) { @@ -305,7 +305,7 @@ function __camTriggerLastAttack() { if (!__camLastAttackTriggered) { - var enemies = enumArea(0, 0, mapWidth, mapHeight, ENEMIES, false); + let enemies = enumArea(0, 0, mapWidth, mapHeight, ENEMIES, false); // Do not order systems (sensor/trucks/repairs) to attack stuff. enemies = enemies.filter((obj) => ( obj.type === DROID && !camIsTransporter(obj) && !camIsSystemDroid(obj) @@ -318,7 +318,7 @@ function __camTriggerLastAttack() function __camVictoryStandard() { - var extraObj = camCheckExtraObjective(); + let extraObj = camCheckExtraObjective(); // check if game is lost if (__camPlayerDead()) { @@ -359,21 +359,21 @@ function __camVictoryTimeout() function __camVictoryOffworld() { - var lz = __camVictoryData.area; + let lz = __camVictoryData.area; if (!camDef(lz)) { camDebug("Landing zone area is required for OFFWORLD"); return; } - var total = countDroid(DROID_ANY, CAM_HUMAN_PLAYER); // for future use + let total = countDroid(DROID_ANY, CAM_HUMAN_PLAYER); // for future use if (total === 0) { __camGameLost(); return; } - var forceLZ = camDef(__camVictoryData.retlz) ? __camVictoryData.retlz : false; - var destroyAll = camDef(__camVictoryData.annihilate) ? __camVictoryData.annihilate : false; - var elimBases = camDef(__camVictoryData.eliminateBases) ? __camVictoryData.eliminateBases : false; + let forceLZ = camDef(__camVictoryData.retlz) ? __camVictoryData.retlz : false; + let destroyAll = camDef(__camVictoryData.annihilate) ? __camVictoryData.annihilate : false; + let elimBases = camDef(__camVictoryData.eliminateBases) ? __camVictoryData.eliminateBases : false; if (camCheckExtraObjective() && camAllArtifactsPickedUp()) { @@ -381,7 +381,7 @@ function __camVictoryOffworld() { if (camAllEnemyBasesEliminated()) { - var enemyDroids = enumArea(0, 0, mapWidth, mapHeight, ENEMIES, false).filter((obj) => ( + let enemyDroids = enumArea(0, 0, mapWidth, mapHeight, ENEMIES, false).filter((obj) => ( obj.type === DROID )).length; @@ -398,7 +398,7 @@ function __camVictoryOffworld() } else { - var enemyLen = enumArea(0, 0, mapWidth, mapHeight, ENEMIES, false).length; + let enemyLen = enumArea(0, 0, mapWidth, mapHeight, ENEMIES, false).length; if (!forceLZ && !enemyLen) { //if there are no more enemies, win instantly unless forced to go @@ -416,7 +416,7 @@ function __camVictoryOffworld() } //Make sure to only count droids here. - var atlz = enumArea(lz, CAM_HUMAN_PLAYER, false).filter((obj) => ( + let atlz = enumArea(lz, CAM_HUMAN_PLAYER, false).filter((obj) => ( obj.type === DROID && !camIsTransporter(obj) )).length; if (((!forceLZ && !destroyAll) || (forceLZ && destroyAll && !enemyLen) || (forceLZ && !destroyAll)) && (atlz === total)) @@ -443,7 +443,7 @@ function __camVictoryOffworld() } if (__camRTLZTicker % REMIND_RETURN === 0) { - var pos = camMakePos(lz); + let pos = camMakePos(lz); playSound("pcv427.ogg", pos.x, pos.y, 0); console(_("Return to LZ")); } @@ -465,7 +465,7 @@ function __camVictoryOffworld() } if (__camLZCompromisedTicker % REMIND_COMPROMISED === 1) { - var pos = camMakePos(lz); + let pos = camMakePos(lz); playSound("pcv445.ogg", pos.x, pos.y, 0); } ++__camLZCompromisedTicker; @@ -477,7 +477,7 @@ function __camVictoryOffworld() else if (__camLZCompromisedTicker > 0) { camTrace("LZ clear"); - var pos = camMakePos(lz); + let pos = camMakePos(lz); playSound("lz-clear.ogg", pos.x, pos.y, 0); setReinforcementTime(__camVictoryData.reinforcements); __camLZCompromisedTicker = 0; @@ -536,8 +536,8 @@ function __camShowVictoryConditions() const ANNIHILATE_MESSAGE = _("Destroy all enemy units and structures"); - var unitsOnMap = 0; - var structuresOnMap = 0; + let unitsOnMap = 0; + let structuresOnMap = 0; enumArea(0, 0, mapWidth, mapHeight, ENEMIES, false).forEach((obj) => { if (obj.type === DROID) @@ -588,7 +588,7 @@ function __camShowVictoryConditions() { for (let i = 0, len = __camExtraObjectiveMessage.length; i < len; ++i) { - var mes = __camExtraObjectiveMessage[i]; + let mes = __camExtraObjectiveMessage[i]; console(mes); } } diff --git a/data/base/script/campaign/libcampaign_includes/video.js b/data/base/script/campaign/libcampaign_includes/video.js index 3e120c856aa..fbc0034f8a5 100644 --- a/data/base/script/campaign/libcampaign_includes/video.js +++ b/data/base/script/campaign/libcampaign_includes/video.js @@ -62,7 +62,7 @@ function __camEnqueueVideos() } const SOUND_IDENTIFER = ".ogg"; - var what = __camVideoSequences[0]; + let what = __camVideoSequences[0]; // Check if this is a sound to play before some sequence. if (typeof what === "string" && what.indexOf(SOUND_IDENTIFER) !== -1) @@ -72,7 +72,7 @@ function __camEnqueueVideos() } else if (typeof what === "object") { - var play = true; + let play = true; if (!camDef(what.video) || !camIsString(what.video)) { diff --git a/data/base/script/campaign/libcampaign_includes/vtol.js b/data/base/script/campaign/libcampaign_includes/vtol.js index b6eb195e1cb..859d3cacabf 100644 --- a/data/base/script/campaign/libcampaign_includes/vtol.js +++ b/data/base/script/campaign/libcampaign_includes/vtol.js @@ -177,8 +177,8 @@ function __camSpawnVtols() } else { - var lim = amount; - var alternate = false; + let lim = amount; + let alternate = false; if (camDef(__camVtolDataSystem[idx].extras.alternate)) { alternate = __camVtolDataSystem[idx].extras.alternate; //Only use one template type diff --git a/data/base/script/fastplay/fastdemo.js b/data/base/script/fastplay/fastdemo.js index 05534e21c3b..65fe075072c 100644 --- a/data/base/script/fastplay/fastdemo.js +++ b/data/base/script/fastplay/fastdemo.js @@ -137,8 +137,8 @@ function activateDefenders() function eventStartLevel() { camSetStandardWinLossConditions(CAM_VICTORY_STANDARD, undefined); - var startpos = getObject("startPosition"); - var lz = getObject("landingZone"); + let startpos = getObject("startPosition"); + let lz = getObject("landingZone"); centreView(startpos.x, startpos.y); setNoGoArea(lz.x, lz.y, lz.x2, lz.y2, CAM_HUMAN_PLAYER); diff --git a/data/base/script/rules.js b/data/base/script/rules.js index d66e5ff8ffe..7d263293a83 100644 --- a/data/base/script/rules.js +++ b/data/base/script/rules.js @@ -6,20 +6,21 @@ receiveAllEvents(true); //Needed to allow enemy research to apply to them include("script/weather.js"); var mainReticule = false; +var lastHitTime = 0; const CREATE_LIKE_EVENT = 0; const DESTROY_LIKE_EVENT = 1; const TRANSFER_LIKE_EVENT = 2; function reticuleManufactureCheck() { - var structureComplete = false; - var facs = [FACTORY, CYBORG_FACTORY, VTOL_FACTORY,]; + let structureComplete = false; + let facs = [FACTORY, CYBORG_FACTORY, VTOL_FACTORY,]; for (let i = 0, len = facs.length; i < len; ++i) { - var facType = facs[i]; - var offWorldFacs = enumStructOffWorld(selectedPlayer, facType); - var onMapFacs = enumStruct(selectedPlayer, facType); + let facType = facs[i]; + let offWorldFacs = enumStructOffWorld(selectedPlayer, facType); + let onMapFacs = enumStruct(selectedPlayer, facType); if (offWorldFacs !== null) { @@ -62,14 +63,14 @@ function reticuleManufactureCheck() function reticuleResearchCheck() { - var structureComplete = false; - var labs = [RESEARCH_LAB,]; + let structureComplete = false; + let labs = [RESEARCH_LAB,]; for (let i = 0, len = labs.length; i < len; ++i) { - var resType = labs[i]; - var offWorldLabs = enumStructOffWorld(selectedPlayer, resType); - var onMapLabs = enumStruct(selectedPlayer, resType); + let resType = labs[i]; + let offWorldLabs = enumStructOffWorld(selectedPlayer, resType); + let onMapLabs = enumStruct(selectedPlayer, resType); if (offWorldLabs !== null) { @@ -124,14 +125,14 @@ function reticuleBuildCheck() function reticuleDesignCheck() { - var structureComplete = false; - var hqs = [HQ,]; + let structureComplete = false; + let hqs = [HQ,]; for (let i = 0, len = hqs.length; i < len; ++i) { - var hqType = hqs[i]; - var offWorldHq = enumStructOffWorld(selectedPlayer, hqType); - var onMapHq = enumStruct(selectedPlayer, hqType); + let hqType = hqs[i]; + let offWorldHq = enumStructOffWorld(selectedPlayer, hqType); + let onMapHq = enumStruct(selectedPlayer, hqType); if (offWorldHq !== null) { @@ -199,7 +200,7 @@ function setMainReticule() function reticuleUpdate(obj, eventType) { - var update_reticule = false; + let update_reticule = false; if (eventType === TRANSFER_LIKE_EVENT) { @@ -306,8 +307,8 @@ function setLimits() function resetPower() { - var powerLimit = 999999; - var powerProductionRate = 100; + let powerLimit = 999999; + let powerProductionRate = 100; // set income modifier/power storage for player 0 (human) if (difficulty <= EASY) @@ -423,7 +424,6 @@ function eventResearched(research, structure, player) // NOTE: Research upgrades are handled by the C++ core game engine since 4.1.0 } -var lastHitTime = 0; function eventAttacked(victim, attacker) { if ((victim.player === selectedPlayer) && (attacker.player !== selectedPlayer) && (gameTime > (lastHitTime + 5000))) diff --git a/data/base/script/tutorial.js b/data/base/script/tutorial.js index a03cbe6a320..5bde970306e 100644 --- a/data/base/script/tutorial.js +++ b/data/base/script/tutorial.js @@ -285,10 +285,10 @@ function checkForPowGen() increaseTutorialState(); //Get the truck that is building the generator and store its ID. - var trucks = enumDroid(CAM_HUMAN_PLAYER, DROID_CONSTRUCT); + let trucks = enumDroid(CAM_HUMAN_PLAYER, DROID_CONSTRUCT); for (let i = 0, len = trucks.length; i < len; ++i) { - var truck = trucks[i]; + let truck = trucks[i]; if (truck.order === DORDER_BUILD) { firstTruckID = truck.id; @@ -328,10 +328,10 @@ function checkHelpBuild() { if (tutState === 6) { - var objects = enumDroid(CAM_HUMAN_PLAYER); + let objects = enumDroid(CAM_HUMAN_PLAYER); for (let i = 0, l = objects.length; i < l; ++i) { - var obj = objects[i]; + let obj = objects[i]; if (obj.type === DROID && obj.droidType === DROID_CONSTRUCT && (obj.order === DORDER_HELPBUILD || obj.order === DORDER_BUILD) && @@ -370,7 +370,7 @@ function addToConsole() { if (consoleVar.length) { - var tutPhase = consoleVar[0]; + let tutPhase = consoleVar[0]; if (tutPhase.state <= tutState) { //Check if we need to wait @@ -411,15 +411,15 @@ function addToConsole() function eventSelectionChanged(objects) { - var tut0 = tutState === 0 && consoleVar.length; - var tut5 = tutState === 5 && consoleVar.length; + let tut0 = tutState === 0 && consoleVar.length; + let tut5 = tutState === 5 && consoleVar.length; if (tut0 || tut5) { //Check if they selected a truck. for (let i = 0, l = objects.length; i < l; ++i) { - var obj = objects[i]; + let obj = objects[i]; if (obj.type === DROID && obj.droidType === DROID_CONSTRUCT) { if (tut0) @@ -487,7 +487,7 @@ function eventStartLevel() camSetStandardWinLossConditions(CAM_VICTORY_STANDARD, undefined, { callback: "noWinningForYou" }); - var startpos = getObject("startPosition"); + let startpos = getObject("startPosition"); tutState = 0; didTheyHelpBuildGen = false; firstTruckID = 0;