Techion Pulse Shot refactor

Author: fourZK

Techion.rte/Devices/Shared.ini

@@ -123,7 +123,7 @@ AddEffect = AEmitter
 
 
 AddEffect = MOPixel
-	PresetName = Techion Pulse Shot Trail Glow
+	PresetName = Particle Techion Pulse Shot Trail Glow
 	Mass = 0
 	LifeTime = 500
 	RestThreshold = -500
@@ -145,13 +145,6 @@ AddEffect = MOPixel
 	EffectStopStrength = 0.0
 
 
-AddEffect = MOPixel
-	CopyOf = Techion Pulse Shot Trail Glow
-	PresetName = Techion Pulse Shot Trail Glow Small
-	ScreenEffect = ContentFile
-		FilePath = Base.rte/Effects/Glows/BlueSmall.png
-
-
 AddParticle = MOPixel
 	PresetName = Particle Techion Pulse Shot
 	ScriptPath = Techion.rte/Devices/Shared/Scripts/PulseShot.lua

Techion.rte/Devices/Shared/Scripts/PulseShot.lua

@@ -4,7 +4,7 @@ function Create(self)
 	--Check backward (second argument) on the first frame as the projectile might be bouncing off something immediately
 	PulsarDissipate(self, true);
 
-	self.trailPar = CreateMOPixel("Techion Pulse Shot Trail Glow");
+	self.trailPar = CreateMOPixel(self.PresetName .. " Trail Glow", "Techion.rte");
 	self.trailPar.Pos = self.Pos - (self.Vel * rte.PxTravelledPerFrame);
 	self.trailPar.Vel = self.Vel * 0.1;
 	self.trailPar.Lifetime = 60;
@@ -15,27 +15,27 @@ function Update(self)
 	if self.explosion then
 		self.ToDelete = true;
 	else
-		PulsarDissipate(self, false);
+		if PulsarDissipate(self, false) == false then
+			self.EffectRotAngle = self.Vel.AbsRadAngle;
+		end
 		if self.trailPar and MovableMan:IsParticle(self.trailPar) then
-			self.trailPar.Pos = self.Pos - Vector(self.Vel.X, self.Vel.Y):SetMagnitude(6);
+			self.trailPar.Pos = self.Pos - Vector(self.Vel.X, self.Vel.Y):SetMagnitude(self.TrailLength - 1);
 			self.trailPar.Vel = self.Vel * 0.5;
 			self.trailPar.Lifetime = self.Age + TimerMan.DeltaTimeMS;
 		else
 			self.trailPar = nil;
 		end
 	end
-	self.EffectRotAngle = self.Vel.AbsRadAngle;
 end
 function PulsarDissipate(self, inverted)
 	self.lastVel = self.lastVel or Vector(self.Vel.X, self.Vel.Y);
 
 	local trace = inverted and Vector(-self.Vel.X, -self.Vel.Y):SetMagnitude(GetPPM()) or Vector(self.Vel.X, self.Vel.Y):SetMagnitude(self.Vel.Magnitude * rte.PxTravelledPerFrame + 1);
-	local hit;
-	local hitPos = Vector();
+	local hit = false;
+	local hitPos = Vector(self.Pos.X, self.Pos.Y);
 	local skipPx = math.sqrt(self.Vel.Magnitude) * 0.5;
 
-	local moid =	SceneMan:CastObstacleRay(self.Pos, trace, hitPos, Vector(), self.ID, self.Team, rte.airID, skipPx) >= 0
-					and SceneMan:GetMOIDPixel(hitPos.X, hitPos.Y) or self.HitWhatMOID;
+	local moid = SceneMan:CastObstacleRay(self.Pos, trace, hitPos, Vector(), self.ID, self.Team, rte.airID, skipPx) >= 0 and SceneMan:GetMOIDPixel(hitPos.X, hitPos.Y) or self.HitWhatMOID;
 
 	if moid ~= rte.NoMOID then
 		local mo = MovableMan:GetMOFromID(moid);
@@ -53,9 +53,11 @@ function PulsarDissipate(self, inverted)
 		local penetration = self.Mass * self.Sharpness * self.Vel.Magnitude;
 		if SceneMan:GetMaterialFromID(SceneMan:GetTerrMatter(hitPos.X, hitPos.Y)).StructuralIntegrity > penetration then
 			hit = true;
+		elseif self.Vel.Magnitude < self.lastVel.Magnitude * 0.5 then
+			hit = true;
 		end
 	end
-	if hit or math.abs(math.sin(self.Vel.AbsRadAngle - self.lastVel.AbsRadAngle)) > 0.1 or self.Vel.Magnitude < self.lastVel.Magnitude * 0.5 then
+	if hit then
 		local offset = Vector(self.Vel.X, self.Vel.Y):SetMagnitude(skipPx);
 		self.explosion = CreateAEmitter("Techion.rte/Laser Dissipate Effect");
 		self.explosion.Pos = hitPos - offset;
