Changes requested by Gacyr

Author: fourZK

Base.rte/AI/HumanBehaviors.lua

@@ -14,8 +14,8 @@ function HumanBehaviors.GetTeamShootingSkill(team)
 		aimSkill = 0.04
 	else
 		-- the AI shoot sooner and with slightly better precision
-		aimSpeed = 1/(0.65/(2.9-math.exp(skill*0.01))) -- [1.42 .. 0.38]
-		aimSkill = 1/(0.75/(3.0-math.exp(skill*0.01))) -- [1.36 .. 0.48]
+		aimSpeed = 1/(0.65/(2.9-math.exp(skill*0.01)))
+		aimSkill = 1/(0.75/(3.0-math.exp(skill*0.01)))
 	end
 	return aimSpeed, aimSkill, skill
 end

Base.rte/AI/HumanFunctions.lua

@@ -5,7 +5,7 @@ function HumanFunctions.DoAlternativeGib(actor)
 	if actor.detachLimit then
 		if actor.WoundCount > actor.detachLimit then
 			actor.detachLimit = actor.WoundCount + 1;
-			local parts = {actor.BGArm, actor.BGLeg, actor.FGArm, actor.FGLeg, actor.Head};	--Piority order
+			local parts = {actor.BGArm, actor.BGLeg, actor.FGArm, actor.FGLeg, actor.Head};	--Priority order
 			local mostWounds = -1;
 			local detachLimb;
 			--Pick the limb with most wounds and detach it
@@ -41,8 +41,8 @@ function HumanFunctions.DoArmSway(actor, pushStrength)
 		actor.lastHandPos = {actor.Pos, actor.Pos};
 	end
 	--Flail around if aiming around too fast
-	local ang = actor.lastAngle - aimAngle;
-	actor.AngularVel = actor.AngularVel - (2 * ang * actor.FlipFactor)/(math.abs(actor.AngularVel)/10 + 1);
+	local angleMovement = actor.lastAngle - aimAngle;
+	actor.AngularVel = actor.AngularVel - (2 * angleMovement * actor.FlipFactor)/(math.abs(actor.AngularVel)/10 + 1);
 	actor.lastAngle = aimAngle;
 	--Shove when unarmed
 	if actor.controller:IsState(Controller.WEAPON_FIRE) and (actor.FGArm or actor.BGArm) and not (actor.EquippedItem or actor.EquippedBGItem) and actor.Status == Actor.STABLE then

Base.rte/AI/NativeHumanAI.lua

@@ -279,7 +279,7 @@ function NativeHumanAI:Update(Owner)
 				elseif FoundMO.ClassName == "ACDropShip" then
 					FoundMO = ToACDropShip(FoundMO)
 				elseif FoundMO.ClassName == "ADoor" and ToADoor(FoundMO).Door and ToADoor(FoundMO).Door:IsAttached()
-				and (Owner:EquipNamedDevice("Heavy Digger", true) or (Owner.FirearmIsReady and HumanBehaviors.GetProjectileData(Owner).pen > ToADoor(FoundMO).Door.Material.StructuralIntegrity)) then
+				and (Owner:EquipNamedDevice("Heavy Digger", true) or (Owner.FirearmIsReady and HumanBehaviors.GetProjectileData(Owner).pen * 0.9 > ToADoor(FoundMO).Door.Material.StructuralIntegrity)) then
 					FoundMO = ToADoor(FoundMO)
 				elseif FoundMO.ClassName == "Actor" then
 					FoundMO = ToActor(FoundMO)
@@ -723,8 +723,8 @@ function NativeHumanAI:CreateAttackBehavior(Owner)
 		self.NextBehavior = coroutine.create(HumanBehaviors.AttackTarget)
 		self.NextBehaviorName = "AttackTarget"
 	-- favor grenades as the initiator to a sneak attack
-	elseif Owner.AIMode ~= Actor.AIMODE_SQUAD and Owner.AIMode ~= Actor.AIMODE_SENTRY and self.Target.HFlipped == Owner.HFlipped and Owner:EquipDeviceInGroup("Bombs - Grenades", true) and
-		dist > 100 and dist < ToThrownDevice(Owner.EquippedItem).MaxThrowVel * 20 and (self.Target.Pos.Y + 20) > Owner.Pos.Y then
+	elseif Owner.AIMode ~= Actor.AIMODE_SQUAD and Owner.AIMode ~= Actor.AIMODE_SENTRY and self.Target.HFlipped == Owner.HFlipped and Owner:EquipDeviceInGroup("Bombs - Grenades", true)
+	and dist > 100 and dist < ToThrownDevice(Owner.EquippedItem).MaxThrowVel * 20 and (self.Target.Pos.Y + 20) > Owner.Pos.Y then
 		self.NextBehavior = coroutine.create(HumanBehaviors.ThrowTarget)
 		self.NextBehaviorName = "ThrowTarget"
 	elseif Owner:EquipFirearm(true) then

