- :3

LordMisfit · Jul 25, 2016 · 3f796be · 3f796be
1 parent 7e63c74
commit 3f796be
Show file tree

Hide file tree

Showing 8 changed files with 107 additions and 1 deletion.
diff --git a/Heretic/decorate/hereticmonsters.dec b/Heretic/decorate/hereticmonsters.dec
@@ -24,6 +24,7 @@ ACTOR ChickenNew : Chicken replaces Chicken
   Obituary "$OB_CHICKEN"
   States
   {
+  Pain.Charm: TNT1 A 0 { A_PlaySound("Teleport"); A_ChangeFlag("FRIENDLY",1); } Goto See
   Spawn:
     CHKN A 0 A_Look
     CHKN A 0 ACS_NamedExecuteAlways("MonsterStatsHP_ATK_DEF_SPD",0,0)
@@ -105,6 +106,7 @@ actor HereticImpNew : HereticImp replaces HereticImp
 
  states
  {
+  Pain.Charm: TNT1 A 0 { A_PlaySound("Teleport"); A_ChangeFlag("FRIENDLY",1); } Goto See
   Spawn:
     IMPX A 0 A_Look
     IMPX A 0 ACS_NamedExecuteAlways("MonsterStatsHP_ATK_DEF_SPD",0,0)
@@ -201,6 +203,7 @@ actor HereticImpLeaderNew : HereticImpLeader replaces HereticImpLeader
 
  states
  {
+  Pain.Charm: TNT1 A 0 { A_PlaySound("Teleport"); A_ChangeFlag("FRIENDLY",1); } Goto See
   Spawn:
     IMPX A 0 A_Look
     IMPX A 0 ACS_NamedExecuteAlways("MonsterStatsHP_ATK_DEF_SPD",0,0)
@@ -291,6 +294,7 @@ actor MummyNew : Mummy replaces Mummy
 
  states
  {
+  Pain.Charm: TNT1 A 0 { A_PlaySound("Teleport"); A_ChangeFlag("FRIENDLY",1); } Goto See
   Spawn:
     MUMM A 0 A_Look
     MUMM A 0 ACS_NamedExecuteAlways("MonsterStatsHP_ATK_DEF_SPD",0,0)
@@ -377,6 +381,7 @@ actor MummyGhostNew : MummyGhost replaces MummyGhost
 
  states
  {
+  Pain.Charm: TNT1 A 0 { A_PlaySound("Teleport"); A_ChangeFlag("FRIENDLY",1); } Goto See
   Spawn:
     MUMM A 0 A_Look
     MUMM A 0 ACS_NamedExecuteAlways("MonsterStatsHP_ATK_DEF_SPD",0,0)
@@ -463,6 +468,7 @@ actor MummyLeaderNew : MummyLeader replaces MummyLeader
 
  states
  {
+  Pain.Charm: TNT1 A 0 { A_PlaySound("Teleport"); A_ChangeFlag("FRIENDLY",1); } Goto See
   Spawn:
     MUMA A 0 A_Look
     MUMA A 0 ACS_NamedExecuteAlways("MonsterStatsHP_ATK_DEF_SPD",0,0)
@@ -558,6 +564,7 @@ actor MummyLeaderGhostNew : MummyLeaderGhost replaces MummyLeaderGhost
 
  states
  {
+  Pain.Charm: TNT1 A 0 { A_PlaySound("Teleport"); A_ChangeFlag("FRIENDLY",1); } Goto See
   Spawn:
     MUMA A 0 A_Look
     MUMA A 0 ACS_NamedExecuteAlways("MonsterStatsHP_ATK_DEF_SPD",0,0)
@@ -653,6 +660,7 @@ ACTOR KnightNew : Knight replaces Knight
 
   States
   {
+  Pain.Charm: TNT1 A 0 { A_PlaySound("Teleport"); A_ChangeFlag("FRIENDLY",1); } Goto See
   Spawn:
     KNIG A 0 A_Look
     KNIG A 0 ACS_NamedExecuteAlways("MonsterStatsHP_ATK_DEF_SPD",0,0)
@@ -742,6 +750,7 @@ ACTOR KnightGhostNew : KnightGhost replaces KnightGhost
 
   States
   {
+  Pain.Charm: TNT1 A 0 { A_PlaySound("Teleport"); A_ChangeFlag("FRIENDLY",1); } Goto See
   Spawn:
     KNIG A 0 A_Look
     KNIG A 0 ACS_NamedExecuteAlways("MonsterStatsHP_ATK_DEF_SPD",0,0)
@@ -834,6 +843,7 @@ ACTOR WizardNew : Wizard replaces Wizard
 
   States
   {
+  Pain.Charm: TNT1 A 0 { A_PlaySound("Teleport"); A_ChangeFlag("FRIENDLY",1); } Goto See
   Spawn:
     WZRD A 0 A_Look
     WZRD A 0 ACS_NamedExecuteAlways("MonsterStatsHP_ATK_DEF_SPD",0,0)
@@ -939,6 +949,7 @@ ACTOR IronlichNew : Ironlich replaces Ironlich
 
   States
   {
+  Pain.Charm: TNT1 A 0 { A_PlaySound("Teleport"); A_ChangeFlag("FRIENDLY",1); } Goto See
   Spawn:
     LICH A 0 A_Look
     LICH A 0 ACS_NamedExecuteAlways("MonsterStatsHP_ATK_DEF_SPD",0,0)
@@ -1023,6 +1034,7 @@ ACTOR ClinkNew : Clink replaces Clink
 
   States
   {
+  Pain.Charm: TNT1 A 0 { A_PlaySound("Teleport"); A_ChangeFlag("FRIENDLY",1); } Goto See
   Spawn:
     CLNK A 0 A_Look
     CLNK A 0 ACS_NamedExecuteAlways("MonsterStatsHP_ATK_DEF_SPD",0,0)
@@ -1108,6 +1120,7 @@ ACTOR BeastNew : Beast replaces Beast
 
   States
   {
+  Pain.Charm: TNT1 A 0 { A_PlaySound("Teleport"); A_ChangeFlag("FRIENDLY",1); } Goto See
   Spawn:
     BEAS A 0 A_Look
     BEAS A 0 ACS_NamedExecuteAlways("MonsterStatsHP_ATK_DEF_SPD",0,0)
@@ -1210,6 +1223,7 @@ ACTOR MaulotaurNew : Minotaur replaces Minotaur
   +AVOIDMELEE
   States
   {
+  Pain.Charm: TNT1 A 0 { A_PlaySound("Teleport"); A_ChangeFlag("FRIENDLY",1); } Goto See
   Spawn:
     MNTR A 0 A_Look
     MNTR A 0 ACS_NamedExecuteAlways("MonsterStatsHP_ATK_DEF_SPD",0,0)
@@ -1353,6 +1367,7 @@ ACTOR SnakeNew : Snake replaces Snake
 
   States
   {
+  Pain.Charm: TNT1 A 0 { A_PlaySound("Teleport"); A_ChangeFlag("FRIENDLY",1); } Goto See
   Spawn:
     SNKE A 0 A_Look
     SNKE A 0 ACS_NamedExecuteAlways("MonsterStatsHP_ATK_DEF_SPD",0,0)
@@ -1441,6 +1456,7 @@ ACTOR DSparilMountedNew : Sorcerer1 replaces Sorcerer1
   +AVOIDMELEE
   States
   {
+  Pain.Charm: Goto See
   Spawn:
     SRCR A 0 A_Look
     SRCR A 0 ACS_NamedExecuteAlways("MonsterStatsHP_ATK_DEF_SPD",0,0)
@@ -1526,6 +1542,7 @@ ACTOR DSparilUnmountedNew : Sorcerer2 replaces Sorcerer2
   +AVOIDMELEE
   States
   {
+  Pain.Charm: Goto See
   Spawn:
     SOR2 A 0 A_Look
     SOR2 A 0 ACS_NamedExecuteAlways("MonsterStatsHP_ATK_DEF_SPD",0,0)

diff --git a/Hexen/decorate/hexenmonsters.dec b/Hexen/decorate/hexenmonsters.dec
@@ -20,6 +20,7 @@ ACTOR PigNew : Pig replaces Pig
   ActiveSound "PigActive1"
   States
   {
+  Pain.Charm: TNT1 A 0 { A_PlaySound("Teleport"); A_ChangeFlag("FRIENDLY",1); } Goto See
   Spawn:
     PIGY B 0 A_Look
     PIGY B 0 ACS_NamedExecuteAlways("MonsterStatsHP_ATK_DEF_SPD",0,0)
@@ -120,6 +121,7 @@ ACTOR EttinNew : Ettin // replaces Ettin
 
   States
   {
+  Pain.Charm: TNT1 A 0 { A_PlaySound("Teleport"); A_ChangeFlag("FRIENDLY",1); } Goto See
   Spawn:
     ETTN A 0 A_Look
     ETTN A 0 ACS_NamedExecuteAlways("MonsterStatsHP_ATK_DEF_SPD",0,0)
@@ -222,6 +224,7 @@ ACTOR EttinGhostNew : EttinMash replaces EttinMash
 
   States
   {
+  Pain.Charm: TNT1 A 0 { A_PlaySound("Teleport"); A_ChangeFlag("FRIENDLY",1); } Goto See
   Spawn:
     ETTN A 0 A_Look
     ETTN A 0 ACS_NamedExecuteAlways("MonsterStatsHP_ATK_DEF_SPD",0,0)
@@ -313,7 +316,7 @@ Actor EttinCommander : Ettin
 
   States
   {
-
+  Pain.Charm: TNT1 A 0 { A_PlaySound("Teleport"); A_ChangeFlag("FRIENDLY",1); } Goto See
   Spawn:
     CETN A 0 A_Look
     CETN A 0 ACS_NamedExecuteAlways("MonsterStatsHP_ATK_DEF_SPD",0,0)
@@ -457,6 +460,7 @@ ACTOR CentaurNew : Centaur replaces Centaur
 
   States
   {
+  Pain.Charm: TNT1 A 0 { A_PlaySound("Teleport"); A_ChangeFlag("FRIENDLY",1); } Goto See
   Spawn:
     CENT A 0 A_Look
     CENT A 0 ACS_NamedExecuteAlways("MonsterStatsHP_ATK_DEF_SPD",0,0)
@@ -572,6 +576,7 @@ ACTOR CentaurGhostNew : CentaurMash replaces CentaurMash
 
   States
   {
+  Pain.Charm: TNT1 A 0 { A_PlaySound("Teleport"); A_ChangeFlag("FRIENDLY",1); } Goto See
   Spawn:
     CENT A 0 A_Look
     CENT A 0 ACS_NamedExecuteAlways("MonsterStatsHP_ATK_DEF_SPD",0,0)
@@ -659,6 +664,7 @@ ACTOR SlaughtaurNew : CentaurLeader replaces CentaurLeader
 
   States
   {
+  Pain.Charm: TNT1 A 0 { A_PlaySound("Teleport"); A_ChangeFlag("FRIENDLY",1); } Goto See
   Spawn:
     CENT A 0 A_Look
     CENT A 0 ACS_NamedExecuteAlways("MonsterStatsHP_ATK_DEF_SPD",0,0)
@@ -774,6 +780,7 @@ ACTOR FireDemonNew : FireDemon replaces FireDemon
 
   States
   {
+  Pain.Charm: TNT1 A 0 { A_PlaySound("Teleport"); A_ChangeFlag("FRIENDLY",1); } Goto See
   Spawn:
     FDMN X 0 A_Look
     FDMN X 0 ACS_NamedExecuteAlways("MonsterStatsHP_ATK_DEF_SPD",0,0)
@@ -877,6 +884,7 @@ ACTOR BishopNew : Bishop // replaces Bishop
 
   States
   {
+  Pain.Charm: TNT1 A 0 { A_PlaySound("Teleport"); A_ChangeFlag("FRIENDLY",1); } Goto See
   Spawn:
     BISH A 0 A_Look
     BISH A 0 ACS_NamedExecuteAlways("MonsterStatsHP_ATK_DEF_SPD",0,0)
@@ -1008,6 +1016,7 @@ ACTOR StalkerNew : Serpent replaces Serpent
 
   States
   {
+  Pain.Charm: TNT1 A 0 { A_PlaySound("Teleport"); A_ChangeFlag("FRIENDLY",1); } Goto See
   Spawn:
     SSPT H 0 A_Look
     SSPT H 0 ACS_NamedExecuteAlways("MonsterStatsHP_ATK_DEF_SPD",0,0)
@@ -1112,6 +1121,7 @@ ACTOR StalkerLeaderNew : SerpentLeader replaces SerpentLeader
 
   States
   {
+  Pain.Charm: TNT1 A 0 { A_PlaySound("Teleport"); A_ChangeFlag("FRIENDLY",1); } Goto See
   Spawn:
     SSPT H 0 A_Look
     SSPT H 0 ACS_NamedExecuteAlways("MonsterStatsHP_ATK_DEF_SPD",0,0)
@@ -1219,6 +1229,7 @@ ACTOR GreenChaosSerpentNew : Demon1 replaces Demon1
 
   States
   {
+  Pain.Charm: TNT1 A 0 { A_PlaySound("Teleport"); A_ChangeFlag("FRIENDLY",1); } Goto See
   Spawn:
     DEMN A 0 A_Look
     DEMN A 0 ACS_NamedExecuteAlways("MonsterStatsHP_ATK_DEF_SPD",0,0)
@@ -1331,6 +1342,7 @@ ACTOR GreenChaosSerpentGhostNew : Demon1Mash replaces Demon1Mash
 
   States
   {
+  Pain.Charm: TNT1 A 0 { A_PlaySound("Teleport"); A_ChangeFlag("FRIENDLY",1); } Goto See
   Spawn:
     DEMN A 0 A_Look
     DEMN A 0 ACS_NamedExecuteAlways("MonsterStatsHP_ATK_DEF_SPD",0,0)
@@ -1414,6 +1426,7 @@ ACTOR BrownChaosSerpentNew : Demon2 replaces Demon2
 
   States
   {
+  Pain.Charm: TNT1 A 0 { A_PlaySound("Teleport"); A_ChangeFlag("FRIENDLY",1); } Goto See
   Spawn:
     DEM2 A 0 A_Look
     DEM2 A 0 ACS_NamedExecuteAlways("MonsterStatsHP_ATK_DEF_SPD",0,0)
@@ -1520,6 +1533,7 @@ ACTOR BrownChaosSerpentGhostNew : Demon2Mash replaces Demon2Mash
 
   States
   {
+  Pain.Charm: TNT1 A 0 { A_PlaySound("Teleport"); A_ChangeFlag("FRIENDLY",1); } Goto See
   Spawn:
     DEM2 A 0 A_Look
     DEM2 A 0 ACS_NamedExecuteAlways("MonsterStatsHP_ATK_DEF_SPD",0,0)
@@ -1604,6 +1618,7 @@ ACTOR WraithNew : Wraith replaces Wraith
 
   States
   {
+  Pain.Charm: TNT1 A 0 { A_PlaySound("Teleport"); A_ChangeFlag("FRIENDLY",1); } Goto See
   Spawn:
     WRTH A 0 A_Look
     WRTH A 0 ACS_NamedExecuteAlways("MonsterStatsHP_ATK_DEF_SPD",0,0)
@@ -1716,6 +1731,7 @@ ACTOR WraithBuriedNew : WraithBuried replaces WraithBuried
 
   States
   {
+  Pain.Charm: TNT1 A 0 { A_PlaySound("Teleport"); A_ChangeFlag("FRIENDLY",1); } Goto See
   Spawn:
     TNT1 A 0
     TNT1 A 0 ACS_NamedExecuteAlways("MonsterStatsHP_ATK_DEF_SPD",0,0)
@@ -1822,6 +1838,7 @@ ACTOR IceGuyNew : IceGuy replaces IceGuy
 
   States
   {
+  Pain.Charm: TNT1 A 0 { A_PlaySound("Teleport"); A_ChangeFlag("FRIENDLY",1); } Goto See
   Spawn:
     ICEY A 0 A_Look
     ICEY A 0 ACS_NamedExecuteAlways("MonsterStatsHP_ATK_DEF_SPD",0,0)
@@ -1902,6 +1919,7 @@ ACTOR HeresiarchNew : Heresiarch replaces Heresiarch
   +AVOIDMELEE
   States
   {
+  Pain.Charm: Goto See
   Spawn:
     SORC A 0 A_Look
     SORC A 0 ACS_NamedExecuteAlways("MonsterStatsHP_ATK_DEF_SPD",0,0)
@@ -2054,6 +2072,7 @@ ACTOR KoraxNew : Korax replaces Korax
 
   States
   {
+  Pain.Charm: Goto See
   Spawn:
     KORX A 0 A_Look
     KORX A 0 ACS_NamedExecuteAlways("MonsterStatsHP_ATK_DEF_SPD",0,0)
@@ -2152,6 +2171,7 @@ ACTOR DragonNew : Dragon replaces Dragon
   +AVOIDMELEE
   States
   {
+  Pain.Charm: Goto See
   Spawn:
     DRAG A 0 A_Look
     DRAG A 0 ACS_NamedExecuteAlways("MonsterStatsHP_ATK_DEF_SPD",0,0)
@@ -2236,6 +2256,7 @@ ACTOR ClericBossNew : ClericBoss replaces ClericBoss
 
   States
   {
+  Pain.Charm: Goto See
   Spawn:
     CLER A 0 A_Look
     CLER A 0 ACS_NamedExecuteAlways("MonsterStatsHP_ATK_DEF_SPD",0,0)
@@ -2404,6 +2425,7 @@ ACTOR FighterBossNew : FighterBoss replaces FighterBoss
 
   States
   {
+  Pain.Charm: Goto See
   Spawn:
     PLAY A 0 A_Look
     PLAY A 0 ACS_NamedExecuteAlways("MonsterStatsHP_ATK_DEF_SPD",0,0)
@@ -2547,6 +2569,7 @@ ACTOR MageBossNew : MageBoss replaces MageBoss
 
   States
   {
+  Pain.Charm: Goto See
   Spawn:
     MAGE A 0 A_Look
     MAGE A 0 ACS_NamedExecuteAlways("MonsterStatsHP_ATK_DEF_SPD",0,0)
@@ -2705,6 +2728,7 @@ ACTOR VampireDVDS : Bishop
   Obituary "A Vampire drained all of %o's life."
   States 
   { 
+   Pain.Charm: TNT1 A 0 { A_PlaySound("Teleport"); A_ChangeFlag("FRIENDLY",1); } Goto See
    Spawn: 
     VAM1 A 0 A_Look
     VAM1 A 0 ACS_NamedExecuteAlways("MonsterStatsHP_ATK_DEF_SPD",0,0)