From 36a3598826bc685c776cf1e33cc0e95dcb2345fd Mon Sep 17 00:00:00 2001 From: Marisa Kirisame Date: Sun, 12 Aug 2018 01:49:00 +0200 Subject: [PATCH] Changed Pulse Beam size to be the same as in UT99 (10 81-unit segments). Tweaked Starter Bolt textures to look better in first person. Tweaked Pulse Beam model UVs to reduce seams. Switched Chainsaw alt-fire to damage in an arc. Rebalanced damages of Chainsaw, Enforcer, Biorifle, Pulsegun, Minigun, Flak Cannon. Adjusted Redeemer damage formula. Added view flash to Redeemer shockwave. Reduced Enforcer fire speed. Reduced delay of Minigun altfire. Should happen after exactly one cycle. Increased knockback of Impact Hammer. --- modeldef.pulse | 10 +++--- models/PBolt_d.3d | Bin 176 -> 176 bytes models/SBolt_a.3d | Bin 0 -> 68 bytes models/SBolt_d.3d | Bin 0 -> 176 bytes models/sbolt0.png | Bin 3870 -> 3990 bytes models/sbolt1.png | Bin 3790 -> 4249 bytes models/sbolt2.png | Bin 4029 -> 4493 bytes models/sbolt3.png | Bin 3873 -> 4259 bytes models/sbolt4.png | Bin 4086 -> 4618 bytes zscript/biorifle.zsc | 10 +++--- zscript/chainsaw.zsc | 13 +++++--- zscript/enforcer.zsc | 10 ++++-- zscript/flakcannon.zsc | 18 +++++------ zscript/impacthammer.zsc | 4 +-- zscript/minigun.zsc | 63 ++---------------------------------- zscript/pulsegun.zsc | 22 ++++++------- zscript/warheadlauncher.zsc | 3 +- 17 files changed, 52 insertions(+), 101 deletions(-) create mode 100644 models/SBolt_a.3d create mode 100644 models/SBolt_d.3d diff --git a/modeldef.pulse b/modeldef.pulse index d8c0ff0..6008490 100644 --- a/modeldef.pulse +++ b/modeldef.pulse @@ -13,8 +13,8 @@ Model "PulseBolt" { Path "models" Model 0 "PBolt_d.3d" - Offset 20.25 0 0 - Scale 0.2025 0.10125 0.1215 + Offset 40.5 0 0 + Scale 0.405 0.2025 0.243 AngleOffset 90 DONTCULLBACKFACES USEACTORPITCH @@ -35,9 +35,9 @@ Model "PulseBolt" Model "StarterBolt" { Path "models" - Model 0 "PBolt_d.3d" - Offset 20.25 0 0 - Scale 0.2025 0.10125 0.1215 + Model 0 "SBolt_d.3d" + Offset 40.5 0 0 + Scale 0.405 0.2025 0.243 AngleOffset 90 DONTCULLBACKFACES USEACTORPITCH diff --git a/models/PBolt_d.3d b/models/PBolt_d.3d index b63b0d17a053001eef7ce84c363f55459bcd2354..f3a60f412fa72d8510b2b8a8130291cdb9e9f530 100644 GIT binary patch literal 176 zcmd;J5MUq$urshQu!1!F|IhIMKZwE1z{J47@E?pA7?>Ft7#KmqPp?I7_|TZ literal 176 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 XU-?Ipx!V~S7#KWV{an^LB{Ts5p<=dR diff --git a/models/sbolt1.png b/models/sbolt1.png index cfd622f3fe43b86f138dd3ba5139c1cc515c424e..4799655055b5a26de346452e73dd973614c210bc 100644 GIT binary patch delta 3472 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 O!PC``)n%PiLK6U$oOR9s delta 3008 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 A00000 diff --git a/models/sbolt3.png b/models/sbolt3.png index c6cec483cae6be5945b5ec38de0ac8fb502a3777..c028198056fdb9b4da6dbb50d2cb495e614df911 100644 GIT binary patch delta 3482 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 Z?Yh}8l|ORLQw9bG22WQ%mvv4FO#lEbcg+9* delta 3091 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�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 delta 3306 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 diff --git a/zscript/biorifle.zsc b/zscript/biorifle.zsc index 17a545c..641b433 100644 --- a/zscript/biorifle.zsc +++ b/zscript/biorifle.zsc @@ -409,7 +409,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); - A_Explode(int(Random[GES](20,40)*Scale.x),Min(150,int(Scale.x*25))); + A_Explode(int(Random[GES](10,15)*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); for ( int i=0; i= (d.HitActor.pos.z+d.HitActor.height*0.8) ) dmg = d.HitActor.DamageMobj(invoker,self,dmg*2,'Decapitated',DMG_USEANGLE,atan2(d.HitDir.y,d.HitDir.x)); else dmg = d.HitActor.DamageMobj(invoker,self,dmg,'slashed',DMG_USEANGLE,atan2(d.HitDir.y,d.HitDir.x)); @@ -130,6 +131,7 @@ Class UTChainsaw : UTWeapon p.pitch = asin(-d.HitDir.z); if ( d.HitType == TRACE_HitWall ) d.HitLine.RemoteActivate(self,d.LineSide,SPAC_Impact,d.HitLocation-d.HitDir*4); } + invoker.sawcnt += 0.2; } override void DetachFromOwner() { @@ -139,6 +141,7 @@ Class UTChainsaw : UTWeapon } action void A_Vibrate( bool bAlt = false ) { + invoker.sawcnt = 0; A_AlertMonsters(); if ( bAlt ) A_QuakeEx(1,1,1,3,0,1,"",QF_RELATIVE,rollIntensity:0.4); else A_QuakeEx(0,0,0,2,0,1,"",QF_RELATIVE,rollIntensity:0.2); @@ -239,9 +242,9 @@ Class UTChainsaw : UTWeapon Goto Idle; AltFire: CSWA A 0 A_PlaySound("chainsaw/fire",CHAN_6); - CSWA ABCDEFG 2 A_Vibrate(true); - CSWA H 2 A_SawSwipe(); - CSWA IJK 2 A_Vibrate(true); + CSWA ABCDE 2 A_Vibrate(true); + CSWA FGHIJ 2 A_SawSwipe(); + CSWA K 2 A_Vibrate(true); CSWA K 0 A_PlaySound("chainsaw/idle",CHAN_6,looping:true); Goto Ready; Deselect: diff --git a/zscript/enforcer.zsc b/zscript/enforcer.zsc index 3a81d26..938889e 100644 --- a/zscript/enforcer.zsc +++ b/zscript/enforcer.zsc @@ -312,7 +312,7 @@ Class Enforcer : UTWeapon replaces Pistol 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 = Random[Enforcer](15,20); + int dmg = Random[Enforcer](12,17); dmg = d.HitActor.DamageMobj(invoker,self,dmg,'shot',DMG_USEANGLE,atan2(d.HitDir.y,d.HitDir.x)); if ( d.HitActor.bNOBLOOD ) { @@ -458,18 +458,20 @@ Class Enforcer : UTWeapon replaces Pistol Hold: ENFF A 0 A_EnforcerFire(); ENFF ABCDEFGHIJ 1; + ENFF J 5; ENFF J 0 A_EnforcerRefire(); ENFF J 2; ENFI A 0; Goto Idle; LeftFire: 2NFI A 0 A_Overlay(-9998,"Null"); - 2NFI A 1 A_SetTics(Random[Enforcer](5,6)); + 2NFI A 8; 2NFI A 0 A_EnforcerRefire(1,true); Goto LeftIdle; LeftHold: 2NFF A 0 A_EnforcerFire(false,true); 2NFF ABCDEFGHIJ 1; + 2NFF J 5; 2NFF J 0 A_EnforcerRefire("LeftHold",true); 2NFF J 2; 2NFI A 0; @@ -480,18 +482,20 @@ Class Enforcer : UTWeapon replaces Pistol AltHold: ENFA G 0 A_EnforcerFire(true); ENFA GHIJKLMN 1; + ENFA N 3; ENFA G 0 A_EnforcerRefire(); ENFA OPQRSTU 1; Goto Idle; LeftAltFire: 2NFI A 0 A_Overlay(-9998,"Null"); - 2NFI A 1 A_SetTics(Random[Enforcer](5,6)); + 2NFI A 7; 2NFI A 0 A_EnforcerRefire(1,true); Goto LeftIdle; 2NFA ABCDEF 1; LeftAltHold: 2NFA G 0 A_EnforcerFire(true,true); 2NFA GHIJKLMN 1; + 2NFA N 3; 2NFA G 0 A_EnforcerRefire("LeftAltHold",true); 2NFA OPQRSTU 1; Goto LeftIdle; diff --git a/zscript/flakcannon.zsc b/zscript/flakcannon.zsc index a5fb33e..bef6d6e 100644 --- a/zscript/flakcannon.zsc +++ b/zscript/flakcannon.zsc @@ -140,7 +140,7 @@ Class FlakChunk : Actor Radius 2; Height 2; Speed 50; - DamageFunction Random[Flak](25,35); + DamageFunction int(Random[Flak](15,20)*max(0.1,1.0-lifetime*4.1)); DamageType 'Shredded'; BounceType "Doom"; BounceFactor 0.8; @@ -189,7 +189,7 @@ Class FlakChunk : Actor if ( frame < 11 ) frame++; } lifetime += lifespeed; - if ( (waterlevel <= 0) && (frame < 10) ) + if ( (waterlevel <= 0) && (frame < 10) && !(lifetics%2) ) { let s = Spawn("UTSmoke",pos); s.vel = (FRandom[Flak](-0.1,0.1),FRandom[Flak](-0.1,0.1),FRandom[Flak](-0.1,0.1)); @@ -212,7 +212,7 @@ Class FlakChunk : Actor { invoker.hasbounced = true; A_SprayDecal("WallCrack",-8); - int numpt = Random[Flak](3,6); + int numpt = Random[Flak](2,3); if ( frame < 10 ) { for ( int i=0; i 0.16 ) + if ( accdamage > 0.17 ) { - t.Results.HitActor.DamageMobj(self,target,int(Random[Pulse](70,80)*accdamage),'zapped',DMG_USEANGLE,atan2(x.y,x.x)); + t.Results.HitActor.DamageMobj(self,target,int(Random[Pulse](70,90)*accdamage),'zapped',DMG_USEANGLE,atan2(x.y,x.x)); accdamage = 0; } } @@ -450,7 +450,7 @@ Class PulseBolt : Actor accdamage = 0; damagedactor = null; } - if ( position >= 19 ) + if ( position >= 9 ) { int numpt = Random[Pulse](5,10)*!Random[Pulse](0,5); for ( int i=0; i olddmgradius) || (dir dot a.vel < 0) ) + if ( (dist > olddmgradius-a.radius) || (dir dot a.vel <= 0) ) { if ( !a.bDONTTHRUST ) a.vel += dir*((moscale+20)/a.mass); a.DamageMobj(self,target,int(moscale),'RedeemerDeath',DMG_THRUSTLESS); } + if ( a.player ) UTMainHandler.DoFlash(a,Color(32,255,255,255),80); } olddmgradius = dmgradius; }