Review changes

Author: fourZK

Base.rte/AI/HumanAI.lua

@@ -6,7 +6,6 @@ function Create(self)
 	self.AI = NativeHumanAI:Create(self);
 	--You can turn features on and off here
 	self.armSway = true;
-	self.automaticEquip = false;
 	self.alternativeGib = true;
 	self.visibleInventory = false;
 end

Base.rte/AI/HumanFunctions.lua

@@ -56,13 +56,6 @@ function HumanFunctions.DoAlternativeGib(actor)
 		end
 	end
 end
-	
-function HumanFunctions.DoAutomaticEquip(actor)
-	--Equip a weapon automatically if the one held by a player is destroyed
-	if actor.EquippedItem == nil and not actor.controller:IsState(Controller.WEAPON_FIRE) and actor:IsPlayerControlled() then
-		actor:EquipFirearm(true);
-	end
-end
 
 function HumanFunctions.DoArmSway(actor, pushStrength)
 	local aimAngle = actor:GetAimAngle(false);
@@ -181,4 +174,31 @@ function HumanFunctions.DoVisibleInventory(actor, showAll)
 			end
 		end
 	end
+end
+--Lunge forward, preferably as result of some dedicated input. Returns horizontal direction of lunge. (TODO: move this into another table?)
+function HumanFunctions.Lunge(actor, power)
+	local flip = 0;
+	if actor.Status == Actor.STABLE then
+		flip = actor.FlipFactor;
+		if actor.controller:IsState(Controller.MOVE_RIGHT) then
+			flip = 1;
+		elseif actor.controller:IsState(Controller.MOVE_LEFT) then
+			flip = -1;
+		end
+		--Different factors that affect the lunge
+		local angVel = math.abs(actor.AngularVel * 0.1) + 1;
+		local vel = (actor.Vel.Magnitude + angVel)^2 * 0.0005 + 1;
+		local mass = math.abs(actor.Mass * 0.005) + 1;
+		local aimAng = actor:GetAimAngle(false);
+		local vertical = math.abs(math.cos(aimAng))/vel;
+		local strength = power * math.min(actor.Health/actor.MaxHealth, 1);
+		
+		local jumpVec =	Vector((power + strength/vel) * flip, -(power * 0.5 + (strength * 0.3)) * vertical):RadRotate(aimAng * actor.FlipFactor);
+		
+		actor.Vel = actor.Vel + jumpVec/mass;
+		actor.AngularVel = actor.AngularVel - (1/angVel * vertical) * flip * math.cos(actor.RotAngle);
+		actor.Status = Actor.UNSTABLE;
+		actor.tapTimer:Reset();
+	end
+	return flip;
 end

Base.rte/AI/NativeHumanAI.lua

@@ -737,7 +737,7 @@ function NativeHumanAI:CreateAttackBehavior(Owner)
 		elseif Owner:EquipNamedDevice("Timed Explosive", true) then
 			self.NextBehavior = coroutine.create(HumanBehaviors.ThrowTarget)
 			self.NextBehaviorName = "ThrowTarget"
-		elseif Owner.FirearmIsReady and HumanBehaviors.GetProjectileData(Owner).pen * 0.9 > (ToADoor(self.Target).Door or self.Target).Material.StructuralIntegrity then
+		elseif Owner.FirearmIsReady and HumanBehaviors.GetProjectileData(Owner).pen * 0.9 > (self.Target.Door or self.Target).Material.StructuralIntegrity then
 			self.NextBehavior = coroutine.create(HumanBehaviors.ShootTarget)
 			self.NextBehaviorName = "ShootTarget"
 		end

Base.rte/Activities/BunkerBreach.lua

@@ -283,7 +283,7 @@ function BunkerBreach:UpdateActivity()
 						self.attackPos = targetActor.Pos;
 
 						self.CPUSpawnDelay = self.CPUSpawnDelay * 0.5;--* dist.Magnitude/searchRadius;
