OrdinaryMagician/flak_m
OrdinaryMagician/flak_m
1
Fork 0
Code Activity

Final changes for 1.0.5:

Browse source 
- Solve sprite conflict between DT and Doomreal flak cannons.
 - Remove Enhanced Shock Rifle spawn for Heretic's Mace.
This commit is contained in:
Marisa the Magician 2019-12-03 13:14:12 +01:00
commit 9b82112ba3
20 changed files with 3 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
zscript/flakcannon.zsc
View file

@ -580,8 +580,8 @@ Class FlakSlug : Actor
}
Wait;
Death:
EXP2 A 0 A_FlakExplode();
EXP2 ABCDEFGHIJKLMNOPQR 1 BRIGHT;
FLEX A 0 A_FlakExplode();
FLEX ABCDEFGHIJKLMNOPQR 1 BRIGHT;
Stop;
}
}

7
zscript/utcommon.zsc
View file

@ -2980,12 +2980,7 @@ Class UTMainHandler : EventHandler
if ( Random[Replacements](0,1) ) e.Replacement = 'Minigun';
else e.Replacement = 'SniperRifle';
}
else if ( e.Replacee == 'BFG9000' ) e.Replacement = 'WarheadLauncher';
else if ( e.Replacee == 'Mace' )
{
if ( (!deathmatch || flak_dmsshock) && !Random[Replacements](0,6) ) e.Replacement = 'EnhancedShockRifle';
else e.Replacement = 'WarheadLauncher';
}
else if ( (e.Replacee == 'BFG9000') || (e.Replacee == 'Mace') ) e.Replacement = 'WarheadLauncher';
else if ( (e.Replacee == 'Clip') || (e.Replacee == 'GoldWandAmmo') || (e.Replacee == 'GoldWandHefty') ) e.Replacement = 'EClip';
else if ( (e.Replacee == 'ClipBox') )
{