From 68ea253b5ec90590bea4f7f2bb28508c5386bd97 Mon Sep 17 00:00:00 2001 From: Marisa the Magician Date: Thu, 2 Jun 2022 00:48:17 +0200 Subject: [PATCH] Add QF_3D to every single A_QuakeEx call. --- language.version | 4 +-- zscript/items/swwm_funstuff.zsc | 2 +- zscript/items/swwm_powerups.zsc | 26 +++++++++---------- zscript/swwm_gesture_fx.zsc | 2 +- zscript/swwm_monsters.zsc | 6 ++--- zscript/swwm_player.zsc | 20 +++++++------- zscript/swwm_player_fx.zsc | 2 +- zscript/weapons/swwm_baseweapon_fx.zsc | 4 +-- zscript/weapons/swwm_baseweapon_melee.zsc | 8 +++--- zscript/weapons/swwm_blazeit.zsc | 2 +- zscript/weapons/swwm_blazeit_fx.zsc | 10 +++---- zscript/weapons/swwm_cbt.zsc | 2 +- zscript/weapons/swwm_cbt_fx.zsc | 2 +- zscript/weapons/swwm_danmaku.zsc | 4 +-- zscript/weapons/swwm_danmaku_fx.zsc | 2 +- zscript/weapons/swwm_deathlydeathcannon.zsc | 2 +- .../weapons/swwm_deathlydeathcannon_fx.zsc | 10 +++---- zscript/weapons/swwm_deepdarkimpact.zsc | 4 +-- zscript/weapons/swwm_deepdarkimpact_fx.zsc | 2 +- zscript/weapons/swwm_shot.zsc | 2 +- zscript/weapons/swwm_shot_fx.zsc | 12 ++++----- zscript/weapons/swwm_sparkyboi.zsc | 6 ++--- zscript/weapons/swwm_sparkyboi_fx.zsc | 14 +++++----- zscript/weapons/swwm_splode.zsc | 4 +-- zscript/weapons/swwm_splode_fx.zsc | 4 +-- zscript/weapons/swwm_tastytreat.zsc | 2 +- zscript/weapons/swwm_tastytreat_fx.zsc | 6 ++--- zscript/weapons/swwm_thiccboolet.zsc | 2 +- zscript/weapons/swwm_thiccboolet_fx.zsc | 4 +-- 29 files changed, 85 insertions(+), 85 deletions(-) diff --git a/language.version b/language.version index 954a0937f..56de1f2d3 100644 --- a/language.version +++ b/language.version @@ -1,3 +1,3 @@ [default] -SWWM_MODVER="\cyDEMOLITIONIST \cw1.2.21 \cu(Tue 7 Jun 12:01:07 CEST 2022)\c-"; -SWWM_SHORTVER="\cw1.2.21 \cu(2022-06-07 12:01:07)\c-"; +SWWM_MODVER="\cyDEMOLITIONIST \cw1.2.21 r1 \cu(Tue 7 Jun 12:01:51 CEST 2022)\c-"; +SWWM_SHORTVER="\cw1.2.21 r1 \cu(2022-06-07 12:01:51)\c-"; diff --git a/zscript/items/swwm_funstuff.zsc b/zscript/items/swwm_funstuff.zsc index ca8bc39ee..21092e677 100644 --- a/zscript/items/swwm_funstuff.zsc +++ b/zscript/items/swwm_funstuff.zsc @@ -1295,7 +1295,7 @@ Class Chancebox : Actor XZW2 A 1 { A_SetSize(default.radius*scale.x,2.5*scale.y); - A_QuakeEx(2,2,2,9,0,500,"",QF_RELATIVE|QF_SCALEDOWN,falloff:200,rollIntensity:.2); + A_QuakeEx(2,2,2,9,0,500,"",QF_RELATIVE|QF_SCALEDOWN|QF_3D,falloff:200,rollIntensity:.2); A_StartSound("chancebox/explode",CHAN_VOICE,pitch:1./scale.x); angle = specialf1; pitch = roll = 0; diff --git a/zscript/items/swwm_powerups.zsc b/zscript/items/swwm_powerups.zsc index a21281108..e52c2bc61 100644 --- a/zscript/items/swwm_powerups.zsc +++ b/zscript/items/swwm_powerups.zsc @@ -40,7 +40,7 @@ Class GrilledCheeseSandwich : Inventory { SWWMUtility.AchievementProgressInc("gcsandwich",1,Owner.player); SWWMHandler.DoFlash(Owner,Color(64,255,255,64),10); - Owner.A_QuakeEx(9,9,9,3,0,1,"",QF_RELATIVE|QF_SCALEDOWN,rollIntensity:1.); + Owner.A_QuakeEx(9,9,9,3,0,1,"",QF_RELATIVE|QF_SCALEDOWN|QF_3D,rollIntensity:1.); Owner.GiveBody(1000,1000); SWWMScoreObj.Spawn(1000,Owner.Vec3Offset(FRandom[ScoreBits](-8,8),FRandom[ScoreBits](-8,8),FRandom[ScoreBits](-8,8)+Owner.Height/2),ST_Health); if ( Owner is 'Demolitionist' ) @@ -1089,7 +1089,7 @@ Class RagekitPower : Powerup lastrage = SWWMHandler.AddOneliner("ragekit",2,20)+40; Owner.A_AlertMonsters(swwm_uncapalert?0:5000); SWWMHandler.DoFlash(Owner,Color(64,255,0,0),30); - Owner.A_QuakeEx(8,8,8,20,0,1,"",QF_RELATIVE|QF_SCALEDOWN,rollIntensity:1.); + Owner.A_QuakeEx(8,8,8,20,0,1,"",QF_RELATIVE|QF_SCALEDOWN|QF_3D,rollIntensity:1.); lasteffect = int.min; lastpulse = max(lastpulse,gametic+35); Demolitionist(Owner).lastbump *= .95; @@ -1113,7 +1113,7 @@ Class RagekitPower : Powerup Owner.A_AlertMonsters(swwm_uncapalert?0:2000); if ( (Owner.player == players[consoleplayer]) && (gametic > lastrage) && (swwm_mutevoice < 2) ) lastrage = SWWMHandler.AddOneliner("ragekit",2,5)+20; - Owner.A_QuakeEx(2,2,2,Random[Rage](1,2),0,1,"",QF_RELATIVE|QF_SCALEDOWN,rollIntensity:.5); + Owner.A_QuakeEx(2,2,2,Random[Rage](1,2),0,1,"",QF_RELATIVE|QF_SCALEDOWN|QF_3D,rollIntensity:.5); lastpulse = max(lastpulse,gametic+10); Demolitionist(Owner).lastbump *= .995; } @@ -1132,7 +1132,7 @@ Class RagekitPower : Powerup if ( !Owner ) return; Owner.A_StartSound("powerup/ragekitend",CHAN_ITEMEXTRA,CHANF_OVERLAP); SWWMHandler.DoFlash(Owner,Color(128,255,0,0),30); - Owner.A_QuakeEx(4,4,4,20,0,1,"",QF_RELATIVE|QF_SCALEDOWN,rollIntensity:1.); + Owner.A_QuakeEx(4,4,4,20,0,1,"",QF_RELATIVE|QF_SCALEDOWN|QF_3D,rollIntensity:1.); Owner.A_AlertMonsters(2000); Demolitionist(Owner).lastbump *= .9; if ( (EffectTics <= 0) && Owner && Owner.CheckLocalView() ) Console.Printf(StringTable.Localize("$D_RAGEKIT")); @@ -1145,7 +1145,7 @@ Class RagekitPower : Powerup SWWMScoreObj.Spawn(5,Owner.Vec3Offset(FRandom[ScoreBits](-8,8),FRandom[ScoreBits](-8,8),FRandom[ScoreBits](-8,8)+Owner.Height/2),ST_Health); Owner.A_AlertMonsters(swwm_uncapalert?0:5000); SWWMHandler.DoFlash(Owner,Color(64,255,0,0),10); - Owner.A_QuakeEx(8,8,8,Random[Rage](3,8),0,1,"",QF_RELATIVE|QF_SCALEDOWN,rollIntensity:1.); + Owner.A_QuakeEx(8,8,8,Random[Rage](3,8),0,1,"",QF_RELATIVE|QF_SCALEDOWN|QF_3D,rollIntensity:1.); if ( (Owner.player == players[consoleplayer]) && (gametic > lastrage) && (swwm_mutevoice < 2) ) lastrage = SWWMHandler.AddOneliner("ragekit",2,5)+40; Owner.A_StartSound("powerup/ragekithit",CHAN_POWERUP,CHANF_OVERLAP); @@ -1191,7 +1191,7 @@ Class Ragekit : Inventory if ( !(Owner is 'Demolitionist') ) { SWWMHandler.DoFlash(Owner,Color(64,255,0,0),30); - Owner.A_QuakeEx(8,8,8,20,0,1,"",QF_RELATIVE|QF_SCALEDOWN,rollIntensity:1.); + Owner.A_QuakeEx(8,8,8,20,0,1,"",QF_RELATIVE|QF_SCALEDOWN|QF_3D,rollIntensity:1.); return true; } let r = RagekitPower(Owner.FindInventory("RagekitPower")); @@ -1199,7 +1199,7 @@ Class Ragekit : Inventory { r.EffectTics += r.default.EffectTics; SWWMHandler.DoFlash(Owner,Color(64,255,0,0),30); - Owner.A_QuakeEx(8,8,8,20,0,1,"",QF_RELATIVE|QF_SCALEDOWN,rollIntensity:1.); + Owner.A_QuakeEx(8,8,8,20,0,1,"",QF_RELATIVE|QF_SCALEDOWN|QF_3D,rollIntensity:1.); r.lastpulse = max(r.lastpulse,gametic+35); Demolitionist(Owner).lastbump *= .95; } @@ -2690,7 +2690,7 @@ Class MykradvoBurst : Actor { nstep = clamp(targets.Size()/10,1,5); A_AlertMonsters(swwm_uncapalert?0:8000); - A_QuakeEx(9,9,9,80,0,3000,"",QF_RELATIVE|QF_SCALEDOWN,falloff:1000,rollintensity:2.); + A_QuakeEx(9,9,9,80,0,3000,"",QF_RELATIVE|QF_SCALEDOWN|QF_3D,falloff:1000,rollintensity:2.); A_StartSound("powerup/mykradvo",CHAN_BODY,CHANF_DEFAULT,1.,.25); A_StartSound("powerup/mykradvo",CHAN_VOICE,CHANF_DEFAULT,1.,.25); FlashPlayer(100,1500); @@ -2874,7 +2874,7 @@ Class Mykradvo : Inventory } if ( Owner is 'Demolitionist' ) Demolitionist(Owner).lastbump *= 0.98; - Owner.A_QuakeEx(1,1,1,4,0,8,"",QF_RELATIVE|QF_SCALEDOWN); + Owner.A_QuakeEx(1,1,1,4,0,8,"",QF_RELATIVE|QF_SCALEDOWN|QF_3D); // don't consume on failure Amount++; return true; @@ -3284,7 +3284,7 @@ Class AngeryPower : Powerup if ( !Owner ) return; Owner.A_AlertMonsters(swwm_uncapalert?0:5000); SWWMHandler.DoFlash(Owner,Color(64,224,0,255),30); - Owner.A_QuakeEx(8,8,8,20,0,1,"",QF_RELATIVE|QF_SCALEDOWN,rollIntensity:1.); + Owner.A_QuakeEx(8,8,8,20,0,1,"",QF_RELATIVE|QF_SCALEDOWN|QF_3D,rollIntensity:1.); lasteffect = int.min; lastpulse = max(lastpulse,gametic+35); if ( Owner is 'Demolitionist' ) @@ -3308,7 +3308,7 @@ Class AngeryPower : Powerup if ( !Owner ) return; Owner.A_StartSound("powerup/devastationend",CHAN_ITEMEXTRA,CHANF_OVERLAP); SWWMHandler.DoFlash(Owner,Color(128,224,0,255),30); - Owner.A_QuakeEx(4,4,4,20,0,1,"",QF_RELATIVE|QF_SCALEDOWN,rollIntensity:1.); + Owner.A_QuakeEx(4,4,4,20,0,1,"",QF_RELATIVE|QF_SCALEDOWN|QF_3D,rollIntensity:1.); Owner.A_AlertMonsters(2000); if ( Owner is 'Demolitionist' ) Demolitionist(Owner).lastbump *= .9; @@ -3320,7 +3320,7 @@ Class AngeryPower : Powerup if ( level.maptime <= lasteffect+5 ) return; Owner.A_AlertMonsters(swwm_uncapalert?0:5000); SWWMHandler.DoFlash(Owner,Color(64,224,0,255),10); - Owner.A_QuakeEx(8,8,8,Random[Rage](3,8),0,1,"",QF_RELATIVE|QF_SCALEDOWN,rollIntensity:1.); + Owner.A_QuakeEx(8,8,8,Random[Rage](3,8),0,1,"",QF_RELATIVE|QF_SCALEDOWN|QF_3D,rollIntensity:1.); Owner.A_StartSound("powerup/devastationhit",CHAN_POWERUP,CHANF_OVERLAP); lasteffect = level.maptime; lastpulse = max(lastpulse,gametic+35); @@ -3356,7 +3356,7 @@ Class AngerySigil : Inventory { r.EffectTics += r.default.EffectTics; SWWMHandler.DoFlash(Owner,Color(64,224,0,255),30); - Owner.A_QuakeEx(8,8,8,20,0,1,"",QF_RELATIVE|QF_SCALEDOWN,rollIntensity:1.); + Owner.A_QuakeEx(8,8,8,20,0,1,"",QF_RELATIVE|QF_SCALEDOWN|QF_3D,rollIntensity:1.); if ( Owner is 'Demolitionist' ) Demolitionist(Owner).lastbump *= .95; } diff --git a/zscript/swwm_gesture_fx.zsc b/zscript/swwm_gesture_fx.zsc index afade1936..02c4a1f8c 100644 --- a/zscript/swwm_gesture_fx.zsc +++ b/zscript/swwm_gesture_fx.zsc @@ -462,7 +462,7 @@ Class LoveHeart : Actor A_AttachLight('LOVELIGHT',DynamicLight.PointLight,0,0,0); //A_RemoveLight('LOVELIGHT'); CheckSplash(40); - A_QuakeEx(2,2,2,8,0,300,"",QF_RELATIVE|QF_SCALEDOWN); + A_QuakeEx(2,2,2,8,0,300,"",QF_RELATIVE|QF_SCALEDOWN|QF_3D); A_SprayDecal("HeartyGlow",64); A_StartSound("bestsound",CHAN_VOICE); Spawn("LoveHeartBurstLight",pos); diff --git a/zscript/swwm_monsters.zsc b/zscript/swwm_monsters.zsc index e248d602a..193882e09 100644 --- a/zscript/swwm_monsters.zsc +++ b/zscript/swwm_monsters.zsc @@ -100,7 +100,7 @@ Class SWWMBossBrainExpl : Actor { void A_Ignite() { - A_QuakeEx(3,3,3,20,0,400,"",QF_RELATIVE|QF_SCALEDOWN,falloff:300,rollintensity:2.); + A_QuakeEx(3,3,3,20,0,400,"",QF_RELATIVE|QF_SCALEDOWN|QF_3D,falloff:300,rollintensity:2.); A_StartSound("explodium/hit",CHAN_VOICE,CHANF_DEFAULT,.4,.5); Scale *= FRandom[ExploS](0.8,1.1); Scale.x *= RandomPick[ExploS](-1,1); @@ -300,7 +300,7 @@ Class SWWMBossBrain : BossBrain MBRN A 10 { A_StartSound("brain/pain",CHAN_VOICE,attenuation:ATTN_NONE); - A_QuakeEx(3,3,3,15,0,65535,"",QF_RELATIVE|QF_SCALEDOWN,rollIntensity:.3); + A_QuakeEx(3,3,3,15,0,65535,"",QF_RELATIVE|QF_SCALEDOWN|QF_3D,rollIntensity:.3); if ( !eyeless ) SpawnBrainExpl(false); Spawn("SWWMBossBrainPain",pos); } @@ -309,7 +309,7 @@ Class SWWMBossBrain : BossBrain MBRN A 120 { A_StartSound("brain/death",CHAN_VOICE,attenuation:ATTN_NONE); - A_QuakeEx(9,9,9,120,0,65535,"",QF_RELATIVE|QF_SCALEDOWN,rollIntensity:1.); + A_QuakeEx(9,9,9,120,0,65535,"",QF_RELATIVE|QF_SCALEDOWN|QF_3D,rollIntensity:1.); if ( !eyeless ) { SpawnBrainExpl(true); diff --git a/zscript/swwm_player.zsc b/zscript/swwm_player.zsc index 5dcc2e294..120c4afa5 100644 --- a/zscript/swwm_player.zsc +++ b/zscript/swwm_player.zsc @@ -1354,7 +1354,7 @@ Class Demolitionist : PlayerPawn } if ( !CheckSight(a,SF_IGNOREVISIBILITY|SF_IGNOREWATERBOUNDARY) ) continue; // large monsters will stop the player (unless hit from above if we're going at ground pound speed) - A_QuakeEx(4,4,4,10,0,128,"",QF_RELATIVE|QF_SCALEDOWN); + A_QuakeEx(4,4,4,10,0,128,"",QF_RELATIVE|QF_SCALEDOWN|QF_3D); A_AlertMonsters(swwm_uncapalert?0:800); A_StartSound("demolitionist/bump",CHAN_DAMAGE,CHANF_OVERLAP); a.A_StartSound("demolitionist/bump",CHAN_DAMAGE,CHANF_OVERLAP); @@ -1365,7 +1365,7 @@ Class Demolitionist : PlayerPawn if ( bumped ) continue; bumped = true; SWWMUtility.AchievementProgressInc("bonk",1,player); - A_QuakeEx(8,8,8,16,0,128,"",QF_RELATIVE|QF_SCALEDOWN); + A_QuakeEx(8,8,8,16,0,128,"",QF_RELATIVE|QF_SCALEDOWN|QF_3D); vel *= .2; vel -= dir*(10+(spd*30/mass)); vel -= dirto*(10+(spd*50/mass)); @@ -1403,7 +1403,7 @@ Class Demolitionist : PlayerPawn A_StartSound("demolitionist/buttslam",CHAN_DAMAGE,CHANF_OVERLAP,1.,.4); if ( swwm_buttsfx ) A_StartSound("demolitionist/buttslamx",CHAN_DAMAGE,CHAN_OVERLAP,1.,.2); Spawn("SWWMItemFog",level.Vec3Offset(pos,diff/2)); - A_QuakeEx(8,8,8,8,0,3000,"",QF_RELATIVE|QF_SCALEDOWN,falloff:300,rollIntensity:1.); + A_QuakeEx(8,8,8,8,0,3000,"",QF_RELATIVE|QF_SCALEDOWN|QF_3D,falloff:300,rollIntensity:1.); mystats.buttslams++; lastbump *= .8; } @@ -1468,7 +1468,7 @@ Class Demolitionist : PlayerPawn A_StartSound("demolitionist/buttslam",CHAN_DAMAGE,CHANF_OVERLAP,1.,.4); if ( swwm_buttsfx ) A_StartSound("demolitionist/buttslamx",CHAN_DAMAGE,CHAN_OVERLAP,1.,.2); Spawn("SWWMItemFog",Vec3Offset(0,0,Height)); - A_QuakeEx(8,8,8,8,0,3000,"",QF_RELATIVE|QF_SCALEDOWN,falloff:300,rollIntensity:1.); + A_QuakeEx(8,8,8,8,0,3000,"",QF_RELATIVE|QF_SCALEDOWN|QF_3D,falloff:300,rollIntensity:1.); mystats.buttslams++; lastbump *= .8; } @@ -1482,7 +1482,7 @@ Class Demolitionist : PlayerPawn A_StartSound("demolitionist/bump",CHAN_DAMAGE,CHANF_OVERLAP); bumptic = gametic+int(20+spd/4.); lastbump *= .8; - A_QuakeEx(8,8,8,16,0,128,"",QF_RELATIVE|QF_SCALEDOWN); + A_QuakeEx(8,8,8,16,0,128,"",QF_RELATIVE|QF_SCALEDOWN|QF_3D); A_AlertMonsters(swwm_uncapalert?0:800); vel *= .2; vel -= dir*(10+(spd*30/mass)); @@ -1566,7 +1566,7 @@ Class Demolitionist : PlayerPawn A_StartSound("demolitionist/buttslam",CHAN_DAMAGE,CHANF_OVERLAP,1.,.4); if ( swwm_buttsfx ) A_StartSound("demolitionist/buttslamx",CHAN_DAMAGE,CHAN_OVERLAP,1.,.2); Spawn("SWWMItemFog",Vec3Offset(dir.x*radius,dir.y*radius,(tempme.Results.Tier==TIER_UPPER)?Height:(tempme.Results.Tier==TIER_LOWER)?0:(Height/2))); - A_QuakeEx(8,8,8,8,0,3000,"",QF_RELATIVE|QF_SCALEDOWN,falloff:300,rollIntensity:1.); + A_QuakeEx(8,8,8,8,0,3000,"",QF_RELATIVE|QF_SCALEDOWN|QF_3D,falloff:300,rollIntensity:1.); mystats.buttslams++; lastbump *= .8; } @@ -1579,7 +1579,7 @@ Class Demolitionist : PlayerPawn A_StartSound("demolitionist/bump",CHAN_DAMAGE,CHANF_OVERLAP); bumptic = gametic+int(25+spd/4.); lastbump *= .8; - A_QuakeEx(8,8,8,16,0,128,"",QF_RELATIVE|QF_SCALEDOWN); + A_QuakeEx(8,8,8,16,0,128,"",QF_RELATIVE|QF_SCALEDOWN|QF_3D); A_AlertMonsters(swwm_uncapalert?0:800); vel *= .2; vel -= dir*(10+(spd*30/mass)); @@ -2742,7 +2742,7 @@ Class Demolitionist : PlayerPawn if ( lastdamage > 90 ) { if ( swwm_extraalert ) A_AlertMonsters(swwm_uncapalert?0:1200); - A_QuakeEx(3,3,3,9,0,8,"",QF_RELATIVE|QF_SCALEDOWN); + A_QuakeEx(3,3,3,9,0,8,"",QF_RELATIVE|QF_SCALEDOWN|QF_3D); A_StartSound("demolitionist/hipain",CHAN_VOICE); lastbump *= 1.04; if ( swwm_mutevoice < 4 ) @@ -2756,7 +2756,7 @@ Class Demolitionist : PlayerPawn else if ( lastdamage > 30 ) { if ( swwm_extraalert ) A_AlertMonsters(swwm_uncapalert?0:600); - A_QuakeEx(2,2,2,6,0,8,"",QF_RELATIVE|QF_SCALEDOWN); + A_QuakeEx(2,2,2,6,0,8,"",QF_RELATIVE|QF_SCALEDOWN|QF_3D); A_StartSound("demolitionist/pain",CHAN_VOICE); lastbump *= 1.02; if ( swwm_mutevoice < 4 ) @@ -2770,7 +2770,7 @@ Class Demolitionist : PlayerPawn else if ( lastdamage > 0 ) { if ( swwm_extraalert ) A_AlertMonsters(swwm_uncapalert?0:200); - A_QuakeEx(1,1,1,3,0,8,"",QF_RELATIVE|QF_SCALEDOWN); + A_QuakeEx(1,1,1,3,0,8,"",QF_RELATIVE|QF_SCALEDOWN|QF_3D); A_StartSound("demolitionist/lopain",CHAN_VOICE); lastbump *= 1.01; if ( swwm_mutevoice < 4 ) diff --git a/zscript/swwm_player_fx.zsc b/zscript/swwm_player_fx.zsc index dee6d5193..65dcb0c02 100644 --- a/zscript/swwm_player_fx.zsc +++ b/zscript/swwm_player_fx.zsc @@ -392,7 +392,7 @@ Class DemolitionistShockwave : Actor override void PostBeginPlay() { Super.PostBeginPlay(); - A_QuakeEx(7,7,7,30,0,300+min(special1,50)*4,"",QF_RELATIVE|QF_SCALEDOWN,falloff:200,rollIntensity:1.5); + A_QuakeEx(7,7,7,30,0,300+min(special1,50)*4,"",QF_RELATIVE|QF_SCALEDOWN|QF_3D,falloff:200,rollIntensity:1.5); if ( target.player != players[consoleplayer] ) { A_StartSound("demolitionist/hardland",CHAN_FOOTSTEP,CHANF_OVERLAP,attenuation:.3); diff --git a/zscript/weapons/swwm_baseweapon_fx.zsc b/zscript/weapons/swwm_baseweapon_fx.zsc index 1c826f13a..cda7e214e 100644 --- a/zscript/weapons/swwm_baseweapon_fx.zsc +++ b/zscript/weapons/swwm_baseweapon_fx.zsc @@ -187,7 +187,7 @@ Class PunchImpact : Actor override void PostBeginPlay() { Super.PostBeginPlay(); - A_QuakeEx(2,2,2,12,0,200,"",QF_RELATIVE|QF_SCALEDOWN,falloff:100,rollIntensity:.3); + A_QuakeEx(2,2,2,12,0,200,"",QF_RELATIVE|QF_SCALEDOWN|QF_3D,falloff:100,rollIntensity:.3); A_StartSound("demolitionist/punch",CHAN_VOICE,CHANF_DEFAULT,bAMBUSH?.6:1.); A_SprayDecal("WallCrack",-20); int numpt = Random[Ponch](5,10); @@ -257,7 +257,7 @@ Class BigPunchImpact : Actor override void PostBeginPlay() { Super.PostBeginPlay(); - A_QuakeEx(8,8,8,18,0,600,"",QF_RELATIVE|QF_SCALEDOWN,falloff:200,rollIntensity:.9); + A_QuakeEx(8,8,8,18,0,600,"",QF_RELATIVE|QF_SCALEDOWN|QF_3D,falloff:200,rollIntensity:.9); A_StartSound("pusher/althit",CHAN_VOICE,CHANF_DEFAULT,bAMBUSH?.6:1.); A_SprayDecal("BigWallCrack",-20); int numpt = Random[Ponch](9,16); diff --git a/zscript/weapons/swwm_baseweapon_melee.zsc b/zscript/weapons/swwm_baseweapon_melee.zsc index 591b32887..10b7e28d1 100644 --- a/zscript/weapons/swwm_baseweapon_melee.zsc +++ b/zscript/weapons/swwm_baseweapon_melee.zsc @@ -182,7 +182,7 @@ Class ParryField : Actor i.angle = atan2(dir.y,dir.x); i.pitch = asin(-dir.z); i.bAMBUSH = true; - A_QuakeEx(3,3,3,10,0,64,"",QF_RELATIVE|QF_SCALEDOWN,rollIntensity:.2); + A_QuakeEx(3,3,3,10,0,64,"",QF_RELATIVE|QF_SCALEDOWN|QF_3D,rollIntensity:.2); A_StartSound("demolitionist/parry",CHAN_WEAPON); if ( special1 >= special2 ) // perfect parry { @@ -434,7 +434,7 @@ extend Class SWWMWeapon // things can instantly cease to exist after taking damage (wow) if ( mt.hits[i].a ) { - if ( mt.hits[i].a.player ) mt.hits[i].a.A_QuakeEx(quakin,quakin,quakin,6,0,1,"",QF_RELATIVE|QF_SCALEDOWN,rollIntensity:.125*quakin); + if ( mt.hits[i].a.player ) mt.hits[i].a.A_QuakeEx(quakin,quakin,quakin,6,0,1,"",QF_RELATIVE|QF_SCALEDOWN|QF_3D,rollIntensity:.125*quakin); if ( !mt.hits[i].a.bNOBLOOD && !mt.hits[i].a.bDORMANT && (raging || !mt.hits[i].a.bINVULNERABLE) ) { mt.hits[i].a.TraceBleed(newdmg,invoker); @@ -454,7 +454,7 @@ extend Class SWWMWeapon } } self.angle += clamp(diff/mt.hits.Size(),-5.,5.); // averaged reorient - A_QuakeEx(quakin/2,quakin/2,quakin/2,3,0,1,"",QF_RELATIVE|QF_SCALEDOWN,rollIntensity:0.06*quakin); + A_QuakeEx(quakin/2,quakin/2,quakin/2,3,0,1,"",QF_RELATIVE|QF_SCALEDOWN|QF_3D,rollIntensity:0.06*quakin); if ( raging && !(flags&MELEE_ForceSound) ) { if ( blooded ) A_StartSound("pusher/altmeat",CHAN_WEAPON,CHANF_OVERLAP); @@ -544,7 +544,7 @@ extend Class SWWMWeapon ps.special1 = dmg; } int quakin = raging?4:1; - A_QuakeEx(quakin,quakin,quakin,3,0,1,"",QF_RELATIVE|QF_SCALEDOWN,rollIntensity:0.12*quakin); + A_QuakeEx(quakin,quakin,quakin,3,0,1,"",QF_RELATIVE|QF_SCALEDOWN|QF_3D,rollIntensity:0.12*quakin); A_BumpFOV(.98); A_StartSound((raging&&!(flags&MELEE_ForceSound))?"pusher/althit":(hitsound!="")?hitsound:"demolitionist/punch",CHAN_WEAPON,CHANF_OVERLAP); A_AlertMonsters(swwm_uncapalert?0:100); diff --git a/zscript/weapons/swwm_blazeit.zsc b/zscript/weapons/swwm_blazeit.zsc index 054ae1540..c68eed781 100644 --- a/zscript/weapons/swwm_blazeit.zsc +++ b/zscript/weapons/swwm_blazeit.zsc @@ -246,7 +246,7 @@ Class Hellblazer : SWWMWeapon A_StartSound(bAlt?"hellblazer/altfire":"hellblazer/fire",CHAN_WEAPON,CHANF_OVERLAP,attenuation:(bAlt?1.7:.8)); A_AlertMonsters(swwm_uncapalert?0:bAlt?400:1200); int qstr = bAlt?4:5; - A_QuakeEx(qstr,qstr,qstr,bAlt?4:12,0,8,"",QF_RELATIVE|QF_SCALEDOWN,rollIntensity:.12*qstr); + A_QuakeEx(qstr,qstr,qstr,bAlt?4:12,0,8,"",QF_RELATIVE|QF_SCALEDOWN|QF_3D,rollIntensity:.12*qstr); A_BumpFOV(bAlt?.96:.93); A_PlayerFire(); invoker.clipcount = max(0,invoker.clipcount-1); diff --git a/zscript/weapons/swwm_blazeit_fx.zsc b/zscript/weapons/swwm_blazeit_fx.zsc index 170a8ae78..e040635aa 100644 --- a/zscript/weapons/swwm_blazeit_fx.zsc +++ b/zscript/weapons/swwm_blazeit_fx.zsc @@ -336,7 +336,7 @@ Class HellblazerMissile : Actor A_SetScale(4.5); SWWMUtility.DoExplosion(self,250,320000,200,90); A_NoGravity(); - A_QuakeEx(5,5,5,15,0,1500,"",QF_RELATIVE|QF_SCALEDOWN,falloff:500,rollIntensity:.8); + A_QuakeEx(5,5,5,15,0,1500,"",QF_RELATIVE|QF_SCALEDOWN|QF_3D,falloff:500,rollIntensity:.8); A_StopSound(CHAN_BODY); A_StartSound("hellblazer/hitm",CHAN_WEAPON,attenuation:.8); A_StartSound("hellblazer/hitm",CHAN_VOICE,attenuation:.5); @@ -433,7 +433,7 @@ Class HellblazerCrackshot : HellblazerMissile A_SetScale(3.); SWWMUtility.DoExplosion(self,200,320000,160,60); A_NoGravity(); - A_QuakeEx(4,4,4,12,0,1200,"",QF_RELATIVE|QF_SCALEDOWN,falloff:400,rollIntensity:.6); + A_QuakeEx(4,4,4,12,0,1200,"",QF_RELATIVE|QF_SCALEDOWN|QF_3D,falloff:400,rollIntensity:.6); A_StopSound(CHAN_BODY); A_StartSound("hellblazer/hitc",CHAN_WEAPON,attenuation:.7); A_StartSound("hellblazer/hitc",CHAN_VOICE,attenuation:.4); @@ -504,7 +504,7 @@ Class HellblazerRavager : HellblazerMissile A_SetScale(8.); SWWMUtility.DoExplosion(self,300,320000,300,120); A_NoGravity(); - A_QuakeEx(6,6,6,30,0,2000,"",QF_RELATIVE|QF_SCALEDOWN,falloff:800,rollIntensity:1.); + A_QuakeEx(6,6,6,30,0,2000,"",QF_RELATIVE|QF_SCALEDOWN|QF_3D,falloff:800,rollIntensity:1.); A_StopSound(CHAN_BODY); A_StartSound("hellblazer/hitr",CHAN_WEAPON,attenuation:.6); A_StartSound("hellblazer/hitr",CHAN_VOICE,attenuation:.3); @@ -587,7 +587,7 @@ Class HellblazerWarhead : HellblazerMissile int nhit; [nhit, nkill] = SWWMUtility.DoExplosion(self,1500,600000,400,200,DE_COUNTENEMIES); A_NoGravity(); - A_QuakeEx(9,9,9,150,0,12000,"",QF_RELATIVE|QF_SCALEDOWN,falloff:4000,rollIntensity:2.); + A_QuakeEx(9,9,9,150,0,12000,"",QF_RELATIVE|QF_SCALEDOWN|QF_3D,falloff:4000,rollIntensity:2.); A_StopSound(CHAN_BODY); A_StartSound("hellblazer/hitw",CHAN_WEAPON,attenuation:.4); A_StartSound("hellblazer/hitw",CHAN_VOICE,attenuation:.1); @@ -897,7 +897,7 @@ Class HellblazerClusterMini : HellblazerMissile2 A_SetScale(2.5); SWWMUtility.DoExplosion(self,50,200000,150,60); A_NoGravity(); - A_QuakeEx(4,4,4,12,0,1000,"",QF_RELATIVE|QF_SCALEDOWN,falloff:400,rollIntensity:.6); + A_QuakeEx(4,4,4,12,0,1000,"",QF_RELATIVE|QF_SCALEDOWN|QF_3D,falloff:400,rollIntensity:.6); A_StopSound(CHAN_BODY); A_StartSound("hellblazer/hitcs",CHAN_WEAPON,attenuation:.9); A_StartSound("hellblazer/hitcs",CHAN_VOICE,attenuation:.5); diff --git a/zscript/weapons/swwm_cbt.zsc b/zscript/weapons/swwm_cbt.zsc index 6a4366a2b..49f58cd1a 100644 --- a/zscript/weapons/swwm_cbt.zsc +++ b/zscript/weapons/swwm_cbt.zsc @@ -459,7 +459,7 @@ Class Wallbuster : SWWMWeapon else player.SetPsprite(PSP_WEAPON,ResolveState("FireTwentyFive")); int qk = min(9,1+howmany/5); int ql = min(25,6+howmany/2); - A_QuakeEx(qk,qk,qk,ql,0,8,"",QF_RELATIVE|QF_SCALEDOWN,rollIntensity:qk*.15); + A_QuakeEx(qk,qk,qk,ql,0,8,"",QF_RELATIVE|QF_SCALEDOWN|QF_3D,rollIntensity:qk*.15); A_BumpFOV(1.-qk*.04); A_AlertMonsters(swwm_uncapalert?0:alertness); A_PlayerFire(); diff --git a/zscript/weapons/swwm_cbt_fx.zsc b/zscript/weapons/swwm_cbt_fx.zsc index a6686ca51..41bea2c8b 100644 --- a/zscript/weapons/swwm_cbt_fx.zsc +++ b/zscript/weapons/swwm_cbt_fx.zsc @@ -24,7 +24,7 @@ Class BustedQuake : Actor A_StartSound("wallbuster/bigbust",CHAN_VOICE,CHANF_OVERLAP,min(1.,special1*.35),1./max(1.,special1*.35),1.-special1*.01); A_StartSound("wallbuster/bigbust",CHAN_VOICE,CHANF_OVERLAP,min(1.,special1*.35),1./max(1.,special1*.35),1.-special1*.01); } - A_QuakeEx(special1,special1,special1,20+special1*5,0,300+special1*90,"",QF_RELATIVE|QF_SCALEDOWN,rollIntensity:special1*.1); + A_QuakeEx(special1,special1,special1,20+special1*5,0,300+special1*90,"",QF_RELATIVE|QF_SCALEDOWN|QF_3D,rollIntensity:special1*.1); A_AlertMonsters(swwm_uncapalert?0:2500); } override void Tick() diff --git a/zscript/weapons/swwm_danmaku.zsc b/zscript/weapons/swwm_danmaku.zsc index 5ef350e93..af6687a5b 100644 --- a/zscript/weapons/swwm_danmaku.zsc +++ b/zscript/weapons/swwm_danmaku.zsc @@ -104,7 +104,7 @@ Class Eviscerator : SWWMWeapon if ( !weap ) return; invoker.isfiring = true; A_StartSound("eviscerator/fire",CHAN_WEAPON,CHANF_OVERLAP); - A_QuakeEx(6,6,6,3,0,10,"",QF_RELATIVE|QF_SCALEDOWN,rollIntensity:1.5); + A_QuakeEx(6,6,6,3,0,10,"",QF_RELATIVE|QF_SCALEDOWN|QF_3D,rollIntensity:1.5); A_BumpFOV(.94); A_SWWMFlash(); A_PlayerFire(); @@ -179,7 +179,7 @@ Class Eviscerator : SWWMWeapon invoker.isfiring = true; A_StartSound("eviscerator/altfire",CHAN_WEAPON,CHANF_OVERLAP); A_StartSound("eviscerator/fire",CHAN_WEAPON,CHANF_OVERLAP); - A_QuakeEx(4,4,4,5,0,10,"",QF_RELATIVE|QF_SCALEDOWN,rollIntensity:.9); + A_QuakeEx(4,4,4,5,0,10,"",QF_RELATIVE|QF_SCALEDOWN|QF_3D,rollIntensity:.9); A_BumpFOV(.91); A_SWWMFlash(); A_PlayerFire(); diff --git a/zscript/weapons/swwm_danmaku_fx.zsc b/zscript/weapons/swwm_danmaku_fx.zsc index 192b6615f..e585dfaf5 100644 --- a/zscript/weapons/swwm_danmaku_fx.zsc +++ b/zscript/weapons/swwm_danmaku_fx.zsc @@ -482,7 +482,7 @@ Class EvisceratorProj : Actor A_NoGravity(); A_SetScale(3.); SWWMUtility.DoExplosion(self,100,120000,150,80); - A_QuakeEx(6,6,6,20,0,1200,"",QF_RELATIVE|QF_SCALEDOWN,falloff:300,rollIntensity:.7); + A_QuakeEx(6,6,6,20,0,1200,"",QF_RELATIVE|QF_SCALEDOWN|QF_3D,falloff:300,rollIntensity:.7); A_StartSound("eviscerator/shell",CHAN_WEAPON,attenuation:.5); A_StartSound("eviscerator/shell",CHAN_VOICE,attenuation:.3); A_AlertMonsters(swwm_uncapalert?0:3000); diff --git a/zscript/weapons/swwm_deathlydeathcannon.zsc b/zscript/weapons/swwm_deathlydeathcannon.zsc index 8e6ccf8cb..27c783215 100644 --- a/zscript/weapons/swwm_deathlydeathcannon.zsc +++ b/zscript/weapons/swwm_deathlydeathcannon.zsc @@ -104,7 +104,7 @@ Class Ynykron : SWWMWeapon } } else A_AlertMonsters(); // full range alert - A_QuakeEx(9,9,9,4,0,1,"",QF_RELATIVE|QF_SCALEDOWN,rollIntensity:2.5); + A_QuakeEx(9,9,9,4,0,1,"",QF_RELATIVE|QF_SCALEDOWN|QF_3D,rollIntensity:2.5); A_BumpFOV(.7); A_PlayerFire(); SWWMHandler.DoFlash(self,Color(120,255,255,255),30); diff --git a/zscript/weapons/swwm_deathlydeathcannon_fx.zsc b/zscript/weapons/swwm_deathlydeathcannon_fx.zsc index 00ed7b02b..25922bacb 100644 --- a/zscript/weapons/swwm_deathlydeathcannon_fx.zsc +++ b/zscript/weapons/swwm_deathlydeathcannon_fx.zsc @@ -404,7 +404,7 @@ Class YnykronImpact : Actor // no need to call A_AlertMonsters if all monsters on the entire map were already alerted by the initial shot if ( swwm_ynykronalert && (!special2 || swwm_extraalert) ) A_AlertMonsters(); rad = args[0]+300+10*clamp(special1/10,0,15); - A_QuakeEx(4,4,4,50,0,rad*4,"",QF_RELATIVE|QF_SCALEDOWN,falloff:rad*2,rollintensity:.6); + A_QuakeEx(4,4,4,50,0,rad*4,"",QF_RELATIVE|QF_SCALEDOWN|QF_3D,falloff:rad*2,rollintensity:.6); FlashPlayer(60,1200); if ( tracer ) { @@ -1117,7 +1117,7 @@ Class YnykronShot : Actor } override void PostBeginPlay() { - A_QuakeEx(6,6,6,150,0,65536,"",QF_RELATIVE|QF_SCALEDOWN,falloff:65536,rollIntensity:1.); + A_QuakeEx(6,6,6,150,0,65536,"",QF_RELATIVE|QF_SCALEDOWN|QF_3D,falloff:65536,rollIntensity:1.); A_StartSound("ynykron/beam",CHAN_VOICE,CHANF_DEFAULT,1.,0.); FlashPlayer(240,8000); hitlist.Clear(); @@ -1569,7 +1569,7 @@ Class YnykronLightningImpact : Actor { Super.PostBeginPlay(); SWWMUtility.DoExplosion(self,400,120000,100,40); - A_QuakeEx(3,3,3,12,0,800,"",QF_RELATIVE|QF_SCALEDOWN,falloff:300,rollIntensity:.4); + A_QuakeEx(3,3,3,12,0,800,"",QF_RELATIVE|QF_SCALEDOWN|QF_3D,falloff:300,rollIntensity:.4); A_SprayDecal("ShockMark",-172); int numpt = Random[ExploS](8,16); for ( int i=0; i