Backport some changes from development branch:

- Made Kinsie's Test Map changes toggleable (off by default)
 - Corrected physics of various projectiles
 - Replaced textures of health items to something better looking
 - Biosludge now only has a hitbox when stuck to surfaces, to be
   more consistent with vanilla behavior
 - Some code cleanup

zscript/biorifle.zsc

@@ -198,8 +198,6 @@ Class BioGel : Actor
 		deadtimer = -1;
 		l = Spawn("BioLight",pos);
 		l.target = self;
-		b = Spawn("BioHitbox",pos);
-		b.target = self;
 		rollvel = FRandom[GES](10,30)*RandomPick[GES](-1,1);
 		pitchvel = FRandom[GES](10,30)*RandomPick[GES](-1,1);
 		yawvel = FRandom[GES](10,30)*RandomPick[GES](-1,1);
@@ -297,72 +295,8 @@ Class BioGel : Actor
 			SetStateLabel("XDeath");
 			return;
 		}
-		FLineTraceData d;
 		A_SetSize(0.1,0);
-		if ( BlockingLine )
-		{
-			atline = BlockingLine;
-			normal = (-BlockingLine.delta.y,BlockingLine.delta.x,0).unit();
-			atside = 1;
-			if ( !BlockingLine.sidedef[1] || (CurSector == BlockingLine.frontsector) )
-			{
-				atside = 0;
-				normal *= -1;
-			}
-			Vector3 orig = (BlockingLine.v1.p.x,BlockingLine.v1.p.y,0);
-			Vector3 onwall = pos-(normal dot (pos-orig))*normal;
-			SetOrigin(onwall+normal*0.5,false);
-			// attempt to guess line part (upper/mid/lower)
-			if ( !atline.sidedef[1] ) atpart = 0;	// mid
-			else if ( atline.sidedef[atside?0:1].sector.ceilingplane.ZAtPoint(pos.xy) < pos.z ) atpart = 1;	// upper
-			else if ( atline.sidedef[atside?0:1].sector.floorplane.ZAtPoint(pos.xy) > pos.z ) atpart = -1;	// lower
-			else atpart = 0;
-			if ( atpart == 1 )
-			{
-				if ( atline.flags&Line.ML_DONTPEGTOP ) atz = pos.z-atline.sidedef[atside].sector.GetPlaneTexZ(1);
-				else atz = pos.z-atline.sidedef[atside?0:1].sector.GetPlaneTexZ(1);
-			}
-			else if ( atpart == -1 )
-			{
-				if ( atline.flags&Line.ML_DONTPEGBOTTOM ) atz = pos.z-atline.sidedef[atside].sector.GetPlaneTexZ(0);
-				else atz = pos.z-atline.sidedef[atside?0:1].sector.GetPlaneTexZ(0);
-			}
-			else if ( atline.flags&Line.ML_DONTPEGBOTTOM ) atz = pos.z-atline.sidedef[atside].sector.GetPlaneTexZ(0);
-			else atz = pos.z-atline.sidedef[atside].sector.GetPlaneTexZ(1);
-			angle = atan2(normal.y,normal.x);
-			pitch = 0;
-			roll = 180;	// otherwise it slides upwards (UT changes roll like this too)
-			if ( waterlevel > 0 ) hittype = HIT_FLOOR;
-			else hittype = HIT_WALL;
-		}
-		else if ( pos.z <= floorz+4 )
-		{
-			atsector = cursector;
-			atplane = 0;
-			normal = cursector.floorplane.Normal;
-			pitch = asin(-normal.z);
-			angle = atan2(normal.y,normal.x);
-			roll = FRandom[GES](0,360);
-			SetOrigin((pos.x,pos.y,floorz)+normal*0.5,false);
-			atz = pos.z-cursector.GetPlaneTexZ(0);
-			hittype = HIT_FLOOR;
-		}
-		else if ( pos.z >= ceilingz-8 )
-		{
-			atsector = cursector;
-			atplane = 1;
-			normal = cursector.ceilingplane.Normal;
-			pitch = asin(-normal.z);
-			angle = atan2(normal.y,normal.x);
-			roll = FRandom[GES](0,360);
-			SetOrigin((pos.x,pos.y,ceilingz)+normal*0.5,false);
-			atz = pos.z-cursector.GetPlaneTexZ(1);
-			if ( waterlevel > 0 ) hittype = HIT_FLOOR;
-			else if ( normal dot (0,0,-1) > 0.7 )
-				hittype = HIT_CEILING;
-			else hittype = HIT_FLOOR;
-		}
-		else if ( tracer && tracer.bACTLIKEBRIDGE )
+		if ( tracer && tracer.bACTLIKEBRIDGE )
 		{
 			atbridge = tracer;
 			onbridge = true;
@@ -461,11 +395,76 @@ Class BioGel : Actor
 				}
 			}
 		}