Base.rte/Activities/OneManArmyDiggers.lua

@@ -233,21 +233,10 @@ function OneManArmy:UpdateActivity()
 
 		--Spawn the AI.
 		if self.CPUTeam ~= Activity.NOTEAM and self.ESpawnTimer:LeftTillSimMS(self.TimeLeft) <= 0 and MovableMan:GetTeamMOIDCount(self.CPUTeam) <= rte.AIMOIDMax * 3 / self:GetActiveCPUTeamCount() then
-			local ship, actorsInCargo
-			
-			if math.random() < 0.5 then
-				-- Set up the ship to deliver this stuff
-				ship = RandomACDropShip("Any", self.CPUTechName);
-				-- If we can't afford this dropship, then try a rocket instead
-				if ship:GetTotalValue(0,3) > self:GetTeamFunds(self.CPUTeam) then
-					DeleteEntity(ship);
-					ship = RandomACRocket("Any", self.CPUTechName);
-				end
-				actorsInCargo = ship.MaxPassengers
-			else
-				ship = RandomACRocket("Any", self.CPUTechName);
-				actorsInCargo = math.min(ship.MaxPassengers, 2)
-			end
+
+			-- Set up the ship to deliver this stuff
+			local ship = RandomACRocket("Any", self.CPUTechName);
+			local actorsInCargo = math.min(ship.MaxPassengers, 2)
 
 			ship.Team = self.CPUTeam;
 

Base.rte/Actors/Infantry/GreenDummy/GreenDummy.ini

@@ -727,7 +727,6 @@ AddActor = AHuman
 	Description = TradeStar's factory worker unit. Agile, but not fit for warfare!
 	AddToGroup = Actors
 	AddToGroup = Actors - Light
-	AddToGroup = Actors - Heavy
 	Mass = 34
 	GoldValue = 45
 	HitsMOs = 1

Base.rte/Actors/Mecha/Medic/Medic.lua

@@ -1,28 +1,40 @@
 function Create(self)
 	self.healTimer = Timer();
-	self.baseHealDelay = 100;
-	self.healIncrementPerTarget = 50;
+	self.baseHealDelay = 150;
+	self.healIncrementPerTarget = 100;
+	self.healIncrementPerWound = 50;
 	self.healTimer:SetSimTimeLimitMS(self.baseHealDelay);
 	self.crossTimer = Timer();
 	self.crossTimer:SetSimTimeLimitMS(800);
 
-	self.healRange = 100 + self.Radius;
+	self.colors = {135, 133, 149, 148, 145};
+	self.maxHealRange = 100 + self.Radius;
 	self.healStrength = 1;
 	self.healTargets = {};
 end
-
 function Update(self)
