From c747793875af10432d9427bcdb54b9f4d65a71e5 Mon Sep 17 00:00:00 2001 From: ForbodingAngel Date: Tue, 14 Feb 2017 01:55:20 -0800 Subject: [PATCH] Add B.O.X. unit Allow BOX to spawn drones Remove drone spawning ability from all other units Remove all energy core reclamation from all units except O.R.B. --- Features/All Worlds/ammobox.lua | 4 +- Gamedata/alldefs_post.lua | 10 ++-- Gamedata/unitdefs_pre.lua | 1 + LuaRules/Gadgets/game_boxcollector.lua | 16 +++--- LuaUI/Widgets_Evo/unit_customrings.lua | 25 ++++++---- Scripts/ebox_lus.lua | 16 +----- Units/AIUnits/ecommanderai.lua | 4 +- Units/arm/armflash.lua | 1 - Units/chicken/queen.lua | 2 +- Units/eair/eairengineer.lua | 1 - Units/eair/upgraded/eairengineer_t2.lua | 1 - Units/eallterrain/eallterraa.lua | 2 +- Units/eallterrain/eallterranarchid.lua | 2 +- Units/eallterrain/eallterrassault.lua | 2 +- Units/eallterrain/eallterrengineer.lua | 3 +- Units/eallterrain/eallterrheavy.lua | 2 +- Units/eallterrain/eallterrlight.lua | 2 +- Units/eallterrain/eallterrmed.lua | 2 +- Units/eallterrain/eallterrriot.lua | 2 +- Units/eallterrain/eallterrshield.lua | 2 +- .../upgraded/eallterranarchid_t2.lua | 2 +- .../upgraded/eallterrassault_t2.lua | 2 +- .../upgraded/eallterrengineer_t2.lua | 3 +- .../eallterrain/upgraded/eallterrheavy_t2.lua | 2 +- .../eallterrain/upgraded/eallterrlight_t2.lua | 2 +- Units/eallterrain/upgraded/eallterrmed_t2.lua | 2 +- .../eallterrain/upgraded/eallterrriot_t2.lua | 2 +- .../upgraded/eallterrshield_t2.lua | 2 +- Units/eamphib/eamphibaa.lua | 2 +- Units/eamphib/eamphibarty.lua | 1 - Units/eamphib/eamphibbuggy.lua | 2 +- Units/eamphib/eamphibengineer.lua | 3 +- Units/eamphib/eamphibleveler.lua | 2 +- Units/eamphib/eamphibmedtank.lua | 2 +- Units/eamphib/eamphibneedle.lua | 2 +- Units/eamphib/eamphibriot.lua | 2 +- Units/eamphib/eamphibrock.lua | 2 +- Units/eamphib/esubmarine.lua | 2 +- Units/eamphib/upgraded/eamphibarty_t2.lua | 1 - Units/eamphib/upgraded/eamphibbuggy_t2.lua | 2 +- Units/eamphib/upgraded/eamphibengineer_t2.lua | 3 +- Units/eamphib/upgraded/eamphibleveler_t2.lua | 2 +- Units/eamphib/upgraded/eamphibmedtank_t2.lua | 2 +- Units/eamphib/upgraded/eamphibneedle_t2.lua | 2 +- Units/eamphib/upgraded/eamphibriot_t2.lua | 2 +- Units/eamphib/upgraded/eamphibrock_t2.lua | 2 +- Units/ebox.lua | 50 +++++++------------ Units/ebuilding/emine.lua | 3 +- Units/ecommander.lua | 4 +- Units/ecommanderbattle.lua | 4 +- Units/ecommanderbuild.lua | 4 +- Units/ecommandercloak.lua | 4 +- Units/ecommanderfactory.lua | 4 +- Units/ecommandershield.lua | 4 +- Units/eexperimental/eexkrabgroth.lua | 2 +- Units/eexperimental/eexnukearty.lua | 2 +- Units/eexperimental/eextankdestroyer.lua | 2 +- Units/ehbot/ehbotengineer.lua | 3 +- Units/ehbot/ehbotpeewee.lua | 2 +- Units/ehbot/ehbotrocko.lua | 2 +- Units/ehbot/ehbotsniper.lua | 2 +- Units/ehbot/ehbotthud.lua | 2 +- Units/ehbot/turret/ehbotengineer_turret.lua | 3 +- Units/ehbot/turret/ehbotpeewee_turret.lua | 2 +- Units/ehbot/turret/ehbotrocko_turret.lua | 2 +- Units/ehbot/turret/ehbotsniper_turret.lua | 2 +- Units/ehbot/turret/ehbotthud_turret.lua | 2 +- Units/ehover/eaatank.lua | 2 +- Units/ehover/eartytank.lua | 2 +- Units/ehover/eengineer5.lua | 3 +- Units/ehover/efatso2.lua | 2 +- Units/ehover/eflametank.lua | 2 +- Units/ehover/eheavytank3.lua | 2 +- Units/ehover/eheavytank_t3.lua | 2 +- Units/ehover/elacerator.lua | 2 +- Units/ehover/elighttank3.lua | 2 +- Units/ehover/emediumtank3.lua | 2 +- Units/ehover/emissiletank.lua | 2 +- Units/ehover/eriottank2.lua | 2 +- Units/ehover/upgraded/eartytank_t2.lua | 2 +- Units/ehover/upgraded/eengineer5_t2.lua | 3 +- Units/ehover/upgraded/eheavytank3_t2.lua | 2 +- Units/ehover/upgraded/eheavytank_upgraded.lua | 2 +- Units/ehover/upgraded/elacerator_t2.lua | 2 +- Units/ehover/upgraded/elighttank3_t2.lua | 2 +- .../ehover/upgraded/elighttank3_upgraded.lua | 2 +- Units/ehover/upgraded/emissiletank_t2.lua | 2 +- Units/ehover/upgraded/eriottank2_t2.lua | 2 +- Units/eorb.lua | 6 +-- Units/mission/engineermarbuk.lua | 2 - 90 files changed, 138 insertions(+), 172 deletions(-) diff --git a/Features/All Worlds/ammobox.lua b/Features/All Worlds/ammobox.lua index aaad55e1b..2d0c5f1d6 100644 --- a/Features/All Worlds/ammobox.lua +++ b/Features/All Worlds/ammobox.lua @@ -2,9 +2,9 @@ local objectname= "ammobox" local featureDef = { name = "ammobox", description =[[Energy Core - • Can be reclaimed for 5 Metal and 5 Energy by moving an Overseer or an ORB in range + • Can be reclaimed for 5 Metal and 5 Energy by moving an O.R.B. in range - • Can be converted to MidKnight Gunship Drone by moving an Engineer in range + • Can be converted to MidKnight Gunship Drone by moving a B.O.X. in range ]], object ="ammobox2.s3o", footprintx =1, diff --git a/Gamedata/alldefs_post.lua b/Gamedata/alldefs_post.lua index a1d8de70d..b12c2ccd7 100644 --- a/Gamedata/alldefs_post.lua +++ b/Gamedata/alldefs_post.lua @@ -103,14 +103,18 @@ function UnitDef_Post(name, uDef) local sqrt = math.sqrt - if (not uDef.mincloakdistance) then + if uDef.cancloak == true then local fx = uDef.footprintx and tonumber(uDef.footprintx) or 1 local fz = uDef.footprintz and tonumber(uDef.footprintz) or 1 local radius = 8 * sqrt((fx * fx) + (fz * fz)) - uDef.mincloakdistance = (radius + 48) + if uDef.customparams and uDef.customparams.decloakradiusmodifier then + uDef.mincloakdistance = (radius * uDef.customparams.decloakradiusmodifier) + else + uDef.mincloakdistance = (radius * 6) + end + end - -------------------------------------------------------------------------------- -------------------------------------------------------------------------------- -- Spring Kludge Removal diff --git a/Gamedata/unitdefs_pre.lua b/Gamedata/unitdefs_pre.lua index 09e2e5a3a..c285fbf9e 100644 --- a/Gamedata/unitdefs_pre.lua +++ b/Gamedata/unitdefs_pre.lua @@ -20,6 +20,7 @@ Shared.buildList = { [[esilo]], [[emine]], [[eorb]], + [[ebox]], } if Spring.GetModOptions ~= nil then diff --git a/LuaRules/Gadgets/game_boxcollector.lua b/LuaRules/Gadgets/game_boxcollector.lua index 946480945..f4b19d8dc 100644 --- a/LuaRules/Gadgets/game_boxcollector.lua +++ b/LuaRules/Gadgets/game_boxcollector.lua @@ -69,7 +69,7 @@ if (gadgetHandler:IsSyncedCode()) then local x,y,z = Spring.GetFeaturePosition(box) local unitsInRange = Spring.GetUnitsInSphere(x,y,z, 500)--at x , y , z with radius 200 for _,unit in ipairs(unitsInRange) do - if UnitDefs[Spring.GetUnitDefID(unit)].customParams.cancollect and select(5, Spring.GetUnitHealth(unit)) == 1 then + if UnitDefs[Spring.GetUnitDefID(unit)].customParams.energycorecollect and select(5, Spring.GetUnitHealth(unit)) == 1 then --local remM, maxM, remE, maxE, left = Spring.GetFeatureResources(box) --- [1] is metal, [3] is energy Spring.AddTeamResource(Spring.GetUnitTeam(unit) , "m", 5) Spring.AddTeamResource(Spring.GetUnitTeam(unit) , "e", 5) @@ -80,16 +80,16 @@ if (gadgetHandler:IsSyncedCode()) then BoxesOnMap[box] = nil break end - if UnitDefs[Spring.GetUnitDefID(unit)].customParams.dronespawner and select(5, Spring.GetUnitHealth(unit)) == 1 then + if UnitDefs[Spring.GetUnitDefID(unit)].customParams.energycoredronespawner and select(5, Spring.GetUnitHealth(unit)) == 1 then Spring.CreateUnit("edrone", x, y, z, 0, Spring.GetUnitTeam(unit)) Spring.DestroyFeature(box) local fx, fy, fz = Spring.GetFeaturePosition(box) - Spring.PlaySoundFile("sounds/dronespawner.wav", 1, fx, fy, fz) + Spring.PlaySoundFile("sounds/energycoredronespawner.wav", 1, fx, fy, fz) SpawnCEG("sparkleorangeplus1drone", fx, fy, fz) BoxesOnMap[box] = nil break end - -- if (UnitDefs[Spring.GetUnitDefID(unit)].customParams.amphibdronespawner) then + -- if (UnitDefs[Spring.GetUnitDefID(unit)].customParams.amphibenergycoredronespawner) then -- Spring.CreateUnit("eamphibdrone", x, y, z, 0, Spring.GetUnitTeam(unit)) -- Spring.DestroyFeature(box) -- local fx, fy, fz = Spring.GetFeaturePosition(box) @@ -106,7 +106,7 @@ if (gadgetHandler:IsSyncedCode()) then local eggx,eggy,eggz = Spring.GetFeaturePosition(chickenEgg) local unitsInRange = Spring.GetUnitsInSphere(eggx,eggy,eggz, 500)--at x , y , z with radius 200 for _,unit in ipairs(unitsInRange) do - if UnitDefs[Spring.GetUnitDefID(unit)].customParams.cancollect and select(5, Spring.GetUnitHealth(unit)) == 1 then + if UnitDefs[Spring.GetUnitDefID(unit)].customParams.energycorecollect and select(5, Spring.GetUnitHealth(unit)) == 1 then --local remM, maxM, remE, maxE, left = Spring.GetFeatureResources(chickenEgg) --- [1] is metal, [3] is energy Spring.AddTeamResource(Spring.GetUnitTeam(unit) , "m", 5) Spring.AddTeamResource(Spring.GetUnitTeam(unit) , "e", 5) @@ -125,7 +125,7 @@ if (gadgetHandler:IsSyncedCode()) then local eggx,eggy,eggz = Spring.GetFeaturePosition(chickenEggB) local unitsInRange = Spring.GetUnitsInSphere(eggx,eggy,eggz, 500)--at x , y , z with radius 200 for _,unit in ipairs(unitsInRange) do - if UnitDefs[Spring.GetUnitDefID(unit)].customParams.cancollect and select(5, Spring.GetUnitHealth(unit)) == 1 then + if UnitDefs[Spring.GetUnitDefID(unit)].customParams.energycorecollect and select(5, Spring.GetUnitHealth(unit)) == 1 then --local remM, maxM, remE, maxE, left = Spring.GetFeatureResources(chickenEggB) --- [1] is metal, [3] is energy Spring.AddTeamResource(Spring.GetUnitTeam(unit) , "m", 5) Spring.AddTeamResource(Spring.GetUnitTeam(unit) , "e", 5) @@ -144,7 +144,7 @@ if (gadgetHandler:IsSyncedCode()) then local eggx,eggy,eggz = Spring.GetFeaturePosition(chickenEggC) local unitsInRange = Spring.GetUnitsInSphere(eggx,eggy,eggz, 500)--at x , y , z with radius 200 for _,unit in ipairs(unitsInRange) do - if UnitDefs[Spring.GetUnitDefID(unit)].customParams.cancollect and select(5, Spring.GetUnitHealth(unit)) == 1 then + if UnitDefs[Spring.GetUnitDefID(unit)].customParams.energycorecollect and select(5, Spring.GetUnitHealth(unit)) == 1 then --local remM, maxM, remE, maxE, left = Spring.GetFeatureResources(chickenEggC) --- [1] is metal, [3] is energy Spring.AddTeamResource(Spring.GetUnitTeam(unit) , "m", 5) Spring.AddTeamResource(Spring.GetUnitTeam(unit) , "e", 5) @@ -163,7 +163,7 @@ if (gadgetHandler:IsSyncedCode()) then local eggx,eggy,eggz = Spring.GetFeaturePosition(chickenEggD) local unitsInRange = Spring.GetUnitsInSphere(eggx,eggy,eggz, 500)--at x , y , z with radius 200 for _,unit in ipairs(unitsInRange) do - if UnitDefs[Spring.GetUnitDefID(unit)].customParams.cancollect and select(5, Spring.GetUnitHealth(unit)) == 1 then + if UnitDefs[Spring.GetUnitDefID(unit)].customParams.energycorecollect and select(5, Spring.GetUnitHealth(unit)) == 1 then --local remM, maxM, remE, maxE, left = Spring.GetFeatureResources(chickenEggD) --- [1] is metal, [3] is energy Spring.AddTeamResource(Spring.GetUnitTeam(unit) , "m", 5) Spring.AddTeamResource(Spring.GetUnitTeam(unit) , "e", 5) diff --git a/LuaUI/Widgets_Evo/unit_customrings.lua b/LuaUI/Widgets_Evo/unit_customrings.lua index 79bb9025f..9ebb7a8a4 100644 --- a/LuaUI/Widgets_Evo/unit_customrings.lua +++ b/LuaUI/Widgets_Evo/unit_customrings.lua @@ -27,55 +27,58 @@ end local ringsDefs = { [UnitDefNames.ecommander.id] = { { color = {1, 0.5, 0, 0.8}, lineWidth = 2, radius = 1000 }, - { color = {0.5, 0, 1, 0.2}, lineWidth = 5, radius = 500 }, + --{ 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 = {0.5, 0, 1, 0.2}, lineWidth = 5, radius = 500 }, + --{ 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 = {0.5, 0, 1, 0.2}, lineWidth = 5, radius = 500 }, + --{ color = {0.5, 0, 1, 0.2}, lineWidth = 5, radius = 500 }, }, [UnitDefNames.ecommanderbuild.id] = { { color = {1, 0.5, 0, 0.8}, lineWidth = 2, radius = 1500 }, - { color = {0.5, 0, 1, 0.2}, lineWidth = 5, radius = 500 }, + --{ color = {0.5, 0, 1, 0.2}, lineWidth = 5, radius = 500 }, }, [UnitDefNames.ecommanderbattle.id] = { { color = {1, 0.5, 0, 0.8}, lineWidth = 2, radius = 1000 }, - { color = {0.5, 0, 1, 0.2}, lineWidth = 5, 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 = 1000 }, - { color = {0.5, 0, 1, 0.2}, lineWidth = 5, radius = 500 }, + --{ color = {0.5, 0, 1, 0.2}, lineWidth = 5, radius = 500 }, }, [UnitDefNames.eorb.id] = { { color = {1,0.5,0,0.8}, lineWidth = 2, radius = 800 }, { color = {0.5,0,1,0.2}, lineWidth = 5, radius = 500 }, { color = {0,1,0,0.6}, lineWidth = 10, radius = 1000 }, + }, + [UnitDefNames.ebox.id] = { + { color = {0.5,0,1,0.2}, lineWidth = 5, radius = 500 }, }, [UnitDefNames.eengineer5.id] = { { color = {1, 0.5, 0, 0.8}, lineWidth = 2, radius = 800 }, - { color = {0.5, 0, 1, 0.2}, lineWidth = 5, radius = 500 }, + --{ color = {0.5, 0, 1, 0.2}, lineWidth = 5, radius = 500 }, }, [UnitDefNames.eamphibengineer.id] = { { color = {1, 0.5, 0, 0.8}, lineWidth = 2, radius = 800 }, - { color = {0.5, 0, 1, 0.2}, lineWidth = 5, radius = 500 }, + --{ color = {0.5, 0, 1, 0.2}, lineWidth = 5, radius = 500 }, }, [UnitDefNames.eallterrengineer.id] = { { color = {1, 0.5, 0, 0.8}, lineWidth = 2, radius = 800 }, - { color = {0.5, 0, 1, 0.2}, lineWidth = 5, radius = 500 }, + --{ color = {0.5, 0, 1, 0.2}, lineWidth = 5, radius = 500 }, }, [UnitDefNames.eairengineer.id] = { { color = {1, 0.5, 0, 0.8}, lineWidth = 2, radius = 600 }, }, [UnitDefNames.ehbotengineer.id] = { { color = {1, 0.5, 0, 0.8}, lineWidth = 2, radius = 800 }, - { color = {0.5, 0, 1, 0.2}, lineWidth = 5, radius = 500 }, + --{ color = {0.5, 0, 1, 0.2}, lineWidth = 5, radius = 500 }, }, [UnitDefNames.ehbotengineer_turret.id] = { { color = {1, 0.5, 0, 0.8}, lineWidth = 2, radius = 1200 }, - { color = {0.5, 0, 1, 0.2}, lineWidth = 5, radius = 500 }, + --{ color = {0.5, 0, 1, 0.2}, lineWidth = 5, radius = 500 }, { color = {0,1,0,0.6}, lineWidth = 10, radius = 1000 }, }, } diff --git a/Scripts/ebox_lus.lua b/Scripts/ebox_lus.lua index 72d6119e6..33fb711c2 100644 --- a/Scripts/ebox_lus.lua +++ b/Scripts/ebox_lus.lua @@ -8,6 +8,7 @@ terrainType = "terrainType" function script.Create() StartThread(common.SmokeUnit, {base, turret, barrel1}) building = false + Move(base, y_axis, 5, 200) end common = include("headers/common_includes_lus.lua") @@ -25,21 +26,6 @@ function thrust() common.DirtTrail() end -local nanoPoints = {'forwarddome', 'reardome'} - -Spring.SetUnitNanoPieces(unitID, nanoPoints) - -function script.StartBuilding(heading, pitch) - -- TODO: This is where you would add your unpack / point towards animation - SetUnitValue(COB.INBUILDSTANCE, true) - building = true -end -function script.StopBuilding() - -- TODO: This is where you would add your pack-up animation - SetUnitValue(COB.INBUILDSTANCE, false) - building = false -end - function script.Killed() Explode(forwarddome, SFX.EXPLODE_ON_HIT) Explode(reardome, SFX.EXPLODE_ON_HIT) diff --git a/Units/AIUnits/ecommanderai.lua b/Units/AIUnits/ecommanderai.lua index 2e3ec2c9a..c65357d29 100644 --- a/Units/AIUnits/ecommanderai.lua +++ b/Units/AIUnits/ecommanderai.lua @@ -29,7 +29,7 @@ local unitDef = { canBeAssisted = true, CanCapture = true, CanRepair = true, - cancollect = "1", + canGuard = true, canMove = true, canPatrol = true, @@ -148,7 +148,7 @@ There can only be one!]], supply_granted = supplyGiven, ProvideTech = powerprovided, death_sounds = "generic", - cancollect = "1", + armortype = armortype, nofriendlyfire = "1", normaltex = "unittextures/lego2skin_explorernormal.dds", diff --git a/Units/arm/armflash.lua b/Units/arm/armflash.lua index 689b83dc0..61d86aad9 100644 --- a/Units/arm/armflash.lua +++ b/Units/arm/armflash.lua @@ -18,7 +18,6 @@ local unitDef = { builder = false, buildTime = 5, canAttack = true, - cancollect = "1", canGuard = true, canMove = true, canPatrol = true, diff --git a/Units/chicken/queen.lua b/Units/chicken/queen.lua index 39e0cccb4..940342b13 100644 --- a/Units/chicken/queen.lua +++ b/Units/chicken/queen.lua @@ -14,7 +14,7 @@ local unitDef = { builder = false, buildTime = 5, canAttack = true, - cancollect = "1", + canGuard = true, canMove = true, canPatrol = true, diff --git a/Units/eair/eairengineer.lua b/Units/eair/eairengineer.lua index a6bcd081b..6e9f5b3e7 100644 --- a/Units/eair/eairengineer.lua +++ b/Units/eair/eairengineer.lua @@ -113,7 +113,6 @@ local unitDef = { area_mex_def = "emetalextractor", -- needed_cover = 2, death_sounds = "generic", - -- airdronespawner = "1", armortype = armortype, -- supply_cost = supply, normaltex = "unittextures/lego2skin_explorernormal.dds", diff --git a/Units/eair/upgraded/eairengineer_t2.lua b/Units/eair/upgraded/eairengineer_t2.lua index 3723aac25..df4dee4ef 100644 --- a/Units/eair/upgraded/eairengineer_t2.lua +++ b/Units/eair/upgraded/eairengineer_t2.lua @@ -114,7 +114,6 @@ local unitDef = { area_mex_def = "emetalextractor", -- needed_cover = 2, death_sounds = "generic", - -- airdronespawner = "1", armortype = armortype, -- supply_cost = supply, normaltex = "unittextures/lego2skin_explorernormal.dds", diff --git a/Units/eallterrain/eallterraa.lua b/Units/eallterrain/eallterraa.lua index 8fe646b23..fe0188d72 100644 --- a/Units/eallterrain/eallterraa.lua +++ b/Units/eallterrain/eallterraa.lua @@ -19,7 +19,7 @@ local unitDef = { builder = false, buildTime = 5, canAttack = true, - cancollect = "1", + canGuard = true, canMove = true, canPatrol = true, diff --git a/Units/eallterrain/eallterranarchid.lua b/Units/eallterrain/eallterranarchid.lua index 0d980e64b..1e184e459 100644 --- a/Units/eallterrain/eallterranarchid.lua +++ b/Units/eallterrain/eallterranarchid.lua @@ -42,7 +42,7 @@ local unitDef = { builder = false, buildTime = 5, canAttack = true, - cancollect = "1", + canGuard = true, canMove = true, canPatrol = true, diff --git a/Units/eallterrain/eallterrassault.lua b/Units/eallterrain/eallterrassault.lua index 67c65615b..f833206cb 100644 --- a/Units/eallterrain/eallterrassault.lua +++ b/Units/eallterrain/eallterrassault.lua @@ -35,7 +35,7 @@ local unitDef = { builder = false, buildTime = 5, canAttack = true, - cancollect = "1", + canGuard = true, canMove = true, canPatrol = true, diff --git a/Units/eallterrain/eallterrengineer.lua b/Units/eallterrain/eallterrengineer.lua index 5c1da52cc..f40221a73 100644 --- a/Units/eallterrain/eallterrengineer.lua +++ b/Units/eallterrain/eallterrengineer.lua @@ -33,7 +33,7 @@ local unitDef = { CanCapture = false, CanRepair = true, canRestore = false, - cancollect = "1", + canGuard = true, canMove = true, canPatrol = true, @@ -123,7 +123,6 @@ local unitDef = { canbetransported = "true", needed_cover = 1, death_sounds = "generic", - dronespawner = "1", armortype = armortype, -- supply_cost = supply, normaltex = "unittextures/con_legonormal.png", diff --git a/Units/eallterrain/eallterrheavy.lua b/Units/eallterrain/eallterrheavy.lua index 6c773972f..6a0d49e3d 100644 --- a/Units/eallterrain/eallterrheavy.lua +++ b/Units/eallterrain/eallterrheavy.lua @@ -35,7 +35,7 @@ local unitDef = { builder = false, buildTime = 5, canAttack = true, - cancollect = "1", + canGuard = true, canMove = true, canPatrol = true, diff --git a/Units/eallterrain/eallterrlight.lua b/Units/eallterrain/eallterrlight.lua index b10874936..dec974f3d 100644 --- a/Units/eallterrain/eallterrlight.lua +++ b/Units/eallterrain/eallterrlight.lua @@ -35,7 +35,7 @@ local unitDef = { builder = false, buildTime = 5, canAttack = true, - cancollect = "1", + canGuard = true, canMove = true, canPatrol = true, diff --git a/Units/eallterrain/eallterrmed.lua b/Units/eallterrain/eallterrmed.lua index 82e7fd91f..a94ce815d 100644 --- a/Units/eallterrain/eallterrmed.lua +++ b/Units/eallterrain/eallterrmed.lua @@ -35,7 +35,7 @@ local unitDef = { builder = false, buildTime = 5, canAttack = true, - cancollect = "1", + canGuard = true, canMove = true, canPatrol = true, diff --git a/Units/eallterrain/eallterrriot.lua b/Units/eallterrain/eallterrriot.lua index 5118b81da..9b71e9bf5 100644 --- a/Units/eallterrain/eallterrriot.lua +++ b/Units/eallterrain/eallterrriot.lua @@ -43,7 +43,7 @@ local unitDef = { builder = false, buildTime = 5, canAttack = true, - cancollect = "1", + -- canDgun = true, canGuard = true, canMove = true, diff --git a/Units/eallterrain/eallterrshield.lua b/Units/eallterrain/eallterrshield.lua index fcc175bbe..6ed1707be 100644 --- a/Units/eallterrain/eallterrshield.lua +++ b/Units/eallterrain/eallterrshield.lua @@ -32,7 +32,7 @@ local unitDef = { builder = false, buildTime = 5, canAttack = false, - cancollect = "1", + canGuard = true, canMove = true, canPatrol = true, diff --git a/Units/eallterrain/upgraded/eallterranarchid_t2.lua b/Units/eallterrain/upgraded/eallterranarchid_t2.lua index d1ef11b38..3553d9b42 100644 --- a/Units/eallterrain/upgraded/eallterranarchid_t2.lua +++ b/Units/eallterrain/upgraded/eallterranarchid_t2.lua @@ -42,7 +42,7 @@ local unitDef = { builder = false, buildTime = 5, canAttack = true, - cancollect = "1", + canGuard = true, canMove = true, canPatrol = true, diff --git a/Units/eallterrain/upgraded/eallterrassault_t2.lua b/Units/eallterrain/upgraded/eallterrassault_t2.lua index 0c5f288c9..ae6d9a73d 100644 --- a/Units/eallterrain/upgraded/eallterrassault_t2.lua +++ b/Units/eallterrain/upgraded/eallterrassault_t2.lua @@ -35,7 +35,7 @@ local unitDef = { builder = false, buildTime = 5, canAttack = true, - cancollect = "1", + canGuard = true, canMove = true, canPatrol = true, diff --git a/Units/eallterrain/upgraded/eallterrengineer_t2.lua b/Units/eallterrain/upgraded/eallterrengineer_t2.lua index 075a98344..d36cbdd4e 100644 --- a/Units/eallterrain/upgraded/eallterrengineer_t2.lua +++ b/Units/eallterrain/upgraded/eallterrengineer_t2.lua @@ -33,7 +33,7 @@ local unitDef = { CanCapture = false, CanRepair = true, canRestore = false, - cancollect = "1", + canGuard = true, canMove = true, canPatrol = true, @@ -123,7 +123,6 @@ local unitDef = { canbetransported = "true", needed_cover = 1, death_sounds = "generic", - dronespawner = "1", armortype = armortype, -- supply_cost = supply, normaltex = "unittextures/con_legonormal.png", diff --git a/Units/eallterrain/upgraded/eallterrheavy_t2.lua b/Units/eallterrain/upgraded/eallterrheavy_t2.lua index 051cc5bcd..3468ef5ec 100644 --- a/Units/eallterrain/upgraded/eallterrheavy_t2.lua +++ b/Units/eallterrain/upgraded/eallterrheavy_t2.lua @@ -35,7 +35,7 @@ local unitDef = { builder = false, buildTime = 5, canAttack = true, - cancollect = "1", + canGuard = true, canMove = true, canPatrol = true, diff --git a/Units/eallterrain/upgraded/eallterrlight_t2.lua b/Units/eallterrain/upgraded/eallterrlight_t2.lua index a0054199b..ed33d24d8 100644 --- a/Units/eallterrain/upgraded/eallterrlight_t2.lua +++ b/Units/eallterrain/upgraded/eallterrlight_t2.lua @@ -35,7 +35,7 @@ local unitDef = { builder = false, buildTime = 5, canAttack = true, - cancollect = "1", + canGuard = true, canMove = true, canPatrol = true, diff --git a/Units/eallterrain/upgraded/eallterrmed_t2.lua b/Units/eallterrain/upgraded/eallterrmed_t2.lua index d27883494..a2b2df17a 100644 --- a/Units/eallterrain/upgraded/eallterrmed_t2.lua +++ b/Units/eallterrain/upgraded/eallterrmed_t2.lua @@ -35,7 +35,7 @@ local unitDef = { builder = false, buildTime = 5, canAttack = true, - cancollect = "1", + canGuard = true, canMove = true, canPatrol = true, diff --git a/Units/eallterrain/upgraded/eallterrriot_t2.lua b/Units/eallterrain/upgraded/eallterrriot_t2.lua index d20c325b2..840aa1abe 100644 --- a/Units/eallterrain/upgraded/eallterrriot_t2.lua +++ b/Units/eallterrain/upgraded/eallterrriot_t2.lua @@ -43,7 +43,7 @@ local unitDef = { builder = false, buildTime = 5, canAttack = true, - cancollect = "1", + -- canDgun = true, canGuard = true, canMove = true, diff --git a/Units/eallterrain/upgraded/eallterrshield_t2.lua b/Units/eallterrain/upgraded/eallterrshield_t2.lua index efc432797..21dd03e64 100644 --- a/Units/eallterrain/upgraded/eallterrshield_t2.lua +++ b/Units/eallterrain/upgraded/eallterrshield_t2.lua @@ -32,7 +32,7 @@ local unitDef = { builder = false, buildTime = 5, canAttack = false, - cancollect = "1", + canGuard = true, canMove = true, canPatrol = true, diff --git a/Units/eamphib/eamphibaa.lua b/Units/eamphib/eamphibaa.lua index ec95ab8c9..b03eb1eae 100644 --- a/Units/eamphib/eamphibaa.lua +++ b/Units/eamphib/eamphibaa.lua @@ -32,7 +32,7 @@ local unitDef = { builder = false, buildTime = 5, canAttack = true, - cancollect = "1", + canGuard = true, canMove = true, canPatrol = true, diff --git a/Units/eamphib/eamphibarty.lua b/Units/eamphib/eamphibarty.lua index a14ce6804..682f2298a 100644 --- a/Units/eamphib/eamphibarty.lua +++ b/Units/eamphib/eamphibarty.lua @@ -35,7 +35,6 @@ local unitDef = { builder = false, buildTime = 5, canAttack = true, - cancollect = "1", canGuard = true, canMove = true, canPatrol = true, diff --git a/Units/eamphib/eamphibbuggy.lua b/Units/eamphib/eamphibbuggy.lua index f2d9649b0..0ccab554d 100644 --- a/Units/eamphib/eamphibbuggy.lua +++ b/Units/eamphib/eamphibbuggy.lua @@ -35,7 +35,7 @@ local unitDef = { builder = false, buildTime = 5, canAttack = true, - cancollect = "1", + canGuard = true, canMove = true, canPatrol = true, diff --git a/Units/eamphib/eamphibengineer.lua b/Units/eamphib/eamphibengineer.lua index 3ad360884..7b3ae65d5 100644 --- a/Units/eamphib/eamphibengineer.lua +++ b/Units/eamphib/eamphibengineer.lua @@ -33,7 +33,7 @@ local unitDef = { CanCapture = false, CanRepair = true, canRestore = false, - cancollect = "1", + canGuard = true, canMove = true, canPatrol = true, @@ -112,7 +112,6 @@ local unitDef = { canbetransported = "true", needed_cover = 1, death_sounds = "generic", - dronespawner = "1", armortype = armortype, -- supply_cost = supply, normaltex = "unittextures/lego2skin_explorernormal.dds", diff --git a/Units/eamphib/eamphibleveler.lua b/Units/eamphib/eamphibleveler.lua index df0b6acba..78ae1b1e5 100644 --- a/Units/eamphib/eamphibleveler.lua +++ b/Units/eamphib/eamphibleveler.lua @@ -42,7 +42,7 @@ local unitDef = { builder = false, buildTime = 5, canAttack = true, - cancollect = "1", + canGuard = true, canMove = true, canPatrol = true, diff --git a/Units/eamphib/eamphibmedtank.lua b/Units/eamphib/eamphibmedtank.lua index 2c2d49589..9171d86b5 100644 --- a/Units/eamphib/eamphibmedtank.lua +++ b/Units/eamphib/eamphibmedtank.lua @@ -35,7 +35,7 @@ local unitDef = { builder = false, buildTime = 5, canAttack = true, - cancollect = "1", + canGuard = true, canMove = true, canPatrol = true, diff --git a/Units/eamphib/eamphibneedle.lua b/Units/eamphib/eamphibneedle.lua index c78bb8e0b..6a4400baf 100644 --- a/Units/eamphib/eamphibneedle.lua +++ b/Units/eamphib/eamphibneedle.lua @@ -35,7 +35,7 @@ local unitDef = { builder = false, buildTime = 5, canAttack = true, - cancollect = "1", + canGuard = true, canMove = true, canPatrol = true, diff --git a/Units/eamphib/eamphibriot.lua b/Units/eamphib/eamphibriot.lua index 9c7bf3376..1fda9a1fa 100644 --- a/Units/eamphib/eamphibriot.lua +++ b/Units/eamphib/eamphibriot.lua @@ -43,7 +43,7 @@ local unitDef = { builder = false, buildTime = 5, canAttack = true, - cancollect = "1", + -- canDgun = true, canGuard = true, canMove = true, diff --git a/Units/eamphib/eamphibrock.lua b/Units/eamphib/eamphibrock.lua index da6843fbf..82b2d98e7 100644 --- a/Units/eamphib/eamphibrock.lua +++ b/Units/eamphib/eamphibrock.lua @@ -39,7 +39,7 @@ local unitDef = { builder = false, buildTime = 5, canAttack = true, - cancollect = "1", + canGuard = true, canMove = true, canPatrol = true, diff --git a/Units/eamphib/esubmarine.lua b/Units/eamphib/esubmarine.lua index adba705f1..05b25eb24 100644 --- a/Units/eamphib/esubmarine.lua +++ b/Units/eamphib/esubmarine.lua @@ -20,7 +20,7 @@ local unitDef = { builder = false, buildTime = 2.5, canAttack = true, - cancollect = "1", + canGuard = true, canMove = true, canPatrol = true, diff --git a/Units/eamphib/upgraded/eamphibarty_t2.lua b/Units/eamphib/upgraded/eamphibarty_t2.lua index b8cb6bad2..7f5fab3c7 100644 --- a/Units/eamphib/upgraded/eamphibarty_t2.lua +++ b/Units/eamphib/upgraded/eamphibarty_t2.lua @@ -35,7 +35,6 @@ local unitDef = { builder = false, buildTime = 5, canAttack = true, - cancollect = "1", canGuard = true, canMove = true, canPatrol = true, diff --git a/Units/eamphib/upgraded/eamphibbuggy_t2.lua b/Units/eamphib/upgraded/eamphibbuggy_t2.lua index 95fc53c14..850fec296 100644 --- a/Units/eamphib/upgraded/eamphibbuggy_t2.lua +++ b/Units/eamphib/upgraded/eamphibbuggy_t2.lua @@ -35,7 +35,7 @@ local unitDef = { builder = false, buildTime = 5, canAttack = true, - cancollect = "1", + canGuard = true, canMove = true, canPatrol = true, diff --git a/Units/eamphib/upgraded/eamphibengineer_t2.lua b/Units/eamphib/upgraded/eamphibengineer_t2.lua index 577a9ee83..ef76a1c6f 100644 --- a/Units/eamphib/upgraded/eamphibengineer_t2.lua +++ b/Units/eamphib/upgraded/eamphibengineer_t2.lua @@ -33,7 +33,7 @@ local unitDef = { CanCapture = false, CanRepair = true, canRestore = false, - cancollect = "1", + canGuard = true, canMove = true, canPatrol = true, @@ -112,7 +112,6 @@ local unitDef = { canbetransported = "true", needed_cover = 1, death_sounds = "generic", - dronespawner = "1", armortype = armortype, -- supply_cost = supply, normaltex = "unittextures/lego2skin_explorernormal.dds", diff --git a/Units/eamphib/upgraded/eamphibleveler_t2.lua b/Units/eamphib/upgraded/eamphibleveler_t2.lua index 4619546ec..05a419869 100644 --- a/Units/eamphib/upgraded/eamphibleveler_t2.lua +++ b/Units/eamphib/upgraded/eamphibleveler_t2.lua @@ -42,7 +42,7 @@ local unitDef = { builder = false, buildTime = 5, canAttack = true, - cancollect = "1", + canGuard = true, canMove = true, canPatrol = true, diff --git a/Units/eamphib/upgraded/eamphibmedtank_t2.lua b/Units/eamphib/upgraded/eamphibmedtank_t2.lua index 570aa9cc1..1247b638c 100644 --- a/Units/eamphib/upgraded/eamphibmedtank_t2.lua +++ b/Units/eamphib/upgraded/eamphibmedtank_t2.lua @@ -35,7 +35,7 @@ local unitDef = { builder = false, buildTime = 5, canAttack = true, - cancollect = "1", + canGuard = true, canMove = true, canPatrol = true, diff --git a/Units/eamphib/upgraded/eamphibneedle_t2.lua b/Units/eamphib/upgraded/eamphibneedle_t2.lua index f3c183023..4930ee1f5 100644 --- a/Units/eamphib/upgraded/eamphibneedle_t2.lua +++ b/Units/eamphib/upgraded/eamphibneedle_t2.lua @@ -35,7 +35,7 @@ local unitDef = { builder = false, buildTime = 5, canAttack = true, - cancollect = "1", + canGuard = true, canMove = true, canPatrol = true, diff --git a/Units/eamphib/upgraded/eamphibriot_t2.lua b/Units/eamphib/upgraded/eamphibriot_t2.lua index 0b4f237d4..11ca55e06 100644 --- a/Units/eamphib/upgraded/eamphibriot_t2.lua +++ b/Units/eamphib/upgraded/eamphibriot_t2.lua @@ -43,7 +43,7 @@ local unitDef = { builder = false, buildTime = 5, canAttack = true, - cancollect = "1", + -- canDgun = true, canGuard = true, canMove = true, diff --git a/Units/eamphib/upgraded/eamphibrock_t2.lua b/Units/eamphib/upgraded/eamphibrock_t2.lua index cbfc98194..9108ec21b 100644 --- a/Units/eamphib/upgraded/eamphibrock_t2.lua +++ b/Units/eamphib/upgraded/eamphibrock_t2.lua @@ -39,7 +39,7 @@ local unitDef = { builder = false, buildTime = 5, canAttack = true, - cancollect = "1", + canGuard = true, canMove = true, canPatrol = true, diff --git a/Units/ebox.lua b/Units/ebox.lua index 392f80e78..08e7e1b9c 100644 --- a/Units/ebox.lua +++ b/Units/ebox.lua @@ -5,6 +5,8 @@ local unitName = "ebox" -------------------------------------------------------------------------------- +local armortype = [[armored]] + local unitDef = { --mobileunit @@ -16,63 +18,48 @@ local unitDef = { brakeRate = 1, buildCostEnergy = 0, buildCostMetal = 35, - buildDistance = 800, - builder = true, + buildDistance = 400, + builder = false, buildTime = 5, - canAssist = false, - canBeAssisted = false, canAttack = false, - canCapture = true, + canCapture = false, canGuard = true, canHover = true, canMove = true, canPatrol = true, canstop = "1", category = "ARMORED NOTAIR", - description = [[Hovering Bomb - Armored - 500 Damage vs Buildings - 250 Damage vs Light/Armored - - Requires +5 Power - Uses +5 Supply]], - energyMake = 0, + description = [[Drone Spawner and Long Range Sight/Radar]], + energyMake = 1, energyStorage = 0, energyUse = 0, - explodeAs = "ebombboom", + explodeAs = "largeExplosionGenericWhite", footprintX = 3, footprintZ = 3, iconType = "assault", idleAutoHeal = .5, idleTime = 2200, leaveTracks = false, - maxDamage = 160, + maxDamage = 400, maxSlope = 26, - maxVelocity = 3, - maxReverseVelocity = 5, + maxVelocity = 4, + maxReverseVelocity = 4, maxWaterDepth = 10, metalStorage = 0, movementClass = "HOVERTANK3", - name = "Shellshock", + name = "B.O.X.", noChaseCategory = "VTOL", objectName = "ebomb2.s3o", script = "ebox_lus.lua", - onlytargetcategory1 = "NOTAIR", - onlytargetcategory2 = "NOTAIR", - onlytargetcategory3 = "NOTAIR", - onlytargetcategory4 = "NOTAIR", - onlytargetcategory5 = "NOTAIR", - onlytargetcategory6 = "NOTAIR", - radarDistance = 0, + radarDistance = 1000, repairable = false, - selfDestructAs = "ebombboom", - selfDestructCountdown = 0, + selfDestructAs = "largeExplosionGenericWhite", side = "CORE", - sightDistance = 500, + sightDistance = 1000, smoothAnim = true, stealth = true, seismicSignature = 2, - turnInPlace = false, + seismicDistance = 1000, turnInPlace = true, turnRate = 5000, unitname = unitName, @@ -100,12 +87,11 @@ local unitDef = { }, customParams = { canbetransported = "true", + armortype = armortype, + energycoredronespawner = true, needed_cover = 1, death_sounds = "generic", - RequireTech = "5 Power", - armortype = "armored", nofriendlyfire = "1", - supply_cost = 5, normaltex = "unittextures/lego2skin_explorernormal.dds", buckettex = "unittextures/lego2skin_explorerbucket.dds", factionname = "outer_colonies", diff --git a/Units/ebuilding/emine.lua b/Units/ebuilding/emine.lua index 7864a4084..fc8ce3705 100644 --- a/Units/ebuilding/emine.lua +++ b/Units/ebuilding/emine.lua @@ -66,7 +66,7 @@ local unitDef = { smoothAnim = true, sonarDistance = 0, seismicDistance = 0, - stealth = false, + stealth = true, unitname = "emine", workerTime = 0, yardMap = "oo oo", @@ -98,6 +98,7 @@ local unitDef = { }, customParams = { + decloakradiusmodifier = 10, needed_cover = 1, death_sounds = "generic", nofriendlyfire = "1", diff --git a/Units/ecommander.lua b/Units/ecommander.lua index 2494be790..73ddec151 100644 --- a/Units/ecommander.lua +++ b/Units/ecommander.lua @@ -35,7 +35,7 @@ local unitDef = { CanCapture = true, CanRepair = true, canRestore = false, - cancollect = "1", + canGuard = true, canMove = true, canPatrol = true, @@ -122,7 +122,7 @@ local unitDef = { needed_cover = 2, supply_granted = supplyGiven, death_sounds = "generic", - cancollect = "1", + armortype = armortype, nofriendlyfire = "1", normaltex = "unittextures/lego2skin_explorernormal.dds", diff --git a/Units/ecommanderbattle.lua b/Units/ecommanderbattle.lua index 1f6962c47..85e731332 100644 --- a/Units/ecommanderbattle.lua +++ b/Units/ecommanderbattle.lua @@ -39,7 +39,7 @@ local unitDef = { CanCapture = true, CanRepair = true, canRestore = false, - cancollect = "1", + canGuard = true, canMove = true, canPatrol = true, @@ -130,7 +130,7 @@ local unitDef = { needed_cover = 2, -- supply_granted = supplyGiven, death_sounds = "generic", - cancollect = "1", + armortype = armortype, nofriendlyfire = "1", normaltex = "unittextures/lego2skin_explorernormal.dds", diff --git a/Units/ecommanderbuild.lua b/Units/ecommanderbuild.lua index 48b012403..822d4e3c2 100644 --- a/Units/ecommanderbuild.lua +++ b/Units/ecommanderbuild.lua @@ -35,7 +35,7 @@ local unitDef = { CanCapture = true, CanRepair = true, canRestore = false, - cancollect = "1", + canGuard = true, canMove = true, canPatrol = true, @@ -122,7 +122,7 @@ local unitDef = { needed_cover = 2, supply_granted = supplyGiven, death_sounds = "generic", - cancollect = "1", + armortype = armortype, nofriendlyfire = "1", normaltex = "unittextures/lego2skin_explorernormal.dds", diff --git a/Units/ecommandercloak.lua b/Units/ecommandercloak.lua index bdb65788f..96cf06c88 100644 --- a/Units/ecommandercloak.lua +++ b/Units/ecommandercloak.lua @@ -35,7 +35,7 @@ local unitDef = { CanCapture = true, CanRepair = true, canRestore = false, - cancollect = "1", + canGuard = true, canMove = true, canPatrol = true, @@ -123,7 +123,7 @@ local unitDef = { needed_cover = 2, supply_granted = supplyGiven, death_sounds = "generic", - cancollect = "1", + armortype = armortype, nofriendlyfire = "1", normaltex = "unittextures/lego2skin_explorernormal.dds", diff --git a/Units/ecommanderfactory.lua b/Units/ecommanderfactory.lua index 2b02e5ab1..d68484ca5 100644 --- a/Units/ecommanderfactory.lua +++ b/Units/ecommanderfactory.lua @@ -35,7 +35,7 @@ local unitDef = { CanCapture = true, CanRepair = true, canRestore = false, - cancollect = "1", + canGuard = true, canMove = true, canPatrol = true, @@ -122,7 +122,7 @@ local unitDef = { needed_cover = 2, supply_granted = supplyGiven, death_sounds = "generic", - cancollect = "1", + armortype = armortype, nofriendlyfire = "1", normaltex = "unittextures/lego2skin_explorernormal.dds", diff --git a/Units/ecommandershield.lua b/Units/ecommandershield.lua index 6b7856591..0e046c27a 100644 --- a/Units/ecommandershield.lua +++ b/Units/ecommandershield.lua @@ -39,7 +39,7 @@ local unitDef = { CanCapture = true, CanRepair = true, canRestore = false, - cancollect = "1", + canGuard = true, canMove = true, canPatrol = true, @@ -129,7 +129,7 @@ local unitDef = { needed_cover = 2, supply_granted = supplyGiven, death_sounds = "generic", - cancollect = "1", + armortype = armortype, nofriendlyfire = "1", normaltex = "unittextures/lego2skin_explorernormal.dds", diff --git a/Units/eexperimental/eexkrabgroth.lua b/Units/eexperimental/eexkrabgroth.lua index 488ea040e..d080bfb7f 100644 --- a/Units/eexperimental/eexkrabgroth.lua +++ b/Units/eexperimental/eexkrabgroth.lua @@ -39,7 +39,7 @@ local unitDef = { builder = false, buildTime = 5, canAttack = true, - cancollect = "1", + canGuard = true, canMove = true, canPatrol = true, diff --git a/Units/eexperimental/eexnukearty.lua b/Units/eexperimental/eexnukearty.lua index 454635f10..fe4d43299 100644 --- a/Units/eexperimental/eexnukearty.lua +++ b/Units/eexperimental/eexnukearty.lua @@ -32,7 +32,7 @@ local unitDef = { builder = false, buildTime = 5, canAttack = true, - cancollect = "1", + canGuard = true, canHover = true, canMove = true, diff --git a/Units/eexperimental/eextankdestroyer.lua b/Units/eexperimental/eextankdestroyer.lua index d394f296b..7ce3dee80 100644 --- a/Units/eexperimental/eextankdestroyer.lua +++ b/Units/eexperimental/eextankdestroyer.lua @@ -39,7 +39,7 @@ local unitDef = { builder = false, buildTime = 5, canAttack = true, - cancollect = "1", + canGuard = true, canMove = true, canPatrol = true, diff --git a/Units/ehbot/ehbotengineer.lua b/Units/ehbot/ehbotengineer.lua index 7ffcd4ff3..a2aef0f38 100644 --- a/Units/ehbot/ehbotengineer.lua +++ b/Units/ehbot/ehbotengineer.lua @@ -34,7 +34,7 @@ local unitDef = { CanCapture = false, CanRepair = true, canRestore = false, - cancollect = "1", + canGuard = true, canHover = true, canMove = true, @@ -112,7 +112,6 @@ local unitDef = { canbetransported = "true", needed_cover = 1, death_sounds = "generic", - dronespawner = "1", armortype = armortype, -- supply_cost = supply, normaltex = "unittextures/lego2skin_explorernormal.dds", diff --git a/Units/ehbot/ehbotpeewee.lua b/Units/ehbot/ehbotpeewee.lua index 3163b43ef..b5e9fd63d 100644 --- a/Units/ehbot/ehbotpeewee.lua +++ b/Units/ehbot/ehbotpeewee.lua @@ -33,7 +33,7 @@ local unitDef = { builder = false, buildTime = 5, canAttack = true, - cancollect = "1", + canGuard = true, canHover = true, canMove = true, diff --git a/Units/ehbot/ehbotrocko.lua b/Units/ehbot/ehbotrocko.lua index 661b2a068..e347c9cbf 100644 --- a/Units/ehbot/ehbotrocko.lua +++ b/Units/ehbot/ehbotrocko.lua @@ -35,7 +35,7 @@ local unitDef = { builder = false, buildTime = 5, canAttack = true, - cancollect = "1", + canGuard = true, canHover = true, canMove = true, diff --git a/Units/ehbot/ehbotsniper.lua b/Units/ehbot/ehbotsniper.lua index 9c620e57d..f371b46f4 100644 --- a/Units/ehbot/ehbotsniper.lua +++ b/Units/ehbot/ehbotsniper.lua @@ -34,7 +34,7 @@ local unitDef = { builder = false, buildTime = 5, canAttack = true, - cancollect = "1", + canGuard = true, canHover = true, canMove = true, diff --git a/Units/ehbot/ehbotthud.lua b/Units/ehbot/ehbotthud.lua index cacd58da0..9fe56c44b 100644 --- a/Units/ehbot/ehbotthud.lua +++ b/Units/ehbot/ehbotthud.lua @@ -34,7 +34,7 @@ local unitDef = { builder = false, buildTime = 5, canAttack = true, - cancollect = "1", + canGuard = true, canHover = true, canMove = true, diff --git a/Units/ehbot/turret/ehbotengineer_turret.lua b/Units/ehbot/turret/ehbotengineer_turret.lua index 4d4306cc4..e1ac80296 100644 --- a/Units/ehbot/turret/ehbotengineer_turret.lua +++ b/Units/ehbot/turret/ehbotengineer_turret.lua @@ -33,7 +33,7 @@ local unitDef = { CanCapture = false, CanRepair = true, canRestore = false, - cancollect = "1", + canGuard = true, canHover = true, canMove = true, @@ -112,7 +112,6 @@ local unitDef = { canbetransported = "true", needed_cover = 1, death_sounds = "generic", - dronespawner = "1", armortype = armortype, -- supply_cost = supply, normaltex = "unittextures/lego2skin_explorernormal.dds", diff --git a/Units/ehbot/turret/ehbotpeewee_turret.lua b/Units/ehbot/turret/ehbotpeewee_turret.lua index ae9abab0a..a72d7ad78 100644 --- a/Units/ehbot/turret/ehbotpeewee_turret.lua +++ b/Units/ehbot/turret/ehbotpeewee_turret.lua @@ -33,7 +33,7 @@ local unitDef = { builder = false, buildTime = 5, canAttack = true, - cancollect = "1", + canGuard = true, canHover = true, canMove = true, diff --git a/Units/ehbot/turret/ehbotrocko_turret.lua b/Units/ehbot/turret/ehbotrocko_turret.lua index a8a35a3f3..ea35a03ec 100644 --- a/Units/ehbot/turret/ehbotrocko_turret.lua +++ b/Units/ehbot/turret/ehbotrocko_turret.lua @@ -36,7 +36,7 @@ local unitDef = { builder = false, buildTime = 5, canAttack = true, - cancollect = "1", + canGuard = true, canHover = true, canMove = true, diff --git a/Units/ehbot/turret/ehbotsniper_turret.lua b/Units/ehbot/turret/ehbotsniper_turret.lua index eabfb85fb..a0fc0819c 100644 --- a/Units/ehbot/turret/ehbotsniper_turret.lua +++ b/Units/ehbot/turret/ehbotsniper_turret.lua @@ -34,7 +34,7 @@ local unitDef = { builder = false, buildTime = 5, canAttack = true, - cancollect = "1", + canGuard = true, canHover = true, canMove = true, diff --git a/Units/ehbot/turret/ehbotthud_turret.lua b/Units/ehbot/turret/ehbotthud_turret.lua index 21f24196c..22782fa40 100644 --- a/Units/ehbot/turret/ehbotthud_turret.lua +++ b/Units/ehbot/turret/ehbotthud_turret.lua @@ -34,7 +34,7 @@ local unitDef = { builder = false, buildTime = 5, canAttack = true, - cancollect = "1", + canGuard = true, canHover = true, canMove = true, diff --git a/Units/ehover/eaatank.lua b/Units/ehover/eaatank.lua index 518125b98..60071616e 100644 --- a/Units/ehover/eaatank.lua +++ b/Units/ehover/eaatank.lua @@ -34,7 +34,7 @@ local unitDef = { builder = false, buildTime = 5, canAttack = true, - cancollect = "1", + canGuard = true, canHover = true, canMove = true, diff --git a/Units/ehover/eartytank.lua b/Units/ehover/eartytank.lua index b50255bfc..b70c1dd99 100644 --- a/Units/ehover/eartytank.lua +++ b/Units/ehover/eartytank.lua @@ -38,7 +38,7 @@ local unitDef = { builder = false, buildTime = 5, canAttack = true, - cancollect = "1", + canGuard = true, canHover = true, canMove = true, diff --git a/Units/ehover/eengineer5.lua b/Units/ehover/eengineer5.lua index 76e614a55..c1c63f295 100644 --- a/Units/ehover/eengineer5.lua +++ b/Units/ehover/eengineer5.lua @@ -33,7 +33,7 @@ local unitDef = { CanCapture = false, CanRepair = true, canRestore = false, - cancollect = "1", + canGuard = true, canHover = true, canMove = true, @@ -111,7 +111,6 @@ local unitDef = { canbetransported = "true", needed_cover = 1, death_sounds = "generic", - dronespawner = "1", armortype = armortype, -- supply_cost = supply, normaltex = "unittextures/lego2skin_explorernormal.dds", diff --git a/Units/ehover/efatso2.lua b/Units/ehover/efatso2.lua index 1e349b8de..0e7f716df 100644 --- a/Units/ehover/efatso2.lua +++ b/Units/ehover/efatso2.lua @@ -20,7 +20,7 @@ local unitDef = { builder = false, buildTime = 5, canAttack = true, - cancollect = "1", + canGuard = true, canHover = true, canMove = true, diff --git a/Units/ehover/eflametank.lua b/Units/ehover/eflametank.lua index 873f2af9a..a83ef6a25 100644 --- a/Units/ehover/eflametank.lua +++ b/Units/ehover/eflametank.lua @@ -20,7 +20,7 @@ local unitDef = { builder = false, buildTime = 5, canAttack = true, - cancollect = "1", + canGuard = true, canHover = true, canMove = true, diff --git a/Units/ehover/eheavytank3.lua b/Units/ehover/eheavytank3.lua index eddcf3bba..e442de716 100644 --- a/Units/ehover/eheavytank3.lua +++ b/Units/ehover/eheavytank3.lua @@ -35,7 +35,7 @@ local unitDef = { builder = false, buildTime = 5, canAttack = true, - cancollect = "1", + canGuard = true, canHover = true, canMove = true, diff --git a/Units/ehover/eheavytank_t3.lua b/Units/ehover/eheavytank_t3.lua index 10c03c747..9c0da9bf4 100644 --- a/Units/ehover/eheavytank_t3.lua +++ b/Units/ehover/eheavytank_t3.lua @@ -39,7 +39,7 @@ local unitDef = { builder = false, buildTime = 5, canAttack = true, - cancollect = "1", + canGuard = true, canHover = true, canMove = true, diff --git a/Units/ehover/elacerator.lua b/Units/ehover/elacerator.lua index 7b0e1af83..c70f9d234 100644 --- a/Units/ehover/elacerator.lua +++ b/Units/ehover/elacerator.lua @@ -35,7 +35,7 @@ local unitDef = { builder = false, buildTime = 5, canAttack = true, - cancollect = "1", + canGuard = true, canHover = true, canMove = true, diff --git a/Units/ehover/elighttank3.lua b/Units/ehover/elighttank3.lua index bfb9c338a..267feaff4 100644 --- a/Units/ehover/elighttank3.lua +++ b/Units/ehover/elighttank3.lua @@ -33,7 +33,7 @@ local unitDef = { builder = false, buildTime = 5, canAttack = true, - cancollect = "1", + canGuard = true, canHover = true, canMove = true, diff --git a/Units/ehover/emediumtank3.lua b/Units/ehover/emediumtank3.lua index 5bd1a8b5a..e19b72f24 100644 --- a/Units/ehover/emediumtank3.lua +++ b/Units/ehover/emediumtank3.lua @@ -20,7 +20,7 @@ local unitDef = { builder = false, buildTime = 5, canAttack = true, - cancollect = "1", + canGuard = true, canHover = true, canMove = true, diff --git a/Units/ehover/emissiletank.lua b/Units/ehover/emissiletank.lua index aebb9a046..2f10b7567 100644 --- a/Units/ehover/emissiletank.lua +++ b/Units/ehover/emissiletank.lua @@ -35,7 +35,7 @@ local unitDef = { builder = false, buildTime = 5, canAttack = true, - cancollect = "1", + canGuard = true, canHover = true, canMove = true, diff --git a/Units/ehover/eriottank2.lua b/Units/ehover/eriottank2.lua index ec3ad6eba..1f30c71a7 100644 --- a/Units/ehover/eriottank2.lua +++ b/Units/ehover/eriottank2.lua @@ -44,7 +44,7 @@ local unitDef = { builder = false, buildTime = 5, canAttack = true, - cancollect = "1", + -- canDgun = true, canGuard = true, canHover = true, diff --git a/Units/ehover/upgraded/eartytank_t2.lua b/Units/ehover/upgraded/eartytank_t2.lua index 2c1ac0425..06d0363b8 100644 --- a/Units/ehover/upgraded/eartytank_t2.lua +++ b/Units/ehover/upgraded/eartytank_t2.lua @@ -38,7 +38,7 @@ local unitDef = { builder = false, buildTime = 5, canAttack = true, - cancollect = "1", + canGuard = true, canHover = true, canMove = true, diff --git a/Units/ehover/upgraded/eengineer5_t2.lua b/Units/ehover/upgraded/eengineer5_t2.lua index 97ca16444..6de7e8799 100644 --- a/Units/ehover/upgraded/eengineer5_t2.lua +++ b/Units/ehover/upgraded/eengineer5_t2.lua @@ -33,7 +33,7 @@ local unitDef = { CanCapture = false, CanRepair = true, canRestore = false, - cancollect = "1", + canGuard = true, canHover = true, canMove = true, @@ -111,7 +111,6 @@ local unitDef = { canbetransported = "true", needed_cover = 1, death_sounds = "generic", - dronespawner = "1", armortype = armortype, -- supply_cost = supply, normaltex = "unittextures/lego2skin_explorernormal.dds", diff --git a/Units/ehover/upgraded/eheavytank3_t2.lua b/Units/ehover/upgraded/eheavytank3_t2.lua index eed6d89b8..6059f3dbd 100644 --- a/Units/ehover/upgraded/eheavytank3_t2.lua +++ b/Units/ehover/upgraded/eheavytank3_t2.lua @@ -35,7 +35,7 @@ local unitDef = { builder = false, buildTime = 5, canAttack = true, - cancollect = "1", + canGuard = true, canHover = true, canMove = true, diff --git a/Units/ehover/upgraded/eheavytank_upgraded.lua b/Units/ehover/upgraded/eheavytank_upgraded.lua index cc2a11bb5..ce2d54d17 100644 --- a/Units/ehover/upgraded/eheavytank_upgraded.lua +++ b/Units/ehover/upgraded/eheavytank_upgraded.lua @@ -39,7 +39,7 @@ local unitDef = { builder = false, buildTime = 5, canAttack = true, - cancollect = "1", + canGuard = true, canHover = true, canMove = true, diff --git a/Units/ehover/upgraded/elacerator_t2.lua b/Units/ehover/upgraded/elacerator_t2.lua index 4d158de4b..672f8fe3e 100644 --- a/Units/ehover/upgraded/elacerator_t2.lua +++ b/Units/ehover/upgraded/elacerator_t2.lua @@ -35,7 +35,7 @@ local unitDef = { builder = false, buildTime = 5, canAttack = true, - cancollect = "1", + canGuard = true, canHover = true, canMove = true, diff --git a/Units/ehover/upgraded/elighttank3_t2.lua b/Units/ehover/upgraded/elighttank3_t2.lua index 80e83c4ef..e863f465b 100644 --- a/Units/ehover/upgraded/elighttank3_t2.lua +++ b/Units/ehover/upgraded/elighttank3_t2.lua @@ -33,7 +33,7 @@ local unitDef = { builder = false, buildTime = 5, canAttack = true, - cancollect = "1", + canGuard = true, canHover = true, canMove = true, diff --git a/Units/ehover/upgraded/elighttank3_upgraded.lua b/Units/ehover/upgraded/elighttank3_upgraded.lua index a047d6460..abba2e475 100644 --- a/Units/ehover/upgraded/elighttank3_upgraded.lua +++ b/Units/ehover/upgraded/elighttank3_upgraded.lua @@ -33,7 +33,7 @@ local unitDef = { builder = false, buildTime = 5, canAttack = true, - cancollect = "1", + canGuard = true, canHover = true, canMove = true, diff --git a/Units/ehover/upgraded/emissiletank_t2.lua b/Units/ehover/upgraded/emissiletank_t2.lua index 7c9575400..9a75ba516 100644 --- a/Units/ehover/upgraded/emissiletank_t2.lua +++ b/Units/ehover/upgraded/emissiletank_t2.lua @@ -35,7 +35,7 @@ local unitDef = { builder = false, buildTime = 5, canAttack = true, - cancollect = "1", + canGuard = true, canHover = true, canMove = true, diff --git a/Units/ehover/upgraded/eriottank2_t2.lua b/Units/ehover/upgraded/eriottank2_t2.lua index a25ea4723..49001571e 100644 --- a/Units/ehover/upgraded/eriottank2_t2.lua +++ b/Units/ehover/upgraded/eriottank2_t2.lua @@ -44,7 +44,7 @@ local unitDef = { builder = false, buildTime = 5, canAttack = true, - cancollect = "1", + -- canDgun = true, canGuard = true, canHover = true, diff --git a/Units/eorb.lua b/Units/eorb.lua index 86e5f01f6..920a74745 100644 --- a/Units/eorb.lua +++ b/Units/eorb.lua @@ -28,7 +28,7 @@ local unitDef = { CanBeAssisted = true, CanCapture = false, CanRepair = true, - cancollect = "1", + canGuard = true, canHover = true, canMove = true, @@ -57,7 +57,7 @@ local unitDef = { metalStorage = 0, movementClass = "ORBHOVERTANK6", moveState = "2", - name = "ORB", + name = "O.R.B.", objectName = "eorb3.s3o", script = "eorb3.cob", radarDistance = 0, @@ -108,7 +108,7 @@ local unitDef = { canbetransported = "true", needed_cover = 2, death_sounds = "generic", - cancollect = "1", + energycorecollect = true, armortype = armortype, -- supply_cost = supply, normaltex = "unittextures/lego2skin_explorernormal.dds", diff --git a/Units/mission/engineermarbuk.lua b/Units/mission/engineermarbuk.lua index 3681cdbe9..24a7cf038 100644 --- a/Units/mission/engineermarbuk.lua +++ b/Units/mission/engineermarbuk.lua @@ -16,7 +16,6 @@ local unitDef = { CanAttack = false, CanAssist = true, CanCapture = false, - cancollect = true, canGuard = true, canMove = true, canPatrol = true, @@ -116,7 +115,6 @@ local unitDef = { needed_cover = 1, death_sounds = "generic", twokhotkey = 'e', - dronespawner = "1", armortype = "light", normaltex = "unittextures/con_legonormal.png", },