mirror of
https://github.com/ZDoom/gzdoom.git
synced 2024-11-06 04:50:26 +00:00
90db40c70f
- Fixed: The shotgun had spawn ID 21 instead of 27. - Fixed: All 3 states in the DoomUnusedStates actor need to end with a 'stop'. - Fixed: The DECORATE TakeInventory functions didn't check the IF_KEEPDEPLETED flag. - Fixed: ClearInventory should leave ammo in the inventory because it might be referenced by undroppable weapons. - Fixed: Several functions in a_artifacts.cpp were missing a check for a valid owner. - Fixed: sc_man counted lines wrong when ungetting strings but getting tokens next. SVN r552 (trunk)
80 lines
1.3 KiB
Text
80 lines
1.3 KiB
Text
// The barrel of green goop ------------------------------------------------
|
|
|
|
ACTOR ExplosiveBarrel 2035
|
|
{
|
|
Game Doom
|
|
SpawnID 125
|
|
Health 20
|
|
Radius 10
|
|
Height 34
|
|
+SOLID
|
|
+SHOOTABLE
|
|
+NOBLOOD
|
|
+ACTIVATEMCROSS
|
|
+DONTGIB
|
|
+NOICEDEATH
|
|
+OLDRADIUSDMG
|
|
DeathSound "world/barrelx"
|
|
Obituary "$OB_BARREL"
|
|
States
|
|
{
|
|
Spawn:
|
|
BAR1 AB 6
|
|
Loop
|
|
Death:
|
|
BEXP A 5 BRIGHT
|
|
BEXP B 5 BRIGHT A_Scream
|
|
BEXP C 5 BRIGHT
|
|
BEXP D 5 BRIGHT A_Explode
|
|
BEXP E 10 BRIGHT
|
|
BEXP E 1050 BRIGHT A_BarrelDestroy
|
|
BEXP E 5 A_Respawn
|
|
Wait
|
|
}
|
|
}
|
|
|
|
// Bullet puff -------------------------------------------------------------
|
|
|
|
ACTOR BulletPuff
|
|
{
|
|
Game Doom
|
|
SpawnID 131
|
|
+NOBLOCKMAP
|
|
+NOGRAVITY
|
|
+ALLOWPARTICLES
|
|
+RANDOMIZE
|
|
RenderStyle Translucent
|
|
Alpha 0.5
|
|
VSpeed 1
|
|
Mass 5
|
|
States
|
|
{
|
|
Spawn:
|
|
PUFF A 4 Bright
|
|
PUFF B 4
|
|
Melee:
|
|
PUFF CD 4
|
|
Stop
|
|
}
|
|
}
|
|
|
|
// Container for an unused state -------------------------------------------
|
|
|
|
/* Doom defined the states S_STALAG, S_DEADTORSO, and S_DEADBOTTOM but never
|
|
* actually used them. For compatibility with DeHackEd patches, they still
|
|
* need to be kept around. This actor serves that purpose.
|
|
*/
|
|
|
|
ACTOR DoomUnusedStates
|
|
{
|
|
States
|
|
{
|
|
SMT2 A -1
|
|
stop
|
|
Death:
|
|
PLAY N -1
|
|
stop
|
|
PLAY S -1
|
|
stop
|
|
}
|
|
}
|