Merge branch 'master' into Mario/monsters

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

diff --git a/qcsrc/common/monsters/monster/wyvern.qc b/qcsrc/common/monsters/monster/wyvern.qc
index 9ca7b66339cdbc1a31c7f9f707852c8566dfc10b..eadfab950c1301dea4a239cfc031b3dc31e8ecc0 100644 (file)
--- a/qcsrc/common/monsters/monster/wyvern.qc
+++ b/qcsrc/common/monsters/monster/wyvern.qc
@@ -2,30 +2,26 @@
 REGISTER_MONSTER(
 /* MON_##id   */ WYVERN,
 /* function   */ m_wyvern,
-/* spawnflags */ MONSTER_TYPE_FLY | MONSTER_SIZE_BROKEN,
+/* spawnflags */ MONSTER_TYPE_FLY | MONSTER_SIZE_BROKEN | MON_FLAG_RANGED,
 /* mins,maxs  */ '-20 -20 -58', '20 20 20',
 /* model      */ "wizard.mdl",
 /* netname    */ "wyvern",
 /* fullname   */ _("Wyvern")
 );
 
-#define WYVERN_SETTINGS(monster) \
-       MON_ADD_CVAR(monster, health) \
-       MON_ADD_CVAR(monster, attack_fireball_damage) \
-       MON_ADD_CVAR(monster, attack_fireball_edgedamage) \
-       MON_ADD_CVAR(monster, attack_fireball_damagetime) \
-       MON_ADD_CVAR(monster, attack_fireball_force) \
-       MON_ADD_CVAR(monster, attack_fireball_radius) \
-       MON_ADD_CVAR(monster, attack_fireball_speed) \
-       MON_ADD_CVAR(monster, speed_stop) \
-       MON_ADD_CVAR(monster, speed_run) \
-       MON_ADD_CVAR(monster, speed_walk) 
-
-#ifdef SVQC
-WYVERN_SETTINGS(wyvern)
-#endif // SVQC
 #else
 #ifdef SVQC
+float autocvar_g_monster_wyvern_health;
+float autocvar_g_monster_wyvern_attack_fireball_damage;
+float autocvar_g_monster_wyvern_attack_fireball_edgedamage;
+float autocvar_g_monster_wyvern_attack_fireball_damagetime;
+float autocvar_g_monster_wyvern_attack_fireball_force;
+float autocvar_g_monster_wyvern_attack_fireball_radius;
+float autocvar_g_monster_wyvern_attack_fireball_speed;
+float autocvar_g_monster_wyvern_speed_stop;
+float autocvar_g_monster_wyvern_speed_run;
+float autocvar_g_monster_wyvern_speed_walk;
+
 const float wyvern_anim_hover  = 0;
 const float wyvern_anim_fly    = 1;
 const float wyvern_anim_magic  = 2;
@@ -39,10 +35,10 @@ void wyvern_fireball_explode()
        {
                pointparticles(particleeffectnum("fireball_explode"), self.origin, '0 0 0', 1);
                
-               RadiusDamage(self, self.realowner, MON_CVAR(wyvern, attack_fireball_damage), MON_CVAR(wyvern, attack_fireball_edgedamage), MON_CVAR(wyvern, attack_fireball_force), world, MON_CVAR(wyvern, attack_fireball_radius), self.projectiledeathtype, world);
+               RadiusDamage(self, self.realowner, (autocvar_g_monster_wyvern_attack_fireball_damage), (autocvar_g_monster_wyvern_attack_fireball_edgedamage), (autocvar_g_monster_wyvern_attack_fireball_force), world, (autocvar_g_monster_wyvern_attack_fireball_radius), self.projectiledeathtype, world);
                
-               for(e = world; (e = findfloat(e, takedamage, DAMAGE_AIM)); ) if(vlen(e.origin - self.origin) <= MON_CVAR(wyvern, attack_fireball_radius))
-                       Fire_AddDamage(e, self, 5 * monster_skill, MON_CVAR(wyvern, attack_fireball_damagetime), self.projectiledeathtype);
+               for(e = world; (e = findfloat(e, takedamage, DAMAGE_AIM)); ) if(vlen(e.origin - self.origin) <= (autocvar_g_monster_wyvern_attack_fireball_radius))
+                       Fire_AddDamage(e, self, 5 * Monster_SkillModifier(), (autocvar_g_monster_wyvern_attack_fireball_damagetime), self.projectiledeathtype);
                
                remove(self);
        }
@@ -69,7 +65,7 @@ void wyvern_fireball()
        setsize(missile, '-6 -6 -6', '6 6 6');          
        setorigin(missile, self.origin + self.view_ofs + v_forward * 14);
        missile.flags = FL_PROJECTILE;
-       missile.velocity = dir * MON_CVAR(wyvern, attack_fireball_speed);
+       missile.velocity = dir * (autocvar_g_monster_wyvern_attack_fireball_speed);
        missile.avelocity = '300 300 300';
        missile.nextthink = time + 5;
        missile.think = wyvern_fireball_explode;
@@ -105,7 +101,7 @@ void spawnfunc_monster_wyvern()
        if(Monster_CheckAppearFlags(self))
                return;
        
-       if not(monster_initialize(MON_WYVERN, TRUE)) { remove(self); return; }
+       if(!monster_initialize(MON_WYVERN, TRUE)) { remove(self); return; }
 }
 
 // compatibility with old spawns
@@ -117,12 +113,12 @@ float m_wyvern(float req)
        {
                case MR_THINK:
                {
-                       monster_move(MON_CVAR(wyvern, speed_run), MON_CVAR(wyvern, speed_walk), MON_CVAR(wyvern, speed_stop), wyvern_anim_fly, wyvern_anim_hover, wyvern_anim_hover);
+                       monster_move((autocvar_g_monster_wyvern_speed_run), (autocvar_g_monster_wyvern_speed_walk), (autocvar_g_monster_wyvern_speed_stop), wyvern_anim_fly, wyvern_anim_hover, wyvern_anim_hover);
                        return TRUE;
                }
                case MR_DEATH:
                {
-                       monsters_setframe(wyvern_anim_death);
+                       self.frame = wyvern_anim_death;
                        self.velocity_x = -200 + 400 * random();
                        self.velocity_y = -200 + 400 * random();
                        self.velocity_z = 100 + 100 * random();
@@ -130,21 +126,17 @@ float m_wyvern(float req)
                }
                case MR_SETUP:
                {
-                       if not(self.health) self.health = MON_CVAR(wyvern, health);
-                               
+                       if(!self.health) self.health = (autocvar_g_monster_wyvern_health);
+                       
+                       self.monster_loot = spawnfunc_item_cells;
                        self.monster_attackfunc = wyvern_attack;
-                       monsters_setframe(wyvern_anim_hover);
+                       self.frame = wyvern_anim_hover;
                        
                        return TRUE;
                }
-               case MR_INIT:
+               case MR_PRECACHE:
                {
-                       // nothing
-                       return TRUE;
-               }
-               case MR_CONFIG:
-               {
-                       MON_CONFIG_SETTINGS(WYVERN_SETTINGS(wyvern))
+                       precache_model ("models/monsters/wizard.mdl");
                        return TRUE;
                }
        }
@@ -158,12 +150,7 @@ float m_wyvern(float req)
 {
        switch(req)
        {
-               case MR_DEATH:
-               {
-                       // nothing
-                       return TRUE;
-               }
-               case MR_INIT:
+               case MR_PRECACHE:
                {
                        precache_model ("models/monsters/wizard.mdl");
                        return TRUE;