diff --git a/campaign/sample/planets/planet21.lua b/campaign/sample/planets/planet21.lua index 4af8940d3..7e930602f 100644 --- a/campaign/sample/planets/planet21.lua +++ b/campaign/sample/planets/planet21.lua @@ -45,11 +45,9 @@ local function GetPlanet(planetUtilities, planetID) mapName = "Otago", modoptions = { graceperiod = 0.5, -- =30s, which is the minimum - --techtimemult = 0.25, chicken_nominiqueen = 1, chicken_minaggro = 5, -- aggro influences chicken tech-up rate (and queen time reduction from killing burrows, but queens are disabled here) chicken_maxaggro = 5, - --chicken_maxtech = 24*60, -- stops before Sporeshooter/Talon chicken_endless = 1, chicken_hidepanel = 1, chicken_nowavemessages = 1, diff --git a/campaign/sample/planets/planet3.lua b/campaign/sample/planets/planet3.lua index d20f4cc83..078e7b7d8 100644 --- a/campaign/sample/planets/planet3.lua +++ b/campaign/sample/planets/planet3.lua @@ -226,7 +226,7 @@ local function GetPlanet(planetUtilities, planetID) difficultyDependantUnlocks = { [2] = {"vehriot",}, [3] = {"vehriot","staticmex", "energysolar"}, - [3] = {"vehriot","staticmex", "energysolar", "vehcon", "vehassault"}, + [4] = {"vehriot","staticmex", "energysolar", "vehcon", "vehassault"}, }, commanderLevel = 2, commander = { diff --git a/campaign/sample/planets/planet30.lua b/campaign/sample/planets/planet30.lua index 2940309a6..d9c7bccbd 100644 --- a/campaign/sample/planets/planet30.lua +++ b/campaign/sample/planets/planet30.lua @@ -27,7 +27,7 @@ local function GetPlanet(planetUtilities, planetID) text = [[...]] }, gameConfig = { - mapName = "LowTideV3", + mapName = "Tropical-v2", playerConfig = { startX = 100, startZ = 100, diff --git a/campaign/sample/planets/planet36.lua b/campaign/sample/planets/planet36.lua index 0f282ada1..c4c3e8ec6 100644 --- a/campaign/sample/planets/planet36.lua +++ b/campaign/sample/planets/planet36.lua @@ -25,7 +25,7 @@ local function GetPlanet(planetUtilities, planetID) primary = "Jazada", primaryType = "G4V", milRating = 1, - text = [[Use the fast-moving Locust raider gunships to curtail your opponent's expansion, then Gargoyle long-range gunships to finish them off.]] + text = [[Use the fast-moving Locust raider gunships to curtail your opponent's expansion, then Nimbus long-range gunships to finish them off.]] }, tips = { { @@ -38,7 +38,7 @@ local function GetPlanet(planetUtilities, planetID) }, { image = "unitpics/gunshipheavyskirm.png", - text = [[If the automatic strafing of your Locusts and Gargoyles is causing them to stray into range of enemy AA, you can disable this behaviour with the corresponding unit toggle.]] + text = [[If the automatic strafing of your Locusts and Nimbuses is causing them to stray into range of enemy AA, you can disable this behaviour with the corresponding unit toggle.]] }, }, gameConfig = { @@ -202,6 +202,127 @@ local function GetPlanet(planetUtilities, planetID) "module_adv_targeting", } }, + midgameUnits = { + { + name = "shieldfelon", + x = 700, + z = 3600, + facing = 2, + spawnRadius = 50, + delay = 2*30*60, + orbitalDrop = true, + }, + { + name = "shieldaa", + x = 700, + z = 3600, + facing = 2, + spawnRadius = 50, + delay = 2*30*60, + orbitalDrop = true, + }, + { + name = "shieldaa", + x = 700, + z = 3600, + facing = 2, + spawnRadius = 50, + delay = 2*30*60, + difficultyAtLeast = 3, + orbitalDrop = true, + }, + { + name = "shieldaa", + x = 700, + z = 3600, + facing = 2, + spawnRadius = 50, + delay = 2*30*60, + difficultyAtLeast = 3, + orbitalDrop = true, + }, + { + name = "shieldfelon", + x = 700, + z = 3600, + facing = 2, + spawnRadius = 50, + delay = 5*30*60, + orbitalDrop = true, + }, + { + name = "shieldaa", + x = 700, + z = 3600, + facing = 2, + spawnRadius = 50, + delay = 5*30*60, + orbitalDrop = true, + }, + { + name = "shieldaa", + x = 700, + z = 3600, + facing = 2, + spawnRadius = 50, + delay = 5*30*60, + orbitalDrop = true, + }, + { + name = "shieldaa", + x = 700, + z = 3600, + facing = 2, + spawnRadius = 50, + delay = 5*30*60, + orbitalDrop = true, + }, + { + name = "shieldfelon", + x = 700, + z = 3600, + facing = 2, + spawnRadius = 50, + delay = 8*30*60, + orbitalDrop = true, + }, + { + name = "shieldaa", + x = 700, + z = 3600, + facing = 2, + spawnRadius = 50, + delay = 8*30*60, + orbitalDrop = true, + }, + { + name = "shieldaa", + x = 700, + z = 3600, + facing = 2, + spawnRadius = 50, + delay = 8*30*60, + orbitalDrop = true, + }, + { + name = "shieldassault", + x = 700, + z = 3600, + facing = 2, + spawnRadius = 50, + delay = 8*30*60, + orbitalDrop = true, + }, + { + name = "shieldassault", + x = 700, + z = 3600, + facing = 2, + spawnRadius = 50, + delay = 8*30*60, + orbitalDrop = true, + }, + }, startUnits = { { name = "staticmex", diff --git a/campaign/sample/planets/planet37.lua b/campaign/sample/planets/planet37.lua index fde247599..460027f1b 100644 --- a/campaign/sample/planets/planet37.lua +++ b/campaign/sample/planets/planet37.lua @@ -25,7 +25,7 @@ local function GetPlanet(planetUtilities, planetID) primary = "Wipapra", primaryType = "G7V", milRating = 1, - text = [[Move to the main continent from your small island using Charon and Argos transports, then build a second factory and expand quickly.]] + text = [[Move to the main continent from your small island using Charon and Hercules transports, then build a second factory and expand quickly.]] }, tips = { { @@ -34,7 +34,7 @@ local function GetPlanet(planetUtilities, planetID) }, { image = "unitpics/gunshipheavytrans.png", - text = [[An Argos can transport any land unit in the game. The online manual contains more tips and tricks for commanding Tranports effectively using Embark, area commands and ferry routes.]] + text = [[A Hercules can transport any land unit in the game. The online manual contains more tips and tricks for commanding Tranports effectively using Embark, area commands and ferry routes.]] }, { image = "unitpics/gunshipemp.png", diff --git a/campaign/sample/planets/planet38.lua b/campaign/sample/planets/planet38.lua index f4f414133..cff1dfc79 100644 --- a/campaign/sample/planets/planet38.lua +++ b/campaign/sample/planets/planet38.lua @@ -204,6 +204,73 @@ local function GetPlanet(planetUtilities, planetID) "module_adv_nano" } }, + midgameUnits = { + { + name = "amphfloater", + x = 8100, + z = 1800, + facing = 2, + spawnRadius = 50, + delay = 3*30*60, + orbitalDrop = true, + }, + { + name = "amphfloater", + x = 8100, + z = 1800, + facing = 2, + spawnRadius = 50, + delay = 3*30*60, + orbitalDrop = true, + }, + { + name = "amphfloater", + x = 8100, + z = 1800, + facing = 2, + spawnRadius = 50, + delay = 3*30*60, + orbitalDrop = true, + }, + { + name = "amphaa", + x = 8100, + z = 1800, + facing = 2, + spawnRadius = 50, + delay = 6*30*60, + orbitalDrop = true, + }, + { + name = "amphaa", + x = 8100, + z = 1800, + facing = 2, + spawnRadius = 50, + delay = 6*30*60, + orbitalDrop = true, + }, + { + name = "amphassault", + x = 8100, + z = 1800, + facing = 2, + spawnRadius = 50, + delay = 6*30*60, + difficultyAtLeast = 3, + orbitalDrop = true, + }, + { + name = "amphassault", + x = 8100, + z = 1800, + facing = 2, + spawnRadius = 50, + delay = 6*30*60, + difficultyAtLeast = 4, + orbitalDrop = true, + }, + }, startUnits = { { name = "staticmex", diff --git a/campaign/sample/planets/planet39.lua b/campaign/sample/planets/planet39.lua index 32e338809..c544c096e 100644 --- a/campaign/sample/planets/planet39.lua +++ b/campaign/sample/planets/planet39.lua @@ -25,7 +25,7 @@ local function GetPlanet(planetUtilities, planetID) primary = "Rirnef", primaryType = "G6V", milRating = 1, - text = [[The enemy is about to finish a Nimbus heavy gunship. Quickly build Trident AA gunships to defeat it, then build your own Nimbuses and return the favour.]] + text = [[The enemy is about to finish a Krow heavy gunship. Quickly build Tridents to defeat it, then build your own Krows and return the favour.]] }, tips = { { @@ -34,7 +34,7 @@ local function GetPlanet(planetUtilities, planetID) }, { image = "unitpics/gunshipkrow.png", - text = [[Make sure your own units are well out of the way when you use the manual fire weapon of the Nimbus (default hotkey D). Its massive barrage of Cluster Bombs do not distinguish between friend and foe.]] + text = [[Make sure your own units are well out of the way when you use the manual fire weapon of the Krow (default hotkey D). Its massive barrage of Cluster Bombs do not distinguish between friend and foe.]] }, }, gameConfig = { @@ -1274,6 +1274,45 @@ local function GetPlanet(planetUtilities, planetID) "commweapon_personal_shield", } }, + midgameUnits = { + { + name = "gunshipkrow", + x = 200, + z = 800, + facing = 2, + spawnRadius = 50, + delay = 6*30*60, + difficultyAtLeast = 4, + orbitalDrop = false, + }, + { + name = "gunshipaa", + x = 200, + z = 800, + facing = 2, + spawnRadius = 50, + delay = 6*30*60, + orbitalDrop = false, + }, + { + name = "gunshipaa", + x = 200, + z = 800, + facing = 2, + spawnRadius = 50, + delay = 6*30*60, + orbitalDrop = false, + }, + { + name = "gunshipaa", + x = 200, + z = 800, + facing = 2, + spawnRadius = 50, + delay = 6*30*60, + orbitalDrop = false, + }, + }, startUnits = { { name = "gunshipkrow", @@ -2439,7 +2478,7 @@ local function GetPlanet(planetUtilities, planetID) }, image = planetUtilities.ICON_DIR .. "gunshipkrow.png", imageOverlay = planetUtilities.ICON_OVERLAY.ATTACK, - description = "Destroy the enemy Nimbus before 5:00", + description = "Destroy an enemy Krow before 5:00", experience = planetUtilities.BONUS_EXP, }, [2] = { -- Have a Krow by 5 minutes @@ -2451,7 +2490,7 @@ local function GetPlanet(planetUtilities, planetID) }, image = planetUtilities.ICON_DIR .. "gunshipkrow.png", imageOverlay = planetUtilities.ICON_OVERLAY.REPAIR, - description = "Build a Nimbus before 5:00", + description = "Build a Krow before 5:00", experience = planetUtilities.BONUS_EXP, }, [3] = { -- Complete all bonus objectives diff --git a/campaign/sample/planets/planet53.lua b/campaign/sample/planets/planet53.lua index a611a612e..96a3a4351 100644 --- a/campaign/sample/planets/planet53.lua +++ b/campaign/sample/planets/planet53.lua @@ -25,12 +25,12 @@ local function GetPlanet(planetUtilities, planetID) primary = "Oeva Pristia", primaryType = "K2V", milRating = 1, - text = [[Your allies are struggling against cloaked skirmishers and artillery attacking them at range. Use Firewalker napalm artillery and jumping Jack assaults to find and destroy the hidden enemies.]] + text = [[Your allies are struggling against cloaked skirmishers and artillery attacking them at range. Use Firewalker napalm artillery and jumping Jacks to find and destroy the hidden enemies.]] }, tips = { { image = "unitpics/jumparty.png", - text = [[Firewalkers are essentially cannons on legs, firing a cluster of napalm-based projections at an area. Firewalkers do not inflict large amounts of damage against single targets, but they are exceptionally effective against large numbers of weak enemies.]] + text = [[Firewalkers are essentially cannons on legs, firing napalm over a large area. Firewalkers do not inflict much damage against single targets, but they are very effective against large numbers of weak enemies.]] }, { image = "unitpics/cloakjammer.png", @@ -38,7 +38,7 @@ local function GetPlanet(planetUtilities, planetID) }, { image = "unitpics/jumpassault.png", - text = [[You also have access to the Jack jumping assault bot, to deal with enemy defences on the cliffs.]] + text = [[Use Jacks to jump up the cliffs and destroy enemy defences with their melee attack.]] }, }, gameConfig = { @@ -1580,6 +1580,255 @@ local function GetPlanet(planetUtilities, planetID) "module_adv_nano", } }, + midgameUnits = { + { + name = "cloakjammer", + x = 5750, + z = 2000, + facing = 2, + spawnRadius = 150, + delay = 2*30*60, + orbitalDrop = true, + }, + { + name = "shieldskirm", + x = 5750, + z = 2000, + facing = 2, + spawnRadius = 150, + delay = 2*30*60, + orbitalDrop = true, + }, + { + name = "shieldskirm", + x = 5750, + z = 2000, + facing = 2, + spawnRadius = 150, + delay = 2*30*60, + orbitalDrop = true, + }, + { + name = "shieldskirm", + x = 5750, + z = 2000, + facing = 2, + spawnRadius = 150, + delay = 2*30*60, + orbitalDrop = true, + }, + { + name = "shieldskirm", + x = 5750, + z = 2000, + facing = 2, + spawnRadius = 150, + delay = 2*30*60, + orbitalDrop = true, + }, + { + name = "shieldskirm", + x = 5750, + z = 2000, + facing = 2, + spawnRadius = 150, + delay = 2*30*60, + orbitalDrop = true, + }, + { + name = "shieldskirm", + x = 5750, + z = 2000, + facing = 2, + spawnRadius = 150, + delay = 2*30*60, + orbitalDrop = true, + }, + { + name = "shieldskirm", + x = 5750, + z = 2000, + facing = 2, + spawnRadius = 150, + delay = 2*30*60, + orbitalDrop = true, + }, + { + name = "shieldskirm", + x = 5750, + z = 2000, + facing = 2, + spawnRadius = 150, + delay = 2*30*60, + orbitalDrop = true, + }, + { + name = "shieldskirm", + x = 5750, + z = 2000, + facing = 2, + spawnRadius = 150, + delay = 2*30*60, + orbitalDrop = true, + }, + { + name = "shieldskirm", + x = 5750, + z = 2000, + facing = 2, + spawnRadius = 150, + delay = 2*30*60, + orbitalDrop = true, + }, + { + name = "cloakjammer", + x = 6100, + z = 4200, + facing = 2, + spawnRadius = 150, + delay = 4.5*30*60, + orbitalDrop = true, + }, + { + name = "spiderskirm", + x = 6100, + z = 4200, + facing = 2, + spawnRadius = 150, + delay = 4.5*30*60, + orbitalDrop = true, + }, + { + name = "spiderskirm", + x = 6100, + z = 4200, + facing = 2, + spawnRadius = 150, + delay = 4.5*30*60, + orbitalDrop = true, + }, + { + name = "spiderskirm", + x = 6100, + z = 4200, + facing = 2, + spawnRadius = 150, + delay = 4.5*30*60, + orbitalDrop = true, + }, + { + name = "spiderskirm", + x = 6100, + z = 4200, + facing = 2, + spawnRadius = 150, + delay = 4.5*30*60, + orbitalDrop = true, + }, + { + name = "spiderskirm", + x = 6100, + z = 4200, + facing = 2, + spawnRadius = 150, + delay = 4.5*30*60, + orbitalDrop = true, + }, + { + name = "spidercrabe", + x = 6100, + z = 4200, + facing = 2, + spawnRadius = 150, + difficultyAtLeast = 3, + delay = 4.5*30*60, + orbitalDrop = true, + }, + { + name = "spidercrabe", + x = 6100, + z = 4200, + facing = 2, + spawnRadius = 150, + difficultyAtLeast = 4, + delay = 4.5*30*60, + orbitalDrop = true, + }, + { + name = "spiderantiheavy", + x = 6100, + z = 4200, + facing = 2, + spawnRadius = 150, + difficultyAtLeast = 4, + delay = 4.5*30*60, + orbitalDrop = true, + }, + { + name = "cloakjammer", + x = 5750, + z = 2000, + facing = 2, + spawnRadius = 150, + delay = 8*30*60, + orbitalDrop = true, + }, + { + name = "hoverarty", + x = 7700, + z = 1200, + facing = 2, + spawnRadius = 150, + delay = 8*30*60, + orbitalDrop = true, + }, + { + name = "hoverarty", + x = 7700, + z = 1200, + facing = 2, + spawnRadius = 150, + difficultyAtLeast = 3, + delay = 8*30*60, + orbitalDrop = true, + }, + { + name = "hoverskirm", + x = 7700, + z = 1200, + facing = 2, + spawnRadius = 150, + delay = 8*30*60, + orbitalDrop = true, + }, + { + name = "hoverskirm", + x = 7700, + z = 1200, + facing = 2, + spawnRadius = 150, + delay = 8*30*60, + orbitalDrop = true, + }, + { + name = "hoverskirm", + x = 7700, + z = 1200, + facing = 2, + spawnRadius = 150, + delay = 8*30*60, + orbitalDrop = true, + }, + { + name = "hoverskirm", + x = 7700, + z = 1200, + facing = 2, + spawnRadius = 150, + delay = 8*30*60, + orbitalDrop = true, + }, + }, startUnits = { { name = "pw_warpjammer", @@ -1588,7 +1837,7 @@ local function GetPlanet(planetUtilities, planetID) facing = 0, mapMarker = { text = "Warp Jammer", - color = "red" + color = "red_small" }, }, { @@ -1598,7 +1847,7 @@ local function GetPlanet(planetUtilities, planetID) facing = 0, mapMarker = { text = "Warp Jammer", - color = "red" + color = "red_small" }, }, { diff --git a/campaign/sample/planets/planet54.lua b/campaign/sample/planets/planet54.lua index 3cfd597e9..27e8ec77e 100644 --- a/campaign/sample/planets/planet54.lua +++ b/campaign/sample/planets/planet54.lua @@ -333,6 +333,67 @@ local function GetPlanet(planetUtilities, planetID) "module_high_power_servos", } }, + midgameUnits = { + { + name = "shipheavyarty", + x = 7500, + z = 6500, + facing = 2, + difficultyAtLeast = 4, + spawnRadius = 50, + delay = 1.5*30*60, + orbitalDrop = true, + }, + { + name = "shipassault", + x = 7800, + z = 6000, + facing = 2, + difficultyAtLeast = 4, + spawnRadius = 100, + delay = 1.5*30*60, + orbitalDrop = true, + }, + { + name = "shipassault", + x = 7800, + z = 5500, + facing = 2, + difficultyAtLeast = 4, + spawnRadius = 100, + delay = 1.5*30*60, + orbitalDrop = false, + }, + { + name = "striderscorpion", + x = 6150, + z = 5100, + facing = 2, + spawnRadius = 50, + delay = 3*30*60, + orbitalDrop = true, + difficultyAtLeast = 3, + }, + { + name = "tankheavyassault", + x = 6000, + z = 7000, + facing = 2, + difficultyAtLeast = 2, + spawnRadius = 50, + delay = 6*30*60, + orbitalDrop = true, + }, + { + name = "amphassault", + x = 6000, + z = 7000, + facing = 2, + spawnRadius = 50, + delay = 8*30*60, + orbitalDrop = true, + }, + }, startUnits = { { name = "energyheavygeo", @@ -364,6 +425,65 @@ local function GetPlanet(planetUtilities, planetID) color = "red_small" }, }, + { + name = "tankassault", + x = 7100, + z = 4700, + facing = 2, + }, + { + name = "tankassault", + x = 7400, + z = 2600, + facing = 2, + difficultyAtLeast = 2, + }, + { + name = "tankassault", + x = 2500, + z = 7400, + facing = 2, + difficultyAtLeast = 2, + }, + { + name = "striderdante", + x = 4400, + z = 4800, + facing = 2, + difficultyAtLeast = 3, + }, + { + name = "striderdante", + x = 6350, + z = 6500, + facing = 2, + difficultyAtLeast = 4, + }, + { + name = "tankheavyassault", + x = 6250, + z = 6500, + facing = 2, + difficultyAtLeast = 4, + }, + { + name = "turretaalaser", + x = 4068, + z = 6883, + facing = 2, + }, + { + name = "turretaalaser", + x = 7830, + z = 4222, + facing = 2, + }, + { + name = "turretaalaser", + x = 6150, + z = 4000, + facing = 2, + }, { name = "turretlaser", x = 7328, diff --git a/campaign/sample/planets/planet56.lua b/campaign/sample/planets/planet56.lua index 23083e629..c8e861bf9 100644 --- a/campaign/sample/planets/planet56.lua +++ b/campaign/sample/planets/planet56.lua @@ -100,8 +100,8 @@ local function GetPlanet(planetUtilities, planetID) }, { name = "energypylon", - x = 72, - z = 88, + x = 150, + z = 130, facing = 0, }, { @@ -1385,6 +1385,8 @@ local function GetPlanet(planetUtilities, planetID) }, loseAfterSeconds = false, allyTeamLossObjectiveID = 1, + defeatOtherAllyTeamsOnLoss = {1}, + doNotExplodeOnLoss = true, }, }, objectiveConfig = { @@ -1434,7 +1436,7 @@ local function GetPlanet(planetUtilities, planetID) }, image = planetUtilities.ICON_DIR .. "factoryspider.png", --imageOverlay = planetUtilities.ICON_DIR .. "module_none", - description = "Don't build any Factories", + description = "Don't have any Factories", experience = planetUtilities.BONUS_EXP, }, },