From cfdbfaa2bf72ffb3c4120cc28732c7e40dcffbb2 Mon Sep 17 00:00:00 2001 From: Marisa Kirisame Date: Thu, 3 Oct 2019 01:27:27 +0200 Subject: [PATCH] =?UTF-8?q?Beta=205=20Hotfix=201:=20=20-=20Increased=20acc?= =?UTF-8?q?uracy=20and=20damage=20of=20Betamag=20(10=20=E2=86=92=2014).=20?= =?UTF-8?q?=20-=20Slightly=20increased=20per-pellet=20damage=20of=20Quadsh?= =?UTF-8?q?ot=20(11=20=E2=86=92=2012).=20=20-=20Fixed=20Flamethrower=20alt?= =?UTF-8?q?=20refire=20not=20restarting=20the=20charge=20process,=20making?= =?UTF-8?q?=20it=20get=20stuck.=20=20-=20[flak=5Fm]=20I=20seriously=20hope?= =?UTF-8?q?=20this=20is=20the=20last=20time=20I=20need=20to=20add=20even?= =?UTF-8?q?=20more=20safeguards=20to=20the=20FlakAccumulator=20class.=20It?= =?UTF-8?q?=20should=20be=20airtight=20now=20and=20never=20crash.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- zscript/betamag.zsc | 6 +++--- zscript/napalm.zsc | 2 ++ zscript/quadshot.zsc | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/zscript/betamag.zsc b/zscript/betamag.zsc index 30208d4..f881a90 100644 --- a/zscript/betamag.zsc +++ b/zscript/betamag.zsc @@ -50,7 +50,7 @@ Class Betamag : UnrealWeapon { Weapon weap = Weapon(invoker); if ( !weap || !player ) return; - if ( invoker.altaccuracy < 0.1 ) invoker.altaccuracy += 0.015; + if ( invoker.altaccuracy < 0.05 ) invoker.altaccuracy += 0.01; if ( slave ) { if ( weap.Ammo1.Amount <= 0 ) @@ -172,14 +172,14 @@ Class Betamag : UnrealWeapon int ydir = slave?-1:1; if ( alt ) origin = level.Vec3Offset(origin,-z*2.5+ydir*y*1.5); else origin = level.Vec3Offset(origin,-z*1.5+ydir*y*2); - double a = FRandom[Betamag](0,360), s = FRandom[Betamag](0,alt?invoker.altaccuracy:0.01); + double a = FRandom[Betamag](0,360), s = FRandom[Betamag](0,alt?invoker.altaccuracy:0.); [x2, y2, z2] = dt_CoordUtil.GetAxes(BulletSlope(),angle,roll); Vector3 dir = (x2+y2*cos(a)*s+z2*sin(a)*s).unit(); FLineTraceData d; LineTrace(atan2(dir.y,dir.x),10000,asin(-dir.z),TRF_ABSPOSITION,origin.z,origin.x,origin.y,d); if ( d.HitType == TRACE_HitActor ) { - int dmg = 10; + int dmg = 14; dmg = d.HitActor.DamageMobj(invoker,self,dmg,'shot',DMG_USEANGLE|DMG_THRUSTLESS,atan2(d.HitDir.y,d.HitDir.x)); double mm = 3000; if ( FRandom[Betamag](0,1) < 0.2 ) mm *= 5; diff --git a/zscript/napalm.zsc b/zscript/napalm.zsc index ac41789..92a9737 100644 --- a/zscript/napalm.zsc +++ b/zscript/napalm.zsc @@ -1025,6 +1025,8 @@ Class UFlamethrower : UnrealWeapon GotoAltHold: FLMA Y 0 { + invoker.bCharging = true; + A_BeginCharge(); player.SetPSprite(-2,ResolveState("FlameAltHold")); } Goto AltHold; diff --git a/zscript/quadshot.zsc b/zscript/quadshot.zsc index c26c572..c603c42 100644 --- a/zscript/quadshot.zsc +++ b/zscript/quadshot.zsc @@ -105,7 +105,7 @@ Class QuadShot : UnrealWeapon { for ( int i=0; i