savegames are now independend from different jake2 builds and releases

22 files changed, 409 insertions, 22 deletions

diff --git a/src/jake2/game/monsters/M_Actor.java b/src/jake2/game/monsters/M_Actor.java
index 8430e27..9aae1fc 100644
--- a/src/jake2/game/monsters/M_Actor.java
+++ b/src/jake2/game/monsters/M_Actor.java
@@ -19,7 +19,7 @@
  */
 
 // Created on 11.11.2003 by RST.
-// $Id: M_Actor.java,v 1.3 2005-11-16 22:24:52 salomo Exp $
+// $Id: M_Actor.java,v 1.4 2005-11-20 22:18:33 salomo Exp $
 package jake2.game.monsters;
 
 import jake2.Defines;
@@ -1014,6 +1014,7 @@ public class M_Actor {
             "Adrianator", "Rambear", "Titus", "Bitterman" };
 
     static EntThinkAdapter actor_stand = new EntThinkAdapter() {
+        public String getID() { return "actor_stand";}
         public boolean think(edict_t self) {
             self.monsterinfo.currentmove = actor_move_stand;
 
@@ -1088,6 +1089,7 @@ public class M_Actor {
             actor_frames_walk, null);
 
     static EntThinkAdapter actor_walk = new EntThinkAdapter() {
+        public String getID() { return "actor_walk";}
         public boolean think(edict_t self) {
             self.monsterinfo.currentmove = actor_move_walk;
             return true;
@@ -1112,6 +1114,7 @@ public class M_Actor {
             actor_frames_run, null);
 
     static EntThinkAdapter actor_run = new EntThinkAdapter() {
+        public String getID() { return "actor_run";}
         public boolean think(edict_t self) {
             if ((GameBase.level.time < self.pain_debounce_time)
                     && (self.enemy == null)) {
@@ -1202,6 +1205,7 @@ public class M_Actor {
             "Check your targets" };
 
     static EntPainAdapter actor_pain = new EntPainAdapter() {
+        public String getID() { return "actor_pain";}
         public void pain(edict_t self, edict_t other, float kick, int damage) {
 
             int n;
@@ -1247,6 +1251,7 @@ public class M_Actor {
     };
 
     static EntThinkAdapter actor_dead = new EntThinkAdapter() {
+        public String getID() { return "actor_dead";}
         public boolean think(edict_t self) {
             Math3D.VectorSet(self.mins, -16, -16, -24);
             Math3D.VectorSet(self.maxs, 16, 16, -8);
@@ -1289,6 +1294,7 @@ public class M_Actor {
             FRAME_death213, actor_frames_death2, actor_dead);
 
     static EntDieAdapter actor_die = new EntDieAdapter() {
+        public String getID() { return "actor_die";}
         public void die(edict_t self, edict_t inflictor, edict_t attacker,
                 int damage, float[] point) {
             int n;
@@ -1327,6 +1333,7 @@ public class M_Actor {
     };
 
     static EntThinkAdapter actor_fire = new EntThinkAdapter() {
+        public String getID() { return "actor_fire";}
         public boolean think(edict_t self) {
             actorMachineGun(self);
 
@@ -1349,6 +1356,7 @@ public class M_Actor {
             FRAME_attak04, actor_frames_attack, actor_run);
 
     static EntThinkAdapter actor_attack = new EntThinkAdapter() {
+        public String getID() { return "actor_attack";}
         public boolean think(edict_t self) {
             int n;
 
@@ -1362,6 +1370,7 @@ public class M_Actor {
     };
 
     static EntUseAdapter actor_use = new EntUseAdapter() {
+        public String getID() { return "actor_use";}
         public void use(edict_t self, edict_t other, edict_t activator) {
             float v[] = { 0, 0, 0 };
 
@@ -1401,6 +1410,7 @@ public class M_Actor {
      */
 
     static EntTouchAdapter target_actor_touch = new EntTouchAdapter() {
+        public String getID() { return "target_actor_touch";}
         public void touch(edict_t self, edict_t other, cplane_t plane,
                 csurface_t surf) {
             float v[] = { 0, 0, 0 };
diff --git a/src/jake2/game/monsters/M_Berserk.java b/src/jake2/game/monsters/M_Berserk.java
index 9f5fa59..dc4e79a 100644
--- a/src/jake2/game/monsters/M_Berserk.java
+++ b/src/jake2/game/monsters/M_Berserk.java
@@ -20,7 +20,7 @@
 
 // Created on 11.11.2003 by RST
 
-// $Id: M_Berserk.java,v 1.3 2005-11-16 22:24:52 salomo Exp $
+// $Id: M_Berserk.java,v 1.4 2005-11-20 22:18:33 salomo Exp $
 
 package jake2.game.monsters;
 
@@ -534,6 +534,7 @@ public class M_Berserk {
     static int sound_search;
 
     static EntInteractAdapter berserk_sight = new EntInteractAdapter() {
+        public String getID() { return "berserk_sight";}
         public boolean interact(edict_t self, edict_t other) {
             GameBase.gi.sound(self, Defines.CHAN_VOICE, sound_sight, 1,
                     Defines.ATTN_NORM, 0);
@@ -542,6 +543,7 @@ public class M_Berserk {
     };
 
     static EntThinkAdapter berserk_search = new EntThinkAdapter() {
+        public String getID() { return "berserk_search";}
         public boolean think(edict_t self) {
             GameBase.gi.sound(self, Defines.CHAN_VOICE, sound_search, 1,
                     Defines.ATTN_NORM, 0);
@@ -550,6 +552,7 @@ public class M_Berserk {
     };
 
     static EntThinkAdapter berserk_fidget = new EntThinkAdapter() {
+        public String getID() { return "berserk_fidget";}
         public boolean think(edict_t self) {
             if ((self.monsterinfo.aiflags & Defines.AI_STAND_GROUND) != 0)
                 return true;
@@ -575,6 +578,7 @@ public class M_Berserk {
             berserk_frames_stand, null);
 
     static EntThinkAdapter berserk_stand = new EntThinkAdapter() {
+        public String getID() { return "berserk_stand";}
         public boolean think(edict_t self) {
             self.monsterinfo.currentmove = berserk_move_stand;
             return true;
@@ -624,6 +628,7 @@ public class M_Berserk {
             berserk_frames_walk, null);
 
     static EntThinkAdapter berserk_walk = new EntThinkAdapter() {
+        public String getID() { return "berserk_walk";}
         public boolean think(edict_t self) {
             self.monsterinfo.currentmove = berserk_move_walk;
             return true;
@@ -664,6 +669,7 @@ public class M_Berserk {
             berserk_frames_run1, null);
 
     static EntThinkAdapter berserk_run = new EntThinkAdapter() {
+        public String getID() { return "berserk_run";}
         public boolean think(edict_t self) {
             if ((self.monsterinfo.aiflags & Defines.AI_STAND_GROUND) != 0)
                 self.monsterinfo.currentmove = berserk_move_stand;
@@ -674,6 +680,7 @@ public class M_Berserk {
     };
 
     static EntThinkAdapter berserk_attack_spike = new EntThinkAdapter() {
+        public String getID() { return "berserk_attack_spike";}
         public boolean think(edict_t self) {
             float[] aim = { Defines.MELEE_DISTANCE, 0f, -24f };
 
@@ -685,6 +692,7 @@ public class M_Berserk {
     };
 
     static EntThinkAdapter berserk_swing = new EntThinkAdapter() {
+        public String getID() { return "berserk_swing";}
         public boolean think(edict_t self) {
             GameBase.gi.sound(self, Defines.CHAN_WEAPON, sound_punch, 1,
                     Defines.ATTN_NORM, 0);
@@ -706,6 +714,7 @@ public class M_Berserk {
             FRAME_att_c8, berserk_frames_attack_spike, berserk_run);
 
     static EntThinkAdapter berserk_attack_club = new EntThinkAdapter() {
+        public String getID() { return "berserk_attack_club";}
         public boolean think(edict_t self) {
             float aim[] = { 0, 0, 0 };
 
@@ -735,6 +744,7 @@ public class M_Berserk {
             FRAME_att_c20, berserk_frames_attack_club, berserk_run);
 
     static EntThinkAdapter berserk_strike = new EntThinkAdapter() {
+        public String getID() { return "berserk_strike";}
         public boolean think(edict_t self) {
             return true;
         }
@@ -760,6 +770,7 @@ public class M_Berserk {
             FRAME_att_c34, berserk_frames_attack_strike, berserk_run);
 
     static EntThinkAdapter berserk_melee = new EntThinkAdapter() {
+        public String getID() { return "berserk_melee";}
         public boolean think(edict_t self) {
             if ((Lib.rand() % 2) == 0)
                 self.monsterinfo.currentmove = berserk_move_attack_spike;
@@ -825,6 +836,7 @@ public class M_Berserk {
             FRAME_painb20, berserk_frames_pain2, berserk_run);
 
     static EntPainAdapter berserk_pain = new EntPainAdapter() {
+        public String getID() { return "berserk_pain";}
         public void pain(edict_t self, edict_t other, float kick, int damage) {
             if (self.health < (self.max_health / 2))
                 self.s.skinnum = 1;
@@ -847,6 +859,7 @@ public class M_Berserk {
     };
 
     static EntThinkAdapter berserk_dead = new EntThinkAdapter() {
+        public String getID() { return "berserk_dead";}
         public boolean think(edict_t self) {
             Math3D.VectorSet(self.mins, -16, -16, -24);
             Math3D.VectorSet(self.maxs, 16, 16, -8);
@@ -890,6 +903,7 @@ public class M_Berserk {
             FRAME_deathc8, berserk_frames_death2, berserk_dead);
 
     static EntDieAdapter berserk_die = new EntDieAdapter() {
+        public String getID() { return "berserk_die";}
         public void die(edict_t self, edict_t inflictor, edict_t attacker,
                 int damage, float point[]) {
             int n;
diff --git a/src/jake2/game/monsters/M_Boss2.java b/src/jake2/game/monsters/M_Boss2.java
index 5633398..c77e6ce 100644
--- a/src/jake2/game/monsters/M_Boss2.java
+++ b/src/jake2/game/monsters/M_Boss2.java
@@ -19,7 +19,7 @@
  */
 
 // Created on 13.11.2003 by RST.
-// $Id: M_Boss2.java,v 1.3 2005-11-16 22:24:52 salomo Exp $
+// $Id: M_Boss2.java,v 1.4 2005-11-20 22:18:33 salomo Exp $
 package jake2.game.monsters;
 
 import jake2.Defines;
@@ -414,6 +414,7 @@ public class M_Boss2 {
     static int sound_search1;
 
     static EntThinkAdapter boss2_stand = new EntThinkAdapter() {
+    	public String getID() { return "boss2_stand"; }
         public boolean think(edict_t self) {
             self.monsterinfo.currentmove = boss2_move_stand;
             return true;
@@ -421,6 +422,7 @@ public class M_Boss2 {
     };
 
     static EntThinkAdapter boss2_run = new EntThinkAdapter() {
+    	public String getID() { return "boss2_run"; }
         public boolean think(edict_t self) {
             if ((self.monsterinfo.aiflags & Defines.AI_STAND_GROUND) != 0)
                 self.monsterinfo.currentmove = boss2_move_stand;
@@ -431,6 +433,7 @@ public class M_Boss2 {
     };
 
     static EntThinkAdapter boss2_walk = new EntThinkAdapter() {
+    	public String getID() { return "boss2_walk"; }
         public boolean think(edict_t self) {
             self.monsterinfo.currentmove = boss2_move_stand;
 
@@ -440,6 +443,7 @@ public class M_Boss2 {
     };
 
     static EntThinkAdapter boss2_attack = new EntThinkAdapter() {
+    	public String getID() { return "boss2_attack"; }
         public boolean think(edict_t self) {
             float[] vec = { 0, 0, 0 };
 
@@ -461,6 +465,7 @@ public class M_Boss2 {
     };
 
     static EntThinkAdapter boss2_attack_mg = new EntThinkAdapter() {
+    	public String getID() { return "boss2_attack_mg"; }
         public boolean think(edict_t self) {
             self.monsterinfo.currentmove = boss2_move_attack_mg;
             return true;
@@ -468,6 +473,7 @@ public class M_Boss2 {
     };
 
     static EntThinkAdapter boss2_reattack_mg = new EntThinkAdapter() {
+    	public String getID() { return "boss2_reattack_mg"; }
         public boolean think(edict_t self) {
             if (GameUtil.infront(self, self.enemy))
                 if (Lib.random() <= 0.7)
@@ -481,6 +487,7 @@ public class M_Boss2 {
     };
 
     static EntPainAdapter boss2_pain = new EntPainAdapter() {
+    	public String getID() { return "boss2_pain"; }
         public void pain(edict_t self, edict_t other, float kick, int damage) {
             if (self.health < (self.max_health / 2))
                 self.s.skinnum = 1;
@@ -507,6 +514,7 @@ public class M_Boss2 {
     };
 
     static EntThinkAdapter boss2_dead = new EntThinkAdapter() {
+    	public String getID() { return "boss2_dead"; }
         public boolean think(edict_t self) {
             Math3D.VectorSet(self.mins, -56, -56, 0);
             Math3D.VectorSet(self.maxs, 56, 56, 80);
@@ -519,6 +527,7 @@ public class M_Boss2 {
     };
 
     static EntDieAdapter boss2_die = new EntDieAdapter() {
+    	public String getID() { return "boss2_die"; }
         public void die(edict_t self, edict_t inflictor, edict_t attacker,
                 int damage, float[] point) {
             GameBase.gi.sound(self, Defines.CHAN_VOICE, sound_death, 1,
@@ -532,6 +541,7 @@ public class M_Boss2 {
     };
 
     static EntThinkAdapter Boss2_CheckAttack = new EntThinkAdapter() {
+    	public String getID() { return "Boss2_CheckAttack"; }
         public boolean think(edict_t self) {
             float[] spot1 = { 0, 0, 0 }, spot2 = { 0, 0, 0 };
             float[] temp = { 0, 0, 0 };
@@ -615,6 +625,7 @@ public class M_Boss2 {
     };
 
     static EntThinkAdapter boss2_search = new EntThinkAdapter() {
+    	public String getID() { return "boss2_search"; }
         public boolean think(edict_t self) {
             if (Lib.random() < 0.5)
                 GameBase.gi.sound(self, Defines.CHAN_VOICE, sound_search1, 1,
@@ -624,6 +635,7 @@ public class M_Boss2 {
     };
 
     static EntThinkAdapter Boss2Rocket = new EntThinkAdapter() {
+    	public String getID() { return "Boss2Rocket"; }
         public boolean think(edict_t self) {
             float[] forward = { 0, 0, 0 }, right = { 0, 0, 0 };
             float[] start = { 0, 0, 0 };
@@ -680,6 +692,7 @@ public class M_Boss2 {
     };
 
     static EntThinkAdapter boss2_firebullet_right = new EntThinkAdapter() {
+    	public String getID() { return "boss2_firebullet_right"; }
         public boolean think(edict_t self) {
             float[] forward = { 0, 0, 0 }, right = { 0, 0, 0 }, target = { 0,
                     0, 0 };
@@ -708,6 +721,7 @@ public class M_Boss2 {
     };
 
     static EntThinkAdapter boss2_firebullet_left = new EntThinkAdapter() {
+    	public String getID() { return "boss2_firebullet_left"; }
         public boolean think(edict_t self) {
             float[] forward = { 0, 0, 0 }, right = { 0, 0, 0 }, target = { 0,
                     0, 0 };
@@ -737,6 +751,7 @@ public class M_Boss2 {
     };
 
     static EntThinkAdapter Boss2MachineGun = new EntThinkAdapter() {
+    	public String getID() { return "Boss2MachineGun"; }
         public boolean think(edict_t self) {
             /*
              * RST: this was disabled ! float[] forward={0,0,0}, right={0,0,0};
diff --git a/src/jake2/game/monsters/M_Boss3.java b/src/jake2/game/monsters/M_Boss3.java
index 3ae6f65..3bdc6aa 100644
--- a/src/jake2/game/monsters/M_Boss3.java
+++ b/src/jake2/game/monsters/M_Boss3.java
@@ -19,7 +19,7 @@
  */
 
 // Created on 13.11.2003 by RST.
-// $Id: M_Boss3.java,v 1.2 2005-02-06 18:48:17 salomo Exp $
+// $Id: M_Boss3.java,v 1.3 2005-11-20 22:18:33 salomo Exp $
 package jake2.game.monsters;
 
 import jake2.Defines;
@@ -33,6 +33,7 @@ import jake2.util.Math3D;
 public class M_Boss3 {
 
     static EntUseAdapter Use_Boss3 = new EntUseAdapter() {
+    	public String getID() { return "Use_Boss3"; }
         public void use(edict_t ent, edict_t other, edict_t activator) {
             GameBase.gi.WriteByte(Defines.svc_temp_entity);
             GameBase.gi.WriteByte(Defines.TE_BOSSTPORT);
@@ -43,6 +44,7 @@ public class M_Boss3 {
     };
 
     static EntThinkAdapter Think_Boss3Stand = new EntThinkAdapter() {
+    	public String getID() { return "Think_Boss3Stand"; }
         public boolean think(edict_t ent) {
             if (ent.s.frame == M_Boss32.FRAME_stand260)
                 ent.s.frame = M_Boss32.FRAME_stand201;
diff --git a/src/jake2/game/monsters/M_Boss31.java b/src/jake2/game/monsters/M_Boss31.java
index 0c76d56..03a250f 100644
--- a/src/jake2/game/monsters/M_Boss31.java
+++ b/src/jake2/game/monsters/M_Boss31.java
@@ -19,7 +19,7 @@
  */
 
 // Created on 13.11.2003 by RST.
-// $Id: M_Boss31.java,v 1.3 2005-11-16 22:24:52 salomo Exp $
+// $Id: M_Boss31.java,v 1.4 2005-11-20 22:18:33 salomo Exp $
 package jake2.game.monsters;
 
 import jake2.Defines;
@@ -459,6 +459,7 @@ public class M_Boss31 {
      */
 
     static EntThinkAdapter jorg_search = new EntThinkAdapter() {
+    	public String getID() { return "jorg_search"; }
         public boolean think(edict_t self) {
             float r;
 
@@ -478,6 +479,7 @@ public class M_Boss31 {
     };
 
     static EntThinkAdapter jorg_idle = new EntThinkAdapter() {
+    	public String getID() { return "jorg_idle"; }
         public boolean think(edict_t self) {
             GameBase.gi.sound(self, Defines.CHAN_VOICE, sound_idle, 1,
                     Defines.ATTN_NORM, 0);
@@ -486,6 +488,7 @@ public class M_Boss31 {
     };
 
     static EntThinkAdapter jorg_death_hit = new EntThinkAdapter() {
+    	public String getID() { return "jorg_death_hit"; }
         public boolean think(edict_t self) {
             GameBase.gi.sound(self, Defines.CHAN_BODY, sound_death_hit, 1,
                     Defines.ATTN_NORM, 0);
@@ -494,6 +497,7 @@ public class M_Boss31 {
     };
 
     static EntThinkAdapter jorg_step_left = new EntThinkAdapter() {
+    	public String getID() { return "jorg_step_left"; }
         public boolean think(edict_t self) {
             GameBase.gi.sound(self, Defines.CHAN_BODY, sound_step_left, 1,
                     Defines.ATTN_NORM, 0);
@@ -502,6 +506,7 @@ public class M_Boss31 {
     };
 
     static EntThinkAdapter jorg_step_right = new EntThinkAdapter() {
+    	public String getID() { return "jorg_step_right"; }
         public boolean think(edict_t self) {
             GameBase.gi.sound(self, Defines.CHAN_BODY, sound_step_right, 1,
                     Defines.ATTN_NORM, 0);
@@ -510,6 +515,7 @@ public class M_Boss31 {
     };
 
     static EntThinkAdapter jorg_stand = new EntThinkAdapter() {
+    	public String getID() { return "jorg_stand"; }
         public boolean think(edict_t self) {
             self.monsterinfo.currentmove = jorg_move_stand;
             return true;
@@ -517,6 +523,7 @@ public class M_Boss31 {
     };
 
     static EntThinkAdapter jorg_reattack1 = new EntThinkAdapter() {
+    	public String getID() { return "jorg_reattack1"; }
         public boolean think(edict_t self) {
             if (GameUtil.visible(self, self.enemy))
                 if (Lib.random() < 0.9)
@@ -534,6 +541,7 @@ public class M_Boss31 {
     };
 
     static EntThinkAdapter jorg_attack1 = new EntThinkAdapter() {
+    	public String getID() { return "jorg_attack1"; }
         public boolean think(edict_t self) {
             self.monsterinfo.currentmove = jorg_move_attack1;
             return true;
@@ -541,6 +549,7 @@ public class M_Boss31 {
     };
 
     static EntPainAdapter jorg_pain = new EntPainAdapter() {
+    	public String getID() { return "jorg_pain"; }
         public void pain(edict_t self, edict_t other, float kick, int damage) {
             if (self.health < (self.max_health / 2))
                 self.s.skinnum = 1;
@@ -600,6 +609,7 @@ public class M_Boss31 {
     };
 
     static EntThinkAdapter jorgBFG = new EntThinkAdapter() {
+    	public String getID() { return "jorgBFG"; }
         public boolean think(edict_t self) {
             float[] forward = { 0, 0, 0 }, right = { 0, 0, 0 };
 
@@ -630,6 +640,7 @@ public class M_Boss31 {
     };
 
     static EntThinkAdapter jorg_firebullet_right = new EntThinkAdapter() {
+    	public String getID() { return "jorg_firebullet_right"; }
         public boolean think(edict_t self) {
             float[] forward = { 0, 0, 0 }, right = { 0, 0, 0 }, target = { 0,
                     0, 0 };
@@ -657,6 +668,7 @@ public class M_Boss31 {
     };
 
     static EntThinkAdapter jorg_firebullet_left = new EntThinkAdapter() {
+    	public String getID() { return "jorg_firebullet_left"; }
         public boolean think(edict_t self) {
             float[] forward = { 0, 0, 0 }, right = { 0, 0, 0 }, target = { 0,
                     0, 0 };
@@ -684,6 +696,7 @@ public class M_Boss31 {
     };
 
     static EntThinkAdapter jorg_firebullet = new EntThinkAdapter() {
+    	public String getID() { return "jorg_firebullet"; }
         public boolean think(edict_t self) {
             jorg_firebullet_left.think(self);
             jorg_firebullet_right.think(self);
@@ -692,6 +705,7 @@ public class M_Boss31 {
     };
 
     static EntThinkAdapter jorg_attack = new EntThinkAdapter() {
+    	public String getID() { return "jorg_attack"; }
         public boolean think(edict_t self) {
             float[] vec = { 0, 0, 0 };
             float range = 0;
@@ -715,6 +729,7 @@ public class M_Boss31 {
 
     /** Was disabled. RST. */
     static EntThinkAdapter jorg_dead = new EntThinkAdapter() {
+    	public String getID() { return "jorg_dead"; }
         public boolean think(edict_t self) {
             /*
              * edict_t tempent;
@@ -737,6 +752,7 @@ public class M_Boss31 {
     };
 
     static EntDieAdapter jorg_die = new EntDieAdapter() {
+    	public String getID() { return "jorg_die"; }
         public void die(edict_t self, edict_t inflictor, edict_t attacker,
                 int damage, float[] point) {
             GameBase.gi.sound(self, Defines.CHAN_VOICE, sound_death, 1,
@@ -751,6 +767,7 @@ public class M_Boss31 {
     };
 
     static EntThinkAdapter Jorg_CheckAttack = new EntThinkAdapter() {
+    	public String getID() { return "Jorg_CheckAttack"; }
         public boolean think(edict_t self) {
             float[] spot1 = { 0, 0, 0 }, spot2 = { 0, 0, 0 };
             float[] temp = { 0, 0, 0 };
@@ -963,6 +980,7 @@ public class M_Boss31 {
             jorg_frames_end_walk, null);
 
     static EntThinkAdapter jorg_walk = new EntThinkAdapter() {
+    	public String getID() { return "jorg_walk"; }
         public boolean think(edict_t self) {
             self.monsterinfo.currentmove = jorg_move_walk;
             return true;
@@ -970,6 +988,7 @@ public class M_Boss31 {
     };
 
     static EntThinkAdapter jorg_run = new EntThinkAdapter() {
+    	public String getID() { return "jorg_run"; }
         public boolean think(edict_t self) {
             if ((self.monsterinfo.aiflags & Defines.AI_STAND_GROUND) != 0)
                 self.monsterinfo.currentmove = jorg_move_stand;
diff --git a/src/jake2/game/monsters/M_Boss32.java b/src/jake2/game/monsters/M_Boss32.java
index 75e80c1..a27bb15 100644
--- a/src/jake2/game/monsters/M_Boss32.java
+++ b/src/jake2/game/monsters/M_Boss32.java
@@ -19,7 +19,7 @@
  */
 
 // Created on 13.11.2003 by RST.
-// $Id: M_Boss32.java,v 1.3 2005-11-16 22:24:52 salomo Exp $
+// $Id: M_Boss32.java,v 1.4 2005-11-20 22:18:33 salomo Exp $
 package jake2.game.monsters;
 
 import jake2.Defines;
@@ -1055,6 +1055,7 @@ public class M_Boss32 {
     static int sound_hit;
 
     static EntThinkAdapter makron_taunt = new EntThinkAdapter() {
+    	public String getID() { return "makron_taunt"; }
         public boolean think(edict_t self) {
             float r;
 
@@ -1076,6 +1077,7 @@ public class M_Boss32 {
     //	   stand
     //
     static EntThinkAdapter makron_stand = new EntThinkAdapter() {
+    	public String getID() { return "makron_stand"; }
         public boolean think(edict_t self) {
             self.monsterinfo.currentmove = makron_move_stand;
             return true;
@@ -1088,6 +1090,7 @@ public class M_Boss32 {
      */
 
     static EntThinkAdapter makron_hit = new EntThinkAdapter() {
+    	public String getID() { return "makron_hit"; }
         public boolean think(edict_t self) {
             GameBase.gi.sound(self, Defines.CHAN_AUTO, sound_hit, 1,
                     Defines.ATTN_NONE, 0);
@@ -1096,6 +1099,7 @@ public class M_Boss32 {
     };
 
     static EntThinkAdapter makron_popup = new EntThinkAdapter() {
+    	public String getID() { return "makron_popup"; }
         public boolean think(edict_t self) {
             GameBase.gi.sound(self, Defines.CHAN_BODY, sound_popup, 1,
                     Defines.ATTN_NONE, 0);
@@ -1104,6 +1108,7 @@ public class M_Boss32 {
     };
 
     static EntThinkAdapter makron_step_left = new EntThinkAdapter() {
+    	public String getID() { return "makron_step_left"; }
 
         public boolean think(edict_t self) {
             GameBase.gi.sound(self, Defines.CHAN_BODY, sound_step_left, 1,
@@ -1113,6 +1118,7 @@ public class M_Boss32 {
     };
 
     static EntThinkAdapter makron_step_right = new EntThinkAdapter() {
+    	public String getID() { return "makron_step_right"; }
         public boolean think(edict_t self) {
             GameBase.gi.sound(self, Defines.CHAN_BODY, sound_step_right, 1,
                     Defines.ATTN_NORM, 0);
@@ -1121,6 +1127,7 @@ public class M_Boss32 {
     };
 
     static EntThinkAdapter makron_brainsplorch = new EntThinkAdapter() {
+    	public String getID() { return "makron_brainsplorch"; }
         public boolean think(edict_t self) {
             GameBase.gi.sound(self, Defines.CHAN_VOICE, sound_brainsplorch, 1,
                     Defines.ATTN_NORM, 0);
@@ -1129,6 +1136,7 @@ public class M_Boss32 {
     };
 
     static EntThinkAdapter makron_prerailgun = new EntThinkAdapter() {
+    	public String getID() { return "makron_prerailgun"; }
         public boolean think(edict_t self) {
             GameBase.gi.sound(self, Defines.CHAN_WEAPON, sound_prerailgun, 1,
                     Defines.ATTN_NORM, 0);
@@ -1241,6 +1249,7 @@ public class M_Boss32 {
     //	   death
     //
     static EntThinkAdapter makron_dead = new EntThinkAdapter() {
+    	public String getID() { return "makron_dead"; }
         public boolean think(edict_t self) {
             Math3D.VectorSet(self.mins, -60, -60, 0);
             Math3D.VectorSet(self.maxs, 60, 60, 72);
@@ -1253,6 +1262,7 @@ public class M_Boss32 {
     };
 
     static EntThinkAdapter makron_walk = new EntThinkAdapter() {
+    	public String getID() { return "makron_walk"; }
         public boolean think(edict_t self) {
             self.monsterinfo.currentmove = makron_move_walk;
             return true;
@@ -1260,6 +1270,7 @@ public class M_Boss32 {
     };
 
     static EntThinkAdapter makron_run = new EntThinkAdapter() {
+    	public String getID() { return "makron_run"; }
         public boolean think(edict_t self) {
             if ((self.monsterinfo.aiflags & Defines.AI_STAND_GROUND) != 0)
                 self.monsterinfo.currentmove = makron_move_stand;
@@ -1475,6 +1486,7 @@ public class M_Boss32 {
             FRAME_active13, makron_frames_sight, makron_run);
 
     static EntThinkAdapter makronBFG = new EntThinkAdapter() {
+    	public String getID() { return "makronBFG"; }
         public boolean think(edict_t self) {
             float[] forward = { 0, 0, 0 }, right = { 0, 0, 0 };
 
@@ -1500,6 +1512,7 @@ public class M_Boss32 {
     };
 
     static EntThinkAdapter MakronSaveloc = new EntThinkAdapter() {
+    	public String getID() { return "MakronSaveloc"; }
         public boolean think(edict_t self) {
             Math3D.VectorCopy(self.enemy.s.origin, self.pos1); //save for
                                                                // aiming the
@@ -1512,6 +1525,7 @@ public class M_Boss32 {
     //	   FIXME: He's not firing from the proper Z
 
     static EntThinkAdapter MakronRailgun = new EntThinkAdapter() {
+    	public String getID() { return "MakronRailgun"; }
         public boolean think(edict_t self) {
             float[] start = { 0, 0, 0 };
             float[] dir = { 0, 0, 0 };
@@ -1536,6 +1550,7 @@ public class M_Boss32 {
     //	   FIXME: This is all wrong. He's not firing at the proper angles.
 
     static EntThinkAdapter MakronHyperblaster = new EntThinkAdapter() {
+    	public String getID() { return "MakronHyperblaster"; }
         public boolean think(edict_t self) {
             float[] dir = { 0, 0, 0 };
             float[] vec = { 0, 0, 0 };
@@ -1578,6 +1593,7 @@ public class M_Boss32 {
     };
 
     static EntPainAdapter makron_pain = new EntPainAdapter() {
+    	public String getID() { return "makron_pain"; }
         public void pain(edict_t self, edict_t other, float kick, int damage) {
 
             if (self.health < (self.max_health / 2))
@@ -1620,6 +1636,7 @@ public class M_Boss32 {
     };
 
     static EntInteractAdapter makron_sight = new EntInteractAdapter() {
+    	public String getID() { return "makron_sight"; }
         public boolean interact(edict_t self, edict_t other) {
             self.monsterinfo.currentmove = makron_move_sight;
             return true;
@@ -1627,6 +1644,7 @@ public class M_Boss32 {
     };
 
     static EntThinkAdapter makron_attack = new EntThinkAdapter() {
+    	public String getID() { return "makron_attack"; }
         public boolean think(edict_t self) {
             float[] vec = { 0, 0, 0 };
             float range;
@@ -1653,6 +1671,7 @@ public class M_Boss32 {
      */
 
     static EntThinkAdapter makron_torso_think = new EntThinkAdapter() {
+    	public String getID() { return "makron_torso_think"; }
         public boolean think(edict_t self) {
             if (++self.s.frame < 365)
                 self.nextthink = GameBase.level.time + Defines.FRAMETIME;
@@ -1665,6 +1684,7 @@ public class M_Boss32 {
     };
 
     static EntThinkAdapter makron_torso = new EntThinkAdapter() {
+    	public String getID() { return "makron_torso"; }
         public boolean think(edict_t ent) {
             ent.movetype = Defines.MOVETYPE_NONE;
             ent.solid = Defines.SOLID_NOT;
@@ -1682,6 +1702,7 @@ public class M_Boss32 {
     };
 
     static EntDieAdapter makron_die = new EntDieAdapter() {
+    	public String getID() { return "makron_die"; }
         public void die(edict_t self, edict_t inflictor, edict_t attacker,
                 int damage, float[] point) {
             edict_t tempent;
@@ -1729,6 +1750,7 @@ public class M_Boss32 {
     };
 
     static EntThinkAdapter Makron_CheckAttack = new EntThinkAdapter() {
+    	public String getID() { return "Makron_CheckAttack"; }
         public boolean think(edict_t self) {
             float[] spot1 = { 0, 0, 0 }, spot2 = { 0, 0, 0 };
             float[] temp = { 0, 0, 0 };
@@ -1885,6 +1907,7 @@ public class M_Boss32 {
      * =================
      */
     static EntThinkAdapter MakronSpawn = new EntThinkAdapter() {
+    	public String getID() { return "MakronSpawn"; }
         public boolean think(edict_t self) {
             float[] vec = { 0, 0, 0 };
 
@@ -1909,6 +1932,7 @@ public class M_Boss32 {
     };
 
     static EntThinkAdapter MakronToss = new EntThinkAdapter() {
+    	public String getID() { return "MakronToss"; }
         public boolean think(edict_t self) {
             edict_t ent;
 
diff --git a/src/jake2/game/monsters/M_Brain.java b/src/jake2/game/monsters/M_Brain.java
index 7189e30..1f49045 100644
--- a/src/jake2/game/monsters/M_Brain.java
+++ b/src/jake2/game/monsters/M_Brain.java
@@ -20,7 +20,7 @@
 
 // Created on 13.11.2003 by RST.
 
-// $Id: M_Brain.java,v 1.3 2005-11-16 22:24:52 salomo Exp $
+// $Id: M_Brain.java,v 1.4 2005-11-20 22:18:33 salomo Exp $
 
 package jake2.game.monsters;
 
@@ -506,6 +506,7 @@ public class M_Brain {
     static int sound_melee3;
 
     static EntInteractAdapter brain_sight = new EntInteractAdapter() {
+    	public String getID() { return "brain_sight"; }
         public boolean interact(edict_t self, edict_t other) {
             GameBase.gi.sound(self, Defines.CHAN_VOICE, sound_sight, 1,
                     Defines.ATTN_NORM, 0);
@@ -514,6 +515,7 @@ public class M_Brain {
     };
 
     static EntThinkAdapter brain_search = new EntThinkAdapter() {
+    	public String getID() { return "brain_search"; }
         public boolean think(edict_t self) {
             GameBase.gi.sound(self, Defines.CHAN_VOICE, sound_search, 1,
                     Defines.ATTN_NORM, 0);
@@ -561,6 +563,7 @@ public class M_Brain {
             brain_frames_stand, null);
 
     static EntThinkAdapter brain_stand = new EntThinkAdapter() {
+    	public String getID() { return "brain_stand"; }
         public boolean think(edict_t self) {
             self.monsterinfo.currentmove = brain_move_stand;
             return true;
@@ -607,6 +610,7 @@ public class M_Brain {
             brain_frames_idle, brain_stand);
 
     static EntThinkAdapter brain_idle = new EntThinkAdapter() {
+    	public String getID() { return "brain_idle"; }
         public boolean think(edict_t self) {
             GameBase.gi.sound(self, Defines.CHAN_AUTO, sound_idle3, 1,
                     Defines.ATTN_IDLE, 0);
@@ -667,6 +671,7 @@ public class M_Brain {
      *  # endif
      */
     static EntThinkAdapter brain_walk = new EntThinkAdapter() {
+    	public String getID() { return "brain_walk"; }
         public boolean think(edict_t self) {
             //			if (random() <= 0.5)
             self.monsterinfo.currentmove = brain_move_walk1;
@@ -681,6 +686,7 @@ public class M_Brain {
     //
 
     static EntThinkAdapter brain_duck_down = new EntThinkAdapter() {
+    	public String getID() { return "brain_duck_down"; }
         public boolean think(edict_t self) {
 
             if ((self.monsterinfo.aiflags & Defines.AI_DUCKED) != 0)
@@ -694,6 +700,7 @@ public class M_Brain {
     };
 
     static EntThinkAdapter brain_duck_hold = new EntThinkAdapter() {
+    	public String getID() { return "brain_duck_hold"; }
         public boolean think(edict_t self) {
             if (GameBase.level.time >= self.monsterinfo.pausetime)
                 self.monsterinfo.aiflags &= ~Defines.AI_HOLD_FRAME;
@@ -704,6 +711,7 @@ public class M_Brain {
     };
 
     static EntThinkAdapter brain_duck_up = new EntThinkAdapter() {
+    	public String getID() { return "brain_duck_up"; }
         public boolean think(edict_t self) {
             self.monsterinfo.aiflags &= ~Defines.AI_DUCKED;
             self.maxs[2] += 32;
@@ -714,6 +722,7 @@ public class M_Brain {
     };
 
     static EntDodgeAdapter brain_dodge = new EntDodgeAdapter() {
+    	public String getID() { return "brain_dodge"; }
         public void dodge(edict_t self, edict_t attacker, float eta) {
             if (Lib.random() > 0.25)
                 return;
@@ -735,6 +744,7 @@ public class M_Brain {
             new mframe_t(GameAI.ai_move, 0, null) };
 
     static EntThinkAdapter brain_dead = new EntThinkAdapter() {
+    	public String getID() { return "brain_dead"; }
         public boolean think(edict_t self) {
             Math3D.VectorSet(self.mins, -16, -16, -24);
             Math3D.VectorSet(self.maxs, 16, 16, -8);
@@ -777,6 +787,7 @@ public class M_Brain {
     //
 
     static EntThinkAdapter brain_swing_right = new EntThinkAdapter() {
+    	public String getID() { return "brain_swing_right"; }
         public boolean think(edict_t self) {
             GameBase.gi.sound(self, Defines.CHAN_BODY, sound_melee1, 1,
                     Defines.ATTN_NORM, 0);
@@ -785,6 +796,7 @@ public class M_Brain {
     };
 
     static EntThinkAdapter brain_hit_right = new EntThinkAdapter() {
+    	public String getID() { return "brain_hit_right"; }
         public boolean think(edict_t self) {
             float[] aim = { 0, 0, 0 };
 
@@ -797,6 +809,7 @@ public class M_Brain {
     };
 
     static EntThinkAdapter brain_swing_left = new EntThinkAdapter() {
+    	public String getID() { return "brain_swing_left"; }
         public boolean think(edict_t self) {
             GameBase.gi.sound(self, Defines.CHAN_BODY, sound_melee2, 1,
                     Defines.ATTN_NORM, 0);
@@ -806,6 +819,7 @@ public class M_Brain {
     };
 
     static EntThinkAdapter brain_hit_left = new EntThinkAdapter() {
+    	public String getID() { return "brain_hit_left"; }
         public boolean think(edict_t self) {
             float[] aim = { 0, 0, 0 };
 
@@ -819,6 +833,7 @@ public class M_Brain {
     };
 
     static EntThinkAdapter brain_chest_open = new EntThinkAdapter() {
+    	public String getID() { return "brain_chest_open"; }
         public boolean think(edict_t self) {
             self.spawnflags &= ~65536;
             self.monsterinfo.power_armor_type = Defines.POWER_ARMOR_NONE;
@@ -829,6 +844,7 @@ public class M_Brain {
     };
 
     static EntThinkAdapter brain_tentacle_attack = new EntThinkAdapter() {
+    	public String getID() { return "brain_tentacle_attack"; }
         public boolean think(edict_t self) {
 
             float[] aim = { 0, 0, 0 };
@@ -864,6 +880,7 @@ public class M_Brain {
             new mframe_t(GameAI.ai_charge, -11, null) };
 
     static EntThinkAdapter brain_chest_closed = new EntThinkAdapter() {
+    	public String getID() { return "brain_chest_closed"; }
         public boolean think(edict_t self) {
 
             self.monsterinfo.power_armor_type = Defines.POWER_ARMOR_SCREEN;
@@ -895,6 +912,7 @@ public class M_Brain {
             new mframe_t(GameAI.ai_charge, -6, null) };
 
     static EntThinkAdapter brain_melee = new EntThinkAdapter() {
+    	public String getID() { return "brain_melee"; }
         public boolean think(edict_t self) {
             if (Lib.random() <= 0.5)
                 self.monsterinfo.currentmove = brain_move_attack1;
@@ -926,6 +944,7 @@ public class M_Brain {
             brain_frames_run, null);
 
     static EntThinkAdapter brain_run = new EntThinkAdapter() {
+    	public String getID() { return "brain_run"; }
         public boolean think(edict_t self) {
             self.monsterinfo.power_armor_type = Defines.POWER_ARMOR_SCREEN;
             if ((self.monsterinfo.aiflags & Defines.AI_STAND_GROUND) != 0)
@@ -1014,6 +1033,7 @@ public class M_Brain {
             brain_frames_duck, brain_run);
 
     static EntPainAdapter brain_pain = new EntPainAdapter() {
+    	public String getID() { return "brain_pain"; }
         public void pain(edict_t self, edict_t other, float kick, int damage) {
             float r;
 
@@ -1046,6 +1066,7 @@ public class M_Brain {
     };
 
     static EntDieAdapter brain_die = new EntDieAdapter() {
+    	public String getID() { return "brain_die"; }
         public void die(edict_t self, edict_t inflictor, edict_t attacker,
                 int damage, float[] point) {
             int n;
diff --git a/src/jake2/game/monsters/M_Chick.java b/src/jake2/game/monsters/M_Chick.java
index be86e8a..4a6891e 100644
--- a/src/jake2/game/monsters/M_Chick.java
+++ b/src/jake2/game/monsters/M_Chick.java
@@ -20,7 +20,7 @@
 
 // Created on 13.11.2003 by RST.
 
-// $Id: M_Chick.java,v 1.3 2005-11-16 22:24:52 salomo Exp $
+// $Id: M_Chick.java,v 1.4 2005-11-20 22:18:33 salomo Exp $
 
 package jake2.game.monsters;
 
@@ -640,6 +640,7 @@ public class M_Chick {
     static int sound_search;
 
     static EntThinkAdapter ChickMoan = new EntThinkAdapter() {
+    	public String getID() { return "ChickMoan"; }
         public boolean think(edict_t self) {
             if (Lib.random() < 0.5)
                 GameBase.gi.sound(self, Defines.CHAN_VOICE, sound_idle1, 1,
@@ -684,6 +685,7 @@ public class M_Chick {
             new mframe_t(GameAI.ai_stand, 0, null) };
 
     static EntThinkAdapter chick_stand = new EntThinkAdapter() {
+    	public String getID() { return "chick_stand"; }
         public boolean think(edict_t self) {
             self.monsterinfo.currentmove = chick_move_stand;
             return true;
@@ -694,6 +696,7 @@ public class M_Chick {
             FRAME_stand230, chick_frames_fidget, chick_stand);
 
     static EntThinkAdapter chick_fidget = new EntThinkAdapter() {
+    	public String getID() { return "chick_fidget"; }
         public boolean think(edict_t self) {
             if ((self.monsterinfo.aiflags & Defines.AI_STAND_GROUND) != 0)
                 return true;
@@ -739,6 +742,7 @@ public class M_Chick {
             FRAME_stand130, chick_frames_stand, null);
 
     static EntThinkAdapter chick_run = new EntThinkAdapter() {
+    	public String getID() { return "chick_run"; }
         public boolean think(edict_t self) {
             if ((self.monsterinfo.aiflags & Defines.AI_STAND_GROUND) != 0) {
                 self.monsterinfo.currentmove = chick_move_stand;
@@ -801,6 +805,7 @@ public class M_Chick {
             chick_frames_walk, null);
 
     static EntThinkAdapter chick_walk = new EntThinkAdapter() {
+    	public String getID() { return "chick_walk"; }
         public boolean think(edict_t self) {
             self.monsterinfo.currentmove = chick_move_walk;
             return true;
@@ -854,6 +859,7 @@ public class M_Chick {
             chick_frames_pain3, chick_run);
 
     static EntPainAdapter chick_pain = new EntPainAdapter() {
+    	public String getID() { return "chick_pain"; }
         public void pain(edict_t self, edict_t other, float kick, int damage) {
             float r;
 
@@ -890,6 +896,7 @@ public class M_Chick {
     };
 
     static EntThinkAdapter chick_dead = new EntThinkAdapter() {
+    	public String getID() { return "chick_dead"; }
         public boolean think(edict_t self) {
             Math3D.VectorSet(self.mins, -16, -16, 0);
             Math3D.VectorSet(self.maxs, 16, 16, 16);
@@ -947,6 +954,7 @@ public class M_Chick {
             FRAME_death112, chick_frames_death1, chick_dead);
 
     static EntDieAdapter chick_die = new EntDieAdapter() {
+    	public String getID() { return "chick_die"; }
 
         public void die(edict_t self, edict_t inflictor, edict_t attacker,
                 int damage, float[] point) {
@@ -993,6 +1001,7 @@ public class M_Chick {
     };
 
     static EntThinkAdapter chick_duck_down = new EntThinkAdapter() {
+    	public String getID() { return "chick_duck_down"; }
         public boolean think(edict_t self) {
             if ((self.monsterinfo.aiflags & Defines.AI_DUCKED) != 0)
                 return true;
@@ -1006,6 +1015,7 @@ public class M_Chick {
     };
 
     static EntThinkAdapter chick_duck_hold = new EntThinkAdapter() {
+    	public String getID() { return "chick_duck_hold"; }
         public boolean think(edict_t self) {
             if (GameBase.level.time >= self.monsterinfo.pausetime)
                 self.monsterinfo.aiflags &= ~Defines.AI_HOLD_FRAME;
@@ -1016,6 +1026,7 @@ public class M_Chick {
     };
 
     static EntThinkAdapter chick_duck_up = new EntThinkAdapter() {
+    	public String getID() { return "chick_duck_up"; }
         public boolean think(edict_t self) {
             self.monsterinfo.aiflags &= ~Defines.AI_DUCKED;
             self.maxs[2] += 32;
@@ -1038,6 +1049,7 @@ public class M_Chick {
             chick_frames_duck, chick_run);
 
     static EntDodgeAdapter chick_dodge = new EntDodgeAdapter() {
+    	public String getID() { return "chick_dodge"; }
         public void dodge(edict_t self, edict_t attacker, float eta) {
             if (Lib.random() > 0.25)
                 return;
@@ -1051,6 +1063,7 @@ public class M_Chick {
     };
 
     static EntThinkAdapter ChickSlash = new EntThinkAdapter() {
+    	public String getID() { return "ChickSlash"; }
         public boolean think(edict_t self) {
             float[] aim = { 0, 0, 0 };
 
@@ -1063,6 +1076,7 @@ public class M_Chick {
     };
 
     static EntThinkAdapter ChickRocket = new EntThinkAdapter() {
+    	public String getID() { return "ChickRocket"; }
         public boolean think(edict_t self) {
             float[] forward = { 0, 0, 0 }, right = { 0, 0, 0 };
             float[] start = { 0, 0, 0 };
@@ -1086,6 +1100,7 @@ public class M_Chick {
     };
 
     static EntThinkAdapter Chick_PreAttack1 = new EntThinkAdapter() {
+    	public String getID() { return "Chick_PreAttack1"; }
         public boolean think(edict_t self) {
             GameBase.gi.sound(self, Defines.CHAN_VOICE,
                     sound_missile_prelaunch, 1, Defines.ATTN_NORM, 0);
@@ -1094,6 +1109,7 @@ public class M_Chick {
     };
 
     static EntThinkAdapter ChickReload = new EntThinkAdapter() {
+    	public String getID() { return "ChickReload"; }
         public boolean think(edict_t self) {
             GameBase.gi.sound(self, Defines.CHAN_VOICE, sound_missile_reload,
                     1, Defines.ATTN_NORM, 0);
@@ -1102,6 +1118,7 @@ public class M_Chick {
     };
 
     static EntThinkAdapter chick_attack1 = new EntThinkAdapter() {
+    	public String getID() { return "chick_attack1"; }
         public boolean think(edict_t self) {
             self.monsterinfo.currentmove = chick_move_attack1;
             return true;
@@ -1109,6 +1126,7 @@ public class M_Chick {
     };
 
     static EntThinkAdapter chick_rerocket = new EntThinkAdapter() {
+    	public String getID() { return "chick_rerocket"; }
         public boolean think(edict_t self) {
             if (self.enemy.health > 0) {
                 if (GameUtil.range(self, self.enemy) > Defines.RANGE_MELEE)
@@ -1171,6 +1189,7 @@ public class M_Chick {
             FRAME_attak132, chick_frames_end_attack1, chick_run);
 
     static EntThinkAdapter chick_reslash = new EntThinkAdapter() {
+    	public String getID() { return "chick_reslash"; }
         public boolean think(edict_t self) {
             if (self.enemy.health > 0) {
                 if (GameUtil.range(self, self.enemy) == Defines.RANGE_MELEE)
@@ -1211,6 +1230,7 @@ public class M_Chick {
             FRAME_attak216, chick_frames_end_slash, chick_run);
 
     static EntThinkAdapter chick_slash = new EntThinkAdapter() {
+    	public String getID() { return "chick_slash"; }
         public boolean think(edict_t self) {
             self.monsterinfo.currentmove = chick_move_slash;
             return true;
@@ -1226,6 +1246,7 @@ public class M_Chick {
             FRAME_attak203, chick_frames_start_slash, chick_slash);
 
     static EntThinkAdapter chick_melee = new EntThinkAdapter() {
+    	public String getID() { return "chick_melee"; }
         public boolean think(edict_t self) {
             self.monsterinfo.currentmove = chick_move_start_slash;
             return true;
@@ -1233,6 +1254,7 @@ public class M_Chick {
     };
 
     static EntThinkAdapter chick_attack = new EntThinkAdapter() {
+    	public String getID() { return "chick_attack"; }
         public boolean think(edict_t self) {
             self.monsterinfo.currentmove = chick_move_start_attack1;
             return true;
@@ -1240,6 +1262,7 @@ public class M_Chick {
     };
 
     static EntInteractAdapter chick_sight = new EntInteractAdapter() {
+    	public String getID() { return "chick_sight"; }
         public boolean interact(edict_t self, edict_t other) {
             GameBase.gi.sound(self, Defines.CHAN_VOICE, sound_sight, 1,
                     Defines.ATTN_NORM, 0);
diff --git a/src/jake2/game/monsters/M_Flipper.java b/src/jake2/game/monsters/M_Flipper.java
index d8e5b91..30235f6 100644
--- a/src/jake2/game/monsters/M_Flipper.java
+++ b/src/jake2/game/monsters/M_Flipper.java
@@ -19,7 +19,7 @@
  */
 
 // Created on 13.11.2003 by RST.
-// $Id: M_Flipper.java,v 1.3 2005-11-16 22:24:52 salomo Exp $
+// $Id: M_Flipper.java,v 1.4 2005-11-20 22:18:33 salomo Exp $
 package jake2.game.monsters;
 
 import jake2.Defines;
@@ -386,6 +386,7 @@ public class M_Flipper {
             FRAME_flphor01, flipper_frames_stand, null);
 
     static EntThinkAdapter flipper_stand = new EntThinkAdapter() {
+    	public String getID() { return "flipper_stand"; }
         public boolean think(edict_t self) {
             self.monsterinfo.currentmove = flipper_move_stand;
             return true;
@@ -429,6 +430,7 @@ public class M_Flipper {
             FRAME_flpver29, flipper_frames_run, null);
 
     static EntThinkAdapter flipper_run_loop = new EntThinkAdapter() {
+    	public String getID() { return "flipper_run_loop"; }
         public boolean think(edict_t self) {
             self.monsterinfo.currentmove = flipper_move_run_loop;
             return true;
@@ -447,6 +449,7 @@ public class M_Flipper {
             FRAME_flpver06, flipper_frames_run_start, flipper_run_loop);
 
     static EntThinkAdapter flipper_run = new EntThinkAdapter() {
+    	public String getID() { return "flipper_run"; }
         public boolean think(edict_t self) {
             self.monsterinfo.currentmove = flipper_move_run_start;
             return true;
@@ -484,6 +487,7 @@ public class M_Flipper {
             FRAME_flphor24, flipper_frames_walk, null);
 
     static EntThinkAdapter flipper_walk = new EntThinkAdapter() {
+    	public String getID() { return "flipper_walk"; }
         public boolean think(edict_t self) {
             self.monsterinfo.currentmove = flipper_move_walk;
             return true;
@@ -501,6 +505,7 @@ public class M_Flipper {
             FRAME_flphor05, flipper_frames_start_run, null);
 
     static EntThinkAdapter flipper_start_run = new EntThinkAdapter() {
+    	public String getID() { return "flipper_start_run"; }
         public boolean think(edict_t self) {
             self.monsterinfo.currentmove = flipper_move_start_run;
             return true;
@@ -528,6 +533,7 @@ public class M_Flipper {
             FRAME_flppn205, flipper_frames_pain1, flipper_run);
 
     static EntThinkAdapter flipper_bite = new EntThinkAdapter() {
+    	public String getID() { return "flipper_bite"; }
         public boolean think(edict_t self) {
             float[] aim = { 0, 0, 0 };
 
@@ -538,6 +544,7 @@ public class M_Flipper {
     };
 
     static EntThinkAdapter flipper_preattack = new EntThinkAdapter() {
+    	public String getID() { return "flipper_preattack"; }
 
         public boolean think(edict_t self) {
             GameBase.gi.sound(self, Defines.CHAN_WEAPON, sound_chomp, 1,
@@ -572,6 +579,7 @@ public class M_Flipper {
             FRAME_flpbit20, flipper_frames_attack, flipper_run);
 
     static EntThinkAdapter flipper_melee = new EntThinkAdapter() {
+    	public String getID() { return "flipper_melee"; }
         public boolean think(edict_t self) {
             self.monsterinfo.currentmove = flipper_move_attack;
             return true;
@@ -579,6 +587,7 @@ public class M_Flipper {
     };
 
     static EntPainAdapter flipper_pain = new EntPainAdapter() {
+    	public String getID() { return "flipper_pain"; }
         public void pain(edict_t self, edict_t other, float kick, int damage) {
             int n;
 
@@ -608,6 +617,7 @@ public class M_Flipper {
     };
 
     static EntThinkAdapter flipper_dead = new EntThinkAdapter() {
+    	public String getID() { return "flipper_dead"; }
         public boolean think(edict_t self) {
             Math3D.VectorSet(self.mins, -16, -16, -24);
             Math3D.VectorSet(self.maxs, 16, 16, -8);
@@ -681,6 +691,7 @@ public class M_Flipper {
             FRAME_flpdth56, flipper_frames_death, flipper_dead);
 
     static EntInteractAdapter flipper_sight = new EntInteractAdapter() {
+    	public String getID() { return "flipper_sight"; }
         public boolean interact(edict_t self, edict_t other) {
             GameBase.gi.sound(self, Defines.CHAN_VOICE, sound_sight, 1,
                     Defines.ATTN_NORM, 0);
@@ -689,6 +700,7 @@ public class M_Flipper {
     };
 
     static EntDieAdapter flipper_die = new EntDieAdapter() {
+    	public String getID() { return "flipper_die"; }
 
         public void die(edict_t self, edict_t inflictor, edict_t attacker,
                 int damage, float[] point) {
diff --git a/src/jake2/game/monsters/M_Float.java b/src/jake2/game/monsters/M_Float.java
index 00882ef..2e2ec3f 100644
--- a/src/jake2/game/monsters/M_Float.java
+++ b/src/jake2/game/monsters/M_Float.java
@@ -19,7 +19,7 @@
  */
 
 // Created on 13.11.2003 by RST.
-// $Id: M_Float.java,v 1.3 2005-11-16 22:24:52 salomo Exp $
+// $Id: M_Float.java,v 1.4 2005-11-20 22:18:33 salomo Exp $
 package jake2.game.monsters;
 
 import jake2.Defines;
@@ -556,6 +556,7 @@ public class M_Float {
     static int sound_sight;
 
     static EntInteractAdapter floater_sight = new EntInteractAdapter() {
+    	public String getID() { return "floater_sight"; }
         public boolean interact(edict_t self, edict_t other) {
             GameBase.gi.sound(self, Defines.CHAN_VOICE, sound_sight, 1,
                     Defines.ATTN_NORM, 0);
@@ -564,6 +565,7 @@ public class M_Float {
     };
 
     static EntThinkAdapter floater_idle = new EntThinkAdapter() {
+    	public String getID() { return "floater_idle"; }
         public boolean think(edict_t self) {
             GameBase.gi.sound(self, Defines.CHAN_VOICE, sound_idle, 1,
                     Defines.ATTN_IDLE, 0);
@@ -572,6 +574,7 @@ public class M_Float {
     };
 
     static EntThinkAdapter floater_fire_blaster = new EntThinkAdapter() {
+    	public String getID() { return "floater_fire_blaster"; }
         public boolean think(edict_t self) {
             float[] start = { 0, 0, 0 };
             float[] forward = { 0, 0, 0 }, right = { 0, 0, 0 };
@@ -715,6 +718,7 @@ public class M_Float {
             FRAME_stand252, floater_frames_stand2, null);
 
     static EntThinkAdapter floater_stand = new EntThinkAdapter() {
+    	public String getID() { return "floater_stand"; }
         public boolean think(edict_t self) {
             if (Lib.random() <= 0.5)
                 self.monsterinfo.currentmove = floater_move_stand1;
@@ -760,6 +764,7 @@ public class M_Float {
             FRAME_actvat31, floater_frames_activate, null);
 
     static EntThinkAdapter floater_run = new EntThinkAdapter() {
+    	public String getID() { return "floater_run"; }
         public boolean think(edict_t self) {
 
             if ((self.monsterinfo.aiflags & Defines.AI_STAND_GROUND) != 0)
@@ -796,6 +801,7 @@ public class M_Float {
     static float[] aim = { Defines.MELEE_DISTANCE, 0, 0 };
 
     static EntThinkAdapter floater_wham = new EntThinkAdapter() {
+    	public String getID() { return "floater_wham"; }
         public boolean think(edict_t self) {
 
             GameBase.gi.sound(self, Defines.CHAN_WEAPON, sound_attack3, 1,
@@ -838,6 +844,7 @@ public class M_Float {
             FRAME_attak225, floater_frames_attack2, floater_run);
 
     static EntThinkAdapter floater_zap = new EntThinkAdapter() {
+    	public String getID() { return "floater_zap"; }
         public boolean think(edict_t self) {
             float[] forward = { 0, 0, 0 }, right = { 0, 0, 0 };
             float[] origin = { 0, 0, 0 };
@@ -931,6 +938,7 @@ public class M_Float {
             new mframe_t(GameAI.ai_move, 0, null) };
 
     static EntThinkAdapter floater_dead = new EntThinkAdapter() {
+    	public String getID() { return "floater_dead"; }
         public boolean think(edict_t self) {
             Math3D.VectorSet(self.mins, -16, -16, -24);
             Math3D.VectorSet(self.maxs, 16, 16, -8);
@@ -1102,6 +1110,7 @@ public class M_Float {
             FRAME_stand152, floater_frames_run, null);
 
     static EntThinkAdapter floater_walk = new EntThinkAdapter() {
+    	public String getID() { return "floater_walk"; }
         public boolean think(edict_t self) {
             self.monsterinfo.currentmove = floater_move_walk;
             return true;
@@ -1109,6 +1118,7 @@ public class M_Float {
     };
 
     static EntThinkAdapter floater_attack = new EntThinkAdapter() {
+    	public String getID() { return "floater_attack"; }
         public boolean think(edict_t self) {
             self.monsterinfo.currentmove = floater_move_attack1;
             return true;
@@ -1116,6 +1126,7 @@ public class M_Float {
     };
 
     static EntThinkAdapter floater_melee = new EntThinkAdapter() {
+    	public String getID() { return "floater_melee"; }
         public boolean think(edict_t self) {
 
             if (Lib.random() < 0.5)
@@ -1127,6 +1138,7 @@ public class M_Float {
     };
 
     static EntPainAdapter floater_pain = new EntPainAdapter() {
+    	public String getID() { return "floater_pain"; }
         public void pain(edict_t self, edict_t other, float kick, int damage) {
             int n;
 
@@ -1155,6 +1167,7 @@ public class M_Float {
     };
 
     static EntDieAdapter floater_die = new EntDieAdapter() {
+    	public String getID() { return "floater_die"; }
 
         public void die(edict_t self, edict_t inflictor, edict_t attacker,
                 int damage, float[] point) {
diff --git a/src/jake2/game/monsters/M_Flyer.java b/src/jake2/game/monsters/M_Flyer.java
index b7af64a..2cb7dcb 100644
--- a/src/jake2/game/monsters/M_Flyer.java
+++ b/src/jake2/game/monsters/M_Flyer.java
@@ -19,7 +19,7 @@
  */
 
 // Created on 13.11.2003 by RST.
-// $Id: M_Flyer.java,v 1.3 2005-11-16 22:24:52 salomo Exp $
+// $Id: M_Flyer.java,v 1.4 2005-11-20 22:18:33 salomo Exp $
 package jake2.game.monsters;
 
 import jake2.Defines;
@@ -372,6 +372,7 @@ public class M_Flyer {
     static int sound_die;
 
     public static EntInteractAdapter flyer_sight = new EntInteractAdapter() {
+    	public String getID() { return "flyer_sight"; }
         public boolean interact(edict_t self, edict_t other) {
             GameBase.gi.sound(self, Defines.CHAN_VOICE, sound_sight, 1,
                     Defines.ATTN_NORM, 0);
@@ -380,6 +381,7 @@ public class M_Flyer {
     };
 
     static EntThinkAdapter flyer_idle = new EntThinkAdapter() {
+    	public String getID() { return "flyer_idle"; }
         public boolean think(edict_t self) {
             GameBase.gi.sound(self, Defines.CHAN_VOICE, sound_idle, 1,
                     Defines.ATTN_IDLE, 0);
@@ -388,6 +390,7 @@ public class M_Flyer {
     };
 
     static EntThinkAdapter flyer_pop_blades = new EntThinkAdapter() {
+    	public String getID() { return "flyer_pop_blades"; }
         public boolean think(edict_t self) {
             GameBase.gi.sound(self, Defines.CHAN_VOICE, sound_sproing, 1,
                     Defines.ATTN_NORM, 0);
@@ -546,6 +549,7 @@ public class M_Flyer {
             flyer_frames_run, null);
 
     static EntThinkAdapter flyer_run = new EntThinkAdapter() {
+    	public String getID() { return "flyer_run"; }
         public boolean think(edict_t self) {
             if ((self.monsterinfo.aiflags & Defines.AI_STAND_GROUND) != 0)
                 self.monsterinfo.currentmove = flyer_move_stand;
@@ -556,6 +560,7 @@ public class M_Flyer {
     };
 
     static EntThinkAdapter flyer_walk = new EntThinkAdapter() {
+    	public String getID() { return "flyer_walk"; }
         public boolean think(edict_t self) {
             self.monsterinfo.currentmove = flyer_move_walk;
             return true;
@@ -563,6 +568,7 @@ public class M_Flyer {
     };
 
     static EntThinkAdapter flyer_stand = new EntThinkAdapter() {
+    	public String getID() { return "flyer_stand"; }
         public boolean think(edict_t self) {
             self.monsterinfo.currentmove = flyer_move_stand;
             return true;
@@ -570,6 +576,7 @@ public class M_Flyer {
     };
 
     static EntThinkAdapter flyer_nextmove = new EntThinkAdapter() {
+    	public String getID() { return "flyer_nextmove"; }
         public boolean think(edict_t self) {
             if (nextmove == ACTION_attack1)
                 self.monsterinfo.currentmove = flyer_move_start_melee;
@@ -605,6 +612,7 @@ public class M_Flyer {
             flyer_frames_stop, null);
 
     static EntThinkAdapter flyer_stop = new EntThinkAdapter() {
+    	public String getID() { return "flyer_stop"; }
         public boolean think(edict_t self) {
             self.monsterinfo.currentmove = flyer_move_stop;
             return true;
@@ -612,6 +620,7 @@ public class M_Flyer {
     };
 
     static EntThinkAdapter flyer_start = new EntThinkAdapter() {
+    	public String getID() { return "flyer_start"; }
         public boolean think(edict_t self) {
             self.monsterinfo.currentmove = flyer_move_start;
             return true;
@@ -715,6 +724,7 @@ public class M_Flyer {
             FRAME_bankl07, flyer_frames_bankleft, null);
 
     static EntThinkAdapter flyer_fireleft = new EntThinkAdapter() {
+    	public String getID() { return "flyer_fireleft"; }
         public boolean think(edict_t self) {
             flyer_fire(self, Defines.MZ2_FLYER_BLASTER_1);
             return true;
@@ -722,6 +732,7 @@ public class M_Flyer {
     };
 
     static EntThinkAdapter flyer_fireright = new EntThinkAdapter() {
+    	public String getID() { return "flyer_fireright"; }
         public boolean think(edict_t self) {
             flyer_fire(self, Defines.MZ2_FLYER_BLASTER_2);
             return true;
@@ -752,6 +763,7 @@ public class M_Flyer {
             FRAME_attak217, flyer_frames_attack2, flyer_run);
 
     static EntThinkAdapter flyer_slash_left = new EntThinkAdapter() {
+    	public String getID() { return "flyer_slash_left"; }
         public boolean think(edict_t self) {
             float[] aim = { 0, 0, 0 };
 
@@ -764,6 +776,7 @@ public class M_Flyer {
     };
 
     static EntThinkAdapter flyer_slash_right = new EntThinkAdapter() {
+    	public String getID() { return "flyer_slash_right"; }
         public boolean think(edict_t self) {
             float[] aim = { 0, 0, 0 };
 
@@ -776,6 +789,7 @@ public class M_Flyer {
     };
 
     static EntThinkAdapter flyer_loop_melee = new EntThinkAdapter() {
+    	public String getID() { return "flyer_loop_melee"; }
         public boolean think(edict_t self) {
             /*
              * if (random() <= 0.5) self.monsterinfo.currentmove =
@@ -824,6 +838,7 @@ public class M_Flyer {
     };
 
     static EntThinkAdapter flyer_check_melee = new EntThinkAdapter() {
+    	public String getID() { return "flyer_check_melee"; }
         public boolean think(edict_t self) {
             if (GameUtil.range(self, self.enemy) == Defines.RANGE_MELEE)
                 if (Lib.random() <= 0.8)
@@ -840,6 +855,7 @@ public class M_Flyer {
             FRAME_attak118, flyer_frames_loop_melee, flyer_check_melee);
 
     static EntThinkAdapter flyer_attack = new EntThinkAdapter() {
+    	public String getID() { return "flyer_attack"; }
         public boolean think(edict_t self) {
             /*
              * if (random() <= 0.5) self.monsterinfo.currentmove =
@@ -852,6 +868,7 @@ public class M_Flyer {
     };
 
     static EntThinkAdapter flyer_setstart = new EntThinkAdapter() {
+    	public String getID() { return "flyer_setstart"; }
         public boolean think(edict_t self) {
             nextmove = ACTION_run;
             self.monsterinfo.currentmove = flyer_move_start;
@@ -860,6 +877,7 @@ public class M_Flyer {
     };
 
     static EntThinkAdapter flyer_melee = new EntThinkAdapter() {
+    	public String getID() { return "flyer_melee"; }
         public boolean think(edict_t self) {
             //			flyer.nextmove = ACTION_attack1;
             //	 self.monsterinfo.currentmove = flyer_move_stop;
@@ -869,6 +887,7 @@ public class M_Flyer {
     };
 
     static EntPainAdapter flyer_pain = new EntPainAdapter() {
+    	public String getID() { return "flyer_pain"; }
         public void pain(edict_t self, edict_t other, float kick, int damage) {
             int n;
 
@@ -901,6 +920,7 @@ public class M_Flyer {
     };
 
     static EntDieAdapter flyer_die = new EntDieAdapter() {
+    	public String getID() { return "flyer_die"; }
         public void die(edict_t self, edict_t inflictor, edict_t attacker,
                 int damage, float[] point) {
             GameBase.gi.sound(self, Defines.CHAN_VOICE, sound_die, 1,
diff --git a/src/jake2/game/monsters/M_Gladiator.java b/src/jake2/game/monsters/M_Gladiator.java
index 4e5bd6d..21975f8 100644
--- a/src/jake2/game/monsters/M_Gladiator.java
+++ b/src/jake2/game/monsters/M_Gladiator.java
@@ -19,7 +19,7 @@
  */
 
 // Created on 13.11.2003 by RST.
-// $Id: M_Gladiator.java,v 1.3 2005-11-16 22:24:52 salomo Exp $
+// $Id: M_Gladiator.java,v 1.4 2005-11-20 22:18:33 salomo Exp $
 package jake2.game.monsters;
 
 import jake2.Defines;
@@ -245,6 +245,7 @@ public class M_Gladiator {
     static int sound_sight;
 
     static EntThinkAdapter gladiator_idle = new EntThinkAdapter() {
+    	public String getID() { return "gladiator_idle"; }
         public boolean think(edict_t self) {
 
             GameBase.gi.sound(self, Defines.CHAN_VOICE, sound_idle, 1,
@@ -254,6 +255,7 @@ public class M_Gladiator {
     };
 
     static EntInteractAdapter gladiator_sight = new EntInteractAdapter() {
+    	public String getID() { return "gladiator_sight"; }
         public boolean interact(edict_t self, edict_t other) {
 
             GameBase.gi.sound(self, Defines.CHAN_VOICE, sound_sight, 1,
@@ -263,6 +265,7 @@ public class M_Gladiator {
     };
 
     static EntThinkAdapter gladiator_search = new EntThinkAdapter() {
+    	public String getID() { return "gladiator_search"; }
         public boolean think(edict_t self) {
 
             GameBase.gi.sound(self, Defines.CHAN_VOICE, sound_search, 1,
@@ -272,6 +275,7 @@ public class M_Gladiator {
     };
 
     static EntThinkAdapter gladiator_cleaver_swing = new EntThinkAdapter() {
+    	public String getID() { return "gladiator_cleaver_swing"; }
         public boolean think(edict_t self) {
 
             GameBase.gi.sound(self, Defines.CHAN_WEAPON, sound_cleaver_swing,
@@ -293,6 +297,7 @@ public class M_Gladiator {
             FRAME_stand7, gladiator_frames_stand, null);
 
     static EntThinkAdapter gladiator_stand = new EntThinkAdapter() {
+    	public String getID() { return "gladiator_stand"; }
         public boolean think(edict_t self) {
 
             self.monsterinfo.currentmove = gladiator_move_stand;
@@ -322,6 +327,7 @@ public class M_Gladiator {
             gladiator_frames_walk, null);
 
     static EntThinkAdapter gladiator_walk = new EntThinkAdapter() {
+    	public String getID() { return "gladiator_walk"; }
         public boolean think(edict_t self) {
 
             self.monsterinfo.currentmove = gladiator_move_walk;
@@ -342,6 +348,7 @@ public class M_Gladiator {
             gladiator_frames_run, null);
 
     static EntThinkAdapter gladiator_run = new EntThinkAdapter() {
+    	public String getID() { return "gladiator_run"; }
         public boolean think(edict_t self) {
 
             if ((self.monsterinfo.aiflags & Defines.AI_STAND_GROUND) != 0)
@@ -354,6 +361,7 @@ public class M_Gladiator {
     };
 
     static EntThinkAdapter GaldiatorMelee = new EntThinkAdapter() {
+    	public String getID() { return "GaldiatorMelee"; }
         public boolean think(edict_t self) {
 
             float[] aim = { 0, 0, 0 };
@@ -392,6 +400,7 @@ public class M_Gladiator {
             FRAME_melee17, gladiator_frames_attack_melee, gladiator_run);
 
     static EntThinkAdapter gladiator_melee = new EntThinkAdapter() {
+    	public String getID() { return "gladiator_melee"; }
         public boolean think(edict_t self) {
 
             self.monsterinfo.currentmove = gladiator_move_attack_melee;
@@ -400,6 +409,7 @@ public class M_Gladiator {
     };
 
     static EntThinkAdapter GladiatorGun = new EntThinkAdapter() {
+    	public String getID() { return "GladiatorGun"; }
         public boolean think(edict_t self) {
 
             float[] start = { 0, 0, 0 };
@@ -440,6 +450,7 @@ public class M_Gladiator {
             FRAME_attack9, gladiator_frames_attack_gun, gladiator_run);
 
     static EntThinkAdapter gladiator_attack = new EntThinkAdapter() {
+    	public String getID() { return "gladiator_attack"; }
         public boolean think(edict_t self) {
 
             float range;
@@ -486,6 +497,7 @@ public class M_Gladiator {
             FRAME_painup7, gladiator_frames_pain_air, gladiator_run);
 
     static EntPainAdapter gladiator_pain = new EntPainAdapter() {
+    	public String getID() { return "gladiator_pain"; }
         public void pain(edict_t self, edict_t other, float kick, int damage) {
 
             if (self.health < (self.max_health / 2))
@@ -519,6 +531,7 @@ public class M_Gladiator {
     };
 
     static EntThinkAdapter gladiator_dead = new EntThinkAdapter() {
+    	public String getID() { return "gladiator_dead"; }
         public boolean think(edict_t self) {
 
             Math3D.VectorSet(self.mins, -16, -16, -24);
@@ -559,6 +572,7 @@ public class M_Gladiator {
             FRAME_death22, gladiator_frames_death, gladiator_dead);
 
     static EntDieAdapter gladiator_die = new EntDieAdapter() {
+    	public String getID() { return "gladiator_die"; }
         public void die(edict_t self, edict_t inflictor, edict_t attacker,
                 int damage, float[] point) {
             int n;
diff --git a/src/jake2/game/monsters/M_Gunner.java b/src/jake2/game/monsters/M_Gunner.java
index dd82ddb..7d6354b 100644
--- a/src/jake2/game/monsters/M_Gunner.java
+++ b/src/jake2/game/monsters/M_Gunner.java
@@ -19,7 +19,7 @@
  */
 
 // Created on 13.11.2003 by RST.
-// $Id: M_Gunner.java,v 1.3 2005-11-16 22:24:52 salomo Exp $
+// $Id: M_Gunner.java,v 1.4 2005-11-20 22:18:33 salomo Exp $
 package jake2.game.monsters;
 
 import jake2.Defines;
@@ -477,6 +477,7 @@ public class M_Gunner {
     static int sound_sight;
 
     static EntThinkAdapter gunner_idlesound = new EntThinkAdapter() {
+    	public String getID() { return "gunner_idlesound"; }
         public boolean think(edict_t self) {
             GameBase.gi.sound(self, Defines.CHAN_VOICE, sound_idle, 1,
                     Defines.ATTN_IDLE, 0);
@@ -485,6 +486,7 @@ public class M_Gunner {
     };
 
     static EntInteractAdapter gunner_sight = new EntInteractAdapter() {
+    	public String getID() { return "gunner_sight"; }
         public boolean interact(edict_t self, edict_t other) {
             GameBase.gi.sound(self, Defines.CHAN_VOICE, sound_sight, 1,
                     Defines.ATTN_NORM, 0);
@@ -493,6 +495,7 @@ public class M_Gunner {
     };
 
     static EntThinkAdapter gunner_search = new EntThinkAdapter() {
+    	public String getID() { return "gunner_search"; }
         public boolean think(edict_t self) {
             GameBase.gi.sound(self, Defines.CHAN_VOICE, sound_search, 1,
                     Defines.ATTN_NORM, 0);
@@ -552,6 +555,7 @@ public class M_Gunner {
             new mframe_t(GameAI.ai_stand, 0, null) };
 
     static EntThinkAdapter gunner_stand = new EntThinkAdapter() {
+    	public String getID() { return "gunner_stand"; }
         public boolean think(edict_t self) {
             self.monsterinfo.currentmove = gunner_move_stand;
             return true;
@@ -562,6 +566,7 @@ public class M_Gunner {
             FRAME_stand70, gunner_frames_fidget, gunner_stand);
 
     static EntThinkAdapter gunner_fidget = new EntThinkAdapter() {
+    	public String getID() { return "gunner_fidget"; }
         public boolean think(edict_t self) {
             if ((self.monsterinfo.aiflags & Defines.AI_STAND_GROUND) != 0)
                 return true;
@@ -625,6 +630,7 @@ public class M_Gunner {
             gunner_frames_walk, null);
 
     static EntThinkAdapter gunner_walk = new EntThinkAdapter() {
+    	public String getID() { return "gunner_walk"; }
         public boolean think(edict_t self) {
             self.monsterinfo.currentmove = gunner_move_walk;
             return true;
@@ -645,6 +651,7 @@ public class M_Gunner {
             gunner_frames_run, null);
 
     static EntThinkAdapter gunner_run = new EntThinkAdapter() {
+    	public String getID() { return "gunner_run"; }
         public boolean think(edict_t self) {
             if ((self.monsterinfo.aiflags & Defines.AI_STAND_GROUND) != 0)
                 self.monsterinfo.currentmove = gunner_move_stand;
@@ -666,6 +673,7 @@ public class M_Gunner {
             FRAME_runs06, gunner_frames_runandshoot, null);
 
     static EntThinkAdapter gunner_runandshoot = new EntThinkAdapter() {
+    	public String getID() { return "gunner_runandshoot"; }
         public boolean think(edict_t self) {
             self.monsterinfo.currentmove = gunner_move_runandshoot;
             return true;
@@ -719,6 +727,7 @@ public class M_Gunner {
             FRAME_pain118, gunner_frames_pain1, gunner_run);
 
     static EntPainAdapter gunner_pain = new EntPainAdapter() {
+    	public String getID() { return "gunner_pain"; }
         public void pain(edict_t self, edict_t other, float kick, int damage) {
             if (self.health < (self.max_health / 2))
                 self.s.skinnum = 1;
@@ -749,6 +758,7 @@ public class M_Gunner {
     };
 
     static EntThinkAdapter gunner_dead = new EntThinkAdapter() {
+    	public String getID() { return "gunner_dead"; }
         public boolean think(edict_t self) {
             Math3D.VectorSet(self.mins, -16, -16, -24);
             Math3D.VectorSet(self.maxs, 16, 16, -8);
@@ -777,6 +787,7 @@ public class M_Gunner {
             FRAME_death11, gunner_frames_death, gunner_dead);
 
     static EntDieAdapter gunner_die = new EntDieAdapter() {
+    	public String getID() { return "gunner_die"; }
         public void die(edict_t self, edict_t inflictor, edict_t attacker,
                 int damage, float[] point) {
             int n;
@@ -813,6 +824,7 @@ public class M_Gunner {
     };
 
     static EntThinkAdapter gunner_duck_down = new EntThinkAdapter() {
+    	public String getID() { return "gunner_duck_down"; }
         public boolean think(edict_t self) {
             if ((self.monsterinfo.aiflags & Defines.AI_DUCKED) != 0)
                 return true;
@@ -831,6 +843,7 @@ public class M_Gunner {
     };
 
     static EntThinkAdapter gunner_duck_hold = new EntThinkAdapter() {
+    	public String getID() { return "gunner_duck_hold"; }
         public boolean think(edict_t self) {
             if (GameBase.level.time >= self.monsterinfo.pausetime)
                 self.monsterinfo.aiflags &= ~Defines.AI_HOLD_FRAME;
@@ -841,6 +854,7 @@ public class M_Gunner {
     };
 
     static EntThinkAdapter gunner_duck_up = new EntThinkAdapter() {
+    	public String getID() { return "gunner_duck_up"; }
         public boolean think(edict_t self) {
             self.monsterinfo.aiflags &= ~Defines.AI_DUCKED;
             self.maxs[2] += 32;
@@ -864,6 +878,7 @@ public class M_Gunner {
             gunner_frames_duck, gunner_run);
 
     static EntDodgeAdapter gunner_dodge = new EntDodgeAdapter() {
+    	public String getID() { return "gunner_dodge"; }
         public void dodge(edict_t self, edict_t attacker, float eta) {
             if (Lib.random() > 0.25)
                 return;
@@ -876,6 +891,7 @@ public class M_Gunner {
     };
 
     static EntThinkAdapter gunner_opengun = new EntThinkAdapter() {
+    	public String getID() { return "gunner_opengun"; }
         public boolean think(edict_t self) {
             GameBase.gi.sound(self, Defines.CHAN_VOICE, sound_open, 1,
                     Defines.ATTN_IDLE, 0);
@@ -884,6 +900,7 @@ public class M_Gunner {
     };
 
     static EntThinkAdapter GunnerFire = new EntThinkAdapter() {
+    	public String getID() { return "GunnerFire"; }
         public boolean think(edict_t self) {
             float[] start = { 0, 0, 0 };
             float[] forward = { 0, 0, 0 }, right = { 0, 0, 0 };
@@ -915,6 +932,7 @@ public class M_Gunner {
     };
 
     static EntThinkAdapter GunnerGrenade = new EntThinkAdapter() {
+    	public String getID() { return "GunnerGrenade"; }
         public boolean think(edict_t self) {
             float[] start = { 0, 0, 0 };
             float[] forward = { 0, 0, 0 }, right = { 0, 0, 0 };
@@ -946,6 +964,7 @@ public class M_Gunner {
     };
 
     static EntThinkAdapter gunner_attack = new EntThinkAdapter() {
+    	public String getID() { return "gunner_attack"; }
         public boolean think(edict_t self) {
             if (GameUtil.range(self, self.enemy) == Defines.RANGE_MELEE) {
                 self.monsterinfo.currentmove = gunner_move_attack_chain;
@@ -960,6 +979,7 @@ public class M_Gunner {
     };
 
     static EntThinkAdapter gunner_fire_chain = new EntThinkAdapter() {
+    	public String getID() { return "gunner_fire_chain"; }
         public boolean think(edict_t self) {
             self.monsterinfo.currentmove = gunner_move_fire_chain;
             return true;
@@ -989,6 +1009,7 @@ public class M_Gunner {
             new mframe_t(GameAI.ai_charge, 0, GunnerFire) };
 
     static EntThinkAdapter gunner_refire_chain = new EntThinkAdapter() {
+    	public String getID() { return "gunner_refire_chain"; }
         public boolean think(edict_t self) {
             if (self.enemy.health > 0)
                 if (GameUtil.visible(self, self.enemy))
diff --git a/src/jake2/game/monsters/M_Hover.java b/src/jake2/game/monsters/M_Hover.java
index ff8f7b6..b2af1fb 100644
--- a/src/jake2/game/monsters/M_Hover.java
+++ b/src/jake2/game/monsters/M_Hover.java
@@ -19,7 +19,7 @@
  */
 
 // Created on 13.11.2003 by RST.
-// $Id: M_Hover.java,v 1.3 2005-11-16 22:24:52 salomo Exp $
+// $Id: M_Hover.java,v 1.4 2005-11-20 22:18:33 salomo Exp $
 package jake2.game.monsters;
 
 import jake2.Defines;
@@ -469,6 +469,7 @@ public class M_Hover {
     static int sound_search2;
 
     static EntThinkAdapter hover_reattack = new EntThinkAdapter() {
+    	public String getID() { return "hover_reattack"; }
         public boolean think(edict_t self) {
             if (self.enemy.health > 0)
                 if (GameUtil.visible(self, self.enemy))
@@ -482,6 +483,7 @@ public class M_Hover {
     };
 
     static EntThinkAdapter hover_fire_blaster = new EntThinkAdapter() {
+    	public String getID() { return "hover_fire_blaster"; }
         public boolean think(edict_t self) {
             float[] start = { 0, 0, 0 };
             float[] forward = { 0, 0, 0 }, right = { 0, 0, 0 };
@@ -510,6 +512,7 @@ public class M_Hover {
     };
 
     static EntThinkAdapter hover_stand = new EntThinkAdapter() {
+    	public String getID() { return "hover_stand"; }
         public boolean think(edict_t self) {
             self.monsterinfo.currentmove = hover_move_stand;
             return true;
@@ -517,6 +520,7 @@ public class M_Hover {
     };
 
     static EntThinkAdapter hover_run = new EntThinkAdapter() {
+    	public String getID() { return "hover_run"; }
         public boolean think(edict_t self) {
             if ((self.monsterinfo.aiflags & Defines.AI_STAND_GROUND) != 0)
                 self.monsterinfo.currentmove = hover_move_stand;
@@ -527,6 +531,7 @@ public class M_Hover {
     };
 
     static EntThinkAdapter hover_walk = new EntThinkAdapter() {
+    	public String getID() { return "hover_walk"; }
         public boolean think(edict_t self) {
             self.monsterinfo.currentmove = hover_move_walk;
             return true;
@@ -534,6 +539,7 @@ public class M_Hover {
     };
 
     static EntThinkAdapter hover_start_attack = new EntThinkAdapter() {
+    	public String getID() { return "hover_start_attack"; }
         public boolean think(edict_t self) {
             self.monsterinfo.currentmove = hover_move_start_attack;
             return true;
@@ -541,6 +547,7 @@ public class M_Hover {
     };
 
     static EntThinkAdapter hover_attack = new EntThinkAdapter() {
+    	public String getID() { return "hover_attack"; }
         public boolean think(edict_t self) {
             self.monsterinfo.currentmove = hover_move_attack1;
             return true;
@@ -548,6 +555,7 @@ public class M_Hover {
     };
 
     static EntPainAdapter hover_pain = new EntPainAdapter() {
+    	public String getID() { return "hover_pain"; }
         public void pain(edict_t self, edict_t other, float kick, int damage) {
             if (self.health < (self.max_health / 2))
                 self.s.skinnum = 1;
@@ -579,6 +587,7 @@ public class M_Hover {
     };
 
     static EntThinkAdapter hover_deadthink = new EntThinkAdapter() {
+    	public String getID() { return "hover_deadthink"; }
         public boolean think(edict_t self) {
             if (null == self.groundentity
                     && GameBase.level.time < self.timestamp) {
@@ -591,6 +600,7 @@ public class M_Hover {
     };
 
     static EntThinkAdapter hover_dead = new EntThinkAdapter() {
+    	public String getID() { return "hover_dead"; }
         public boolean think(edict_t self) {
             Math3D.VectorSet(self.mins, -16, -16, -24);
             Math3D.VectorSet(self.maxs, 16, 16, -8);
@@ -604,6 +614,7 @@ public class M_Hover {
     };
 
     static EntDieAdapter hover_die = new EntDieAdapter() {
+    	public String getID() { return "hover_die"; }
         public void die(edict_t self, edict_t inflictor, edict_t attacker,
                 int damage, float[] point) {
             int n;
@@ -644,6 +655,7 @@ public class M_Hover {
     };
 
     static EntInteractAdapter hover_sight = new EntInteractAdapter() {
+    	public String getID() { return "hover_sight"; }
         public boolean interact(edict_t self, edict_t other) {
             GameBase.gi.sound(self, Defines.CHAN_VOICE, sound_sight, 1,
                     Defines.ATTN_NORM, 0);
@@ -652,6 +664,7 @@ public class M_Hover {
     };
 
     static EntThinkAdapter hover_search = new EntThinkAdapter() {
+    	public String getID() { return "hover_search"; }
         public boolean think(edict_t self) {
             if (Lib.random() < 0.5)
                 GameBase.gi.sound(self, Defines.CHAN_VOICE, sound_search1, 1,
diff --git a/src/jake2/game/monsters/M_Infantry.java b/src/jake2/game/monsters/M_Infantry.java
index d4d3bdd..3e169c4 100644
--- a/src/jake2/game/monsters/M_Infantry.java
+++ b/src/jake2/game/monsters/M_Infantry.java
@@ -19,7 +19,7 @@
  */
 
 // Created on 13.11.2003 by RST.
-// $Id: M_Infantry.java,v 1.3 2005-11-16 22:24:52 salomo Exp $
+// $Id: M_Infantry.java,v 1.4 2005-11-20 22:18:33 salomo Exp $
 package jake2.game.monsters;
 
 import jake2.Defines;
@@ -510,6 +510,7 @@ public class M_Infantry {
             FRAME_stand71, infantry_frames_stand, null);
 
     public static EntThinkAdapter infantry_stand = new EntThinkAdapter() {
+    	public String getID() { return "infantry_stand"; }
         public boolean think(edict_t self) {
             self.monsterinfo.currentmove = infantry_move_stand;
             return true;
@@ -571,6 +572,7 @@ public class M_Infantry {
             FRAME_stand49, infantry_frames_fidget, infantry_stand);
 
     static EntThinkAdapter infantry_fidget = new EntThinkAdapter() {
+    	public String getID() { return "infantry_fidget"; }
         public boolean think(edict_t self) {
             self.monsterinfo.currentmove = infantry_move_fidget;
             GameBase.gi.sound(self, Defines.CHAN_VOICE, sound_idle, 1,
@@ -597,6 +599,7 @@ public class M_Infantry {
             infantry_frames_walk, null);
 
     static EntThinkAdapter infantry_walk = new EntThinkAdapter() {
+    	public String getID() { return "infantry_walk"; }
         public boolean think(edict_t self) {
             self.monsterinfo.currentmove = infantry_move_walk;
             return true;
@@ -617,6 +620,7 @@ public class M_Infantry {
             infantry_frames_run, null);
 
     static EntThinkAdapter infantry_run = new EntThinkAdapter() {
+    	public String getID() { return "infantry_run"; }
         public boolean think(edict_t self) {
             if ((self.monsterinfo.aiflags & Defines.AI_STAND_GROUND) != 0)
                 self.monsterinfo.currentmove = infantry_move_stand;
@@ -657,6 +661,7 @@ public class M_Infantry {
             FRAME_pain210, infantry_frames_pain2, infantry_run);
 
     static EntPainAdapter infantry_pain = new EntPainAdapter() {
+    	public String getID() { return "infantry_pain"; }
         public void pain(edict_t self, edict_t other, float kick, int damage) {
 
             int n;
@@ -694,6 +699,7 @@ public class M_Infantry {
             { 90.0f, 35.0f, 0.0f } };
 
     static EntThinkAdapter InfantryMachineGun = new EntThinkAdapter() {
+    	public String getID() { return "InfantryMachineGun"; }
         public boolean think(edict_t self) {
             float[] start = { 0, 0, 0 }, target = { 0, 0, 0 };
             float[] forward = { 0, 0, 0 }, right = { 0, 0, 0 };
@@ -738,6 +744,7 @@ public class M_Infantry {
     };
 
     static EntInteractAdapter infantry_sight = new EntInteractAdapter() {
+    	public String getID() { return "infantry_sight"; }
         public boolean interact(edict_t self, edict_t other) {
             GameBase.gi.sound(self, Defines.CHAN_BODY, sound_sight, 1,
                     Defines.ATTN_NORM, 0);
@@ -748,6 +755,7 @@ public class M_Infantry {
     ///
 
     static EntThinkAdapter infantry_dead = new EntThinkAdapter() {
+    	public String getID() { return "infantry_dead"; }
         public boolean think(edict_t self) {
             Math3D.VectorSet(self.mins, -16, -16, -24);
             Math3D.VectorSet(self.maxs, 16, 16, -8);
@@ -831,6 +839,7 @@ public class M_Infantry {
             FRAME_death309, infantry_frames_death3, infantry_dead);
 
     public static EntDieAdapter infantry_die = new EntDieAdapter() {
+    	public String getID() { return "infantry_die"; }
         public void die(edict_t self, edict_t inflictor, edict_t attacker,
                 int damage, float[] point) {
 
@@ -880,6 +889,7 @@ public class M_Infantry {
     };
 
     static EntThinkAdapter infantry_duck_down = new EntThinkAdapter() {
+    	public String getID() { return "infantry_duck_down"; }
         public boolean think(edict_t self) {
             if ((self.monsterinfo.aiflags & Defines.AI_DUCKED) != 0)
                 return true;
@@ -893,6 +903,7 @@ public class M_Infantry {
     };
 
     static EntThinkAdapter infantry_duck_hold = new EntThinkAdapter() {
+    	public String getID() { return "infantry_duck_hold"; }
         public boolean think(edict_t self) {
             if (GameBase.level.time >= self.monsterinfo.pausetime)
                 self.monsterinfo.aiflags &= ~Defines.AI_HOLD_FRAME;
@@ -903,6 +914,7 @@ public class M_Infantry {
     };
 
     static EntThinkAdapter infantry_duck_up = new EntThinkAdapter() {
+    	public String getID() { return "infantry_duck_up"; }
         public boolean think(edict_t self) {
             self.monsterinfo.aiflags &= ~Defines.AI_DUCKED;
             self.maxs[2] += 32;
@@ -923,6 +935,7 @@ public class M_Infantry {
             infantry_frames_duck, infantry_run);
 
     static EntDodgeAdapter infantry_dodge = new EntDodgeAdapter() {
+    	public String getID() { return "infantry_dodge"; }
         public void dodge(edict_t self, edict_t attacker, float eta) {
             if (Lib.random() > 0.25)
                 return;
@@ -935,6 +948,7 @@ public class M_Infantry {
     };
 
     static EntThinkAdapter infantry_cock_gun = new EntThinkAdapter() {
+    	public String getID() { return "infantry_cock_gun"; }
         public boolean think(edict_t self) {
             int n;
 
@@ -948,6 +962,7 @@ public class M_Infantry {
     };
 
     static EntThinkAdapter infantry_fire = new EntThinkAdapter() {
+    	public String getID() { return "infantry_fire"; }
         public boolean think(edict_t self) {
             InfantryMachineGun.think(self);
 
@@ -980,6 +995,7 @@ public class M_Infantry {
             FRAME_attak115, infantry_frames_attack1, infantry_run);
 
     static EntThinkAdapter infantry_swing = new EntThinkAdapter() {
+    	public String getID() { return "infantry_swing"; }
 
         public boolean think(edict_t self) {
             GameBase.gi.sound(self, Defines.CHAN_WEAPON, sound_punch_swing, 1,
@@ -989,6 +1005,7 @@ public class M_Infantry {
     };
 
     static EntThinkAdapter infantry_smack = new EntThinkAdapter() {
+    	public String getID() { return "infantry_smack"; }
         public boolean think(edict_t self) {
             float[] aim = { 0, 0, 0 };
 
@@ -1014,6 +1031,7 @@ public class M_Infantry {
             FRAME_attak208, infantry_frames_attack2, infantry_run);
 
     static EntThinkAdapter infantry_attack = new EntThinkAdapter() {
+    	public String getID() { return "infantry_attack"; }
         public boolean think(edict_t self) {
             if (GameUtil.range(self, self.enemy) == Defines.RANGE_MELEE)
                 self.monsterinfo.currentmove = infantry_move_attack2;
diff --git a/src/jake2/game/monsters/M_Insane.java b/src/jake2/game/monsters/M_Insane.java
index 51fa113..b77adcf 100644
--- a/src/jake2/game/monsters/M_Insane.java
+++ b/src/jake2/game/monsters/M_Insane.java
@@ -19,7 +19,7 @@
  */
 
 // Created on 13.11.2003 by RST.
-// $Id: M_Insane.java,v 1.3 2005-11-16 22:24:52 salomo Exp $
+// $Id: M_Insane.java,v 1.4 2005-11-20 22:18:33 salomo Exp $
 package jake2.game.monsters;
 
 import jake2.Defines;
@@ -614,6 +614,7 @@ public class M_Insane {
     static int sound_scream[] = { 0, 0, 0, 0, 0, 0, 0, 0 };
 
     static EntThinkAdapter insane_fist = new EntThinkAdapter() {
+    	public String getID() { return "insane_fist"; }
         public boolean think(edict_t self) {
             GameBase.gi.sound(self, Defines.CHAN_VOICE, sound_fist, 1,
                     Defines.ATTN_IDLE, 0);
@@ -622,6 +623,7 @@ public class M_Insane {
     };
 
     static EntThinkAdapter insane_shake = new EntThinkAdapter() {
+    	public String getID() { return "insane_shake"; }
         public boolean think(edict_t self) {
             GameBase.gi.sound(self, Defines.CHAN_VOICE, sound_shake, 1,
                     Defines.ATTN_IDLE, 0);
@@ -630,6 +632,7 @@ public class M_Insane {
     };
 
     static EntThinkAdapter insane_moan = new EntThinkAdapter() {
+    	public String getID() { return "insane_moan"; }
         public boolean think(edict_t self) {
             GameBase.gi.sound(self, Defines.CHAN_VOICE, sound_moan, 1,
                     Defines.ATTN_IDLE, 0);
@@ -638,6 +641,7 @@ public class M_Insane {
     };
 
     static EntThinkAdapter insane_scream = new EntThinkAdapter() {
+    	public String getID() { return "insane_scream"; }
         public boolean think(edict_t self) {
             GameBase.gi.sound(self, Defines.CHAN_VOICE,
                     sound_scream[Lib.rand() % 8], 1, Defines.ATTN_IDLE, 0);
@@ -646,6 +650,7 @@ public class M_Insane {
     };
 
     static EntThinkAdapter insane_cross = new EntThinkAdapter() {
+    	public String getID() { return "insane_cross"; }
         public boolean think(edict_t self) {
             if (Lib.random() < 0.8)
                 self.monsterinfo.currentmove = insane_move_cross;
@@ -656,6 +661,7 @@ public class M_Insane {
     };
 
     static EntThinkAdapter insane_walk = new EntThinkAdapter() {
+    	public String getID() { return "insane_walk"; }
         public boolean think(edict_t self) {
             if ((self.spawnflags & 16) != 0) // Hold Ground?
                 if (self.s.frame == FRAME_cr_pain10) {
@@ -673,6 +679,7 @@ public class M_Insane {
     };
 
     static EntThinkAdapter insane_run = new EntThinkAdapter() {
+    	public String getID() { return "insane_run"; }
         public boolean think(edict_t self) {
             if ((self.spawnflags & 16) != 0) // Hold Ground?
                 if (self.s.frame == FRAME_cr_pain10) {
@@ -690,6 +697,7 @@ public class M_Insane {
     };
 
     static EntPainAdapter insane_pain = new EntPainAdapter() {
+    	public String getID() { return "insane_pain"; }
         public void pain(edict_t self, edict_t other, float kick, int damage) {
             int l, r;
 
@@ -732,6 +740,7 @@ public class M_Insane {
     };
 
     static EntThinkAdapter insane_onground = new EntThinkAdapter() {
+    	public String getID() { return "insane_onground"; }
         public boolean think(edict_t self) {
             self.monsterinfo.currentmove = insane_move_down;
             return true;
@@ -739,6 +748,7 @@ public class M_Insane {
     };
 
     static EntThinkAdapter insane_checkdown = new EntThinkAdapter() {
+    	public String getID() { return "insane_checkdown"; }
         public boolean think(edict_t self) {
             //			if ( (self.s.frame == FRAME_stand94) || (self.s.frame ==
             // FRAME_stand65) )
@@ -754,6 +764,7 @@ public class M_Insane {
     };
 
     static EntThinkAdapter insane_checkup = new EntThinkAdapter() {
+    	public String getID() { return "insane_checkup"; }
         public boolean think(edict_t self) {
             //			If Hold_Ground and Crawl are set
             if ((self.spawnflags & 4) != 0 && (self.spawnflags & 16) != 0)
@@ -765,6 +776,7 @@ public class M_Insane {
     };
 
     static EntThinkAdapter insane_stand = new EntThinkAdapter() {
+    	public String getID() { return "insane_stand"; }
         public boolean think(edict_t self) {
             if ((self.spawnflags & 8) != 0) // If crucified
             {
@@ -783,6 +795,7 @@ public class M_Insane {
     };
 
     static EntThinkAdapter insane_dead = new EntThinkAdapter() {
+    	public String getID() { return "insane_dead"; }
         public boolean think(edict_t self) {
             if ((self.spawnflags & 8) != 0) {
                 self.flags |= Defines.FL_FLY;
@@ -799,6 +812,7 @@ public class M_Insane {
     };
 
     static EntDieAdapter insane_die = new EntDieAdapter() {
+    	public String getID() { return "insane_die"; }
         public void die(edict_t self, edict_t inflictor, edict_t attacker,
                 int damage, float[] point) {
             int n;
diff --git a/src/jake2/game/monsters/M_Medic.java b/src/jake2/game/monsters/M_Medic.java
index 6237e1c..8925213 100644
--- a/src/jake2/game/monsters/M_Medic.java
+++ b/src/jake2/game/monsters/M_Medic.java
@@ -19,7 +19,7 @@
  */
 
 // Created on 13.11.2003 by RST.
-// $Id: M_Medic.java,v 1.3 2005-11-16 22:24:52 salomo Exp $
+// $Id: M_Medic.java,v 1.4 2005-11-20 22:18:33 salomo Exp $
 package jake2.game.monsters;
 
 import jake2.Defines;
@@ -560,6 +560,7 @@ public class M_Medic {
     }
 
     static EntThinkAdapter medic_idle = new EntThinkAdapter() {
+    	public String getID(){ return "medic_idle"; }
         public boolean think(edict_t self) {
             edict_t ent;
 
@@ -578,6 +579,7 @@ public class M_Medic {
     };
 
     static EntThinkAdapter medic_search = new EntThinkAdapter() {
+    	public String getID(){ return "medic_search"; }
         public boolean think(edict_t self) {
             edict_t ent;
 
@@ -599,6 +601,7 @@ public class M_Medic {
     };
 
     static EntInteractAdapter medic_sight = new EntInteractAdapter() {
+    	public String getID(){ return "medic_sight"; }
         public boolean interact(edict_t self, edict_t other) {
             GameBase.gi.sound(self, Defines.CHAN_VOICE, sound_sight, 1,
                     Defines.ATTN_NORM, 0);
@@ -702,6 +705,7 @@ public class M_Medic {
             medic_frames_stand, null);
 
     static EntThinkAdapter medic_stand = new EntThinkAdapter() {
+    	public String getID(){ return "medic_stand"; }
         public boolean think(edict_t self) {
             self.monsterinfo.currentmove = medic_move_stand;
             return true;
@@ -726,6 +730,7 @@ public class M_Medic {
             medic_frames_walk, null);
 
     static EntThinkAdapter medic_walk = new EntThinkAdapter() {
+    	public String getID(){ return "medic_walk"; }
         public boolean think(edict_t self) {
             self.monsterinfo.currentmove = medic_move_walk;
             return true;
@@ -744,6 +749,7 @@ public class M_Medic {
             medic_frames_run, null);
 
     static EntThinkAdapter medic_run = new EntThinkAdapter() {
+    	public String getID(){ return "medic_run"; }
         public boolean think(edict_t self) {
             if (0 == (self.monsterinfo.aiflags & Defines.AI_MEDIC)) {
                 edict_t ent;
@@ -801,6 +807,7 @@ public class M_Medic {
             medic_frames_pain2, medic_run);
 
     static EntPainAdapter medic_pain = new EntPainAdapter() {
+    	public String getID(){ return "medic_pain"; }
         public void pain(edict_t self, edict_t other, float kick, int damage) {
 
             if (self.health < (self.max_health / 2))
@@ -827,6 +834,7 @@ public class M_Medic {
     };
 
     static EntThinkAdapter medic_fire_blaster = new EntThinkAdapter() {
+    	public String getID(){ return "medic_fire_blaster"; }
         public boolean think(edict_t self) {
             float[] start = { 0, 0, 0 };
             float[] forward = { 0, 0, 0 }, right = { 0, 0, 0 };
@@ -861,6 +869,7 @@ public class M_Medic {
     };
 
     static EntThinkAdapter medic_dead = new EntThinkAdapter() {
+    	public String getID(){ return "medic_dead"; }
         public boolean think(edict_t self) {
             Math3D.VectorSet(self.mins, -16, -16, -24);
             Math3D.VectorSet(self.maxs, 16, 16, -8);
@@ -908,6 +917,7 @@ public class M_Medic {
             medic_frames_death, medic_dead);
 
     static EntDieAdapter medic_die = new EntDieAdapter() {
+    	public String getID(){ return "medic_die"; }
         public void die(edict_t self, edict_t inflictor, edict_t attacker,
                 int damage, float[] point) {
 
@@ -950,6 +960,7 @@ public class M_Medic {
     };
 
     static EntThinkAdapter medic_duck_down = new EntThinkAdapter() {
+    	public String getID(){ return "medic_duck_down"; }
         public boolean think(edict_t self) {
             if ((self.monsterinfo.aiflags & Defines.AI_DUCKED) != 0)
                 return true;
@@ -963,6 +974,7 @@ public class M_Medic {
     };
 
     static EntThinkAdapter medic_duck_hold = new EntThinkAdapter() {
+    	public String getID(){ return "medic_duck_hold"; }
         public boolean think(edict_t self) {
             if (GameBase.level.time >= self.monsterinfo.pausetime)
                 self.monsterinfo.aiflags &= ~Defines.AI_HOLD_FRAME;
@@ -973,6 +985,7 @@ public class M_Medic {
     };
 
     static EntThinkAdapter medic_duck_up = new EntThinkAdapter() {
+    	public String getID(){ return "medic_duck_up"; }
         public boolean think(edict_t self) {
             self.monsterinfo.aiflags &= ~Defines.AI_DUCKED;
             self.maxs[2] += 32;
@@ -1004,6 +1017,7 @@ public class M_Medic {
             medic_frames_duck, medic_run);
 
     static EntDodgeAdapter medic_dodge = new EntDodgeAdapter() {
+    	public String getID(){ return "medic_dodge"; }
         public void dodge(edict_t self, edict_t attacker, float eta) {
             if (Lib.random() > 0.25)
                 return;
@@ -1037,6 +1051,7 @@ public class M_Medic {
             FRAME_attack30, medic_frames_attackHyperBlaster, medic_run);
 
     static EntThinkAdapter medic_continue = new EntThinkAdapter() {
+    	public String getID(){ return "medic_continue"; }
         public boolean think(edict_t self) {
             if (GameUtil.visible(self, self.enemy))
                 if (Lib.random() <= 0.95)
@@ -1069,6 +1084,7 @@ public class M_Medic {
             FRAME_attack14, medic_frames_attackBlaster, medic_run);
 
     static EntThinkAdapter medic_hook_launch = new EntThinkAdapter() {
+    	public String getID(){ return "medic_hook_launch"; }
         public boolean think(edict_t self) {
             GameBase.gi.sound(self, Defines.CHAN_WEAPON, sound_hook_launch, 1,
                     Defines.ATTN_NORM, 0);
@@ -1084,6 +1100,7 @@ public class M_Medic {
             { 32.7f, -19.7f, 10.4f } };
 
     static EntThinkAdapter medic_cable_attack = new EntThinkAdapter() {
+    	public String getID(){ return "medic_cable_attack"; }
         public boolean think(edict_t self) {
             float[] offset = { 0, 0, 0 }, start = { 0, 0, 0 }, end = { 0, 0, 0 }, f = {
                     0, 0, 0 }, r = { 0, 0, 0 };
@@ -1164,6 +1181,7 @@ public class M_Medic {
     };
 
     static EntThinkAdapter medic_hook_retract = new EntThinkAdapter() {
+    	public String getID(){ return "medic_hook_retract"; }
         public boolean think(edict_t self) {
             GameBase.gi.sound(self, Defines.CHAN_WEAPON, sound_hook_retract, 1,
                     Defines.ATTN_NORM, 0);
@@ -1206,6 +1224,7 @@ public class M_Medic {
             FRAME_attack60, medic_frames_attackCable, medic_run);
 
     static EntThinkAdapter medic_attack = new EntThinkAdapter() {
+    	public String getID(){ return "medic_attack"; }
         public boolean think(edict_t self) {
             if ((self.monsterinfo.aiflags & Defines.AI_MEDIC) != 0)
                 self.monsterinfo.currentmove = medic_move_attackCable;
@@ -1216,6 +1235,7 @@ public class M_Medic {
     };
 
     static EntThinkAdapter medic_checkattack = new EntThinkAdapter() {
+    	public String getID(){ return "medic_checkattack"; }
         public boolean think(edict_t self) {
             if ((self.monsterinfo.aiflags & Defines.AI_MEDIC) != 0) {
                 medic_attack.think(self);
diff --git a/src/jake2/game/monsters/M_Mutant.java b/src/jake2/game/monsters/M_Mutant.java
index 6683bc9..705c3a3 100644
--- a/src/jake2/game/monsters/M_Mutant.java
+++ b/src/jake2/game/monsters/M_Mutant.java
@@ -19,7 +19,7 @@
  */
 
 // Created on 13.11.2003 by RST.
-// $Id: M_Mutant.java,v 1.3 2005-11-16 22:24:52 salomo Exp $
+// $Id: M_Mutant.java,v 1.4 2005-11-20 22:18:33 salomo Exp $
 package jake2.game.monsters;
 
 import jake2.Defines;
@@ -362,6 +362,7 @@ public class M_Mutant {
     //	SOUNDS
     //
     static EntThinkAdapter mutant_step = new EntThinkAdapter() {
+    	public String getID(){ return "mutant_step"; }
         public boolean think(edict_t self) {
             int n;
             n = (Lib.rand() + 1) % 3;
@@ -379,6 +380,7 @@ public class M_Mutant {
     };
 
     static EntInteractAdapter mutant_sight = new EntInteractAdapter() {
+    	public String getID(){ return "mutant_sight"; }
         public boolean interact(edict_t self, edict_t other) {
             GameBase.gi.sound(self, Defines.CHAN_VOICE, sound_sight, 1,
                     Defines.ATTN_NORM, 0);
@@ -387,6 +389,7 @@ public class M_Mutant {
     };
 
     static EntThinkAdapter mutant_search = new EntThinkAdapter() {
+    	public String getID(){ return "mutant_search"; }
         public boolean think(edict_t self) {
             GameBase.gi.sound(self, Defines.CHAN_VOICE, sound_search, 1,
                     Defines.ATTN_NORM, 0);
@@ -395,6 +398,7 @@ public class M_Mutant {
     };
 
     static EntThinkAdapter mutant_swing = new EntThinkAdapter() {
+    	public String getID(){ return "mutant_swing"; }
         public boolean think(edict_t self) {
             GameBase.gi.sound(self, Defines.CHAN_VOICE, sound_swing, 1,
                     Defines.ATTN_NORM, 0);
@@ -473,6 +477,7 @@ public class M_Mutant {
             FRAME_stand151, mutant_frames_stand, null);
 
     static EntThinkAdapter mutant_stand = new EntThinkAdapter() {
+    	public String getID(){ return "mutant_stand"; }
         public boolean think(edict_t self) {
             self.monsterinfo.currentmove = mutant_move_stand;
             return true;
@@ -484,6 +489,7 @@ public class M_Mutant {
     //
 
     static EntThinkAdapter mutant_idle_loop = new EntThinkAdapter() {
+    	public String getID(){ return "mutant_idle_loop"; }
         public boolean think(edict_t self) {
             if (Lib.random() < 0.75)
                 self.monsterinfo.nextframe = FRAME_stand155;
@@ -512,6 +518,7 @@ public class M_Mutant {
             FRAME_stand164, mutant_frames_idle, mutant_stand);
 
     static EntThinkAdapter mutant_idle = new EntThinkAdapter() {
+    	public String getID(){ return "mutant_idle"; }
         public boolean think(edict_t self) {
             self.monsterinfo.currentmove = mutant_move_idle;
             GameBase.gi.sound(self, Defines.CHAN_VOICE, sound_idle, 1,
@@ -542,6 +549,7 @@ public class M_Mutant {
             mutant_frames_walk, null);
 
     static EntThinkAdapter mutant_walk_loop = new EntThinkAdapter() {
+    	public String getID(){ return "mutant_walk_loop"; }
         public boolean think(edict_t self) {
             self.monsterinfo.currentmove = mutant_move_walk;
             return true;
@@ -558,6 +566,7 @@ public class M_Mutant {
             FRAME_walk04, mutant_frames_start_walk, mutant_walk_loop);
 
     static EntThinkAdapter mutant_walk = new EntThinkAdapter() {
+    	public String getID(){ return "mutant_walk"; }
         public boolean think(edict_t self) {
             self.monsterinfo.currentmove = mutant_move_start_walk;
             return true;
@@ -580,6 +589,7 @@ public class M_Mutant {
             mutant_frames_run, null);
 
     static EntThinkAdapter mutant_run = new EntThinkAdapter() {
+    	public String getID(){ return "mutant_run"; }
         public boolean think(edict_t self) {
             if ((self.monsterinfo.aiflags & Defines.AI_STAND_GROUND) != 0)
                 self.monsterinfo.currentmove = mutant_move_stand;
@@ -595,6 +605,7 @@ public class M_Mutant {
     //
 
     static EntThinkAdapter mutant_hit_left = new EntThinkAdapter() {
+    	public String getID(){ return "mutant_hit_left"; }
         public boolean think(edict_t self) {
             float[] aim = { 0, 0, 0 };
 
@@ -610,6 +621,7 @@ public class M_Mutant {
     };
 
     static EntThinkAdapter mutant_hit_right = new EntThinkAdapter() {
+    	public String getID(){ return "mutant_hit_right"; }
         public boolean think(edict_t self) {
             float[] aim = { 0, 0, 0 };
 
@@ -625,6 +637,7 @@ public class M_Mutant {
     };
 
     static EntThinkAdapter mutant_check_refire = new EntThinkAdapter() {
+    	public String getID(){ return "mutant_check_refire"; }
         public boolean think(edict_t self) {
             if (null == self.enemy || !self.enemy.inuse
                     || self.enemy.health <= 0)
@@ -650,6 +663,7 @@ public class M_Mutant {
             FRAME_attack15, mutant_frames_attack, mutant_run);
 
     static EntThinkAdapter mutant_melee = new EntThinkAdapter() {
+    	public String getID(){ return "mutant_melee"; }
         public boolean think(edict_t self) {
             self.monsterinfo.currentmove = mutant_move_attack;
             return true;
@@ -661,6 +675,7 @@ public class M_Mutant {
     //
 
     static EntTouchAdapter mutant_jump_touch = new EntTouchAdapter() {
+    	public String getID(){ return "mutant_jump_touch"; }
 
         public void touch(edict_t self, edict_t other, cplane_t plane,
                 csurface_t surf) {
@@ -697,6 +712,7 @@ public class M_Mutant {
     };
 
     static EntThinkAdapter mutant_jump_takeoff = new EntThinkAdapter() {
+    	public String getID(){ return "mutant_jump_takeoff"; }
         public boolean think(edict_t self) {
 
             float[] forward = { 0, 0, 0 };
@@ -716,6 +732,7 @@ public class M_Mutant {
     };
 
     static EntThinkAdapter mutant_check_landing = new EntThinkAdapter() {
+    	public String getID(){ return "mutant_check_landing"; }
         public boolean think(edict_t self) {
             if (self.groundentity != null) {
                 GameBase.gi.sound(self, Defines.CHAN_WEAPON, sound_thud, 1,
@@ -747,6 +764,7 @@ public class M_Mutant {
             FRAME_attack08, mutant_frames_jump, mutant_run);
 
     static EntThinkAdapter mutant_jump = new EntThinkAdapter() {
+    	public String getID(){ return "mutant_jump"; }
         public boolean think(edict_t self) {
 
             self.monsterinfo.currentmove = mutant_move_jump;
@@ -758,6 +776,7 @@ public class M_Mutant {
     //	CHECKATTACK
     //
     static EntThinkAdapter mutant_check_melee = new EntThinkAdapter() {
+    	public String getID(){ return "mutant_check_melee"; }
         public boolean think(edict_t self) {
             if (GameUtil.range(self, self.enemy) == Defines.RANGE_MELEE)
                 return true;
@@ -767,6 +786,7 @@ public class M_Mutant {
     };
 
     static EntThinkAdapter mutant_check_jump = new EntThinkAdapter() {
+    	public String getID(){ return "mutant_check_jump"; }
         public boolean think(edict_t self) {
 
             float[] v = { 0, 0, 0 };
@@ -795,6 +815,7 @@ public class M_Mutant {
     };
 
     static EntThinkAdapter mutant_checkattack = new EntThinkAdapter() {
+    	public String getID(){ return "mutant_checkattack"; }
         public boolean think(edict_t self) {
 
             if (null == self.enemy || self.enemy.health <= 0)
@@ -857,6 +878,7 @@ public class M_Mutant {
             FRAME_pain311, mutant_frames_pain3, mutant_run);
 
     static EntPainAdapter mutant_pain = new EntPainAdapter() {
+    	public String getID(){ return "mutant_pain"; }
         public void pain(edict_t self, edict_t other, float kick, int damage) {
             float r;
 
@@ -892,6 +914,7 @@ public class M_Mutant {
     //	DEATH
     //
     static EntThinkAdapter mutant_dead = new EntThinkAdapter() {
+    	public String getID(){ return "mutant_dead"; }
         public boolean think(edict_t self) {
             Math3D.VectorSet(self.mins, -16, -16, -24);
             Math3D.VectorSet(self.maxs, 16, 16, -8);
@@ -934,6 +957,7 @@ public class M_Mutant {
             FRAME_death210, mutant_frames_death2, mutant_dead);
 
     static EntDieAdapter mutant_die = new EntDieAdapter() {
+    	public String getID(){ return "mutant_die"; }
         public void die(edict_t self, edict_t inflictor, edict_t attacker,
                 int damage, float[] point) {
             int n;
@@ -981,6 +1005,7 @@ public class M_Mutant {
      * Trigger_Spawn Sight
      */
     public static EntThinkAdapter SP_monster_mutant = new EntThinkAdapter() {
+    	public String getID(){ return "SP_monster_mutant"; }
         public boolean think(edict_t self) {
             if (GameBase.deathmatch.value != 0) {
                 GameUtil.G_FreeEdict(self);
diff --git a/src/jake2/game/monsters/M_Parasite.java b/src/jake2/game/monsters/M_Parasite.java
index 9aa56e6..f7bb56a 100644
--- a/src/jake2/game/monsters/M_Parasite.java
+++ b/src/jake2/game/monsters/M_Parasite.java
@@ -19,7 +19,7 @@
  */
 
 // Created on 13.11.2003 by RST.
-// $Id: M_Parasite.java,v 1.3 2005-11-16 22:24:52 salomo Exp $
+// $Id: M_Parasite.java,v 1.4 2005-11-20 22:18:33 salomo Exp $
 package jake2.game.monsters;
 
 import jake2.Defines;
@@ -304,6 +304,7 @@ public class M_Parasite {
     static int sound_search;
 
     static EntThinkAdapter parasite_launch = new EntThinkAdapter() {
+    	public String getID(){ return "parasite_launch"; }
         public boolean think(edict_t self) {
 
             GameBase.gi.sound(self, Defines.CHAN_WEAPON, sound_launch, 1,
@@ -313,6 +314,7 @@ public class M_Parasite {
     };
 
     static EntThinkAdapter parasite_reel_in = new EntThinkAdapter() {
+    	public String getID(){ return "parasite_reel_in"; }
         public boolean think(edict_t self) {
             GameBase.gi.sound(self, Defines.CHAN_WEAPON, sound_reelin, 1,
                     Defines.ATTN_NORM, 0);
@@ -321,6 +323,7 @@ public class M_Parasite {
     };
 
     static EntInteractAdapter parasite_sight = new EntInteractAdapter() {
+    	public String getID(){ return "parasite_sight"; }
         public boolean interact(edict_t self, edict_t other) {
             GameBase.gi.sound(self, Defines.CHAN_WEAPON, sound_sight, 1,
                     Defines.ATTN_NORM, 0);
@@ -329,6 +332,7 @@ public class M_Parasite {
     };
 
     static EntThinkAdapter parasite_tap = new EntThinkAdapter() {
+    	public String getID(){ return "parasite_tap"; }
         public boolean think(edict_t self) {
             GameBase.gi.sound(self, Defines.CHAN_WEAPON, sound_tap, 1,
                     Defines.ATTN_IDLE, 0);
@@ -337,6 +341,7 @@ public class M_Parasite {
     };
 
     static EntThinkAdapter parasite_scratch = new EntThinkAdapter() {
+    	public String getID(){ return "parasite_scratch"; }
         public boolean think(edict_t self) {
             GameBase.gi.sound(self, Defines.CHAN_WEAPON, sound_scratch, 1,
                     Defines.ATTN_IDLE, 0);
@@ -345,6 +350,7 @@ public class M_Parasite {
     };
 
     static EntThinkAdapter parasite_search = new EntThinkAdapter() {
+    	public String getID(){ return "parasite_search"; }
         public boolean think(edict_t self) {
             GameBase.gi.sound(self, Defines.CHAN_WEAPON, sound_search, 1,
                     Defines.ATTN_IDLE, 0);
@@ -353,6 +359,7 @@ public class M_Parasite {
     };
 
     static EntThinkAdapter parasite_start_walk = new EntThinkAdapter() {
+    	public String getID(){ return "parasite_start_walk"; }
         public boolean think(edict_t self) {
             self.monsterinfo.currentmove = parasite_move_start_walk;
             return true;
@@ -360,6 +367,7 @@ public class M_Parasite {
     };
 
     static EntThinkAdapter parasite_walk = new EntThinkAdapter() {
+    	public String getID(){ return "parasite_walk"; }
         public boolean think(edict_t self) {
             self.monsterinfo.currentmove = parasite_move_walk;
             return true;
@@ -367,6 +375,7 @@ public class M_Parasite {
     };
 
     static EntThinkAdapter parasite_stand = new EntThinkAdapter() {
+    	public String getID(){ return "parasite_stand"; }
         public boolean think(edict_t self) {
             self.monsterinfo.currentmove = parasite_move_stand;
             return true;
@@ -374,6 +383,7 @@ public class M_Parasite {
     };
 
     static EntThinkAdapter parasite_end_fidget = new EntThinkAdapter() {
+    	public String getID(){ return "parasite_end_fidget"; }
         public boolean think(edict_t self) {
             self.monsterinfo.currentmove = parasite_move_end_fidget;
             return true;
@@ -381,6 +391,7 @@ public class M_Parasite {
     };
 
     static EntThinkAdapter parasite_do_fidget = new EntThinkAdapter() {
+    	public String getID(){ return "parasite_do_fidget"; }
         public boolean think(edict_t self) {
             self.monsterinfo.currentmove = parasite_move_fidget;
             return true;
@@ -388,6 +399,7 @@ public class M_Parasite {
     };
 
     static EntThinkAdapter parasite_refidget = new EntThinkAdapter() {
+    	public String getID(){ return "parasite_refidget"; }
         public boolean think(edict_t self) {
             if (Lib.random() <= 0.8)
                 self.monsterinfo.currentmove = parasite_move_fidget;
@@ -398,6 +410,7 @@ public class M_Parasite {
     };
 
     static EntThinkAdapter parasite_idle = new EntThinkAdapter() {
+    	public String getID(){ return "parasite_idle"; }
         public boolean think(edict_t self) {
             self.monsterinfo.currentmove = parasite_move_start_fidget;
             return true;
@@ -405,6 +418,7 @@ public class M_Parasite {
     };
 
     static EntThinkAdapter parasite_start_run = new EntThinkAdapter() {
+    	public String getID(){ return "parasite_start_run"; }
         public boolean think(edict_t self) {
             if ((self.monsterinfo.aiflags & Defines.AI_STAND_GROUND) != 0)
                 self.monsterinfo.currentmove = parasite_move_stand;
@@ -415,6 +429,7 @@ public class M_Parasite {
     };
 
     static EntThinkAdapter parasite_run = new EntThinkAdapter() {
+    	public String getID(){ return "parasite_run"; }
         public boolean think(edict_t self) {
             if ((self.monsterinfo.aiflags & Defines.AI_STAND_GROUND) != 0)
                 self.monsterinfo.currentmove = parasite_move_stand;
@@ -556,6 +571,7 @@ public class M_Parasite {
             FRAME_pain111, parasite_frames_pain1, parasite_start_run);
 
     static EntPainAdapter parasite_pain = new EntPainAdapter() {
+    	public String getID(){ return "parasite_pain"; }
         public void pain(edict_t self, edict_t other, float kick, int damage) {
             if (self.health < (self.max_health / 2))
                 self.s.skinnum = 1;
@@ -580,6 +596,7 @@ public class M_Parasite {
     };
 
     static EntThinkAdapter parasite_drain_attack = new EntThinkAdapter() {
+    	public String getID(){ return "parasite_drain_attack"; }
         public boolean think(edict_t self) {
             float[] offset = { 0, 0, 0 }, start = { 0, 0, 0 }, f = { 0, 0, 0 }, r = {
                     0, 0, 0 }, end = { 0, 0, 0 }, dir = { 0, 0, 0 };
@@ -700,6 +717,7 @@ public class M_Parasite {
      */
 
     static EntThinkAdapter parasite_attack = new EntThinkAdapter() {
+    	public String getID(){ return "parasite_attack"; }
         public boolean think(edict_t self) {
             //	if (random() <= 0.2)
             //		self.monsterinfo.currentmove = &parasite_move_break;
@@ -714,6 +732,7 @@ public class M_Parasite {
      */
 
     static EntThinkAdapter parasite_dead = new EntThinkAdapter() {
+    	public String getID(){ return "parasite_dead"; }
         public boolean think(edict_t self) {
             Math3D.VectorSet(self.mins, -16, -16, -24);
             Math3D.VectorSet(self.maxs, 16, 16, -8);
@@ -738,6 +757,7 @@ public class M_Parasite {
             FRAME_death107, parasite_frames_death, parasite_dead);
 
     static EntDieAdapter parasite_die = new EntDieAdapter() {
+    	public String getID(){ return "parasite_die"; }
         public void die(edict_t self, edict_t inflictor, edict_t attacker,
                 int damage, float[] point) {
             int n;
@@ -783,6 +803,7 @@ public class M_Parasite {
      */
 
     public static EntThinkAdapter SP_monster_parasite = new EntThinkAdapter() {
+    	public String getID(){ return "SP_monster_parasite"; }
         public boolean think(edict_t self) {
             if (GameBase.deathmatch.value != 0) {
                 GameUtil.G_FreeEdict(self);
diff --git a/src/jake2/game/monsters/M_Soldier.java b/src/jake2/game/monsters/M_Soldier.java
index 57225f9..42dad51 100644
--- a/src/jake2/game/monsters/M_Soldier.java
+++ b/src/jake2/game/monsters/M_Soldier.java
@@ -19,7 +19,7 @@
  */
 
 // Created on 13.11.2003 by RST.
-// $Id: M_Soldier.java,v 1.3 2005-11-16 22:24:52 salomo Exp $
+// $Id: M_Soldier.java,v 1.4 2005-11-20 22:18:33 salomo Exp $
 package jake2.game.monsters;
 
 import jake2.Defines;
@@ -1017,6 +1017,7 @@ public class M_Soldier {
     static int sound_cock;
 
     static EntThinkAdapter soldier_dead = new EntThinkAdapter() {
+    	public String getID(){ return "soldier_dead"; }
         public boolean think(edict_t self) {
 
             Math3D.VectorSet(self.mins, -16, -16, -24);
@@ -1030,6 +1031,7 @@ public class M_Soldier {
     };
 
     static EntDieAdapter soldier_die = new EntDieAdapter() {
+    	public String getID(){ return "soldier_die"; }
         public void die(edict_t self, edict_t inflictor, edict_t attacker,
                 int damage, float[] point) {
             int n;
@@ -1092,6 +1094,7 @@ public class M_Soldier {
     };
 
     static EntThinkAdapter soldier_attack1_refire1 = new EntThinkAdapter() {
+    	public String getID(){ return "soldier_attack1_refire1"; }
         public boolean think(edict_t self) {
             if (self.s.skinnum > 1)
                 return true;
@@ -1109,6 +1112,7 @@ public class M_Soldier {
     };
 
     static EntThinkAdapter soldier_attack1_refire2 = new EntThinkAdapter() {
+    	public String getID(){ return "soldier_attack1_refire2"; }
         public boolean think(edict_t self) {
             if (self.s.skinnum < 2)
                 return true;
@@ -1124,6 +1128,7 @@ public class M_Soldier {
     };
 
     static EntThinkAdapter soldier_attack2_refire1 = new EntThinkAdapter() {
+    	public String getID(){ return "soldier_attack2_refire1"; }
         public boolean think(edict_t self) {
             if (self.s.skinnum > 1)
                 return true;
@@ -1141,6 +1146,7 @@ public class M_Soldier {
     };
 
     static EntThinkAdapter soldier_attack2_refire2 = new EntThinkAdapter() {
+    	public String getID(){ return "soldier_attack2_refire2"; }
         public boolean think(edict_t self) {
             if (self.s.skinnum < 2)
                 return true;
@@ -1156,6 +1162,7 @@ public class M_Soldier {
     };
 
     static EntThinkAdapter soldier_attack3_refire = new EntThinkAdapter() {
+    	public String getID(){ return "soldier_attack3_refire"; }
         public boolean think(edict_t self) {
             if ((GameBase.level.time + 0.4) < self.monsterinfo.pausetime)
                 self.monsterinfo.nextframe = FRAME_attak303;
@@ -1164,6 +1171,7 @@ public class M_Soldier {
     };
 
     static EntThinkAdapter soldier_attack6_refire = new EntThinkAdapter() {
+    	public String getID(){ return "soldier_attack6_refire"; }
         public boolean think(edict_t self) {
             if (self.enemy.health <= 0)
                 return true;
@@ -1179,6 +1187,7 @@ public class M_Soldier {
 
     // ATTACK6 (run & shoot)
     static EntThinkAdapter soldier_fire8 = new EntThinkAdapter() {
+    	public String getID(){ return "soldier_fire8"; }
         public boolean think(edict_t self) {
             soldier_fire(self, 7);
             return true;
@@ -1188,6 +1197,7 @@ public class M_Soldier {
     // ATTACK1 (blaster/shotgun)
 
     static EntThinkAdapter soldier_fire1 = new EntThinkAdapter() {
+    	public String getID(){ return "soldier_fire1"; }
         public boolean think(edict_t self) {
             soldier_fire(self, 0);
             return true;
@@ -1197,6 +1207,7 @@ public class M_Soldier {
     // ATTACK2 (blaster/shotgun)
 
     static EntThinkAdapter soldier_fire2 = new EntThinkAdapter() {
+    	public String getID(){ return "soldier_fire2"; }
         public boolean think(edict_t self) {
             soldier_fire(self, 1);
             return true;
@@ -1204,6 +1215,7 @@ public class M_Soldier {
     };
 
     static EntThinkAdapter soldier_duck_down = new EntThinkAdapter() {
+    	public String getID(){ return "soldier_duck_down"; }
         public boolean think(edict_t self) {
             if ((self.monsterinfo.aiflags & Defines.AI_DUCKED) != 0)
                 return true;
@@ -1217,6 +1229,7 @@ public class M_Soldier {
     };
 
     static EntThinkAdapter soldier_fire3 = new EntThinkAdapter() {
+    	public String getID(){ return "soldier_fire3"; }
         public boolean think(edict_t self) {
             soldier_duck_down.think(self);
             soldier_fire(self, 2);
@@ -1227,6 +1240,7 @@ public class M_Soldier {
     // ATTACK4 (machinegun)
 
     static EntThinkAdapter soldier_fire4 = new EntThinkAdapter() {
+    	public String getID(){ return "soldier_fire4"; }
         public boolean think(edict_t self) {
             soldier_fire(self, 3);
             //
@@ -1245,6 +1259,7 @@ public class M_Soldier {
     //
 
     static EntThinkAdapter soldier_fire6 = new EntThinkAdapter() {
+    	public String getID(){ return "soldier_fire6"; }
         public boolean think(edict_t self) {
             soldier_fire(self, 5);
             return true;
@@ -1252,6 +1267,7 @@ public class M_Soldier {
     };
 
     static EntThinkAdapter soldier_fire7 = new EntThinkAdapter() {
+    	public String getID(){ return "soldier_fire7"; }
         public boolean think(edict_t self) {
             soldier_fire(self, 6);
             return true;
@@ -1259,6 +1275,7 @@ public class M_Soldier {
     };
 
     static EntThinkAdapter soldier_idle = new EntThinkAdapter() {
+    	public String getID(){ return "soldier_idle"; }
         public boolean think(edict_t self) {
             if (Lib.random() > 0.8)
                 GameBase.gi.sound(self, Defines.CHAN_VOICE, sound_idle, 1,
@@ -1268,6 +1285,7 @@ public class M_Soldier {
     };
 
     static EntThinkAdapter soldier_stand = new EntThinkAdapter() {
+    	public String getID(){ return "soldier_stand"; }
         public boolean think(edict_t self) {
             if ((self.monsterinfo.currentmove == soldier_move_stand3)
                     || (Lib.random() < 0.8))
@@ -1282,6 +1300,7 @@ public class M_Soldier {
     // WALK
     //
     static EntThinkAdapter soldier_walk1_random = new EntThinkAdapter() {
+    	public String getID(){ return "soldier_walk1_random"; }
         public boolean think(edict_t self) {
             if (Lib.random() > 0.1)
                 self.monsterinfo.nextframe = FRAME_walk101;
@@ -1290,6 +1309,7 @@ public class M_Soldier {
     };
 
     static EntThinkAdapter soldier_walk = new EntThinkAdapter() {
+    	public String getID(){ return "soldier_walk"; }
         public boolean think(edict_t self) {
             if (Lib.random() < 0.5)
                 self.monsterinfo.currentmove = soldier_move_walk1;
@@ -1300,6 +1320,7 @@ public class M_Soldier {
     };
 
     static EntThinkAdapter soldier_run = new EntThinkAdapter() {
+    	public String getID(){ return "soldier_run"; }
         public boolean think(edict_t self) {
             if ((self.monsterinfo.aiflags & Defines.AI_STAND_GROUND) != 0) {
                 self.monsterinfo.currentmove = soldier_move_stand1;
@@ -1319,6 +1340,7 @@ public class M_Soldier {
     };
 
     static EntPainAdapter soldier_pain = new EntPainAdapter() {
+    	public String getID(){ return "soldier_pain"; }
         public void pain(edict_t self, edict_t other, float kick, int damage) {
             float r;
             int n;
@@ -1371,6 +1393,7 @@ public class M_Soldier {
     //
 
     static EntThinkAdapter soldier_duck_up = new EntThinkAdapter() {
+    	public String getID(){ return "soldier_duck_up"; }
         public boolean think(edict_t self) {
             self.monsterinfo.aiflags &= ~Defines.AI_DUCKED;
             self.maxs[2] += 32;
@@ -1381,6 +1404,7 @@ public class M_Soldier {
     };
 
     static EntInteractAdapter soldier_sight = new EntInteractAdapter() {
+    	public String getID(){ return "soldier_sight"; }
         public boolean interact(edict_t self, edict_t other) {
             if (Lib.random() < 0.5)
                 GameBase.gi.sound(self, Defines.CHAN_VOICE, sound_sight1, 1,
@@ -1403,6 +1427,7 @@ public class M_Soldier {
     //
 
     static EntThinkAdapter SP_monster_soldier_x = new EntThinkAdapter() {
+    	public String getID(){ return "SP_monster_soldier_x"; }
         public boolean think(edict_t self) {
 
             self.s.modelindex = GameBase.gi
@@ -1445,6 +1470,7 @@ public class M_Soldier {
      * Trigger_Spawn Sight
      */
     public static EntThinkAdapter SP_monster_soldier_light = new EntThinkAdapter() {
+    	public String getID(){ return "SP_monster_soldier_light"; }
         public boolean think(edict_t self) {
             if (GameBase.deathmatch.value != 0) {
                 GameUtil.G_FreeEdict(self);
@@ -1472,6 +1498,7 @@ public class M_Soldier {
      */
 
     public static EntThinkAdapter SP_monster_soldier = new EntThinkAdapter() {
+    	public String getID(){ return "SP_monster_soldier"; }
         public boolean think(edict_t self) {
             Com.DPrintf("Spawning a soldier at " + self.s.origin[0] + " " +
                     self.s.origin[1] + " " +
@@ -1501,6 +1528,7 @@ public class M_Soldier {
      * Trigger_Spawn Sight
      */
     public static EntThinkAdapter SP_monster_soldier_ss = new EntThinkAdapter() {
+    	public String getID(){ return "SP_monster_soldier_ss"; }
         public boolean think(edict_t self) {
             if (GameBase.deathmatch.value != 0) {
                 GameUtil.G_FreeEdict(self);
@@ -1585,6 +1613,7 @@ public class M_Soldier {
     }
 
     static EntThinkAdapter soldier_cock = new EntThinkAdapter() {
+    	public String getID(){ return "soldier_cock"; }
         public boolean think(edict_t self) {
             if (self.s.frame == FRAME_stand322)
                 GameBase.gi.sound(self, Defines.CHAN_WEAPON, sound_cock, 1,
@@ -1756,6 +1785,7 @@ public class M_Soldier {
     //
 
     static EntThinkAdapter soldier_duck_hold = new EntThinkAdapter() {
+    	public String getID(){ return "soldier_duck_hold"; }
         public boolean think(edict_t self) {
             if (GameBase.level.time >= self.monsterinfo.pausetime)
                 self.monsterinfo.aiflags &= ~Defines.AI_HOLD_FRAME;
@@ -2188,6 +2218,7 @@ public class M_Soldier {
     // ATTACK3 (duck and shoot)
 
     static EntThinkAdapter soldier_attack = new EntThinkAdapter() {
+    	public String getID(){ return "soldier_attack"; }
         public boolean think(edict_t self) {
             if (self.s.skinnum < 4) {
                 if (Lib.random() < 0.5)
@@ -2202,6 +2233,7 @@ public class M_Soldier {
     };
 
     static EntDodgeAdapter soldier_dodge = new EntDodgeAdapter() {
+    	public String getID(){ return "soldier_dodge"; }
         public void dodge(edict_t self, edict_t attacker, float eta) {
             float r;
 
diff --git a/src/jake2/game/monsters/M_Supertank.java b/src/jake2/game/monsters/M_Supertank.java
index 0d724e7..dd3bda3 100644
--- a/src/jake2/game/monsters/M_Supertank.java
+++ b/src/jake2/game/monsters/M_Supertank.java
@@ -19,7 +19,7 @@
  */
 
 // Created on 13.11.2003 by RST.
-// $Id: M_Supertank.java,v 1.3 2005-11-16 22:24:52 salomo Exp $
+// $Id: M_Supertank.java,v 1.4 2005-11-20 22:18:33 salomo Exp $
 package jake2.game.monsters;
 
 import jake2.Defines;
@@ -566,6 +566,7 @@ public class M_Supertank {
     static int tread_sound;
 
     static EntThinkAdapter TreadSound = new EntThinkAdapter() {
+    	public String getID(){ return "TreadSound"; }
         public boolean think(edict_t self) {
             GameBase.gi.sound(self, Defines.CHAN_VOICE, tread_sound, 1,
                     Defines.ATTN_NORM, 0);
@@ -574,6 +575,7 @@ public class M_Supertank {
     };
 
     static EntThinkAdapter supertank_search = new EntThinkAdapter() {
+    	public String getID(){ return "supertank_search"; }
         public boolean think(edict_t self) {
             if (Lib.random() < 0.5)
                 GameBase.gi.sound(self, Defines.CHAN_VOICE, sound_search1, 1,
@@ -655,6 +657,7 @@ public class M_Supertank {
             FRAME_stand_60, supertank_frames_stand, null);
 
     static EntThinkAdapter supertank_stand = new EntThinkAdapter() {
+    	public String getID() { return "supertank_stand"; }
         public boolean think(edict_t self) {
             self.monsterinfo.currentmove = supertank_move_stand;
             return true;
@@ -712,6 +715,7 @@ public class M_Supertank {
             FRAME_forwrd_18, supertank_frames_forward, null);
 
     static EntThinkAdapter supertank_forward = new EntThinkAdapter() {
+    	public String getID(){ return "supertank_forward"; }
         public boolean think(edict_t self) {
             self.monsterinfo.currentmove = supertank_move_forward;
             return true;
@@ -719,6 +723,7 @@ public class M_Supertank {
     };
 
     static EntThinkAdapter supertank_walk = new EntThinkAdapter() {
+    	public String getID(){ return "supertank_walk"; }
         public boolean think(edict_t self) {
             self.monsterinfo.currentmove = supertank_move_forward;
             return true;
@@ -726,6 +731,7 @@ public class M_Supertank {
     };
 
     static EntThinkAdapter supertank_run = new EntThinkAdapter() {
+    	public String getID(){ return "supertank_run"; }
         public boolean think(edict_t self) {
             if ((self.monsterinfo.aiflags & Defines.AI_STAND_GROUND) != 0)
                 self.monsterinfo.currentmove = supertank_move_stand;
@@ -739,6 +745,7 @@ public class M_Supertank {
     // death
     //
     static EntThinkAdapter supertank_dead = new EntThinkAdapter() {
+    	public String getID(){ return "supertank_dead"; }
         public boolean think(edict_t self) {
             Math3D.VectorSet(self.mins, -60, -60, 0);
             Math3D.VectorSet(self.maxs, 60, 60, 72);
@@ -751,6 +758,7 @@ public class M_Supertank {
     };
 
     static EntThinkAdapter supertankRocket = new EntThinkAdapter() {
+    	public String getID(){ return "supertankRocket"; }
         public boolean think(edict_t self) {
             float[] forward = { 0, 0, 0 }, right = { 0, 0, 0 };
             float[] start = { 0, 0, 0 };
@@ -784,6 +792,7 @@ public class M_Supertank {
     };
 
     static EntThinkAdapter supertankMachineGun = new EntThinkAdapter() {
+    	public String getID(){ return "supertankMachineGun"; }
         public boolean think(edict_t self) {
             float[] dir = { 0, 0, 0 };
             float[] vec = { 0, 0, 0 };
@@ -820,6 +829,7 @@ public class M_Supertank {
     };
 
     static EntThinkAdapter supertank_attack = new EntThinkAdapter() {
+    	public String getID(){ return "supertank_attack"; }
         public boolean think(edict_t self) {
             float[] vec = { 0, 0, 0 };
             float range;
@@ -1046,6 +1056,7 @@ public class M_Supertank {
             FRAME_attak2_27, supertank_frames_attack2, supertank_run);
 
     static EntThinkAdapter supertank_reattack1 = new EntThinkAdapter() {
+    	public String getID(){ return "supertank_reattack1"; }
         public boolean think(edict_t self) {
             if (GameUtil.visible(self, self.enemy))
                 if (Lib.random() < 0.9)
@@ -1089,6 +1100,7 @@ public class M_Supertank {
             FRAME_attak1_20, supertank_frames_end_attack1, supertank_run);
 
     static EntPainAdapter supertank_pain = new EntPainAdapter() {
+    	public String getID(){ return "supertank_pain"; }
         public void pain(edict_t self, edict_t other, float kick, int damage) {
             if (self.health < (self.max_health / 2))
                 self.s.skinnum = 1;
@@ -1129,6 +1141,7 @@ public class M_Supertank {
     };
 
     static EntDieAdapter supertank_die = new EntDieAdapter() {
+    	public String getID(){ return "supertank_die"; }
         public void die(edict_t self, edict_t inflictor, edict_t attacker,
                 int damage, float[] point) {
             GameBase.gi.sound(self, Defines.CHAN_VOICE, sound_death, 1,
@@ -1149,6 +1162,7 @@ public class M_Supertank {
      * Trigger_Spawn Sight
      */
     public static EntThinkAdapter SP_monster_supertank = new EntThinkAdapter() {
+    	public String getID(){ return "SP_monster_supertank"; }
         public boolean think(edict_t self) {
             if (GameBase.deathmatch.value != 0) {
                 GameUtil.G_FreeEdict(self);
@@ -1200,6 +1214,7 @@ public class M_Supertank {
     /** Common Boss explode animation. */
     
     public static EntThinkAdapter BossExplode = new EntThinkAdapter() {
+    	public String getID(){ return "BossExplode"; }
         public boolean think(edict_t self) {
             float[] org = { 0, 0, 0 };
     
diff --git a/src/jake2/game/monsters/M_Tank.java b/src/jake2/game/monsters/M_Tank.java
index 62353ac..ef2f6e6 100644
--- a/src/jake2/game/monsters/M_Tank.java
+++ b/src/jake2/game/monsters/M_Tank.java
@@ -19,7 +19,7 @@
  */
 
 // Created on 13.11.2003 by RST.
-// $Id: M_Tank.java,v 1.3 2005-11-16 22:24:52 salomo Exp $
+// $Id: M_Tank.java,v 1.4 2005-11-20 22:18:33 salomo Exp $
 package jake2.game.monsters;
 
 import jake2.Defines;
@@ -654,6 +654,7 @@ public class M_Tank {
     //
 
     static EntInteractAdapter tank_sight = new EntInteractAdapter() {
+    	public String getID(){ return "tank_sight"; }
         public boolean interact(edict_t self, edict_t other) {
             GameBase.gi.sound(self, Defines.CHAN_VOICE, sound_sight, 1,
                     Defines.ATTN_NORM, 0);
@@ -662,6 +663,7 @@ public class M_Tank {
     };
 
     static EntThinkAdapter tank_footstep = new EntThinkAdapter() {
+    	public String getID(){ return "tank_footstep"; }
         public boolean think(edict_t self) {
             GameBase.gi.sound(self, Defines.CHAN_BODY, sound_step, 1,
                     Defines.ATTN_NORM, 0);
@@ -670,6 +672,7 @@ public class M_Tank {
     };
 
     static EntThinkAdapter tank_thud = new EntThinkAdapter() {
+    	public String getID(){ return "tank_thud"; }
         public boolean think(edict_t self) {
             GameBase.gi.sound(self, Defines.CHAN_BODY, sound_thud, 1,
                     Defines.ATTN_NORM, 0);
@@ -678,6 +681,7 @@ public class M_Tank {
     };
 
     static EntThinkAdapter tank_windup = new EntThinkAdapter() {
+    	public String getID(){ return "tank_windup"; }
         public boolean think(edict_t self) {
             GameBase.gi.sound(self, Defines.CHAN_WEAPON, sound_windup, 1,
                     Defines.ATTN_NORM, 0);
@@ -686,6 +690,7 @@ public class M_Tank {
     };
 
     static EntThinkAdapter tank_idle = new EntThinkAdapter() {
+    	public String getID(){ return "tank_idle"; }
         public boolean think(edict_t self) {
             GameBase.gi.sound(self, Defines.CHAN_VOICE, sound_idle, 1,
                     Defines.ATTN_IDLE, 0);
@@ -733,6 +738,7 @@ public class M_Tank {
             tank_frames_stand, null);
 
     static EntThinkAdapter tank_stand = new EntThinkAdapter() {
+    	public String getID(){ return "tank_stand"; }
         public boolean think(edict_t self) {
             self.monsterinfo.currentmove = tank_move_stand;
             return true;
@@ -743,6 +749,7 @@ public class M_Tank {
     // walk
     //
     static EntThinkAdapter tank_run = new EntThinkAdapter() {
+    	public String getID(){ return "tank_run"; }
         public boolean think(edict_t self) {
             if (self.enemy != null && self.enemy.client != null)
                 self.monsterinfo.aiflags |= Defines.AI_BRUTAL;
@@ -765,6 +772,7 @@ public class M_Tank {
     };
 
     static EntThinkAdapter tank_walk = new EntThinkAdapter() {
+    	public String getID(){ return "tank_walk"; }
         public boolean think(edict_t self) {
             self.monsterinfo.currentmove = tank_move_walk;
             return true;
@@ -900,6 +908,7 @@ public class M_Tank {
             tank_frames_pain3, tank_run);
 
     static EntPainAdapter tank_pain = new EntPainAdapter() {
+    	public String getID(){ return "tank_pain"; }
         public void pain(edict_t self, edict_t other, float kick, int damage) {
             if (self.health < (self.max_health / 2))
                 self.s.skinnum |= 1;
@@ -945,6 +954,7 @@ public class M_Tank {
     //
 
     static EntThinkAdapter TankBlaster = new EntThinkAdapter() {
+    	public String getID(){ return "TankBlaster"; }
         public boolean think(edict_t self) {
             float[] forward = { 0, 0, 0 }, right = { 0, 0, 0 };
             float[] start = { 0, 0, 0 };
@@ -977,6 +987,7 @@ public class M_Tank {
     };
 
     static EntThinkAdapter TankStrike = new EntThinkAdapter() {
+    	public String getID(){ return "TankStrike"; }
         public boolean think(edict_t self) {
             GameBase.gi.sound(self, Defines.CHAN_WEAPON, sound_strike, 1,
                     Defines.ATTN_NORM, 0);
@@ -986,6 +997,7 @@ public class M_Tank {
     };
 
     static EntThinkAdapter TankRocket = new EntThinkAdapter() {
+    	public String getID(){ return "TankRocket"; }
         public boolean think(edict_t self) {
             float[] forward = { 0, 0, 0 }, right = { 0, 0, 0 };
             float[] start = { 0, 0, 0 };
@@ -1019,6 +1031,7 @@ public class M_Tank {
     };
 
     static EntThinkAdapter TankMachineGun = new EntThinkAdapter() {
+    	public String getID(){ return "TankMachineGun"; }
         public boolean think(edict_t self) {
 
             float[] dir = { 0, 0, 0 };
@@ -1061,6 +1074,7 @@ public class M_Tank {
     };
 
     static EntThinkAdapter tank_reattack_blaster = new EntThinkAdapter() {
+    	public String getID(){ return "tank_reattack_blaster"; }
         public boolean think(edict_t self) {
             if (GameBase.skill.value >= 2)
                 if (GameUtil.visible(self, self.enemy))
@@ -1122,6 +1136,7 @@ public class M_Tank {
             FRAME_attak122, tank_frames_attack_post_blast, tank_run);
 
     static EntThinkAdapter tank_poststrike = new EntThinkAdapter() {
+    	public String getID(){ return "tank_poststrike"; }
         public boolean think(edict_t self) {
             self.enemy = null;
             tank_run.think(self);
@@ -1130,6 +1145,7 @@ public class M_Tank {
     };
 
     static EntThinkAdapter tank_doattack_rocket = new EntThinkAdapter() {
+    	public String getID(){ return "tank_doattack_rocket"; }
         public boolean think(edict_t self) {
             self.monsterinfo.currentmove = tank_move_attack_fire_rocket;
             return true;
@@ -1137,6 +1153,7 @@ public class M_Tank {
     };
 
     static EntThinkAdapter tank_refire_rocket = new EntThinkAdapter() {
+    	public String getID(){ return "tank_refire_rocket"; }
         public boolean think(edict_t self) {
             // Only on hard or nightmare
             if (GameBase.skill.value >= 2)
@@ -1306,6 +1323,7 @@ public class M_Tank {
             FRAME_attak429, tank_frames_attack_chain, tank_run);
 
     static EntThinkAdapter tank_attack = new EntThinkAdapter() {
+    	public String getID(){ return "tank_attack"; }
         public boolean think(edict_t self) {
             float[] vec = { 0, 0, 0 };
             float range;
@@ -1353,6 +1371,7 @@ public class M_Tank {
     // death
     //
     static EntThinkAdapter tank_dead = new EntThinkAdapter() {
+    	public String getID(){ return "tank_dead"; }
         public boolean think(edict_t self) {
             Math3D.VectorSet(self.mins, -16, -16, -16);
             Math3D.VectorSet(self.maxs, 16, 16, -0);
@@ -1402,6 +1421,7 @@ public class M_Tank {
             FRAME_death132, tank_frames_death1, tank_dead);
 
     static EntDieAdapter tank_die = new EntDieAdapter() {
+    	public String getID(){ return "tank_die"; }
         public void die(edict_t self, edict_t inflictor, edict_t attacker,
                 int damage, float[] point) {
             int n;
@@ -1455,6 +1475,7 @@ public class M_Tank {
      * Trigger_Spawn Sight
      */
     public static EntThinkAdapter SP_monster_tank = new EntThinkAdapter() {
+    	public String getID(){ return "SP_monster_tank"; }
         public boolean think(edict_t self) {
             if (GameBase.deathmatch.value != 0) {
                 GameUtil.G_FreeEdict(self);