Merge branch '4zk-content' into cf-143-data-version

Author: Gacyr

Base.rte/AI/HumanBehaviors.lua

@@ -2644,8 +2644,11 @@ function HumanBehaviors.ThrowTarget(AI, Owner, Abort)
 				else
 					AI.fire = false
 				end
-			else
-				break	-- no grenades left
+			else	-- no grenades left, continue attack
+				if not (Owner.AIMode == Actor.AIMODE_SENTRY or Owner.AIMode == Actor.AIMODE_SQUAD) then
+					AI:CreateAttackBehavior(Owner)
+				end
+				break
 			end
 		else
 			if scan < 1 then

Base.rte/AI/HumanFunctions.lua

@@ -149,8 +149,9 @@ function HumanFunctions.DoVisibleInventory(actor, showAll)
 				if item.ClassName == "TDExplosive" then
 					thrownCount = thrownCount + 1;
 				elseif item.ClassName == "HDFirearm" or item.ClassName == "HeldDevice" then
-					if showAll or item.Radius + item.Mass > largestItem then
-						largestItem = item.Radius + item.Mass;
+					if showAll or item.Diameter + item.Mass > largestItem then
+						item = ToMOSprite(item);
+						largestItem = item.Diameter + item.Mass;
 						heldCount = heldCount + 1;
 						local itemCount = math.sqrt(heldCount);
 
@@ -159,7 +160,7 @@ function HumanFunctions.DoVisibleInventory(actor, showAll)
 						--Bigger actors carry weapons higher up, smaller weapons are carried lower down
 						local drawPos = actor.Pos + Vector((-actorBack.X * 0.5 - stackX) * actor.FlipFactor, -actorBack.Y * 0.75):RadRotate(actor.RotAngle);
 						--Display tall objects upright
-						local widthToHeightRatio = ToMOSprite(item):GetSpriteWidth()/ToMOSprite(item):GetSpriteHeight();
+						local widthToHeightRatio = item:GetSpriteWidth()/item:GetSpriteHeight();
 						local orientation = widthToHeightRatio > 1 and 1.57 * actor.FlipFactor or 0;
 
 						local tilt = (itemCount/item.Radius) * widthToHeightRatio * actor.FlipFactor;
@@ -168,7 +169,7 @@ function HumanFunctions.DoVisibleInventory(actor, showAll)
 						for player = Activity.PLAYER_1, Activity.MAXPLAYERCOUNT - 1 do
 							local screen = ActivityMan:GetActivity():ScreenOfPlayer(player);
 							if screen ~= -1 and not SceneMan:IsUnseen(drawPos.X, drawPos.Y, ActivityMan:GetActivity():GetTeamOfPlayer(player)) then
-								PrimitiveMan:DrawBitmapPrimitive(screen, drawPos, item, rotAng, 0, actor.HFlipped, true);
+								PrimitiveMan:DrawBitmapPrimitive(screen, drawPos, item, rotAng, item.Frame, actor.HFlipped, true);
 							end
 						end
 					end

Base.rte/Activities.ini

@@ -83,7 +83,7 @@ AddActivity = GAScripted
 
 AddActivity = GAScripted
 	PresetName = Brain vs Brain
-	SceneName = Grasslands Bunkers
+	SceneName = Fredeleig Bunkers
 	Description = Defend your bunker and invade your opponent's. You can fight against the AI in a pre-built bunker or build your own when fighting against your friends.
 	ScriptFile = Base.rte/Activities/BrainVsBrain.lua
 	InCampaignStage = 1

Base.rte/Actors/Shared.ini

@@ -22,6 +22,19 @@ AddActor = Leg
 	MoveSpeed = 1
 
 
+AddActor = Attachable
+	PresetName = Null Attachable
+	Mass = 0
+	HitsMOs = 0
+	GetsHitByMOs = 0
+	SpriteFile = ContentFile
+		FilePath = Base.rte/Null.bmp
+	AtomGroup = AtomGroup
+		CopyOf = Null AtomGroup
+	JointStrength = 10000
+	JointStiffness = 0.1
+
+
 ///////////////////////////////////////////////////////////////////////
 // Limb Paths
 
@@ -422,9 +435,6 @@ AddEffect = AEmitter
 	BurstSpacing = 920
 	BurstScale = 1
 	BurstTriggered = 1
-	EmissionDamage = 0
-	Flash = None
-	FlashOnlyOnBurst = 0
 	LoudnessOnEmit = 0.1
 
 

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

@@ -231,23 +231,23 @@ AddDevice = TDExplosive
 		MaxVelocity = 40
 		LifeVariation = 0.50
 	AddGib = Gib
-		GibParticle = MOSParticle
+		GibParticle = PEmitter
 			CopyOf = Flame 2 Hurt
 		Count = 10
 		MinVelocity = 10
 		MaxVelocity = 25
 		InheritsVel = 0
 		LifeVariation = 0.20
 	AddGib = Gib
