From 27017feed2bf780dbb6533fed444f249ab60b8c5 Mon Sep 17 00:00:00 2001
From: Marisa Kirisame <marisa@sayachan.org>
Date: Fri, 17 Aug 2018 20:59:27 +0200
Subject: [PATCH] Fix typo in biorifle blast momentum value. Minor corrections.

---
 zscript/biorifle.zsc   | 3 +--
 zscript/eightball.zsc  | 1 -
 zscript/flakcannon.zsc | 3 ---
 zscript/ripper.zsc     | 2 +-
 zscript/shockrifle.zsc | 2 --
 5 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/zscript/biorifle.zsc b/zscript/biorifle.zsc
index 9453c80..caff9cd 100644
--- a/zscript/biorifle.zsc
+++ b/zscript/biorifle.zsc
@@ -411,7 +411,7 @@ Class BioGel : Actor
 		s.args[3] = int(s.args[3]*Scale.x);
 		invoker.deadtimer = -2;
 		if ( invoker.atline ) invoker.atline.RemoteActivate(target,invoker.atside,SPAC_Impact,pos);
-		UTMainHandler.DoBlast(self,Min(150,int(Scale.x*25)),200000);
+		UTMainHandler.DoBlast(self,Min(150,int(Scale.x*25)),20000*Scale.x);
 		A_Explode(int(Random[GES](18,22)*max(1,(Scale.x-1)**2)),Min(150,int(Scale.x*25)));
 		A_PlaySound("ges/explode",CHAN_VOICE);
 		int numpt = Min(300,int(Scale.x*30))+Random[GES](-10,10);
@@ -438,7 +438,6 @@ Class BioGel : Actor
 	{
 		Obituary "%o drank a glass of %k's dripping green load.";
 		DamageType 'Slime';
-		Damage 0;
 		RenderStyle "Add";
 		Radius 3;
 		Height 3;
diff --git a/zscript/eightball.zsc b/zscript/eightball.zsc
index b0f3ce1..45a7753 100644
--- a/zscript/eightball.zsc
+++ b/zscript/eightball.zsc
@@ -105,7 +105,6 @@ Class UTRocket : Actor
 	Default
 	{
 		Obituary "%o was smacked down by %k's Rocket Launcher.";
-		Damage 0;
 		DamageType 'RocketDeath';
 		Radius 2;
 		Height 2;
diff --git a/zscript/flakcannon.zsc b/zscript/flakcannon.zsc
index d4fc8a8..27fe626 100644
--- a/zscript/flakcannon.zsc
+++ b/zscript/flakcannon.zsc
@@ -133,7 +133,6 @@ Class FlakChunk : Actor
 	double rollvel, pitchvel, yawvel;
 	double lifetime, lifespeed;
 	int lifetics;
-	bool hasbounced;
 	Default
 	{
 		Obituary "%o was ripped to shreds by %k's Flak Cannon.";
@@ -210,7 +209,6 @@ Class FlakChunk : Actor
 	}
 	action void A_HandleBounce()
 	{
-		invoker.hasbounced = true;
 		A_SprayDecal("WallCrack",-8);
 		int numpt = Random[Flak](2,3);
 		if ( frame < 10 )
@@ -359,7 +357,6 @@ Class FlakSlug : Actor
 	{
 		Obituary "%o was ripped to shreds by %k's Flak Cannon.";
 		DamageType 'FlakDeath';
-		Damage 0;
 		Radius 2;
 		Height 2;
 		Speed 40;
diff --git a/zscript/ripper.zsc b/zscript/ripper.zsc
index c6285fe..28aaf4c 100644
--- a/zscript/ripper.zsc
+++ b/zscript/ripper.zsc
@@ -185,7 +185,7 @@ Class Razor2Alt : Razor2
 {
 	Default
 	{
-		Damage 0;
+		DamageFunction 0;
 		DamageType 'RipperAltDealth';
 		BounceType "None";
 		-CANBOUNCEWATER;
diff --git a/zscript/shockrifle.zsc b/zscript/shockrifle.zsc
index 10c2d82..0aea2e4 100644
--- a/zscript/shockrifle.zsc
+++ b/zscript/shockrifle.zsc
@@ -854,7 +854,6 @@ Class ShockBall : Actor
 		Obituary "%k inflicted mortal damage upon %o with the Shock Rifle";
 		RenderStyle "Add";
 		DamageType 'jolted';
-		Damage 0;
 		Radius 2;
 		Height 2;
 		Scale 0.4;
@@ -920,7 +919,6 @@ Class SuperShockBall : Actor
 		Obituary "%k electrified %o with the Enhanced Shock Rifle.";
 		RenderStyle "Add";
 		DamageType 'joltedX';
-		Damage 0;
 		Radius 2;
 		Height 2;
 		Scale 0.5;