Changed TotalWoundCount to WoundCount and RemoveAnyRandomWounds to RemoveWounds

Author: Gacyr

Base.rte/Activities/MetaFight.lua

@@ -581,7 +581,7 @@ function MetaFight:StartActivity()
 					end
 
 					-- Further reduce value if actors are badly damaged in terms of wounds
-					if Act.TotalWoundCount / Act.TotalWoundLimit > 0.5 then
+					if Act.WoundCount / Act.TotalWoundLimit > 0.5 then
 						value = value * 0.5
 					end
 

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

@@ -33,7 +33,7 @@ function Update(self)
 			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
+				if healTarget and IsActor(healTarget) and (healTarget.Health < healTarget.MaxHealth or healTarget.WoundCount > 0) and healTarget.Vel.Largest < 10 then
 					local trace = SceneMan:ShortestDistance(self.Pos, healTarget.Pos, false);
 					if (trace.Magnitude - healTarget.Radius) < healRange then
 						if SceneMan:CastObstacleRay(self.Pos, trace, Vector(), Vector(), parent.ID, parent.IgnoresWhichTeam, rte.grassID, 5) < 0 then
@@ -50,7 +50,7 @@ function Update(self)
 							MovableMan:AddParticle(cross);
 						end
 						if healTarget.Health >= healTarget.MaxHealth then
-							healTarget:RemoveAnyRandomWounds(self.healStrength);
+							healTarget:RemoveWounds(self.healStrength);
 						end
 					end
 				end
@@ -60,7 +60,7 @@ function Update(self)
 			end
 			self.healTargets = {};
 			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
+				if act.Team == parent.Team and act.ID ~= parent.ID and (act.Health < act.MaxHealth or act.WoundCount > 0) and act.Vel.Largest < 5 then
 					local trace = SceneMan:ShortestDistance(self.Pos, act.Pos, false);
 					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

Base.rte/Devices/Special/Medikit/Medikit.lua

@@ -17,13 +17,13 @@ function Update(self)
 					break;
 				end
 			end
-			if target and (target.Health < target.MaxHealth or target.TotalWoundCount > 0) then
+			if target and (target.Health < target.MaxHealth or target.WoundCount > 0) then
 				local strength = self.baseStrength + math.ceil(3000/(1 + math.abs(target.Mass + target.Material.StructuralIntegrity) * 0.5));
 				if target.Health < target.MaxHealth then
 					target.Health = math.min(target.Health + strength, target.MaxHealth);
 				end
-				if target.TotalWoundCount > 0 then
-					target:RemoveAnyRandomWounds(math.ceil(strength * 0.15));
+				if target.WoundCount > 0 then
+					target:RemoveWounds(math.ceil(strength * 0.15));
 				end
 				target:FlashWhite(50);
 				AudioMan:PlaySound("Base.rte/Sounds/GUIs/SlicePicked.wav", self.Pos);

Base.rte/Scenes/Objects/Bunkers/BunkerSystems/Docks/DropshipDock.lua

@@ -23,8 +23,8 @@ function Update(self)
 		--Heal the craft.
 		if self.healTimer:IsPastSimMS(self.craft.Mass) then
 			self.healTimer:Reset();
-			if self.craft.TotalWoundCount > 0 then
-				self.craft.Health = math.min(self.craft.Health + self.craft:RemoveAnyRandomWounds(1), self.craft.MaxHealth);
+			if self.craft.WoundCount > 0 then
+				self.craft.Health = math.min(self.craft.Health + self.craft:RemoveWounds(1), self.craft.MaxHealth);
 			elseif self.craft.Health < self.craft.MaxHealth then
 				self.craft.Health = math.min(self.craft.Health + 1, self.craft.MaxHealth);
 			end

Base.rte/Scenes/Objects/Bunkers/BunkerSystems/Docks/RocketDock.lua

@@ -23,8 +23,8 @@ function Update(self)
 		--Heal the craft
 		if self.healTimer:IsPastSimMS(self.craft.Mass) then
 			self.healTimer:Reset();
-			if self.craft.TotalWoundCount > 0 then
-				self.craft.Health = math.min(self.craft.Health + self.craft:RemoveAnyRandomWounds(1), self.craft.MaxHealth);
+			if self.craft.WoundCount > 0 then
+				self.craft.Health = math.min(self.craft.Health + self.craft:RemoveWounds(1), self.craft.MaxHealth);
 			elseif self.craft.Health < self.craft.MaxHealth then
 				self.craft.Health = math.min(self.craft.Health + 1, self.craft.MaxHealth);
 			end

Techion.rte/Actors/Infantry/SilverMan/Regeneration.lua

@@ -3,18 +3,18 @@ function Create(self)
 	self.regenDelay = 750;
 	self.regenTimer = Timer();
 
-	self.lastWoundCount = self.TotalWoundCount;
+	self.lastWoundCount = self.WoundCount;
 	self.lastHealth = self.Health;
 end
 function Update(self)
 	if self.regenTimer:IsPastSimMS(self.regenDelay) then
 		self.regenTimer:Reset();
 		if self.Health > 0 then
-			local damageRatio = (self.TotalWoundCount - self.lastWoundCount)/self.TotalWoundLimit + (self.lastHealth - self.Health)/self.MaxHealth;
+			local damageRatio = (self.WoundCount - self.lastWoundCount)/self.TotalWoundLimit + (self.lastHealth - self.Health)/self.MaxHealth;
 			if damageRatio > 0 then
 				self.regenDelay = self.regenDelay * (1 + damageRatio);
 			else
-				local healed = self:RemoveAnyRandomWounds(1);
+				local healed = self:RemoveWounds(1);
 				if healed ~= 0 and self.Health < self.MaxHealth then
 					self:AddHealth(self.healAmount);
 					if self.Health > self.MaxHealth	then
@@ -23,7 +23,7 @@ function Update(self)
 				end
 			end
 		end
-		self.lastWoundCount = self.TotalWoundCount;
+		self.lastWoundCount = self.WoundCount;
 		self.lastHealth = self.Health;
 	end
 end

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

@@ -35,7 +35,7 @@ function Create(self)
 			end
 		end
 		--Elaborate effect resistance strength calculations based on various Actor values
-		local resistance = ((actor.Mass + size + actor.Material.StructuralIntegrity) * 0.3 + (actor.TotalWoundLimit - actor.TotalWoundCount) + actor.Health) * 0.5;
+		local resistance = ((actor.Mass + size + actor.Material.StructuralIntegrity) * 0.3 + (actor.TotalWoundLimit - actor.WoundCount) + actor.Health) * 0.5;
 		if resistance - strength < 0 then
 			--Leave this Actor alone if it already has a disintegrator particle assigned to it
 			if ToActor(target):NumberValueExists("ToDisintegrate") then
@@ -48,7 +48,7 @@ function Create(self)
 					self.target = ToACrab(target);
 				end
 				self.target.Health = self.target.Health - self.target.MaxHealth;
-				self.target:RemoveAnyRandomWounds(self.target.TotalWoundCount + 1);
+				self.target:RemoveWounds(self.target.WoundCount + 1);
 				self.target.MissionCritical = true;	--This ensures that the target Actor doesn't settle during the effect
 				self.target.HitsMOs = false;
 				self.target.AngularVel = self.target.AngularVel * 0.5 - self.target.Vel.X + self.target.FlipFactor;