Skip to content

Commit

Permalink
Legion javelin (#4073)
Browse files Browse the repository at this point in the history
* Add Legion Javelin

* add legjav wreck

Split from Commit: 1240d50

Co-Authored-By: Tharsy <[email protected]>

* legjav smaller model

Co-Authored-By: Tharsy <[email protected]>

* Update unit_continuous_aim.lua

* Update legjav.lua

Changed footprint, main weapon can no longer fire at air

---------

Co-authored-by: Tharsis <[email protected]>
Co-authored-by: Tharsy <[email protected]>
Co-authored-by: Zecrus2 <[email protected]>
  • Loading branch information
4 people authored Dec 30, 2024
1 parent d35d55b commit 141b16d
Show file tree
Hide file tree
Showing 16 changed files with 1,070 additions and 4 deletions.
1 change: 1 addition & 0 deletions gamedata/armordefs.lua
Original file line number Diff line number Diff line change
Expand Up @@ -448,6 +448,7 @@ local armorDefs = {
"legfhp",
"legch",
"legeyes",
"legjav",
},
mines = {
"armfmine3",
Expand Down
4 changes: 4 additions & 0 deletions gamedata/icontypes.lua
Original file line number Diff line number Diff line change
Expand Up @@ -539,6 +539,10 @@ local icontypes = {
bitmap = "icons/armmar_t3.png",
size = 2
},
legjav = {
bitmap = "icons/legjav.png",
size = 2.1
},
armmark = {
bitmap = "icons/bot_t2_radar.png",
size = 1.34399986
Expand Down
Binary file added icons/legjav.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 4 additions & 2 deletions language/en/units.json
Original file line number Diff line number Diff line change
Expand Up @@ -862,7 +862,8 @@
"legnanotcbase": "Base Builder",
"legrampart": "Rampart",
"legabm": "Aegis",
"legrwall": "Dragon's Constitution"
"legrwall": "Dragon's Constitution",
"legjav": "Javelin"
},
"descriptions": {
"armaak": "Advanced Amphibious Anti-Air Bot",
Expand Down Expand Up @@ -1719,7 +1720,8 @@
"legnanotcbase": "Assist & Repair in massive radius",
"legrampart": "Geothermal Antinuke, Jammer, Radar and Drone Platform",
"legabm": "Anti-Nuke System",
"legrwall": "Railgun Defense Wall"
"legrwall": "Railgun Defense Wall",
"legjav": "Amphibious Raider"
}
}
}
5 changes: 5 additions & 0 deletions luarules/configs/gui_soundeffects.lua
Original file line number Diff line number Diff line change
Expand Up @@ -2983,6 +2983,11 @@ GUIUnitSoundEffects = {
BaseSoundMovementType = "cor-bot-large-ok",
BaseSoundWeaponType = "plasma-large",
},
legjav = {
BaseSoundSelectType = "arm-bot-huge-sel",
BaseSoundMovementType = "arm-bot-huge-ok",
BaseSoundWeaponType = "fastemg-medium",
},

