]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Zombie has a random chance at melee range to block most damage
authorMario <mario.mario@y7mail.com>
Mon, 2 Sep 2013 04:44:15 +0000 (14:44 +1000)
committerMario <mario.mario@y7mail.com>
Mon, 2 Sep 2013 04:44:15 +0000 (14:44 +1000)
qcsrc/common/monsters/monster/zombie.qc
qcsrc/common/monsters/sv_monsters.qc

index c87044d452e6f96ba4328174ad65607e3768852c..e34e6dae02124b4a0286ed00dfc30ac1758d0a8e 100644 (file)
@@ -77,6 +77,29 @@ void zombie_attack_leap_touch()
                self.touch = MonsterTouch;
 }
 
+void zombie_blockend()
+{
+       if(self.health <= 0)
+               return;
+
+       monsters_setframe(zombie_anim_blockend);
+       self.armorvalue = 0;
+       self.m_armor_blockpercent = autocvar_g_monsters_armor_blockpercent;
+}
+
+float zombie_block()
+{
+       monsters_setframe(zombie_anim_blockstart);
+       self.armorvalue = 100;
+       self.m_armor_blockpercent = 0.7;
+       self.state = MONSTER_STATE_ATTACK_MELEE; // freeze monster
+       self.attack_finished_single = time + 2.1;
+       
+       defer(2, zombie_blockend);
+       
+       return TRUE;
+}
+
 float zombie_attack(float attack_type)
 {
        switch(attack_type)
@@ -92,6 +115,9 @@ float zombie_attack(float attack_type)
                        else
                                chosen_anim = zombie_anim_attackstanding3;
                        
+                       if(random() < 0.3 && self.health < 75)
+                               return zombie_block();
+                       
                        return monster_melee(self.enemy, MON_CVAR(zombie, attack_melee_damage), chosen_anim, self.attack_range, MON_CVAR(zombie, attack_melee_delay), DEATH_MONSTER_ZOMBIE_MELEE, TRUE);
                }
                case MONSTER_ATTACK_RANGED:
@@ -129,6 +155,8 @@ float m_zombie(float req)
                }
                case MR_DEATH:
                {
+                       self.armorvalue = 0;
+                       self.m_armor_blockpercent = autocvar_g_monsters_armor_blockpercent;
                        monsters_setframe((random() > 0.5) ? zombie_anim_deathback1 : zombie_anim_deathfront1);
                        return TRUE;
                }
index 693960180183aed63764467c1b74d8d237aa4f8b..62555c371b83312db81051e2b532065ded92f271 100644 (file)
@@ -916,6 +916,8 @@ void monster_die()
        self.moveto                     = self.origin;
        self.touch                      = MonsterTouch; // reset incase monster was pouncing
        self.reset                      = func_null;
+       self.state                      = 0;
+       self.attack_finished_single = 0;
 
        if not(self.flags & FL_FLY)
                self.velocity = '0 0 0';