Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 11710b4

Browse files
ximexximex
committedApr 11, 2021
convert var to let in "for" loops (general)
1 parent 178c0c7 commit 11710b4

File tree

10 files changed

+44
-44
lines changed

10 files changed

+44
-44
lines changed
 

‎data/base/script/fastplay/fastdemo.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ function grantStartTech()
4040
];
4141

4242
camCompleteRequiredResearch(TECH, CAM_HUMAN_PLAYER);
43-
for (var i = 0, l = STRUCTS.length; i < l; ++i)
43+
for (let i = 0, l = STRUCTS.length; i < l; ++i)
4444
{
4545
enableStructure(STRUCTS[i], CAM_HUMAN_PLAYER);
4646
}

‎data/base/script/rules.js

+11-11
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,15 @@ function reticuleManufactureCheck()
1515
var structureComplete = false;
1616
var facs = [FACTORY, CYBORG_FACTORY, VTOL_FACTORY,];
1717

18-
for (var i = 0, len = facs.length; i < len; ++i)
18+
for (let i = 0, len = facs.length; i < len; ++i)
1919
{
2020
var facType = facs[i];
2121
var offWorldFacs = enumStructOffWorld(selectedPlayer, facType);
2222
var onMapFacs = enumStruct(selectedPlayer, facType);
2323

2424
if (offWorldFacs !== null)
2525
{
26-
for (var j = 0, len2 = offWorldFacs.length; j < len2; ++j)
26+
for (let j = 0, len2 = offWorldFacs.length; j < len2; ++j)
2727
{
2828
if (offWorldFacs[j].status === BUILT)
2929
{
@@ -34,7 +34,7 @@ function reticuleManufactureCheck()
3434
}
3535
if (!structureComplete)
3636
{
37-
for (var j = 0, len2 = onMapFacs.length; j < len2; ++j)
37+
for (let j = 0, len2 = onMapFacs.length; j < len2; ++j)
3838
{
3939
if (onMapFacs[j].status === BUILT)
4040
{
@@ -65,15 +65,15 @@ function reticuleResearchCheck()
6565
var structureComplete = false;
6666
var labs = [RESEARCH_LAB,];
6767

68-
for (var i = 0, len = labs.length; i < len; ++i)
68+
for (let i = 0, len = labs.length; i < len; ++i)
6969
{
7070
var resType = labs[i];
7171
var offWorldLabs = enumStructOffWorld(selectedPlayer, resType);
7272
var onMapLabs = enumStruct(selectedPlayer, resType);
7373

7474
if (offWorldLabs !== null)
7575
{
76-
for (var j = 0, len2 = offWorldLabs.length; j < len2; ++j)
76+
for (let j = 0, len2 = offWorldLabs.length; j < len2; ++j)
7777
{
7878
if (offWorldLabs[j].status === BUILT)
7979
{
@@ -84,7 +84,7 @@ function reticuleResearchCheck()
8484
}
8585
if (!structureComplete)
8686
{
87-
for (var j = 0, len2 = onMapLabs.length; j < len2; ++j)
87+
for (let j = 0, len2 = onMapLabs.length; j < len2; ++j)
8888
{
8989
if (onMapLabs[j].status === BUILT)
9090
{
@@ -127,15 +127,15 @@ function reticuleDesignCheck()
127127
var structureComplete = false;
128128
var hqs = [HQ,];
129129

130-
for (var i = 0, len = hqs.length; i < len; ++i)
130+
for (let i = 0, len = hqs.length; i < len; ++i)
131131
{
132132
var hqType = hqs[i];
133133
var offWorldHq = enumStructOffWorld(selectedPlayer, hqType);
134134
var onMapHq = enumStruct(selectedPlayer, hqType);
135135

136136
if (offWorldHq !== null)
137137
{
138-
for (var j = 0, len2 = offWorldHq.length; j < len2; ++j)
138+
for (let j = 0, len2 = offWorldHq.length; j < len2; ++j)
139139
{
140140
if (offWorldHq[j].status === BUILT)
141141
{
@@ -146,7 +146,7 @@ function reticuleDesignCheck()
146146
}
147147
if (!structureComplete)
148148
{
149-
for (var j = 0, len2 = onMapHq.length; j < len2; ++j)
149+
for (let j = 0, len2 = onMapHq.length; j < len2; ++j)
150150
{
151151
if (onMapHq[j].status === BUILT)
152152
{
@@ -287,7 +287,7 @@ function setLimits()
287287
setDroidLimit(selectedPlayer, 10, DROID_COMMAND);
288288
setDroidLimit(selectedPlayer, 15, DROID_CONSTRUCT);
289289

290-
for (var i = 0; i < maxPlayers; ++i)
290+
for (let i = 0; i < maxPlayers; ++i)
291291
{
292292
setStructureLimits("A0PowerGenerator", 5, i);
293293
setStructureLimits("A0ResourceExtractor", 200, i);
@@ -414,7 +414,7 @@ function eventResearched(research, structure, player)
414414
{
415415
//debug("RESEARCH : " + research.fullname + "(" + research.name + ") for " + player);
416416
// iterate over all results
417-
for (var i = 0; i < research.results.length; i++)
417+
for (let i = 0; i < research.results.length; i++)
418418
{
419419
var v = research.results[i];
420420
//debug(" RESULT : class=" + v['class'] + " parameter=" + v['parameter'] + " value=" + v['value'] + " filter=" + v['filterParameter'] + " filterparam=" + v['filterParameter']);

‎data/base/script/tutorial.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,7 @@ function checkForPowGen()
279279

280280
//Get the truck that is building the generator and store its ID.
281281
var trucks = enumDroid(CAM_HUMAN_PLAYER, DROID_CONSTRUCT);
282-
for (var i = 0, len = trucks.length; i < len; ++i)
282+
for (let i = 0, len = trucks.length; i < len; ++i)
283283
{
284284
var truck = trucks[i];
285285
if (truck.order === DORDER_BUILD)
@@ -322,7 +322,7 @@ function checkHelpBuild()
322322
if (tutState === 6)
323323
{
324324
var objects = enumDroid(CAM_HUMAN_PLAYER);
325-
for (var i = 0, l = objects.length; i < l; ++i)
325+
for (let i = 0, l = objects.length; i < l; ++i)
326326
{
327327
var obj = objects[i];
328328
if (obj.type === DROID &&
@@ -410,7 +410,7 @@ function eventSelectionChanged(objects)
410410
if (tut0 || tut5)
411411
{
412412
//Check if they selected a truck.
413-
for (var i = 0, l = objects.length; i < l; ++i)
413+
for (let i = 0, l = objects.length; i < l; ++i)
414414
{
415415
var obj = objects[i];
416416
if (obj.type === DROID && obj.droidType === DROID_CONSTRUCT)

‎data/mp/multiplay/script/rules/endconditions.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ function checkEndConditions()
1313
/* If teams enabled check if all team members have lost */
1414
if (alliancesType == ALLIANCES_TEAMS || alliancesType == ALLIANCES_UNSHARED)
1515
{
16-
for (var playnum = 0; playnum < maxPlayers; playnum++)
16+
for (let playnum = 0; playnum < maxPlayers; playnum++)
1717
{
1818
if (playnum != selectedPlayer && allianceExistsBetween(selectedPlayer, playnum))
1919
{
@@ -40,7 +40,7 @@ function checkEndConditions()
4040
var gamewon = true;
4141

4242
// check if all enemies defeated
43-
for (var playnum = 0; playnum < maxPlayers; playnum++)
43+
for (let playnum = 0; playnum < maxPlayers; playnum++)
4444
{
4545
if (playnum != selectedPlayer && !allianceExistsBetween(selectedPlayer, playnum)) // checking enemy player
4646
{

‎data/mp/multiplay/script/rules/events/gameinit.js

+9-9
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ function eventGameInit()
22
{
33
//From script/rules/setupgame.js
44
setupGame();
5-
5+
66
//From script/rules/printsettings.js
77
printGameSettings();
8-
8+
99
//From script/rules/oildrum.js
1010
oilDrumInit();
1111

@@ -15,29 +15,29 @@ function eventGameInit()
1515
//From script/setup/setupscavenger.js
1616
setupScavenger();
1717

18-
for (var playnum = 0; playnum < maxPlayers; playnum++)
18+
for (let playnum = 0; playnum < maxPlayers; playnum++)
1919
{
2020
//From script/setup/powermodifier.js
2121
setupPowerModifier(playnum);
22-
22+
2323
//From script/setup/droidlimit.js
2424
droidLimit(playnum);
2525

2626
//From script/setup/setupstructure.js
2727
setupStructure(playnum);
28-
28+
2929
//From script/setup/setupstructurelimit.js
3030
setupStructureLimit(playnum);
31-
31+
3232
//From script/setup/setupresearch.js
3333
setupResearch(playnum);
34-
34+
3535
//From script/setup/setupcomponents.js
3636
setupComponents(playnum);
37-
37+
3838
//From script/setup/setupbase.js
3939
setupBase(playnum);
40-
40+
4141
//From script/setup/setuptechlevels.js
4242
seupTechLevel(playnum);
4343

‎data/mp/multiplay/script/rules/events/research.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ function eventResearched(research, structure, player)
22
{
33
//if (research.name == "") debug("RESEARCH : " + research.fullname + "(" + research.name + ") for " + player);
44
// iterate over all results
5-
for (var i = 0; i < research.results.length; i++)
5+
for (let i = 0; i < research.results.length; i++)
66
{
77
var v = research.results[i];
88
//if (research.name == "") debug(" RESULT : class=" + v['class'] + " parameter=" + v['parameter'] + " value=" + v['value'] + " filter=" + v['filterParameter'] + " filterval=" + v['filterValue']);
@@ -19,7 +19,7 @@ function eventResearched(research, structure, player)
1919
if (Stats[ctype][cname][parameter] instanceof Array)
2020
{
2121
var dst = Upgrades[player][ctype][cname][parameter].slice();
22-
for (var x = 0; x < dst.length; x++)
22+
for (let x = 0; x < dst.length; x++)
2323
{
2424
dst[x] += Math.ceil(Stats[ctype][cname][parameter][x] * v['value'] / 100);
2525
}

‎data/mp/multiplay/script/rules/oildrum.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ function placeOilDrum()
1414
var nearbyTruck = false;
1515
const SCAN_RANGE_TRUCKS = 6;
1616
var nearbyObjects = enumRange(x, y, SCAN_RANGE_TRUCKS, ALL_PLAYERS, false);
17-
for (var i = 0, len = nearbyObjects.length; i < len; ++i)
17+
for (let i = 0, len = nearbyObjects.length; i < len; ++i)
1818
{
1919
var object = nearbyObjects[i];
2020
if (object.type === DROID && object.droidType === DROID_CONSTRUCT)
@@ -31,7 +31,7 @@ function placeOilDrum()
3131
// see if the random position is valid
3232
var occupied = (enumRange(x, y, SCAN_RANGE_OCCUPIED, ALL_PLAYERS, false).length > 0);
3333
var unreachable = true;
34-
for (var i = 0; i < maxPlayers; ++i)
34+
for (let i = 0; i < maxPlayers; ++i)
3535
{
3636
if (propulsionCanReach("hover01", x, y, startPositions[i].x, startPositions[i].y))
3737
{
@@ -61,7 +61,7 @@ function eventPickup(feature, droid)
6161
{
6262
if (feature.stattype == OIL_DRUM)
6363
{
64-
var delay;
64+
let delay;
6565
// generate Geom(1/6) distribution for oil drum respawn delay
6666
for (delay = 0; ; ++delay)
6767
{
@@ -84,7 +84,7 @@ function oilDrumInit()
8484
{
8585
// always at least one oil drum, and one more for every 64x64 tiles of map area
8686
oilDrumData.maxOilDrums = (mapWidth * mapHeight) >> 12; // replace float division with shift for sync-safety
87-
for (var i = 0; i < oilDrumData.maxOilDrums; ++i)
87+
for (let i = 0; i < oilDrumData.maxOilDrums; ++i)
8888
{
8989
queue("placeOilDrum", 10000 * i);
9090
}

‎data/mp/multiplay/script/rules/reticule.js

+6-6
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ function reticuleManufactureCheck()
33
var structureComplete = false;
44
var facs = [FACTORY, CYBORG_FACTORY, VTOL_FACTORY,];
55

6-
for (var i = 0, len = facs.length; i < len; ++i)
6+
for (let i = 0, len = facs.length; i < len; ++i)
77
{
88
var onMapFacs = enumStruct(selectedPlayer, facs[i]);
9-
for (var j = 0, len2 = onMapFacs.length; j < len2; ++j)
9+
for (let j = 0, len2 = onMapFacs.length; j < len2; ++j)
1010
{
1111
if (onMapFacs[j].status === BUILT)
1212
{
@@ -31,10 +31,10 @@ function reticuleResearchCheck()
3131
var structureComplete = false;
3232
var labs = [RESEARCH_LAB,];
3333

34-
for (var i = 0, len = labs.length; i < len; ++i)
34+
for (let i = 0, len = labs.length; i < len; ++i)
3535
{
3636
var onMapResLabs = enumStruct(selectedPlayer, labs[i]);
37-
for (var j = 0, len2 = onMapResLabs.length; j < len2; ++j)
37+
for (let j = 0, len2 = onMapResLabs.length; j < len2; ++j)
3838
{
3939
if (onMapResLabs[j].status === BUILT)
4040
{
@@ -70,10 +70,10 @@ function reticuleDesignCheck()
7070
var structureComplete = false;
7171
var HQS = [HQ,];
7272

73-
for (var i = 0, len = HQS.length; i < len; ++i)
73+
for (let i = 0, len = HQS.length; i < len; ++i)
7474
{
7575
var onMapHQ = enumStruct(selectedPlayer, HQS[i]);
76-
for (var j = 0, len2 = onMapHQ.length; j < len2; ++j)
76+
for (let j = 0, len2 = onMapHQ.length; j < len2; ++j)
7777
{
7878
if (onMapHQ[j].status === BUILT)
7979
{

‎data/mp/multiplay/script/rules/setup/base.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ function setupBase(player) // inside hackNetOff()
66
completeResearchOnTime(cleanTech, player);
77
// Keep only some structures for insane AI
88
var structs = enumStruct(player);
9-
for (var i = 0; i < structs.length; i++)
9+
for (let i = 0; i < structs.length; i++)
1010
{
1111
var s = structs[i];
1212
if (playerData[player].difficulty != INSANE
@@ -23,7 +23,7 @@ function setupBase(player) // inside hackNetOff()
2323
completeResearchOnTime(timeBaseTech, player);
2424
// Keep only some structures
2525
var structs = enumStruct(player);
26-
for (var i = 0; i < structs.length; i++)
26+
for (let i = 0; i < structs.length; i++)
2727
{
2828
var s = structs[i];
2929
if ((playerData[player].difficulty != INSANE && (s.stattype == WALL || s.stattype == DEFENSE))

‎data/mp/multiplay/script/scavengers/init.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ function produceDroid(fac1) {
2020
case 4: buildDroid(fac1, "Firebus", "FireBody", "BaBaProp", null, null, "BabaFlame"); break;
2121
default: buildDroid(fac1, "Bloke", "B1BaBaPerson01", "BaBaLegs", null, null, "BaBaMG"); break;
2222
}
23-
}
23+
}
2424
}
2525

2626
// Regularly check back on our scavs
@@ -46,7 +46,7 @@ function scavtick()
4646
{
4747
// another way of dealing with lists is to iterate over them
4848
// note, you must NOT use the for (... in ...) construct to iterate over an array of objects with properties!
49-
for (var i = 0; i < droidlist.length; i++)
49+
for (let i = 0; i < droidlist.length; i++)
5050
{
5151
var droid = droidlist[i];
5252
var current = 0;
@@ -55,7 +55,7 @@ function scavtick()
5555

5656
// Find closest factory; notice that we still have the factory list from earlier, which
5757
// saves us a few expensive scripting calls
58-
for (var j = 0; j < factorylist.length; j++)
58+
for (let j = 0; j < factorylist.length; j++)
5959
{
6060
var fact = factorylist[j];
6161
current = distBetweenTwoPoints(fact.x, fact.y, droid.x, droid.y);
@@ -104,7 +104,7 @@ function eventAttacked(victim, attacker)
104104
{
105105
lastAttack = gameTime;
106106
var droidlist = enumGroup(attackGroup);
107-
for (var i = 0; i < droidlist.length; i++)
107+
for (let i = 0; i < droidlist.length; i++)
108108
{
109109
var droid = droidlist[i];
110110
if (distBetweenTwoPoints(victim.x, victim.y, attacker.x, attacker.y) < 24)

0 commit comments

Comments
 (0)
Please sign in to comment.