Merge pull request #5768 from SteelBlueZK/singudisarm

Singu hides ball on disarm, also hides halo effect

Author: GoogleFrog

LuaUI/Configs/lupsFXs.lua

@@ -273,7 +273,6 @@ shieldBursts350 = {
 -- LIGHT -------------------------------------------------------------------
 ----------------------------------------------------------------------------
 energysinguCorona = {
-	pos         = {0,66,0},
 	life        = math.huge,
 	lifeSpread  = 0,
 	size        = 110,

LuaUI/Configs/lupsUnitFXs.lua

@@ -55,7 +55,7 @@ effectUnitDefs = {
 	--// FUSIONS //--------------------------
 	energysingu = {
 		{class='Bursts', options=energysinguBursts},
-		{class='StaticParticles', options=energysinguCorona},
+		{class='StaticParticles', options=MergeTable(energysinguCorona, {piece="energyball", sizeScaleParam="ballSwell"})},
 		--{class='ShieldSphere', options=energysinguShieldSphere},
 		--{class='ShieldJitter', options={layer=-16, life=math.huge, pos={0,58.9,0}, size=100, precision=22, strength = 0.001, repeatEffect=true}},
 		{class='GroundFlash', options=groundFlashOrange},
@@ -206,7 +206,7 @@ effectUnitDefs = {
 
 		-- portable singularity
 		{class='Bursts', options=MergeTable(energysinguBursts,{piece="ball", noIconDraw = true, size=5, pos={0,0,0}})},
-		{class='StaticParticles', options=MergeTable(energysinguCorona,{piece="ball", noIconDraw = true, size=18, pos={0,0,0}})},
+		{class='StaticParticles', options=MergeTable(energysinguCorona,{piece="ball", onUnitRulesParam="ballHalo", noIconDraw = true, size=18})},
 
 		-- blinky lights
 		{class='StaticParticles', options=MergeTable(blinkyLightRed,   {piece="extra_L"}) },

lups/ParticleClasses/StaticParticles.lua

@@ -47,6 +47,7 @@ StaticParticles.Default = {
 	size        = 0,
 	sizeSpread  = 0,
 	sizeGrowth  = 0,
+	-- sizeScaleParam= unset, overrides sizeGrowth property if set.
 	colormap    = { {0, 0, 0, 0} }, --//max 12 entries
 	srcBlend    = GL.ONE,
 	dstBlend    = GL.ONE_MINUS_SRC_ALPHA,
@@ -74,6 +75,7 @@ local spGetPositionLosState = Spring.GetPositionLosState
 local spGetUnitViewPosition = Spring.GetUnitViewPosition
 local spIsSphereInView      = Spring.IsSphereInView
 local spGetUnitRadius       = Spring.GetUnitRadius
+local spGetUnitRulesParam   = Spring.GetUnitRulesParam
 local spGetProjectilePosition = Spring.GetProjectilePosition
 
 local glTexture     = gl.Texture
@@ -246,7 +248,11 @@ end
 
 function StaticParticles:Update(n)
 	self.frame  = self.frame + n
-	self.usize  = self.usize + n*self.sizeGrowth
+	if self.sizeScaleParam then
+		self.usize = spGetUnitRulesParam(self.unit, self.sizeScaleParam)  * self.size
+	else
+		self.usize  = self.usize + n*self.sizeGrowth -- overridden if self.sizeScaleParam
+	end
 end
 
 -- used if repeatEffect=true;

scripts/bomberheavy.lua

@@ -2,6 +2,7 @@ include "constants.lua"
 include "bombers.lua"
 include "fixedwingTakeOff.lua"
 
+local spSetUnitRulesParam = Spring.SetUnitRulesParam
 
 local base       = piece 'base'
 local wing_L     = piece 'wing_L'
@@ -29,8 +30,7 @@ local takeoffHeight = UnitDefNames["bomberheavy"].cruiseAltitude
 
 local function ShowBall()
 	Show(ball)
-	Move(ball, y_axis, 0)
-	Move(ball, z_axis, 0)
+	spSetUnitRulesParam(unitID, "ballHalo", 1, INLOS) -- show halo
 
 	Move(radiator_L, z_axis, 0, 2)
 	Move(radiator_R, z_axis, 0, 2)
@@ -53,13 +53,10 @@ end
 
 local function HideBall()
 	Hide(ball)
+	spSetUnitRulesParam(unitID, "ballHalo", 0, INLOS) -- hide halo
 	Scale(ball, 0)
 	Turn(ball_emit, y_axis, 0)
 	Spin(ball_emit, y_axis, 0)
-
-	-- apparently to hide the LUPS glow
-	Move(ball, y_axis, 27)
-	Move(ball, z_axis, 1)
 
 	Show(radiator_L)
 	Show(radiator_R)
@@ -197,6 +194,7 @@ function script.Create()
 
 	WingStart()
 	Hide(ball)
+	spSetUnitRulesParam(unitID, "ballHalo", 0, INLOS) -- hide halo
 	Hide(radiator_L)
 	Hide(radiator_R)
 

scripts/energysingu.lua

@@ -15,6 +15,7 @@ local smokePiece = { piece "base", piece "arm1", piece "arm2", piece "arm3" }
 
 local ballSize = 0
 local is_stunned = true
+local spSetUnitRulesParam = Spring.SetUnitRulesParam
 
 local function SizeControl()
 	local mag = math.random() + 1
@@ -41,6 +42,7 @@ local function SizeControl()
 		end
 
 		local ballSwellFactor = 1.13^(sin(t/period)*mag) * (ballSize^2 / 11000)
+		spSetUnitRulesParam(unitID, "ballSwell", 1.15*ballSwellFactor - 0.1, INLOS)
 		Scale(energyball, ballSwellFactor)
 
 		t = t + 1
@@ -66,9 +68,10 @@ end
 
 local function Anim()
 	local spGetUnitIsStunned = Spring.GetUnitIsStunned
+	local spGetUnitRulesParam = Spring.GetUnitRulesParam
 	local was_stunned = true
 	while true do
-		is_stunned = spGetUnitIsStunned(unitID)
+		is_stunned = spGetUnitIsStunned(unitID) or (spGetUnitRulesParam(unitID, "disarmed") == 1)
 		if is_stunned ~= was_stunned then
 			was_stunned = is_stunned
 			if is_stunned then
@@ -84,6 +87,7 @@ end
 
 function script.Create()
 	Hide(energyball)
+	spSetUnitRulesParam(unitID, "ballSwell", 0, INLOS) -- halo size
 
 	StartThread(GG.Script.SmokeUnit, unitID, smokePiece)
 	StartThread(Anim)