-	if self.healTimer:IsPastSimTimeLimit() then
-		self.healTimer:Reset();
-		local parent = self:GetParent();
-		if parent and IsActor(parent) then
-			parent = ToActor(parent);
+	local parent = self:GetParent();
+	if parent and IsActor(parent) then
+		parent = ToActor(parent);
+		local healRange = self.maxHealRange * (1 - (self.WoundCount/self.GibWoundLimit));
+		if (parent:IsPlayerControlled() and parent:GetController():IsState(Controller.WEAPON_FIRE)) or #self.healTargets > 0 then
+			local screen = ActivityMan:GetActivity():ScreenOfPlayer(parent:GetController().Player);
+			if screen ~= -1 then
+				PrimitiveMan:DrawCirclePrimitive(screen, self.Pos, healRange, self.colors[math.random(#self.colors)]);
+				for i = 1, math.random(10, 20) do
+					local vector = Vector(healRange, 0):RadRotate(6.28 * math.random());
+					PrimitiveMan:DrawLinePrimitive(screen, self.Pos + vector * RangeRand(0.66, 0.99), self.Pos + vector, self.colors[math.random(#self.colors)]);
+				end
+			end
+		end
+		if self.healTimer:IsPastSimTimeLimit() then
+			self.healTimer:Reset();
 			for i = 1, #self.healTargets do
 				local targetFound = false;
 				local healTarget = self.healTargets[i];
 				if healTarget and IsActor(healTarget) and (healTarget.Health < healTarget.MaxHealth or healTarget.TotalWoundCount > 0) and healTarget.Vel.Largest < 10 then
 					local trace = SceneMan:ShortestDistance(self.Pos, healTarget.Pos, false);
-					if (trace.Magnitude - healTarget.Radius) < self.healRange then
+					if (trace.Magnitude - healTarget.Radius) < healRange then
 						if SceneMan:CastObstacleRay(self.Pos, trace, Vector(), Vector(), parent.ID, parent.IgnoresWhichTeam, rte.grassID, 5) < 0 then
 							targetFound = true;
 						end
@@ -49,14 +61,14 @@ function Update(self)
 			for act in MovableMan.Actors do
 				if act.Team == parent.Team and act.ID ~= parent.ID and (act.Health < act.MaxHealth or act.TotalWoundCount > 0) and act.Vel.Largest < 5 then
 					local trace = SceneMan:ShortestDistance(self.Pos, act.Pos, false);
-					if (trace.Magnitude - act.Radius) < (self.healRange * 0.9) then
-						if SceneMan:CastObstacleRay(self.Pos, trace, Vector(), Vector(), parent.ID, parent.IgnoresWhichTeam, 0, 3) < 0 then
+					if (trace.Magnitude - act.Radius) < (healRange * 0.9) then
+						if SceneMan:CastObstacleRay(self.Pos, trace, Vector(), Vector(), parent.ID, parent.IgnoresWhichTeam, rte.airID, 3) < 0 then
 							table.insert(self.healTargets, act);
 						end
 					end
 				end
 			end
-			self.healTimer:SetSimTimeLimitMS(self.baseHealDelay + (#self.healTargets * self.healIncrementPerTarget));
+			self.healTimer:SetSimTimeLimitMS(self.baseHealDelay + (self.healIncrementPerWound * self.WoundCount) + (#self.healTargets * self.healIncrementPerTarget));
 		end
 	end
 end

Base.rte/Craft/Shared/ScuttleExplosions.lua

@@ -4,16 +4,20 @@ function Create(self)
 	self.height = ToMOSprite(self):GetSpriteHeight();
 	self.width = ToMOSprite(self):GetSpriteWidth();
 
-	self.explosiondelay = 5000/math.sqrt(self.width + self.height);
+	if self:NumberValueExists("ScuttleExplosionDelay") then
+		self.explosionDelay = self:GetNumberValue("ScuttleExplosionDelay");
+	else
+		self.explosionDelay = 5000/math.sqrt(self.width + self.height);
+	end
 end
 function Update(self)
 	if self.Status > Actor.INACTIVE or self.AIMode == Actor.AIMODE_SCUTTLE then
-		if self.explosionTimer:IsPastSimMS(self.explosiondelay) then
+		if self.explosionTimer:IsPastSimMS(self.explosionDelay) then
 			self.explosionTimer:Reset();
-			local expl = CreateAEmitter("Scuttle Explosion");
-			expl.Pos = self.Pos + Vector(self.width/2 * RangeRand(-0.9, 0.9), self.height/2 * RangeRand(-0.9, 0.9)):RadRotate(self.RotAngle);
-			expl.Vel = self.Vel;
-			MovableMan:AddParticle(expl);
+			local explosion = CreateAEmitter("Scuttle Explosion");
+			explosion.Pos = self.Pos + Vector(self.width/2 * RangeRand(-0.9, 0.9), self.height/2 * RangeRand(-0.9, 0.9)):RadRotate(self.RotAngle);
+			explosion.Vel = self.Vel;
+			MovableMan:AddParticle(explosion);
 		end
 	end
 end

Base.rte/Craft/StorageCrate/DropCrate.lua

@@ -4,7 +4,7 @@ function Create(self)
 	-- Choose a random horizontal direction
 	local randomDirection = math.random() > 0.5 and 1 or -1;
 	-- Randomize velocities
-	self.RotAngle = math.random() * (math.pi * 2);
+	self.RotAngle = RangeRand(0, math.pi * 2);
 	self.AngularVel = -randomDirection * math.random(1, 10);
 	self.Pos = Vector(self.Pos.X - randomDirection * math.random(99), self.Pos.Y);
 	-- Try not to fly off the edge in non-wrapping scenes

Base.rte/Devices/Explosives/RemoteExplosive/RemoteExplosive.ini

@@ -64,7 +64,7 @@ AddDevice = HDFirearm
 		CopyOf = Dent Metal
 	ExitWound = AEmitter
 		CopyOf = Dent Metal
-	GoldValue = 25
+	GoldValue = 10
 	AtomGroup = AtomGroup
 		AutoGenerate = 1
 		Material = Material

Base.rte/Devices/Tools/Constructor/ConstructorCollect.lua

@@ -3,15 +3,12 @@ function Create(self)
 	self.speed = 8;
 
 	self.ToSettle = false;
-	if self.Sharpness > -1 then
-		for i = 1, MovableMan:GetMOIDCount()-1 do
-			local mo = MovableMan:GetMOFromID(i);
-			if mo.UniqueID == self.Sharpness then
-				self.target = mo;
-				self.Sharpness = 0;
-				self.PinStrength = 0;
-				break;
-			end
+	if self.Sharpness ~= rte.NoMOID then
+		local mo = MovableMan:GetMOFromID(i);
+		if mo then
+			self.target = mo;
+			self.Sharpness = 0;
+			self.PinStrength = 0;
 		end
 	else
 		self.ToDelete = true;