Merge pull request #46 from cortex-command-community/MaximDude-Experiments

Fixes and Cleanup Followup

Author: garethyr

Base.rte/AI/HumanBehaviors.lua

@@ -257,7 +257,7 @@ function HumanBehaviors.GetGrenadeAngle(AimPoint, TargetVel, StartPos, muzVel)
 			Dist = SceneMan:ShortestDistance(StartPos, AimPoint, false)
 		end
 
-		Dist = Dist / FrameMan.PPM	-- convert from pixels to meters
+		Dist = Dist / GetPPM()	-- convert from pixels to meters
 		local velSqr = math.pow(muzVel, 2)
 		local gravity = SceneMan.GlobalAcc.Y * 0.67	-- underestimate gravity
 		local root = math.sqrt(velSqr*velSqr - gravity*(gravity*Dist.X*Dist.X+2*-Dist.Y*velSqr))
@@ -1715,8 +1715,8 @@ function HumanBehaviors.GoToWpt(AI, Owner, Abort)
 												-- predict jetpack movement when jumping and there is a target (check one direction)
 												local jetStrength = AI.jetImpulseFactor / Owner.Mass
 												local t = math.min(0.4, Owner.JetTimeLeft*0.001)
-												local PixelVel = Owner.Vel * (FrameMan.PPM * t)
-												local Accel = SceneMan.GlobalAcc * FrameMan.PPM
+												local PixelVel = Owner.Vel * (GetPPM() * t)
+												local Accel = SceneMan.GlobalAcc * GetPPM()
 
 												-- a burst use 10x more fuel
 												if Owner.Jetpack:CanTriggerBurst() then
@@ -1779,8 +1779,8 @@ function HumanBehaviors.GoToWpt(AI, Owner, Abort)
 											-- predict jetpack movement...
 											local jetStrength = AI.jetImpulseFactor / Owner.Mass
 											local t = math.min(0.4, Owner.JetTimeLeft*0.001)
-											local PixelVel = Owner.Vel * (FrameMan.PPM * t)
-											local Accel = SceneMan.GlobalAcc * FrameMan.PPM
+											local PixelVel = Owner.Vel * (GetPPM() * t)
+											local Accel = SceneMan.GlobalAcc * GetPPM()
 
 											-- a burst use 10x more fuel
 											if Owner.Jetpack:CanTriggerBurst() then
@@ -2162,16 +2162,16 @@ function HumanBehaviors.GetProjectileData(Owner)
 			PrjDat.rng = math.huge
 		elseif PrjDat.drg < 1 then	-- AirResistance
 			PrjDat.rng = 0
-			local threshold = PrjDat.thr * FrameMan.PPM * TimerMan.DeltaTimeSecs	-- AirThreshold in pixels/frame
-			local vel = PrjDat.vel * FrameMan.PPM * TimerMan.DeltaTimeSecs	-- muzzle velocity in pixels/frame
+			local threshold = PrjDat.thr * GetPPM() * TimerMan.DeltaTimeSecs	-- AirThreshold in pixels/frame
+			local vel = PrjDat.vel * GetPPM() * TimerMan.DeltaTimeSecs	-- muzzle velocity in pixels/frame
 			for _ = 0, math.ceil(lifeTime/TimerMan.DeltaTimeMS) do
 				PrjDat.rng = PrjDat.rng + vel
 				if vel > threshold then
 					vel = vel * PrjDat.drg
 				end
 			end
 		else	-- no AirResistance
-			PrjDat.rng = PrjDat.vel * FrameMan.PPM * TimerMan.DeltaTimeSecs * (lifeTime / TimerMan.DeltaTimeMS)
+			PrjDat.rng = PrjDat.vel * GetPPM() * TimerMan.DeltaTimeSecs * (lifeTime / TimerMan.DeltaTimeMS)
 		end
 
 		-- Artificially decrease reported range to make sure AI 
@@ -2931,7 +2931,7 @@ function HumanBehaviors.GetAngleToHit(PrjDat, Dist)
 		return Dist.AbsRadAngle
 	else	-- compensate for gravity
 		local rootSq, muzVelSq
-		local D = Dist / FrameMan.PPM	-- convert from pixels to meters
+		local D = Dist / GetPPM()	-- convert from pixels to meters
 		if PrjDat.drg < 1 then	-- compensate for air resistance
 			local rng = D.Magnitude
 			local timeToTarget = math.floor((rng / math.max(PrjDat.vel*PrjDat.drg^math.floor(rng/(PrjDat.vel+1)+0.5), PrjDat.thr)) / TimerMan.DeltaTimeSecs)	-- estimate time of flight in frames

Base.rte/AI/NativeHumanAI.lua

@@ -56,8 +56,8 @@ function NativeHumanAI:Create(Owner)
 			Owner.Jetpack.Throttle = 0.15	-- increase jetpack strength slightly to compensate for AI ineptitude
 		end
 
-		Members.jetImpulseFactor = Owner.Jetpack:EstimateImpulse(false) * FrameMan.PPM / TimerMan.DeltaTimeSecs
-		Members.jetBurstFactor = (Owner.Jetpack:EstimateImpulse(true) * FrameMan.PPM / TimerMan.DeltaTimeSecs - Members.jetImpulseFactor) * math.pow(TimerMan.DeltaTimeSecs, 2) * 0.5
+		Members.jetImpulseFactor = Owner.Jetpack:EstimateImpulse(false) * GetPPM() / TimerMan.DeltaTimeSecs
+		Members.jetBurstFactor = (Owner.Jetpack:EstimateImpulse(true) * GetPPM() / TimerMan.DeltaTimeSecs - Members.jetImpulseFactor) * math.pow(TimerMan.DeltaTimeSecs, 2) * 0.5
 		Members.minBurstTime = math.min(Owner.Jetpack.BurstSpacing*2, Owner.JetTimeTotal*0.99)	-- in milliseconds
 	end
 

