Skip to content

Commit

Permalink
Convert var to let for data/base where possible
Browse files Browse the repository at this point in the history
Without causing save issues.
  • Loading branch information
KJeff01 committed Aug 15, 2023
1 parent 56e9651 commit 6ff8bed
Show file tree
Hide file tree
Showing 53 changed files with 675 additions and 659 deletions.
16 changes: 8 additions & 8 deletions data/base/script/campaign/cam1-1.js
Expand Up @@ -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
Expand All @@ -35,15 +35,15 @@ 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")
});
}

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")
});
Expand Down Expand Up @@ -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
Expand All @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion data/base/script/campaign/cam1-1s.js
Expand Up @@ -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))
Expand Down
8 changes: 4 additions & 4 deletions data/base/script/campaign/cam1-2.js
Expand Up @@ -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);
Expand Down
20 changes: 10 additions & 10 deletions data/base/script/campaign/cam1-3.js
Expand Up @@ -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);
}
});
Expand Down Expand Up @@ -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)
{
Expand Down Expand Up @@ -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)
{
Expand Down Expand Up @@ -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);
Expand Down
10 changes: 5 additions & 5 deletions data/base/script/campaign/cam1-4a.js
Expand Up @@ -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.
Expand Down Expand Up @@ -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);
Expand Down
28 changes: 14 additions & 14 deletions data/base/script/campaign/cam1-5.js
Expand Up @@ -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)
{
Expand All @@ -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
Expand All @@ -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)]);
Expand Down Expand Up @@ -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 },
Expand Down Expand Up @@ -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
Expand Down
30 changes: 15 additions & 15 deletions data/base/script/campaign/cam1-7.js
Expand Up @@ -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 }
Expand All @@ -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)
Expand All @@ -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({
Expand Down Expand Up @@ -127,29 +127,29 @@ 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))
{
return; //player must have snatched it
}

//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;
Expand Down Expand Up @@ -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))
{
Expand Down Expand Up @@ -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);
Expand Down
12 changes: 6 additions & 6 deletions data/base/script/campaign/cam1-d.js
Expand Up @@ -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)]);
Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit 6ff8bed

Please sign in to comment.