Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add Legion T2 AA Truck and Update T2 AA Turret #4178

Merged
merged 5 commits into from
Jan 16, 2025
Merged

Add Legion T2 AA Truck and Update T2 AA Turret #4178

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
da21951
Update legflak
Tharsy Jan 16, 2025
48f5147
Add legvflak "charon"
Tharsy Jan 16, 2025
3f61cd9
Charon Final Tweaks
Tharsy Jan 16, 2025
1098d7e
Optimize scripts
Tharsy Jan 16, 2025
948b97f
other isseus fix
Tharsy Jan 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions gamedata/icontypes.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1875,6 +1875,10 @@ local icontypes = {
bitmap = "icons/vehicle_t2_aa_flak.png",
size = 1.36499989
},
legvflak = {
bitmap = "icons/vehicle_t2_aa_flak.png",
size = 1.36499989
},
corsiegebreaker = {
bitmap = "icons/vehicle_t2_tank_laser.png",
size = 1.46999991
Expand Down
6 changes: 4 additions & 2 deletions language/en/units.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -722,7 +722,8 @@
"legfig": "Noctua",
"legfhive": "Hive",
"legfmkr": "Naval Energy Converter",
"legflak": "Ravager",
"legflak": "Pluto",
"legvflak": "Charon",
"legfloat": "Triton",
"legfort": "Tyrannus",
"legfortt4": "Epic Tyrannus",
Expand Down Expand Up @@ -1582,7 +1583,8 @@
"legfhp": "Builds Hovercraft",
"legfig": "Fighter / Scout Drone",
"legfloat": "Heavy Convertible Tank/Boat",
"legflak": "Anti-Air Gatling Gun",
"legflak": "Anti-Air Minigun",
"legvflak": "Anti-Air Minigun Truck",
"legfort": "Flying Fortress",
"legfortt4": "Gigantic Flying Fortress",
"legafus": "Produces 3000 Energy (Hazardous)",
Expand Down
5 changes: 5 additions & 0 deletions luarules/configs/gui_soundeffects.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3099,6 +3099,11 @@ GUIUnitSoundEffects = {
BaseSoundMovementType = "cor-tnk-medium-ok",
BaseSoundWeaponType = "arty-large",
},
legvflak = {
BaseSoundSelectType = "leg-veh-small-sel",
BaseSoundMovementType = "leg-veh-small-ok",
BaseSoundWeaponType = "flak",
},
legaskirmtank = {
BaseSoundSelectType = "cor-tnk-medium-sel",
BaseSoundMovementType = "cor-tnk-medium-ok",
Expand Down
13 changes: 8 additions & 5 deletions luarules/configs/scav_spawn_defs.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -455,6 +455,7 @@ local LandUnitsList = {
["legvcarry_scav"] = 2,
["legbart_scav"] = 2,
["legsrail_scav"] = 2,
["legvflak_scav"] = 2,

},
[5] = {
Expand Down Expand Up @@ -779,6 +780,8 @@ local SeaUnitsList = {
["cormship_scav"] = 2,
["corsjam_scav"] = 2,
["corsentinel_scav"] = 2,
--Legion
["legvflak_scav"] = 2,
},
[6] = {
--Armada
Expand Down Expand Up @@ -1909,9 +1912,9 @@ addNewSquad({ type = "specialAirLand", minAnger = tierConfiguration[3].minAnger,
addNewSquad({ type = "specialLand", minAnger = tierConfiguration[4].minAnger, units = { "10 armfav_scav","10 corfav_scav","25 armzapper_scav",}, weight = 6, maxAnger = tierConfiguration[4].maxAnger}) --Rover and EMP Rover/Whole Tier Length
--Land
addNewSquad({ type = "specialLand", minAnger = tierConfiguration[4].minAnger, units = { "6 armlatnk_scav","6 cortorch_scav","6 legmrv_scav",}, weight = 4, maxAnger = tierConfiguration[4].maxAnger}) --T2 Veh Raid
addNewSquad({ type = "specialLand", minAnger = tierConfiguration[4].minAnger, units = { "6 armbull_scav","6 correap_scav","1 corgol_scav","2 legaheattank_scav","2 armyork_scav","2 corsent_scav",}, weight = 4, maxAnger = tierConfiguration[4].maxAnger}) --T2 Veh Assault/AA
addNewSquad({ type = "specialLand", minAnger = tierConfiguration[4].minAnger, units = { "6 armbull_scav","6 correap_scav","1 corgol_scav","2 legaheattank_scav","2 armyork_scav","2 corsent_scav","2 legvflak_scav",}, weight = 4, maxAnger = tierConfiguration[4].maxAnger}) --T2 Veh Assault/AA
addNewSquad({ type = "specialLand", minAnger = tierConfiguration[5].minAnger, units = { "2 armmanni_scav","2 corban_scav","1 legvcarry_scav",}, weight = 4, maxAnger = tierConfiguration[5].maxAnger}) --T2 Veh Unique
addNewSquad({ type = "specialLand", minAnger = tierConfiguration[5].minAnger, units = { "3 armmart_scav","1 armmerl_scav","1 armyork_scav","3 cormart_scav","1 corvroc_scav","1 corsent_scav","1 leginf_scav",}, weight = 4, maxAnger = tierConfiguration[5].maxAnger}) --T2 Arty/AA
addNewSquad({ type = "specialLand", minAnger = tierConfiguration[5].minAnger, units = { "3 armmart_scav","1 armmerl_scav","1 armyork_scav","3 cormart_scav","1 corvroc_scav","1 corsent_scav","2 legvflak_scav","1 leginf_scav",}, weight = 4, maxAnger = tierConfiguration[5].maxAnger}) --T2 Arty/AA
--air
addNewSquad({ type = "specialAirLand", minAnger = tierConfiguration[5].minAnger, units = { "3 armawac_scav","3 corawac_scav",}, weight = 4, maxAnger = 1000}) --T2 Air Scouts
addNewSquad({ type = "specialAirLand", minAnger = tierConfiguration[5].minAnger, units = { "2 armstil_scav",}, weight = 4, maxAnger = 1000}) --EMP Bombers
Expand All @@ -1924,9 +1927,9 @@ addNewSquad({ type = "specialLand", minAnger = tierConfiguration[6].minAnger, un
addNewSquad({ type = "specialLand", minAnger = tierConfiguration[6].minAnger, units = { "6 cortorch_scav","6 legmrv_scav",}, weight = 3, maxAnger = tierConfiguration[6].maxAnger}) --T2 Veh Raid
--Land
addNewSquad({ type = "specialLand", minAnger = tierConfiguration[6].minAnger, units = { "12 armmar_scav",}, weight = 3, maxAnger = tierConfiguration[6].maxAnger}) --T3 Raid
addNewSquad({ type = "specialLand", minAnger = tierConfiguration[6].minAnger, units = { "6 armmeatball_scav","6 armassimilator_scav","2 armyork_scav","2 corsent_scav",}, weight = 4, maxAnger = tierConfiguration[6].maxAnger}) --T3 Assault/AA
addNewSquad({ type = "specialLand", minAnger = tierConfiguration[6].minAnger, units = { "6 corshiva_scav","2 armraz_scav","1 legpede_scav","1 armyork_scav","1 corsent_scav",}, weight = 4, maxAnger = tierConfiguration[6].maxAnger}) --T3 Assault/AA
addNewSquad({ type = "specialLand", minAnger = tierConfiguration[6].minAnger, units = { "2 armvang_scav","2 corcat_scav","1 armyork_scav","1 corsent_scav",}, weight = 4, maxAnger = tierConfiguration[6].maxAnger}) --T3 Arty/AA
addNewSquad({ type = "specialLand", minAnger = tierConfiguration[6].minAnger, units = { "6 armmeatball_scav","6 armassimilator_scav","2 armyork_scav","2 corsent_scav"," 2legvflak_scav",}, weight = 4, maxAnger = tierConfiguration[6].maxAnger}) --T3 Assault/AA
addNewSquad({ type = "specialLand", minAnger = tierConfiguration[6].minAnger, units = { "6 corshiva_scav","2 armraz_scav","1 legpede_scav","1 armyork_scav","1 corsent_scav","2 legvflak_scav",}, weight = 4, maxAnger = tierConfiguration[6].maxAnger}) --T3 Assault/AA
addNewSquad({ type = "specialLand", minAnger = tierConfiguration[6].minAnger, units = { "2 armvang_scav","2 corcat_scav","1 armyork_scav","1 corsent_scav","2 legvflak_scav",}, weight = 4, maxAnger = tierConfiguration[6].maxAnger}) --T3 Arty/AA
addNewSquad({ type = "specialLand", minAnger = tierConfiguration[6].minAnger, units = { "5 armvadert4_scav",}, weight = 3, maxAnger = 1000}) --Epic Tumbleweeds
addNewSquad({ type = "specialSea", minAnger = tierConfiguration[6].minAnger, units = { "5 armvadert4_scav",}, weight = 3, maxAnger = 1000}) --Epic Tumbleweeds
--air
Expand Down
1 change: 1 addition & 0 deletions luaui/configs/buildmenu_sorting.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -326,6 +326,7 @@ local unitOrderTable = {

['armyork'] = 008200,
['corsent'] = 008210,
['legvflak'] = 008220,

['armah'] = 008300,
['corah'] = 008310,
Expand Down
2 changes: 1 addition & 1 deletion luaui/configs/gridmenu_layouts.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ local labGrids = {
legavp = {
"legacv", "legmrv", "legaskirmtank", "legamcluster", -- T2 con, Quickshot, scorpion, cleaver
"legavrad", "legavjam", "legaheattank", "leginf", -- radar, jammer, goli, inferno
"legfloat", "legmed", "corsent", "legavroc", -- the new and improved triton, medusa, AA, boreas
"legfloat", "legmed", "legvflak", "legavroc", -- the new and improved triton, medusa, AA, boreas
},
-- T1 air
armap = {
Expand Down
Binary file modified objects3d/Units/legflak.s3o
View file
Open in desktop
Binary file not shown.
Binary file modified objects3d/Units/legflak_dead.s3o
View file
Open in desktop
Binary file not shown.
Binary file added objects3d/Units/legvflak.s3o
View file
Open in desktop
Binary file not shown.
Binary file added objects3d/Units/legvflak_dead.s3o
View file
Open in desktop
Binary file not shown.
Loading