mirror of
https://github.com/ZDoom/gzdoom.git
synced 2024-12-24 11:31:38 +00:00
a7e40b56f6
have those escapes stripped before printing so that they do not merge with subsequent text. - Moved default weapon slot assignments into the player classes. Weapon.SlotNumber is now used solely for mods that want to add new weapons without completely redoing the player's arsenal. Restored some config-based weapon slot customization, though slots are no longer automatically saved to the config and section names have changed slightly. However, unlike before, config slots are now the definitive word on slot assignments and cannot be overridden by any other files loaded. - Fixed: Several weapons were missing a game filter from their definitions. - Removed storage of weapon slots in the config so that weapon slots can be setup in the weapons themselves. Slots are still configurable, since they need to be for KEYCONF to work; any changes simply won't be saved when you quit. - Removed limit on weapon slot sizes. SVN r1428 (trunk)
63 lines
1.2 KiB
Text
63 lines
1.2 KiB
Text
|
|
// Fist (first weapon) ------------------------------------------------------
|
|
|
|
ACTOR FWeapFist : FighterWeapon
|
|
{
|
|
Game Hexen
|
|
+BLOODSPLATTER
|
|
Weapon.SelectionOrder 3400
|
|
+WEAPON.MELEEWEAPON
|
|
Weapon.KickBack 150
|
|
|
|
action native A_FPunchAttack();
|
|
|
|
States
|
|
{
|
|
Select:
|
|
FPCH A 1 A_Raise
|
|
Loop
|
|
Deselect:
|
|
FPCH A 1 A_Lower
|
|
Loop
|
|
Ready:
|
|
FPCH A 1 A_WeaponReady
|
|
Loop
|
|
Fire:
|
|
FPCH B 5 Offset (5, 40)
|
|
FPCH C 4 Offset (5, 40)
|
|
FPCH D 4 Offset (5, 40) A_FPunchAttack
|
|
FPCH C 4 Offset (5, 40)
|
|
FPCH B 5 Offset (5, 40) A_ReFire
|
|
Goto Ready
|
|
Fire2:
|
|
FPCH DE 4 Offset (5, 40)
|
|
FPCH E 1 Offset (15, 50)
|
|
FPCH E 1 Offset (25, 60)
|
|
FPCH E 1 Offset (35, 70)
|
|
FPCH E 1 Offset (45, 80)
|
|
FPCH E 1 Offset (55, 90)
|
|
FPCH E 1 Offset (65, 90)
|
|
FPCH E 10 Offset (0, 150)
|
|
Goto Ready
|
|
}
|
|
}
|
|
|
|
// Punch puff ---------------------------------------------------------------
|
|
|
|
ACTOR PunchPuff
|
|
{
|
|
+NOBLOCKMAP +NOGRAVITY
|
|
+PUFFONACTORS
|
|
RenderStyle Translucent
|
|
Alpha 0.6
|
|
SeeSound "FighterPunchHitThing"
|
|
AttackSound "FighterPunchHitWall"
|
|
ActiveSound "FighterPunchMiss"
|
|
VSpeed 1
|
|
States
|
|
{
|
|
Spawn:
|
|
FHFX STUVW 4
|
|
Stop
|
|
}
|
|
}
|