Update name in spawn list

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / monsters / monster / ogre.qc

diff --git a/qcsrc/server/monsters/monster/ogre.qc b/qcsrc/server/monsters/monster/ogre.qc
index a340d552cbfb95e5f60c055b31992f9fd86149ae..238526ba11dc001aa84d38ad14587c5f9f7ec600 100644 (file)
--- a/qcsrc/server/monsters/monster/ogre.qc
+++ b/qcsrc/server/monsters/monster/ogre.qc
@@ -29,25 +29,11 @@ const float ogre_anim_pain          = 3;
 const float ogre_anim_swing    = 4;
 const float ogre_anim_die              = 5;
 
-void chainsaw()
-{
-       if (!self.enemy)
-               return;
-
-       if (vlen(self.enemy.origin - self.origin) > 100 * self.scale)
-               return;
-
-       Damage(self.enemy, self, self, autocvar_g_monster_ogre_chainsaw_damage * monster_skill, DEATH_MONSTER_OGRE_CHAINSAW, self.enemy.origin, normalize(self.enemy.origin - self.origin));
-}
-
 void ogre_think()
 {
        self.think = ogre_think;
        self.nextthink = time + self.ticrate;
        
-       if(self.delay != -1)
-               self.nextthink = self.delay;
-       
        monster_move(autocvar_g_monster_ogre_speed_run, autocvar_g_monster_ogre_speed_walk, 300, ogre_anim_run, ogre_anim_walk, ogre_anim_idle);
 }
 
@@ -55,19 +41,11 @@ void ogre_think()
 void ogre_swing()
 {
        self.ogre_cycles += 1;
-       monsters_setframe(ogre_anim_swing);
-       if(self.ogre_cycles == 1)
-               self.attack_finished_single = time + 1.3;
        self.angles_y = self.angles_y + random()* 25;
        self.delay = time + 0.2;
        self.monster_delayedattack = ogre_swing;
        
-       if(self.ogre_cycles <= 2)
-               chainsaw();
-       else if(self.ogre_cycles <= 4)
-               chainsaw();
-       else
-               chainsaw();
+       monster_melee(self.enemy, autocvar_g_monster_ogre_chainsaw_damage, 0.3, DEATH_MONSTER_OGRE_CHAINSAW, TRUE);
        
        if(self.ogre_cycles >= 4)
        {
@@ -87,6 +65,8 @@ void ogre_uzi_fire()
                return;
        }
        
+       monster_makevectors(self.enemy);
+       
        W_SetupShot (self, autocvar_g_antilag_bullets && 18000 >= autocvar_g_antilag_bullets, 0, "weapons/uzi_fire.wav", CH_WEAPON_A, autocvar_g_monster_ogre_attack_uzi_damage);
        fireBallisticBullet(w_shotorg, w_shotdir, 0.02, 18000, 5, autocvar_g_monster_ogre_attack_uzi_damage, autocvar_g_monster_ogre_attack_uzi_force, DEATH_MONSTER_OGRE_UZI, 0, 1, 115);
        endFireBallisticBullet();
@@ -95,14 +75,6 @@ void ogre_uzi_fire()
        self.monster_delayedattack = ogre_uzi_fire;
 }
 
-void ogre_uzi()
-{
-       monsters_setframe(ogre_anim_pain);
-       self.attack_finished_single = time + 0.8;
-       self.delay = time + 0.1;
-       self.monster_delayedattack = ogre_uzi_fire;
-}
-
 void ogre_grenade_explode()
 {
        pointparticles(particleeffectnum("grenade_explode"), self.origin, '0 0 0', 1);
@@ -187,31 +159,44 @@ void ogre_gl()
        gren.flags = FL_PROJECTILE;
 
        CSQCProjectile(gren, TRUE, PROJECTILE_GRENADE, TRUE);
-       
-       
-       monsters_setframe(ogre_anim_pain);
-       self.attack_finished_single = time + 0.8;
 }
 
-float ogre_missile()
+float ogre_attack(float attack_type)
 {
-       self.ogre_cycles = 0;
-       if (random() <= autocvar_g_monster_ogre_attack_uzi_chance)
+       switch(attack_type)
        {
-               ogre_uzi();
-               return TRUE;
+               case MONSTER_ATTACK_MELEE:
+               {
+                       self.ogre_cycles = 0;
+                       monsters_setframe(ogre_anim_swing);
+                       self.attack_finished_single = time + 1.3;
+                       ogre_swing();
+                       
+                       return TRUE;
+               }
+               case MONSTER_ATTACK_RANGED:
+               {
+                       self.ogre_cycles = 0;
+                       if(random() <= autocvar_g_monster_ogre_attack_uzi_chance)
+                       {
+                               monsters_setframe(ogre_anim_pain);
+                               self.attack_finished_single = time + 0.8;
+                               self.delay = time + 0.1;
+                               self.monster_delayedattack = ogre_uzi_fire;
+                       }
+                       else
+                       {
+                               monster_makevectors(self.enemy);
+                               ogre_gl();
+                               monsters_setframe(ogre_anim_pain);
+                               self.attack_finished_single = time + 1.2;
+                       }
+                       
+                       return TRUE;
+               }
        }
-       else
-       {
-               ogre_gl();
-               return TRUE;
-       }
-}
-
-void ogre_melee()
-{
-       self.ogre_cycles = 0;
-       ogre_swing();
+       
+       return FALSE;
 }
 
 void ogre_die()
@@ -229,14 +214,12 @@ void ogre_die()
 void ogre_spawn()
 {
        if not(self.health)
-               self.health = autocvar_g_monster_ogre_health * self.scale;
+               self.health = autocvar_g_monster_ogre_health;
 
        self.damageforcescale   = 0.003;
        self.classname                  = "monster_ogre";
-       self.checkattack                = GenericCheckAttack;
-       self.attack_melee               = ogre_melee;
-       self.attack_ranged              = ogre_missile;
-       self.nextthink                  = time + 0.1;
+       self.monster_attackfunc = ogre_attack;
+       self.nextthink                  = time + random() * 0.5 + 0.1;
        self.think                              = ogre_think;
        self.weapon                             = WEP_GRENADE_LAUNCHER;