Revert "Merge branch 'BOSCleanup'"

This reverts commit d685cd2, reversing
changes made to 1ad5ad0.

luarules/gadgets/unit_continuous_aim.lua

@@ -53,7 +53,6 @@ local convertedUnitsNames = {
 	['armbanth'] = 1,
 	['corkorg'] = 1,
 	['armvang'] = 3,
-	['armcrus'] = 5,
 
 	-- the following units get a faster reaimtime to counteract their turret acceleration
 

luarules/gadgets/unit_turretspeed.lua

@@ -7,7 +7,7 @@ function gadget:GetInfo()
 		date      = "May 2018",
 		license   = "GNU GPL, v2 or later",
 		layer     = 0,
-		enabled   = false,
+		enabled   = true,
 	}
 end
 
@@ -19,17 +19,6 @@ end
  -If using continuous aiming, the correct values for the waitforturn checks are: > 65536, > WeaponXTurretY/30, < 65536 - WeaponXTurretY/30 (== not within one frame of the last valid heading)
 
  This gadget will only call the setting function if it finds both the wpnXturretx and wpnXturrety customParams, if the weapon doesn't use a rotation around x-axis in its aiming then just set it to 1 (not nil)
-
-For future notes, look for these in COB scripts
- Weapon1TurretX 
- Weapon1TurretY
- 
-Look for these in UnitDefs customparams:
- wpn1turretx
- wpn1turrety
-
-This, should entirely be removed anyway, along with the customparams
- 
  ]]
 
 -- finds fields weapon1turretx/weapon1turrety, up to 10.

luaui/configs/DeferredLightsGL4config.lua

