More review changes

Author: fourZK

Base.rte/AI/HumanFunctions.lua

@@ -58,7 +58,7 @@ function HumanFunctions.DoAlternativeGib(actor)
 end
 
 function HumanFunctions.DoAutomaticEquip(actor)
-	--Equip a weapon automatically if the one held by a player is destroyed
+	--Equip a weapon automatically if the one held by a player is destroyed (To-do: move this to cpp?)
 	if actor.EquippedItem == nil and not actor.controller:IsState(Controller.WEAPON_FIRE) and (actor:IsPlayerControlled() or actor:UnequipBGArm()) then
 		actor:EquipFirearm(true);
 	end

Base.rte/Constants.lua

@@ -2,8 +2,8 @@
 rte = {};
 
 rte.MOIDCountMax = math.max(SettingsMan.RecommendedMOIDCount * 3, 250);
-rte.DefenderMOIDMax = SettingsMan.RecommendedMOIDCount;
-rte.AIMOIDMax = SettingsMan.RecommendedMOIDCount/2;
+rte.AIMOIDMax = rte.MOIDCountMax/4;
+rte.DefenderMOIDMax = rte.MOIDCountMax - rte.AIMOIDMax;
 rte.NoMOID = 255;
 rte.SpawnIntervalScale = 1.0;
 rte.StartingFundsScale = 1.0;

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

@@ -8,6 +8,7 @@ function Create(self)
 		self.isShort = true;
 		self.deleteDelay = self.Lifetime * RangeRand(0.1, 0.2);
 	end
+	self.shortFlame = CreatePEmitter("Flame Hurt Short Float", "Base.rte");
 end
 function Update(self)
 	self.ToSettle = false;
@@ -29,23 +30,26 @@ function Update(self)
 			if self.checkTimer:IsPastSimMS(self.checkDelay) then
 				self.checkTimer:Reset();
 				self.checkDelay = math.floor(self.checkDelay * 1.05 + 3);	--Gradually extend the delay for optimization reasons
-				local checkPos = Vector(self.Pos.X, self.Pos.Y - 1) + self.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 (self.Team == Activity.NOTEAM or mo.Team ~= self.Team) then
-						self.target = ToMOSRotating(mo);
+				if self.Vel.Magnitude > 1 then
+					local checkPos = Vector(self.Pos.X, self.Pos.Y - 1) + self.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 (self.Team == Activity.NOTEAM or mo.Team ~= self.Team) then
+							self.target = ToMOSRotating(mo);
 
-						self.isShort = true;
-						self.deleteDelay = math.random(self.Lifetime);
-						self.GlobalAccScalar = 0.9;
-						
-						self.targetStickAngle = mo.RotAngle;	
-						self.stickPos = SceneMan:ShortestDistance(mo.Pos, self.Pos, SceneMan.SceneWrapsX) * 0.8;
+							self.isShort = true;
+							self.deleteDelay = math.random(self.Lifetime);
+							self.GlobalAccScalar = 0.9;
+							
+							self.targetStickAngle = mo.RotAngle;	
+							self.stickPos = SceneMan:ShortestDistance(mo.Pos, self.Pos, SceneMan.SceneWrapsX) * 0.8;
+						end
 					end
-				elseif not self.isShort and math.random() < 0.1 then
+				end
+				if not self.isShort and math.random() < 0.1 then
 					--Spawn another, shorter flame particle occasionally
-					local particle = CreatePEmitter("Flame Hurt Short Float");
+					local particle = self.shortFlame:Clone();
 					particle.Lifetime = particle.Lifetime * RangeRand(0.6, 0.9);
 					particle.Vel = self.Vel + Vector(0, -3) + Vector(math.random(), 0):RadRotate(math.random() * math.pi * 2);
 					particle.Pos = Vector(self.Pos.X, self.Pos.Y - 1);

Missions.rte/Activities/Doainar.lua

@@ -279,12 +279,12 @@ function DoainarMission:UpdateActivity()
 	for actor in MovableMan.Actors do
 		if self.aggress == false then
 			if not self.caveAreaA:IsInside(actor.Pos) and not self.caveAreaB:IsInside(actor.Pos) and actor.PresetName == "Crab" then
-				self:AddObjectivePoint("Kill!", actor.Pos + Vector(0, -actor.Radius), Activity.TEAM_1, GameActivity.ARROWDOWN);
+				self:AddObjectivePoint("Kill!", actor.AboveHUDPos, Activity.TEAM_1, GameActivity.ARROWDOWN);
 			end
 		end
 		if self.mamadead == true then
 			if actor.PresetName == "Crab" then
-				self:AddObjectivePoint("Kill!", actor.Pos + Vector(0, -actor.Radius), Activity.TEAM_1, GameActivity.ARROWDOWN);
+				self:AddObjectivePoint("Kill!", actor.AboveHUDPos, Activity.TEAM_1, GameActivity.ARROWDOWN);
 			end
 		end
 	end