legadvsol (#2818)

Added Legadvsol, from a model made by EnderRobo
beyond-all-reason · Apr 5, 2024 · 9d0dad4 · 9d0dad4
1 parent 6e27dc8
commit 9d0dad4
Show file tree

Hide file tree

Showing 21 changed files with 1,081 additions and 25 deletions.
diff --git a/gamedata/armordefs.lua b/gamedata/armordefs.lua
@@ -359,6 +359,8 @@ local armorDefs = {
 		"legstarfall",
 		"legflak",
 		"legsolar",
+		"legsolar",
+		"legadvsol",
 
 		"coruwgeo",
 		"coruwageo",

diff --git a/gamedata/icontypes.lua b/gamedata/icontypes.lua
@@ -2019,6 +2019,10 @@ local icontypes = {
 		bitmap = "icons/vehicle_t2_worker.png",
 		size = 1.36499989
 	},
+	legadvsol = {
+		bitmap = "icons/energy2_1.18.png",
+		size = 1.23899984
+	},
 	legalab = {
 		bitmap = "icons/factory_bot_t2.png",
 		size = 1.9425

diff --git a/language/en/units.json b/language/en/units.json
@@ -622,6 +622,7 @@
 			"legaca": "Advanced Construction Aircraft",
 			"legack": "Advanced Construction Bot",
 			"legacv": "Advanced Construction Vehicle",
+			"legadvsol": "Advanced Solar Collector",
 			"legassistdrone": "Assist Drone",
 			"legassistdrone_land": "Assist Vehicle",
 			"legavp": "Advanced Vehicle Plant",
@@ -1362,6 +1363,7 @@
 			"legaca": "Tech 2 Constructor",
 			"legack": "Tech 2 Constructor",
 			"legacv": "Tech 2 Constructor",
+			"legadvsol": "Produces 100 Energy",
 			"legassistdrone": "Portable Buildpower",
 			"legassistdrone_land": "Portable Buildpower",
 			"legavp": "Produces Tech 2 Vehicles",

diff --git a/luarules/configs/gui_soundeffects.lua b/luarules/configs/gui_soundeffects.lua
@@ -2469,7 +2469,11 @@ GUIUnitSoundEffects = {
 		BaseSoundActivate   = "arm-bld-solar-activate",
 		BaseSoundDeactivate = "arm-bld-solar-deactivate",
 	},
-
+	legadvsol = {
+		BaseSoundSelectType = "arm-bld-nrghum",
+		--BaseSoundMovementType = "",
+		BaseSoundWeaponType = "arm-bld-solar-alt-adv",
+	},
 
 	-- LEGION T1 BOTS
 	legck = {

diff --git a/luarules/gadgets/unit_sunfacing.lua b/luarules/gadgets/unit_sunfacing.lua
@@ -50,15 +50,14 @@ function gadget:Initialize()
 		end
 
 		--only look for advsols that care about the sun (coradvsol sun agnostic chad)
-		--legadvsol to follow
-		--if (UnitDefNames.legadvsol) then
-			--advsols[UnitDefNames.legadvsol.id] = true
-		--end
+		if (UnitDefNames.legadvsol) then
+			advsols[UnitDefNames.legadvsol.id] = true
+		end
+
+		if (UnitDefNames.legadvsol_scav) then
+			advsols[UnitDefNames.legadvsol_scav.id] = true
+		end
 
-		--if (UnitDefNames.legadvsol_scav) then
-			--advsols[UnitDefNames.legadvsol_scav.id] = true
-		--end
-
 		success, mapinfo = pcall(VFS.Include,"mapinfo.lua")
 
 		if success and mapinfo then

diff --git a/luaui/configs/DeferredLightsGL4config.lua b/luaui/configs/DeferredLightsGL4config.lua
@@ -16116,6 +16116,38 @@ local unitLights = {
 							lifetime = 0, sustain = 0, animtype = 0},
 		},
 	},
+
+	['legadvsol'] = {
+		glow1 = {
+			lightType = 'point',
+			pieceName = 'base',
+			lightConfig = { posx = 0, posy = 22, posz = 26, radius = 32,
+							color2r = 0, color2g = 0, color2b = 0, colortime = 0,
+							r = 1, g = 1, b = 0.4, a = 0.14,
+							modelfactor = 0.33, specular = 1.5, scattering = 0.5, lensflare = 0,
+							lifetime = 0, sustain = 0, animtype = 0},
+		},
+		glow2 = {
+			lightType = 'point',
+			pieceName = 'base',
+			lightConfig = { posx = -22, posy = 22, posz = -13, radius = 32,
+							color2r = 0, color2g = 0, color2b = 0, colortime = 0,
+							r = 1, g = 1, b = 0.4, a = 0.14,
+							modelfactor = 0.33, specular = 1.5, scattering = 0.5, lensflare = 0,
+							lifetime = 0, sustain = 0, animtype = 0},
+		},
+		glow3 = {
+			lightType = 'point',
+			pieceName = 'base',
+			lightConfig = { posx = 22, posy = 22, posz = -13, radius = 32,
+							color2r = 0, color2g = 0, color2b = 0, colortime = 0,
+							r = 1, g = 1, b = 0.4, a = 0.14,
+							modelfactor = 0.33, specular = 1.5, scattering = 0.5, lensflare = 0,
+							lifetime = 0, sustain = 0, animtype = 0},
+		},
+	},	
+
+
 	['cormakr'] = {
 		enabled1 = {
 			lightType = 'point',

diff --git a/luaui/configs/buildmenu_sorting.lua b/luaui/configs/buildmenu_sorting.lua
@@ -442,6 +442,7 @@ local unitOrderTable = {
    ['legsolar']       = 101090,
    ['armadvsol']      = 101100,
    ['coradvsol']      = 101150,
+   ['legadvsol']      = 101170,
 
    --ECO NRG GEOS
    ['armgeo']         = 101200,

diff --git a/luaui/configs/gridmenu_layouts.lua b/luaui/configs/gridmenu_layouts.lua
@@ -503,7 +503,7 @@ local unitGrids = {
 	},
    legck = {
 		{
-			{ "legmex", "legsolar", "legwin", "coradvsol", },   -- mex, solar, wind, adv. solar
+			{ "legmex", "legsolar", "legwin", "legadvsol", },   -- mex, solar, wind, adv. solar
 			{ "cormakr", "corgeo", "legmext15", },              -- T1 converter, geo, T1.5 legion mex, (tidal)
 			{ "corestor", "cormstor", },                        -- e storage, m storage, (uw e stor), (fl. T1 converter)
 		},
@@ -572,7 +572,7 @@ local unitGrids = {
 	},
     legcv = {
 		{
-			{ "legmex", "legsolar", "legwin", "coradvsol", },   -- mex, solar, wind, adv. solar
+			{ "legmex", "legsolar", "legwin", "legadvsol", },   -- mex, solar, wind, adv. solar
 			{ "cormakr", "corgeo", "legmext15", },              -- T1 converter, geo, T1.5 legion mex, (tidal)
 			{ "corestor", "cormstor", },                        -- e storage, m storage, (uw e stor), (fl. T1 converter)
 		},
@@ -640,7 +640,7 @@ local unitGrids = {
 	},
     legca = {
 		{
-			{ "legmex", "legsolar", "legwin", "coradvsol", },   -- mex, solar, wind, adv. solar
+			{ "legmex", "legsolar", "legwin", "legadvsol", },   -- mex, solar, wind, adv. solar
 			{ "cormakr", "corgeo", "legmext15", },              -- T1 converter, geo, T1.5 legion mex, (tidal)
 			{ "corestor", "cormstor", },                        -- e storage, m storage, (uw e stor), (fl. T1 converter)
 		},

diff --git a/objects3d/Units/legadvsol.s3o b/objects3d/Units/legadvsol.s3o
diff --git a/objects3d/Units/legadvsol_dead.s3o b/objects3d/Units/legadvsol_dead.s3o