diff --git a/gamedata/armordefs.lua b/gamedata/armordefs.lua index 07b44322774..8c9c7ba7144 100644 --- a/gamedata/armordefs.lua +++ b/gamedata/armordefs.lua @@ -585,7 +585,7 @@ local armorDefs = { "legtriarius", "legtriariusheatray", "legtriariusdrone", - "legpontus", + "legportent", "corarch", "armaas", "armcrus", diff --git a/gamedata/icontypes.lua b/gamedata/icontypes.lua index b9c8b5aabff..4797fe50a43 100644 --- a/gamedata/icontypes.lua +++ b/gamedata/icontypes.lua @@ -2532,7 +2532,7 @@ local icontypes = { bitmap = "icons/air_trans.png", size = 1.83749986 }, - legsy = { + legjim = { bitmap = "icons/factory_ship.png", size = 1.52250004 }, @@ -2540,6 +2540,10 @@ local icontypes = { bitmap = "icons/energy1_1.0.png", size = 1.04999995 }, + legtl = { + bitmap = "icons/defence_1_naval.png", + size = 1.10249984 + }, legfmkr = { bitmap = "icons/metalmaker_t1.png", size = 0.78749996 diff --git a/language/en/units.json b/language/en/units.json index c6d71f3659d..82a629318d5 100644 --- a/language/en/units.json +++ b/language/en/units.json @@ -703,7 +703,7 @@ "legsh": "Glaucus", "legsilo": "Supernova", "legsnapper": "Snapper", - "legsy": "Shipyard", + "legjim": "Shipyard", "leggob": "Goblin", "leghades": "Alaris", "leghastatus": "Hastatus", @@ -1521,7 +1521,7 @@ "legsh": "Fast Attack Hovercraft", "legsilo": "Nuclear ICBM Launcher", "legsnapper": "Amphibious Screwdrive Bomb", - "legsy": "Produces Tech 1 Ships", + "legjim": "Produces Tech 1 Ships", "leggob": "Light Skirmish Bot", "leghades": "Fast Assault Tank", "leghastatus": "Assault Frigate", diff --git a/luaui/configs/buildmenu_sorting.lua b/luaui/configs/buildmenu_sorting.lua index d8ef1427c41..5ed5ce82a6c 100644 --- a/luaui/configs/buildmenu_sorting.lua +++ b/luaui/configs/buildmenu_sorting.lua @@ -692,7 +692,7 @@ local unitOrderTable = { ['armsy'] = 211100, ['corsy'] = 211200, - ['legsy'] = 211300, + ['legjim'] = 211300, ['armfhp'] = 212100, ['corfhp'] = 212200, ['legfhp'] = 212250, diff --git a/objects3d/Units/armrad.s3o b/objects3d/Units/armrad.s3o index 4c85bc40d43..411ed885b2b 100644 Binary files a/objects3d/Units/armrad.s3o and b/objects3d/Units/armrad.s3o differ diff --git a/objects3d/legtorpedo.s3o b/objects3d/legtorpedo.s3o new file mode 100644 index 00000000000..e52a1c699a3 Binary files /dev/null and b/objects3d/legtorpedo.s3o differ diff --git a/units/ArmBuildings/LandUtil/armdrag.lua b/units/ArmBuildings/LandUtil/armdrag.lua index ac088fc3489..1e681703172 100644 --- a/units/ArmBuildings/LandUtil/armdrag.lua +++ b/units/ArmBuildings/LandUtil/armdrag.lua @@ -34,6 +34,7 @@ return { sightdistance = 1, yardmap = "ffff", customparams = { + unitgroup = "util", usebuildinggrounddecal = true, buildinggrounddecaltype = "decals/armdrag_aoplane.dds", buildinggrounddecalsizey = 4, diff --git a/units/ArmBuildings/LandUtil/armfort.lua b/units/ArmBuildings/LandUtil/armfort.lua index bbc64921bf6..92bceb87555 100644 --- a/units/ArmBuildings/LandUtil/armfort.lua +++ b/units/ArmBuildings/LandUtil/armfort.lua @@ -35,6 +35,7 @@ return { sightdistance = 1, yardmap = "ffff", customparams = { + unitgroup = "util", usebuildinggrounddecal = true, buildinggrounddecaltype = "decals/armfort_aoplane.dds", buildinggrounddecalsizey = 4, diff --git a/units/CorBuildings/LandUtil/cordrag.lua b/units/CorBuildings/LandUtil/cordrag.lua index 93faeb0b767..44a16420540 100644 --- a/units/CorBuildings/LandUtil/cordrag.lua +++ b/units/CorBuildings/LandUtil/cordrag.lua @@ -34,6 +34,7 @@ return { sightdistance = 1, yardmap = "ffff", customparams = { + unitgroup = "util", usebuildinggrounddecal = true, buildinggrounddecaltype = "decals/cordrag_aoplane.dds", buildinggrounddecalsizey = 4, diff --git a/units/CorBuildings/LandUtil/corfort.lua b/units/CorBuildings/LandUtil/corfort.lua index f766b220676..b3e5b05057d 100644 --- a/units/CorBuildings/LandUtil/corfort.lua +++ b/units/CorBuildings/LandUtil/corfort.lua @@ -35,6 +35,7 @@ return { sightdistance = 1, yardmap = "ffff", customparams = { + unitgroup = "util", usebuildinggrounddecal = true, buildinggrounddecaltype = "decals/corfort_aoplane.dds", buildinggrounddecalsizey = 4, diff --git a/units/Legion/Air/legdrone.lua b/units/Legion/Air/legdrone.lua index f6fcf775980..1b30577e7fb 100644 --- a/units/Legion/Air/legdrone.lua +++ b/units/Legion/Air/legdrone.lua @@ -123,7 +123,7 @@ return { ownerExpAccWeight = 4.0, proximitypriority = 3, range = 300, - reloadtime = 0.8, + reloadtime = 0.6, rgbcolor = "1 0.95 0.4", soundhit = "bimpact3", soundhitwet = "splshbig", @@ -136,8 +136,8 @@ return { weapontype = "LaserCannon", weaponvelocity = 990, damage = { - default = 16, - vtol = 5, + default = 12, + vtol = 4, }, }, }, diff --git a/units/Legion/Labs/legsy.lua b/units/Legion/Labs/legjim.lua similarity index 85% rename from units/Legion/Labs/legsy.lua rename to units/Legion/Labs/legjim.lua index 3fe247c988b..1ea8cac05c5 100644 --- a/units/Legion/Labs/legsy.lua +++ b/units/Legion/Labs/legjim.lua @@ -1,5 +1,5 @@ return { - legsy = { + legjim = { maxacc = 0, maxdec = 0, energycost = 1200, @@ -33,18 +33,7 @@ return { yardmap = "oyyyyyyoyccccccyyccccccyyccccccyyccccccyyccccccyyccccccyoyyyyyyo", buildoptions = { [1] = "legcs", - [2] = "legstingray",-- - [3] = "legvelite",-- - [4] = "legpontus", - [5] = "leghastatus", - [6] = "legtriarius",-- - [7] = "legsub",-- - [8] = "correcl", - [9] = "legoptio", - [10] = "leghastatusalt", - [11] = "legportent", - [12] = "legtriariusdrone", - [13] = "legtriariusheatray"--mortar + }, customparams = { diff --git a/units/Legion/Ships/legpontus.lua b/units/Legion/Ships/legpontus.lua index 1a30ca3e257..146acbad9b8 100644 --- a/units/Legion/Ships/legpontus.lua +++ b/units/Legion/Ships/legpontus.lua @@ -112,7 +112,7 @@ return { armseap_weapon1 = { areaofeffect = 16, avoidfeature = false, - avoidfriendly = true, + avoidfriendly = false, burnblow = true, cegtag = "torpedotrail-tiny", collidefriendly = false, @@ -125,7 +125,7 @@ return { gravityaffected = "false", impulseboost = 0.123, impulsefactor = 0.123, - model = "torpedo.s3o", + model = "legtorpedo.s3o", name = "Homing torpedo launcher", noselfdamage = true, predictboost = 0.3, @@ -139,7 +139,7 @@ return { startvelocity = 45, tolerance = 12000, tracks = true, - turnrate = 4500, + turnrate = 5200, turret = true, waterweapon = true, weaponacceleration = 2, diff --git a/units/Legion/Ships/legstingray.lua b/units/Legion/Ships/legstingray.lua index eeba31f4ce9..487b35c8bc9 100644 --- a/units/Legion/Ships/legstingray.lua +++ b/units/Legion/Ships/legstingray.lua @@ -122,7 +122,7 @@ return { flighttime = 3, impulseboost = 0.123, impulsefactor = 0.123, - model = "cortorpedo.s3o", + model = "legtorpedo.s3o", name = "Light torpedo launcher", noselfdamage = true, predictboost = 1, diff --git a/units/Legion/Ships/legtriariusdrone.lua b/units/Legion/Ships/legtriariusdrone.lua index 037a6630ea7..8c74f25f572 100644 --- a/units/Legion/Ships/legtriariusdrone.lua +++ b/units/Legion/Ships/legtriariusdrone.lua @@ -5,7 +5,7 @@ return { maxdec = 0.02757, buildangle = 16384, energycost = 8000, - metalcost = 820, + metalcost = 760, buildpic = "legtriariusdrone.DDS", buildtime = 11500, canmove = true, @@ -209,7 +209,7 @@ return { badtargetcategory = "VTOL", def = "heatroy", onlytargetcategory = "SURFACE", - fastautoretargeting = true, + fastautoretargeting = false, }, [2] = { diff --git a/units/Legion/Ships/legvelite.lua b/units/Legion/Ships/legvelite.lua index ac7a0b775e0..dd8f2631e4f 100644 --- a/units/Legion/Ships/legvelite.lua +++ b/units/Legion/Ships/legvelite.lua @@ -31,7 +31,7 @@ return { sightdistance = 550, turninplace = true, turninplaceanglelimit = 90, - turnrate = 400, + turnrate = 430, waterline = 0, customparams = { unitgroup = 'weapon', diff --git a/units/Legion/Ships/legvelitealt.lua b/units/Legion/Ships/legvelitealt.lua deleted file mode 100644 index 2dcca624406..00000000000 --- a/units/Legion/Ships/legvelitealt.lua +++ /dev/null @@ -1,155 +0,0 @@ -return { - legvelitealt = { - maxacc = 0.1004, - maxdec = 0.1004, - buildangle = 16384, - energycost = 1600, - metalcost = 190, - buildpic = "ARMDECADE.DDS", - buildtime = 2600, - canmove = true, - category = "ALL WEAPON NOTSUB SHIP NOTAIR NOTHOVER SURFACE EMPABLE", - collisionvolumeoffsets = "0 -7 -1", - collisionvolumescales = "21 25 62", - collisionvolumetype = "CylZ", - corpse = "DEAD", - explodeas = "mediumexplosiongeneric", - floater = true, - footprintx = 3, - footprintz = 3, - idleautoheal = 5, - idletime = 1800, - health = 1000, - speed = 100, - minwaterdepth = 12, - movementclass = "BOAT3", - nochasecategory = "UNDERWATER VTOL", - objectname = "Units/legvelite.s3o", - script = "Units/legvelite.cob", - seismicsignature = 0, - selfdestructas = "mediumexplosiongenericSelfd", - sightdistance = 375, - turninplace = true, - turninplaceanglelimit = 90, - turnrate = 400, - waterline = 0, - customparams = { - unitgroup = 'weapon', - model_author = "FireStorm", - normaltex = "unittextures/Arm_normal.dds", - subfolder = "armships", - }, - featuredefs = { - dead = { - blocking = false, - category = "corpses", - collisionvolumeoffsets = "-4.64749145508 -7.42665378418 -1.15311431885", - collisionvolumescales = "32.7630615234 17.5484924316 65.1112213135", - collisionvolumetype = "Box", - damage = 300, - featuredead = "HEAP", - footprintx = 3, - footprintz = 3, - height = 20, - metal = 82.5, - object = "Units/armdecade_dead.s3o", - reclaimable = true, - }, - heap = { - blocking = false, - category = "heaps", - collisionvolumescales = "85.0 14.0 6.0", - collisionvolumetype = "cylY", - damage = 500, - footprintx = 2, - footprintz = 2, - height = 4, - metal = 41.25, - object = "Units/arm4X4B.s3o", - reclaimable = true, - resurrectable = 0, - }, - }, - sfxtypes = { - explosiongenerators = { - [1] = "custom:barrelshot-tiny", - [2] = "custom:waterwake-small-long", - }, - pieceexplosiongenerators = { - [1] = "deathceg2", - [2] = "deathceg3", - [3] = "deathceg4", - }, - }, - sounds = { - canceldestruct = "cancel2", - underattack = "warning1", - cant = { - [1] = "cantdo4", - }, - count = { - [1] = "count6", - [2] = "count5", - [3] = "count4", - [4] = "count3", - [5] = "count2", - [6] = "count1", - }, - ok = { - [1] = "sharmmov", - }, - select = { - [1] = "sharmsel", - }, - }, - weapondefs = { - velgun = { - accuracy = 7, - areaofeffect = 16, - avoidfeature = false, - burst = 6, - burstrate = 0.07, - burnblow = false, - craterareaofeffect = 0, - craterboost = 0, - cratermult = 0, - duration = 0.038, - edgeeffectiveness = 0.85, - explosiongenerator = "custom:plasmahit-sparkonly", - fallOffRate = 0.2, - firestarter = 0, - impulseboost = 0.4, - impulsefactor = 1.5, - intensity = 0.8, - name = "Rapid-fire machine gun", - noselfdamage = true, - ownerExpAccWeight = 4.0, - proximitypriority = 3, - range = 316, - reloadtime = 0.3, - rgbcolor = "1 0.95 0.4", - soundhit = "bimpact3", - soundhitwet = "splshbig", - soundstart = "minigun3", - soundstartvolume = 4, - sprayangle = 750, - thickness = 0.91, - tolerance = 6000, - turret = true, - weapontype = "LaserCannon", - weaponvelocity = 945, - damage = { - default = 5, - vtol = 5, - }, - }, - }, - weapons = { - [1] = { - badtargetcategory="vtol", - def = "velgun", - onlytargetcategory = "NOTSUB", - }, - }, - }, -} diff --git a/units/Legion/Vehicles/T2 Vehicles/legfloat.lua b/units/Legion/Vehicles/T2 Vehicles/legfloat.lua index 7f9eccc928f..0ea7bf08343 100644 --- a/units/Legion/Vehicles/T2 Vehicles/legfloat.lua +++ b/units/Legion/Vehicles/T2 Vehicles/legfloat.lua @@ -7,7 +7,7 @@ return { buildpic = "LEGFLOAT.DDS", buildtime = 16000, canmove = true, - category = "ALL TANK MOBILE WEAPON NOTSHIP NOTAIR NOTSUB SURFACE PHIB EMPABLE", + category = "ALL TANK MOBILE WEAPON NOTSHIP NOTHOVER NOTAIR NOTSUB SURFACE PHIB EMPABLE", collisionvolumeoffsets = "0 0 -0.5", collisionvolumescales = "40 27 60", collisionvolumetype = "Box",