diff --git a/Gamedata/unitdefs_pre.lua b/Gamedata/unitdefs_pre.lua index 3ef991bb5..cd3aae3fd 100644 --- a/Gamedata/unitdefs_pre.lua +++ b/Gamedata/unitdefs_pre.lua @@ -72,7 +72,7 @@ Shared.buildListZaal = { Shared.buildListZaalArm = { [[zarm]], - [[zhive]], + [[zhatch]], } local turrets = { diff --git a/LuaRules/Configs/morph_defs.lua b/LuaRules/Configs/morph_defs.lua index bd49f6354..7017f03f9 100644 --- a/LuaRules/Configs/morph_defs.lua +++ b/LuaRules/Configs/morph_defs.lua @@ -53,6 +53,12 @@ local timeToBuild_etech2 = energyCost_etech2 * 0.10 local energyCost_etech3 = 4000 local timeToBuild_etech3 = energyCost_etech3 * 0.10 +local energyCost_zlair = 2000 +local timeToBuild_zlair = energyCost_zlair * 0.10 + +local energyCost_zhive = 4000 +local timeToBuild_zhive = energyCost_zhive * 0.10 + local energyCost_elightturret2 = 150 local timeToBuild_elightturret2 = energyCost_elightturret2 * 0.10 @@ -1224,6 +1230,32 @@ Evolution]], }, }, +---------------------------------------------------------- +---------------------------------------------------------- + + zhatch = { + { + into = 'zlair', + time = timeToBuild_zlair, + cmdname = [[Lair +Evolution]], + energy = energyCost_zlair, + metal = 0, + text = 'Evolve into a Lair.', + }, + }, + zlair = { + { + into = 'zhive', + time = timeToBuild_zhive, + cmdname = [[Hive +Evolution]], + energy = energyCost_zhive, + metal = 0, + text = 'Evolve into a Hive.', + }, + }, + ---------------------------------------------------------- ---------------------------------------------------------- diff --git a/Units-Configs-Basedefs/basedefs/zaal/zairbomber_basedef.lua b/Units-Configs-Basedefs/basedefs/zaal/zairbomber_basedef.lua index e95a89b9d..c020369ce 100644 --- a/Units-Configs-Basedefs/basedefs/zaal/zairbomber_basedef.lua +++ b/Units-Configs-Basedefs/basedefs/zaal/zairbomber_basedef.lua @@ -4,7 +4,7 @@ unitDef = { airHoverFactor = 0, --brakeRate = 1, buildCostEnergy = 0, - buildCostMetal = 53, + buildCostMetal = 60, buildTime = 2.5, buildpic = "zaal_unitpics/zairbomber.png", canAttack = true, diff --git a/Units-Configs-Basedefs/basedefs/zaal/zairscout_basedef.lua b/Units-Configs-Basedefs/basedefs/zaal/zairscout_basedef.lua index a1a5e528f..7afc6e030 100644 --- a/Units-Configs-Basedefs/basedefs/zaal/zairscout_basedef.lua +++ b/Units-Configs-Basedefs/basedefs/zaal/zairscout_basedef.lua @@ -4,7 +4,7 @@ unitDef = { bankscale = "1", brakeRate = 0.7, buildCostEnergy = 0, - buildCostMetal = 33, + buildCostMetal = 5, buildTime = 2.5, buildpic = "zaal_unitpics/zairscout.png", canAttack = true, diff --git a/Units-Configs-Basedefs/basedefs/zaal/zairtoairfighter_basedef.lua b/Units-Configs-Basedefs/basedefs/zaal/zairtoairfighter_basedef.lua index b0cd98b6f..e04431626 100644 --- a/Units-Configs-Basedefs/basedefs/zaal/zairtoairfighter_basedef.lua +++ b/Units-Configs-Basedefs/basedefs/zaal/zairtoairfighter_basedef.lua @@ -4,7 +4,7 @@ unitDef = { airHoverFactor = 0, --brakeRate = 1, buildCostEnergy = 0, - buildCostMetal = 53, + buildCostMetal = 30, buildTime = 2.5, buildpic = "zaal_unitpics/zairtoairfighter.png", canAttack = true, diff --git a/Units-Configs-Basedefs/basedefs/zaal/zarm_basedef.lua b/Units-Configs-Basedefs/basedefs/zaal/zarm_basedef.lua index 4ba0c8522..40a6edcd5 100644 --- a/Units-Configs-Basedefs/basedefs/zaal/zarm_basedef.lua +++ b/Units-Configs-Basedefs/basedefs/zaal/zarm_basedef.lua @@ -81,6 +81,7 @@ unitDef = { customParams = { unittype = "building", area_mex_def = "zhive", + ProvideTech = techprovided, canbetransported = "false", needed_cover = 1, death_sounds = "generic", diff --git a/Units-Configs-Basedefs/basedefs/zaal/zarty_basedef.lua b/Units-Configs-Basedefs/basedefs/zaal/zarty_basedef.lua index 5b5987f0b..167580a4f 100644 --- a/Units-Configs-Basedefs/basedefs/zaal/zarty_basedef.lua +++ b/Units-Configs-Basedefs/basedefs/zaal/zarty_basedef.lua @@ -104,7 +104,7 @@ weaponDefs = { Artilleryweapon = { accuracy = 500, - AreaOfEffect = 50, + AreaOfEffect = 250, avoidFriendly = false, avoidFeature = false, collideFriendly = false, @@ -119,7 +119,7 @@ weaponDefs = { interceptedByShieldType = 4, highTrajectory = 0, name = "Plasma Cannon", - range = 1300, + range = 1500, reloadtime = 5, size = 16, weaponType = "Cannon", @@ -133,7 +133,7 @@ weaponDefs = { nofriendlyfire = 1, }, damage = { - default = 200, + default = 600, }, }, } diff --git a/Units-Configs-Basedefs/basedefs/zaal/zassault_basedef.lua b/Units-Configs-Basedefs/basedefs/zaal/zassault_basedef.lua index c3ad48798..0ed740f3b 100644 --- a/Units-Configs-Basedefs/basedefs/zaal/zassault_basedef.lua +++ b/Units-Configs-Basedefs/basedefs/zaal/zassault_basedef.lua @@ -2,7 +2,7 @@ unitDef = { acceleration = 1, brakeRate = 1, buildCostEnergy = 0, - buildCostMetal = 59, + buildCostMetal = 75, builder = false, buildTime = 5, buildpic = "zaal_unitpics/zskirmisher.png", @@ -24,7 +24,7 @@ unitDef = { idleAutoHeal = .5, idleTime = 2200, leaveTracks = false, - maxDamage = 375, + maxDamage = 600, maxSlope = 26, maxVelocity = 3.5, maxReverseVelocity = 1, @@ -132,7 +132,7 @@ weaponDefs = { nofriendlyfire = 1, }, damage = { - default = 325, + default = 500, }, }, } \ No newline at end of file diff --git a/Units-Configs-Basedefs/basedefs/zaal/zhive_basedef.lua b/Units-Configs-Basedefs/basedefs/zaal/zhive_basedef.lua index ec4989e4e..68c46c15b 100644 --- a/Units-Configs-Basedefs/basedefs/zaal/zhive_basedef.lua +++ b/Units-Configs-Basedefs/basedefs/zaal/zhive_basedef.lua @@ -16,13 +16,13 @@ unitDef = { canRepair = true, canstop = true, category = "BUILDING NOTAIR", - description = [[Build a Tech Facility to unlock units. Build Supply Depots to increase your army size.]], + description = [[Upgrade to get more supply and Metal/Energy Income and unlock new Tech]], energyStorage = 0, - energyUse = 0, - energyMake = 0, + energyUse = energyUse, + energyMake = energyMake, explodeAs = "hugeBuildingExplosionGeneric", - footprintX = 8, - footprintZ = 8, + footprintX = footprintX, + footprintZ = footprintZ, floater = true, iconType = "factory", idleAutoHeal = .5, @@ -31,7 +31,11 @@ unitDef = { maxSlope = 25, maxWaterDepth = 99999999999, metalStorage = 0, +<<<<<<< HEAD metalMake = 1, +======= + metalMake = metalMultiplier, +>>>>>>> Get the tech structure all set up and set some tentative balance for Zaal name = humanName, objectName = objectName, script = script, @@ -46,7 +50,7 @@ unitDef = { unitname = unitName, -- unitRestricted = 1, workerTime = 1, - yardMap = "oooooooo oooooooo oooooooo oooooooo oooooooo oooooooo oooooooo oooooooo", + yardMap = yardMap, -- usePieceCollisionVolumes = true, -- modelCenterOffset = {108, 10, 0}, sfxtypes = { @@ -55,7 +59,7 @@ unitDef = { }, explosiongenerators = { - "custom:blacksmoke", + primaryCEG, "custom:blood_spray", }, }, diff --git a/Units-Configs-Basedefs/basedefs/zaal/zlightswarm_basedef.lua b/Units-Configs-Basedefs/basedefs/zaal/zlightswarm_basedef.lua index f8b087473..2c356c76c 100644 --- a/Units-Configs-Basedefs/basedefs/zaal/zlightswarm_basedef.lua +++ b/Units-Configs-Basedefs/basedefs/zaal/zlightswarm_basedef.lua @@ -129,7 +129,7 @@ weaponDefs = { nofriendlyfire = 1, }, damage = { - default = 10, + default = 25, }, }, } \ No newline at end of file diff --git a/Units-Configs-Basedefs/basedefs/zaal/zmedswarm_basedef.lua b/Units-Configs-Basedefs/basedefs/zaal/zmedswarm_basedef.lua index 373ccbc6e..5a156427b 100644 --- a/Units-Configs-Basedefs/basedefs/zaal/zmedswarm_basedef.lua +++ b/Units-Configs-Basedefs/basedefs/zaal/zmedswarm_basedef.lua @@ -128,7 +128,7 @@ weaponDefs = { nofriendlyfire = 1, }, damage = { - default = 50, + default = 60, }, }, } \ No newline at end of file diff --git a/Units-Configs-Basedefs/basedefs/zaal/zqueen_basedef.lua b/Units-Configs-Basedefs/basedefs/zaal/zqueen_basedef.lua index a45da4010..e8c7f8063 100644 --- a/Units-Configs-Basedefs/basedefs/zaal/zqueen_basedef.lua +++ b/Units-Configs-Basedefs/basedefs/zaal/zqueen_basedef.lua @@ -2,7 +2,7 @@ unitDef = { acceleration = 1, brakeRate = 1, buildCostEnergy = 0, - buildCostMetal = 59, + buildCostMetal = 2500, builder = false, buildTime = 5, buildpic = "zaal_unitpics/zqueen.png", @@ -24,7 +24,7 @@ unitDef = { idleAutoHeal = .5, idleTime = 2200, leaveTracks = false, - maxDamage = 375, + maxDamage = 15000, maxSlope = 26, maxVelocity = 3.5, maxReverseVelocity = 1, diff --git a/Units/zaal/zairbomber.lua b/Units/zaal/zairbomber.lua index bd9940d85..4d807d6bf 100644 --- a/Units/zaal/zairbomber.lua +++ b/Units/zaal/zairbomber.lua @@ -13,7 +13,7 @@ objectName = "zaal/zairbomber.s3o" script = "zaal/zairbomber.cob" -tech = [[5 hive]] +tech = [[tech2]] armortype = [[light]] supply = [[2]] diff --git a/Units/zaal/zairscout.lua b/Units/zaal/zairscout.lua index 87dcccf5c..54d35d636 100644 --- a/Units/zaal/zairscout.lua +++ b/Units/zaal/zairscout.lua @@ -12,7 +12,7 @@ script = "zaal/zairscout.cob" armortype = [[light]] -tech = [[1 hive]] +tech = [[tech0]] supply = [[1]] diff --git a/Units/zaal/zairtoairfighter.lua b/Units/zaal/zairtoairfighter.lua index a4d468897..b7144cf13 100644 --- a/Units/zaal/zairtoairfighter.lua +++ b/Units/zaal/zairtoairfighter.lua @@ -13,7 +13,7 @@ objectName = "zaal/zairtoairfighter.s3o" script = "zaal/zairtoairfighter.cob" -tech = [[4 hive]] +tech = [[tech1]] armortype = [[light]] supply = [[2]] diff --git a/Units/zaal/zairtogroundfighter.lua b/Units/zaal/zairtogroundfighter.lua index af42be97f..216e2e3f2 100644 --- a/Units/zaal/zairtogroundfighter.lua +++ b/Units/zaal/zairtogroundfighter.lua @@ -13,7 +13,7 @@ objectName = "zaal/zairtogroundfighter.s3o" script = "zaal/zairtogroundfighter.cob" -tech = [[4 hive]] +tech = [[tech2]] armortype = [[light]] supply = [[2]] diff --git a/Units/zaal/zarm.lua b/Units/zaal/zarm.lua index 4bc9b6aa0..facba73af 100644 --- a/Units/zaal/zarm.lua +++ b/Units/zaal/zarm.lua @@ -13,6 +13,7 @@ objectName = "zaal/zarm.s3o" script = "zaal/zarm_lus.lua" armortype = [[building]] +techprovided = [[tech0]] VFS.Include("units-configs-basedefs/basedefs/zaal/zarm_basedef.lua") diff --git a/Units/zaal/zarty.lua b/Units/zaal/zarty.lua index 9d8a538b1..ad6cef7f1 100644 --- a/Units/zaal/zarty.lua +++ b/Units/zaal/zarty.lua @@ -12,7 +12,7 @@ humanName = "Trike" objectName = "zaal/zarty.s3o" script = "zaal/zarty.cob" -tech = [[6 hive]] +tech = [[tech2]] armortype = [[armored]] supply = [[4]] diff --git a/Units/zaal/zassault.lua b/Units/zaal/zassault.lua index 6796056d7..43e500870 100644 --- a/Units/zaal/zassault.lua +++ b/Units/zaal/zassault.lua @@ -12,7 +12,7 @@ humanName = "Trike" objectName = "zaal/zassault.s3o" script = "zaal/zassault.cob" -tech = [[6 hive]] +tech = [[tech2]] armortype = [[armored]] supply = [[4]] diff --git a/Units/zaal/zhatch.lua b/Units/zaal/zhatch.lua new file mode 100644 index 000000000..90ff9c1ee --- /dev/null +++ b/Units/zaal/zhatch.lua @@ -0,0 +1,38 @@ +-- UNITDEF -- ZHATCH -- +-------------------------------------------------------------------------------- + +unitName = [[zhatch]] + +-------------------------------------------------------------------------------- + +metalMultiplier = 1 + +buildCostMetal = 30 +energyUse = 0 +energyMake = 0 + +supplygranted = 20 + +footprintX = 8 +footprintZ = 8 + +yardMap = [[oooooooo oooooooo oooooooo oooooooo oooooooo oooooooo oooooooo oooooooo]] + +primaryCEG = "custom:fusionreactionnuclear-2color" + +humanName = [[Zaal Hatchery]] + +objectName = [[zaal/zhive.s3o]] +script = [[zaal/zhive.cob]] + +techprovided = [[tech1, tech0]] +armortype = [[building]] + +VFS.Include("units-configs-basedefs/basedefs/zaal/zhive_basedef.lua") + +unitDef.weaponDefs = weaponDefs +-------------------------------------------------------------------------------- + +return lowerkeys({ [unitName] = unitDef }) + +-------------------------------------------------------------------------------- \ No newline at end of file diff --git a/Units/zaal/zhive.lua b/Units/zaal/zhive.lua index 32eed7979..a7016dd1c 100644 --- a/Units/zaal/zhive.lua +++ b/Units/zaal/zhive.lua @@ -5,21 +5,27 @@ unitName = [[zhive]] -------------------------------------------------------------------------------- -metalMultiplier = 1 +metalMultiplier = 2 -buildCostMetal = 30 +buildCostMetal = 300 energyUse = 0 +energyMake = 20 -supplygranted = 40 +supplygranted = 60 -primaryCEG = "custom:fusionreactionnuclear-1color" +footprintX = 8 +footprintZ = 8 + +yardMap = [[oooooooo oooooooo oooooooo oooooooo oooooooo oooooooo oooooooo oooooooo]] + +primaryCEG = "custom:fusionreactionnuclear-4color" humanName = [[Zaal Hive]] objectName = [[zaal/zhive.s3o]] script = [[zaal/zhive.cob]] -techprovided = [[1 hive]] +techprovided = [[tech3, tech2, tech1, tech0]] armortype = [[building]] VFS.Include("units-configs-basedefs/basedefs/zaal/zhive_basedef.lua") diff --git a/Units/zaal/zkamikaze.lua b/Units/zaal/zkamikaze.lua index a790e8471..468edeb6a 100644 --- a/Units/zaal/zkamikaze.lua +++ b/Units/zaal/zkamikaze.lua @@ -12,7 +12,7 @@ humanName = "Trike" objectName = "zaal/zkamikaze.s3o" script = "zaal/zkamikaze.cob" -tech = [[6 hive]] +tech = [[tech2]] armortype = [[armored]] supply = [[4]] diff --git a/Units/zaal/zlair.lua b/Units/zaal/zlair.lua new file mode 100644 index 000000000..a3b920450 --- /dev/null +++ b/Units/zaal/zlair.lua @@ -0,0 +1,38 @@ +-- UNITDEF -- ZLAIR -- +-------------------------------------------------------------------------------- + +unitName = [[zlair]] + +-------------------------------------------------------------------------------- + +metalMultiplier = 1.5 + +buildCostMetal = 150 +energyUse = 0 +energyMake = 10 + +supplygranted = 40 + +footprintX = 8 +footprintZ = 8 + +yardMap = [[oooooooo oooooooo oooooooo oooooooo oooooooo oooooooo oooooooo oooooooo]] + +primaryCEG = "custom:fusionreactionnuclear-3color" + +humanName = [[Zaal Lair]] + +objectName = [[zaal/zhive.s3o]] +script = [[zaal/zhive.cob]] + +techprovided = [[tech2, tech1, tech0]] +armortype = [[building]] + +VFS.Include("units-configs-basedefs/basedefs/zaal/zhive_basedef.lua") + +unitDef.weaponDefs = weaponDefs +-------------------------------------------------------------------------------- + +return lowerkeys({ [unitName] = unitDef }) + +-------------------------------------------------------------------------------- \ No newline at end of file diff --git a/Units/zaal/zlightswarm.lua b/Units/zaal/zlightswarm.lua index a5c00b27f..c589c338a 100644 --- a/Units/zaal/zlightswarm.lua +++ b/Units/zaal/zlightswarm.lua @@ -12,8 +12,8 @@ humanName = "Trike" objectName = "zaal/zlightswarm.s3o" script = "zaal/zlightswarm.cob" -tech = [[hive]] -armortype = [[armored]] +tech = [[tech0]] +armortype = [[light]] supply = [[4]] VFS.Include("units-configs-basedefs/basedefs/zaal/zlightswarm_basedef.lua") diff --git a/Units/zaal/zmedswarm.lua b/Units/zaal/zmedswarm.lua index 6b02c0898..7c886f554 100644 --- a/Units/zaal/zmedswarm.lua +++ b/Units/zaal/zmedswarm.lua @@ -12,8 +12,8 @@ humanName = "Trike" objectName = "zaal/zmedswarm.s3o" script = "zaal/zmedswarm.cob" -tech = [[3 hive]] -armortype = [[armored]] +tech = [[tech1]] +armortype = [[light]] supply = [[4]] VFS.Include("units-configs-basedefs/basedefs/zaal/zmedswarm_basedef.lua") diff --git a/Units/zaal/zpyro.lua b/Units/zaal/zpyro.lua index caeb3decf..210a97550 100644 --- a/Units/zaal/zpyro.lua +++ b/Units/zaal/zpyro.lua @@ -12,7 +12,7 @@ humanName = "Trike" objectName = "zaal/zpyro.s3o" script = "zaal/zpyro.cob" -tech = [[8 hive]] +tech = [[tech2]] armortype = [[armored]] supply = [[4]] diff --git a/Units/zaal/zqueen.lua b/Units/zaal/zqueen.lua index 2d1fd8588..d40810a8e 100644 --- a/Units/zaal/zqueen.lua +++ b/Units/zaal/zqueen.lua @@ -12,7 +12,7 @@ humanName = "Trike" objectName = "zaal/zqueen.s3o" script = "zaal/zqueen.cob" -tech = [[10 hive]] +tech = [[tech3]] armortype = [[armored]] supply = [[4]] diff --git a/Units/zaal/zskirmisher.lua b/Units/zaal/zskirmisher.lua index a439bea8e..534f0a3e6 100644 --- a/Units/zaal/zskirmisher.lua +++ b/Units/zaal/zskirmisher.lua @@ -12,7 +12,7 @@ humanName = "Trike" objectName = "zaal/zskirmisher.s3o" script = "zaal/zskirmisher.cob" -tech = [[6 hive]] +tech = [[tech2]] armortype = [[armored]] supply = [[4]] diff --git a/dist_cfg/config.json b/dist_cfg/config.json index 1d5826e70..6b28e8310 100644 --- a/dist_cfg/config.json +++ b/dist_cfg/config.json @@ -8,7 +8,7 @@ }, "downloads": { "games" : ["evo:stable", "chobby:test"], - "engines" : [ "104.0.1-968-gb54c668 maintenance" ] + "engines" : [ "104.0.1-1208-gb3ccab9 maintenance" ] }, "no_start_script" : true, "launch": { @@ -22,7 +22,7 @@ }, "downloads": { "games" : ["evo:test", "chobby:test"], - "engines" : [ "104.0.1-1156-gb72a9cc maintenance" ] + "engines" : [ "104.0.1-1208-gb3ccab9 maintenance" ] }, "no_start_script" : true, "launch": { @@ -35,7 +35,7 @@ "display": "Dev Lobby" }, "downloads": { - "engines" : [ "104.0.1-1156-gb72a9cc maintenance" ] + "engines" : [ "104.0.1-1208-gb3ccab9 maintenance" ] }, "no_start_script" : true, "no_downloads" : true,