From c3f2830c1ecf65f7156d94ef2e8302e6d5d8a989 Mon Sep 17 00:00:00 2001 From: Marisa Kirisame Date: Sun, 11 Aug 2019 17:25:07 +0200 Subject: [PATCH] Small fix for translocator modules bouncing on bridge actors. --- zscript/translocator.zsc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/zscript/translocator.zsc b/zscript/translocator.zsc index 289f7f9..f63762c 100644 --- a/zscript/translocator.zsc +++ b/zscript/translocator.zsc @@ -132,6 +132,7 @@ Class TranslocatorModule : Actor +MOVEWITHSECTOR; +CANBOUNCEWATER; +BLOCKASPLAYER; + -ALLOWBOUNCEONACTORS; BounceType "Hexen"; BounceFactor 0.3; WallBounceFactor 0.3; @@ -218,7 +219,7 @@ Class TranslocatorModule : Actor { A_SetPitch(0); A_PlaySound("transloc/bounce"); - if ( BlockingFloor ) alreadyhit = true; + if ( BlockingFloor || (tracer && (pos.z >= tracer.pos.z+tracer.height) && tracer.bACTLIKEBRIDGE) ) alreadyhit = true; } } Goto Spawn; @@ -226,7 +227,7 @@ Class TranslocatorModule : Actor TMOD A 0 { A_SetPitch(0); - if ( tracer ) + if ( tracer && !tracer.bACTLIKEBRIDGE ) { SetOrigin(tracer.Vec2OffsetZ(0,0,pos.z),false); vel.xy *= 0;