Minor Medikit tweaks

Author: fourZK

Base.rte/Devices/Tools/Medikit/Medikit.ini

@@ -34,47 +34,6 @@ AddEffect = MOPixel
 	EffectStopStrength = 0.5
 
 
-AddAmmo = Magazine
-	PresetName = Medikit Magazine
-	Mass = 0
-	HitsMOs = 0
-	GetsHitByMOs = 0
-	SpriteFile = ContentFile
-		FilePath = Base.rte/Null.bmp
-	FrameCount = 1
-	SpriteOffset = Vector
-		X = 0
-		Y = 0
-	EntryWound = AEmitter
-		CopyOf = Dent Metal
-	ExitWound = AEmitter
-		CopyOf = Dent Metal
-	AtomGroup = AtomGroup
-		AutoGenerate = 1
-		Material = Material
-			CopyOf = Bullet Metal
-		Resolution = 2
-		Depth = 0
-	DeepGroup = AtomGroup
-		AutoGenerate = 1
-		Material = Material
-			CopyOf = Bullet Metal
-		Resolution = 3
-		Depth = 1
-	DeepCheck = 0
-	JointStrength = 200
-	JointStiffness = 1
-	JointOffset = Vector
-		X = 0
-		Y = 0
-	DrawAfterParent = 1
-	RoundCount = 1
-	RTTRatio = 0
-	RegularRound = Round
-		CopyOf = Null Round
-	Discardable = 0
-
-
 AddDevice = HDFirearm
 	PresetName = Medikit
 	AddToGroup = Tools
@@ -125,7 +84,7 @@ AddDevice = HDFirearm
 		Y = 2
 	SharpLength = 5
 	Magazine = Magazine
-		CopyOf = Medikit Magazine
+		CopyOf = Null Magazine
 	Loudness = 0.0
 	RateOfFire = 100
 	ReloadTime = 500

Base.rte/Devices/Tools/Medikit/Medikit.lua

@@ -7,10 +7,8 @@ function Update(self)
 		if parent and IsActor(parent) then
 			parent = ToActor(parent);
 			local target;
-			local extend = 0;
-			if parent:GetController():IsState(Controller.AIM_SHARP) then
-				extend = self.Radius;	-- Reach out further
-			end
+			local extend = parent:GetController():IsState(Controller.AIM_SHARP) and self.Radius or 0;
+
 			for actor in MovableMan.Actors do
 				local dist = SceneMan:ShortestDistance(self.MuzzlePos, actor.Pos, SceneMan.SceneWrapsX);
 				if dist.Magnitude < (actor.Radius + extend) and actor.Team == self.Team and actor.ID ~= parent.ID then
@@ -31,11 +29,11 @@ function Update(self)
 				target:FlashWhite(50);
 				AudioMan:PlaySound("Base.rte/Sounds/GUIs/SlicePicked.wav", SceneMan:TargetDistanceScalar(self.Pos), false, true, -1);
 
-				local radist = math.ceil(5 + target.Radius / 2);
-				for i = 1, radist do
+				local targetSize = math.ceil(5 + target.Radius / 2);
+				for i = 1, targetSize do
 					local part = CreateMOPixel("Heal Glow", "Base.rte");
-					local vec = Vector(radist * 2, 0):RadRotate(6.28 / radist * i);
-					part.Pos = target.Pos + Vector(0, -radist / 3):RadRotate(target.RotAngle) + vec;
+					local vec = Vector(targetSize * 2, 0):RadRotate(6.28 / targetSize * i);
+					part.Pos = target.Pos + Vector(0, -targetSize / 3):RadRotate(target.RotAngle) + vec;
 					part.Vel = target.Vel * 0.5 - Vector(vec.X, vec.Y) / 4;
 					MovableMan:AddParticle(part);
 				end