Skip to content

Commit

Permalink
Add legion t1 nano turrets + legshot fix (beyond-all-reason#3627)
Browse files Browse the repository at this point in the history 
* Add legion t1 nano turrets + legshot fix

Add nanoturrets
Fix missing bracket in legshot breaking evocoms
Updated evocoms energy storage
Updated construction unit buildlits for new legnanotc

* Update units.json

* Update DeferredLightsGL4config.lua

* update unitpics + buildmenu sort
  • Loading branch information
@Tharsy
Tharsy authored Aug 21, 2024
1 parent 36118c0 commit a99c69e
Show file tree
Hide file tree
Showing 29 changed files with 274 additions and 49 deletions.
8 changes: 8 additions & 0 deletions gamedata/icontypes.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1655,10 +1655,18 @@ local icontypes = {
bitmap = "icons/nanot1.png",
size = 0.96599996
},
legnanotc = {
bitmap = "icons/nanot1.png",
size = 0.96599996
},
cornanotcplat = {
bitmap = "icons/nanot1.png",
size = 0.96599996
},
legnanotcplat = {
bitmap = "icons/nanot1.png",
size = 0.96599996
},
cornanotct2 = {
bitmap = "icons/nanot2.png",
size = 1.64999998
Expand Down
8 changes: 6 additions & 2 deletions language/en/units.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -839,7 +839,9 @@
"xmasball2_3": "Xmas ball",
"xmasball2_4": "Xmas ball",
"xmasball2_5": "Xmas ball",
"xmasball2_6": "Xmas ball"
"xmasball2_6": "Xmas ball",
"legnanotc": "Construction Turret",
"legnanotcplat": "Naval Construction Turret"
},
"descriptions": {
"armaak": "Advanced Amphibious Anti-Air Bot",
Expand Down Expand Up @@ -1673,7 +1675,9 @@
"xmasball2_3": "Xmas ball",
"xmasball2_4": "Xmas ball",
"xmasball2_5": "Xmas ball",
"xmasball2_6": "Xmas ball"
"xmasball2_6": "Xmas ball",
"legnanotc": "Assist & Repair in large radius",
"legnanotcplat": "Builds and Repairs in large radius"
}
}
}
14 changes: 13 additions & 1 deletion luarules/configs/gui_soundeffects.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2360,7 +2360,8 @@ GUIUnitSoundEffects = {
BaseSoundSelectType = "cor-com-sel",
BaseSoundMovementType = { "cor-com-ok-1", "cor-com-ok-2", "cor-com-ok-3", "cor-com-ok-4", },
BaseSoundWeaponType = "fastemg-small",
}, legcom = {
},
legcom = {
BaseSoundSelectType = "cor-com-sel",
BaseSoundMovementType = { "cor-com-ok-1", "cor-com-ok-2", "cor-com-ok-3", "cor-com-ok-4", },
BaseSoundWeaponType = "fastemg-small",
Expand Down Expand Up @@ -2439,6 +2440,17 @@ GUIUnitSoundEffects = {
BaseSoundWeaponType = "arm-bld-wall-t2",
},

legnanotc = {
BaseSoundSelectType = "arm-bld-select-small",
--BaseSoundMovementType = "",
BaseSoundWeaponType = "conalt-small",
},

legnanotcplat = {
BaseSoundSelectType = "arm-bld-select-small-water",
--BaseSoundMovementType = "",
BaseSoundWeaponType = "conalt-small",
},

legwin = {
BaseSoundSelectType = "arm-bld-nrghum",
Expand Down
22 changes: 22 additions & 0 deletions luaui/configs/DeferredLightsGL4config.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1258,6 +1258,28 @@ local unitLights = {
lifetime = 0, sustain = 0, animtype = 0},
},
},
['legnanotc'] = {
nanolight = {
lightType = 'point',
pieceName = 'emitnano',
lightConfig = { posx = 0, posy = 0, posz = 1, radius = 33,
color2r = 0, color2g = 0, color2b = 0, colortime = 0,
r = -1, g = 1, b = 1, a = 0.4,
modelfactor = 0.5, specular = 0.5, scattering = 1, lensflare = 10,
lifetime = 0, sustain = 0, animtype = 0},
},
},
['legnanotcplat'] = {
nanolight = {
lightType = 'point',
pieceName = 'emitnano',
lightConfig = { posx = 0, posy = 0, posz = 1, radius = 33,
color2r = 0, color2g = 0, color2b = 0, colortime = 0,
r = -1, g = 1, b = 1, a = 0.4,
modelfactor = 0.5, specular = 0.5, scattering = 1, lensflare = 10,
lifetime = 0, sustain = 0, animtype = 0},
},
},
['armnanotc'] = {
nanolight = {
lightType = 'point',
Expand Down
2 changes: 2 additions & 0 deletions luaui/configs/buildmenu_sorting.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -500,6 +500,7 @@ local unitOrderTable = {
--NANOS
['armnanotc'] = 102000,
['cornanotc'] = 102050,
['legnanotc'] = 102075,

--FACTORIES
['armlab'] = 102100,
Expand Down Expand Up @@ -697,6 +698,7 @@ local unitOrderTable = {
--WATER CONSTRUCTION
['armnanotcplat'] = 210000,
['cornanotcplat'] = 210500,
['legnanotcplat'] = 210550,

['armsy'] = 211100,
['corsy'] = 211200,
Expand Down
28 changes: 14 additions & 14 deletions luaui/configs/gridmenu_layouts.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -842,7 +842,7 @@ local unitGrids = {
},
{
{ "leglab", "legvp", "legap", "corsy", }, -- bot lab, veh lab, air lab, shipyard
{ "cornanotc", "leginfestor", "cornanotcplat",}, -- nano, infestor, floating nano
{ "legnanotc", "leginfestor", "legnanotcplat",}, -- nano, infestor, floating nano
{ "leghp", "legfhp", }, -- hover lab, floating hover lab
}
},
Expand All @@ -864,7 +864,7 @@ local unitGrids = {
},
{
{ "leglab", "legvp", "legap", "corsy", }, -- bot lab, veh lab, air lab, shipyard
{ "cornanotc", "leginfestor", "cornanotcplat",}, -- nano, infestor, floating nano
{ "legnanotc", "leginfestor", "legnanotcplat",}, -- nano, infestor, floating nano
{ "leghp", "legfhp", }, -- hover lab, floating hover lab
}
},
Expand All @@ -886,7 +886,7 @@ local unitGrids = {
},
{
{ "leglab", "legvp", "legap", "corsy", }, -- bot lab, veh lab, air lab, shipyard
{ "cornanotc", "leginfestor", "cornanotcplat",}, -- nano, infestor, floating nano
{ "legnanotc", "leginfestor", "legnanotcplat",}, -- nano, infestor, floating nano
{ "leghp", "legfhp", }, -- hover lab, floating hover lab
}
},
Expand All @@ -908,7 +908,7 @@ local unitGrids = {
},
{
{ "leglab", "legvp", "legap", "corsy", }, -- bot lab, veh lab, air lab, shipyard
{ "cornanotc", "leginfestor", "cornanotcplat",}, -- nano, infestor, floating nano
{ "legnanotc", "leginfestor", "legnanotcplat",}, -- nano, infestor, floating nano
{ "leghp", "legfhp", }, -- hover lab, floating hover lab
}
},
Expand All @@ -930,7 +930,7 @@ local unitGrids = {
},
{
{ "leglab", "legvp", "legap", "corsy", }, -- bot lab, veh lab, air lab, shipyard
{ "cornanotc", "leginfestor", "cornanotcplat",}, -- nano, infestor, floating nano
{ "legnanotc", "leginfestor", "legnanotcplat",}, -- nano, infestor, floating nano
{ "leghp", "legfhp", }, -- hover lab, floating hover lab
}
},
Expand All @@ -952,7 +952,7 @@ local unitGrids = {
},
{
{ "leglab", "legvp", "legap", "corsy", }, -- bot lab, veh lab, air lab, shipyard
{ "cornanotc", "leginfestor", "cornanotcplat",}, -- nano, infestor, floating nano
{ "legnanotc", "leginfestor", "legnanotcplat",}, -- nano, infestor, floating nano
{ "leghp", "legfhp", }, -- hover lab, floating hover lab
}
},
Expand All @@ -974,7 +974,7 @@ local unitGrids = {
},
{
{ "leglab", "legvp", "legap", "corsy", }, -- bot lab, veh lab, air lab, shipyard
{ "cornanotc", "leginfestor", "cornanotcplat",}, -- nano, infestor, floating nano
{ "legnanotc", "leginfestor", "legnanotcplat",}, -- nano, infestor, floating nano
{ "leghp", "legfhp", }, -- hover lab, floating hover lab
}
},
Expand All @@ -996,7 +996,7 @@ local unitGrids = {
},
{
{ "leglab", "legvp", "legap", "corsy", }, -- bot lab, veh lab, air lab, shipyard
{ "cornanotc", "leginfestor", "cornanotcplat",}, -- nano, infestor, floating nano
{ "legnanotc", "leginfestor", "legnanotcplat",}, -- nano, infestor, floating nano
{ "leghp", "legfhp", }, -- hover lab, floating hover lab
}
},
Expand Down Expand Up @@ -1064,7 +1064,7 @@ local unitGrids = {
},
{
{ "leglab", "legvp", "legap", "corsy", }, -- bot lab, veh lab, air lab, shipyard
{ "cornanotc", "legalab", }, -- nano, T2 lab
{ "legnanotc", "legalab", }, -- nano, T2 lab
{ "leghp", }, -- hover lab, floating hover lab, amphibious lab, seaplane lab
}
},
Expand Down Expand Up @@ -1133,7 +1133,7 @@ local unitGrids = {
},
{
{ "leglab", "legvp", "legap", "corsy", }, -- bot lab, veh lab, air lab, shipyard
{ "cornanotc", "coralab", }, -- nano, T2 lab
{ "legnanotc", "coralab", }, -- nano, T2 lab
{ "leghp", }, -- hover lab, floating hover lab, amphibious lab, seaplane lab
}
},
Expand Down Expand Up @@ -1201,7 +1201,7 @@ local unitGrids = {
},
{
{ "leglab", "legvp", "legap", "corsy", }, -- bot lab, veh lab, air lab, shipyard
{ "cornanotc", "legaap", }, -- nano, T2 lab
{ "legnanotc", "legaap", }, -- nano, T2 lab
{ "leghp", }, -- hover lab, floating hover lab, amphibious lab, seaplane lab
}
},
Expand Down Expand Up @@ -1315,7 +1315,7 @@ local unitGrids = {
},
{
{ "leglab", "legvp", "legap", "corsy", }, -- bot lab, veh lab, air lab, shipyard
{ "cornanotc", "legavp", "cornanotcplat", "corasy", }, -- nano, T2 veh lab, floating nano
{ "legnanotc", "legavp", "legnanotcplat", "corasy", }, -- nano, T2 veh lab, floating nano
{ "leghp", "legfhp", "legamsub", "corplat", }, -- hover lab, floating hover lab, amphibious lab, seaplane lab
}
},
Expand Down Expand Up @@ -1432,7 +1432,7 @@ local unitGrids = {
},
{
{ "leglab", "legvp", "legap", "corsy", }, -- bot lab, veh lab, air lab, shipyard
{ "cornanotc", "legavp", "cornanotcplat", }, -- nano, T2 veh lab, floating nano
{ "legnanotc", "legavp", "legnanotcplat", }, -- nano, T2 veh lab, floating nano
{ "leghp", "legfhp", "legamsub", "corplat", }, -- hover lab, floating hover lab, amphibious lab, seaplane lab
}
},
Expand Down Expand Up @@ -1876,7 +1876,7 @@ local unitGrids = {
},
{
{ "leglab", "legck", }, -- bot lab, bot con
{ "cornanotc", "legch", }, -- nano, hover con (for now)
{ "legnanotc", "legch", }, -- nano, hover con (for now)
{ }, --
}
},
Expand Down
Binary file added objects3d/Units/legnanotc.s3o
View file
Binary file not shown.
Binary file added objects3d/Units/legnanotcplat.s3o
View file
Binary file not shown.
Binary file added unitpics/legnanotc.dds
View file
Binary file not shown.
Binary file added unitpics/legnanotcplat.dds
View file
Binary file not shown.
1 change: 1 addition & 0 deletions units/Legion/Bots/T2 Bots/legshot.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,7 @@ return {
default = 40,
vtol = 13,
},
},
},
weapons = {
[1] = {
Expand Down
2 changes: 1 addition & 1 deletion units/Legion/Constructors/legaceb.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ return {
[1] = "legsolar",
[2] = "legmex",
[3] = "leglab",
[4] = "cornanotc",
[4] = "legnanotc",
[5] = "coreyes",
[6] = "corshroud",
[7] = "legforti",
Expand Down
2 changes: 1 addition & 1 deletion units/Legion/Constructors/legca.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ return {
"legvp",
"legap",
"leghp",
"cornanotc",
"legnanotc",
"coreyes",
"legrad",
"legdrag",
Expand Down
4 changes: 2 additions & 2 deletions units/Legion/Constructors/legch.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,8 @@ return {
[12] = "legap",
[13] = "leghp",
[14] = "legavp",
[15] = "cornanotc",
[16] = "cornanotcplat",
[15] = "legnanotc",
[16] = "legnanotcplat",
[17] = "coreyes",
[18] = "legrad",
[19] = "legdrag",
Expand Down
2 changes: 1 addition & 1 deletion units/Legion/Constructors/legck.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ return {
"legvp",
"legap",
"leghp",
"cornanotc",
"legnanotc",
"coreyes",
"legrad",
"legdrag",
Expand Down
2 changes: 1 addition & 1 deletion units/Legion/Constructors/legcs.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ return {
"coruwes",
"legsy",
"corasy",
"cornanotcplat",
"legnanotcplat",
"corfhp",
"legamsub",
"corplat",
Expand Down
2 changes: 1 addition & 1 deletion units/Legion/Constructors/legcv.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ return {
"legvp",
"legap",
"leghp",
"cornanotc",
"legnanotc",
"coreyes",
"legrad",
"legdrag",
Expand Down
4 changes: 2 additions & 2 deletions units/Legion/Constructors/legotter.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,8 @@ return {
[12] = "legap",
[13] = "leghp",
[14] = "legavp",
[15] = "cornanotc",
[16] = "cornanotcplat",
[15] = "legnanotc",
[16] = "legnanotcplat",
[17] = "coreyes",
[18] = "legrad",
[19] = "legdrag",
Expand Down
Loading

0 comments on commit a99c69e

Please sign in to comment.