Merge pull request #105 from cortex-command-community/4zk-content

Data followup to ThrownDevice changes

Author: garethyr

Base.rte/AI/HumanBehaviors.lua

@@ -2754,14 +2754,21 @@ function HumanBehaviors.ThrowTarget(AI, Owner, Abort)
 					if Owner.ThrowableIsReady then
 						local Grenade = ToThrownDevice(Owner.EquippedItem)
 						if Grenade then
-							aim = HumanBehaviors.GetGrenadeAngle(AimPoint, Vector(), Grenade.MuzzlePos, Grenade.MaxThrowVel)
+							local maxThrowVel = Grenade.MaxThrowVel
+							local minThrowVel = Grenade.MinThrowVel
+							if maxThrowVel == 0 then
+								maxThrowVel = Owner.FGArm.ThrowStrength + math.abs(Owner.AngularVel * 0.5) * math.cos(Owner.RotAngle)/math.sqrt(math.abs(Grenade.Mass) + 1)
+								minThrowVel = maxThrowVel * 0.2
+							end
+							aim = HumanBehaviors.GetGrenadeAngle(AimPoint, Vector(), Grenade.MuzzlePos, maxThrowVel)
 							if aim then
+								aim = aim - Owner.RotAngle
 								ThrowTimer:Reset()
 								aimTime = Owner.ThrowPrepTime * RangeRand(0.9, 1.1)
 								local maxAim = aim
 
 								-- try again with an average throw vel
-								aim = HumanBehaviors.GetGrenadeAngle(AimPoint, Vector(), Grenade.MuzzlePos, (Grenade.MaxThrowVel+Grenade.MinThrowVel)/2)
+								aim = HumanBehaviors.GetGrenadeAngle(AimPoint, Vector(), Grenade.MuzzlePos, (maxThrowVel + minThrowVel)/2)
 								if aim then
 									aimTime = Owner.ThrowPrepTime * RangeRand(0.45, 0.55)
 								else

Base.rte/Actors/Brains/Brainbot/Brainbot.ini

@@ -356,6 +356,7 @@ AddActor = Arm
 	Hand = ContentFile
 		FilePath = Base.rte/Actors/Brains/Brainbot/HandFG.png
 	GripStrength = 100
+	ThrowStrength = 25
 	MaxLength = 13
 	IdleOffset = Vector
 		X = 7

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

@@ -377,6 +377,7 @@ AddActor = Arm
 	Hand = ContentFile
 		FilePath = Base.rte/Actors/Infantry/GreenDummy/HandFGA.png
 	GripStrength = 100
+	ThrowStrength = 30
 	MaxLength = 12
 	IdleOffset = Vector
 		X = 5

Base.rte/Devices/Explosives/AntiPersonnelMine/AntiPersonnelMine.ini

@@ -208,10 +208,10 @@ AddDevice = TDExplosive
 		Y = 4
 	StartThrowOffset = Vector
 		X = 9
-		Y = -2
+		Y = 1
 	EndThrowOffset = Vector
-		X = 4
-		Y = 4
+		X = 8
+		Y = -1
 	MinThrowVel = 1
 	MaxThrowVel = 10
 	TriggerDelay = 10000000

Base.rte/Devices/Explosives/ClusterMineBomb/ClusterMineBomb.ini

@@ -136,12 +136,10 @@ AddDevice = TDExplosive
 		Y = 4
 	StartThrowOffset = Vector
 		X = 6
-		Y = -7
+		Y = -4
 	EndThrowOffset = Vector
-		X = 4
-		Y = 4
-	MinThrowVel = 1
-	MaxThrowVel = 8
+		X = 6
+		Y = -1
 	TriggerDelay = 5000
 	ActivatesWhenReleased = 1
 	AddGib = Gib

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

@@ -1,27 +1,3 @@
-///////////////////////////////////////////////////////////////////////
-// Frag Grenade Effects
-
-
-AddAmmo = MOSParticle
-	PresetName = Frag Grenade Pin
-	Mass = 0.05
-	HitsMOs = 0
-	GetsHitByMOs = 0
-	RestThreshold = 1000
-	SpriteFile = ContentFile
-		FilePath = Base.rte/Devices/Explosives/FragGrenade/FragGrenadePin.png
-	FrameCount = 8
-	SpriteAnimMode = 7
-	SpriteOffset = Vector
-		X = -2
-		Y = -2
-	AngularVel = 6
-	Atom = Atom
-		Material = Material
-			PresetName = Scrap Metal
-		TrailLength = 0
-
-
 ///////////////////////////////////////////////////////////////////////
 // Frag Grenade
 
@@ -30,14 +6,14 @@ AddDevice = TDExplosive
 	PresetName = Frag Grenade
 	AddToGroup = Bombs - Grenades
 	AddToGroup = Bombs
-	Mass = 1
+	Mass = 1.3
 	RestThreshold = -500
 	HitsMOs = 1
 	GetsHitByMOs = 1
-	ScriptPath = Base.rte/Devices/Explosives/FragGrenade/FragGrenade.lua
 	SpriteFile = ContentFile
 		FilePath = Base.rte/Devices/Explosives/FragGrenade/FragGrenade.png
 	FrameCount = 2