+		else if ( BlockingFloor )
+		{
+			atsector = BlockingFloor;
+			atplane = 0;
+			normal = BlockingFloor.floorplane.Normal;
+			pitch = asin(-normal.z);
+			angle = atan2(normal.y,normal.x);
+			roll = FRandom[GES](0,360);
+			SetOrigin((pos.x,pos.y,floorz)+normal*0.5,false);
+			atz = pos.z-BlockingFloor.GetPlaneTexZ(0);
+			hittype = HIT_FLOOR;
+		}
+		else if ( BlockingCeiling )
+		{
+			atsector = BlockingCeiling;
+			atplane = 1;
+			normal = BlockingCeiling.ceilingplane.Normal;
+			pitch = asin(-normal.z);
+			angle = atan2(normal.y,normal.x);
+			roll = FRandom[GES](0,360);
+			SetOrigin((pos.x,pos.y,ceilingz)+normal*0.5,false);
+			atz = pos.z-BlockingCeiling.GetPlaneTexZ(1);
+			if ( waterlevel > 0 ) hittype = HIT_FLOOR;
+			else if ( normal dot (0,0,-1) > 0.7 )
+				hittype = HIT_CEILING;
+			else hittype = HIT_FLOOR;
+		}
+		else if ( BlockingLine )
+		{
+			atline = BlockingLine;
+			normal = (-BlockingLine.delta.y,BlockingLine.delta.x,0).unit();
+			atside = 1;
+			if ( !BlockingLine.sidedef[1] || (CurSector == BlockingLine.frontsector) )
+			{
+				atside = 0;
+				normal *= -1;
+			}
+			Vector3 orig = (BlockingLine.v1.p.x,BlockingLine.v1.p.y,0);
+			Vector3 onwall = pos-(normal dot (pos-orig))*normal;
+			SetOrigin(onwall+normal*0.5,false);
+			// attempt to guess line part (upper/mid/lower)
+			if ( !atline.sidedef[1] ) atpart = 0;	// mid
+			else if ( atline.sidedef[atside?0:1].sector.ceilingplane.ZAtPoint(pos.xy) < pos.z ) atpart = 1;	// upper
+			else if ( atline.sidedef[atside?0:1].sector.floorplane.ZAtPoint(pos.xy) > pos.z ) atpart = -1;	// lower
+			else atpart = 0;
+			if ( atpart == 1 )
+			{
+				if ( atline.flags&Line.ML_DONTPEGTOP ) atz = pos.z-atline.sidedef[atside].sector.GetPlaneTexZ(1);
+				else atz = pos.z-atline.sidedef[atside?0:1].sector.GetPlaneTexZ(1);
+			}
+			else if ( atpart == -1 )
+			{
+				if ( atline.flags&Line.ML_DONTPEGBOTTOM ) atz = pos.z-atline.sidedef[atside].sector.GetPlaneTexZ(0);
+				else atz = pos.z-atline.sidedef[atside?0:1].sector.GetPlaneTexZ(0);
+			}
+			else if ( atline.flags&Line.ML_DONTPEGBOTTOM ) atz = pos.z-atline.sidedef[atside].sector.GetPlaneTexZ(0);
+			else atz = pos.z-atline.sidedef[atside].sector.GetPlaneTexZ(1);
+			angle = atan2(normal.y,normal.x);
+			pitch = 0;
+			roll = 180;	// otherwise it slides upwards (UT changes roll like this too)
+			if ( waterlevel > 0 ) hittype = HIT_FLOOR;
+			else hittype = HIT_WALL;
+		}
 		else
 		{
 			SetStateLabel("XDeath");
 			return;
 		}
