Skip to content

Commit

Permalink
New assemblies for some Gamma missions.
Browse files Browse the repository at this point in the history
New assemblies from alfred007.
  • Loading branch information
KJeff01 committed Nov 12, 2017
1 parent 6f919d4 commit 6dc0361
Show file tree
Hide file tree
Showing 6 changed files with 144 additions and 124 deletions.
5 changes: 4 additions & 1 deletion data/base/script/campaign/cam3-1.js
Expand Up @@ -112,7 +112,7 @@ function missileSilosDestroyed()
destroyed += (getObject(SILO_ALIAS + (i + 1)) === null) ? 1 : 0;
}

return ((destroyed === SILO_COUNT) ? true : false);
return destroyed === SILO_COUNT ? true : false;
}

//Nuclear missile destroys everything not in safe zone.
Expand Down Expand Up @@ -305,6 +305,7 @@ function eventStartLevel()

with (camTemplates) camSetFactories({
"NXCybFac1": {
assembly: "NXCybFac1Assembly",
order: CAM_ORDER_ATTACK,
groupSize: 4,
throttle: camChangeOnDiff(30000),
Expand All @@ -316,6 +317,7 @@ function eventStartLevel()
templates: [nxcyrail, nxcyscou, nxcylas]
},
"NXCybFac2": {
assembly: "NXCybFac2Assembly",
order: CAM_ORDER_ATTACK,
groupSize: 4,
throttle: camChangeOnDiff(40000),
Expand All @@ -327,6 +329,7 @@ function eventStartLevel()
templates: [nxcyrail, nxcyscou, nxcylas]
},
"NXMediumFac": {
assembly: "NXMediumFacAssembly",
order: CAM_ORDER_DEFEND,
data: {
pos: [
Expand Down
37 changes: 21 additions & 16 deletions data/base/script/campaign/cam3-a.js
Expand Up @@ -271,14 +271,14 @@ function eventStartLevel()
detectSnd: "pcv379.ogg",
eliminateSnd: "pcv394.ogg",
},
"NEXUS-SWBase": {
cleanup: "southWestBaseCleanup",
"NEXUS-NEBase": {
cleanup: "northEastBaseCleanup",
detectMsg: "CM3A_BASE2",
detectSnd: "pcv379.ogg",
eliminateSnd: "pcv394.ogg",
},
"NEXUS-NEBase": {
cleanup: "northEastBaseCleanup",
"NEXUS-SWBase": {
cleanup: "southWestBaseCleanup",
detectMsg: "CM3A_BASE3",
detectSnd: "pcv379.ogg",
eliminateSnd: "pcv394.ogg",
Expand All @@ -293,23 +293,20 @@ function eventStartLevel()

with (camTemplates) camSetFactories({
"NXcybFac-b2": {
order: CAM_ORDER_PATROL,
assembly: "NXcybFac-b2Assembly",
order: CAM_ORDER_ATTACK,
data: {
pos: [
camMakePos("southWestBasePatrol"),
camMakePos("westEntrancePatrol"),
camMakePos("playerLZPatrol"),
],
regroup: false,
repair: 40,
count: -1,
},
groupSize: 4,
throttle: camChangeOnDiff(40000),
group: camMakeGroup("cybValleyPatrol"),
templates: [nxcyrail, nxcyscou]
throttle: camChangeOnDiff(50000),
group: camMakeGroup("NEAttackerGroup"),
templates: [nxcyrail, nxcyscou]
},
"NXcybFac-b3-1": {
assembly: "NXcybFac-b3-1Assembly",
order: CAM_ORDER_ATTACK,
data: {
pos: [
Expand All @@ -326,18 +323,25 @@ function eventStartLevel()
templates: [nxcyrail, nxcyscou]
},
"NXcybFac-b3-2": {
order: CAM_ORDER_ATTACK,
assembly: "NXcybFac-b3-2Assembly",
order: CAM_ORDER_PATROL,
data: {
pos: [
camMakePos("southWestBasePatrol"),
camMakePos("westEntrancePatrol"),
camMakePos("playerLZPatrol"),
],
regroup: false,
repair: 40,
count: -1,
},
groupSize: 4,
throttle: camChangeOnDiff(50000),
group: camMakeGroup("NEAttackerGroup"),
throttle: camChangeOnDiff(40000),
group: camMakeGroup("cybValleyPatrol"),
templates: [nxcyrail, nxcyscou]
},
"NXHvyFac-b3": {
assembly: "NXHvyFac-b3Assembly",
order: CAM_ORDER_PATROL,
data: {
pos: [
Expand All @@ -355,6 +359,7 @@ function eventStartLevel()
templates: [nxmscouh]
},
"NXcybFac-b4": {
assembly: "NXcybFac-b4Assembly",
order: CAM_ORDER_DEFEND,
data: {
pos: [
Expand Down
2 changes: 2 additions & 0 deletions data/base/script/campaign/cam3-b.js
Expand Up @@ -233,6 +233,7 @@ function eventStartLevel()

with (camTemplates) camSetFactories({
"gammaFactory": {
assembly: "gammaFactoryAssembly",
order: CAM_ORDER_ATTACK,
groupSize: 4,
throttle: camChangeOnDiff(45000),
Expand All @@ -244,6 +245,7 @@ function eventStartLevel()
templates: [nxmrailh, nxmscouh]
},
"gammaCyborgFactory": {
assembly: "gammaCyborgFactoryAssembly",
order: CAM_ORDER_ATTACK,
group: camMakeGroup("gammaBaseCleanup"),
groupSize: 6,
Expand Down
79 changes: 42 additions & 37 deletions data/base/wrf/cam3/cam3a/labels.json
@@ -1,43 +1,48 @@
{
"position_0" : { "label": "startPosition", "pos": [ 7360, 15296 ] },
"position_1" : { "label": "transporterEntry", "pos": [ 7296, 16256 ] },
"position_2" : { "label": "transporterExit", "pos": [ 7296, 16256 ] },
"position_3" : { "label": "vtolAppearPos", "pos": [ 832, 6464 ] },
"position_4" : { "label": "vtolRemovePos", "pos": [ 128, 8320 ] },
"position_5" : { "label": "healthRetreatPos", "pos": [ 1344, 15296 ] },
"position_6" : { "label": "genericasAssembly", "pos": [ 4544, 10816 ] },
"position_7" : { "label": "northFacAssembly", "pos": [ 7104, 9280 ] },
"position_8" : { "label": "ambushPlayerPos", "pos": [ 7360, 14656 ] },
"position_10": { "label": "hoverGrpPos1", "pos": [ 4928, 14400 ] },
"position_11": { "label": "hoverGrpPos2", "pos": [ 5312, 12352 ] },
"position_12": { "label": "hoverGrpPos3", "pos": [ 3776, 12864 ] },
"position_13": { "label": "southWestBasePatrol", "pos": [ 1344, 15296 ] },
"position_14": { "label": "westEntrancePatrol", "pos": [ 5952, 14144 ] },
"position_15": { "label": "playerLZPatrol", "pos": [ 7232, 14656 ] },
"position_16": { "label": "NEBaseRetreat", "pos": [ 5568, 9792 ] },
"position_17": { "label": "NWBaseRetreat", "pos": [ 1472, 8512 ] },
"position_18": { "label": "SWBaseRetreat", "pos": [ 2496, 15168 ] },
"position_0" : { "label": "startPosition", "pos": [ 7360, 15296 ] },
"position_1" : { "label": "transporterEntry", "pos": [ 7296, 16256 ] },
"position_2" : { "label": "transporterExit", "pos": [ 7296, 16256 ] },
"position_3" : { "label": "vtolAppearPos", "pos": [ 832, 6464 ] },
"position_4" : { "label": "vtolRemovePos", "pos": [ 128, 8320 ] },
"position_5" : { "label": "healthRetreatPos", "pos": [ 1344, 15296 ] },
"position_6" : { "label": "genericasAssembly", "pos": [ 4544, 10816 ] },
"position_7" : { "label": "northFacAssembly", "pos": [ 7104, 9280 ] },
"position_8" : { "label": "ambushPlayerPos", "pos": [ 7360, 14656 ] },
"position_9" : { "label": "hoverGrpPos1", "pos": [ 4928, 14400 ] },
"position_10": { "label": "hoverGrpPos2", "pos": [ 5312, 12352 ] },
"position_11": { "label": "hoverGrpPos3", "pos": [ 3776, 12864 ] },
"position_12": { "label": "southWestBasePatrol", "pos": [ 1344, 15296 ] },
"position_13": { "label": "westEntrancePatrol", "pos": [ 5952, 14144 ] },
"position_14": { "label": "playerLZPatrol", "pos": [ 7232, 14656 ] },
"position_15": { "label": "NEBaseRetreat", "pos": [ 5568, 9792 ] },
"position_16": { "label": "NWBaseRetreat", "pos": [ 1472, 8512 ] },
"position_17": { "label": "SWBaseRetreat", "pos": [ 2496, 15168 ] },
"position_18": { "label": "NXcybFac-b2Assembly", "pos": [ 5568, 8640 ] },
"position_19": { "label": "NXcybFac-b3-1Assembly", "pos": [ 2496, 14528 ] },
"position_20": { "label": "NXcybFac-b3-2Assembly", "pos": [ 1600, 15296 ] },
"position_21": { "label": "NXHvyFac-b3Assembly", "pos": [ 1600, 14912 ] },
"position_22": { "label": "NXcybFac-b4Assembly", "pos": [ 1984, 8768 ] },

"area_0" : { "label": "landingZone", "pos1": [ 7040, 15232 ], "pos2": [ 7296, 15488 ] },
"area_1" : { "label": "cybAttackers", "pos1": [ 6976, 12480 ], "pos2": [ 7360, 12864 ] },
"area_2" : { "label": "hoverPatrolGrp", "pos1": [ 3648, 13504 ], "pos2": [ 4160, 13888 ] },
"area_3" : { "label": "cybValleyPatrol", "pos1": [ 4288, 15040 ], "pos2": [ 4672, 15424 ] },
"area_4" : { "label": "NEDefenderGroup", "pos1": [ 4032, 9536 ], "pos2": [ 5440, 9920 ] },
"area_5" : { "label": "NEAttackerGroup", "pos1": [ 4928, 9664 ], "pos2": [ 5440, 9920 ] },
"area_6" : { "label": "NAmbushCyborgs", "pos1": [ 6080, 11456 ], "pos2": [ 7232, 12224 ] },
"area_7" : { "label": "westBaseCleanup", "pos1": [ 704, 11840 ], "pos2": [ 3136, 13248 ] },
"area_8" : { "label": "southWestBaseCleanup", "pos1": [ 64, 13376 ], "pos2": [ 3520, 16192 ] },
"area_9" : { "label": "northEastBaseCleanup", "pos1": [ 5056, 7744 ], "pos2": [ 8000, 10432 ] },
"area_10": { "label": "northWestBaseCleanup", "pos1": [ 192, 8256 ], "pos2": [ 3264, 10176 ] },
"area_0" : { "label": "landingZone", "pos1": [ 7040, 15232 ], "pos2": [ 7296, 15488 ] },
"area_1" : { "label": "cybAttackers", "pos1": [ 6976, 12480 ], "pos2": [ 7360, 12864 ] },
"area_2" : { "label": "hoverPatrolGrp", "pos1": [ 3648, 13504 ], "pos2": [ 4160, 13888 ] },
"area_3" : { "label": "cybValleyPatrol", "pos1": [ 4288, 15040 ], "pos2": [ 4672, 15424 ] },
"area_4" : { "label": "NEDefenderGroup", "pos1": [ 4032, 9536 ], "pos2": [ 5440, 9920 ] },
"area_5" : { "label": "NEAttackerGroup", "pos1": [ 4928, 9664 ], "pos2": [ 5440, 9920 ] },
"area_6" : { "label": "NAmbushCyborgs", "pos1": [ 6080, 11456 ], "pos2": [ 7232, 12224 ] },
"area_7" : { "label": "westBaseCleanup", "pos1": [ 704, 11840 ], "pos2": [ 3136, 13248 ] },
"area_8" : { "label": "southWestBaseCleanup", "pos1": [ 64, 13376 ], "pos2": [ 3520, 16192 ] },
"area_9" : { "label": "northEastBaseCleanup", "pos1": [ 5056, 7744 ], "pos2": [ 8000, 10432 ] },
"area_10": { "label": "northWestBaseCleanup", "pos1": [ 192, 8256 ], "pos2": [ 3264, 10176 ] },

"object_0": { "label": "NXPowerGenArti", "id": 901, "player": 3, "type": 1 },
"object_1": { "label": "NXResearchLabArti", "id": 1011, "player": 3, "type": 1 },
"object_2": { "label": "NXcybFac-b2", "id": 187, "player": 3, "type": 1 },
"object_3": { "label": "NXcybFac-b3-1", "id": 88, "player": 3, "type": 1 },
"object_4": { "label": "NXcybFac-b3-2", "id": 1059, "player": 3, "type": 1 },
"object_5": { "label": "NXHvyFac-b3", "id": 1065, "player": 3, "type": 1 },
"object_6": { "label": "NXcybFac-b4", "id": 240, "player": 3, "type": 1 },
"object_7": { "label": "NXCommandCenter", "id": 170, "player": 3, "type": 1 },
"object_0": { "label": "NXPowerGenArti", "id": 901, "player": 3, "type": 1 },
"object_1": { "label": "NXResearchLabArti", "id": 1011, "player": 3, "type": 1 },
"object_2": { "label": "NXcybFac-b2", "id": 88, "player": 3, "type": 1 },
"object_3": { "label": "NXcybFac-b3-1", "id": 187, "player": 3, "type": 1 },
"object_4": { "label": "NXcybFac-b3-2", "id": 1059, "player": 3, "type": 1 },
"object_5": { "label": "NXHvyFac-b3", "id": 1065, "player": 3, "type": 1 },
"object_6": { "label": "NXcybFac-b4", "id": 240, "player": 3, "type": 1 },
"object_7": { "label": "NXCommandCenter", "id": 170, "player": 3, "type": 1 },

"radius_0": { "label": "vtolRemoveZone", "subscriber": 3, "pos" : [ 128, 8320 ], "radius": 250 }
}
66 changes: 34 additions & 32 deletions data/base/wrf/cam3/cam3b/labels.json
@@ -1,38 +1,40 @@
{
"position_0" : { "label": "startPosition", "pos": [ 7360, 15296 ] },
"position_1" : { "label": "vtolAppearPos", "pos": [ 832, 6464 ] },
"position_2" : { "label": "vtolRemovePos", "pos": [ 128, 10240 ] },
"position_3" : { "label": "healthRetreatPos", "pos": [ 704, 6592 ] },
"position_4" : { "label": "healthRetreatPosGamma", "pos": [ 1728, 1472 ] },
"position_5" : { "label": "playerLZ", "pos": [ 7232, 14656 ] },
"position_6" : { "label": "nexusEastTransportPos", "pos": [ 6144, 6528 ] },
"position_7" : { "label": "nexusWestTransportPos", "pos": [ 1024, 6784 ] },
"position_8" : { "label": "eastRetreat", "pos": [ 6464, 7104 ] },
"position_9" : { "label": "westRetreat", "pos": [ 704, 6592 ] },
"position_10": { "label": "westPhantomFactory", "pos": [ 64, 2624 ] },
"position_11": { "label": "northEastOfLake", "pos": [ 5952, 1856 ] },
"position_12": { "label": "gammaBase", "pos": [ 1728, 1472 ] },
"position_13": { "label": "northEndOfPass", "pos": [ 2496, 6080 ] },
"position_14": { "label": "southOfRidge", "pos": [ 4416, 9152 ] },
"position_15": { "label": "westRidge", "pos": [ 3520, 6336 ] },
"position_16": { "label": "eastRidge", "pos": [ 5696, 7488 ] },
"position_17": { "label": "westDoorOfBase", "pos": [ 6080, 14144 ] },
"position_18": { "label": "eastDoorOfBase", "pos": [ 6592, 11456 ] },
"position_0" : { "label": "startPosition", "pos": [ 7360, 15296 ] },
"position_1" : { "label": "vtolAppearPos", "pos": [ 832, 6464 ] },
"position_2" : { "label": "vtolRemovePos", "pos": [ 128, 10240 ] },
"position_3" : { "label": "healthRetreatPos", "pos": [ 704, 6592 ] },
"position_4" : { "label": "healthRetreatPosGamma", "pos": [ 1728, 1472 ] },
"position_5" : { "label": "playerLZ", "pos": [ 7232, 14656 ] },
"position_6" : { "label": "nexusEastTransportPos", "pos": [ 6144, 6528 ] },
"position_7" : { "label": "nexusWestTransportPos", "pos": [ 1024, 6784 ] },
"position_8" : { "label": "eastRetreat", "pos": [ 6464, 7104 ] },
"position_9" : { "label": "westRetreat", "pos": [ 704, 6592 ] },
"position_10": { "label": "westPhantomFactory", "pos": [ 64, 2624 ] },
"position_11": { "label": "northEastOfLake", "pos": [ 5952, 1856 ] },
"position_12": { "label": "gammaBase", "pos": [ 1728, 1472 ] },
"position_13": { "label": "northEndOfPass", "pos": [ 2496, 6080 ] },
"position_14": { "label": "southOfRidge", "pos": [ 4416, 9152 ] },
"position_15": { "label": "westRidge", "pos": [ 3520, 6336 ] },
"position_16": { "label": "eastRidge", "pos": [ 5696, 7488 ] },
"position_17": { "label": "westDoorOfBase", "pos": [ 6080, 14144 ] },
"position_18": { "label": "eastDoorOfBase", "pos": [ 6592, 11456 ] },
"position_19": { "label": "gammaFactoryAssembly", "pos": [ 1216, 2112 ] },
"position_20": { "label": "gammaCyborgFactoryAssembly", "pos": [ 1856, 2112 ] },

"area_0": { "label": "landingZone", "pos1": [ 7040, 15232 ], "pos2": [ 7296, 15488 ] },
"area_1": { "label": "gammaBaseCleanup", "pos1": [ 448, 448 ], "pos2": [ 2880, 3800 ] },
"area_2": { "label": "NXEastBaseCleanup", "pos1": [ 5696, 4800 ], "pos2": [ 7360, 7872 ] },
"area_3": { "label": "NXWestBaseCleanup", "pos1": [ 448, 5440 ], "pos2": [ 1600, 7104 ] },
"area_4": { "label": "eastNXGroup", "pos1": [ 6080, 5568 ], "pos2": [ 6848, 6080 ] },
"area_5": { "label": "westNXGroup", "pos1": [ 192, 4288 ], "pos2": [ 1472, 6336 ] },
"area_6": { "label": "trapTrigger", "subscriber": 0, "pos1": [ 448, 4000 ], "pos2": [ 7600, 4500 ] },
"area_0": { "label": "landingZone", "pos1": [ 7040, 15232 ], "pos2": [ 7296, 15488 ] },
"area_1": { "label": "gammaBaseCleanup", "pos1": [ 448, 448 ], "pos2": [ 2880, 3800 ] },
"area_2": { "label": "NXEastBaseCleanup", "pos1": [ 5696, 4800 ], "pos2": [ 7360, 7872 ] },
"area_3": { "label": "NXWestBaseCleanup", "pos1": [ 448, 5440 ], "pos2": [ 1600, 7104 ] },
"area_4": { "label": "eastNXGroup", "pos1": [ 6080, 5568 ], "pos2": [ 6848, 6080 ] },
"area_5": { "label": "westNXGroup", "pos1": [ 192, 4288 ], "pos2": [ 1472, 6336 ] },
"area_6": { "label": "trapTrigger", "subscriber": 0, "pos1": [ 448, 4000 ], "pos2": [ 7600, 4500 ] },

"object_0": { "label": "NXCommandCenter", "id": 1180, "player": 3, "type": 1 },
"object_1": { "label": "NXBeamTowerArti", "id": 1181, "player": 3, "type": 1 },
"object_2": { "label": "gammaFactory", "id": 432, "player": 1, "type": 1 },
"object_3": { "label": "gammaCyborgFactory", "id": 134, "player": 1, "type": 1 },
"object_4": { "label": "gammaResLabArti", "id": 143, "player": 1, "type": 1 },
"object_5": { "label": "gammaCommandArti", "id": 133, "player": 1, "type": 1 },
"object_0": { "label": "NXCommandCenter", "id": 1180, "player": 3, "type": 1 },
"object_1": { "label": "NXBeamTowerArti", "id": 1181, "player": 3, "type": 1 },
"object_2": { "label": "gammaFactory", "id": 432, "player": 1, "type": 1 },
"object_3": { "label": "gammaCyborgFactory", "id": 134, "player": 1, "type": 1 },
"object_4": { "label": "gammaResLabArti", "id": 143, "player": 1, "type": 1 },
"object_5": { "label": "gammaCommandArti", "id": 133, "player": 1, "type": 1 },

"radius_0": { "label": "vtolRemoveZone", "subscriber": 3, "pos" : [ 128, 10240 ], "radius": 300 }
}

0 comments on commit 6dc0361

Please sign in to comment.