+	SpriteAnimMode = 0
 	SpriteOffset = Vector
 		X = -3
 		Y = -4
@@ -75,15 +51,15 @@ AddDevice = TDExplosive
 		X = -12
 		Y = -5
 	StartThrowOffset = Vector
-		X = -12
-		Y = -5
+		X = -11
+		Y = -3
 	EndThrowOffset = Vector
-		X = -12
-		Y = -5
-	MinThrowVel = 5
-	MaxThrowVel = 20
+		X = 11
+		Y = -3
 	TriggerDelay = 2500
 	ActivatesWhenReleased = 1
+	StrikerLever = MOSParticle
+		CopyOf = Grenade Pin
 	AddGib = Gib
 		GibParticle = MOPixel
 			CopyOf = Glow Explosion Big

Base.rte/Devices/Explosives/FragGrenade/FragGrenade.lua

@@ -173,8 +173,6 @@ AddDevice = TDExplosive
 	EndThrowOffset = Vector
 		X = 4
 		Y = 4
-	MinThrowVel = 1
-	MaxThrowVel = 8
 	TriggerDelay = 5000
 	ActivatesWhenReleased = 1
 	AddGib = Gib

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

@@ -56,8 +56,6 @@ AddDevice = TDExplosive
 	EndThrowOffset = Vector
 		X = 4
 		Y = 4
-	MinThrowVel = 1
-	MaxThrowVel = 10
 	TriggerDelay = 5000
 	ActivatesWhenReleased = 1
 	AddGib = Gib

Base.rte/Devices/Explosives/StandardBomb/StandardBomb.ini

@@ -4,12 +4,12 @@ function Create(self)
 	self.laserTimer:SetSimTimeLimitMS(10);
 	self.guideTable = {};
 
-	self.projectileVel = 30;
-
 	if IsThrownDevice(self) then
 		self.isThrownDevice = true;
-		self.projectileVel = self.MaxThrowVel;
-		self.projectileVelMin = self.MinThrowVel;
+		if self.MaxThrowVel > 0 then
+			self.projectileVelMax = self.MaxThrowVel;
+			self.projectileVelMin = self.MinThrowVel;
+		end
 		self.projectileGravity = self.GlobalAccScalar;
 		self.projectileAirResistance = self.AirResistance;
 		self.projectileAirThreshold = self.AirThreshold;
@@ -46,18 +46,21 @@ function Update(self)
 		if controller:IsState(Controller.AIM_SHARP) or self.isThrownDevice and controller:IsState(Controller.WEAPON_FIRE) then
 			if self.laserTimer:IsPastSimTimeLimit() then
 
-				local guideParPos, gudeParVel;
+				local guideParPos, guideParVel;
 
 				if self.isThrownDevice and IsAHuman(actor) then
 					--Display detonation point if a scripted fuze is active
 					if self.fuze and self.fuzeDelay then
 						self.maxTrajectoryPars = (self.fuzeDelay - self.fuze.ElapsedSimTimeMS - self.laserTimer.ElapsedSimTimeMS)/TimerMan.DeltaTimeMS * rte.PxTravelledPerFrame;
 					end
 					actor = ToAHuman(actor);
+					local rotationThisFrame = actor.AngularVel * TimerMan.DeltaTimeSecs;
+					local maxVel = self.projectileVelMax or (actor.FGArm.ThrowStrength + math.abs(actor.AngularVel * 0.5))/math.sqrt(math.abs(self.Mass) + 1);
+					local minVel = self.projectileVelMin or maxVel * 0.2;
 					--The following offset is as found in the source code (To-do: expose and utilize EndThrowOffset properly instead)
-					guideParPos = actor.Pos + Vector((actor.FGArm.ParentOffset.X + 15) * actor.FlipFactor, actor.FGArm.ParentOffset.Y - 8);
-					local projectileVel = self.throwTimer and self.projectileVelMin + (self.projectileVel - self.projectileVelMin) * math.min(self.throwTimer.ElapsedSimTimeMS, actor.ThrowPrepTime)/actor.ThrowPrepTime or self.projectileVel;
-					guideParVel = Vector(projectileVel, 0):RadRotate(actor.RotAngle + actor:GetAimAngle(true));
+					guideParPos = actor.Pos + actor.Vel * rte.PxTravelledPerFrame + Vector((actor.FGArm.ParentOffset.X + actor.FGArm.MaxLength) * actor.FlipFactor, actor.FGArm.ParentOffset.Y - actor.FGArm.MaxLength * 0.5):RadRotate(actor:GetAimAngle(false) * actor.FlipFactor);
+					local projectileVel = self.throwTimer and minVel + (maxVel - minVel) * math.min(self.throwTimer.ElapsedSimTimeMS, actor.ThrowPrepTime)/actor.ThrowPrepTime or maxVel;
+					guideParVel = Vector(projectileVel, 0):RadRotate(actor.RotAngle + actor:GetAimAngle(true) + rotationThisFrame);
 				else
 					guideParPos = self.MuzzlePos;
 					guideParVel = Vector(self.projectileVel, 0):RadRotate(actor:GetAimAngle(true));