Skip to content

Commit

Permalink
Fix cam3-a script labels.
Browse files Browse the repository at this point in the history 
Bases 2 and 3 were swapped.
  • Loading branch information
@KJeff01
KJeff01 committed Nov 12, 2017
1 parent d55b38d commit 43a3801
Show file tree
Hide file tree
Showing 2 changed files with 36 additions and 36 deletions.
52 changes: 26 additions & 26 deletions data/base/script/campaign/cam3-a.js
View file
Expand Up @@ -23,7 +23,7 @@ camAreaEvent("cybAttackers", function(droid)
{
if(droid.player === CAM_HUMAN_PLAYER)
{
camEnableFactory("NXcybFac-b2");
camEnableFactory("NXcybFac-b2-1");
}
else
{
Expand All @@ -35,7 +35,7 @@ camAreaEvent("northEastBaseCleanup", function(droid)
{
if (droid.player === CAM_HUMAN_PLAYER)
{
camEnableFactory("NXcybFac-b3-1");
camEnableFactory("NXcybFac-b3");
}
else
{
Expand All @@ -48,8 +48,8 @@ camAreaEvent("southWestBaseCleanup", function(droid)
{
if (droid.player === CAM_HUMAN_PLAYER)
{
camEnableFactory("NXcybFac-b3-2");
camEnableFactory("NXHvyFac-b3");
camEnableFactory("NXcybFac-b2-2");
camEnableFactory("NXHvyFac-b2");

camManageGroup(camMakeGroup("NEAttackerGroup"), CAM_ORDER_ATTACK, {
regroup: true,
Expand Down Expand Up @@ -102,11 +102,11 @@ function eventTransporterLanded(transport)
camCallOnce("setHeroUnits");
}

//Enable all factories after twenty five minutes.
//Enable all factories.
function enableAllFactories()
{
const FACTORY_NAMES = [
"NXcybFac-b4", "NXcybFac-b3-1", "NXcybFac-b3-2", "NXHvyFac-b3", "NXcybFac-b2",
"NXcybFac-b3", "NXcybFac-b2-1", "NXcybFac-b2-2", "NXHvyFac-b2", "NXcybFac-b4",
];

for (var j = 0, i = FACTORY_NAMES.length; j < i; ++j)
Expand Down Expand Up @@ -271,14 +271,14 @@ function eventStartLevel()
detectSnd: "pcv379.ogg",
eliminateSnd: "pcv394.ogg",
},
"NEXUS-NEBase": {
cleanup: "northEastBaseCleanup",
"NEXUS-SWBase": {
cleanup: "southWestBaseCleanup",
detectMsg: "CM3A_BASE2",
detectSnd: "pcv379.ogg",
eliminateSnd: "pcv394.ogg",
},
"NEXUS-SWBase": {
cleanup: "southWestBaseCleanup",
"NEXUS-NEBase": {
cleanup: "northEastBaseCleanup",
detectMsg: "CM3A_BASE3",
detectSnd: "pcv379.ogg",
eliminateSnd: "pcv394.ogg",
Expand All @@ -292,21 +292,21 @@ function eventStartLevel()
});

with (camTemplates) camSetFactories({
"NXcybFac-b2": {
assembly: "NXcybFac-b2Assembly",
"NXcybFac-b3": {
assembly: "NXcybFac-b3Assembly",
order: CAM_ORDER_ATTACK,
data: {
regroup: false,
repair: 40,
count: -1,
},
groupSize: 4,
throttle: camChangeOnDiff(50000),
throttle: camChangeOnDiff(40000),
group: camMakeGroup("NEAttackerGroup"),
templates: [nxcyrail, nxcyscou]
templates: [nxcyrail, nxcyscou]
},
"NXcybFac-b3-1": {
assembly: "NXcybFac-b3-1Assembly",
"NXcybFac-b2-1": {
assembly: "NXcybFac-b2-1Assembly",
order: CAM_ORDER_ATTACK,
data: {
pos: [
Expand All @@ -317,13 +317,13 @@ function eventStartLevel()
repair: 40,
count: -1,
},
groupSize: 8,
throttle: camChangeOnDiff(40000),
groupSize: 4,
throttle: camChangeOnDiff(30000),
group: camMakeGroup("cybAttackers"),
templates: [nxcyrail, nxcyscou]
},
"NXcybFac-b3-2": {
assembly: "NXcybFac-b3-2Assembly",
"NXcybFac-b2-2": {
assembly: "NXcybFac-b2-2Assembly",
order: CAM_ORDER_PATROL,
data: {
pos: [
Expand All @@ -336,12 +336,12 @@ function eventStartLevel()
count: -1,
},
groupSize: 4,
throttle: camChangeOnDiff(40000),
throttle: camChangeOnDiff(30000),
group: camMakeGroup("cybValleyPatrol"),
templates: [nxcyrail, nxcyscou]
},
"NXHvyFac-b3": {
assembly: "NXHvyFac-b3Assembly",
"NXHvyFac-b2": {
assembly: "NXHvyFac-b2Assembly",
order: CAM_ORDER_PATROL,
data: {
pos: [
Expand All @@ -354,7 +354,7 @@ function eventStartLevel()
count: -1,
},
groupSize: 4,
throttle: camChangeOnDiff(70000),
throttle: camChangeOnDiff(60000),
group: camMakeGroup("hoverPatrolGrp"),
templates: [nxmscouh]
},
Expand All @@ -372,7 +372,7 @@ function eventStartLevel()
count: -1,
},
groupSize: 4,
throttle: camChangeOnDiff(50000),
throttle: camChangeOnDiff(30000),
group: camMakeGroup("NEDefenderGroup"),
templates: [nxcyrail, nxcyscou]
},
Expand All @@ -395,5 +395,5 @@ function eventStartLevel()

groupPatrolNoTrigger();
queue("vtolAttack", camChangeOnDiff(480000)); //8 min
queue("enableAllFactories", camChangeOnDiff(1800000)); //25 minutes.
queue("enableAllFactories", camChangeOnDiff(1200000)); //20 minutes.
}
20 changes: 10 additions & 10 deletions data/base/wrf/cam3/cam3a/labels.json
View file
Expand Up @@ -72,19 +72,19 @@
"pos": [2496, 15168]
},
"position_18": {
"label": "NXcybFac-b2Assembly",
"label": "NXcybFac-b3Assembly",
"pos": [5568, 8640]
},
"position_19": {
"label": "NXcybFac-b3-1Assembly",
"label": "NXcybFac-b2-1Assembly",
"pos": [2496, 14528]
},
"position_20": {
"label": "NXcybFac-b3-2Assembly",
"label": "NXcybFac-b2-2Assembly",
"pos": [1600, 15296]
},
"position_21": {
"label": "NXHvyFac-b3Assembly",
"label": "NXHvyFac-b2Assembly",
"pos": [1600, 14912]
},
"position_22": {
Expand Down Expand Up @@ -161,25 +161,25 @@
"type": 1
},
"object_2": {
"label": "NXcybFac-b2",
"id": 88,
"label": "NXcybFac-b3",
"id": 187,
"player": 3,
"type": 1
},
"object_3": {
"label": "NXcybFac-b3-1",
"id": 187,
"label": "NXcybFac-b2-1",
"id": 88,
"player": 3,
"type": 1
},
"object_4": {
"label": "NXcybFac-b3-2",
"label": "NXcybFac-b2-2",
"id": 1059,
"player": 3,
"type": 1
},
"object_5": {
"label": "NXHvyFac-b3",
"label": "NXHvyFac-b2",
"id": 1065,
"player": 3,
"type": 1
Expand Down

0 comments on commit 43a3801

Please sign in to comment.