OrdinaryMagician/swwmgz_m
OrdinaryMagician/swwmgz_m
1
Fork 0
Code Activity

Some stuff that was missed. Also, fuck Hexen.

Browse source
This commit is contained in:
Mari the Deer 2022-10-28 17:36:03 +02:00
commit b4d1c05e28
12 changed files with 125 additions and 63 deletions
Download patch file Download diff file Expand all files Collapse all files

50
zscript/items/swwm_armor.zsc
View file

@ -91,31 +91,6 @@ Class BlastSuit : SWWMArmor
return int(ceil(damage*factor));
}
}
Class BlastSuitItem : SWWMSpareArmor
{
override Inventory CreateCopy( Actor other )
{
// additional lore
SWWMLoreLibrary.Add(other.player,"BlastSuit");
return Super.CreateCopy(other);
}
Default
{
Tag "$T_BLASTSUIT";
Stamina 40000;
Inventory.Icon "graphics/HUD/Icons/I_BlastSuit.png";
Inventory.PickupMessage "$T_BLASTSUIT";
Inventory.UseSound "armor/blastsuit";
Inventory.RestrictedTo "Demolitionist";
SWWMSpareArmor.GiveArmor "BlastSuit";
}
States
{
Spawn:
XZW1 A -1;
Stop;
}
}
Class WarArmor : SWWMArmor
{
@ -141,28 +116,3 @@ Class WarArmor : SWWMArmor
return int(ceil(damage*factor));
}
}
Class WarArmorItem : SWWMSpareArmor
{
override Inventory CreateCopy( Actor other )
{
// additional lore
SWWMLoreLibrary.Add(other.player,"WarArmor");
return Super.CreateCopy(other);
}
Default
{
Tag "$T_WARARMOR";
Stamina 100000;
Inventory.Icon "graphics/HUD/Icons/I_WarArmor.png";
Inventory.PickupMessage "$T_WARARMOR";
Inventory.UseSound "armor/wararmor";
Inventory.RestrictedTo "Demolitionist";
SWWMSpareArmor.GiveArmor "WarArmor";
}
States
{
Spawn:
XZW1 A -1;
Stop;
}
}

55
zscript/items/swwm_armor_filtered.zsc Normal file
View file

@ -0,0 +1,55 @@
// In Hexen, armors have +NOGRAVITY as a default flag
// unfortunately there is no better way to do that than to
// duplicate this whole file and putting it in a filter
Class BlastSuitItem : SWWMSpareArmor
{
override Inventory CreateCopy( Actor other )
{
// additional lore
SWWMLoreLibrary.Add(other.player,"BlastSuit");
return Super.CreateCopy(other);
}
Default
{
Tag "$T_BLASTSUIT";
Stamina 40000;
Inventory.Icon "graphics/HUD/Icons/I_BlastSuit.png";
Inventory.PickupMessage "$T_BLASTSUIT";
Inventory.UseSound "armor/blastsuit";
Inventory.RestrictedTo "Demolitionist";
SWWMSpareArmor.GiveArmor "BlastSuit";
}
States
{
Spawn:
XZW1 A -1;
Stop;
}
}
Class WarArmorItem : SWWMSpareArmor
{
override Inventory CreateCopy( Actor other )
{
// additional lore
SWWMLoreLibrary.Add(other.player,"WarArmor");
return Super.CreateCopy(other);
}
Default
{
Tag "$T_WARARMOR";
Stamina 100000;
Inventory.Icon "graphics/HUD/Icons/I_WarArmor.png";
Inventory.PickupMessage "$T_WARARMOR";
Inventory.UseSound "armor/wararmor";
Inventory.RestrictedTo "Demolitionist";
SWWMSpareArmor.GiveArmor "WarArmor";
}
States
{
Spawn:
XZW1 A -1;
Stop;
}
}

2
zscript/items/swwm_baseitem.zsc
View file

@ -166,7 +166,7 @@ Mixin Class SWWMPickupGlow
// reattach our glow if we became a pickup
if ( (ret == self) && (PickupFlash is 'SWWMPickupFlash') )
{
let p = Spawn(PickupFlash,Vec3Offset(0,0,16));
let p = Spawn(PickupFlash,pos);
p.target = self;
p.SetStateLabel("Pickup");
}

2
zscript/items/swwm_powerups.zsc
View file

@ -2965,7 +2965,7 @@ Class SafetyTether : Inventory
// reattach our glow if we became a pickup
if ( (ret == self) && (PickupFlash is 'SWWMPickupFlash') )
{
let p = Spawn(PickupFlash,Vec3Offset(0,0,16));
let p = Spawn(PickupFlash,pos);
p.target = self;
p.SetStateLabel("Pickup");
}