@@ -65,6 +67,8 @@ function PulsarDissipate(self, inverted)
 		MovableMan:AddParticle(self.explosion);
 	end
 	self.lastVel = Vector(self.Vel.X, self.Vel.Y);
+	
+	return hit;
 end
 --[[ To-do: Use this system instead
 function OnCollideWithMO(self, mo, parentMO)

Techion.rte/Devices/Weapons/MicroPulsar/HomingPulsarShot.lua

@@ -1,14 +1,12 @@
 function Create(self)
 
-	self.disintegrationStrength = 50;
 	self.adjustmentAmount = 1;
 
 	self.delayTimer = Timer();
 
-	self.target = null;
 	local longDist = 800;
 	local shortDist = 98;
-	
+	--To-do: fix this garbage targeting system?
 	for i = 1, MovableMan:GetMOIDCount() - 1 do
 		local mo = MovableMan:GetMOFromID(i);
 		if mo and (mo.Team ~= self.Team or mo.ClassName == "TDExplosive" or mo.ClassName == "MOSRotating" or (mo.ClassName == "AEmitter" and mo.RootID == moCheck)) then
@@ -39,37 +37,14 @@ function Create(self)
 			end
 		end
 	end
-	self.lastVel = Vector(self.Vel.X, self.Vel.Y);
-	PulsarDissipate(self, true);
-	
-	self.trailPar = CreateMOPixel("Techion Pulse Shot Trail Glow Small");
-	self.trailPar.Pos = self.Pos - (self.Vel * rte.PxTravelledPerFrame);
-	self.trailPar.Vel = self.Vel * 0.1;
-	self.trailPar.Lifetime = 60;
-	MovableMan:AddParticle(self.trailPar);
 end
 function Update(self)
-	self.lastVel = Vector(self.Vel.X, self.Vel.Y);
-	if self.delayTimer:IsPastSimMS(25) and self.target ~= null and self.target.ID ~= rte.NoMOID then
+	if self.delayTimer:IsPastSimMS(25) and self.target and self.target.ID ~= rte.NoMOID then
 		local checkVel = SceneMan:ShortestDistance(self.Pos, self.target.Pos, SceneMan.SceneWrapsX);
 		checkVel = checkVel:SetMagnitude(checkVel.Magnitude - self.target.Radius);
 		if SceneMan:CastStrengthRay(self.Pos, checkVel, 0, Vector(), 3, rte.airID, SceneMan.SceneWrapsX) == false then
 			local aimVel = Vector(self.Vel.X, self.Vel.Y):SetMagnitude(1) + SceneMan:ShortestDistance(self.Pos, self.target.Pos, SceneMan.SceneWrapsX):SetMagnitude(self.adjustmentAmount);
 			self.Vel = Vector(self.Vel.Magnitude, 0):RadRotate(aimVel.AbsRadAngle);
 		end
 	end
-	self.ToSettle = false;
-	if self.explosion then
-		self.ToDelete = true;
-	else
-		PulsarDissipate(self, false);
-		if self.trailPar and MovableMan:IsParticle(self.trailPar) then
-			self.trailPar.Pos = self.Pos - Vector(self.Vel.X, self.Vel.Y):SetMagnitude(3);
-			self.trailPar.Vel = self.Vel * 0.5;
-			self.trailPar.Lifetime = self.Age + TimerMan.DeltaTimeMS;
-		else
-			self.trailPar = nil;
-		end
-	end
-	self.EffectRotAngle = self.Vel.AbsRadAngle;
 end

Techion.rte/Devices/Weapons/MicroPulsar/MicroPulsar.ini

@@ -2,20 +2,18 @@
 // Micro Pulsar Effects
 
 
+AddEffect = MOPixel
+	CopyOf = Particle Techion Pulse Shot Trail Glow
+	PresetName = Particle Techion Micro Pulsar Trail Glow
+	ScreenEffect = ContentFile
+		FilePath = Base.rte/Effects/Glows/BlueSmall.png
+
+
 AddParticle = MOPixel
+	CopyOf = Particle Techion Pulse Shot
 	PresetName = Particle Techion Micro Pulsar
 	ScriptPath = Techion.rte/Devices/Weapons/MicroPulsar/HomingPulsarShot.lua
-	Mass = 0.01
-	RestThreshold = -1
-	LifeTime = 500
-	Sharpness = 1
-	HitsMOs = 0
-	GetsHitByMOs = 0
-	GlobalAccScalar = 0.1
-	Color = Color
-		R = 255
-		G = 255
-		B = 255
+	//HitsMOs = 0
 	Atom = Atom
 		Material = Material
 			CopyOf = Air
@@ -26,11 +24,6 @@ AddParticle = MOPixel
 		TrailLength = 4
 	ScreenEffect = ContentFile
 		FilePath = Techion.rte/Devices/Shared/Glows/PulseShotGlowShort.png
-	EffectAlwaysShows = 1
-	EffectStartTime = 1
-	EffectStopTime = 500
-	EffectStartStrength = 1.0
-	EffectStopStrength = 0.6
 
 
 ///////////////////////////////////////////////////////////////////////