diff --git a/data/base/multiplay/skirmish/nexus.vlo b/data/base/multiplay/skirmish/nexus.vlo index 4f905cda1eb..f96e7c0950a 100644 --- a/data/base/multiplay/skirmish/nexus.vlo +++ b/data/base/multiplay/skirmish/nexus.vlo @@ -69,7 +69,7 @@ run tech[0][5] RESEARCHSTAT "R-Defense-Pillbox06" //lancer bunker //other tech: R-Vehicle-Prop-VTOL, R-Struc-VTOLPad, R-Struc-VTOLFactory - techCount[1] int 27 + techCount[1] int 19 //how many res facilities to use when finished researching all specified research topics maxIdleRes[1] int 3 @@ -77,38 +77,26 @@ run tech[1][0] RESEARCHSTAT "R-Struc-VTOLFactory" tech[1][1] RESEARCHSTAT "R-Struc-VTOLPad" tech[1][2] RESEARCHSTAT "R-Wpn-MG3Mk1" //HMG - tech[1][3] RESEARCHSTAT "R-Cyborg-Wpn-MG" //Machine gunner - tech[1][4] RESEARCHSTAT "R-Wpn-Rocket02-MRL" //mini rocket artillery - tech[1][5] RESEARCHSTAT "R-Wpn-Rocket-ROF03" + tech[1][3] RESEARCHSTAT "R-Wpn-Rocket02-MRL" //mini rocket artillery + tech[1][4] RESEARCHSTAT "R-Wpn-Rocket-ROF03" - tech[1][6] RESEARCHSTAT "R-Cyborg-Sys-Mechanic" //mechanic - tech[1][7] RESEARCHSTAT "R-Cyborg-Sys-ComEng" //cyb engineer - tech[1][8] RESEARCHSTAT "R-Cyborg-Wpn-Flamer" //flamer - tech[1][9] RESEARCHSTAT "R-Wpn-Flamer-Damage03" //flamer damage 03 - tech[1][10] RESEARCHSTAT "R-Wpn-Flamer-ROF03" //flamer ROF 03 + tech[1][5] RESEARCHSTAT "R-Wpn-Flamer-Damage03" //flamer damage 03 + tech[1][6] RESEARCHSTAT "R-Wpn-Flamer-ROF03" //flamer ROF 03 - tech[1][11] RESEARCHSTAT "R-Cyborg-Wpn-Cannon" //heavy gunner - tech[1][12] RESEARCHSTAT "R-Wpn-Rocket01-LtAT" //Lancer - tech[1][13] RESEARCHSTAT "R-Cyborg-Wpn-Rocket" //Cyborg Lancer - tech[1][14] RESEARCHSTAT "R-Vehicle-Body08" //Scorpion body - tech[1][15] RESEARCHSTAT "R-Struc-Power-Upgrade03a" //power upgrade 03a - tech[1][16] RESEARCHSTAT "R-Wpn-RocketSlow-Accuracy03" //lancer accuracy - tech[1][17] RESEARCHSTAT "R-Wpn-RocketSlow-Damage06" //lancer damage 06 (all 6 can be researched at once) + tech[1][7] RESEARCHSTAT "R-Wpn-Rocket01-LtAT" //Lancer + tech[1][8] RESEARCHSTAT "R-Vehicle-Body08" //Scorpion body + tech[1][9] RESEARCHSTAT "R-Struc-Power-Upgrade03a" //power upgrade 03a + tech[1][10] RESEARCHSTAT "R-Wpn-Missile-Accuracy02" //lancer accuracy + tech[1][11] RESEARCHSTAT "R-Wpn-Missile-Damage03" //lancer damage - tech[1][18] RESEARCHSTAT "R-Cyborg-Wpn-RotMG-Grd" //assault gunner - - - tech[1][19] RESEARCHSTAT "R-Wpn-Rocket03-HvAT" //BB - tech[1][20] RESEARCHSTAT "R-Cyborg-Wpn-Rail1-Grd" //needle gunner - tech[1][21] RESEARCHSTAT "R-Struc-VTOLPad-Upgrade06" - tech[1][22] RESEARCHSTAT "R-Struc-VTOLFactory-Upgrade06" - tech[1][23] RESEARCHSTAT "R-Sys-Autorepair-General" //autorepair - tech[1][24] RESEARCHSTAT "R-Sys-Sensor-UpLink" - tech[1][25] RESEARCHSTAT "R-Sys-VTOLCBS-Turret01" - tech[1][26] RESEARCHSTAT "R-Sys-VTOLStrike-Tower01" - - //tech[1][5] RESEARCHSTAT "R-Vehicle-Body04" // Bug body + tech[1][12] RESEARCHSTAT "R-Wpn-Rocket03-HvAT" //BB + tech[1][13] RESEARCHSTAT "R-Struc-VTOLPad-Upgrade06" + tech[1][14] RESEARCHSTAT "R-Struc-Factory-Upgrade04" + tech[1][15] RESEARCHSTAT "R-Sys-Autorepair-General" //autorepair + tech[1][16] RESEARCHSTAT "R-Sys-Sensor-UpLink" + tech[1][17] RESEARCHSTAT "R-Sys-VTOLCBS-Turret01" + tech[1][18] RESEARCHSTAT "R-Sys-VTOLStrike-Tower01" maxVtolFacs[0] int 1 maxVtolFacs[1] int 4 diff --git a/data/base/multiplay/skirmish/rules.js b/data/base/multiplay/skirmish/rules.js index ad44e8143d2..afce6ec0b7b 100644 --- a/data/base/multiplay/skirmish/rules.js +++ b/data/base/multiplay/skirmish/rules.js @@ -52,20 +52,18 @@ function eventGameInit() } applyLimitSet(); // set limit options - const numCleanTech = 5; // do x for clean - const numBaseTech = 20; // do x for base + const numCleanTech = 4; // do x for clean + const numBaseTech = 18; // do x for base var techlist = new Array( "R-Vehicle-Prop-Wheels", "R-Sys-Spade1Mk1", "R-Vehicle-Body01", "R-Comp-SynapticLink", - "R-Cyborg-Legs01", "R-Wpn-MG1Mk1", "R-Defense-HardcreteWall", "R-Vehicle-Prop-Wheels", "R-Sys-Spade1Mk1", "R-Struc-Factory-Cyborg", - "R-Cyborg-Wpn-MG", "R-Defense-Pillbox01", "R-Defense-Tower01", "R-Vehicle-Body01", @@ -82,8 +80,6 @@ function eventGameInit() "R-Struc-RepairFacility", "R-Sys-MobileRepairTurret01", "R-Vehicle-Engine01", - "R-Cyborg-Wpn-Cannon", - "R-Cyborg-Wpn-Flamer", "R-Wpn-MG3Mk1", "R-Wpn-Cannon1Mk1", "R-Wpn-Mortar01Lt", diff --git a/data/base/multiplay/skirmish/semperfi.js b/data/base/multiplay/skirmish/semperfi.js index 3ee6ac94165..5efc4f31e38 100644 --- a/data/base/multiplay/skirmish/semperfi.js +++ b/data/base/multiplay/skirmish/semperfi.js @@ -280,7 +280,7 @@ function eventResearched(tech, labparam) if (!found) { // Look for missile tech (and test string parameter) - found = pursueResearch(lab, "R-Wpn-Missile-Accuracy02"); + found = pursueResearch(lab, "R-Wpn-MdArtMissile"); if (!found) { // Find a random research item diff --git a/data/base/multiplay/skirmish/semperfi.vlo b/data/base/multiplay/skirmish/semperfi.vlo index 4f0061fd52a..2a9f61597d3 100644 --- a/data/base/multiplay/skirmish/semperfi.vlo +++ b/data/base/multiplay/skirmish/semperfi.vlo @@ -95,7 +95,7 @@ run tech[1][11] RESEARCHSTAT "R-Vehicle-Body07" //retribution body tech[1][12] RESEARCHSTAT "R-Vehicle-Metals09" //vtol armor tech[1][13] RESEARCHSTAT "R-Struc-VTOLPad-Upgrade06" //rearm - tech[1][14] RESEARCHSTAT "R-Struc-VTOLFactory-Upgrade06" //production + tech[1][14] RESEARCHSTAT "R-Struc-Factory-Upgrade04" //production tech[1][15] RESEARCHSTAT "R-Struc-Power-Upgrade03a" //power upgrade 03a tech[1][16] RESEARCHSTAT "R-Sys-Autorepair-General" //autorepair tech[1][17] RESEARCHSTAT "R-Vehicle-Engine09" //finally - speed diff --git a/data/mp/stats/research/multiplayer/redstructure.txt b/data/mp/stats/research/multiplayer/redstructure.txt index 5bb0c7dce2c..1cb6f440f5a 100644 --- a/data/mp/stats/research/multiplayer/redstructure.txt +++ b/data/mp/stats/research/multiplayer/redstructure.txt @@ -9,7 +9,6 @@ R-Defense-HvyArtMissile,Emplacement-MortarPit02,282 R-Defense-HvyFlamer,PillBox5,158 R-Defense-HvyMor,Emplacement-MortarPit01,142 R-Defense-MdArtMissile,Emplacement-MRL-pit,263 -R-Defense-Pillbox-RotMG,PillBox1,126 R-Defense-PlasmiteFlamer,WallTower-Projector,184 R-Defense-PlasmiteFlamer,Tower-Projector,183 R-Defense-RotHow,Emplacement-Howitzer105,134 diff --git a/data/mp/stats/research/multiplayer/research.txt b/data/mp/stats/research/multiplayer/research.txt index bf009960c67..d97e56f1d62 100644 --- a/data/mp/stats/research/multiplayer/research.txt +++ b/data/mp/stats/research/multiplayer/research.txt @@ -1,8 +1,4 @@ Research ID,unused,Subgroup icon,Major tech,Main icon,IMD,IMD2,MsgName,StructName,CompName,CompType,ResearchPoints,keyTopic,unused,unused,unused,unused,unused,unused,unused -R-Cyborg-Wpn-Thermite,Level Two,0,0,IMAGE_RES_CYBORGTECH,0,0,RES_CYW_TFL,0,Flame2,WEAPON,900,0,0,0,0,0,0,0,0 -R-Cyborg-Wpn-Grenade,Level Two,0,0,IMAGE_RES_CYBORGTECH,0,0,RES_CYW_GRN,0,Mortar1Mk1,WEAPON,900,0,0,0,0,0,0,0,0 -R-Cyborg-Sys-ComEng,Level One,0,0,IMAGE_RES_CYBORGTECH,0,0,RES_CYS_CEN,0,Spade1Mk1,CONSTRUCT,600,0,0,0,0,0,0,0,0 -R-Cyborg-Sys-Mechanic,Level One,0,0,IMAGE_RES_CYBORGTECH,0,0,RES_CYS_MCH,0,LightRepair1,REPAIR,600,0,0,0,0,0,0,0,0 R-Wpn-Howitzer-Incenediary,Level Two-Three,0,0,IMAGE_RES_WEAPONTECH,0,0,RES_W_INH,0,Howitzer-Incenediary,WEAPON,12000,1,3,0,0,0,0,0,1 R-Defense-Howitzer-Incenediary,Level Two-Three,0,0,IMAGE_RES_DEFENCE,0,0,RES_EMP_INH,Emplacement-Howitzer-Incenediary,0,0,4800,0,2,0,1,0,1,0,0 R-Wpn-Plasmite-Flamer,Level Three,0,0,IMAGE_RES_WEAPONTECH,0,0,RES_PLFL,0,PlasmiteFlamer,WEAPON,7200,1,2,0,0,0,0,1,1 @@ -62,7 +58,6 @@ R-Wpn-Cannon3Mk1,Level One,0,0,IMAGE_RES_WEAPONTECH,0,0,RES_CN3MK1,0,Cannon375mm R-Wpn-Rocket06-IDF,Level Two,0,0,IMAGE_RES_WEAPONTECH,0,0,RES_W_RK_IDF,0,Rocket-IDF,WEAPON,7200,1,2,0,0,0,0,0,1 R-Wpn-HowitzerMk1,Level Two,0,0,IMAGE_RES_WEAPONTECH,0,0,RES_W_HMK1,0,Howitzer105Mk1,WEAPON,9000,1,2,0,0,0,0,0,1 R-Struc-Factory-Cyborg,Level One,0,0,IMAGE_RES_STRUCTURETECH,0,0,RES_ST_FCY1,A0CyborgFactory,0,0,1800,0,1,0,0,0,1,0,0 -R-Cyborg-Wpn-MG,Level One,0,0,IMAGE_RES_CYBORGTECH,0,0,RES_CYW_MG1,0,MG1Mk1,WEAPON,600,0,0,0,0,0,0,0,0 R-Wpn-MG-Damage01,Level One,IMAGE_RES_GRPDAM,0,IMAGE_RES_WEAPONTECH,0,0,RES_W_MG_D1,0,MG1Mk1,WEAPON,600,1,1,1,0,0,0,0,0 R-Wpn-MG-ROF01,Level One-Two,IMAGE_RES_GRPROF,0,IMAGE_RES_WEAPONTECH,0,0,RES_W_MG_ROF1,0,MG1Mk1,WEAPON,3600,0,2,1,0,0,0,0,0 R-Wpn-MG-Damage02,Level One,IMAGE_RES_GRPDAM,0,IMAGE_RES_WEAPONTECH,0,0,RES_W_MG_D2,0,MG1Mk1,WEAPON,1200,0,1,1,0,0,0,0,0 @@ -98,9 +93,6 @@ R-Defense-Tower06,Level One,0,0,IMAGE_RES_DEFENCE,0,0,RES_EMP_PODTOW,GuardTower6 R-Defense-Pillbox01,Level One,0,0,IMAGE_RES_DEFENCE,0,0,RES_DF_P1,PillBox1,0,0,1200,0,2,0,1,0,1,0,0 R-Defense-Pillbox04,Level One,0,0,IMAGE_RES_DEFENCE,0,0,RES_PB_LC,PillBox4,0,0,1500,0,2,0,1,0,1,0,0 R-Defense-Pillbox05,Level One,0,0,IMAGE_RES_DEFENCE,0,0,RES_PB_FL,PillBox5,0,0,1500,0,2,0,1,0,1,0,0 -R-Cyborg-Wpn-Flamer,Level One,0,0,IMAGE_RES_CYBORGTECH,0,0,RES_CYW_FL1,0,Flame1Mk1,WEAPON,900,0,0,0,0,0,0,0,0 -R-Cyborg-Wpn-Cannon,Level One,0,0,IMAGE_RES_CYBORGTECH,0,0,RES_CYW_CN1,0,Cannon1Mk1,WEAPON,1500,0,0,0,0,0,0,0,0 -R-Cyborg-Wpn-Rocket,Level One,0,0,IMAGE_RES_CYBORGTECH,0,0,RES_CYW_RK1,0,Rocket-LtA-T,WEAPON,900,0,0,0,0,0,0,0,0 R-Sys-MobileRepairTurret01,Level All,0,0,IMAGE_RES_SYSTEMTECH,0,0,RES_REPTU1,0,LightRepair1,REPAIR,600,0,1,0,0,0,0,0,2 R-Defense-WallUpgrade02,Level One-Two,IMAGE_RES_GRPUPG,1,IMAGE_RES_DEFENCE,BLWALLH.PIE,0,0,0,0,0,2400,0,1,1,0,0,0,0,0 R-Defense-WallUpgrade03,Level One-Two,IMAGE_RES_GRPUPG,1,IMAGE_RES_DEFENCE,BLWALLH.PIE,0,0,0,0,0,3600,0,1,1,0,0,0,0,0 @@ -114,8 +106,6 @@ R-Struc-Research-Upgrade01,Level One,IMAGE_RES_GRPUPG,0,IMAGE_RES_COMPUTERTECH,b R-Struc-Research-Upgrade02,Level One,IMAGE_RES_GRPUPG,1,IMAGE_RES_COMPUTERTECH,blresch4.PIE,0,0,0,0,0,2400,0,1,1,0,0,0,0,0 R-Struc-Research-Upgrade03,Level One-Two,IMAGE_RES_GRPUPG,1,IMAGE_RES_COMPUTERTECH,blresch4.PIE,0,0,0,0,0,3600,0,1,1,0,0,0,0,0 R-Struc-Factory-Upgrade01,Level One,IMAGE_RES_GRPUPG,0,IMAGE_RES_STRUCTURETECH,BLFACT1.PIE,0,RES_ST_FU1,0,0,0,2400,1,1,3,0,0,0,0,0 -R-Struc-Factory-Upgrade02,Level One,IMAGE_RES_GRPUPG,1,IMAGE_RES_STRUCTURETECH,BLFACT1.PIE,0,0,0,0,0,4800,0,0,0,0,0,0,0,0 -R-Struc-Factory-Upgrade03,Level One-Two,IMAGE_RES_GRPUPG,1,IMAGE_RES_STRUCTURETECH,BLFACT1.PIE,0,0,0,0,0,7200,0,0,0,0,0,0,0,0 R-Cyborg-Metals01,Level One,IMAGE_RES_GRPUPG,0,IMAGE_RES_CYBORGTECH,icmolql.pie,0,RES_CYMET1,0,0,0,1200,0,2,1,0,0,0,0,0 R-Cyborg-Metals02,Level One,IMAGE_RES_GRPUPG,1,IMAGE_RES_CYBORGTECH,icmolql.pie,0,0,0,0,0,2400,0,1,1,0,0,0,0,0 R-Cyborg-Metals03,Level One-Two,IMAGE_RES_GRPUPG,1,IMAGE_RES_CYBORGTECH,icmolql.pie,0,0,0,0,0,3600,0,1,1,0,0,0,0,0 @@ -130,8 +120,6 @@ R-Wpn-HvyHowitzer,Level Two,0,0,IMAGE_RES_WEAPONTECH,0,0,RES_W_HH1,0,Howitzer150 R-Vehicle-Prop-Wheels,Level One,0,0,IMAGE_RES_DROIDTECH,0,0,RES_V_P_W1,0,wheeled01,PROPULSION,1200,0,1,0,0,0,0,0,1 R-Sys-Spade1Mk1,Level One,0,1,IMAGE_RES_SYSTEMTECH,0,0,0,0,Spade1Mk1,CONSTRUCT,10,1,1,0,0,0,0,0,1 R-Struc-RprFac-Upgrade01,Level One,IMAGE_RES_GRPUPG,0,IMAGE_RES_SYSTEMTECH,0,0,RES_ST_RFU1,A0RepairCentre3,0,0,2400,0,2,1,0,0,0,0,0 -R-Struc-RprFac-Upgrade02,Level One,IMAGE_RES_GRPUPG,1,IMAGE_RES_SYSTEMTECH,0,0,0,A0RepairCentre3,0,0,3600,0,0,0,0,0,0,0,0 -R-Struc-RprFac-Upgrade03,Level One-Two,IMAGE_RES_GRPUPG,1,IMAGE_RES_SYSTEMTECH,0,0,0,A0RepairCentre3,0,0,4800,0,0,0,0,0,0,0,0 R-Vehicle-Prop-VTOL,Level All,0,0,IMAGE_RES_DROIDTECH,DPVTOL.PIE,0,RES_V_P_V1,0,0,BODY,6000,1,3,0,0,0,0,0,1 R-Struc-VTOLPad,Level Two,0,0,IMAGE_RES_STRUCTURETECH,0,0,RES_ST_VP,A0VtolPad,0,0,3600,0,2,0,0,0,1,0,0 R-Struc-VTOLFactory,Level Two,0,0,IMAGE_RES_STRUCTURETECH,0,0,RES_ST_VF,A0VTolFactory1,0,0,6000,0,1,0,0,0,1,0,0 @@ -161,7 +149,6 @@ R-Defense-Howitzer,Level Two,0,0,IMAGE_RES_DEFENCE,0,0,RES_EMP_HOW,Emplacement-H R-Defense-MortarPit,Level One-Two,0,0,IMAGE_RES_DEFENCE,0,0,RES_EMP_Mpit,Emplacement-MortarPit01,0,0,1200,0,2,0,1,0,1,0,0 R-Defense-Wall-RotMg,Level Two,0,0,IMAGE_RES_DEFENCE,0,0,RES_WT7_RMG,Wall-RotMg,0,0,4800,0,2,0,1,1,1,0,0 R-Defense-Wall-VulcanCan,Level Two,0,0,IMAGE_RES_DEFENCE,0,0,RES_WT8_RC,Wall-VulcanCan,0,0,4800,0,1,0,1,1,1,0,0 -R-Defense-WallTower-HvyFlamer,Level Two,0,0,IMAGE_RES_DEFENCE,0,0,RES_WT11_HFL,WallTower-Projector,0,0,3600,0,0,0,1,0,0,0,0 R-Defense-WallTower-PulseLas,Level Three,0,0,IMAGE_RES_DEFENCE,0,0,RES_WT14_PLS,WallTower-PulseLas,0,0,14400,0,1,0,1,0,1,0,0 R-Defense-WallTower-Rail2,Level Three,0,0,IMAGE_RES_DEFENCE,0,0,RES_WT15_RL2,WallTower-Rail2,0,0,14400,0,1,0,1,0,1,0,0 R-Cyborg-Metals04,Level Two,IMAGE_RES_GRPUPG,0,IMAGE_RES_CYBORGTECH,icmolql.pie,0,RES_CYMET4,0,0,0,5600,0,2,1,0,0,0,0,0 @@ -190,11 +177,6 @@ R-Wpn-Cannon-ROF06,Level Three,IMAGE_RES_GRPROF,1,IMAGE_RES_WEAPONTECH,0,0,0,0,C R-Wpn-Cannon-Accuracy02,Level All,IMAGE_RES_GRPACC,0,IMAGE_RES_WEAPONTECH,0,0,RES_W_CNAC2,0,Cannon1Mk1,WEAPON,4800,1,2,1,0,0,0,0,0 R-Sys-Sensor-Tower02,Level Two,0,0,IMAGE_RES_SYSTEMTECH,0,0,RES_SY_STW2,Sys-SensoTower02,0,0,1200,1,2,0,0,1,1,0,0 R-Wpn-Rocket07-Tank-Killer,Level Two-Three,0,0,IMAGE_RES_WEAPONTECH,0,0,RES_W_RK_HvAT,0,Rocket-HvyA-T,WEAPON,10000,1,2,0,0,0,0,0,2 -R-Cyborg-Legs01,Level One-Two,0,1,IMAGE_RES_CYBORGTECH,0,0,0,0,CyborgLegs,PROPULSION,7200,0,0,0,0,0,0,0,1 -R-Cyborg-Wpn-RotMG-Grd,Level Two,0,0,IMAGE_RES_CYBORGTECH,0,0,RES_CYW_MG4,0,MG4ROTARYMk1,WEAPON,3000,0,0,0,0,0,0,0,0 -R-Cyborg-Wpn-Rail1-Grd,Level Three,0,0,IMAGE_RES_CYBORGTECH,0,0,RES_CYW_RL1,0,RailGun1Mk1,WEAPON,3500,0,0,0,0,0,0,0,0 -R-Cyborg-Wpn-ATMiss-Grd,Level Three,0,0,IMAGE_RES_CYBORGTECH,0,0,RES_CYW_ATM,0,Missile-A-T,WEAPON,3500,0,0,0,0,0,0,0,0 -R-Cyborg-Wpn-Laser1-Grd,Level Three,0,0,IMAGE_RES_CYBORGTECH,0,0,RES_CYW_LS1,0,Laser2PULSEMk1,WEAPON,3500,0,0,0,0,0,0,0,0 R-Defense-Sunburst,Level All,0,1,IMAGE_RES_DEFENCE,0,0,0,P0-AASite-Sunburst,0,PROPULSION,1800,0,1,0,1,0,1,0,0 R-Defense-HvyFlamer,Level Two,0,0,IMAGE_RES_DEFENCE,0,0,RES_EMP_HVFL,Tower-Projector,0,0,4000,0,1,0,1,1,1,0,0 R-Defense-SamSite1,Level Three,0,0,IMAGE_RES_DEFENCE,0,0,RES_EMP_SAM1,P0-AASite-SAM1,0,0,14400,0,1,0,1,0,1,0,0 @@ -202,7 +184,6 @@ R-Defense-SamSite2,Level Three,0,0,IMAGE_RES_DEFENCE,0,0,RES_EMP_SAM2,P0-AASite- R-Defense-HvyHowitzer,Level Two,0,0,IMAGE_RES_DEFENCE,0,0,RES_EMP_HvHOW,Emplacement-Howitzer105,0,0,6000,0,2,0,1,0,1,0,0 R-Defense-MRL,Level One-Two,0,0,IMAGE_RES_DEFENCE,0,0,RES_EMP_MRL,Emplacement-MRL-pit,0,0,1200,0,2,0,1,0,1,0,0 R-Defense-RotMG,Level Two,0,0,IMAGE_RES_DEFENCE,0,0,RES_DEF_RotMG,Pillbox-RotMG,0,0,4800,0,1,0,1,1,1,0,0 -R-Defense-RotCannon,Level Two,0,0,IMAGE_RES_DEFENCE,0,0,RES_EMP_RotCan,Wall-VulcanCan,0,0,6000,0,0,0,1,0,1,0,0 R-Defense-HvyMor,Level Two,0,0,IMAGE_RES_DEFENCE,0,0,RES_EMP_HvyMor,Emplacement-MortarPit01,0,0,3600,0,2,0,1,1,1,0,0 R-Defense-IDFRocket,Level Two,0,0,IMAGE_RES_DEFENCE,0,0,RES_EMP_IDFR,Emplacement-Rocket06-IDF,0,0,4800,0,2,0,1,0,1,0,0 R-Defense-HvyA-Trocket,Level Three,0,0,IMAGE_RES_DEFENCE,0,0,RES_EMP_HVATR,Emplacement-HvyATrocket,0,0,4800,0,1,0,1,0,1,0,0 @@ -222,20 +203,6 @@ R-Defense-WallUpgrade07,Level Three,IMAGE_RES_GRPUPG,0,IMAGE_RES_DEFENCE,BLWALLH R-Defense-WallUpgrade08,Level Three,IMAGE_RES_GRPUPG,1,IMAGE_RES_DEFENCE,BLWALLH.PIE,0,0,0,0,0,14000,0,1,1,0,0,0,0,0 R-Defense-WallUpgrade09,Level Three,IMAGE_RES_GRPUPG,1,IMAGE_RES_DEFENCE,BLWALLH.PIE,0,0,0,0,0,16000,0,1,1,0,0,0,0,0 R-Struc-Factory-Upgrade04,Level Two,IMAGE_RES_GRPUPG,0,IMAGE_RES_STRUCTURETECH,BLFACT1.PIE,0,RES_ST_FU4,0,0,0,9200,1,2,3,0,0,0,0,0 -R-Struc-Factory-Upgrade05,Level Two,IMAGE_RES_GRPUPG,1,IMAGE_RES_STRUCTURETECH,BLFACT1.PIE,0,0,0,0,0,11200,0,0,0,0,0,0,0,0 -R-Struc-Factory-Upgrade06,Level Two-Three,IMAGE_RES_GRPUPG,1,IMAGE_RES_STRUCTURETECH,BLFACT1.PIE,0,0,0,0,0,13200,0,0,0,0,0,0,0,0 -R-Struc-Factory-Cyborg-Upgrade01,Level One,IMAGE_RES_GRPUPG,0,IMAGE_RES_STRUCTURETECH,blcfact1.pie,0,RES_ST_FCY01,0,0,0,2400,1,0,0,0,0,0,0,0 -R-Struc-Factory-Cyborg-Upgrade02,Level One,IMAGE_RES_GRPUPG,1,IMAGE_RES_STRUCTURETECH,blcfact1.pie,0,0,0,0,0,4800,0,0,0,0,0,0,0,0 -R-Struc-Factory-Cyborg-Upgrade03,Level One-Two,IMAGE_RES_GRPUPG,1,IMAGE_RES_STRUCTURETECH,blcfact1.pie,0,0,0,0,0,7200,0,0,0,0,0,0,0,0 -R-Struc-Factory-Cyborg-Upgrade04,Level Two,IMAGE_RES_GRPUPG,0,IMAGE_RES_STRUCTURETECH,blcfact1.pie,0,RES_ST_FCY4,0,0,0,9200,1,0,0,0,0,0,0,0 -R-Struc-Factory-Cyborg-Upgrade05,Level Two,IMAGE_RES_GRPUPG,1,IMAGE_RES_STRUCTURETECH,blcfact1.pie,0,0,0,0,0,11200,0,0,0,0,0,0,0,0 -R-Struc-Factory-Cyborg-Upgrade06,Level Two-Three,IMAGE_RES_GRPUPG,1,IMAGE_RES_STRUCTURETECH,blcfact1.pie,0,0,0,0,0,13200,0,0,0,0,0,0,0,0 -R-Struc-VTOLFactory-Upgrade01,Level Two,IMAGE_RES_GRPUPG,0,IMAGE_RES_STRUCTURETECH,blvfact0.pie,0,RES_ST_VPU1,0,0,0,2400,1,0,0,0,0,0,0,0 -R-Struc-VTOLFactory-Upgrade02,Level Two,IMAGE_RES_GRPUPG,1,IMAGE_RES_STRUCTURETECH,blvfact0.pie,0,0,0,0,0,3600,0,0,0,0,0,0,0,0 -R-Struc-VTOLFactory-Upgrade03,Level Two-Three,IMAGE_RES_GRPUPG,1,IMAGE_RES_STRUCTURETECH,blvfact0.pie,0,0,0,0,0,4800,0,0,0,0,0,0,0,0 -R-Struc-VTOLFactory-Upgrade04,Level Three,IMAGE_RES_GRPUPG,0,IMAGE_RES_STRUCTURETECH,blvfact0.pie,0,RES_ST_VPU4,0,0,0,6000,1,0,0,0,0,0,0,0 -R-Struc-VTOLFactory-Upgrade05,Level Three,IMAGE_RES_GRPUPG,1,IMAGE_RES_STRUCTURETECH,blvfact0.pie,0,0,0,0,0,8000,0,0,0,0,0,0,0,0 -R-Struc-VTOLFactory-Upgrade06,Level Three,IMAGE_RES_GRPUPG,1,IMAGE_RES_STRUCTURETECH,blvfact0.pie,0,0,0,0,0,10000,0,0,0,0,0,0,0,0 R-Struc-VTOLPad-Upgrade01,Level Two,IMAGE_RES_GRPUPG,0,IMAGE_RES_STRUCTURETECH,0,0,RES_ST_VPU1,A0VtolPad,0,0,4800,1,1,1,0,0,0,0,0 R-Struc-VTOLPad-Upgrade02,Level Two,IMAGE_RES_GRPUPG,1,IMAGE_RES_STRUCTURETECH,0,0,0,A0VtolPad,0,0,6000,0,1,1,0,0,0,0,0 R-Struc-VTOLPad-Upgrade03,Level Two-Three,IMAGE_RES_GRPUPG,1,IMAGE_RES_STRUCTURETECH,0,0,0,A0VtolPad,0,0,8000,0,1,1,0,0,0,0,0 @@ -257,7 +224,6 @@ R-Struc-Research-Upgrade07,Level Three,IMAGE_RES_GRPUPG,0,IMAGE_RES_COMPUTERTECH R-Struc-Research-Upgrade08,Level Three,IMAGE_RES_GRPUPG,1,IMAGE_RES_COMPUTERTECH,blresch4.PIE,0,0,0,0,0,12000,0,1,1,0,0,0,0,0 R-Struc-Research-Upgrade09,Level Three,IMAGE_RES_GRPUPG,1,IMAGE_RES_COMPUTERTECH,blresch4.PIE,0,0,0,0,0,14000,0,1,1,0,0,0,0,0 R-Struc-RprFac-Upgrade04,Level Two,IMAGE_RES_GRPUPG,0,IMAGE_RES_SYSTEMTECH,0,0,RES_ST_RFU4,A0RepairCentre3,0,0,6000,0,2,1,0,0,0,0,0 -R-Struc-RprFac-Upgrade05,Level Two,IMAGE_RES_GRPUPG,1,IMAGE_RES_SYSTEMTECH,0,0,0,A0RepairCentre3,0,0,8000,0,0,0,0,0,0,0,0 R-Struc-RprFac-Upgrade06,Level Two-Three,IMAGE_RES_GRPUPG,1,IMAGE_RES_SYSTEMTECH,0,0,0,A0RepairCentre3,0,0,10000,0,2,1,0,0,0,0,0 R-Sys-Engineering02,Level Two-Three,IMAGE_RES_GRPUPG,0,IMAGE_RES_SYSTEMTECH,trlcon.pie,0,RES_ENGIN2,0,0,0,4800,1,2,1,0,0,0,0,0 R-Sys-Engineering03,Level Three,IMAGE_RES_GRPUPG,0,IMAGE_RES_SYSTEMTECH,trlcon.pie,0,RES_ENGIN3,0,0,0,9600,1,2,1,0,0,0,0,0 @@ -343,18 +309,8 @@ R-Wpn-Rocket-Damage06,Level Two-Three,IMAGE_RES_GRPDAM,1,IMAGE_RES_WEAPONTECH,0, R-Wpn-Rocket-Damage07,Level Two,IMAGE_RES_GRPDAM,0,IMAGE_RES_WEAPONTECH,0,0,RES_W_RK_D4,0,Rocket-LtA-T,WEAPON,8400,0,1,1,0,0,0,0,0 R-Wpn-Rocket-Damage08,Level Two,IMAGE_RES_GRPDAM,1,IMAGE_RES_WEAPONTECH,0,0,0,0,Rocket-LtA-T,WEAPON,9600,0,1,1,0,0,0,0,0 R-Wpn-Rocket-Damage09,Level Two-Three,IMAGE_RES_GRPDAM,1,IMAGE_RES_WEAPONTECH,0,0,0,0,Rocket-LtA-T,WEAPON,10800,0,1,1,0,0,0,0,0 -R-Wpn-RocketSlow-ROF01,Level Two,IMAGE_RES_GRPROF,0,IMAGE_RES_WEAPONTECH,0,0,RES_W_SRK_ROF1,0,Rocket-LtA-T,WEAPON,6000,0,0,0,0,0,0,0,0 -R-Wpn-RocketSlow-ROF02,Level Two,IMAGE_RES_GRPROF,1,IMAGE_RES_WEAPONTECH,0,0,0,0,Rocket-LtA-T,WEAPON,8000,0,0,0,0,0,0,0,0 -R-Wpn-RocketSlow-ROF03,Level Two-Three,IMAGE_RES_GRPROF,1,IMAGE_RES_WEAPONTECH,0,0,0,0,Rocket-LtA-T,WEAPON,10000,0,0,0,0,0,0,0,0 R-Wpn-RocketSlow-Accuracy01,Level One,IMAGE_RES_GRPACC,0,IMAGE_RES_WEAPONTECH,0,0,RES_W_SRK_AC1,0,Rocket-LtA-T,WEAPON,6000,0,1,1,0,0,0,0,0 R-Wpn-RocketSlow-Accuracy02,Level One-Two,IMAGE_RES_GRPACC,0,IMAGE_RES_WEAPONTECH,0,0,RES_W_SRK_AC2,0,Rocket-LtA-T,WEAPON,7200,0,2,1,0,0,0,0,0 -R-Wpn-RocketSlow-Accuracy03,Level All,IMAGE_RES_GRPACC,0,IMAGE_RES_WEAPONTECH,0,0,RES_W_SRK_AC3,0,Rocket-LtA-T,WEAPON,8000,0,0,0,0,0,0,0,0 -R-Wpn-RocketSlow-Damage01,Level One,IMAGE_RES_GRPDAM,0,IMAGE_RES_WEAPONTECH,0,0,RES_W_SRK_D1,0,Rocket-LtA-T,WEAPON,2400,0,0,0,0,0,0,0,0 -R-Wpn-RocketSlow-Damage02,Level One,IMAGE_RES_GRPDAM,1,IMAGE_RES_WEAPONTECH,0,0,0,0,Rocket-LtA-T,WEAPON,3600,0,0,0,0,0,0,0,0 -R-Wpn-RocketSlow-Damage03,Level One-Two,IMAGE_RES_GRPDAM,1,IMAGE_RES_WEAPONTECH,0,0,0,0,Rocket-LtA-T,WEAPON,4800,0,0,0,0,0,0,0,0 -R-Wpn-RocketSlow-Damage04,Level Two,IMAGE_RES_GRPDAM,0,IMAGE_RES_WEAPONTECH,0,0,RES_W_SRK_D4,0,Rocket-LtA-T,WEAPON,6000,0,0,0,0,0,0,0,0 -R-Wpn-RocketSlow-Damage05,Level Two,IMAGE_RES_GRPDAM,1,IMAGE_RES_WEAPONTECH,0,0,0,0,Rocket-LtA-T,WEAPON,8000,0,0,0,0,0,0,0,0 -R-Wpn-RocketSlow-Damage06,Level Two-Three,IMAGE_RES_GRPDAM,1,IMAGE_RES_WEAPONTECH,0,0,0,0,Rocket-LtA-T,WEAPON,10000,0,0,0,0,0,0,0,0 R-Defense-WallTower-Rail3,Level Three,0,0,IMAGE_RES_DEFENCE,0,0,RES_WT15_RL3,WallTower-Rail3,0,0,14400,0,1,0,1,1,1,0,0 R-Wpn-Mortar-ROF04,Level Three,IMAGE_RES_GRPROF,0,IMAGE_RES_WEAPONTECH,0,0,RES_W_M_ROF4,0,Mortar2Mk1,WEAPON,10000,0,2,1,0,0,0,0,0 R-Cyborg-Hvywpn-HPV,Level Two-Three,0,0,IMAGE_RES_CYBORGTECH,0,0,RES_CYW_H_HPV,0,Cannon4AUTOMk1,WEAPON,4000,0,2,0,0,0,0,0,1 @@ -386,7 +342,6 @@ R-Wpn-Missile-LtSAM,Level Three,0,0,IMAGE_RES_WEAPONTECH,0,0,RES_W_MS_LtSAM1,0,M R-Wpn-Missile-HvSAM,Level Three,0,0,IMAGE_RES_WEAPONTECH,0,0,RES_W_MS_HvSAM1,0,Missile-HvySAM,WEAPON,28800,0,2,0,0,0,0,1,1 R-Wpn-MdArtMissile,Level Three,0,0,IMAGE_RES_WEAPONTECH,0,0,RES_W_MS_MART,0,Missile-MdArt,WEAPON,14400,1,2,0,0,0,0,0,1 R-Wpn-HvArtMissile,Level Three,0,0,IMAGE_RES_WEAPONTECH,0,0,RES_W_MS_HART,0,Missile-HvyArt,WEAPON,28800,1,3,0,0,0,0,0,1 -R-Defense-Pillbox-RotMG,Level Two-Three,0,0,0,0,0,0,Pillbox-RotMG,0,0,4800,0,0,0,1,1,1,0,0 R-Sys-Sensor-Upgrade02,Level All,IMAGE_RES_GRPUPG,0,IMAGE_RES_SYSTEMTECH,GNLSNSR1.PIE,0,RES_SY_SU2,0,0,BODY,3600,1,2,1,0,0,0,0,0 R-Struc-Power-Upgrade03,Level Three,IMAGE_RES_GRPUPG,1,IMAGE_RES_POWERTECH,blpower4.pie,0,0,0,0,BODY,12000,1,1,1,0,0,0,0,0 R-Struc-Power-Upgrade01b,Level Two-Three,IMAGE_RES_GRPUPG,1,IMAGE_RES_POWERTECH,blpower4.pie,0,0,0,0,BODY,6000,1,1,1,0,0,0,0,0 @@ -422,11 +377,7 @@ R-Wpn-Flamer-Damage07,Level Three,IMAGE_RES_GRPDAM,0,IMAGE_RES_WEAPONTECH,0,0,RE R-Wpn-Flamer-Damage08,Level Three,IMAGE_RES_GRPDAM,1,IMAGE_RES_WEAPONTECH,0,0,0,0,PlasmiteFlamer,WEAPON,15200,0,1,1,0,0,0,0,0 R-Wpn-Flamer-Damage09,Level Three,IMAGE_RES_GRPDAM,1,IMAGE_RES_WEAPONTECH,0,0,0,0,PlasmiteFlamer,WEAPON,17200,0,1,1,0,0,0,0,0 R-Struc-Factory-Upgrade07,Level Three,IMAGE_RES_GRPUPG,0,IMAGE_RES_STRUCTURETECH,BLFACT1.PIE,0,RES_ST_FU7,0,0,BODY,15200,1,2,3,0,0,0,0,0 -R-Struc-Factory-Upgrade08,Level Three,IMAGE_RES_GRPUPG,1,IMAGE_RES_STRUCTURETECH,BLFACT1.PIE,0,0,0,0,BODY,17200,0,0,0,0,0,0,0,0 R-Struc-Factory-Upgrade09,Level Three,IMAGE_RES_GRPUPG,1,IMAGE_RES_STRUCTURETECH,BLFACT1.PIE,0,0,0,0,BODY,19200,0,1,3,0,0,0,0,0 -R-Struc-Factory-Cyborg-Upgrade07,Level Three,IMAGE_RES_GRPUPG,0,IMAGE_RES_STRUCTURETECH,blcfact1.pie,0,RES_ST_FCY7,0,0,BODY,15200,1,0,0,0,0,0,0,0 -R-Struc-Factory-Cyborg-Upgrade08,Level Three,IMAGE_RES_GRPUPG,1,IMAGE_RES_STRUCTURETECH,blcfact1.pie,0,0,0,0,BODY,17200,0,0,0,0,0,0,0,0 -R-Struc-Factory-Cyborg-Upgrade09,Level Three,IMAGE_RES_GRPUPG,1,IMAGE_RES_STRUCTURETECH,blcfact1.pie,0,0,0,0,BODY,19200,0,0,0,0,0,0,0,0 R-Wpn-MortarEMP,Level Three,0,0,IMAGE_RES_WEAPONTECH,0,0,RES_W_M2,0,MortarEMP,WEAPON,20000,0,1,0,0,0,0,0,0 R-Wpn-AALaser,Level Three,0,0,IMAGE_RES_WEAPONTECH,0,0,RES_W_MS_HvSAM1,0,AAGunLaser,WEAPON,28800,0,1,0,0,0,0,0,1 R-Defense-AA-Laser,Level Three,0,0,IMAGE_RES_DEFENCE,0,0,RES_DEF_AALAS,P0-AASite-Laser,0,PROPULSION,14400,0,1,0,1,0,1,0,0 diff --git a/data/mp/stats/research/multiplayer/researchstruct.txt b/data/mp/stats/research/multiplayer/researchstruct.txt index 45de0c8510b..0dd8ab6890b 100644 --- a/data/mp/stats/research/multiplayer/researchstruct.txt +++ b/data/mp/stats/research/multiplayer/researchstruct.txt @@ -25,7 +25,6 @@ R-Defense-Howitzer,A0CommandCentre,0 R-Defense-MortarPit,A0CommandCentre,0 R-Defense-Wall-RotMg,A0CommandCentre,0 R-Defense-Wall-VulcanCan,A0CommandCentre,0 -R-Defense-WallTower-HvyFlamer,A0CommandCentre,0 R-Defense-WallTower-PulseLas,A0CommandCentre,0 R-Defense-WallTower-Rail2,A0CommandCentre,0 R-Defense-HvyFlamer,A0CommandCentre,0 @@ -34,7 +33,6 @@ R-Defense-SamSite2,A0CommandCentre,0 R-Defense-HvyHowitzer,A0CommandCentre,0 R-Defense-MRL,A0CommandCentre,0 R-Defense-RotMG,A0CommandCentre,0 -R-Defense-RotCannon,A0CommandCentre,0 R-Defense-HvyMor,A0CommandCentre,0 R-Defense-IDFRocket,A0CommandCentre,0 R-Defense-HvyA-Trocket,A0CommandCentre,0 @@ -50,7 +48,6 @@ R-Defense-WallTower-A-Tmiss,A0CommandCentre,0 R-Defense-WallTower-Rail3,A0CommandCentre,0 R-Defense-MassDriver,A0CommandCentre,0 R-Defense-Super-Cannon,A0CommandCentre,0 -R-Defense-Pillbox-RotMG,A0CommandCentre,0 R-Defense-Cannon6,A0CommandCentre,0 R-Defense-HeavyLas,A0CommandCentre,0 R-Wpn-LasSat,A0CommandCentre,0 diff --git a/data/mp/stats/research/multiplayer/resultcomponent.txt b/data/mp/stats/research/multiplayer/resultcomponent.txt index 05a7f22d4eb..09ca06f5215 100644 --- a/data/mp/stats/research/multiplayer/resultcomponent.txt +++ b/data/mp/stats/research/multiplayer/resultcomponent.txt @@ -52,7 +52,6 @@ R-Cyborg-Hvywpn-TK,Cyb-Hvybod-TK,BODY,0,0,2 R-Wpn-Cannon1Mk1,CyborgCannonGrd,BODY,0,0,2 R-Wpn-MG1Mk1,CyborgChain1Ground,BODY,0,0,2 R-Wpn-Flamer01Mk1,CyborgFlamerGrd,BODY,0,0,2 -R-Cyborg-Legs01,CyborgLegs,PROPULSION,0,0,5 R-Wpn-Rocket01-LtAT,CyborgRkt1Ground,BODY,0,0,2 R-Wpn-MG4,CybRotMgGrd,BODY,0,BODY,2 R-Wpn-EMPCannon,EMP-Cannon,WEAPON,0,0,10 diff --git a/data/mp/stats/research/multiplayer/resultstructure.txt b/data/mp/stats/research/multiplayer/resultstructure.txt index c23bb5519b9..8eb6d9e13de 100644 --- a/data/mp/stats/research/multiplayer/resultstructure.txt +++ b/data/mp/stats/research/multiplayer/resultstructure.txt @@ -26,7 +26,6 @@ R-Defense-MdArtMissile,Emplacement-MdART-pit,0,270 R-Defense-MortarPit,Emplacement-MortarPit01,0,142 R-Defense-MortarPit-Incenediary,Emplacement-MortarPit-Incenediary,0,325 R-Defense-MRL,Emplacement-MRL-pit,0,263 -R-Defense-Pillbox-RotMG,Pillbox-RotMG,0,290 R-Defense-Pillbox01,PillBox1,0,126 R-Defense-Pillbox04,PillBox4,0,130 R-Defense-Pillbox05,PillBox5,0,158 @@ -37,7 +36,6 @@ R-Defense-PrisLas,Emplacement-PrisLas,0,214 R-Defense-PulseLas,GuardTower-BeamLas,0,268 R-Defense-Rail2,Emplacement-Rail2,0,269 R-Defense-Rail3,Emplacement-Rail3,0,221 -R-Defense-RotCannon,Wall-VulcanCan,0,198 R-Defense-RotHow,Emplacement-RotHow,0,186 R-Defense-RotMG,Pillbox-RotMG,PillBox1,290 R-Defense-RotMor,Emplacement-RotMor,0,185