Permalink
Browse files

Update campaign labels and assemblies.

- New factory assemblies and labels from forum member alfred007.
- Delete sub2-6 gates file.
  • Loading branch information...
KJeff01 committed Oct 31, 2017
1 parent 922ccd2 commit 88ad402ce1127036080879e0f6618d340f9114b0
Showing with 809 additions and 765 deletions.
  1. +3 −3 data/base/script/campaign/cam1-5.js
  2. +7 −3 data/base/script/campaign/cam1-d.js
  3. +3 −3 data/base/script/campaign/cam1c.js
  4. +3 −1 data/base/script/campaign/cam2-5.js
  5. +7 −2 data/base/script/campaign/cam2-6.js
  6. +6 −3 data/base/script/campaign/cam2-7.js
  7. +5 −4 data/base/script/campaign/cam2-8.js
  8. +6 −0 data/base/script/campaign/cam2-b.js
  9. +4 −0 data/base/script/campaign/cam2-c.js
  10. +3 −1 data/base/script/campaign/cam2-d.js
  11. +5 −2 data/base/script/campaign/libcampaign.js
  12. +29 −26 data/base/wrf/cam1/cam1a/labels.json
  13. +31 −29 data/base/wrf/cam1/cam1b/labels.json
  14. +49 −56 data/base/wrf/cam1/cam1c/labels.json
  15. +41 −47 data/base/wrf/cam1/cam1ca/labels.json
  16. +21 −21 data/base/wrf/cam1/sub1-1/labels.json
  17. +19 −20 data/base/wrf/cam1/sub1-2/labels.json
  18. +14 −15 data/base/wrf/cam1/sub1-3/labels.json
  19. +38 −41 data/base/wrf/cam1/sub1-4/labels.json
  20. +35 −32 data/base/wrf/cam1/sub1-5/labels.json
  21. +37 −37 data/base/wrf/cam1/sub1-7/labels.json
  22. +52 −46 data/base/wrf/cam1/sub1-d/labels.json
  23. +40 −36 data/base/wrf/cam2/cam2b/labels.json
  24. +43 −40 data/base/wrf/cam2/cam2c/labels.json
  25. +11 −11 data/base/wrf/cam2/cam2start/labels.json
  26. +13 −13 data/base/wrf/cam2/sub2-1/labels.json
  27. +24 −24 data/base/wrf/cam2/sub2-2/labels.json
  28. +21 −19 data/base/wrf/cam2/sub2-5/labels.json
  29. +0 −1 data/base/wrf/cam2/sub2-6/gates.txt
  30. +34 −30 data/base/wrf/cam2/sub2-6/labels.json
  31. +27 −24 data/base/wrf/cam2/sub2-7/labels.json
  32. +25 −24 data/base/wrf/cam2/sub2-8/labels.json
  33. +21 −19 data/base/wrf/cam2/sub2-d/labels.json
  34. +7 −7 data/base/wrf/cam3/cam3a-b/labels.json
  35. +21 −21 data/base/wrf/cam3/cam3a/labels.json
  36. +19 −19 data/base/wrf/cam3/cam3b/labels.json
  37. +24 −24 data/base/wrf/cam3/cam3c/labels.json
  38. +30 −30 data/base/wrf/cam3/sub3-1/labels.json
  39. +31 −31 data/base/wrf/cam3/sub3-2/labels.json
