OrdinaryMagician/swwmgz_m
OrdinaryMagician/swwmgz_m
1
Fork 0
Code Activity

Shift Sparkster x3 (DLC2) to slot 7.

Browse source 
This way you can have both it and the Quadravol simultaneously.
It would be unfair to not let you hold both "iconic" UnSX weapons at once.
This commit is contained in:
Mari the Deer 2021-12-03 12:11:05 +01:00
commit 14e643b40a
4 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
zscript/dlc2/swwm_blueballs.zsc
View file

@ -1,5 +1,5 @@
// Tach-Engine & Nekuratek Sparkster x3 (from UnSX 2)
// Slot 6, spawns shared with Hellblazer
// Slot 7, spawns shared with Biospark Carbine
Class ModernSparkster : SWWMWeapon
{
@ -20,7 +20,7 @@ Class ModernSparkster : SWWMWeapon
SWWMWeapon.Tooltip "$TT_NEWSPARKSTER";
SWWMWeapon.GetLine "getnewsparkster";
Inventory.Icon "graphics/HUD/Icons/W_NewSparkster.png";
Weapon.SlotNumber 6;
Weapon.SlotNumber 7;
Weapon.SlotPriority 3.;
Weapon.SelectionOrder 625;
Weapon.AmmoType1 "SparksterBAmmo";

3
zscript/weapons/swwm_baseweapon.zsc
View file

@ -42,7 +42,7 @@ Class SWWMWeapon : Weapon abstract
override void Touch( Actor toucher )
{
// cannot pick up swapweapon unless explicitly pressing use
// show prompt to swap weapon, and prevent normal pickup
SWWMWeapon sw;
if ( bSPECIAL && swwm_swapweapons && (sw = HasSwapWeapon(toucher)) )
{
@ -55,6 +55,7 @@ Class SWWMWeapon : Weapon abstract
}
return;
}
// explicit use-to pickup, function must be called from Used() virtual
if ( toucher.player && swwm_usetopickup && !bUsePickup )
return;
Super.Touch(toucher);