@@ -77,7 +77,7 @@ local unitLights = {
 		arm1 = {	-- looks like arm movement is different and light isnt fixed in place :/
 			lightType = 'point',
 			pieceName = 'luparm',
-			lightConfig = { posx = 5, posy = 5.5, posz = 0, radius = 13,
+			lightConfig = { posx = -25, posy = 5.5, posz = 0, radius = 13,
 							color2r = 1, color2g = 1, color2b = 0.25, colortime = 0,
 							r = 1, g = 1, b = 0.25, a = 0.07,
 							modelfactor = 0.2, specular = 1, scattering = 0.6, lensflare = 0,
@@ -86,7 +86,7 @@ local unitLights = {
 		arm2 = {	-- looks like arm movement is different and light isnt fixed in place :/
 			lightType = 'point',
 			pieceName = 'ruparm',
-			lightConfig = { posx = -5, posy = 5.5, posz = 0, radius = 13,
+			lightConfig = { posx = 25, posy = 5.5, posz = 0, radius = 13,
 							color2r = 1, color2g = 1, color2b = 0.25, colortime = 0,
 							r = 1, g = 1, b = 0.25, a = 0.07,
 							modelfactor = 0.2, specular = 1, scattering = 0.6, lensflare = 0,
@@ -105,8 +105,8 @@ local unitLights = {
 	['armfatf'] = {
 		greenblob = {
 			lightType = 'point',
-			pieceName = 'light',
-			lightConfig = { posx = 0, posy = 0, posz = 0, radius = 17,
+			pieceName = 'base',
+			lightConfig = { posx = 10, posy = 95, posz = 8.5, radius = 17,
 							color2r = 0, color2g = 0, color2b = 0, colortime = 12,
 							r = 0, g = 1.5, b = 0, a = 0.8,
 							modelfactor = 0.8, specular = 0.9, scattering = 1, lensflare = 10,
@@ -1557,62 +1557,62 @@ local unitLights = {
 		},
 		top1 = {
 			lightType = 'point',
-			pieceName = 'launcher',
-			lightConfig = { posx = 0, posy = 14, posz = 1, radius = 21,
+			pieceName = 'sleeve',
+			lightConfig = { posx = 0, posy = 12, posz = -19, radius = 21,
 							color2r = 1, color2g = 1, color2b = 0.4, colortime = 0,
 							r = 1, g = 1, b = 0.4, a = 0.055,
 							modelfactor = 0.4, specular = 0.5, scattering = 0.7, lensflare = 0,
 							lifetime = 0, sustain = 0, animtype = 0},
 		},
 		top2 = {
 			lightType = 'point',
-			pieceName = 'launcher',
-			lightConfig = { posx = 0, posy = 12, posz = -4, radius = 21,
+			pieceName = 'sleeve',
+			lightConfig = { posx = 0, posy = 12, posz = -26, radius = 21,
 							color2r = 1, color2g = 1, color2b = 0.4, colortime = 0,
 							r = 1, g = 1, b = 0.4, a = 0.055,
 							modelfactor = 0.4, specular = 0.5, scattering = 0.7, lensflare = 0,
 							lifetime = 0, sustain = 0, animtype = 0},
 		},
 		top3 = {
 			lightType = 'point',
-			pieceName = 'launcher',
-			lightConfig = { posx = 0, posy = 12, posz = -11, radius = 21,
+			pieceName = 'sleeve',
+			lightConfig = { posx = 0, posy = 12, posz = -33, radius = 21,
 							color2r = 1, color2g = 1, color2b = 0.4, colortime = 0,
 							r = 1, g = 1, b = 0.4, a = 0.055,
-							modelfactor = 0.4, specular = 0.5, scattering = 0.7, lensflare = 100,
+							modelfactor = 0.4, specular = 0.5, scattering = 0.7, lensflare = 0,
 							lifetime = 0, sustain = 0, animtype = 0},
 		},
 		top4 = {
 			lightType = 'point',
-			pieceName = 'launcher',
-			lightConfig = { posx = 0, posy = 12, posz = -18, radius = 21,
+			pieceName = 'sleeve',
+			lightConfig = { posx = 0, posy = 12, posz = -40, radius = 21,
 							color2r = 1, color2g = 1, color2b = 0.4, colortime = 0,
 							r = 1, g = 1, b = 0.4, a = 0.055,
 							modelfactor = 0.4, specular = 0.5, scattering = 0.7, lensflare = 0,
 							lifetime = 0, sustain = 0, animtype = 0},
 		},
 		topback1 = {
 			lightType = 'point',
-			pieceName = 'launcher',
-			lightConfig = { posx = 0, posy = 0, posz = -28, radius = 17,
+			pieceName = 'sleeve',
+			lightConfig = { posx = 0, posy = 0, posz = -50, radius = 17,
 							color2r = 1, color2g = 1, color2b = 0.4, colortime = 0,
 							r = 1, g = 1, b = 0.4, a = 0.055,
 							modelfactor = 0.4, specular = 0.5, scattering = 0.7, lensflare = 0,
 							lifetime = 0, sustain = 0, animtype = 0},
 		},
 		topback2 = {
 			lightType = 'point',
-			pieceName = 'launcher',
-			lightConfig = { posx = -7, posy = 0, posz = -25.5, radius = 17,
+			pieceName = 'sleeve',
+			lightConfig = { posx = -7, posy = 0, posz = -47.5, radius = 17,
 							color2r = 1, color2g = 1, color2b = 0.4, colortime = 0,
 							r = 1, g = 1, b = 0.4, a = 0.055,
 							modelfactor = 0.4, specular = 0.5, scattering = 0.7, lensflare = 0,
 							lifetime = 0, sustain = 0, animtype = 0},
 		},
 		topback3 = {
 			lightType = 'point',
-			pieceName = 'launcher',
-			lightConfig = { posx = 7, posy = 0, posz = -25.5, radius = 17,
+			pieceName = 'sleeve',
+			lightConfig = { posx = 7, posy = 0, posz = -47.5, radius = 17,
 							color2r = 1, color2g = 1, color2b = 0.4, colortime = 0,
 							r = 1, g = 1, b = 0.4, a = 0.055,
 							modelfactor = 0.4, specular = 0.5, scattering = 0.7, lensflare = 0,