OrdinaryMagician/stinger_m
OrdinaryMagician/stinger_m
1
Fork 0
Code Activity

First round of fixes before the beta release proper.

Browse source 
Corrected various backface culling issues on weapons (rifle, peacemaker, autocannon).
Fixed crash with dispersion pistol powerups due to typo.
Fixed razorclaw and impaler not temporarily disabling invisibility on melee attack.
Fixed rifle being visible with low zoom.
This commit is contained in:
Marisa the Magician 2019-09-27 08:40:53 +02:00
commit 4ba5db9d7f
7 changed files with 18 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
models/RifleM_d.3d
View file

Binary file not shown.

BIN
models/SMinigun_d.3d
View file

Binary file not shown.

BIN
models/peacehand_d.3d
View file

Binary file not shown.

2
zscript/bonesaw.zsc
View file

@ -96,10 +96,12 @@ Class Bonesaw : UnrealWeapon
invoker.special1++;
if ( invoker.special1 < 5 ) return;
invoker.special1 = 0;
invoker.FireEffect();
for ( int i=0; i<8; i++ ) if ( TryHit(angle+i*(45./16),5) || TryHit(angle-i*(45./16),5) ) return;
}
action void A_Clamp()
{
invoker.FireEffect();
for ( int i=0; i<8; i++ ) if ( TryHit(angle+i*(45./16),20) || TryHit(angle-i*(45./16),20) ) return;
}
Default

2
zscript/dispersionpistol.zsc
View file

@ -21,7 +21,7 @@ Class WeaponPowerUp : Inventory
if ( dpis && (dpis.pendingupgrade < 4) )
{
dpis.pendingupgrade++;
if ( toucher.player && ((toucher.player.ReadyWeapon != dpis) || (player.PendingWeapon != WP_NOCHANGE)) )
if ( toucher.player && ((toucher.player.ReadyWeapon != dpis) || (toucher.player.PendingWeapon != WP_NOCHANGE)) )
ScriptUtil.SetWeapon(toucher,"DispersionPistol");
}
GoAwayAndDie();

1
zscript/impaler.zsc
View file

@ -829,6 +829,7 @@ Class Impaler : UnrealWeapon
}
action void A_Stab()
{
invoker.FireEffect();
UTMainHandler.DoSwing(self,(FRandom[Impaler](-1,1),FRandom[Impaler](-1,1)),0.3,-0.2,2,SWING_Spring,0,2);
for ( int i=0; i<8; i++ ) if ( TryHit(angle+i*(45./16),15) || TryHit(angle-i*(45./16),15) ) return;
}

21
zscript/rifle.zsc
View file

@ -267,7 +267,7 @@ Class URifle : UnrealWeapon
SRFF ABCDEFGHIJ 2;
Goto Idle;
ZoomedFire:
SRSI A 20 A_RifleFire(true);
TNT1 A 20 A_RifleFire(true);
Goto ZoomedIdle;
AltFire:
SRFF A 0 A_JumpIf(!sting_rifle,"Zoom");
@ -285,21 +285,26 @@ Class URifle : UnrealWeapon
SRFI A 3;
Goto Idle;
ZoomedAltFire:
SRSI A 7 A_RifleFire(true,true);
SRSI A 0 A_JumpIfNoAmmo("ZoomedAltFireEnd");
SRSI A 7 A_RifleFire(true,true);
SRSI A 0 A_JumpIfNoAmmo("ZoomedAltFireEnd");
SRSI A 7 A_RifleFire(true,true);
TNT1 A 7 A_RifleFire(true,true);
TNT1 A 0 A_JumpIfNoAmmo("ZoomedAltFireEnd");
TNT1 A 7 A_RifleFire(true,true);
TNT1 A 0 A_JumpIfNoAmmo("ZoomedAltFireEnd");
TNT1 A 7 A_RifleFire(true,true);
ZoomedAltFireEnd:
SRSI A 6;
TNT1 A 6;
Goto Idle;
Reload:
SRFI A 0 A_JumpIf(invoker.sniperzoom>1.0,"ZoomedReload");
SRFI A 8 A_ToggleLight();
Goto Idle;
ZoomedReload:
TNT1 A 8 A_ToggleLight();
Goto Idle;
Zoom:
SRSU A 0 A_JumpIf(invoker.sniperzoom>1.0,"ZoomOut");
SRSU A 0 A_PlaySound("rifle/scopeon",CHAN_ITEM,.5);
SRSU ABCDEFGHIJKLMN 1;
SRSI A 0;
Goto ZoomHold;
ZoomHold:
TNT1 A 1
@ -313,12 +318,14 @@ Class URifle : UnrealWeapon
ZoomOut:
SRSD A 0 A_ZoomFactor(invoker.sniperzoom=1.0,ZOOM_INSTANT);
SRSD A 0 A_PlaySound("rifle/scopeoff",CHAN_ITEM,.5);
SRSI A 1;
SRSD ABCDEFGHIJKLMNO 1;
Goto Idle;
Deselect:
SRFD A 0 A_JumpIf(invoker.sniperzoom<=1.0,"Deselect2");
SRSD A 0 A_ZoomFactor(invoker.sniperzoom=1.0,ZOOM_INSTANT);
SRSD A 0 A_PlaySound("rifle/scopeoff",CHAN_ITEM,.5);
SRSI A 1;
SRSD ABCDEFGHIJKLMNO 1;
Deselect2:
SRFD A 0