mirror of
https://github.com/ZDoom/gzdoom.git
synced 2024-11-10 23:01:50 +00:00
- Heretic DECORATE fixes.
SVN r1150 (trunk)
This commit is contained in:
Christoph Oelckers
parent
511c9366f7
commit
1521f2faf3
7 changed files with 26 additions and 10 deletions
|
|
@ -60,11 +60,11 @@ ACTOR BeakPowered : Beak
|
||||||
|
|
||||||
ACTOR ChickenPlayer : PlayerPawn native
|
ACTOR ChickenPlayer : PlayerPawn native
|
||||||
{
|
{
|
||||||
Health 24
|
Health 30
|
||||||
ReactionTime 0
|
ReactionTime 0
|
||||||
PainChance 255
|
PainChance 255
|
||||||
Radius 16
|
Radius 16
|
||||||
Height 30
|
Height 24
|
||||||
Speed 1
|
Speed 1
|
||||||
Gravity 0.125
|
Gravity 0.125
|
||||||
+NOSKIN
|
+NOSKIN
|
||||||
|
|
@ -142,6 +142,7 @@ ACTOR Chicken : MorphedMonster
|
||||||
Pain:
|
Pain:
|
||||||
CHKN D 5 A_Feathers
|
CHKN D 5 A_Feathers
|
||||||
CHKN C 5 A_Pain
|
CHKN C 5 A_Pain
|
||||||
|
Goto See
|
||||||
Melee:
|
Melee:
|
||||||
CHKN A 8 A_FaceTarget
|
CHKN A 8 A_FaceTarget
|
||||||
CHKN C 10 A_CustomMeleeAttack(random[ChicAttack](1,2))
|
CHKN C 10 A_CustomMeleeAttack(random[ChicAttack](1,2))
|
||||||
|
|
|
||||||
|
|
@ -70,7 +70,7 @@ ACTOR Sorcerer1 7
|
||||||
SRCR L 25 A_PlaySoundEx("dsparil/zap", "body")
|
SRCR L 25 A_PlaySoundEx("dsparil/zap", "body")
|
||||||
SRCR MN 5
|
SRCR MN 5
|
||||||
SRCR O 4
|
SRCR O 4
|
||||||
SRCR L 25 A_PlaySoundEx("dsparil/zap", "body")
|
SRCR L 20 A_PlaySoundEx("dsparil/zap", "body")
|
||||||
SRCR MN 5
|
SRCR MN 5
|
||||||
SRCR O 4
|
SRCR O 4
|
||||||
SRCR L 12
|
SRCR L 12
|
||||||
|
|
@ -92,6 +92,8 @@ ACTOR SorcererFX1
|
||||||
Damage 10
|
Damage 10
|
||||||
DamageType Fire
|
DamageType Fire
|
||||||
Projectile
|
Projectile
|
||||||
|
-ACTIVATEIMPACT
|
||||||
|
-ACTIVATEPCROSS
|
||||||
RenderStyle Add
|
RenderStyle Add
|
||||||
States
|
States
|
||||||
{
|
{
|
||||||
|
|
@ -196,6 +198,8 @@ ACTOR Sorcerer2FX1
|
||||||
FastSpeed 28
|
FastSpeed 28
|
||||||
Damage 1
|
Damage 1
|
||||||
Projectile
|
Projectile
|
||||||
|
-ACTIVATEIMPACT
|
||||||
|
-ACTIVATEPCROSS
|
||||||
RenderStyle Add
|
RenderStyle Add
|
||||||
|
|
||||||
action native A_BlueSpark ();
|
action native A_BlueSpark ();
|
||||||
|
|
|
||||||
|
|
@ -30,7 +30,7 @@ ACTOR Pod 2035
|
||||||
PPOD C 5 BRIGHT A_RemovePod
|
PPOD C 5 BRIGHT A_RemovePod
|
||||||
PPOD D 5 BRIGHT A_Scream
|
PPOD D 5 BRIGHT A_Scream
|
||||||
PPOD E 5 BRIGHT A_Explode
|
PPOD E 5 BRIGHT A_Explode
|
||||||
PPOD F 5 BRIGHT
|
PPOD F 10 BRIGHT
|
||||||
Stop
|
Stop
|
||||||
Grow:
|
Grow:
|
||||||
PPOD IJKLMNOP 3
|
PPOD IJKLMNOP 3
|
||||||
|
|
@ -67,6 +67,7 @@ ACTOR PodGenerator 43
|
||||||
SpawnID 126
|
SpawnID 126
|
||||||
+NOBLOCKMAP
|
+NOBLOCKMAP
|
||||||
+NOSECTOR
|
+NOSECTOR
|
||||||
|
+DONTSPLASH
|
||||||
|
|
||||||
action native A_MakePod ();
|
action native A_MakePod ();
|
||||||
|
|
||||||
|
|
@ -88,6 +89,7 @@ ACTOR TeleGlitterGenerator1 74
|
||||||
+NOBLOCKMAP
|
+NOBLOCKMAP
|
||||||
+NOSECTOR
|
+NOSECTOR
|
||||||
+NOGRAVITY
|
+NOGRAVITY
|
||||||
|
+DONTSPLASH
|
||||||
States
|
States
|
||||||
{
|
{
|
||||||
Spawn:
|
Spawn:
|
||||||
|
|
@ -105,6 +107,7 @@ ACTOR TeleGlitterGenerator2 52
|
||||||
+NOBLOCKMAP
|
+NOBLOCKMAP
|
||||||
+NOSECTOR
|
+NOSECTOR
|
||||||
+NOGRAVITY
|
+NOGRAVITY
|
||||||
|
+DONTSPLASH
|
||||||
States
|
States
|
||||||
{
|
{
|
||||||
Spawn:
|
Spawn:
|
||||||
|
|
|
||||||
|
|
@ -77,8 +77,8 @@ ACTOR StaffPuff
|
||||||
States
|
States
|
||||||
{
|
{
|
||||||
Spawn:
|
Spawn:
|
||||||
PUF3 A 3 BRIGHT
|
PUF3 A 4 BRIGHT
|
||||||
PUF3 BCD 3
|
PUF3 BCD 4
|
||||||
Stop
|
Stop
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -798,7 +798,6 @@ ACTOR BlasterPuff
|
||||||
+NOBLOCKMAP
|
+NOBLOCKMAP
|
||||||
+NOGRAVITY
|
+NOGRAVITY
|
||||||
+PUFFONACTORS
|
+PUFFONACTORS
|
||||||
+NOTELEPORT
|
|
||||||
RenderStyle Add
|
RenderStyle Add
|
||||||
States
|
States
|
||||||
{
|
{
|
||||||
|
|
@ -856,6 +855,9 @@ ACTOR SkullRodPowered : SkullRod
|
||||||
Weapon.AmmoUse1 5
|
Weapon.AmmoUse1 5
|
||||||
Weapon.AmmoGive1 0
|
Weapon.AmmoGive1 0
|
||||||
Weapon.SisterWeapon "SkullRod"
|
Weapon.SisterWeapon "SkullRod"
|
||||||
|
|
||||||
|
action native A_FireSkullRodPL2();
|
||||||
|
|
||||||
States
|
States
|
||||||
{
|
{
|
||||||
Fire:
|
Fire:
|
||||||
|
|
@ -863,7 +865,7 @@ ACTOR SkullRodPowered : SkullRod
|
||||||
HROD D 3
|
HROD D 3
|
||||||
HROD E 2
|
HROD E 2
|
||||||
HROD F 3
|
HROD F 3
|
||||||
HROD G 4 A_FireCustomMissile("HornRodFX2")
|
HROD G 4 A_FireSkullRodPL2
|
||||||
HROD F 2
|
HROD F 2
|
||||||
HROD E 3
|
HROD E 3
|
||||||
HROD D 2
|
HROD D 2
|
||||||
|
|
|
||||||
|
|
@ -63,6 +63,8 @@ ACTOR HeadFX1
|
||||||
FastSpeed 20
|
FastSpeed 20
|
||||||
Damage 1
|
Damage 1
|
||||||
Projectile
|
Projectile
|
||||||
|
-ACTIVATEIMPACT
|
||||||
|
-ACTIVATEPCROSS
|
||||||
+THRUGHOST
|
+THRUGHOST
|
||||||
RenderStyle Add
|
RenderStyle Add
|
||||||
|
|
||||||
|
|
@ -128,7 +130,7 @@ ACTOR HeadFX3
|
||||||
FX06 ABC 4 BRIGHT A_LichFireGrow
|
FX06 ABC 4 BRIGHT A_LichFireGrow
|
||||||
Loop
|
Loop
|
||||||
NoGrow:
|
NoGrow:
|
||||||
FX06 ABC 4 BRIGHT
|
FX06 ABC 5 BRIGHT
|
||||||
Loop
|
Loop
|
||||||
Death:
|
Death:
|
||||||
FX06 DEFG 5 BRIGHT
|
FX06 DEFG 5 BRIGHT
|
||||||
|
|
@ -144,7 +146,7 @@ ACTOR Whirlwind native
|
||||||
Game Heretic
|
Game Heretic
|
||||||
SpawnID 165
|
SpawnID 165
|
||||||
Radius 16
|
Radius 16
|
||||||
Height 75
|
Height 74
|
||||||
Speed 10
|
Speed 10
|
||||||
Damage 1
|
Damage 1
|
||||||
Projectile
|
Projectile
|
||||||
|
|
|
||||||
|
|
@ -83,6 +83,8 @@ ACTOR KnightAxe
|
||||||
Damage 2
|
Damage 2
|
||||||
Projectile
|
Projectile
|
||||||
-NOBLOCKMAP
|
-NOBLOCKMAP
|
||||||
|
-ACTIVATEIMPACT
|
||||||
|
-ACTIVATEPCROSS
|
||||||
+WINDTHRUST
|
+WINDTHRUST
|
||||||
DeathSound "hknight/hit"
|
DeathSound "hknight/hit"
|
||||||
States
|
States
|
||||||
|
|
|
||||||
|
|
@ -83,6 +83,8 @@ ACTOR WizardFX1
|
||||||
FastSpeed 24
|
FastSpeed 24
|
||||||
Damage 3
|
Damage 3
|
||||||
Projectile
|
Projectile
|
||||||
|
-ACTIVATEIMPACT
|
||||||
|
-ACTIVATEPCROSS
|
||||||
RenderStyle Add
|
RenderStyle Add
|
||||||
States
|
States
|
||||||
{
|
{
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue