From dd603b2257d404c69e8d3389285a8e50b22d2943 Mon Sep 17 00:00:00 2001
From: Marisa Kirisame <marisa@sayachan.org>
Date: Sat, 23 Jan 2021 18:21:49 +0100
Subject: [PATCH] Biospark Carbine buff.

---
 language.version           |  2 +-
 zscript/swwm_sparkyboi.zsc | 26 ++++++++++++++------------
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/language.version b/language.version
index 9b5cc2655..4f47f2473 100644
--- a/language.version
+++ b/language.version
@@ -1,2 +1,2 @@
 [default]
-SWWM_MODVER="\chSWWM \czGZ\c- \cw0.9.11b-pre r787 \cu(Sat 23 Jan 18:21:36 CET 2021)";
+SWWM_MODVER="\chSWWM \czGZ\c- \cw0.9.11b-pre r788 \cu(Sat 23 Jan 18:21:49 CET 2021)";
diff --git a/zscript/swwm_sparkyboi.zsc b/zscript/swwm_sparkyboi.zsc
index 6d492bbde..663a869f2 100644
--- a/zscript/swwm_sparkyboi.zsc
+++ b/zscript/swwm_sparkyboi.zsc
@@ -281,7 +281,7 @@ Class BigBiospark : Actor
 	{
 		A_StopSound(CHAN_VOICE);
 		A_AlertMonsters(swwm_uncapalert?0:15000);
-		SWWMUtility.DoExplosion(self,350,90000,250,100,flags:DE_HOWL);
+		SWWMUtility.DoExplosion(self,200,90000,250,100,flags:DE_HOWL);
 		A_QuakeEx(9,9,9,30,0,1400,"",QF_RELATIVE|QF_SCALEDOWN,falloff:500,rollIntensity:1.5);
 		A_StartSound("biospark/bighit",CHAN_ITEM,attenuation:.4);
 		A_StartSound("biospark/bighit",CHAN_WEAPON,attenuation:.3);
@@ -541,7 +541,7 @@ Class BiosparkBall : Actor
 	{
 		A_StopSound(CHAN_VOICE);
 		A_AlertMonsters(swwm_uncapalert?0:5000);
-		SWWMUtility.DoExplosion(self,50,20000,150,80,flags:DE_HOWL);
+		SWWMUtility.DoExplosion(self,60,20000,150,80,flags:DE_HOWL);
 		A_QuakeEx(6,6,6,16,0,800,"",QF_RELATIVE|QF_SCALEDOWN,falloff:300,rollIntensity:.8);
 		A_StartSound("biospark/hit",CHAN_ITEM,attenuation:.8);
 		A_StartSound("biospark/hit",CHAN_WEAPON,attenuation:.6);
@@ -594,7 +594,7 @@ Class BiosparkBall : Actor
 		if ( special1 > 30 ) return;
 		double factor = (30-special1)/30.;
 		double invfct = 1.-factor;
-		SWWMUtility.DoExplosion(self,10*factor,0.,150*invfct,flags:DE_HOWL);
+		SWWMUtility.DoExplosion(self,15*factor,0.,150*invfct,flags:DE_HOWL);
 		SWWMUtility.DoExplosion(self,0,-5000*factor,300*invfct);
 		int numpt = int(Random[ExploS](16,32)*factor);
 		for ( int i=0; i<numpt; i++ )
@@ -705,7 +705,7 @@ Class BiosparkBeamImpact : Actor
 	{
 		Super.PostBeginPlay();
 		A_AlertMonsters(swwm_uncapalert?0:2000);
-		SWWMUtility.DoExplosion(self,40,20000,100,40,flags:DE_HOWL);
+		SWWMUtility.DoExplosion(self,50,20000,100,40,flags:DE_HOWL);
 		A_QuakeEx(3,3,3,12,0,800,"",QF_RELATIVE|QF_SCALEDOWN,falloff:300,rollIntensity:.4);
 		A_StartSound("biospark/beamhit",CHAN_ITEM,attenuation:1.1);
 		A_StartSound("biospark/beamhit",CHAN_WEAPON,attenuation:.8);
@@ -851,7 +851,7 @@ Class BiosparkComboImpactSub : Actor
 	{
 		Super.PostBeginPlay();
 		if ( !bAMBUSH ) return;
-		SWWMUtility.DoExplosion(self,30,10000,300,120,flags:DE_HOWL);
+		SWWMUtility.DoExplosion(self,40,10000,300,120,flags:DE_HOWL);
 	}
 	override void Tick()
 	{
@@ -907,7 +907,7 @@ Class BiosparkComboImpact : Actor
 	{
 		Super.PostBeginPlay();
 		A_AlertMonsters(swwm_uncapalert?0:6000);
-		SWWMUtility.DoExplosion(self,bAMBUSH?(200+Args[0]*25):150,bAMBUSH?120000:60000,bAMBUSH?500:300,bAMBUSH?350:150,DE_HOWL);
+		SWWMUtility.DoExplosion(self,bAMBUSH?(300+Args[0]*25):150,bAMBUSH?120000:60000,bAMBUSH?500:300,bAMBUSH?350:150,DE_HOWL);
 		A_QuakeEx(9,9,9,25,0,2000,"",QF_RELATIVE|QF_SCALEDOWN,falloff:600,rollIntensity:1.5);
 		A_StartSound("biospark/bighit",CHAN_ITEM,attenuation:.4);
 		A_StartSound("biospark/bighit",CHAN_WEAPON,attenuation:.3);
@@ -975,7 +975,7 @@ Class BiosparkComboImpact : Actor
 		if ( special1 > mx ) return;
 		double factor = (mx-special1)/mx;
 		double invfct = 1.-factor;
-		SWWMUtility.DoExplosion(self,(bAMBUSH?(80+Args[0]*10):50)*factor,0.,(bAMBUSH?600.:400.)*invfct,flags:DE_HOWL);
+		SWWMUtility.DoExplosion(self,(bAMBUSH?(80+Args[0]*15):60)*factor,0.,(bAMBUSH?600.:400.)*invfct,flags:DE_HOWL);
 		SWWMUtility.DoExplosion(self,0.,-12000*factor,(bAMBUSH?800:600)*invfct);
 		int numpt = int(Random[ExploS](8,16)*factor);
 		for ( int i=0; i<numpt; i++ )
@@ -1594,7 +1594,7 @@ Class BiosparkArc : Actor
 	{
 		Obituary "$O_SPARKSTER";
 		RenderStyle "Add";
-		DamageFunction 3;
+		DamageFunction 4;
 		ReactionTime 12;
 		Speed 16;
 		Radius .1;
@@ -1623,7 +1623,7 @@ Class BiosparkArcSmall : BiosparkArc
 	Default
 	{
 		ReactionTime 12;
-		DamageFunction 1;
+		DamageFunction 2;
 		Speed 8;
 	}
 	States
@@ -1642,7 +1642,7 @@ Class BiosparkArcBig : BiosparkArc
 	Default
 	{
 		ReactionTime 12;
-		DamageFunction 10;
+		DamageFunction 15;
 		Speed 64;
 	}
 	States
@@ -1810,7 +1810,7 @@ Class BiosparkCore : Actor
 		bNOGRAVITY = true;
 		A_SetRenderStyle(1.,STYLE_Add);
 		A_AlertMonsters(swwm_uncapalert?0:5000);
-		SWWMUtility.DoExplosion(self,50,120000,150,60);
+		SWWMUtility.DoExplosion(self,120,120000,150,60);
 		A_QuakeEx(6,6,6,16,0,800,"",QF_RELATIVE|QF_SCALEDOWN,falloff:300,rollIntensity:.8);
 		Scale *= FRandom[ExploS](0.8,1.1);
 		Scale.x *= RandomPick[ExploS](-1,1);
@@ -1860,7 +1860,7 @@ Class BiosparkCore : Actor
 		double factor = (30-special2)/30.;
 		double invfct = 1.-factor;
 		SWWMUtility.DoExplosion(self,0.,-5000*factor,300*invfct);
-		SWWMUtility.DoExplosion(self,30*factor,0.,150*invfct);
+		SWWMUtility.DoExplosion(self,40*factor,0.,150*invfct);
 		int numpt = int(Random[ExploS](16,32)*factor);
 		for ( int i=0; i<numpt; i++ )
 		{
@@ -2240,6 +2240,7 @@ Class Sparkster : SWWMWeapon
 		{
 			invoker.clipcount = 0;
 			A_StartSound("biospark/magout",CHAN_WEAPON,CHANF_OVERLAP);
+			A_StopSound(CHAN_WEAPONEXTRA);
 		}
 		XZW3 GHIJKL 2;
 		XZW3 M 2 A_DropMag();
@@ -2250,6 +2251,7 @@ Class Sparkster : SWWMWeapon
 				invoker.Ammo1.Amount = max(0,invoker.Ammo1.Amount-1);
 			invoker.clipcount = invoker.default.clipcount;
 			A_StartSound("biospark/magin",CHAN_WEAPON,CHANF_OVERLAP);
+			A_StartSound("biospark/idle",CHAN_WEAPONEXTRA,CHANF_LOOP,.4,4.);
 		}
 		XZW3 UVW 2;
 		XZW3 X 2 A_StartSound("biospark/meleeend",CHAN_WEAPON,CHANF_OVERLAP);