Base.rte/Constants.lua

@@ -21,7 +21,7 @@ rte.StartingFundsScale = 1.0;
 rte.PassengerMax = 3; -- Deprecated. Use 'Craft.MaxPassengers' instead
 rte.DiggersRate = 0.4
 rte.MetabaseArea = "MetabaseServiceArea"
-rte.PxTravelledPerFrame = FrameMan.PPM * TimerMan.DeltaTimeSecs;
+rte.PxTravelledPerFrame = GetPPM() * TimerMan.DeltaTimeSecs;
 
 -- Materials
 rte.airID = 0;

Base.rte/Devices/Explosives/FragGrenade/FragGrenade.ini

@@ -11,6 +11,7 @@ AddAmmo = MOSParticle
 	SpriteFile = ContentFile
 		FilePath = Base.rte/Devices/Explosives/FragGrenade/FragGrenadePin.bmp
 	FrameCount = 8
+	SpriteAnimMode = 7
 	SpriteOffset = Vector
 		X = -2
 		Y = -2
@@ -19,7 +20,6 @@ AddAmmo = MOSParticle
 		Material = Material
 			PresetName = Scrap Metal
 		TrailLength = 0
-	Framerate = 10
 
 
 ///////////////////////////////////////////////////////////////////////

Base.rte/Devices/Explosives/NapalmBomb/NapalmBomb.ini

@@ -44,6 +44,7 @@ AddEffect = MOSParticle
 	SpriteFile = ContentFile
 		FilePath = Base.rte/Effects/Pyro/FirePuffSmall.bmp
 	FrameCount = 6
+	SpriteAnimMode = 7
 	SpriteOffset = Vector
 		X = -8
 		Y = -8
@@ -52,7 +53,6 @@ AddEffect = MOSParticle
 		Material = Material
 			CopyOf = Air
 		TrailLength = 0
-	Framerate = 0
 
 
 AddEffect = MOSRotating

Base.rte/Devices/Shared/Scripts/TrajectoryGuide.lua

@@ -26,7 +26,7 @@ function Update(self)
 			local guideParPos = self.MuzzlePos;
 			local guideParVel = Vector(self.projectileVel,0):RadRotate(actor:GetAimAngle(true));
 			for i = 1, self.maxTrajectoryPars do
-				guideParVel = guideParVel + Vector((SceneMan.GlobalAcc.X/FrameMan.PPM),(SceneMan.GlobalAcc.Y/FrameMan.PPM));
+				guideParVel = guideParVel + Vector((SceneMan.GlobalAcc.X/GetPPM()),(SceneMan.GlobalAcc.Y/GetPPM()));
 				guideParPos = guideParPos + guideParVel;
 				-- No need to wrap the seam manually, primitives can handle out-of-scene coordinates correctly
 				--if SceneMan.SceneWrapsX == true then

Base.rte/Devices/Special/Medikit/Medikit.ini

@@ -28,7 +28,7 @@ AddEffect = MOPixel
 	ScreenEffect = ContentFile
 		FilePath = Base.rte/Actors/Mecha/Medic/HealEffectGlow.bmp
 	EffectAlwaysShows = 1
-	EffectStartTime = -1
+	EffectStartTime = 0
 	EffectStopTime = 200
 	EffectStartStrength = 0.0
 	EffectStopStrength = 0.5

Base.rte/Devices/Tools/Disarmer/Disarmer.lua

@@ -7,7 +7,7 @@ function Create(self)
 	self.blink = false;
 	self.fireOn = false;
 
-	self.disarmRange = FrameMan.PPM * 5;
+	self.disarmRange = GetPPM() * 5;
 	self.targetTable = {};
 end
 

Base.rte/Effects.ini

@@ -320,7 +320,7 @@ AddEffect = MOPixel
 		TrailLength = 2
 	ScreenEffect = ContentFile
 		FilePath = Base.rte/Effects/Glows/FireGlowTiny.bmp
-	EffectStartTime = -1
+	EffectStartTime = 0
 
 
 ///////////////////////////////////////////////////////////////////////

Base.rte/Effects/Casings.ini

@@ -12,6 +12,7 @@ AddAmmo = MOSParticle
 	SpriteFile = ContentFile
 		FilePath = Base.rte/Effects/Casings/Casing.bmp
 	FrameCount = 8
+	SpriteAnimMode = 8
 	SpriteOffset = Vector
 		X = -2
 		Y = -2
@@ -24,7 +25,6 @@ AddAmmo = MOSParticle
 			Friction = 0.1
 			StructuralIntegrity = 0.5
 		TrailLength = 0
-	Framerate = 10
 
 
 AddAmmo = MOSParticle
@@ -108,6 +108,7 @@ AddAmmo = MOSParticle
 	SpriteFile = ContentFile
 		FilePath = Base.rte/Effects/Casings/Shell.bmp
 	FrameCount = 8
+	SpriteAnimMode = 8
 	SpriteOffset = Vector
 		X = -3
 		Y = -3
@@ -116,7 +117,6 @@ AddAmmo = MOSParticle
 		Material = Material
 			CopyOf = Weak Casing
 		TrailLength = 0
-	Framerate = 10
 
 
 AddAmmo = AEmitter