Skip to content

Commit 2f73f2e

Browse files
DARwins1DARwins1
committed
Update scripts
1 parent 47180e0 commit 2f73f2e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

80 files changed

+1736
-1327
lines changed

‎Changelog.txt

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,20 @@
1-
Changelog:
1+
Refactored v2.6.0
2+
3+
Update with a lot of script tidying-up to match the current libcampaign standards indroduced in 4.4.0, this should not have a noticeable impact on actual gameplay.
4+
NOTE: Saves from previous versions may not work for most levels, as some variable names have been changed.
5+
6+
Changes:
7+
- Also fixed a script error on Beta 2.
8+
9+
210
Refactored v2.5.5
311

412
Quick update to resolve issues with Alpha 5.
513

614
Changes:
715
- Updated labels to fix missing south scav base and Hardcrete artifact.
816

17+
918
Refactored v2.5.4
1019

1120
Update with bugfixes to work with recent versions.
@@ -31,7 +40,6 @@ Changes:
3140
- NEXUS no longer wipes the player's VTOLs on Gamma Final; if you can get VTOLs anywhere close to that base you probably already deserve a medal.
3241

3342

34-
Changelog:
3543
Refactored v2.5.2
3644

3745
A smaller balance patch and a fix.

‎script/campaign/cam1-1.js

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22
include("script/campaign/libcampaign.js");
33
include("script/campaign/templates.js");
44

