Skip to content

Commit

Permalink
Convert let to const for data/base where possible
Browse files Browse the repository at this point in the history 
Standardize everything to a new convention.
  • Loading branch information
@KJeff01
KJeff01 committed Aug 15, 2023
1 parent 6ff8bed commit 5feefe2
Show file tree
Hide file tree
Showing 66 changed files with 1,413 additions and 1,400 deletions.
44 changes: 22 additions & 22 deletions data/base/script/campaign/cam1-1.js
View file
Expand Up @@ -2,15 +2,15 @@
include("script/campaign/libcampaign.js");
include("script/campaign/templates.js");

const SCAVENGER_RES = [
const mis_scavengerRes = [
"R-Wpn-Flamer-Damage01", "R-Wpn-MG-Damage02", "R-Wpn-MG-ROF01",
];

//Ambush player from scav base - triggered from middle path
camAreaEvent("scavBaseTrigger", function()
{
let ambushGroup = camMakeGroup(enumArea("eastScavsNorth", SCAV_7, false));
camManageGroup(ambushGroup, CAM_ORDER_ATTACK, {
const AMBUSH_GROUP = camMakeGroup(enumArea("eastScavsNorth", CAM_SCAV_7, false));
camManageGroup(AMBUSH_GROUP, CAM_ORDER_ATTACK, {
count: -1,
regroup: false
});
Expand All @@ -35,16 +35,16 @@ camAreaEvent("factoryTrigger", function()

function westScavAction()
{
let ambushGroup = camMakeGroup(enumArea("westScavs", SCAV_7, false));
camManageGroup(ambushGroup, CAM_ORDER_DEFEND, {
const AMBUSH_GROUP = camMakeGroup(enumArea("westScavs", CAM_SCAV_7, false));
camManageGroup(AMBUSH_GROUP, CAM_ORDER_DEFEND, {
pos: camMakePos("ambush1")
});
}

function northwestScavAction()
{
let ambushGroup = camMakeGroup(enumArea("northWestScavs", SCAV_7, false));
camManageGroup(ambushGroup, CAM_ORDER_DEFEND, {
const AMBUSH_GROUP = camMakeGroup(enumArea("northWestScavs", CAM_SCAV_7, false));
camManageGroup(AMBUSH_GROUP, CAM_ORDER_DEFEND, {
pos: camMakePos("ambush2")
});
}
Expand Down Expand Up @@ -79,8 +79,8 @@ function checkFrontBunkers()
{
if (getObject("frontBunkerLeft") === null && getObject("frontBunkerRight") === null)
{
let ambushGroup = camMakeGroup(enumArea("eastScavsSouth", SCAV_7, false));
camManageGroup(ambushGroup, CAM_ORDER_ATTACK, {
const AMBUSH_GROUP = camMakeGroup(enumArea("eastScavsSouth", CAM_SCAV_7, false));
camManageGroup(AMBUSH_GROUP, CAM_ORDER_ATTACK, {
count: -1,
regroup: false
});
Expand All @@ -101,25 +101,25 @@ function eventStartLevel()
retlz: true
});

let startpos = getObject("startPosition");
let lz = getObject("landingZone"); //player lz
let tent = getObject("transporterEntry");
let text = getObject("transporterExit");
centreView(startpos.x, startpos.y);
const startPos = getObject("startPosition");
const lz = getObject("landingZone"); //player lz
const tEnt = getObject("transporterEntry");
const 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);
startTransporterEntry(tEnt.x, tEnt.y, CAM_HUMAN_PLAYER);
setTransporterExit(tExt.x, tExt.y, CAM_HUMAN_PLAYER);

camCompleteRequiredResearch(SCAVENGER_RES, SCAV_7);
camCompleteRequiredResearch(mis_scavengerRes, CAM_SCAV_7);
if (difficulty >= HARD)
{
completeResearch("R-Wpn-Flamer-Range01", SCAV_7);
completeResearch("R-Wpn-Flamer-Range01", CAM_SCAV_7);
}

camUpgradeOnMapTemplates(cTempl.bloke, cTempl.blokeheavy, SCAV_7);
camUpgradeOnMapTemplates(cTempl.trike, cTempl.triketwin, SCAV_7);
camUpgradeOnMapTemplates(cTempl.buggy, cTempl.buggytwin, SCAV_7);
camUpgradeOnMapTemplates(cTempl.bjeep, cTempl.bjeeptwin, SCAV_7);
camUpgradeOnMapTemplates(cTempl.bloke, cTempl.blokeheavy, CAM_SCAV_7);
camUpgradeOnMapTemplates(cTempl.trike, cTempl.triketwin, CAM_SCAV_7);
camUpgradeOnMapTemplates(cTempl.buggy, cTempl.buggytwin, CAM_SCAV_7);
camUpgradeOnMapTemplates(cTempl.bjeep, cTempl.bjeeptwin, CAM_SCAV_7);

//Get rid of the already existing crate and replace with another
camSafeRemoveObject("artifact1", false);
Expand Down
2 changes: 1 addition & 1 deletion data/base/script/campaign/cam1-1s.js
View file
Expand Up @@ -27,7 +27,7 @@ function secondVideo()
//Has player built the power module?
function powerModuleBuilt()
{
let gens = enumStruct(CAM_HUMAN_PLAYER, POWER_GEN, false);
const 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
26 changes: 13 additions & 13 deletions data/base/script/campaign/cam1-2.js
View file
Expand Up @@ -2,7 +2,7 @@
include("script/campaign/libcampaign.js");
include("script/campaign/templates.js");

const SCAVENGER_RES = [
const mis_scavengerRes = [
"R-Wpn-Flamer-Damage02", "R-Wpn-Flamer-Range01", "R-Wpn-Flamer-ROF01",
"R-Wpn-MG-Damage02", "R-Wpn-MG-ROF01", "R-Wpn-Mortar-Damage02",
"R-Wpn-Mortar-ROF01", "R-Wpn-Rocket-ROF03",
Expand Down Expand Up @@ -67,21 +67,21 @@ function eventStartLevel()
retlz: true
});

let startpos = getObject("StartPosition");
let lz = getObject("LandingZone");
let tent = getObject("TransporterEntry");
let text = getObject("TransporterExit");
centreView(startpos.x, startpos.y);
const startPos = getObject("StartPosition");
const lz = getObject("LandingZone");
const tEnt = getObject("TransporterEntry");
const 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);
startTransporterEntry(tEnt.x, tEnt.y, CAM_HUMAN_PLAYER);
setTransporterExit(tExt.x, tExt.y, CAM_HUMAN_PLAYER);

camCompleteRequiredResearch(SCAVENGER_RES, SCAV_7);
camCompleteRequiredResearch(mis_scavengerRes, CAM_SCAV_7);

camUpgradeOnMapTemplates(cTempl.bloke, cTempl.blokeheavy, SCAV_7);
camUpgradeOnMapTemplates(cTempl.trike, cTempl.triketwin, SCAV_7);
camUpgradeOnMapTemplates(cTempl.buggy, cTempl.buggytwin, SCAV_7);
camUpgradeOnMapTemplates(cTempl.bjeep, cTempl.bjeeptwin, SCAV_7);
camUpgradeOnMapTemplates(cTempl.bloke, cTempl.blokeheavy, CAM_SCAV_7);
camUpgradeOnMapTemplates(cTempl.trike, cTempl.triketwin, CAM_SCAV_7);
camUpgradeOnMapTemplates(cTempl.buggy, cTempl.buggytwin, CAM_SCAV_7);
camUpgradeOnMapTemplates(cTempl.bjeep, cTempl.bjeeptwin, CAM_SCAV_7);

camSetEnemyBases({
"NorthGroup": {
Expand Down
44 changes: 22 additions & 22 deletions data/base/script/campaign/cam1-3.js
View file
Expand Up @@ -4,15 +4,15 @@ include("script/campaign/templates.js");

//New base blip, new base area, new factory data

const NEW_PARADIGM_RES = [
const mis_newParadigmRes = [
"R-Wpn-MG1Mk1", "R-Vehicle-Body01", "R-Sys-Spade1Mk1", "R-Vehicle-Prop-Wheels",
"R-Sys-Engineering01", "R-Wpn-MG-Damage03", "R-Wpn-MG-ROF01", "R-Wpn-Cannon-Damage01",
"R-Wpn-Flamer-Damage03", "R-Wpn-Flamer-Range01", "R-Wpn-Flamer-ROF01",
"R-Defense-WallUpgrade02", "R-Struc-Materials02", "R-Vehicle-Engine01",
"R-Struc-RprFac-Upgrade01", "R-Wpn-Rocket-Damage01", "R-Wpn-Rocket-ROF02",
"R-Wpn-Mortar-Damage02", "R-Wpn-Mortar-ROF01",
];
const SCAVENGER_RES = [
const mis_scavengerRes = [
"R-Wpn-Flamer-Damage02", "R-Wpn-Flamer-Range01", "R-Wpn-Flamer-ROF01",
"R-Wpn-MG-Damage03", "R-Wpn-MG-ROF01", "R-Wpn-Cannon-Damage01",
"R-Wpn-Mortar-Damage02", "R-Wpn-Mortar-ROF01", "R-Wpn-Rocket-ROF03",
Expand All @@ -34,11 +34,11 @@ camAreaEvent("NorthConvoyTrigger", function(droid)

camAreaEvent("SouthConvoyTrigger", function(droid)
{
let scout = getObject("ScoutDroid");
const scout = getObject("ScoutDroid");
if (camDef(scout) && scout)
{
camTrace("New Paradigm sensor scout retreating");
let pos = camMakePos("ScoutDroidTarget");
const pos = camMakePos("ScoutDroidTarget");
orderDroidLoc(scout, DORDER_MOVE, pos.x, pos.y);
}
});
Expand Down Expand Up @@ -86,15 +86,15 @@ function NPReinforce()
{
if (getObject("NPHQ") !== null)
{
let list = [];
let count = 5 + camRand(5);
let scouts = [cTempl.nphmg, cTempl.npblc, cTempl.nppod, cTempl.nphmg, cTempl.npblc];
const list = [];
const COUNT = 5 + camRand(5);
const scouts = [cTempl.nphmg, cTempl.npblc, cTempl.nppod, cTempl.nphmg, cTempl.npblc];

for (let i = 0; i < count; ++i)
for (let i = 0; i < COUNT; ++i)
{
list.push(scouts[camRand(scouts.length)]);
}
camSendReinforcement(NEW_PARADIGM, camMakePos("NPReinforcementPos"), list, CAM_REINFORCE_GROUND, {
camSendReinforcement(CAM_NEW_PARADIGM, camMakePos("NPReinforcementPos"), list, CAM_REINFORCE_GROUND, {
data: {
regroup: false,
repair: 66,
Expand Down Expand Up @@ -127,10 +127,10 @@ function eventAttacked(victim, attacker) {
{
return;
}
if (victim.player === NEW_PARADIGM)
if (victim.player === CAM_NEW_PARADIGM)
{
camCallOnce("enableNP");
let commander = getObject("NPCommander");
const commander = getObject("NPCommander");
if (camDef(attacker) && attacker && camDef(commander) && commander &&
commander.order !== DORDER_SCOUT && commander.order !== DORDER_RTR)
{
Expand Down Expand Up @@ -170,7 +170,7 @@ function camEnemyBaseEliminated_ScavBaseGroup()
{
//make enemy easier to find if all his buildings destroyed
camManageGroup(
camMakeGroup(enumArea(0, 0, mapWidth, mapHeight, SCAV_7, false)),
camMakeGroup(enumArea(0, 0, mapWidth, mapHeight, CAM_SCAV_7, false)),
CAM_ORDER_ATTACK
);
}
Expand Down Expand Up @@ -210,18 +210,18 @@ function eventStartLevel()
annihilate: true
});

let startpos = getObject("StartPosition");
let lz = getObject("LandingZone");
let tent = getObject("TransporterEntry");
let text = getObject("TransporterExit");
centreView(startpos.x, startpos.y);
const startPos = getObject("StartPosition");
const lz = getObject("LandingZone");
const tEnt = getObject("TransporterEntry");
const 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);
startTransporterEntry(tEnt.x, tEnt.y, CAM_HUMAN_PLAYER);
setTransporterExit(tExt.x, tExt.y, CAM_HUMAN_PLAYER);

camCompleteRequiredResearch(NEW_PARADIGM_RES, NEW_PARADIGM);
camCompleteRequiredResearch(SCAVENGER_RES, SCAV_7);
setAlliance(NEW_PARADIGM, SCAV_7, true);
camCompleteRequiredResearch(mis_newParadigmRes, CAM_NEW_PARADIGM);
camCompleteRequiredResearch(mis_scavengerRes, CAM_SCAV_7);
setAlliance(CAM_NEW_PARADIGM, CAM_SCAV_7, true);

camUpgradeOnMapTemplates(cTempl.bloke, cTempl.blokeheavy, 7);
camUpgradeOnMapTemplates(cTempl.trike, cTempl.trikeheavy, 7);
Expand Down
54 changes: 27 additions & 27 deletions data/base/script/campaign/cam1-4a.js
View file
Expand Up @@ -2,7 +2,7 @@
include("script/campaign/libcampaign.js");
include("script/campaign/templates.js");

const NEW_PARADIGM_RES = [
const mis_newParadigmRes = [
"R-Wpn-MG1Mk1", "R-Vehicle-Body01", "R-Sys-Spade1Mk1", "R-Vehicle-Prop-Wheels",
"R-Sys-Engineering01", "R-Wpn-MG-Damage04", "R-Wpn-MG-ROF01", "R-Wpn-Cannon-Damage03",
"R-Wpn-Flamer-Damage03", "R-Wpn-Flamer-Range01", "R-Wpn-Flamer-ROF01",
Expand All @@ -11,7 +11,7 @@ const NEW_PARADIGM_RES = [
"R-Vehicle-Metals02", "R-Wpn-Mortar-Damage03", "R-Wpn-Rocket-Accuracy01",
"R-Wpn-RocketSlow-Damage02", "R-Wpn-Mortar-ROF01",
];
const SCAVENGER_RES = [
const mis_scavengerRes = [
"R-Wpn-Flamer-Damage03", "R-Wpn-Flamer-Range01", "R-Wpn-Flamer-ROF01",
"R-Wpn-MG-Damage04", "R-Wpn-MG-ROF01", "R-Wpn-Rocket-Damage02",
"R-Wpn-Cannon-Damage02", "R-Wpn-Mortar-Damage03", "R-Wpn-Mortar-ROF01",
Expand Down 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.

let lz = getObject("LandingZone2"); // will override later
const 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 @@ -90,18 +90,18 @@ function NPBaseDetect()
function buildDefenses()
{
// First wave of trucks
camQueueBuilding(NEW_PARADIGM, "GuardTower6", "BuildTower0");
camQueueBuilding(NEW_PARADIGM, "PillBox1", "BuildTower3");
camQueueBuilding(NEW_PARADIGM, "PillBox1", "BuildTower6");
camQueueBuilding(CAM_NEW_PARADIGM, "GuardTower6", "BuildTower0");
camQueueBuilding(CAM_NEW_PARADIGM, "PillBox1", "BuildTower3");
camQueueBuilding(CAM_NEW_PARADIGM, "PillBox1", "BuildTower6");

// Second wave of trucks
camQueueBuilding(NEW_PARADIGM, "GuardTower3", "BuildTower1");
camQueueBuilding(NEW_PARADIGM, "GuardTower6", "BuildTower2");
camQueueBuilding(NEW_PARADIGM, "GuardTower6", "BuildTower4");
camQueueBuilding(CAM_NEW_PARADIGM, "GuardTower3", "BuildTower1");
camQueueBuilding(CAM_NEW_PARADIGM, "GuardTower6", "BuildTower2");
camQueueBuilding(CAM_NEW_PARADIGM, "GuardTower6", "BuildTower4");

// Third wave of trucks
camQueueBuilding(NEW_PARADIGM, "GuardTower3", "BuildTower5");
camQueueBuilding(NEW_PARADIGM, "GuardTower6", "BuildTower7");
camQueueBuilding(CAM_NEW_PARADIGM, "GuardTower3", "BuildTower5");
camQueueBuilding(CAM_NEW_PARADIGM, "GuardTower6", "BuildTower7");
}

function eventStartLevel()
Expand All @@ -113,25 +113,25 @@ function eventStartLevel()
retlz: true
});

let startpos = getObject("StartPosition");
let lz = getObject("LandingZone1"); // will override later
let tent = getObject("TransporterEntry");
let text = getObject("TransporterExit");
const startPos = getObject("StartPosition");
const lz = getObject("LandingZone1"); // will override later
const tEnt = getObject("TransporterEntry");
const tExt = getObject("TransporterExit");

centreView(startpos.x, startpos.y);
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);
startTransporterEntry(tEnt.x, tEnt.y, CAM_HUMAN_PLAYER);
setTransporterExit(tExt.x, tExt.y, CAM_HUMAN_PLAYER);

camCompleteRequiredResearch(NEW_PARADIGM_RES, NEW_PARADIGM);
camCompleteRequiredResearch(SCAVENGER_RES, SCAV_7);
setAlliance(NEW_PARADIGM, SCAV_7, true);
camCompleteRequiredResearch(mis_newParadigmRes, CAM_NEW_PARADIGM);
camCompleteRequiredResearch(mis_scavengerRes, CAM_SCAV_7);
setAlliance(CAM_NEW_PARADIGM, CAM_SCAV_7, true);

camUpgradeOnMapTemplates(cTempl.bloke, cTempl.blokeheavy, SCAV_7);
camUpgradeOnMapTemplates(cTempl.trike, cTempl.trikeheavy, SCAV_7);
camUpgradeOnMapTemplates(cTempl.buggy, cTempl.buggyheavy, SCAV_7);
camUpgradeOnMapTemplates(cTempl.bjeep, cTempl.bjeepheavy, SCAV_7);
camUpgradeOnMapTemplates(cTempl.rbjeep, cTempl.rbjeep8, SCAV_7);
camUpgradeOnMapTemplates(cTempl.bloke, cTempl.blokeheavy, CAM_SCAV_7);
camUpgradeOnMapTemplates(cTempl.trike, cTempl.trikeheavy, CAM_SCAV_7);
camUpgradeOnMapTemplates(cTempl.buggy, cTempl.buggyheavy, CAM_SCAV_7);
camUpgradeOnMapTemplates(cTempl.bjeep, cTempl.bjeepheavy, CAM_SCAV_7);
camUpgradeOnMapTemplates(cTempl.rbjeep, cTempl.rbjeep8, CAM_SCAV_7);

camSetEnemyBases({
"SouthScavBaseGroup": {
Expand Down Expand Up @@ -204,7 +204,7 @@ function eventStartLevel()

// To be able to use camEnqueueBuilding() later,
// and also to rebuild dead trucks.
camManageTrucks(NEW_PARADIGM);
camManageTrucks(CAM_NEW_PARADIGM);

queue("enableSouthScavFactory", camChangeOnDiff(camSecondsToMilliseconds(10)));
}

0 comments on commit 5feefe2

Please sign in to comment.