-
+						--TODO: Fix GetClosestTeamActor and use that instead
 						local closestGuard = MovableMan:GetClosestEnemyActor(targetActor.Team, targetActor.Pos, searchRadius - dist.Magnitude, Vector());
 						if closestGuard and math.random() > dist.Magnitude/searchRadius and closestGuard.AIMode == Actor.AIMODE_SENTRY and closestGuard:GetAlarmPoint() ~= Vector() then
 							--Send a nearby alerted guard after the intruder

Base.rte/Effects/Pyro/Flame/Flame.lua

@@ -1,16 +1,16 @@
 function Create(self)
 	--Add flames to a global table that handles their stickyness
 	if self.ClassName == "PEmitter" and not string.find(self.PresetName, "Ground") then
-		Flames = Flames or {};
-		local id = #Flames + 1;
-		Flames[id] = {particle = self, id = self.UniqueID};
+		local id = #GlobalFlameManagement.Flames + 1;
+		GlobalFlameManagement.Flames[id] = {particle = self, id = self.UniqueID};
 		if string.find(self.PresetName, "Short") then
-			Flames[id].deleteDelay = self.Lifetime * RangeRand(0.1, 0.2);
-			Flames[id].isShort = true;
+			GlobalFlameManagement.Flames[id].deleteDelay = self.Lifetime * RangeRand(0.1, 0.2);
+			GlobalFlameManagement.Flames[id].isShort = true;
 		end
-		if GlobalFlameHandler == nil then
-			GlobalFlameHandler = CreateMOPixel("Global Flame Handler", "Base.rte");
-			MovableMan:AddParticle(GlobalFlameHandler);
+		if GlobalFlameManagement.FlameHandler == nil then
+			local handler = CreateMOPixel("Global Flame Handler", "Base.rte");
+			MovableMan:AddParticle(handler);
+			GlobalFlameManagement.FlameHandler = handler;
 		end
 	end
 end

Base.rte/Effects/Pyro/Flame/FlameGlobal.lua

@@ -1,59 +1,61 @@
 --Global handler for flame particles - this eliminates the need to run a script on each of the particles
+GlobalFlameManagement = {FlameHandler = nil, Flames = {}};
+
 function Create(self)
 	self.shortFlame = CreatePEmitter("Flame Hurt Short Float", "Base.rte");
-	print("GlobalFlameHandler:Create()");
 end
 --To-do: multiple flames close to each other should form a bigger flame
 function Update(self)
 	self.PinStrength = 900001;
 	local flameCount = 0;
 	local nearbyFlame = {};
-	if #Flames ~= 0 then
-		for i = 1, #Flames do
-			if Flames[i] and Flames[i].particle and MovableMan:ValidMO(Flames[i].particle) then
+	if #GlobalFlameManagement.Flames ~= 0 then
+		--TODO: use 'pairs' instead?
+		for i = 1, #GlobalFlameManagement.Flames do
+			if GlobalFlameManagement.Flames[i] and GlobalFlameManagement.Flames[i].particle and MovableMan:ValidMO(GlobalFlameManagement.Flames[i].particle) then
 
 				flameCount = flameCount + 1;
 
-				local flame = Flames[i].particle;
+				local flame = GlobalFlameManagement.Flames[i].particle;
 				local ageRatio = flame.Age/flame.Lifetime;
 				flame.ToSettle = false;
 				flame.Throttle = flame.Throttle - TimerMan.DeltaTimeMS/flame.Lifetime;
 
