Skip to content

Commit

Permalink
The Big Legion Makeover: Tier 1 Aircraft Update (beyond-all-reason#3046)
Browse files Browse the repository at this point in the history 
The entirety of Legion's T1 Air lab has been remodelled. This includes:

Tier 1 Construction Aircraft
Noctua (Fighter)
Mosquito (Gunship) [Remodelled by Tharsis]
Martyr (Bomber) [Remodelled by Protar]
Blindfold (Juno Bomber Scout)
Aeolus (Air Transport, replaces Cortex placeholder). The Aeolus is slightly tougher, more expensive, and slightly slower than its counterparts, to reflect the new model.
  • Loading branch information
@ZephyrSkies7
ZephyrSkies7 authored May 25, 2024
1 parent fb29c9b commit d1b7216
Show file tree
Hide file tree
Showing 38 changed files with 1,253 additions and 197 deletions.
1 change: 1 addition & 0 deletions gamedata/armordefs.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -505,6 +505,7 @@ local armorDefs = {
"legnap",
"legkam",
"legcib",
"legatrans",
"legmineb",
"raptor_air_kamikaze_basic_t2_v1",
"raptor_air_bomber_brood_t4_v2",
Expand Down
4 changes: 4 additions & 0 deletions gamedata/icontypes.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2063,6 +2063,10 @@ local icontypes = {
bitmap = "icons/land_assistdrone.png",
size = 0.85000002
},
legatrans = {
bitmap = "icons/air_trans.png",
size = 1.36499989
},
legavp = {
bitmap = "icons/factory_vehicle_t2.png",
size = 1.9425
Expand Down
2 changes: 2 additions & 0 deletions language/en/units.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -649,6 +649,7 @@
"legadvsol": "Advanced Solar Collector",
"legassistdrone": "Assist Drone",
"legassistdrone_land": "Assist Vehicle",
"legatrans": "Aeolus",
"legavp": "Advanced Vehicle Plant",
"legbal": "Ballista",
"legbar": "Barrage",
Expand Down Expand Up @@ -1437,6 +1438,7 @@
"legadvsol": "Produces 100 Energy",
"legassistdrone": "Portable Buildpower",
"legassistdrone_land": "Portable Buildpower",
"legatrans": "Air Transport",
"legavp": "Produces Tech 2 Vehicles",
"legbal": "Medium Rocket Bot",
"legbar": "Napalm Artillery",
Expand Down
23 changes: 20 additions & 3 deletions luaui/Widgets/gfx_airjets_gl4.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ local effectDefs = {
{ color = { 0.1, 0.4, 0.6 }, width = 3.5, length = 35, piece = "thrusta", limit = true },
},
["legfig"] = {
{ color = { 0.7, 0.4, 0.1 }, width = 4, length = 25, piece = "thrust", limit = true },
{ color = { 0.7, 0.4, 0.1 }, width = 2, length = 15, piece = "thrust", limit = true },
},
["legionnaire"] = {
{ color = { 0.2, 0.4, 0.5 }, width = 3.5, length = 30, piece = "thrusta", limit = true },
Expand Down Expand Up @@ -164,6 +164,14 @@ local effectDefs = {
{ color = { 0.1, 0.4, 0.6 }, width = 10, length = 25, piece = "thrustfra", emitVector = { 0, 1, 0 }, light = 0.75 },
{ color = { 0.1, 0.4, 0.6 }, width = 10, length = 25, piece = "thrustfla", emitVector = { 0, 1, 0 }, light = 0.75 },
},
["legatrans"] = {
{ color = { 0.7, 0.4, 0.1 }, width = 6, length = 17, piece = "rightGroundThrust", emitVector = { 0, 1, 0 }, light = 1 },
{ color = { 0.7, 0.4, 0.1 }, width = 6, length = 17, piece = "leftGroundThrust", emitVector = { 0, 1, 0 }, light = 1 },
{ color = { 0.7, 0.4, 0.1 }, width = 4, length = 17, piece = "rightMainThrust", emitVector = { 0, 1, 0 }, light = 1 },
{ color = { 0.7, 0.4, 0.1 }, width = 4, length = 17, piece = "leftMainThrust", emitVector = { 0, 1, 0 }, light = 1 },
{ color = { 0.7, 0.4, 0.1 }, width = 2, length = 8.5, piece = "rightMiniThrust", emitVector = { 0, 1, 0 }, light = 1 },
{ color = { 0.7, 0.4, 0.1 }, width = 2, length = 8.5, piece = "leftMiniThrust", emitVector = { 0, 1, 0 }, light = 1 },
},
["legstronghold"] = {
{ color = { 0.1, 0.4, 0.6 }, width = 13, length = 25, piece = "thrustrra", emitVector = { 0, 1, 0 }, light = 0.75 },
{ color = { 0.1, 0.4, 0.6 }, width = 13, length = 25, piece = "thrustrla", emitVector = { 0, 1, 0 }, light = 0.75 },
Expand All @@ -183,6 +191,9 @@ local effectDefs = {
["armblade"] = {
{ color = { 0.1, 0.4, 0.6 }, width = 3.5, length = 25, piece = "thrust", light = 1, xzVelocity = 1.5 },
},
["legmos"] = {
{ color = { 0.2, 0.8, 0.2 }, width = 2, length = 16, piece = "thrust", emitVector = { 0, 0, -1 }, xzVelocity = 1.5, light = 1 },
},
["corape"] = {
{ color = { 0.1, 0.4, 0.6 }, width = 4, length = 16, piece = "rthrust", emitVector = { 0, 0, -1 }, xzVelocity = 1.5, light = 1 },
{ color = { 0.1, 0.4, 0.6 }, width = 4, length = 16, piece = "lthrust", emitVector = { 0, 0, -1 }, xzVelocity = 1.5, light = 1 },
Expand Down Expand Up @@ -306,10 +317,11 @@ local effectDefs = {
{ color = { 0.1, 0.4, 0.6 }, width = 5, length = 35, piece = "thrusta2" },
},
["legcib"] = {
{ color = { 0.7, 0.4, 0.1 }, width = 4, length = 25, piece = "thrust", light = 1.3 },
{ color = { 0.7, 0.4, 0.1 }, width = 4, length = 25, piece = "lThrust", light = 1.3 },
{ color = { 0.7, 0.4, 0.1 }, width = 4, length = 25, piece = "rThrust", light = 1.3 },
},
["legkam"] = {
{ color = { 0.2, 0.8, 0.2 }, width = 2, length = 24, piece = "thrust", light = 1 },
{ color = { 0.2, 0.8, 0.2 }, width = 4, length = 25, piece = "thrust", light = 1 },
},
["armsb"] = {
{ color = { 0.2, 0.8, 0.2 }, width = 4, length = 36, piece = "thrustc", light = 1 },
Expand Down Expand Up @@ -345,6 +357,11 @@ local effectDefs = {
["corca"] = {
{ color = { 0.1, 0.4, 0.6 }, width = 4, length = 15, piece = "thrust", xzVelocity = 1.2 },
},
["legca"] = {
{ color = { 0.1, 0.4, 0.6 }, width = 4, length = 15, piece = "mainThrust", xzVelocity = 1.2 },
{ color = { 0.1, 0.4, 0.6 }, width = 2, length = 7, piece = "thrustA", xzVelocity = 1.2 },
{ color = { 0.1, 0.4, 0.6 }, width = 2, length = 7, piece = "thrustB", xzVelocity = 1.2 },
},
["coraca"] = {
{ color = { 0.1, 0.4, 0.6 }, width = 6, length = 22, piece = "thrust", xzVelocity = 1.2 },
},
Expand Down
194 changes: 194 additions & 0 deletions luaui/configs/DeferredLightsGL4config.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13779,7 +13779,201 @@ local unitLights = {
lifetime = 0, sustain = 0, animtype = 0},
},
},
['legca'] = {
nanolight = {
lightType = 'point',
pieceName = 'beam',
lightConfig = { posx = 0, posy = 0, posz = 1, radius = 16,
color2r = 0, color2g = 0, color2b = 0, colortime = 0,
r = -1, g = 1, b = 1, a = 0.25,
modelfactor = 0.5, specular = 0.5, scattering = 1, lensflare = 10,
lifetime = 0, sustain = 0, animtype = 0 },
},
mainthrust = {
lightType = 'point',
pieceName = 'mainThrust',
lightConfig = { posx = 0, posy = 0, posz = 0, radius = 24,
color2r = 1, color2g = 1, color2b = 1, colortime = 0,
r = 0.45, g = 0.7, b = 1, a = 0.35,
modelfactor = 0.4, specular = 0, scattering = 0.35, lensflare = 0,
lifetime = 0, sustain = 0, animtype = 0},
},
minithrusta = {
lightType = 'point',
pieceName = 'thrustA',
lightConfig = { posx = 0, posy = 0, posz = 0, radius = 10,
color2r = 1, color2g = 1, color2b = 1, colortime = 0,
r = 0.45, g = 0.7, b = 1, a = 0.35,
modelfactor = 0.4, specular = 0, scattering = 0.35, lensflare = 0,
lifetime = 0, sustain = 0, animtype = 0},
},
minithrustb = {
lightType = 'point',
pieceName = 'thrustB',
lightConfig = { posx = 0, posy = 0, posz = 0, radius = 10,
color2r = 1, color2g = 1, color2b = 1, colortime = 0,
r = 0.45, g = 0.7, b = 1, a = 0.35,
modelfactor = 0.4, specular = 0, scattering = 0.35, lensflare = 0,
lifetime = 0, sustain = 0, animtype = 0},
},
eyes1 = {
lightType = 'point',
pieceName = 'chassis',
lightConfig = { posx = 0, posy = 1.5, posz = 15.5, radius = 14,
color2r = 0.2, color2g = 1, color2b = 0.2, colortime = 0,
r = 0.2, g = 1, b = 0.2, a = 0.09,
modelfactor = 0.4, specular = 0, scattering = 0.8, lensflare = 0,
lifetime = 0, sustain = 0, animtype = 0},
},
},
['legatrans'] = {
lgThrust = {
lightType = 'cone',
pieceName = 'leftGroundThrust',
lightConfig = { posx = 0, posy = 0, posz = 0, radius = 80,
dirx = 0, diry = -1, dirz = 0, theta = 0.8,
r = 1, g = 0.8, b = 0.33, a = 0.1,
modelfactor = 0, specular = 1, scattering = 0.5, lensflare = 1,
lifetime = 0, sustain = 0, animtype = 0},
},
rgThrust = {
lightType = 'cone',
pieceName = 'rightGroundThrust',
lightConfig = { posx = 0, posy = 0, posz = 0, radius = 80,
dirx = 0, diry = -1, dirz = 0, theta = 0.8,
r = 1, g = 0.8, b = 0.33, a = 0.1,
modelfactor = 0, specular = 1, scattering = 0.5, lensflare = 1,
lifetime = 0, sustain = 0, animtype = 0},
},

lmainthrust = {
lightType = 'cone',
pieceName = 'leftMainThrust',
lightConfig = { posx = 0, posy = 0, posz = 0, radius = 60,
dirx = 0, diry = 0, dirz = -1, theta = 0.8,
r = 1, g = 0.8, b = 0.33, a = 0.1,
modelfactor = 0, specular = 1, scattering = 0.5, lensflare = 1,
lifetime = 0, sustain = 0, animtype = 0},
},
rmainthrust = {
lightType = 'cone',
pieceName = 'rightMainThrust',
lightConfig = { posx = 0, posy = 0, posz = 0, radius = 60,
dirx = 0, diry = 0, dirz = -1, theta = 0.8,
r = 1, g = 0.8, b = 0.33, a = 0.1,
modelfactor = 0, specular = 1, scattering = 0.5, lensflare = 1,
lifetime = 0, sustain = 0, animtype = 0},
},

lminithrust = {
lightType = 'cone',
pieceName = 'leftMiniThrust',
lightConfig = { posx = 0, posy = 0, posz = 0, radius = 30,
dirx = 0, diry = 0, dirz = -1, theta = 0.8,
r = 1, g = 0.8, b = 0.33, a = 0.1,
modelfactor = 0, specular = 1, scattering = 0.5, lensflare = 1,
lifetime = 0, sustain = 0, animtype = 0},
},
rminithrust = {
lightType = 'cone',
pieceName = 'rightMiniThrust',
lightConfig = { posx = 0, posy = 0, posz = 0, radius = 30,
dirx = 0, diry = 0, dirz = -1, theta = 0.8,
r = 1, g = 0.8, b = 0.33, a = 0.1,
modelfactor = 0, specular = 1, scattering = 0.5, lensflare = 1,
lifetime = 0, sustain = 0, animtype = 0},
},

trieyes = {
lightType = 'point',
pieceName = 'chassis',
lightConfig = { posx = 0, posy = 4.3, posz = 15.5, radius = 14,
color2r = 0.2, color2g = 1, color2b = 0.2, colortime = 0,
r = 0.2, g = 1, b = 0.2, a = 0.09,
modelfactor = 0.4, specular = 0, scattering = 0.8, lensflare = 0,
lifetime = 0, sustain = 0, animtype = 0},
},

},
['legcib'] = {
eyes = {
lightType = 'point',
pieceName = 'chassis',
lightConfig = { posx = 0, posy = 1, posz = 19, radius = 14,
color2r = 0.2, color2g = 1, color2b = 0.2, colortime = 0,
r = 0.2, g = 1, b = 0.2, a = 0.09,
modelfactor = 0.4, specular = 0, scattering = 0.8, lensflare = 0,
lifetime = 0, sustain = 0, animtype = 0},
},
rthrust = {
lightType = 'cone',
pieceName = 'rThrust',
lightConfig = { posx = 0, posy = 0, posz = 0, radius = 30,
dirx = 0, diry = 0, dirz = -1, theta = 0.8,
r = 1, g = 0.8, b = 0.33, a = 0.1,
modelfactor = 0, specular = 1, scattering = 0.5, lensflare = 1,
lifetime = 0, sustain = 0, animtype = 0},

},
lthrust = {
lightType = 'cone',
pieceName = 'lThrust',
lightConfig = { posx = 0, posy = 0, posz = 0, radius = 30,
dirx = 0, diry = 0, dirz = -1, theta = 0.8,
r = 1, g = 0.8, b = 0.33, a = 0.1,
modelfactor = 0, specular = 1, scattering = 0.5, lensflare = 1,
lifetime = 0, sustain = 0, animtype = 0},
},
},
['legmos'] = {
eyes = {
lightType = 'point',
pieceName = 'base',
lightConfig = { posx = 0, posy = -3, posz = 16, radius = 14,
color2r = 0.2, color2g = 1, color2b = 0.2, colortime = 0,
r = 0.2, g = 1, b = 0.2, a = 0.09,
modelfactor = 0.4, specular = 0, scattering = 0.8, lensflare = 0,
lifetime = 0, sustain = 0, animtype = 0},
},
thrustMain = {
lightType = 'cone',
pieceName = 'thrust',
lightConfig = { posx = 0, posy = 0, posz = 0, radius = 30,
dirx = 0, diry = 0, dirz = -1, theta = 0.8,
r = 0.33, g = 1, b = 0.33, a = 0.1,
modelfactor = 0, specular = 1, scattering = 0.5, lensflare = 1,
lifetime = 0, sustain = 0, animtype = 0},
},
},
['legkam'] = {
thrustMain = {
lightType = 'cone',
pieceName = 'thrust',
lightConfig = { posx = 0, posy = 0, posz = 0, radius = 30,
dirx = 0, diry = 0, dirz = -1, theta = 0.8,
r = 0.33, g = 1, b = 0.33, a = 0.1,
modelfactor = 0, specular = 1, scattering = 0.5, lensflare = 1,
lifetime = 0, sustain = 0, animtype = 0},
},
bomb1 = {
lightType = 'point',
pieceName = 'bomb',
lightConfig = { posx = 0, posy = 0, posz = -1.9, radius = 10,
color2r = 1, color2g = 0.92, color2b = 0.66, colortime = 6,
r = 0.88, g = 0.83, b = 0.2, a = 0.6,
modelfactor = 0.4, specular = 0.5, scattering = 2.5, lensflare = 0,
lifetime = 0, sustain = 0, animtype = 0},
},
bomb2 = {
lightType = 'point',
pieceName = 'bomb',
lightConfig = { posx = 0, posy = 0, posz = -9.9, radius = 10,
color2r = 1, color2g = 0.92, color2b = 0.66, colortime = 6,
r = 0.88, g = 0.83, b = 0.2, a = 0.6,
modelfactor = 0.4, specular = 0.5, scattering = 2.5, lensflare = 0,
lifetime = 0, sustain = 0, animtype = 0},
},
},
['legionnaire'] = {
thruster1 = {
lightType = 'point',
Expand Down
1 change: 1 addition & 0 deletions luaui/configs/buildmenu_sorting.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -389,6 +389,7 @@ local unitOrderTable = {
-- TRANSPORTS
['armatlas'] = 010500,
['corvalk'] = 010510,
['legatrans'] = 010520,

['armtship'] = 010540,
['cortship'] = 010550,
Expand Down
2 changes: 1 addition & 1 deletion luaui/configs/gridmenu_layouts.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ local labGrids = {
},
legap = {
"legca", "legfig", "legmos", "legkam", -- T1 con, fig, drone, bomber
"legcib", "corvalk", -- radar, transport
"legcib", "legatrans", -- radar, transport
},
-- T2 air
armaap = {
Expand Down
Binary file added objects3d/Units/legatrans.s3o
View file
Binary file not shown.
Binary file added objects3d/Units/legca.s3o
View file
Binary file not shown.
Binary file modified objects3d/Units/legcib.s3o
View file
Binary file not shown.
Binary file modified objects3d/Units/legfig.s3o
View file
Binary file not shown.
Binary file modified objects3d/Units/legkam.s3o
View file
Binary file not shown.
Binary file modified objects3d/Units/legmos.s3o
View file
Binary file not shown.
Loading

0 comments on commit d1b7216

Please sign in to comment.