+		b = Spawn("BioHitbox",pos);
+		b.target = self;
 		A_PlaySound("ges/hit");
 		A_SprayDecal("BioSplat",-172);
 		int numpt = Min(100,int(Scale.x*10))+Random[GES](-5,5);

zscript/eightball.zsc

@@ -221,11 +221,11 @@ Class UTGrenade : UTRocket
 		DamageType 'GrenadeDeath';
 		-NOGRAVITY;
 		+USEBOUNCESTATE;
-		-BOUNCEAUTOOFF;
-		+BOUNCEAUTOOFFFLOORONLY;
 		-EXPLODEONWATER;
 		+CANBOUNCEWATER;
-		BounceType "Doom";
+		+NOEXPLODEFLOOR;
+		BounceType "Hexen";
+		WallBounceFactor 0.75;
 		BounceFactor 0.75;
 		ReactionTime 85;
 		Speed 20;
@@ -243,20 +243,37 @@ Class UTGrenade : UTRocket
 	Spawn:
 		RCKT A 1
 		{
-			angle += anglevel;
-			pitch += pitchvel;
-			roll += rollvel;
+			if ( !bNOGRAVITY )
+			{
+				angle += anglevel;
+				pitch += pitchvel;
+				roll += rollvel;
+			}
+			let s = Spawn("UTSmoke",pos);
+			s.scale *= 2.0;
+			s.alpha *= 0.6;
+			s.vel = (FRandom[Eightball](-0.1,0.1),FRandom[Eightball](-0.1,0.1),FRandom[Eightball](-0.1,0.3));
+			s.vel += vel*0.05;
+			s.SetShade("000000");
 			A_Countdown();
 		}
 		Wait;
 	Bounce:
 		RCKT A 0
 		{
+			bHITOWNER = true;
 			A_PlaySound("utrl/bounce");
 			rollvel = FRandom[Eightball](-16,16);
 			pitchvel = FRandom[Eightball](-16,16);
 			anglevel = FRandom[Eightball](-16,16);
-			bHITOWNER = true;
+			if ( vel.z > 10 ) vel.z = 0.5*(10+vel.z);
+			else if ( BlockingFloor && (vel.xy.length() < 0.5) )
+			{
+				vel *= 0;
+				bNOGRAVITY = true;
+				bMOVEWITHSECTOR = true;
+				ClearBounce();
+			}
 		}
 		Goto Spawn;
 	Death:

zscript/enforcer.zsc

@@ -88,7 +88,7 @@ Class BulletImpact : Actor
 
 Class UTCasing : Actor
 {
-	int deadtimer;
+	int deadtimer, numbounces;
 	double pitchvel, anglevel;
 	double heat;
 
@@ -102,7 +102,9 @@ Class UTCasing : Actor
 		+THRUACTORS;
 		+USEBOUNCESTATE;
 		+INTERPOLATEANGLES;
-		BounceType "Doom";
+		Mass 1;
+		BounceType "Hexen";
+		WallBounceFactor 0.65;
 		BounceFactor 0.65;
 		BounceSound "bullet/casing";
 	}
@@ -144,6 +146,12 @@ Class UTCasing : Actor
 			pitchvel = FRandom[Junk](10,30)*RandomPick[Junk](-1,1);
 			anglevel = FRandom[Junk](10,30)*RandomPick[Junk](-1,1);
 			vel = (vel.unit()+(FRandom[Junk](-.2,.2),FRandom[Junk](-.2,.2),FRandom[Junk](-.2,.2))).unit()*vel.length();