-		GibParticle = MOSParticle
+		GibParticle = PEmitter
 			CopyOf = Flame Hurt Short
 		Count = 20
 		MinVelocity = 20
 		MaxVelocity = 40
 		InheritsVel = 0
 		LifeVariation = 0.20
 	AddGib = Gib
-		GibParticle = MOSParticle
+		GibParticle = PEmitter
 			CopyOf = Ground Flame
 		Count = 30
 		MinVelocity = 10

Base.rte/Devices/Explosives/RemoteExplosive/RemoteExplosiveSet.lua

@@ -52,13 +52,24 @@ end
 function RemoteExplosiveStick(self)
 
 	if self.actionPhase == 0 then
+		local checkVec = Vector(self.Vel.X, self.Vel.Y + 1):SetMagnitude(math.max(self.Vel.Magnitude * rte.PxTravelledPerFrame, self.Radius));
+		--Find a user to ignore hits with
+		if not self.userID then
+			self.userID = rte.NoMOID;
+			local moCheck = SceneMan:CastMORay(self.Pos, checkVec * (-2), self.ID, -1, rte.airID, true, 1);
+			if moCheck ~= rte.NoMOID then
+				local rootID = MovableMan:GetMOFromID(moCheck).RootID;
+				if rootID ~= rte.NoMOID then
+					self.userID = rootID;
+				end
+			end
+		end
 		local rayHitPos = Vector();
 		local rayHit = false;
-		local checkVec = Vector(self.Vel.X, self.Vel.Y + 1):SetMagnitude(math.max(self.Vel.Magnitude * rte.PxTravelledPerFrame, self.Radius));
 		for i = 1, 2 do
 			local checkPos = self.Pos + (checkVec/i);
 			local checkPix = SceneMan:GetMOIDPixel(checkPos.X, checkPos.Y);
-			if checkPix ~= rte.NoMOID then
+			if checkPix ~= rte.NoMOID and MovableMan:GetMOFromID(checkPix).RootID ~= self.userID then
 				checkPos = checkPos + SceneMan:ShortestDistance(checkPos, self.Pos, SceneMan.SceneWrapsX):SetMagnitude(ToMOSprite(self):GetSpriteWidth() * 0.5 - 1);
 				self.target = ToMOSRotating(MovableMan:GetMOFromID(checkPix));
 				self.stickPosition = SceneMan:ShortestDistance(self.target.Pos, checkPos, SceneMan.SceneWrapsX);

Base.rte/Devices/Shared.ini

@@ -56,6 +56,22 @@ AddAmmo = Magazine
 	RoundCount = -1
 
 
+AddDevice = HeldDevice
+	PresetName = Null Item
+	Mass = 0
+	HitsMOs = 0
+	GetsHitByMOs = 0
+	SpriteFile = ContentFile
+		FilePath = Base.rte/Null.bmp
+	Buyable = 0
+	AtomGroup = AtomGroup
+		CopyOf = Null AtomGroup
+	JointStrength = 200
+	JointStiffness = 1
+	HUDVisible = 0
+	LifeTime = 1
+
+
 ///////////////////////////////////////////////////////////////////////
 // Ammo
 

Base.rte/Effects/Pyro.ini

@@ -979,20 +979,22 @@ AddEffect = MOSParticle
 	SpriteFile = ContentFile
 		FilePath = Base.rte/Effects/Pyro/FireBlastSmallB.bmp
 	Mass = 0.49
-	LifeTime = 600
-	GlobalAccScalar = -0.6
+	LifeTime = 800
 	AirResistance = 0.05
 	AirThreshold = 3
 
 
 AddEffect = MOSParticle
 	CopyOf = Flame Smoke 2
 	PresetName = Flame Smoke 2 Glow
+	LifeTime = 700
+	AirResistance = 0.037
+	AirThreshold = 2
 	ScreenEffect = ContentFile
 		FilePath = Base.rte/Effects/Glows/FireGlow1.bmp
 	EffectStartTime = 1
 	EffectAlwaysShows = 1
-	EffectStopTime = 300
+	EffectStopTime = 350
 	EffectStartStrength = 0.5
 	EffectStopStrength = 0.0
 
@@ -1108,9 +1110,6 @@ AddEffect = AEmitter
 	ParticlesPerMinute = 0
 	BurstSize = 0
 	BurstScale = 0
-	BurstSpacing = 0
-	EmissionDamage = 0
-	FlashOnlyOnBurst = 0
 
 
 AddAmmo = MOSRotating
@@ -1175,7 +1174,7 @@ AddAmmo = MOSRotating
 AddEffect = MOSParticle
 	PresetName = Flame 1 Hurt
 	GlobalAccScalar = 0.9
