Further implementation of new properties like SpreadMode and Reloadable

Author: fourZK

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

@@ -120,10 +120,11 @@ AddDevice = TDExplosive
 		InheritsVel = 0
 	AddGib = Gib
 		GibParticle = MOPixel
-			CopyOf = Air Blast Scripted
-		Spread = 0
-		MaxVelocity = 50
-		MinVelocity = 50
+			CopyOf = Air Blast
+		Count = 40
+		MaxVelocity = 80
+		MinVelocity = 70
 		InheritsVel = 0
+		SpreadMode = 1
 	GibImpulseLimit = 50000
 	GibWoundLimit = 2

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

@@ -209,6 +209,7 @@ AddDevice = TDExplosive
 		MinVelocity = 40
 		MaxVelocity = 60
 		InheritsVel = 0
+		SpreadMode = 1
 	AddGib = Gib
 		GibParticle = MOPixel
 			CopyOf = Particle Napalm Bomb
@@ -239,6 +240,7 @@ AddDevice = TDExplosive
 		MaxVelocity = 40
 		InheritsVel = 0
 		LifeVariation = 0.20
+		SpreadMode = 1
 	AddGib = Gib
 		GibParticle = PEmitter
 			CopyOf = Ground Flame
@@ -247,6 +249,7 @@ AddDevice = TDExplosive
 		MaxVelocity = 25
 		InheritsVel = 0
 		LifeVariation = 0.20
+		SpreadMode = 1
 	AddGib = Gib
 		GibParticle = MOSParticle
 			CopyOf = Flame Smoke 2

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

@@ -79,8 +79,11 @@ AddDevice = HDFirearm
 		Y = 2
 	SharpLength = 5
 	Magazine = Magazine
-		CopyOf = Null Magazine Infinite
+		CopyOf = Null Magazine
+		PresetName = Magazine Medikit
+		RoundCount = 3
 	Loudness = 0
+	Reloadable = 0
 	RecoilTransmission = 0
 	RateOfFire = 60
 	ReloadTime = 250

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

@@ -1,5 +1,4 @@
 function Create(self)
-	self.uses = 3;
 	self.baseStrength = 10;
 
 	self.confirmSound = CreateSoundContainer("Confirm", "Base.rte");
@@ -21,7 +20,7 @@ function Update(self)
 				end
 			end
 			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));
+				local strength = self.baseStrength + math.ceil(3000/(1 + math.abs(target.Mass - target.InventoryMass + target.Material.StructuralIntegrity) * 0.5));
 				if target.Health < target.MaxHealth then
 					target.Health = math.min(target.Health + strength, target.MaxHealth);
 				end
@@ -42,17 +41,15 @@ function Update(self)
 				local cross = CreateMOSParticle("Particle Heal Effect", "Base.rte");
 				cross.Pos = target.AboveHUDPos + Vector(0, 5);
 				MovableMan:AddParticle(cross);
-
-				self:Reload();
-				self.uses = self.uses - 1;
 			else
 				self.errorSound:Play(self.Pos);
+				if self.Magazine then
+					self.Magazine.RoundCount = self.Magazine.RoundCount + self.RoundsFired;
+				end
 			end
 		end
-	end
-	if self.uses == 0 then
-		self.ToDelete = true;
-	elseif self.Magazine then
-		self.Magazine.RoundCount = self.uses;
+		if self.RoundInMagCount == 0 then
+			self.ToDelete = true;
+		end
 	end
 end

Coalition.rte/Devices/Explosives/FragGrenade/FragGrenade.ini

@@ -70,11 +70,20 @@ AddDevice = MOSRotating
 		InheritsVel = 0
 	AddGib = Gib
 		GibParticle = MOPixel
-			CopyOf = Air Blast Scripted
-		Spread = 0
+			CopyOf = Air Blast
+		Count = 50
+		Spread = 3.14
 		MaxVelocity = 90
 		MinVelocity = 80
 		InheritsVel = 0
+		SpreadMode = 1
+	AddGib = Gib
+		GibParticle = MOPixel
+			CopyOf = Air Blast Scripted
+		Spread = 0
+		MaxVelocity = 70
+		MinVelocity = 60
+		InheritsVel = 0
 
 
 AddDevice = TDExplosive