@@ -196,7 +196,7 @@ function eventStartLevel()
with (camTemplates) camSetFactories({
"NPLeftFactory": {
//assembly: "NPLeftAssembly",
assembly: "NPLeftAssembly",
order: CAM_ORDER_ATTACK,
groupSize: 4,
throttle: camChangeOnDiff(50000),
@@ -208,7 +208,7 @@ function eventStartLevel()
},
},
"NPRightFactory": {
//assembly: "NPRightAssembly",
assembly: "NPRightAssembly",
order: CAM_ORDER_ATTACK,
groupSize: 4,
throttle: camChangeOnDiff(60000),
@@ -220,7 +220,7 @@ function eventStartLevel()
},
},
"NPCyborgFactory": {
//assembly: "NPCyborgAssembly",
assembly: "NPCyborgAssembly",
order: CAM_ORDER_ATTACK,
groupSize: 4,
throttle: camChangeOnDiff(40000),
@@ -207,7 +207,7 @@ function eventStartLevel()
with (camTemplates) camSetFactories({
"NPFactoryW": {
assembly: camMakePos("genRetreatPoint"),
assembly: "NPFactoryWAssembly",
order: CAM_ORDER_ATTACK,
groupSize: 4,
throttle: camChangeOnDiff(60000),
@@ -219,6 +219,7 @@ function eventStartLevel()
templates: [ nphmgh, npltath, nphch ] //Hover factory
},
"NPFactoryE": {
assembly: "NPFactoryEAssembly",
order: CAM_ORDER_ATTACK,
groupSize: 4,
throttle: camChangeOnDiff(90000),
@@ -230,6 +231,7 @@ function eventStartLevel()
templates: [ npltat, npmsens, npmorb, npsmct, nphct ] //variety
},
"NPFactoryNE": {
assembly: "NPFactoryNEAssembly",
order: CAM_ORDER_ATTACK,
groupSize: 4,
throttle: camChangeOnDiff(120000),
@@ -241,6 +243,7 @@ function eventStartLevel()
templates: [ nphct, npsbb, npmorb ] //tough units
},
"NPCybFactoryW": {
assembly: "NPCybFactoryWAssembly",
order: CAM_ORDER_ATTACK,
groupSize: 4,
throttle: camChangeOnDiff(50000),
@@ -252,6 +255,7 @@ function eventStartLevel()
templates: [ npcybc, npcybf, npcybr ]
},
"NPCybFactoryE": {
assembly: "NPCybFactoryEAssembly",
order: CAM_ORDER_ATTACK,
groupSize: 4,
throttle: camChangeOnDiff(50000),
@@ -263,7 +267,7 @@ function eventStartLevel()
templates: [ npcybc, npcybf, npcybr ]
},
"NPCybFactoryNE": {
assembly: camMakePos("cybRetreatPoint"),
assembly: "NPCybFactoryNEAssembly",
order: CAM_ORDER_ATTACK,
groupSize: 4,
throttle: camChangeOnDiff(70000),
@@ -278,6 +282,6 @@ function eventStartLevel()
hackAddMessage("C1D_OBJ1", PROX_MSG, CAM_HUMAN_PLAYER, true);
queue("enableReinforcements", 10000);
queue("enableReinforcements", 15000);
queue("setupPatrols", 160000); // 2.5 min.
}
@@ -288,14 +288,14 @@ function eventStartLevel()
assembly: "ScavSouthFactoryAssembly",
order: CAM_ORDER_ATTACK,
groupSize: 4,
throttle: camChangeOnDiff(90000),
throttle: camChangeOnDiff(30000),
templates: [ buscan, rbjeep, trike, buggy ]
},
"ScavCentralFactory": {
// no assembly was defined in wzcam for this factory
assembly: "ScavCentralFactoryAssembly",
order: CAM_ORDER_ATTACK,
groupSize: 4,
throttle: camChangeOnDiff(60000),
throttle: camChangeOnDiff(30000),
templates: [ firecan, rbuggy, bjeep, bloke ]
},
"ScavNorthFactory": {
@@ -120,7 +120,7 @@ function eventStartLevel()
with (camTemplates) camSetFactories({
"COMediumFactory": {
assembly: camMakePos("mediumFactoryAssembly"),
assembly: "COMediumFactoryAssembly",
order: CAM_ORDER_ATTACK,
groupSize: 4,
throttle: camChangeOnDiff(60000),
@@ -132,6 +132,7 @@ function eventStartLevel()
templates: [comct, comatt, comhpv]
},
"COCyborgFactoryL": {
assembly: "COCyborgFactoryLAssembly",
order: CAM_ORDER_ATTACK,
groupSize: 5,
throttle: camChangeOnDiff(40000),
@@ -143,6 +144,7 @@ function eventStartLevel()
templates: [cocybag, npcybf, npcybr]
},
"COCyborgFactoryR": {
assembly: "COCyborgFactoryRAssembly",
order: CAM_ORDER_ATTACK,
groupSize: 5,
throttle: camChangeOnDiff(40000),
@@ -149,6 +149,7 @@ function eventStartLevel()
with (camTemplates) camSetFactories({
"COCyborgFactory-Arti": {
assembly: "COCyborgFactory-ArtiAssembly",
order: CAM_ORDER_ATTACK,
groupSize: 4,
throttle: camChangeOnDiff(40000),
@@ -160,7 +161,7 @@ function eventStartLevel()
templates: [npcybc, npcybf, cocybag, npcybr]
},
"COCyborgFactory-b1": {
assembly: camMakePos("base1CybAssembly"),
assembly: "COCyborgFactory-b1Assembly",
order: CAM_ORDER_ATTACK,
groupSize: 6,
throttle: camChangeOnDiff(50000),
@@ -172,6 +173,7 @@ function eventStartLevel()
templates: [cocybag, npcybr]
},
"COCyborgFactory-b2": {
assembly: "COCyborgFactory-b2Assembly",
order: CAM_ORDER_ATTACK,
groupSize: 4,
throttle: camChangeOnDiff(50000),
@@ -183,6 +185,7 @@ function eventStartLevel()
templates: [npcybc, npcybf]
},
"COHeavyFactory-b2L": {
assembly: "COHeavyFactory-b2LAssembly",
order: CAM_ORDER_ATTACK,
groupSize: 4,
throttle: camChangeOnDiff(80000),
@@ -194,6 +197,7 @@ function eventStartLevel()
templates: [cohact, comhpv, comrotm]
},
"COHeavyFactory-b2R": {
assembly: "COHeavyFactory-b2RAssembly",
order: CAM_ORDER_ATTACK,
groupSize: 5,
throttle: camChangeOnDiff(60000),
@@ -205,6 +209,7 @@ function eventStartLevel()
templates: [comrotm, comhltat, cohact, comsensh]
},
"COMediumFactory": {
assembly: "COMediumFactoryAssembly",
order: CAM_ORDER_ATTACK,
groupSize: 4,
throttle: camChangeOnDiff(45000),
@@ -221,7 +226,7 @@ function eventStartLevel()
truckDefense();
hackAddMessage("C26_OBJ1", PROX_MSG, CAM_HUMAN_PLAYER, true);
queue("enableReinforcements", 20000);
queue("enableReinforcements", 27000);
queue("northWestAttack", 120000);
queue("mainBaseAttackGroup", 180000);
queue("enableTimeBasedFactories", camChangeOnDiff(600000)); // 10 min
@@ -142,7 +142,7 @@ function eventStartLevel()
with (camTemplates) camSetFactories({
"COHeavyFac-Arti-b2": {
assembly: camMakePos("base2HeavyAssembly"),
assembly: "base2HeavyAssembly",
order: CAM_ORDER_ATTACK,
groupSize: 5,
throttle: camChangeOnDiff(60000),
@@ -154,7 +154,7 @@ function eventStartLevel()
templates: [comagt, cohact, cohhpv, comtath]
},
"COCyborgFac-b2": {
assembly: camMakePos("base2CybAssembly"),
assembly: "base2CybAssembly",
order: CAM_ORDER_ATTACK,
groupSize: 4,
throttle: camChangeOnDiff(40000),
@@ -166,6 +166,7 @@ function eventStartLevel()
templates: [npcybc, cocybag]
},
"COCyborgFac-b3": {
assembly: "base3CybAssembly",
order: CAM_ORDER_ATTACK,
groupSize: 4,
throttle: camChangeOnDiff(40000),
@@ -177,6 +178,7 @@ function eventStartLevel()
templates: [npcybf, npcybr]
},
"COHeavyFac-b4": {
assembly: "base4HeavyAssembly",
order: CAM_ORDER_ATTACK,
groupSize: 4,
throttle: camChangeOnDiff(80000),
@@ -188,6 +190,7 @@ function eventStartLevel()
templates: [comrotmh, comhltat, cohct]
},
"COCyborgFac-b4": {
assembly: "base4CybAssembly",
order: CAM_ORDER_ATTACK,
groupSize: 4,
throttle: camChangeOnDiff(50000),
@@ -199,7 +202,7 @@ function eventStartLevel()
templates: [cocybag, npcybc, npcybr]
},
"COVtolFactory-b4": {
assembly: camMakePos("base4VTOLAssembly"),
assembly: "base4VTOLAssembly",
order: CAM_ORDER_ATTACK,
groupSize: 5,
throttle: camChangeOnDiff(70000),
@@ -44,7 +44,7 @@ function cyborgPatrol()
camMakePos("NWTankPos2"),
camMakePos("NWTankPos3"),
],
//fallback: camMakePos("cyborgAssembly-b1"),
//fallback: camMakePos("COCyborgFac-b1Assembly"),
//morale: 50,
interval: 45000,
regroup: false,
@@ -56,7 +56,7 @@ function cyborgPatrol()
camMakePos("WCybPos2"),
camMakePos("WCybPos3"),
],
//fallback: camMakePos("heavyAssembly-b2"),
//fallback: camMakePos("COHeavyFacR-b2Assembly"),
//morale: 90,
interval: 30000,
regroup: false,
@@ -129,7 +129,7 @@ function eventStartLevel()
with (camTemplates) camSetFactories({
"COCyborgFac-b1": {
assembly: camMakePos("cyborgAssembly-b1"),
assembly: "COCyborgFac-b1Assembly",
order: CAM_ORDER_ATTACK,
groupSize: 5,
throttle: camChangeOnDiff(40000),
@@ -141,6 +141,7 @@ function eventStartLevel()
templates: [cocybag, npcybr, npcybf, npcybc]
},
"COHeavyFacL-b2": {
assembly: "COHeavyFacL-b2Assembly",
order: CAM_ORDER_ATTACK,
groupSize: 5,
throttle: camChangeOnDiff(80000),
@@ -152,7 +153,7 @@ function eventStartLevel()
templates: [comhpv, cohact]
},
"COHeavyFacR-b2": {
assembly: camMakePos("heavyAssembly-b2"),
assembly: "COHeavyFacR-b2Assembly",
order: CAM_ORDER_ATTACK,
groupSize: 5,
throttle: camChangeOnDiff(80000),
@@ -158,6 +158,7 @@ function eventStartLevel()
with (camTemplates) camSetFactories({
"COHeavyFacL-b1": {
assembly: "COHeavyFacL-b1Assembly",
order: CAM_ORDER_ATTACK,
groupSize: 5,
throttle: camChangeOnDiff(70000),
@@ -169,6 +170,7 @@ function eventStartLevel()
templates: [comatt, cohct, comct]
},
"COHeavyFacR-b1": {
assembly: "COHeavyFacR-b1Assembly",
order: CAM_ORDER_ATTACK,
groupSize: 5,
throttle: camChangeOnDiff(60000),
@@ -180,6 +182,7 @@ function eventStartLevel()
templates: [comatt, cohct, comct]
},
"COCybFacL-b2": {
assembly: "COCybFacL-b2Assembly",
order: CAM_ORDER_ATTACK,
groupSize: 4,
throttle: camChangeOnDiff(30000),
@@ -191,6 +194,7 @@ function eventStartLevel()
templates: [npcybc, npcybr]
},
"COCybFacR-b2": {
assembly: "COCybFacR-b2Assembly",
order: CAM_ORDER_ATTACK,
groupSize: 4,
throttle: camChangeOnDiff(40000),
@@ -202,6 +206,7 @@ function eventStartLevel()
templates: [npcybc, npcybr, npcybf, npcybm]
},
"COHeavyFac-b4": {
assembly: "COHeavyFac-b4Assembly",
order: CAM_ORDER_ATTACK,
groupSize: 4,
throttle: camChangeOnDiff(50000),
@@ -213,6 +218,7 @@ function eventStartLevel()
templates: [comatt, comit]
},
"COCybFac-b4": {
assembly: "COCybFac-b4Assembly",
order: CAM_ORDER_ATTACK,
groupSize: 4,
throttle: camChangeOnDiff(40000),
@@ -320,6 +320,7 @@ function eventStartLevel()
with (camTemplates) camSetFactories({
"COHeavyFac-Upgrade": {
assembly: "COHeavyFac-UpgradeAssembly",
order: CAM_ORDER_ATTACK,
groupSize: 4,
throttle: camChangeOnDiff(60000),
@@ -331,6 +332,7 @@ function eventStartLevel()
templates: [comit, cohct, comhpv, cohbbt]
},
"COHeavyFac-Leopard": {
assembly: "COHeavyFac-LeopardAssembly",
order: CAM_ORDER_ATTACK,
groupSize: 4,
throttle: camChangeOnDiff(60000),
@@ -342,6 +344,7 @@ function eventStartLevel()
templates: [comit, cohct, comhpv, cohbbt]
},
"COCyborgFactoryL": {
assembly: "COCyborgFactoryLAssembly",
order: CAM_ORDER_ATTACK,
groupSize: 4,
throttle: camChangeOnDiff(40000),
@@ -353,6 +356,7 @@ function eventStartLevel()
templates: [npcybf, npcybc, npcybr]
},
"COCyborgFactoryR": {
assembly: "COCyborgFactoryRAssembly",
order: CAM_ORDER_ATTACK,
groupSize: 4,
throttle: camChangeOnDiff(40000),
@@ -132,6 +132,7 @@ function eventStartLevel()
with (camTemplates) camSetFactories({
"COHeavyFactory": {
assembly: "COHeavyFactoryAssembly",
order: CAM_ORDER_ATTACK,
groupSize: 5,
throttle: camChangeOnDiff(80000),
@@ -143,6 +144,7 @@ function eventStartLevel()
templates: [cohhpv, comhltat, cohct]
},
"COSouthCyborgFactory": {
assembly: "COSouthCyborgFactoryAssembly",
order: CAM_ORDER_ATTACK,
groupSize: 5,
throttle: camChangeOnDiff(40000),
@@ -162,6 +164,6 @@ function eventStartLevel()
camEnableFactory("COHeavyFactory");
camEnableFactory("COSouthCyborgFactory");
queue("enableReinforcements", 20000);
queue("enableReinforcements", 22000);
queue("vtolAttack", 60000);
}
Oops, something went wrong.

0 comments on commit 88ad402

Please sign in to comment.