-- LEGION T1 VEHICLES
legcv = {
Expand Down
1 change: 1 addition & 0 deletions luarules/gadgets/unit_continuous_aim.lua
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,7 @@ local convertedUnitsNames = {
['legmed'] = 5,
['legaheattank'] = 3,
['legrwall'] = 4,
['legjav'] = 3,
}
--add entries for scavboss
local scavengerBossV4Table = {'scavengerbossv4_veryeasy', 'scavengerbossv4_easy', 'scavengerbossv4_normal', 'scavengerbossv4_hard', 'scavengerbossv4_veryhard', 'scavengerbossv4_epic',
Expand Down
71 changes: 71 additions & 0 deletions luaui/configs/DeferredLightsGL4config.lua
Original file line number Diff line number Diff line change
Expand Up @@ -20250,6 +20250,53 @@ local unitLights = {
lifetime = 0, sustain = 0, animtype = 0},
},
},
['legjav'] = {
eye1 = {
lightType = 'point',
pieceName = 'torso',
lightConfig = { posx = 0, posy = -2.55, posz = 15, radius = 4,
color2r = 0, color2g = 0, color2b = 0, colortime = 75,
r = 0.3, g = 0.85, b = 0.3, a = 0.6,
modelfactor = 0.15, specular = 0.3, scattering = 0.7, lensflare = 10,
lifetime = 0, sustain = 0, animtype = 0},
},
eye2 = {
lightType = 'point',
pieceName = 'torso',
lightConfig = { posx = 0, posy = -4.75, posz = 14.4, radius = 2,
color2r = 0, color2g = 0, color2b = 0, colortime = 80,
r = 0.3, g = 0.85, b = 0.3, a = 0.6,
modelfactor = 0.15, specular = 0.3, scattering = 0.7, lensflare = 10,
lifetime = 0, sustain = 0, animtype = 0},
},
eye3 = {
lightType = 'point',
pieceName = 'torso',
lightConfig = { posx = 0, posy = 3.75, posz = 10.3, radius = 3,
color2r = 0, color2g = 0, color2b = 0, colortime = 65,
r = 0.3, g = 0.85, b = 0.3, a = 0.6,
modelfactor = 0.15, specular = 0.3, scattering = 0.7, lensflare = 10,
lifetime = 0, sustain = 0, animtype = 0},
},
eye4 = {
lightType = 'point',
pieceName = 'aasleeve',
lightConfig = { posx = -2.75, posy = 1.25, posz = 1.8, radius = 2.5,
color2r = 0, color2g = 0, color2b = 0, colortime = 70,
r = 0.3, g = 0.85, b = 0.3, a = 0.6,
modelfactor = 0.15, specular = 0.3, scattering = 0.7, lensflare = 10,
lifetime = 0, sustain = 0, animtype = 0},
},
floodlightglow = {
lightType = 'point',
pieceName = 'torso',
lightConfig = { posx = -4, posy = -6.5, posz = 11.4, radius = 2.5,
color2r = 0, color2g = 0, color2b = 0, colortime = 70,
r = 0.3, g = 0.85, b = 0.3, a = 0.6,
modelfactor = 0.15, specular = 0.3, scattering = 0.7, lensflare = 10,
lifetime = 0, sustain = 0, animtype = 0},
},
},
['cormuskrat'] = {
buildlight = { -- this is the lightname
lightType = 'cone',
Expand Down Expand Up @@ -21403,6 +21450,30 @@ local unitEventLightsNames = {
lifetime = 200, sustain = 2},
},
},
['legjav'] = {
[1] = { --lightIndex as above, MUST BE AN INTEGER, Give it a nice name in a comment,
lightType = 'point',
pieceName = 'lbarrel',
lightName = 'legjavlbarrelglow',
alwaysVisible = true,
lightConfig = { posx = 0, posy = 0, posz = 12, radius = 18,
color2r = 1, color2g = 0.2, color2b = 0, colortime = 200,
r = 0.4, g = 0.06, b = 0, a = 0.6,
modelfactor = 2, specular = 1, scattering = 0.0, lensflare = 0,
lifetime = 200, sustain = 3},
},
[2] = { --lightIndex as above, MUST BE AN INTEGER, Give it a nice name in a comment,
lightType = 'point',
pieceName = 'rbarrel',
lightName = 'legjavrbarrelglow',
alwaysVisible = true,
lightConfig = { posx = 0, posy = 0, posz = 12, radius = 18,
color2r = 1, color2g = 0.2, color2b = 0, colortime = 200,
r = 0.3, g = 0.06, b = 0, a = 0.6,
modelfactor = 2, specular = 1, scattering = 0.0, lensflare = 0,
lifetime = 200, sustain = 3},
},
},

['legrwall'] = {
[1] = { --lightIndex as above, MUST BE AN INTEGER, Give it a nice name in a comment,
Expand Down
1 change: 1 addition & 0 deletions luaui/configs/buildmenu_sorting.lua
Original file line number Diff line number Diff line change
Expand Up @@ -273,6 +273,7 @@ local unitOrderTable = {

--T3 LAND ATTACK
['armmar'] = 007000,
['legjav'] = 007005,
['corcat'] = 007010,
['armraz'] = 007020,
['corkarg'] = 007030,
Expand Down
2 changes: 1 addition & 1 deletion luaui/configs/gridmenu_layouts.lua
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ local labGrids = {
},

corgant = {
"corcat", "corkarg", "corshiva", "corkorg",
"corcat", "corkarg", "legjav", "corkorg",
"corjugg", "corsok"
},
leggant = {
Expand Down
Binary file added objects3d/Units/legjav.s3o
Binary file not shown.
Binary file added objects3d/Units/legjav_dead.s3o
Binary file not shown.
Loading

0 comments on commit 141b16d

Please sign in to comment.