Stripped out the acid spitting demon from jDoom64. It was added in th…

…e Outcast edition.
skyjake · Mar 8, 2008 · 2a85469 · 2a85469
1 parent 9c4bd12
commit 2a85469
Show file tree

Hide file tree

Showing 9 changed files with 1 addition and 451 deletions.
diff --git a/doomsday/plugins/jdoom64/defs/objects.ded b/doomsday/plugins/jdoom64/defs/objects.ded
@@ -5478,59 +5478,6 @@ Thing {
   Flags = "mf_missile mf_noblockmap mf_dropoff";
 }
 
-Thing {
-  ID = "ACID";
-  Name = "Acid Demon";
-  DoomEd number = 552;
-  Spawn state = "ACID_STND";
-  See state = "ACID_RUN1";
-  Pain state = "ACID_PAIN";
-  Melee state = "NULL";
-  Missile state = "ACID_DECIDE";
-  Death state = "ACID_DIE1";
-  Xdeath state = "NULL";
-  Raise state = "NULL";
-  See sound = "sgtsit";
-  Attack sound = "sgtatk";
-  Pain sound = "dmpain";
-  Death sound = "sgtdth";
-  Active sound = "dmact";
-  Reaction time = 8;
-  Pain chance = 180;
-  Spawn health = 200;
-  Speed = 7;
-  Radius = 32;
-  Height = 56;
-  Mass = 400;
-  Flags = "mf_solid mf_shootable mf_countkill";
-}
-
-Thing {
-  ID = "ACIDMISSILE";
-  DoomEd number = -1;
-  Spawn state = "ACID3";
-  See state = "NULL";
-  Pain state = "NULL";
-  Melee state = "NULL";
-  Missile state = "NULL";
-  Death state = "RPUFF1";
-  Xdeath state = "NULL";
-  Raise state = "NULL";
-  See sound = "None";
-  Attack sound = "None";
-  Pain sound = "None";
-  Death sound = "None";
-  Active sound = "None";
-  Reaction time = 8;
-  Spawn health = 1000;
-  Speed = 11;
-  Radius = 11;
-  Height = 8;
-  Mass =80;
-  Damage = 1;
-  Flags = "mf_missile mf_noblockmap mf_dropoff";
-}
-
 Thing {
   ID = "MT_TELEPORTCHAINGUY";
   DoomEd number = 7631;
@@ -5579,30 +5526,6 @@ Thing {
   Flags = "mf_noblockmap mf_nosector mf_local";
 }
 
-Thing {
-  ID = "MT_TELEPORTACID";
-  DoomEd number = 7633;
-  Spawn state = "NULL";
-  See state = "NULL";
-  Pain state = "NULL";
-  Melee state = "NULL";
-  Missile state = "NULL";
-  Death state = "NULL";
-  Xdeath state = "NULL";
-  Raise state = "NULL";
-  See sound = "None";
-  Attack sound = "None";
-  Pain sound = "None";
-  Death sound = "None";
-  Active sound = "None";
-  Reaction time = 8;
-  Spawn health = 1000;
-  Radius = 20;
-  Height = 16;
-  Mass = 100;
-  Flags = "mf_noblockmap mf_nosector mf_local";
-}
-
 Thing {
   ID = "SUPERBONUS";
   DoomEd number = 553;
@@ -17664,159 +17587,6 @@ State {
   Next state = "GRENADE2";
 }
 
-State {
-  ID = "ACID_STND";
-  Sprite = "ACID";
-  Frame = 0;
-  Tics = 10;
-  Action = "A_Look";
-  Next state = "ACID_STND2";
-}
-
-State {
-  ID = "ACID_STND2";
-  Sprite = "ACID";
-  Frame = 1;
-  Tics = 10;
-  Action = "A_Look";
-  Next state = "ACID_STND";
-}
-
-State {
-  ID = "ACID_DECIDE";
-  Sprite = "ACID";
-  Frame = 3;
-  Tics = 0;
-  Action = "A_AcidCharge";
-  Next state = "ACID_RUN1";
-}
-
-State {
-  ID = "ACID_ATK1";
-  Sprite = "ACID";
-  Frame = 4;
-  Tics = 8;
-  Action = "A_FaceTarget";
-  Next state = "ACID_ATK2";
-}
-
-State {
-  ID = "ACID_ATK2";
-  Sprite = "ACID";
-  Frame = 5;
-  Tics = 8;
-  Action = "A_FaceTarget";
-  Next state = "ACID_ATK3";
-}
-
-State {
-  ID = "ACID_ATK3";
-  Sprite = "ACID";
-  Frame = 6;
-  Tics = 8;
-  Action = "A_SpitAcid";
-  Next state = "ACID_RUN1";
-}
-
-State {
-  ID = "ACID_PAIN";
-  Sprite = "ACID";
-  Frame = 7;
-  Tics = 2;
-  Next state = "ACID_PAIN2";
-}
-
-State {
-  ID = "ACID_PAIN2";
-  Sprite = "ACID";
-  Frame = 7;
-  Tics = 2;
-  Action = "A_Pain";
-  Next state = "ACID_RUN1";
-}
-
-State {
-  ID = "ACID_DIE1";
-  Sprite = "ACID";
-  Frame = 8;
-  Tics = 8;
-  Next state = "ACID_DIE2";
-}
-
-State {
-  ID = "ACID_DIE2";
-  Sprite = "ACID";
-  Frame = 9;
-  Tics = 8;
-  Action = "A_Scream";
-  Next state = "ACID_DIE3";
-}
-
-State {
-  ID = "ACID_DIE3";
-  Sprite = "ACID";
-  Frame = 10;
-  Tics = 4;
-  Next state = "ACID_DIE4";
-}
-
-State {
-  ID = "ACID_DIE4";
-  Sprite = "ACID";
-  Frame = 11;
-  Tics = 4;
-  Action = "A_Fall";
-  Next state = "ACID_DIE5";
-}
-
-State {
-  ID = "ACID_DIE5";
-  Sprite = "ACID";
-  Frame = 12;
-  Tics = 4;
-  Next state = "ACID_DIE6";
-}
-
-State {
-  ID = "ACID_DIE6";
-  Sprite = "ACID";
-  Frame = 13;
-  Tics = -1;
-  Next state = "NULL";
-}
-
-State {
-  ID = "ACID1";
-  Sprite = "ACIP";
-  Frame = 0;
-  Tics = 8;
-  Next state = "ACID2";
-}
-
-State {
-  ID = "ACID2";
-  Sprite = "ACIP";
-  Frame = 1;
-  Tics = 8;
-  Next state = "ACID3";
-}
-
-State {
-  ID = "ACID3";
-  Sprite = "ACIP";
-  Frame = 2;
-  Tics = 8;
-  Next state = "ACID4";
-}
-
-State {
-  ID = "ACID4";
-  Sprite = "ACIP";
-  Frame = 3;
-  Tics = 8;
-  Next state = "ACID3";
-}
-
 State {
   ID = "BON3";
   Sprite = "BON3";
@@ -17865,78 +17635,6 @@ State {
   Next state = "BON3";
 }
 
-State {
-  ID = "ACID_RUN1";
-  Sprite = "ACID";
-  Frame = 0;
-  Tics = 5;
-  Action = "A_Chase";
-  Next state = "ACID_RUN2";
-}
-
-State {
-  ID = "ACID_RUN2";
-  Sprite = "ACID";
-  Frame = 0;
-  Tics = 5;
-  Action = "A_Chase";
-  Next state = "ACID_RUN3";
-}
-
-State {
-  ID = "ACID_RUN3";
-  Sprite = "ACID";
-  Frame = 1;
-  Tics = 5;
-  Action = "A_Chase";
-  Next state = "ACID_RUN4";
-}
-
-State {
-  ID = "ACID_RUN4";
-  Sprite = "ACID";
-  Frame = 1;
-  Tics = 5;
-  Action = "A_Chase";
-  Next state = "ACID_RUN5";
-}
-
-State {
-  ID = "ACID_RUN5";
-  Sprite = "ACID";
-  Frame = 2;
-  Tics = 5;
-  Action = "A_Chase";
-  Next state = "ACID_RUN6";
-}
-
-State {
-  ID = "ACID_RUN6";
-  Sprite = "ACID";
-  Frame = 2;
-  Tics = 5;
-  Action = "A_Chase";
-  Next state = "ACID_RUN7";
-}
-
-State {
-  ID = "ACID_RUN7";
-  Sprite = "ACID";
-  Frame = 3;
-  Tics = 5;
-  Action = "A_Chase";
-  Next state = "ACID_RUN8";
-}
-
-State {
-  ID = "ACID_RUN8";
-  Sprite = "ACID";
-  Frame = 3;
-  Tics = 5;
-  Action = "A_Chase";
-  Next state = "ACID_RUN1";
-}
-
 State {
   ID = "HFOG";
   Sprite = "HFOG";

diff --git a/doomsday/plugins/jdoom64/defs/sprites.ded b/doomsday/plugins/jdoom64/defs/sprites.ded
@@ -168,7 +168,5 @@ Sprite { ID = "BLNK"; }
 Sprite { ID = "POSC"; }
 Sprite { ID = "BSGI"; }
 Sprite { ID = "GREN"; }
-Sprite { ID = "ACID"; }
-Sprite { ID = "ACIP"; }
 Sprite { ID = "STLK"; }
 Sprite { ID = "HFOG"; }
diff --git a/doomsday/plugins/jdoom64/include/acfnlink.h b/doomsday/plugins/jdoom64/include/acfnlink.h
@@ -141,8 +141,6 @@ void C_DECL A_CybrSpecial();
 void C_DECL A_BitchSpecial();
 void C_DECL A_Rocketpuff();
 void C_DECL A_BossExplode();
-void C_DECL A_SpitAcid();
-void C_DECL A_AcidCharge();
 void C_DECL A_TroopClaw();
 void C_DECL A_NtroopAttack();
 void C_DECL A_MotherFloorFire();

diff --git a/doomsday/plugins/jdoom64/include/info.h b/doomsday/plugins/jdoom64/include/info.h
@@ -199,8 +199,6 @@ typedef enum {
     SPR_POSC,
     SPR_BSGI,
     SPR_GREN,
-    SPR_ACID,
-    SPR_ACIP,
     SPR_STLK,
     SPR_HFOG,
     NUMSPRITES
@@ -1416,13 +1414,6 @@ typedef enum {
     S_TRACEEXP6,
     S_SMALL_WHITE_LIGHT,
     S_TEMPSOUNDORIGIN1,
-    S_ACID_RUN1,
-    S_ACID_RUN2,
-    S_ACID_RUN3,
-    S_ACID_RUN4,
-    S_ACID_RUN5,
-    S_ACID_RUN7,
-    S_ACID_RUN8,
     NUMSTATES
 } statenum_t;
 
@@ -1648,11 +1639,8 @@ typedef enum {
     MT_STALKER,
     MT_NIGHTCRAWLER,
     MT_GRENADE,
-    MT_ACID,
-    MT_ACIDMISSILE,
     MT_TELEPORTCHAINGUY,
     MT_TELEPORTCRAWLER,
-    MT_TELEPORTACID,
     MT_SUPERBONUS,
     MT_LIGHTSOURCE,
 
@@ -1830,7 +1818,7 @@ typedef enum {
     TXT_STSTR_DQDOFF,
     TXT_STSTR_KFAADDED,
     TXT_STSTR_FAADDED,
-    TXT_STSTR_NCON,
+    TXT_STSTR_NCON,
     TXT_STSTR_NCOFF,
     TXT_STSTR_BEHOLD,
     TXT_STSTR_BEHOLDX,

diff --git a/doomsday/plugins/jdoom64/include/p_mobj.h b/doomsday/plugins/jdoom64/include/p_mobj.h
@@ -62,7 +62,6 @@
 #define MELEERANGE          (64)
 #define PLRMELEERANGE       (80) // jd64 wide player radius.
 #define MISSILERANGE        (32 * 64)
-#define ACIDRANGE           (296) // jd64
 
 #define FLOATSPEED          (4)
 #define MAXHEALTH           (maxHealth) //100