+			if ( numbounces && ((numbounces > 3) || (Random[Junk](1,20) < 17) || (vel.z > -1.4)) )
+			{
+				ClearBounce();
+				ExplodeMissile();
+			}
+			numbounces++;
 		}
 		Goto Spawn;
 	Death:

zscript/flakcannon.zsc

@@ -166,12 +166,11 @@ Class FlakChunk : Actor
 		Speed 50;
 		DamageFunction Random[Flak](15,20);
 		DamageType 'Shredded';
-		BounceType "Doom";
+		BounceType "Hexen";
 		BounceFactor 0.8;
 		WallBounceFactor 0.8;
 		PROJECTILE;
 		+USEBOUNCESTATE;
-		-BOUNCEAUTOOFF;
 		+CANBOUNCEWATER;
 		+SKYEXPLODE;
 		+INTERPOLATEANGLES;
@@ -232,9 +231,8 @@ Class FlakChunk : Actor
 	action void A_HandleBounce()
 	{
 		bHITOWNER = true;
-		A_SprayDecal("WallCrack",-8);
 		int numpt = Random[Flak](2,3);
-		if ( frame < 10 )
+		if ( (frame < 10) && Random[Flak](0,1) )
 		{
 			for ( int i=0; i<numpt; i++ )
 			{
@@ -243,6 +241,7 @@ Class FlakChunk : Actor
 				s.vel = pvel;
 			}
 		}
+		else A_SprayDecal("WallCrack",-8);
 		A_Gravity();
 		invoker.rollvel = FRandom[Flak](50,100)*RandomPick[Flak](-1,1)*(vel.length()/speed);
 		invoker.pitchvel = FRandom[Flak](50,100)*RandomPick[Flak](-1,1)*(vel.length()/speed);
@@ -255,7 +254,7 @@ Class FlakChunk : Actor
 	}
 	override int DoSpecialDamage( Actor target, int damage, Name damagetype )
 	{
-		if ( vel.length() <= 5.0 ) return 0;
+		if ( vel.length() <= 5.0 ) return -1;
 		FlakAccumulator.Accumulate(target,damage);
 		int gibhealth = (target.GibHealth==int.min)?-target.SpawnHealth():target.GibHealth;
 		int calcdmg = FlakAccumulator.GetAmount(target);

zscript/ripper.zsc

@@ -60,13 +60,12 @@ Class Razor2 : Actor
 		DamageFunction (Random[Ripper](20,25)*((DamageType=='Decapitated')?3:1.0));
 		DamageType 'Shredded';
 		Obituary "%k ripped a chunk of meat out of %o with the Ripper.";
-		BounceType "Doom";
+		BounceType "Hexen";
 		ReactionTime 7;
 		BounceFactor 1.0;
 		WallBounceFactor 1.0;
 		PROJECTILE;
 		+USEBOUNCESTATE;
-		-BOUNCEAUTOOFF;
 		+SKYEXPLODE;
 		+CANBOUNCEWATER;
 		+NODAMAGETHRUST;

zscript/translocator.zsc

@@ -115,6 +115,7 @@ Class TranslocatorGlow : Actor
 Class TranslocatorModule : Actor
 {
 	Actor b;
+	bool alreadyhit;
 
 	Default
 	{
@@ -128,12 +129,10 @@ Class TranslocatorModule : Actor
 		+HITTRACER;
 		+MOVEWITHSECTOR;
 		+CANBOUNCEWATER;
-		-BOUNCEAUTOOFF;
-		+BOUNCEAUTOOFFFLOORONLY;
 		+BLOCKASPLAYER;
-		BounceType "Doom";
-		BounceFactor 0.5;
-		WallBounceFactor 0.5;
+		BounceType "Hexen";
+		BounceFactor 0.3;
+		WallBounceFactor 0.3;
 	}
 
 	override void PostBeginPlay()
@@ -207,8 +206,17 @@ Class TranslocatorModule : Actor
 	Bounce:
 		TMOD A 0
 		{
-			A_SetPitch(0);
-			A_PlaySound("transloc/bounce");
+			if ( alreadyhit )
+			{
+				ClearBounce();
+				ExplodeMissile();
+			}
+			else
+			{
+				A_SetPitch(0);
+				A_PlaySound("transloc/bounce");
+				if ( BlockingFloor ) alreadyhit = true;
+			}
 		}
 		Goto Spawn;
 	Death:

zscript/utcommon.zsc

@@ -601,6 +601,8 @@ Class UTWeapon : Weapon
 	virtual ui void PreRender( double lbottom ) {}
 	// Drawstuffs over HUD
 	virtual ui void PostRender( double lbottom ) {}
+	// Future preparations for scripted textures
+	virtual ui void RenderOverlay( RenderEvent e ) {}
 
 	override Inventory CreateTossable( int amt )
 	{
@@ -1284,7 +1286,7 @@ Class ShredCorpseHitbox : Actor
 	override void Tick()
 	{
 		Super.Tick();
-		if ( !target || (target.Health > 0) || target.InStateSequence(target.CurState,target.FindState("XDeath")) )
+		if ( !flak_corpsedamage || !target || (target.Health > 0) || target.InStateSequence(target.CurState,target.FindState("XDeath")) )
 		{
 			Destroy();
 			return;
@@ -1300,6 +1302,7 @@ Class ShredCorpseHitbox : Actor
 		{
 			// force gib (cheap ATM)
 			State gib = target.FindState("XDeath");
+			if ( !gib ) gib = target.FindState("Death.Extreme");
 			if ( gib ) target.SetState(gib);
 			Destroy();
 		}
@@ -1539,6 +1542,12 @@ Class UTMainHandler : StaticEventHandler
 		// prettify Kinsie's test map for a more Unreal feel
 		if ( level.GetChecksum() ~== "FBC3B6622A8B74AE06DE01E70007AC33" )
 		{
+			// just replace the -noflat- with a better scaled version
+			if ( !flak_doomtest )
+			{
+				TexMan.ReplaceTextures("-noflat-","DefTex",0);
+				return;
+			}
 			TextureID deftex = TexMan.CheckForTexture("-noflat-",TexMan.Type_Any);
 			TextureID skytx = TexMan.CheckForTexture("BlueSky",TexMan.Type_Any);
 			TextureID baseflor = TexMan.CheckForTexture("rClfFlr0",TexMan.Type_Any);
@@ -1716,6 +1725,9 @@ Class UTMainHandler : StaticEventHandler
 
 	override void RenderOverlay( RenderEvent e )
 	{
+		// well this if sure is a long one
+		if ( players[consoleplayer].camera.player && players[consoleplayer].camera.player.ReadyWeapon && (players[consoleplayer].camera.player.ReadyWeapon is 'UTWeapon') )
+			UTWeapon(players[consoleplayer].camera.player.ReadyWeapon).RenderOverlay(e);
 		if ( !menuactive ) return;
 		if ( tex.IsNull() || !tex.IsValid() ) return;
 		if ( !CVar.GetCVar('flak_showmenu',players[consoleplayer]).GetBool() ) return;
@@ -1727,11 +1739,12 @@ Class UTMainHandler : StaticEventHandler
 	{
 		if ( e.Thing.bDONTGIB ) return;
 		// gibbers
-		if ( flak_gibs && !e.Thing.bNOBLOOD && ((e.Inflictor && e.Inflictor.bEXTREMEDEATH) || (e.Thing.Health < e.Thing.GetGibHealth())) && (!e.Inflictor || !e.Inflictor.bNOEXTREMEDEATH) )
+		if ( flak_gibs && !e.Thing.bNOBLOOD && (e.Thing.FindState("XDeath") || e.Thing.FindState("Death.Extreme")) && ((e.Inflictor && e.Inflictor.bEXTREMEDEATH) || (e.Thing.Health < e.Thing.GetGibHealth())) && (!e.Inflictor || !e.Inflictor.bNOEXTREMEDEATH) )
 		{
 			// players have special gibbing
 			if ( e.Thing.player )
 			{
+				// TODO
 				return;
 			}
 			// generic gibbing

zscript/utgore.zsc

@@ -8,6 +8,7 @@ Class UTBlood : Actor
 		+NOBLOCKMAP;
 		+NOGRAVITY;
 		+NOTELEPORT;
+		+DONTSPLASH;
 		+FORCEXYBILLBOARD;
 		+PUFFGETSOWNER;
 	}
@@ -61,6 +62,7 @@ Class UTBloodDrop : Actor
 	Default
 	{
 		Scale 0.24;
+		Mass 1;
 		Radius 2;
 		Height 2;
 		RenderStyle "Translucent";
@@ -99,6 +101,7 @@ Class UTBloodSpurt : Actor
 	{
 		+NOBLOCKMAP;
 		+NOGRAVITY;
+		+DONTSPLASH;
 		+NOTELEPORT;
 		+THRUACTORS;
 	}
@@ -134,6 +137,7 @@ Class UTBloodTrail : Actor
 		+NOBLOCKMAP;
 		+NOGRAVITY;
 		+NOTELEPORT;
+		+DONTSPLASH;
 		+THRUACTORS;
 	}
 	override void PostBeginPlay()
@@ -183,6 +187,7 @@ Class UTBloodPuff : Actor
 		+NOBLOCKMAP;
 		+NOGRAVITY;
 		+NOTELEPORT;
+		+DONTSPLASH;
 		+FORCEXYBILLBOARD;
 	}
 	States
@@ -284,12 +289,13 @@ Class UTGib : Actor
 	{
 		Radius 4;
 		Height 4;
-		BounceType "Doom";
-		BounceFactor 0.7;
-		WallBounceFactor 0.7;
+		BounceType "Hexen";
+		BounceFactor 0.8;
+		WallBounceFactor 0.8;
 		+ROLLSPRITE;
 		+ROLLCENTER;
 		+INTERPOLATEANGLES;
+		+CANBOUNCEWATER;
 		+MISSILE;
 		+THRUACTORS;
 		+USEBOUNCESTATE;
@@ -297,19 +303,30 @@ Class UTGib : Actor
 	override void PostBeginPlay()
 	{
 		Super.PostBeginPlay();
-		let t = Spawn("UTBloodTrail",pos);
-		t.target = self;
-		if ( bloodcolor ) t.SetShade(bloodcolor);
-		else t.SetShade(gameinfo.defaultbloodcolor);
-		t.translation = bloodtranslation;
+		tracer = Spawn("UTBloodTrail",pos);
+		tracer.target = self;
+		if ( bloodcolor ) tracer.SetShade(bloodcolor);
+		else tracer.SetShade(gameinfo.defaultbloodcolor);
+		tracer.translation = bloodtranslation;
 		rollvel = FRandom[Blod](5,15)*RandomPick[Blod](-1,1);
 		anglevel = FRandom[Blod](5,15)*RandomPick[Blod](-1,1);
 		pitchvel = FRandom[Blod](5,15)*RandomPick[Blod](-1,1);
 	}
 	void A_HandleBounce()
 	{
-		if ( vel.length() > double.epsilon )
-			vel = (vel.unit()+(FRandom[Blod](-0.2,0.2),FRandom[Blod](-0.2,0.2),FRandom[Blod](-0.2,0.2))).unit()*vel.length();
+		double spd = vel.length();
+		if ( spd > double.epsilon )
+			vel = (vel.unit()+(FRandom[Blod](-0.2,0.2),FRandom[Blod](-0.2,0.2),FRandom[Blod](-0.2,0.2))).unit()*spd;
+		if ( BlockingFloor && (vel.xy.length() < 1) )
+		{
+			ClearBounce();
+			ExplodeMissile();
+		}
+		if ( spd < 10 )
+		{
+			if ( tracer ) tracer.Destroy();
+		}
+		else if ( spd > 20 ) vel *= 0.8;
 		A_PlaySound("misc/gibp");
 		double ang, pt;
 		for ( int i=0; i<6; i++ )