-	AirResistance = 0.05
+	AirResistance = 0.04
 	AirThreshold = 1
 	RestThreshold = -1
 	Mass = 0.98
@@ -1236,17 +1235,20 @@ AddEffect = MOSParticle
 
 
 AddEffect = PEmitter
-	PresetName = Flame 1 Hurt Emitter
-	AirResistance = 0.01
+	PresetName = Flame 1 Hurt
+	GlobalAccScalar = 0.9
+	AirResistance = 0.04
+	AirThreshold = 1
 	RestThreshold = -1
 	Mass = 0.98
-	LifeTime = 8000
+	LifeTime = 6000
 	Sharpness = 0.1
 	HitsMOs = 0
 	GetsHitByMOs = 0
+	ScriptPath = Base.rte/Effects/Pyro/Flame/Flame.lua
 	SpriteFile = ContentFile
 		FilePath = Base.rte/Effects/Pyro/Flame/Flame.bmp
-	FrameCount = 84
+	FrameCount = 86
 	SpriteAnimMode = 7
 	SpriteOffset = Vector
 		X = -10
@@ -1259,39 +1261,94 @@ AddEffect = PEmitter
 		FilePath = Base.rte/Effects/Glows/FireGlow1.bmp
 	EffectAlwaysShows = 0
 	EffectStartTime = 0
-	EffectStopTime = 8000
-	EffectStartStrength = 0.5
-	EffectStopStrength = 0.1
+	EffectStopTime = 5000
+	EffectStartStrength = 0.4
+	EffectStopStrength = 0.0
 	AddEmission = Emission
 		EmittedParticle = MOPixel
 			CopyOf = Ground Fire Burn Particle
+		ParticlesPerMinute = 900
+		LifeVariation = 0.25
+		StopTimeMS = 3500
+		Spread = 1.5
+		MaxVelocity = 18
+		MinVelocity = -9
+		PushesEmitter = 0
+		InheritsVel = 1
+	AddEmission = Emission
+		EmittedParticle = MOSParticle
+			CopyOf = Flame Smoke 2
 		ParticlesPerMinute = 1200
+		LifeVariation = 0.75
+		StopTimeMS = 3500
+		Spread = 1.5
+		MaxVelocity = 1
+		MinVelocity = -0.5
+		PushesEmitter = 0
+		InheritsVel = 1
+	AddEmission = Emission
+		EmittedParticle = MOPixel
+			CopyOf = Ground Fire Burn Particle
+		ParticlesPerMinute = 500
 		LifeVariation = 0.25
+		StartTimeMS = 3500
 		Spread = 1.5
-		MaxVelocity = 20
-		MinVelocity = -10
+		MaxVelocity = 14
+		MinVelocity = -7
 		PushesEmitter = 0
+		InheritsVel = 1
 	AddEmission = Emission
 		EmittedParticle = MOSParticle
 			CopyOf = Flame Smoke 2
-		ParticlesPerMinute = 1600
-		LifeVariation = 0.50
+		ParticlesPerMinute = 720
+		LifeVariation = 0.75
+		StartTimeMS = 3500
 		Spread = 1.5
-		MaxVelocity = 8
-		MinVelocity = -4
+		MaxVelocity = 0.5
+		MinVelocity = 0
 		PushesEmitter = 0
+		InheritsVel = 1
 	EmissionAngle = Matrix
 		AngleDegrees = 90
+	EmissionOffset = Vector
+		X = 0
+		Y = -1
 	EmissionEnabled = 1
 	EmissionsIgnoreThis = 0
 	BurstSize = 5
 	BurstScale = 2
-	BurstTriggered = 0
+	BurstTriggered = 1
+
+
+AddEffect = PEmitter
+	CopyOf = Flame 1 Hurt
+	PresetName = Flame Hurt Short
+	GlobalAccScalar = 0.5
+	LifeTime = 4500
+	EffectStartTime = 10
 
 
 AddEffect = PEmitter
-	CopyOf = Flame 1 Hurt Emitter
-	PresetName = Flame 2 Hurt Emitter
+	CopyOf = Flame 1 Hurt
+	PresetName = Flame 2 Hurt
+	ScreenEffect = ContentFile
+		FilePath = Base.rte/Effects/Glows/FireGlow1.bmp
+	EffectStopTime = 3000
+	EffectStartStrength = 0.6
+	EffectStopStrength = 0.0
+
+
+AddEffect = PEmitter
+	CopyOf = Flame Hurt Short
+	PresetName = Flame Hurt Short Float
+	GlobalAccScalar = -0.1
+
+
+AddEffect = PEmitter
+	CopyOf = Flame 1 Hurt
+	PresetName = Ground Flame
+	LifeTime = 7500
+	EffectStopStrength = 0
 
 
 ///////////////////////////////////////////////////////////////////////