Legion atlas beautification + other small fixes (beyond-all-reason#3569)

* Railgun unit beautification + leg atlas decompression * Fixes in other areas and making the entire atlas look good :) * Update legsilo.s3o * Add leggob * add heavy drone to evocoms * update leggob * Adjust evocoms + legshot projectiles * Update legheavydrone.lua Improved accuracy * Update legshot.lua Cardea (shotgun hover) weapon copied over to Phalanx --------- Co-authored-by: Zecrus2 <[email protected]>
Tharsy · Aug 20, 2024 · 3cd41dd · 3cd41dd
1 parent 967f756
commit 3cd41dd
Show file tree

Hide file tree

Showing 46 changed files with 883 additions and 1,100 deletions.
diff --git a/gamedata/armordefs.lua b/gamedata/armordefs.lua
@@ -509,6 +509,7 @@ local armorDefs = {
 		"armdroneold",
 		"cordroneold",
 		"legdrone",
+		"legheavydrone",
 		"raptor_air_bomber_basic_t1_v1",
 		"raptor_air_bomber_basic_t2_v1",
 		"raptor_air_bomber_basic_t2_v2",

diff --git a/gamedata/icontypes.lua b/gamedata/icontypes.lua
@@ -2291,6 +2291,10 @@ local icontypes = {
 		bitmap = "icons/air_hover.png",
 		size = 0.5
 	},
+	legheavydrone = {
+		bitmap = "icons/heavyheatraydrone.png",
+		size = 0.75
+	},
 	legfhp = {
 		bitmap = "icons/factory_hover.png",
 		size = 1.52250004

diff --git a/icons/heavyheatraydrone.png b/icons/heavyheatraydrone.png
diff --git a/icons/inverted/heavyheatraydrone.png b/icons/inverted/heavyheatraydrone.png
diff --git a/language/en/units.json b/language/en/units.json
@@ -700,7 +700,8 @@
 			"legdtl": "Dragon's Claw",
 			"legdtm": "Dragon's Tail",
 			"legforti": "Fortification Wall",
-			"legdrone": "Light Combat Drone",
+			"legdrone": "Legion Drone",
+			"legheavydrone": "Legion Heavy Drone",
 			"legdtr": "Dragon's Jaw",
 			"legeconv": "Energy Converter",
 			"legfhp": "Naval Hovercraft Platform",
@@ -1531,6 +1532,7 @@
 			"legdtm": "Pop-up Missile Turret",
 			"legforti": "Advanced Fortification",
 			"legdrone": "Light Combat Drone",
+			"legheavydrone": "Heavy Defense Drone",
 			"legfhp": "Builds Hovercraft",
 			"legfig": "Fighter / Scout Drone",
 			"legfloat": "Heavy Convertible Tank/Boat",

diff --git a/luarules/configs/gui_soundeffects.lua b/luarules/configs/gui_soundeffects.lua
@@ -2380,6 +2380,36 @@ GUIUnitSoundEffects = {
 		BaseSoundMovementType = { "cor-com-ok-1", "cor-com-ok-2", "cor-com-ok-3", "cor-com-ok-4", },
 		BaseSoundWeaponType = "fastemg-small",
 	},
+	legcomlvl5 = {
+		BaseSoundSelectType = "cor-com-sel",
+		BaseSoundMovementType = { "cor-com-ok-1", "cor-com-ok-2", "cor-com-ok-3", "cor-com-ok-4", },
+		BaseSoundWeaponType = "fastemg-small",
+	},
+	legcomlvl6 = {
+		BaseSoundSelectType = "cor-com-sel",
+		BaseSoundMovementType = { "cor-com-ok-1", "cor-com-ok-2", "cor-com-ok-3", "cor-com-ok-4", },
+		BaseSoundWeaponType = "fastemg-small",
+	},
+	legcomlvl7 = {
+		BaseSoundSelectType = "cor-com-sel",
+		BaseSoundMovementType = { "cor-com-ok-1", "cor-com-ok-2", "cor-com-ok-3", "cor-com-ok-4", },
+		BaseSoundWeaponType = "fastemg-small",
+	},
+	legcomlvl8 = {
+		BaseSoundSelectType = "cor-com-sel",
+		BaseSoundMovementType = { "cor-com-ok-1", "cor-com-ok-2", "cor-com-ok-3", "cor-com-ok-4", },
+		BaseSoundWeaponType = "fastemg-small",
+	},
+	legcomlvl9 = {
+		BaseSoundSelectType = "cor-com-sel",
+		BaseSoundMovementType = { "cor-com-ok-1", "cor-com-ok-2", "cor-com-ok-3", "cor-com-ok-4", },
+		BaseSoundWeaponType = "fastemg-small",
+	},
+	legcomlvl10 = {
+		BaseSoundSelectType = "cor-com-sel",
+		BaseSoundMovementType = { "cor-com-ok-1", "cor-com-ok-2", "cor-com-ok-3", "cor-com-ok-4", },
+		BaseSoundWeaponType = "fastemg-small",
+	},
 
 	-- LEGION T1 BUILDINGS
 

diff --git a/luarules/gadgets/unit_continuous_aim.lua b/luarules/gadgets/unit_continuous_aim.lua
@@ -97,6 +97,7 @@ local convertedUnitsNames = {
 	['legmos'] = 5,
 	['leghades'] = 5,
 	['leghelios'] = 5,
+	['legheavydrone'] = 5,
 	['legkeres'] = 5,
 	['legrail'] = 5,
 	['legbar'] = 5,

diff --git a/luaui/Widgets/gfx_airjets_gl4.lua b/luaui/Widgets/gfx_airjets_gl4.lua
@@ -194,6 +194,9 @@ local effectDefs = {
 	["legmos"] = {
 		{ color = { 0.2, 0.8, 0.2 }, width = 2, length = 16, piece = "thrust", emitVector = { 0, 0, -1 }, xzVelocity = 1.5, light = 1 },
 	},
+	["legheavydrone"] = {
+		{ color = { 0.2, 0.8, 0.2 }, width = 2, length = 16, piece = "thrusttrail", 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 },

diff --git a/luaui/configs/DeferredLightsGL4config.lua b/luaui/configs/DeferredLightsGL4config.lua
@@ -20273,6 +20273,82 @@ local unitLights = {
 							lifetime = 0, sustain = 0, animtype = 0},
 		},
 	},
+	['legrail'] = {
+		eye = {
+			lightType = 'point',
+			pieceName = 'base',
+			lightConfig = { posx = 3.1, posy = 10.0, posz = 20.0, radius = 10.0,
+							color2r = 1, color2g = 0.2, color2b = 0.2, colortime = 0,
+							r = 0.2, g = 1, b = 0.2, a = 0.1,
+							modelfactor = 0.4, specular = 0, scattering = 0.7, lensflare = 0,
+							lifetime = 0, sustain = 0, animtype = 0},
+		},
+		capacitor = {
+			lightType = 'point',
+			pieceName = 'sleeve',
+			lightConfig = { posx = 1.0, posy = 2.0, posz = -8.0, radius = 10.0,
+							color2r = 1, color2g = 0.2, color2b = 0.2, colortime = 0,
+							r = 0.2, g = 1, b = 0.2, a = 0.1,
+							modelfactor = 0.4, specular = 0, scattering = 0.7, lensflare = 0,
+							lifetime = 0, sustain = 0, animtype = 0},
+		},
+		sleeveglow = {
+			lightType = 'point',
+			pieceName = 'barrel',
+			lightConfig = { posx = 0.0, posy = 0.0, posz = 0.0, radius = 8.0,
+							color2r = 1, color2g = 0.2, color2b = 0.2, colortime = 0,
+							r = 0.6, g = 0.3, b = 0.1, a = 0.25,
+							modelfactor = 0.4, specular = 0, scattering = 0.7, lensflare = 0,
+							lifetime = 0, sustain = 0, animtype = 0},
+		},
+	},
+	['legsrail'] = {
+		eye1 = {
+			lightType = 'point',
+			pieceName = 'pelvis',
+			lightConfig = { posx = -2.0, posy = 14.0, posz = 10.0, radius = 10.0,
+							color2r = 1, color2g = 0.2, color2b = 0.2, colortime = 0,
+							r = 0.2, g = 1, b = 0.2, a = 0.1,
+							modelfactor = 0.0, specular = 0, scattering = 0.7, lensflare = 0,
+							lifetime = 0, sustain = 0, animtype = 0},
+		},
+		eye2 = {
+			lightType = 'point',
+			pieceName = 'pelvis',
+			lightConfig = { posx = 0.0, posy = 14.0, posz = 10.0, radius = 10.0,
+							color2r = 1, color2g = 0.2, color2b = 0.2, colortime = 0,
+							r = 0.2, g = 1, b = 0.2, a = 0.1,
+							modelfactor = 0.0, specular = 0, scattering = 0.7, lensflare = 0,
+							lifetime = 0, sustain = 0, animtype = 0},
+		},
+		eye3 = {
+			lightType = 'point',
+			pieceName = 'pelvis',
+			lightConfig = { posx = 2.0, posy = 14.0, posz = 10.0, radius = 10.0,
+							color2r = 1, color2g = 0.2, color2b = 0.2, colortime = 0,
+							r = 0.2, g = 1, b = 0.2, a = 0.1,
+							modelfactor = 0.0, specular = 0, scattering = 0.7, lensflare = 0,
+							lifetime = 0, sustain = 0, animtype = 0},
+		},
+		capacitors = {
+			lightType = 'point',
+			pieceName = 'sleeve',
+			lightConfig = { posx = 0.0, posy = 3.5, posz = -2.0, radius = 20.0,
+							color2r = 1, color2g = 0.2, color2b = 0.2, colortime = 0,
+							r = 0.6, g = 0.3, b = 0.1, a = 0.2,
+							modelfactor = 0.4, specular = 0, scattering = 0.7, lensflare = 0,
+							lifetime = 0, sustain = 0, animtype = 0},
+		},
+		sleeveglow = {
+			lightType = 'point',
+			pieceName = 'barrel',
+			lightConfig = { posx = 0.0, posy = 0.0, posz = -4.0, radius = 8.0,
+							color2r = 1, color2g = 0.2, color2b = 0.2, colortime = 0,
+							r = 0.6, g = 0.3, b = 0.1, a = 0.25,
+							modelfactor = 0.4, specular = 0, scattering = 0.7, lensflare = 0,
+							lifetime = 0, sustain = 0, animtype = 0},
+		},
+	},
 	['armgate'] = {
 		shieldglow = {
 			lightType = 'point',
@@ -20483,6 +20559,20 @@ local unitEventLightsNames = {
 			},
 		},
 
+		['legheavydrone'] = {
+			[1] = { --lightIndex as above, MUST BE AN INTEGER, Give it a nice name in a comment,
+				lightType = 'point',
+				pieceName = 'flare',
+				lightName = 'hvydronheatToroidGlow',
+				alwaysVisible = true,
+				lightConfig = { posx = 0, posy = 7, posz = 1, radius = 12,
+					color2r = 1, color2g = 0.92, color2b = 0.66, colortime = 160,
+					r = 0.88, g = 0.83, b = 0.2, a = 0.09,
+					modelfactor = 1.5, specular = 2, scattering = 2, lensflare = 0,
+					lifetime = 80, sustain = 5},
+			},
+		},
+
 		['leghelios'] = {
 			[1] = { --lightIndex as above, MUST BE AN INTEGER, Give it a nice name in a comment,
 				lightType = 'point',
@@ -20807,6 +20897,57 @@ local unitEventLightsNames = {
 					lifetime = 200, sustain = 15, animtype = 0},
 			},
 		},
+
+		['legrail'] = {
+			[1] = { --lightIndex as above, MUST BE AN INTEGER, Give it a nice name in a comment,
+				lightType = 'point',
+				pieceName = 'flare',
+				lightName = 'railglow',
+				alwaysVisible = true,
+				lightConfig = { posx = 0, posy = 0, posz = 0, radius = 16,
+					color2r = 0.01, color2g = 0.1, color2b = 0.2, colortime = 550,
+					r = 0.5, g = 0.3, b = 0.1, a = 0.50,
+					modelfactor = 2, specular = 1, scattering = 0, lensflare = 1,
+					lifetime = 100, sustain = 5, animtype = 0},
+			},
+			[2] = { --lightIndex as above, MUST BE AN INTEGER, Give it a nice name in a comment,
+				lightType = 'point',
+				pieceName = 'flare',
+				lightName = 'railglowaa',
+				alwaysVisible = true,
+				lightConfig = { posx = 0, posy = 0, posz = 0, radius = 16,
+					color2r = 0.01, color2g = 0.1, color2b = 0.2, colortime = 550,
+					r = 1.0, g = 0.33, b = 0.7, a = 0.50,
+					modelfactor = 2, specular = 1, scattering = 0, lensflare = 1,
+					lifetime = 100, sustain = 5, animtype = 0},
+			},
+		},
+
+		['legsrail'] = {
+			[1] = { --lightIndex as above, MUST BE AN INTEGER, Give it a nice name in a comment,
+				lightType = 'point',
+				pieceName = 'flare1',
+				lightName = 'railglowt2',
+				alwaysVisible = true,
+				lightConfig = { posx = 0, posy = 0, posz = 0, radius = 24,
+					color2r = 0.01, color2g = 0.1, color2b = 0.2, colortime = 550,
+					r = 0.5, g = 0.3, b = 0.1, a = 0.50,
+					modelfactor = 2, specular = 1, scattering = 0, lensflare = 1,
+					lifetime = 100, sustain = 5, animtype = 0},
+			},
+			[2] = { --lightIndex as above, MUST BE AN INTEGER, Give it a nice name in a comment,
+				lightType = 'point',
+				pieceName = 'flare1',
+				lightName = 'railglowt2aa',
+				alwaysVisible = true,
+				lightConfig = { posx = 0, posy = 0, posz = 0, radius = 24,
+					color2r = 0.01, color2g = 0.1, color2b = 0.2, colortime = 550,
+					r = 1.0, g = 0.33, b = 0.7, a = 0.50,
+					modelfactor = 2, specular = 1, scattering = 0, lensflare = 1,
+					lifetime = 100, sustain = 5, animtype = 0},
+			},
+		},
+
 		['legphoenix'] = {
 			[1] = { --lightIndex as above, MUST BE AN INTEGER, Give it a nice name in a comment,
 				lightType = 'point',
@@ -20949,7 +21090,6 @@ local unitEventLightsNames = {
 			},
 		},
 
-
 		['armraz'] = {
 			[1] = { --lightIndex as above, MUST BE AN INTEGER, Give it a nice name in a comment,
 				lightType = 'point',
@@ -21082,6 +21222,8 @@ local unitEventLightsNames = {
 	},
 
 
+
+
 	------------------------------- Put additional lights tied to events here! --------------------------------
 	UnitIdle =  {
 		['armcom'] = {

diff --git a/objects3d/Units/legcv.s3o b/objects3d/Units/legcv.s3o
diff --git a/objects3d/Units/legcv_dead.s3o b/objects3d/Units/legcv_dead.s3o
diff --git a/objects3d/Units/leggob.s3o b/objects3d/Units/leggob.s3o
diff --git a/objects3d/Units/leggob_dead.s3o b/objects3d/Units/leggob_dead.s3o
diff --git a/objects3d/Units/legheavydrone.s3o b/objects3d/Units/legheavydrone.s3o
diff --git a/objects3d/Units/legsilo.s3o b/objects3d/Units/legsilo.s3o
diff --git a/objects3d/Units/legsrail.s3o b/objects3d/Units/legsrail.s3o
diff --git a/scripts/Units/legcv.bos b/scripts/Units/legcv.bos
@@ -3,7 +3,7 @@
 #define SIGNAL_MOVE 1
 #define SIGNAL_BUILD 2
 
-piece base, mlwheel, mrwheel, blwheel, brwheel, flwheel, frwheel, arml, armr, lpanel, rpanel, solar, loturret, upturret, nano, beam, cagelight, cagelight_emit;
+piece base, mlwheel, mrwheel, blwheel, brwheel, flwheel, frwheel, arml, armr, lpanel, rpanel, solar, cylinderdeco, loturret, upturret, nano, beam, cagelight, cagelight_emit;
 
 static-var  restore_delay, readyToBuild, currentSpeed, moveSpeed, wheelSpeed, oldHeading;
 
@@ -82,6 +82,7 @@ Create()
 	oldheading = get HEADING;
 	start-script Steering();
 	SLEEP_UNTIL_UNITFINISHED;
+	spin cylinderdeco around x-axis speed <30>;
 	set INBUILDSTANCE to FALSE;
 }
 
@@ -118,6 +119,8 @@ StartBuilding(heading, pitch)
 	show cagelight_emit;
 	spin cagelight_emit around y-axis speed <250>;
 
+	spin cylinderdeco around x-axis speed <240> accelerate <10>;
+
 	readyToBuild = 1;
 }
 
@@ -128,6 +131,8 @@ StopBuilding()
 
 	hide cagelight_emit;
 	turn cagelight to y-axis <0> speed <1000>;
+
+	spin cylinderdeco around x-axis speed <30> accelerate <10>;
 
 	sleep 6000;
 	set INBUILDSTANCE to FALSE;

diff --git a/scripts/Units/legcv.cob b/scripts/Units/legcv.cob