5-
const SCAVENGER_RES = [
5+
const mis_scavengerRes = [
66
"R-Wpn-Flamer-Damage01", "R-Wpn-MG-Damage01",
77
];
88

99
//Ambush player from scav base - triggered from middle path
1010
camAreaEvent("scavBaseTrigger", function()
1111
{
12-
var ambushGroup = camMakeGroup(enumArea("eastScavs", SCAV_7, false));
12+
const AMBUSH_GROUP = camMakeGroup(enumArea("eastScavs", CAM_SCAV_7, false));
1313
camManageGroup(ambushGroup, CAM_ORDER_DEFEND, {
1414
pos: camMakePos("artifactLocation")
1515
});
@@ -18,7 +18,7 @@ camAreaEvent("scavBaseTrigger", function()
1818
//Moves west scavs units closer to the base - triggered from right path
1919
camAreaEvent("ambush1Trigger", function()
2020
{
21-
var ambushGroup = camMakeGroup(enumArea("westScavs", SCAV_7, false));
21+
const AMBUSH_GROUP = camMakeGroup(enumArea("westScavs", CAM_SCAV_7, false));
2222
camManageGroup(ambushGroup, CAM_ORDER_DEFEND, {
2323
pos: camMakePos("ambush1")
2424
});
@@ -27,7 +27,7 @@ camAreaEvent("ambush1Trigger", function()
2727
//Sends some units towards player LZ - triggered from left path
2828
camAreaEvent("ambush2Trigger", function()
2929
{
30-
var ambushGroup = camMakeGroup(enumArea("northWestScavs", SCAV_7, false));
30+
const AMBUSH_GROUP = camMakeGroup(enumArea("northWestScavs", CAM_SCAV_7, false));
3131
camManageGroup(ambushGroup, CAM_ORDER_DEFEND, {
3232
pos: camMakePos("ambush2")
3333
});
@@ -51,16 +51,16 @@ function eventStartLevel()
5151
retlz: true
5252
});
5353

54-
var startpos = getObject("startPosition");
55-
var lz = getObject("landingZone"); //player lz
56-
var tent = getObject("transporterEntry");
57-
var text = getObject("transporterExit");
54+
const startpos = getObject("startPosition");
55+
const lz = getObject("landingZone"); //player lz
56+
const tent = getObject("transporterEntry");
57+
const text = getObject("transporterExit");
5858
centreView(startpos.x, startpos.y);
5959
setNoGoArea(lz.x, lz.y, lz.x2, lz.y2, CAM_HUMAN_PLAYER);
6060
startTransporterEntry(tent.x, tent.y, CAM_HUMAN_PLAYER);
6161
setTransporterExit(text.x, text.y, CAM_HUMAN_PLAYER);
6262

63-
camCompleteRequiredResearch(SCAVENGER_RES, SCAV_7);
63+
camCompleteRequiredResearch(mis_scavengerRes, CAM_SCAV_7);
6464

6565
//Get rid of the already existing crate and replace with another
6666
camSafeRemoveObject("artifact1", false);

‎script/campaign/cam1-1s.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ function secondVideo()
2525
//Has player built the power module?
2626
function powerModuleBuilt()
2727
{
28-
var gens = enumStruct(CAM_HUMAN_PLAYER, POWER_GEN, false);
29-
for (var x = 0, l = gens.length; x < l; ++x)
28+
const gens = enumStruct(CAM_HUMAN_PLAYER, POWER_GEN, false);
29+
for (let x = 0, l = gens.length; x < l; ++x)
3030
{
3131
if ((gens[x].modules > 0) && (gens[x].status === BUILT))
3232
{

‎script/campaign/cam1-2.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
include("script/campaign/libcampaign.js");
33
include("script/campaign/templates.js");
44

5-
const SCAVENGER_RES = [
5+
const mis_scavengerRes = [
66
"R-Wpn-Flamer-Damage02", "R-Wpn-Flamer-ROF01",
77
"R-Wpn-MG-Damage02", "R-Wpn-Mortar-Damage01",
88
"R-Wpn-Mortar-ROF01", "R-Wpn-Rocket-ROF01",
@@ -66,16 +66,16 @@ function eventStartLevel()
6666
retlz: true
6767
});
6868

69-
var startpos = getObject("StartPosition");
70-
var lz = getObject("LandingZone");
71-
var tent = getObject("TransporterEntry");
72-
var text = getObject("TransporterExit");
69+
const startpos = getObject("StartPosition");
70+
const lz = getObject("LandingZone");
71+
const tent = getObject("TransporterEntry");
72+
const text = getObject("TransporterExit");
7373
centreView(startpos.x, startpos.y);
7474
setNoGoArea(lz.x, lz.y, lz.x2, lz.y2, CAM_HUMAN_PLAYER);
7575
startTransporterEntry(tent.x, tent.y, CAM_HUMAN_PLAYER);
7676
setTransporterExit(text.x, text.y, CAM_HUMAN_PLAYER);
7777

78-
camCompleteRequiredResearch(SCAVENGER_RES, SCAV_7);
78+
camCompleteRequiredResearch(mis_scavengerRes, CAM_SCAV_7);
7979

8080
camSetEnemyBases({
8181
"NorthGroup": {

‎script/campaign/cam1-3.js

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ include("script/campaign/templates.js");
44

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

7-
const NEW_PARADIGM_RES = [
7+
const mis_newParadigmRes = [
88
"R-Wpn-MG-Damage03", "R-Wpn-MG-ROF01", "R-Defense-WallUpgrade01",
99
"R-Struc-Materials01", "R-Struc-Factory-Upgrade01",
1010
"R-Vehicle-Engine01",
@@ -14,7 +14,7 @@ const NEW_PARADIGM_RES = [
1414
"R-Wpn-Rocket-Damage02", "R-Wpn-Rocket-ROF01",
1515
"R-Wpn-RocketSlow-Damage01", "R-Struc-RprFac-Upgrade03",
1616
];
17-
const SCAVENGER_RES = [
17+
const mis_scavengerRes = [
1818
"R-Wpn-Flamer-Damage02", "R-Wpn-Flamer-ROF01",
1919
"R-Wpn-MG-Damage02", "R-Wpn-Cannon-Damage01",
2020
"R-Wpn-Mortar-Damage01", "R-Wpn-Mortar-ROF01", "R-Wpn-Rocket-ROF01",
@@ -36,11 +36,11 @@ camAreaEvent("NorthConvoyTrigger", function(droid)
3636

3737
camAreaEvent("SouthConvoyTrigger", function(droid)
3838
{
39-
var scout = getObject("ScoutDroid");
39+
const scout = getObject("ScoutDroid");
4040
if (camDef(scout) && scout)
4141
{
4242
camTrace("New Paradigm sensor scout retreating");
43-
var pos = camMakePos("ScoutDroidTarget");
43+
const pos = camMakePos("ScoutDroidTarget");
4444
orderDroidLoc(scout, DORDER_MOVE, pos.x, pos.y);
4545
}
4646
});
@@ -88,15 +88,15 @@ function NPReinforce()
8888
{
8989
if (getObject("NPHQ") !== null)
9090
{
91-
var list = [];
92-
var count = 5 + camRand(5);
93-
var scouts = [cTempl.nphmg, cTempl.npflam, cTempl.nppod, cTempl.nphmg, cTempl.npflam];
91+
let list = [];
92+
const COUNT = 5 + camRand(5);
93+
const scouts = [cTempl.nphmg, cTempl.npflam, cTempl.nppod, cTempl.nphmg, cTempl.npflam];
9494

95-
for (var i = 0; i < count; ++i)
95+
for (let i = 0; i < COUNT; ++i)
9696
{
9797
list.push(scouts[camRand(scouts.length)]);
9898
}
99-
camSendReinforcement(NEW_PARADIGM, camMakePos("NPReinforcementPos"), list, CAM_REINFORCE_GROUND, {
99+
camSendReinforcement(CAM_NEW_PARADIGM, camMakePos("NPReinforcementPos"), list, CAM_REINFORCE_GROUND, {
100100
data: {
101101
regroup: false,
102102
repair: 66,
@@ -129,10 +129,10 @@ function eventAttacked(victim, attacker) {
129129
{
130130
return;
131131
}
132-
if (victim.player === NEW_PARADIGM)
132+
if (victim.player === CAM_NEW_PARADIGM)
133133
{
134134
camCallOnce("enableNP");
135-
var commander = getObject("NPCommander");
135+
const commander = getObject("NPCommander");
136136
if (camDef(attacker) && attacker && camDef(commander) && commander &&
137137
commander.order !== DORDER_SCOUT && commander.order !== DORDER_RTR)
138138
{
@@ -172,7 +172,7 @@ function camEnemyBaseEliminated_ScavBaseGroup()
172172
{
173173
//make enemy easier to find if all his buildings destroyed
174174
camManageGroup(
175-
camMakeGroup(enumArea(0, 0, mapWidth, mapHeight, SCAV_7, false)),
175+
camMakeGroup(enumArea(0, 0, mapWidth, mapHeight, CAM_SCAV_7, false)),
176176
CAM_ORDER_ATTACK
177177
);
178178
}
@@ -212,18 +212,18 @@ function eventStartLevel()
212212
annihilate: true
213213
});
214214

215-
var startpos = getObject("StartPosition");
216-
var lz = getObject("LandingZone");
217-
var tent = getObject("TransporterEntry");
218-
var text = getObject("TransporterExit");
215+
const startpos = getObject("StartPosition");
216+
const lz = getObject("LandingZone");
217+
const tent = getObject("TransporterEntry");
218+
const text = getObject("TransporterExit");
219219
centreView(startpos.x, startpos.y);
220220
setNoGoArea(lz.x, lz.y, lz.x2, lz.y2, CAM_HUMAN_PLAYER);
221221
startTransporterEntry(tent.x, tent.y, CAM_HUMAN_PLAYER);
222222
setTransporterExit(text.x, text.y, CAM_HUMAN_PLAYER);
223223

224-
camCompleteRequiredResearch(NEW_PARADIGM_RES, NEW_PARADIGM);
225-
camCompleteRequiredResearch(SCAVENGER_RES, SCAV_7);
226-
setAlliance(NEW_PARADIGM, SCAV_7, true);
224+
camCompleteRequiredResearch(mis_newParadigmRes, CAM_NEW_PARADIGM);
225+
camCompleteRequiredResearch(mis_scavengerRes, CAM_SCAV_7);
226+
setAlliance(CAM_NEW_PARADIGM, CAM_SCAV_7, true);
227227

228228
camSetEnemyBases({
229229
"ScavBaseGroup": {

‎script/campaign/cam1-4a.js

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
include("script/campaign/libcampaign.js");
22
include("script/campaign/templates.js");
33

4-
const NEW_PARADIGM_RES = [
4+
const mis_newParadigmRes = [
55
"R-Wpn-MG-Damage04", "R-Wpn-MG-ROF01", "R-Defense-WallUpgrade02",
66
"R-Struc-Materials02", "R-Struc-Factory-Upgrade02",
77
"R-Vehicle-Engine02",
@@ -11,7 +11,7 @@ const NEW_PARADIGM_RES = [
1111
"R-Wpn-Rocket-Damage02", "R-Wpn-Rocket-ROF02",
1212
"R-Wpn-RocketSlow-Damage02", "R-Struc-RprFac-Upgrade03",
1313
];
14-
const SCAVENGER_RES = [
14+
const mis_scavengerRes = [
1515
"R-Wpn-Flamer-Damage03", "R-Wpn-Flamer-ROF01",
1616
"R-Wpn-MG-Damage04", "R-Wpn-MG-ROF01", "R-Wpn-Rocket-Damage02",
1717
"R-Wpn-Cannon-Damage02", "R-Wpn-Mortar-Damage03", "R-Wpn-Mortar-ROF01",
@@ -51,7 +51,7 @@ camAreaEvent("LandingZoneTrigger", function()
5151
camPlayVideos(["pcv456.ogg", {video: "SB1_4_B", type: MISS_MSG}]);
5252
hackRemoveMessage("C1-4_LZ", PROX_MSG, CAM_HUMAN_PLAYER); //Remove LZ 2 blip.
5353

54-
var lz = getObject("LandingZone2"); // will override later
54+
const lz = getObject("LandingZone2"); // will override later
5555
setNoGoArea(lz.x, lz.y, lz.x2, lz.y2, CAM_HUMAN_PLAYER);
5656

5757
// Give extra 40 minutes.
@@ -90,18 +90,18 @@ function NPBaseDetect()
9090
function buildDefenses()
9191
{
9292
// First wave of trucks
93-
camQueueBuilding(NEW_PARADIGM, "GuardTower6", "BuildTower0");
94-
camQueueBuilding(NEW_PARADIGM, "PillBox1", "BuildTower3");
95-
camQueueBuilding(NEW_PARADIGM, "PillBox1", "BuildTower6");
93+
camQueueBuilding(CAM_NEW_PARADIGM, "GuardTower6", "BuildTower0");
94+
camQueueBuilding(CAM_NEW_PARADIGM, "PillBox1", "BuildTower3");
95+
camQueueBuilding(CAM_NEW_PARADIGM, "PillBox1", "BuildTower6");
9696

9797
// Second wave of trucks
98-
camQueueBuilding(NEW_PARADIGM, "GuardTower3", "BuildTower1");
99-
camQueueBuilding(NEW_PARADIGM, "GuardTower6", "BuildTower2");
100-
camQueueBuilding(NEW_PARADIGM, "GuardTower6", "BuildTower4");
98+
camQueueBuilding(CAM_NEW_PARADIGM, "GuardTower3", "BuildTower1");
99+
camQueueBuilding(CAM_NEW_PARADIGM, "GuardTower6", "BuildTower2");
100+
camQueueBuilding(CAM_NEW_PARADIGM, "GuardTower6", "BuildTower4");
101101

102102
// Third wave of trucks
103-
camQueueBuilding(NEW_PARADIGM, "GuardTower3", "BuildTower5");
104-
camQueueBuilding(NEW_PARADIGM, "GuardTower6", "BuildTower7");
103+
camQueueBuilding(CAM_NEW_PARADIGM, "GuardTower3", "BuildTower5");
104+
camQueueBuilding(CAM_NEW_PARADIGM, "GuardTower6", "BuildTower7");
105105
}
106106

107107
function eventStartLevel()
@@ -113,19 +113,19 @@ function eventStartLevel()
113113
retlz: true
114114
});
115115

116-
var startpos = getObject("StartPosition");
117-
var lz = getObject("LandingZone1"); // will override later
118-
var tent = getObject("TransporterEntry");
119-
var text = getObject("TransporterExit");
116+
const startpos = getObject("StartPosition");
117+
const lz = getObject("LandingZone1"); // will override later
118+
const tent = getObject("TransporterEntry");
119+
const text = getObject("TransporterExit");
120120

121121
centreView(startpos.x, startpos.y);
122122
setNoGoArea(lz.x, lz.y, lz.x2, lz.y2, CAM_HUMAN_PLAYER);
123123
startTransporterEntry(tent.x, tent.y, CAM_HUMAN_PLAYER);
124124
setTransporterExit(text.x, text.y, CAM_HUMAN_PLAYER);
125125

126-
camCompleteRequiredResearch(NEW_PARADIGM_RES, NEW_PARADIGM);
127-
camCompleteRequiredResearch(SCAVENGER_RES, SCAV_7);
128-
setAlliance(NEW_PARADIGM, SCAV_7, true);
126+
camCompleteRequiredResearch(mis_newParadigmRes, CAM_NEW_PARADIGM);
127+
camCompleteRequiredResearch(mis_scavengerRes, CAM_SCAV_7);
128+
setAlliance(CAM_NEW_PARADIGM, CAM_SCAV_7, true);
129129

130130
camSetEnemyBases({
131131
"SouthScavBaseGroup": {
@@ -197,7 +197,7 @@ function eventStartLevel()
197197

198198
// To be able to use camEnqueueBuilding() later,
199199
// and also to rebuild dead trucks.
200-
camManageTrucks(NEW_PARADIGM);
200+
camManageTrucks(CAM_NEW_PARADIGM);
201201

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

0 commit comments

Comments
 (0)