- fixed some discrepancies in Harmony's actor definitions.

This commit is contained in:
Christoph Oelckers 2019-07-22 21:20:51 +02:00
parent 7b680e2f12
commit 7e71532ccc

View file

@ -78,15 +78,15 @@ actor Beastling replaces ZombieMan
SARG AB 10 A_Look SARG AB 10 A_Look
loop loop
See: See:
SARG AABBCCDD 2 A_Chase SARG AABBCCDD 2 Fast A_Chase
loop loop
Pain: Pain:
SARG H 2 SARG H 2 Fast
SARG H 2 A_Pain SARG H 2 Fast A_Pain
goto See goto See
Melee: Melee:
SARG EF 8 A_FaceTarget SARG EF 8 Fast A_FaceTarget
SARG G 8 A_SargAttack SARG G 8 Fast A_SargAttack
goto See goto See
Missile: Missile:
SARG E 10 A_FaceTarget SARG E 10 A_FaceTarget
@ -101,6 +101,9 @@ actor Beastling replaces ZombieMan
SARG M 4 SARG M 4
SARG N -1 SARG N -1
stop stop
Raise:
SARG NMLKJI 5
Goto See
} }
} }
@ -108,7 +111,7 @@ actor Follower replaces ShotgunGuy
{ {
scale .33 scale .33
health 60 health 60
radius 10 radius 20
height 56 height 56
mass 75 mass 75
speed 8 speed 8
@ -165,7 +168,8 @@ actor FallingFollower replaces Archvile
height 56 height 56
reactiontime 8 reactiontime 8
painchance 170 painchance 170
mass 75 mass 100
MaxTargetRange 896
seesound "shotguy/sight" seesound "shotguy/sight"
attacksound "shotguy/attack" attacksound "shotguy/attack"
painsound "shotguy/pain" painsound "shotguy/pain"
@ -188,8 +192,7 @@ actor FallingFollower replaces Archvile
BON1 A 2 A_Chase BON1 A 2 A_Chase
BON1 A 1 A_Chase BON1 A 1 A_Chase
BON1 B 2 A_Chase BON1 B 2 A_Chase
BON1 B 1 A_Chase BON1 B 2 A_Chase
BON1 C 2 A_Chase
BON1 CC 6 A_Chase BON1 CC 6 A_Chase
BON1 D 2 A_Chase BON1 D 2 A_Chase
BON1 D 6 A_Chase BON1 D 6 A_Chase
@ -316,7 +319,7 @@ actor Obstacle1 replaces Fatso
painchance 80 painchance 80
mass 1000 mass 1000
MONSTER MONSTER
-SHOOTABLE +SHOOTABLE
+FLOORCLIP +FLOORCLIP
-COUNTKILL -COUNTKILL
states states
@ -523,6 +526,7 @@ actor Mine replaces LostSoul
+NOICEDEATH +NOICEDEATH
+DONTFALL +DONTFALL
-COUNTKILL -COUNTKILL
+NOBLOOD
states states
{ {
Spawn: Spawn:
@ -1039,6 +1043,7 @@ actor PurpleKeycard : Key replaces RedCard
height 16 height 16
inventory.pickupmessage "$GOTREDCARD" inventory.pickupmessage "$GOTREDCARD"
inventory.icon "STKEYS2" inventory.icon "STKEYS2"
+NOTDMATCH
states states
{ {
Spawn: Spawn:
@ -1057,6 +1062,7 @@ actor YellowKeycard : Key replaces YellowCard
height 16 height 16
inventory.pickupmessage "$GOTYELWCARD" inventory.pickupmessage "$GOTYELWCARD"
inventory.icon "STKEYS1" inventory.icon "STKEYS1"
+NOTDMATCH
states states
{ {
Spawn: Spawn:
@ -1355,9 +1361,10 @@ actor Minigun : Weapon replaces Chaingun
CHGG AB 4 A_Refire CHGG AB 4 A_Refire
goto Ready goto Ready
Flash: Flash:
CHGF AB 5 bright A_Light1 CHGF A 5 bright A_Light1
SHTG E 0 A_Light0 Goto LightDone
stop CHGF B 5 bright A_Light1
Goto LightDone
Spawn: Spawn:
MGUN A -1 MGUN A -1
stop stop