Merge branch 'master' into Mario/monsters

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / monsters / monster / zombie.qc

diff --git a/qcsrc/common/monsters/monster/zombie.qc b/qcsrc/common/monsters/monster/zombie.qc
index 26e88b2f273fd4c7209683434365fcced69a9e56..5d16169148d460713146ec775eb578613159e915 100644 (file)
--- a/qcsrc/common/monsters/monster/zombie.qc
+++ b/qcsrc/common/monsters/monster/zombie.qc
@@ -1,12 +1,12 @@
 #ifdef REGISTER_MONSTER
 REGISTER_MONSTER(
-/* MON_##id   */ ZOMBIE,
-/* function   */ m_zombie,
+/* MON_##id      */ ZOMBIE,
+/* function      */ m_zombie,
 /* spawnflags */ MON_FLAG_MELEE,
 /* mins,maxs  */ '-18 -18 -25', '18 18 47',
-/* model      */ "zombie.dpm",
-/* netname    */ "zombie",
-/* fullname   */ _("Zombie")
+/* model         */ "zombie.dpm",
+/* netname       */ "zombie",
+/* fullname      */ _("Zombie")
 );
 
 #else
@@ -29,7 +29,7 @@ const float zombie_anim_attackrun3                    = 3;
 const float zombie_anim_attackstanding1                = 4;
 const float zombie_anim_attackstanding2                = 5;
 const float zombie_anim_attackstanding3                = 6;
-const float zombie_anim_blockend                       = 7;
+const float zombie_anim_blockend                       = 7;
 const float zombie_anim_blockstart                     = 8;
 const float zombie_anim_deathback1                     = 9;
 const float zombie_anim_deathback2                     = 10;
@@ -41,24 +41,24 @@ const float zombie_anim_deathleft1                  = 15;
 const float zombie_anim_deathleft2                     = 16;
 const float zombie_anim_deathright1                    = 17;
 const float zombie_anim_deathright2                    = 18;
-const float zombie_anim_idle                           = 19;
-const float zombie_anim_painback1                      = 20;
-const float zombie_anim_painback2                      = 21;
+const float zombie_anim_idle                           = 19;
+const float zombie_anim_painback1                      = 20;
+const float zombie_anim_painback2                      = 21;
 const float zombie_anim_painfront1                     = 22;
 const float zombie_anim_painfront2                     = 23;
-const float zombie_anim_runbackwards           = 24;
-const float zombie_anim_runbackwardsleft       = 25;
-const float zombie_anim_runbackwardsright      = 26;
+const float zombie_anim_runbackwards           = 24;
+const float zombie_anim_runbackwardsleft       = 25;
+const float zombie_anim_runbackwardsright      = 26;
 const float zombie_anim_runforward                     = 27;
-const float zombie_anim_runforwardleft         = 28;
+const float zombie_anim_runforwardleft         = 28;
 const float zombie_anim_runforwardright                = 29;
-const float zombie_anim_spawn                          = 30;
+const float zombie_anim_spawn                          = 30;
 
 void zombie_attack_leap_touch()
 {
        if (self.health <= 0)
                return;
-               
+
        vector angles_face;
 
        if(other.takedamage)
@@ -90,9 +90,9 @@ float zombie_block()
        self.m_armor_blockpercent = 0.9;
        self.state = MONSTER_STATE_ATTACK_MELEE; // freeze monster
        self.attack_finished_single = time + 2.1;
-       
+
        defer(2, zombie_blockend);
-       
+
        return TRUE;
 }
 
@@ -103,17 +103,17 @@ float zombie_attack(float attack_type)
                case MONSTER_ATTACK_MELEE:
                {
                        float rand = random(), chosen_anim;
-               
+
                        if(rand < 0.33)
                                chosen_anim = zombie_anim_attackstanding1;
                        else if(rand < 0.66)
                                chosen_anim = zombie_anim_attackstanding2;
                        else
                                chosen_anim = zombie_anim_attackstanding3;
-                       
+
                        if(random() < 0.3 && self.health < 75 && self.enemy.health > 10)
                                return zombie_block();
-                       
+
                        return monster_melee(self.enemy, (autocvar_g_monster_zombie_attack_melee_damage), chosen_anim, self.attack_range, (autocvar_g_monster_zombie_attack_melee_delay), DEATH_MONSTER_ZOMBIE_MELEE, TRUE);
                }
                case MONSTER_ATTACK_RANGED:
@@ -122,21 +122,21 @@ float zombie_attack(float attack_type)
                        return monster_leap(zombie_anim_attackleap, zombie_attack_leap_touch, v_forward * (autocvar_g_monster_zombie_attack_leap_speed) + '0 0 200', (autocvar_g_monster_zombie_attack_leap_delay));
                }
        }
-       
+
        return FALSE;
 }
 
-void spawnfunc_monster_zombie() 
+void spawnfunc_monster_zombie()
 {
        self.classname = "monster_zombie";
-       
+
        self.monster_spawnfunc = spawnfunc_monster_zombie;
-       
+
        self.spawnflags |= MONSTER_RESPAWN_DEATHPOINT;
-       
+
        if(Monster_CheckAppearFlags(self))
                return;
-       
+
        if(!monster_initialize(MON_ZOMBIE, FALSE)) { remove(self); return; }
 }
 
@@ -159,17 +159,17 @@ float m_zombie(float req)
                case MR_SETUP:
                {
                        if(!self.health) self.health = (autocvar_g_monster_zombie_health);
-                       
+
                        if(self.spawnflags & MONSTERFLAG_NORESPAWN)
                                self.spawnflags &= ~MONSTERFLAG_NORESPAWN; // zombies always respawn
-                       
+
                        self.monster_loot = spawnfunc_item_health_medium;
                        self.monster_attackfunc = zombie_attack;
                        self.frame = zombie_anim_spawn;
                        self.spawn_time = time + 2.1;
                        self.spawnshieldtime = self.spawn_time;
                        self.respawntime = 0.2;
-                       
+
                        return TRUE;
                }
                case MR_PRECACHE:
@@ -178,7 +178,7 @@ float m_zombie(float req)
                        return TRUE;
                }
        }
-       
+
        return TRUE;
 }
 
@@ -194,7 +194,7 @@ float m_zombie(float req)
                        return TRUE;
                }
        }
-       
+
        return TRUE;
 }