-				if Flames[i].target and Flames[i].target.ID ~= rte.NoMOID and not Flames[i].target.ToDelete then
-					flame.Vel = Flames[i].target.Vel;
-					flame.Pos = Flames[i].target.Pos + Vector(Flames[i].stickOffset.X, Flames[i].stickOffset.Y):RadRotate(Flames[i].target.RotAngle - Flames[i].targetStickAngle);
-					local actor = Flames[i].target:GetRootParent();
+				if GlobalFlameManagement.Flames[i].target and GlobalFlameManagement.Flames[i].target.ID ~= rte.NoMOID and not GlobalFlameManagement.Flames[i].target.ToDelete then
+					flame.Vel = GlobalFlameManagement.Flames[i].target.Vel;
+					flame.Pos = GlobalFlameManagement.Flames[i].target.Pos + Vector(GlobalFlameManagement.Flames[i].stickOffset.X, GlobalFlameManagement.Flames[i].stickOffset.Y):RadRotate(GlobalFlameManagement.Flames[i].target.RotAngle - GlobalFlameManagement.Flames[i].targetStickAngle);
+					local actor = GlobalFlameManagement.Flames[i].target:GetRootParent();
 					if MovableMan:IsActor(actor) then
 						actor = ToActor(actor);
-						actor.Health = actor.Health - (Flames[i].target.DamageMultiplier + flame.Throttle)/(actor.Mass * 0.5 + Flames[i].target.Material.StructuralIntegrity * 0.75);
+						actor.Health = actor.Health - (GlobalFlameManagement.Flames[i].target.DamageMultiplier + flame.Throttle)/(actor.Mass * 0.5 + GlobalFlameManagement.Flames[i].target.Material.StructuralIntegrity * 0.75);
 						--Stop, drop and roll!
 						flame.Lifetime = flame.Lifetime - math.abs(actor.AngularVel);
 					end
 				else
-					Flames[i].target = nil;
+					GlobalFlameManagement.Flames[i].target = nil;
 					if math.random() > ageRatio then
 						if flame.Vel.Magnitude > 1 then
 							local checkPos = Vector(flame.Pos.X, flame.Pos.Y - 1) + flame.Vel * rte.PxTravelledPerFrame * math.random();
 							local moCheck = SceneMan:GetMOIDPixel(checkPos.X, checkPos.Y);
 							if moCheck ~= rte.NoMOID then
 								local mo = MovableMan:GetMOFromID(moCheck);
 								if mo and (flame.Team == Activity.NOTEAM or mo.Team ~= flame.Team) then
-									Flames[i].target = ToMOSRotating(mo);
+									GlobalFlameManagement.Flames[i].target = ToMOSRotating(mo);
 
-									Flames[i].isShort = true;
-									Flames[i].deleteDelay = math.random(flame.Lifetime);
+									GlobalFlameManagement.Flames[i].isShort = true;
+									GlobalFlameManagement.Flames[i].deleteDelay = math.random(flame.Lifetime);
 
-									Flames[i].targetStickAngle = mo.RotAngle;	
-									Flames[i].stickOffset = SceneMan:ShortestDistance(mo.Pos, flame.Pos, SceneMan.SceneWrapsX) * 0.8;
+									GlobalFlameManagement.Flames[i].targetStickAngle = mo.RotAngle;	
+									GlobalFlameManagement.Flames[i].stickOffset = SceneMan:ShortestDistance(mo.Pos, flame.Pos, SceneMan.SceneWrapsX) * 0.8;
 
 									flame.GlobalAccScalar = 0.9;
 								end
-							elseif flame.GlobalAccScalar < 0.5 and Flames[i].isShort and math.random() < 0.2 and SceneMan:GetTerrMatter(checkPos.X, checkPos.Y) ~= rte.airID then
-								Flames[i].deleteDelay = math.random(flame.Lifetime);
+							elseif flame.GlobalAccScalar < 0.5 and GlobalFlameManagement.Flames[i].isShort and math.random() < 0.2 and SceneMan:GetTerrMatter(checkPos.X, checkPos.Y) ~= rte.airID then
+								GlobalFlameManagement.Flames[i].deleteDelay = math.random(flame.Lifetime);
 								flame.GlobalAccScalar = 0.9;
 							end
 						end
