diff --git a/Gamedata/alldefs_post.lua b/Gamedata/alldefs_post.lua index c41534cc0..3f89f93d8 100644 --- a/Gamedata/alldefs_post.lua +++ b/Gamedata/alldefs_post.lua @@ -482,9 +482,9 @@ function ModOptions_Post (UnitDefs, WeaponDefs) unitDef.buildcostenergy = 0 end - -- Set maximum possible workertime to 2 - if unitDef.workertime and unitDef.workertime >= 2 then - unitDef.workertime = 2 + -- Set maximum possible workertime to 8 + if unitDef.workertime and unitDef.workertime >= 8 then + unitDef.workertime = 8 end end end diff --git a/Gamedata/unitdefs_pre.lua b/Gamedata/unitdefs_pre.lua index 4d558cb8f..7a5f957a5 100644 --- a/Gamedata/unitdefs_pre.lua +++ b/Gamedata/unitdefs_pre.lua @@ -28,6 +28,33 @@ Shared.buildList = { -- [[ecommander]], } +Shared.buildListeCommanderFactory = { + [[ehbotengineer]], + [[eorb]], + [[escoutdrone]], + [[ebox]], + [[ehbotfac]], + [[eminifac]], + [[ebasefactory]], + [[eamphibfac]], + [[eairplant]], + [[ehbotpeewee]], + [[ehbotthud]], + [[ehbotsniper]], + [[eallterrlight]], + [[eallterrriot]], + [[eallterrheavy]], + [[elighttank3]], + [[eriottank2]], + [[eheavytank3]], + [[eamphibbuggy]], + [[eamphibriot]], + [[eamphibmedtank]], + [[efighter]], + [[egunship2]], + [[ebomber]], +} + Shared.buildListChicken = { [[croost]] } diff --git a/LuaRules/Configs/morph_defs.lua b/LuaRules/Configs/morph_defs.lua index dcec79454..bd49f6354 100644 --- a/LuaRules/Configs/morph_defs.lua +++ b/LuaRules/Configs/morph_defs.lua @@ -115,7 +115,7 @@ Overseer]], Overseer]], energy = energyCost_ecommanderbuild, metal = 0, - text = 'Evolve into Builder Overseer: Stun ability AOE halved, Stun recharge halved, gains x3 buildpower.', + text = 'Evolve into Builder Overseer: Stun ability AOE halved, Stun recharge halved, gains 4x buildpower.', require = [[tech2]], }, { @@ -125,7 +125,7 @@ Overseer]], Overseer]], energy = energyCost_ecommanderfactory, metal = 0, - text = 'Evolve into Factory Overseer: Gains the ability to build all raider, riot, and MBTs anywhere, gains 3x buildpower.', + text = 'Evolve into Factory Overseer: Gains the ability to build all raider, riot, and MBTs anywhere, gains 8x buildpower.', require = [[tech2]], }, { @@ -166,7 +166,7 @@ Overseer]], Overseer]], energy = energyCost_ecommanderbuild, metal = 0, - text = 'Evolve into Builder Overseer: Stun ability AOE halved, Stun recharge halved, gains x3 buildpower.', + text = 'Evolve into Builder Overseer: Stun ability AOE halved, Stun recharge halved, gains 4x buildpower.', }, { into = 'ecommanderfactory', @@ -175,7 +175,7 @@ Overseer]], Overseer]], energy = energyCost_ecommanderfactory, metal = 0, - text = 'Evolve into Factory Overseer: Gains the ability to build all raider, riot, and MBTs anywhere, gains 3x buildpower.', + text = 'Evolve into Factory Overseer: Gains the ability to build all raider, riot, and MBTs anywhere, gains 8x buildpower.', }, { into = 'ecommanderbattle', @@ -215,7 +215,7 @@ Overseer]], Overseer]], energy = energyCost_ecommanderbuild, metal = 0, - text = 'Evolve into Builder Overseer: Stun ability AOE halved, Stun recharge halved, gains x3 buildpower.', + text = 'Evolve into Builder Overseer: Stun ability AOE halved, Stun recharge halved, gains 4x buildpower.', }, { into = 'ecommanderfactory', @@ -224,7 +224,7 @@ Overseer]], Overseer]], energy = energyCost_ecommanderfactory, metal = 0, - text = 'Evolve into Factory Overseer: Gains the ability to build all raider, riot, and MBTs anywhere, gains 3x buildpower.', + text = 'Evolve into Factory Overseer: Gains the ability to build all raider, riot, and MBTs anywhere, gains 8x buildpower.', }, { into = 'ecommanderbattle', @@ -273,7 +273,7 @@ Overseer]], Overseer]], energy = energyCost_ecommanderfactory, metal = 0, - text = 'Evolve into Factory Overseer: Gains the ability to build all raider, riot, and MBTs anywhere, gains 3x buildpower.', + text = 'Evolve into Factory Overseer: Gains the ability to build all raider, riot, and MBTs anywhere, gains 8x buildpower.', }, { into = 'ecommanderbattle', @@ -322,7 +322,7 @@ Overseer]], Overseer]], energy = energyCost_ecommanderbuild, metal = 0, - text = 'Evolve into Builder Overseer: Stun ability AOE halved, Stun recharge halved, gains x3 buildpower.', + text = 'Evolve into Builder Overseer: Stun ability AOE halved, Stun recharge halved, gains x4 buildpower.', }, { into = 'ecommanderbattle', @@ -380,7 +380,7 @@ Overseer]], Overseer]], energy = energyCost_ecommanderbuild, metal = 0, - text = 'Evolve into Builder Overseer: Stun ability AOE halved, Stun recharge halved, gains x3 buildpower.', + text = 'Evolve into Builder Overseer: Stun ability AOE halved, Stun recharge halved, gains 4x buildpower.', }, { into = 'ecommanderfactory', @@ -389,7 +389,7 @@ Overseer]], Overseer]], energy = energyCost_ecommanderfactory, metal = 0, - text = 'Evolve into Factory Overseer: Gains the ability to build all raider, riot, and MBTs anywhere, gains 3x buildpower.', + text = 'Evolve into Factory Overseer: Gains the ability to build all raider, riot, and MBTs anywhere, gains 8x buildpower.', }, }, diff --git a/LuaUI/Widgets_Evo/unit_customrings.lua b/LuaUI/Widgets_Evo/unit_customrings.lua index 3d0a0b67f..d5fda1e4f 100644 --- a/LuaUI/Widgets_Evo/unit_customrings.lua +++ b/LuaUI/Widgets_Evo/unit_customrings.lua @@ -31,11 +31,11 @@ local ringsDefs = { --{ color = {0.5, 0, 1, 0.2}, lineWidth = 5, radius = 500 }, }, [UnitDefNames.ecommandercloak.id] = { - { color = {1, 0.5, 0, 0.8}, lineWidth = 2, radius = 1000 }, + --{ color = {1, 0.5, 0, 0.8}, lineWidth = 2, radius = 1000 }, --{ color = {0.5, 0, 1, 0.2}, lineWidth = 5, radius = 500 }, }, [UnitDefNames.ecommandershield.id] = { - { color = {1, 0.5, 0, 0.8}, lineWidth = 2, radius = 1000 }, + --{ color = {1, 0.5, 0, 0.8}, lineWidth = 2, radius = 1000 }, { color = {0, 0, 1, 0.5}, lineWidth = 5, radius = 500 }, }, [UnitDefNames.ecommanderbuild.id] = { @@ -43,11 +43,11 @@ local ringsDefs = { --{ color = {0.5, 0, 1, 0.2}, lineWidth = 5, radius = 500 }, }, [UnitDefNames.ecommanderbattle.id] = { - { color = {1, 0.5, 0, 0.8}, lineWidth = 2, radius = 500 }, + --{ color = {1, 0.5, 0, 0.8}, lineWidth = 2, radius = 500 }, --{ color = {0.5, 0, 1, 0.2}, lineWidth = 5, radius = 500 }, }, [UnitDefNames.ecommanderfactory.id] = { - { color = {1, 0.5, 0, 0.8}, lineWidth = 2, radius = 500 }, + { color = {1, 0.5, 0, 0.8}, lineWidth = 2, radius = 250 }, --{ color = {0.5, 0, 1, 0.2}, lineWidth = 5, radius = 500 }, }, [UnitDefNames.eorb.id] = { diff --git a/Units/ecommanderbattle.lua b/Units/ecommanderbattle.lua index 45cb0e76a..63fe53280 100644 --- a/Units/ecommanderbattle.lua +++ b/Units/ecommanderbattle.lua @@ -104,7 +104,7 @@ local unitDef = { "custom:gdhcannon", }, }, - buildoptions = Shared.buildList, + --buildoptions = Shared.buildList, sounds = { build = "miscfx/buildstart.wav", underattack = "other/unitsunderattack1", @@ -125,7 +125,7 @@ local unitDef = { }, customParams = { unittype = "mobile", - area_mex_def = "emetalextractor", + --area_mex_def = "emetalextractor", ProvideTech = techprovided, RequireTech = techrequired, canbetransported = "true", diff --git a/Units/ecommanderbuild.lua b/Units/ecommanderbuild.lua index 7cf0f75b4..0787a49ca 100644 --- a/Units/ecommanderbuild.lua +++ b/Units/ecommanderbuild.lua @@ -81,7 +81,7 @@ local unitDef = { turnRate = 5000, unitname = unitName, upright = false, - workerTime = 3, + workerTime = 4, capturespeed = 0.25, TerraformSpeed = 2147000, ReclaimSpeed = 0, diff --git a/Units/ecommandercloak.lua b/Units/ecommandercloak.lua index e469707fc..c95a1913e 100644 --- a/Units/ecommandercloak.lua +++ b/Units/ecommandercloak.lua @@ -43,7 +43,7 @@ local unitDef = { canreclaim = false, canstop = true, category = "NOTAIR SUPPORT LIGHT", - description = [[Builds Units • Provides Cloak Field]], + description = [[Provides Massive Cloak Field]], energyMake = 0, energyStorage = 0, energyUse = 0, @@ -100,7 +100,7 @@ local unitDef = { "custom:blacksmoke", }, }, - buildoptions = Shared.buildList, + --buildoptions = Shared.buildList, sounds = { build = "miscfx/buildstart.wav", underattack = "other/unitsunderattack1", @@ -118,7 +118,7 @@ local unitDef = { }, customParams = { unittype = "mobile", - area_mex_def = "emetalextractor", + --area_mex_def = "emetalextractor", ProvideTech = techprovided, RequireTech = techrequired, canbetransported = "true", diff --git a/Units/ecommanderfactory.lua b/Units/ecommanderfactory.lua index b3d24f52f..2875fbbd7 100644 --- a/Units/ecommanderfactory.lua +++ b/Units/ecommanderfactory.lua @@ -26,7 +26,7 @@ local unitDef = { brakeRate = 1, buildCostEnergy = 0, buildCostMetal = 1000, - buildDistance = 500, + buildDistance = 250, builder = true, buildTime = 2.5, capturable = false, @@ -81,7 +81,7 @@ local unitDef = { turnRate = 5000, unitname = unitName, upright = false, - workerTime = 3, + workerTime = 8, capturespeed = 0.25, TerraformSpeed = 2147000, ReclaimSpeed = 0, @@ -99,7 +99,7 @@ local unitDef = { "custom:blacksmoke", }, }, - buildoptions = Shared.buildListFactory, + buildoptions = Shared.buildListeCommanderFactory, sounds = { build = "miscfx/buildstart.wav", underattack = "other/unitsunderattack1", @@ -117,7 +117,7 @@ local unitDef = { }, customParams = { unittype = "mobile", - area_mex_def = "emetalextractor", + --area_mex_def = "emetalextractor", ProvideTech = techprovided, RequireTech = techrequired, canbetransported = "true", diff --git a/Units/ecommandermeteor.lua b/Units/ecommandermeteor.lua index 76421f3fd..b90945ebd 100644 --- a/Units/ecommandermeteor.lua +++ b/Units/ecommandermeteor.lua @@ -146,7 +146,7 @@ local weaponDefs = { collideFriendly = false, collideFeature = false, commandFire = true, - burst = 50, + burst = 100, burstrate = 0.1, --projectiles = 5, cegTag = "METEORTRAIL", diff --git a/Units/ecommandershield.lua b/Units/ecommandershield.lua index 2aa5b784e..ff25ad1f5 100644 --- a/Units/ecommandershield.lua +++ b/Units/ecommandershield.lua @@ -47,7 +47,7 @@ local unitDef = { canreclaim = false, canstop = true, category = "NOTAIR SUPPORT LIGHT", - description = [[Builds Units • Provides large shielding]], + description = [[Provides large shielding • Self-Heals out of combat 40hp/s when idle]], energyMake = 0, energyStorage = 0, energyUse = 0, @@ -56,8 +56,8 @@ local unitDef = { footprintZ = 4, hideDamage = true, iconType = "commander", - idleAutoHeal = .5, - idleTime = 2200, + idleAutoHeal = 40, + idleTime = 5, levelground = true, maxDamage = 7500, maxSlope = 180, @@ -103,7 +103,7 @@ local unitDef = { "custom:blacksmoke", }, }, - buildoptions = Shared.buildList, + --buildoptions = Shared.buildList, sounds = { build = "miscfx/buildstart.wav", underattack = "other/unitsunderattack1", @@ -124,7 +124,7 @@ local unitDef = { }, customParams = { unittype = "mobile", - area_mex_def = "emetalextractor", + --area_mex_def = "emetalextractor", ProvideTech = techprovided, RequireTech = techrequired, canbetransported = "true",