From 1521f2faf3524a460fcd9edf7cca2c89cd3eedd9 Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@zdoom.fake>
Date: Mon, 11 Aug 2008 08:58:55 +0000
Subject: [PATCH] - Heretic DECORATE fixes.

SVN r1150 (trunk)
---
 wadsrc/static/actors/heretic/chicken.txt      |  5 +++--
 wadsrc/static/actors/heretic/dsparil.txt      |  6 +++++-
 wadsrc/static/actors/heretic/hereticmisc.txt  |  5 ++++-
 wadsrc/static/actors/heretic/hereticweaps.txt | 10 ++++++----
 wadsrc/static/actors/heretic/ironlich.txt     |  6 ++++--
 wadsrc/static/actors/heretic/knight.txt       |  2 ++
 wadsrc/static/actors/heretic/wizard.txt       |  2 ++
 7 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/wadsrc/static/actors/heretic/chicken.txt b/wadsrc/static/actors/heretic/chicken.txt
index 2a7c32200..2bed5248c 100644
--- a/wadsrc/static/actors/heretic/chicken.txt
+++ b/wadsrc/static/actors/heretic/chicken.txt
@@ -60,11 +60,11 @@ ACTOR BeakPowered : Beak
 
 ACTOR ChickenPlayer : PlayerPawn native
 {
-	Health 24
+	Health 30
 	ReactionTime 0
 	PainChance 255
 	Radius 16
-	Height 30
+	Height 24
 	Speed 1
 	Gravity 0.125
 	+NOSKIN
@@ -142,6 +142,7 @@ ACTOR Chicken : MorphedMonster
 	Pain:
 		CHKN D 5 A_Feathers
 		CHKN C 5 A_Pain
+		Goto See
 	Melee:
 		CHKN A 8 A_FaceTarget
 		CHKN C 10 A_CustomMeleeAttack(random[ChicAttack](1,2))
diff --git a/wadsrc/static/actors/heretic/dsparil.txt b/wadsrc/static/actors/heretic/dsparil.txt
index c067be5f7..d5ad9d24d 100644
--- a/wadsrc/static/actors/heretic/dsparil.txt
+++ b/wadsrc/static/actors/heretic/dsparil.txt
@@ -70,7 +70,7 @@ ACTOR Sorcerer1 7
 		SRCR L 25 A_PlaySoundEx("dsparil/zap", "body")
 		SRCR MN 5
 		SRCR O 4
-		SRCR L 25 A_PlaySoundEx("dsparil/zap", "body")
+		SRCR L 20 A_PlaySoundEx("dsparil/zap", "body")
 		SRCR MN 5
 		SRCR O 4
 		SRCR L 12
@@ -92,6 +92,8 @@ ACTOR SorcererFX1
 	Damage 10
 	DamageType Fire
 	Projectile
+	-ACTIVATEIMPACT
+	-ACTIVATEPCROSS
 	RenderStyle Add
 	States
 	{
@@ -196,6 +198,8 @@ ACTOR Sorcerer2FX1
 	FastSpeed 28
 	Damage 1
 	Projectile
+	-ACTIVATEIMPACT
+	-ACTIVATEPCROSS
 	RenderStyle Add
 
 	action native A_BlueSpark ();
diff --git a/wadsrc/static/actors/heretic/hereticmisc.txt b/wadsrc/static/actors/heretic/hereticmisc.txt
index a1eafde1c..b03e57a17 100644
--- a/wadsrc/static/actors/heretic/hereticmisc.txt
+++ b/wadsrc/static/actors/heretic/hereticmisc.txt
@@ -30,7 +30,7 @@ ACTOR Pod 2035
 		PPOD C 5 BRIGHT A_RemovePod
 		PPOD D 5 BRIGHT A_Scream
 		PPOD E 5 BRIGHT A_Explode
-		PPOD F 5 BRIGHT
+		PPOD F 10 BRIGHT
 		Stop
 	Grow:
 		PPOD IJKLMNOP 3
@@ -67,6 +67,7 @@ ACTOR PodGenerator 43
 	SpawnID 126
 	+NOBLOCKMAP
 	+NOSECTOR
+	+DONTSPLASH
 
 	action native A_MakePod ();
 
@@ -88,6 +89,7 @@ ACTOR TeleGlitterGenerator1 74
 	+NOBLOCKMAP 
 	+NOSECTOR 
 	+NOGRAVITY
+	+DONTSPLASH
 	States
 	{
 	Spawn:
@@ -105,6 +107,7 @@ ACTOR TeleGlitterGenerator2 52
 	+NOBLOCKMAP 
 	+NOSECTOR 
 	+NOGRAVITY
+	+DONTSPLASH
 	States
 	{
 	Spawn:
diff --git a/wadsrc/static/actors/heretic/hereticweaps.txt b/wadsrc/static/actors/heretic/hereticweaps.txt
index caf52ada0..0e7087591 100644
--- a/wadsrc/static/actors/heretic/hereticweaps.txt
+++ b/wadsrc/static/actors/heretic/hereticweaps.txt
@@ -77,8 +77,8 @@ ACTOR StaffPuff
 	States
 	{
 	Spawn:
-		PUF3 A 3 BRIGHT
-		PUF3 BCD 3
+		PUF3 A 4 BRIGHT
+		PUF3 BCD 4
 		Stop
 	}
 }
@@ -798,7 +798,6 @@ ACTOR BlasterPuff
 	+NOBLOCKMAP
 	+NOGRAVITY
 	+PUFFONACTORS
-	+NOTELEPORT
 	RenderStyle Add
 	States
 	{
@@ -856,6 +855,9 @@ ACTOR SkullRodPowered : SkullRod
 	Weapon.AmmoUse1 5
 	Weapon.AmmoGive1 0
 	Weapon.SisterWeapon "SkullRod"
+
+	action native A_FireSkullRodPL2();
+
 	States
 	{
 	Fire:
@@ -863,7 +865,7 @@ ACTOR SkullRodPowered : SkullRod
 		HROD D 3
 		HROD E 2
 		HROD F 3
-		HROD G 4 A_FireCustomMissile("HornRodFX2")
+		HROD G 4 A_FireSkullRodPL2
 		HROD F 2
 		HROD E 3
 		HROD D 2
diff --git a/wadsrc/static/actors/heretic/ironlich.txt b/wadsrc/static/actors/heretic/ironlich.txt
index 44c34dc74..f9cfa3a61 100644
--- a/wadsrc/static/actors/heretic/ironlich.txt
+++ b/wadsrc/static/actors/heretic/ironlich.txt
@@ -63,6 +63,8 @@ ACTOR HeadFX1
 	FastSpeed 20
 	Damage 1
 	Projectile
+	-ACTIVATEIMPACT
+	-ACTIVATEPCROSS
 	+THRUGHOST
 	RenderStyle Add
 
@@ -128,7 +130,7 @@ ACTOR HeadFX3
 		FX06 ABC 4 BRIGHT A_LichFireGrow
 		Loop
 	NoGrow:
-		FX06 ABC 4 BRIGHT
+		FX06 ABC 5 BRIGHT
 		Loop
 	Death:
 		FX06 DEFG 5 BRIGHT
@@ -144,7 +146,7 @@ ACTOR Whirlwind native
 	Game Heretic
 	SpawnID 165
 	Radius 16
-	Height 75
+	Height 74
 	Speed 10
 	Damage 1
 	Projectile
diff --git a/wadsrc/static/actors/heretic/knight.txt b/wadsrc/static/actors/heretic/knight.txt
index 8c0420170..cc47323a5 100644
--- a/wadsrc/static/actors/heretic/knight.txt
+++ b/wadsrc/static/actors/heretic/knight.txt
@@ -83,6 +83,8 @@ ACTOR KnightAxe
 	Damage 2
 	Projectile
 	-NOBLOCKMAP
+	-ACTIVATEIMPACT
+	-ACTIVATEPCROSS
 	+WINDTHRUST
 	DeathSound "hknight/hit"
 	States
diff --git a/wadsrc/static/actors/heretic/wizard.txt b/wadsrc/static/actors/heretic/wizard.txt
index caf2da761..18188a321 100644
--- a/wadsrc/static/actors/heretic/wizard.txt
+++ b/wadsrc/static/actors/heretic/wizard.txt
@@ -83,6 +83,8 @@ ACTOR WizardFX1
 	FastSpeed 24
 	Damage 3
 	Projectile
+	-ACTIVATEIMPACT
+	-ACTIVATEPCROSS
 	RenderStyle Add
 	States
 	{