-						if not Flames[i].isShort then
+						if not GlobalFlameManagement.Flames[i].isShort then
 							--Combine two flames into one
 							if flame.Throttle < 0 then
 								for n = 1, #nearbyFlame do
@@ -69,8 +71,8 @@ function Update(self)
 										newFlame.Pos = flame.Pos;
 										newFlame.Vel = flame.Vel;
 										MovableMan:AddParticle(newFlame);
-										Flames[i].particle = newFlame;
-										Flames[i].isShort = true;
+										GlobalFlameManagement.Flames[i].particle = newFlame;
+										GlobalFlameManagement.Flames[i].isShort = true;
 										flame.ToDelete = true;
 										flame = newFlame;
 										]]--
@@ -88,22 +90,21 @@ function Update(self)
 								MovableMan:AddParticle(particle);
 							end
 						end
-						if Flames[i].deleteDelay and flame.Age > Flames[i].deleteDelay then
+						if GlobalFlameManagement.Flames[i].deleteDelay and flame.Age > GlobalFlameManagement.Flames[i].deleteDelay then
 							flame.ToDelete = true;
 						end
 					end
 				end
 			else
-				Flames[i] = {};
+				GlobalFlameManagement.Flames[i] = {};
 			end
 		end
 		if flameCount == 0 then
 			--Clear the global table
-			Flames = {};
+			GlobalFlameManagement.Flames = {};
 		end
 	end
 end
 function Destroy(self)
-	GlobalFlameHandler = nil;
-	print("GlobalFlameHandler:Destroy()");
+	GlobalFlameManagement.FlameHandler = nil;
 end

Coalition.rte/Devices/Explosives/ClusterGrenade/ClusterPart.lua

@@ -7,5 +7,6 @@ function Update(self)
 		--Bounce on the very first hit, and explode on the next
 		self.GibImpulseLimit = 1;
 		self.HitsMOs = self.HitsMOs or math.random() < 0.5;
+		self:DisableScript("Coalition.rte/Devices/Explosives/ClusterGrenade/ClusterPart.lua");
 	end
 end

Ronin.rte/Actors/Brains/Commander/RoninCommander.lua

@@ -4,6 +4,7 @@ function Create(self)
 	self.lungeTapDelay = 200;
 	self.lungePower = 6;
 	self.tapTimer = Timer();
+	self.dir = 0;
 
 	if not self:NumberValueExists("Identity") then
 		self.face = math.random(0, self.FrameCount - 2);
@@ -22,11 +23,8 @@ function Create(self)
 			self.Head.Frame = self.face;
 		end
 	end
-	self.analogSpin = 0;
-	self.lastAnalogAngle = self:GetController().AnalogMove.AbsRadAngle;
 end
 function Update(self)
-	self.analogSpin = self.analogSpin * 0.9;
 	if self.updateTimer:IsPastSimMS(1000) then
 		self.updateTimer:Reset();
 		self.aggressive = self.Health < self.MaxHealth * 0.5;
@@ -42,51 +40,24 @@ function Update(self)
 	if self:IsPlayerControlled() and self.Status < Actor.INACTIVE and self.FGLeg and self.BGLeg then
 		local crouching = self.controller:IsState(Controller.BODY_CROUCH);
 		if self.Status == Actor.UNSTABLE then
-			local motion = (self.Vel.Magnitude * 0.5 + math.abs(self.AngularVel));
-			local stillness = 1/(1 + motion);
-			if crouching then
-				self.AngularVel = self.AngularVel * (1 - stillness) - (self.RotAngle - (self:GetAimAngle(false) - math.pi * 0.5) * self.FlipFactor) * 2 * stillness;
+			if self.dir == self.FlipFactor then
+				local motion = (self.Vel.Magnitude * 0.5 + math.abs(self.AngularVel));
+				local stillness = 1/(1 + motion);
+				if crouching then
+					self.AngularVel = self.AngularVel * (1 - stillness) - (self.RotAngle - (self:GetAimAngle(false) - math.pi * 0.5) * self.FlipFactor) * 2 * stillness;
+				end
+			else
+				self.dir = 0;
 			end
 		elseif crouching then
 			if not self.crouchHeld then
 				if not self.tapTimer:IsPastSimMS(self.lungeTapDelay) and SceneMan.Scene.GlobalAcc.Magnitude > 10 then
-					Lunge(self, 3);
-				else
-					self.tapTimer:Reset();
-				end	
+					self.dir = HumanFunctions.Lunge(self, self.lungePower);
+				end
+				self.tapTimer:Reset();
 				self.controller:SetState(Controller.BODY_CROUCH, false);
 			end
-		else
-			self.analogSpin = self.analogSpin + math.sin(self.controller.AnalogMove.AbsRadAngle - self.lastAnalogAngle);
-			if math.abs(self.analogSpin) > 2 then
-				Lunge(self, 12);
-				self.analogSpin = 0;
-			end
 		end
 		self.crouchHeld = crouching;
 	end
-	self.lastAnalogAngle = self.controller.AnalogMove.AbsRadAngle;
-end
-
-function Lunge(self, spin)
-	local flip = self.FlipFactor;
-	if self.controller:IsState(Controller.MOVE_RIGHT) then
-		flip = 1;
-	elseif self.controller:IsState(Controller.MOVE_LEFT) then
-		flip = -1;
-	end
-	--Different factors that affect the lunge
-	local angVel = math.abs(self.AngularVel * 0.1) + 1;
-	local vel = (self.Vel.Magnitude + angVel)^2 * 0.0005 + 1;
-	local mass = math.abs(self.Mass * 0.005) + 1;
-	local aimAng = self:GetAimAngle(false);
-	local vertical = math.abs(math.cos(aimAng))/vel;
-	local strength = (self.lungePower/self.MaxHealth) * math.min(self.Health, self.MaxHealth);
-	
-	local jumpVec =	Vector((self.lungePower + strength/vel) * flip, -(self.lungePower * 0.5 + (strength * 0.3)) * vertical):RadRotate(aimAng * self.FlipFactor);
-	
-	self.Vel = self.Vel + jumpVec/mass;
-	self.AngularVel = self.AngularVel - (spin/angVel * vertical) * flip * math.cos(self.RotAngle);
-	self.Status = Actor.UNSTABLE;
-	self.tapTimer:Reset();
 end

Ronin.rte/Devices/Shared/Throwable.lua

@@ -8,7 +8,7 @@ end
 function OnCollideWithMO(self, mo, rootMO)
 	if self.thrown then
 		local force = self.PrevVel * self.impactPower;
-		mo:AddForce(force, Vector());
+		mo:AddImpulseForce(force, Vector());
 		if force.Magnitude * self.Sharpness > mo.Material.StructuralIntegrity then
 			local woundName = mo:GetEntryWoundPresetName();
 			if woundName ~= "" then

Ronin.rte/Devices/Weapons/RocketPropelledChainsaw/RPCShot.lua

@@ -29,7 +29,7 @@ function Update(self)
 				local dist = SceneMan:ShortestDistance(self.Pos, mo.Pos, SceneMan.SceneWrapsX);
 				self:AddWound(CreateAEmitter(self:GetEntryWoundPresetName()), Vector(math.random(1 + self.length), 0), true);
 
-				mo:AddForce(self.Vel * self.Mass, Vector());
+				mo:AddImpulseForce(self.Vel * self.Mass, Vector());
 				self.Vel = (mo.Vel - dist:SetMagnitude(self.Vel.Magnitude):RadRotate(RangeRand(-1, 1))) * 0.5;
 				self.AngularVel = self.AngularVel + math.random(10, 20) * (math.random() < 0.5 and 1 or -1);
 			else