]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/blobdiff - qcsrc/common/monsters/monster/spider.qc
Purge self from most of the monster code
[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / monsters / monster / spider.qc
index 35a320b9d50908b6209927e604db3f6004f57397..89239941ee1d3dfc4c25d60e2f1cb93b21245415 100644 (file)
@@ -2,7 +2,7 @@
 #define SPIDER_H
 
 #ifndef MENUQC
-MODEL(MON_SPIDER, "models/monsters/spider.dpm");
+MODEL(MON_SPIDER, M_Model("spider.dpm"));
 #endif
 
 CLASS(Spider, Monster)
@@ -22,13 +22,13 @@ REGISTER_MONSTER(SPIDER, NEW(Spider)) {
 #endif
 }
 
-#include "../../weapons/all.qh"
+#include <common/weapons/all.qh>
 
 CLASS(SpiderAttack, PortoLaunch)
 /* flags     */ ATTRIB(SpiderAttack, spawnflags, int, WEP_TYPE_OTHER | WEP_FLAG_HIDDEN | WEP_FLAG_MUTATORBLOCKED);
 /* impulse   */ ATTRIB(SpiderAttack, impulse, int, 9);
 /* refname   */ ATTRIB(SpiderAttack, netname, string, "spider");
-/* wepname   */ ATTRIB(SpiderAttack, message, string, _("Spider attack"));
+/* wepname   */ ATTRIB(SpiderAttack, m_name, string, _("Spider attack"));
 ENDCLASS(SpiderAttack)
 REGISTER_WEAPON(SPIDER_ATTACK, NEW(SpiderAttack));
 
@@ -38,6 +38,8 @@ REGISTER_WEAPON(SPIDER_ATTACK, NEW(SpiderAttack));
 
 #ifdef SVQC
 
+.float spider_slowness; // effect time of slowness inflicted by spiders
+
 .float spider_web_delay;
 
 float autocvar_g_monster_spider_attack_web_damagetime;
@@ -48,33 +50,69 @@ float autocvar_g_monster_spider_attack_web_delay;
 float autocvar_g_monster_spider_attack_bite_damage;
 float autocvar_g_monster_spider_attack_bite_delay;
 
-void M_Spider_Attack_Web();
+void M_Spider_Attack_Web(entity this);
+
+REGISTER_MUTATOR(spiderweb, true);
+
+MUTATOR_HOOKFUNCTION(spiderweb, PlayerPhysics)
+{
+       if (time >= self.spider_slowness)
+               return false;
+       PHYS_MAXSPEED(self) *= 0.5; // half speed while slow from spider
+       PHYS_MAXAIRSPEED(self) *= 0.5;
+       PHYS_AIRSPEEDLIMIT_NONQW(self) *= 0.5;
+       PHYS_AIRSTRAFEACCELERATE(self) *= 0.5;
+       return false;
+}
+
+MUTATOR_HOOKFUNCTION(spiderweb, MonsterMove)
+{
+       if(time < self.spider_slowness)
+       {
+               monster_speed_run *= 0.5;
+               monster_speed_walk *= 0.5;
+       }
+       return false;
+}
+
+MUTATOR_HOOKFUNCTION(spiderweb, PlayerSpawn)
+{
+       self.spider_slowness = 0;
+       return false;
+}
+
+MUTATOR_HOOKFUNCTION(spiderweb, MonsterSpawn)
+{
+       self.spider_slowness = 0;
+       return false;
+}
 
-METHOD(SpiderAttack, wr_think, void(SpiderAttack thiswep, entity actor, bool fire1, bool fire2)) {
+SOUND(SpiderAttack_FIRE, W_Sound("electro_fire"));
+METHOD(SpiderAttack, wr_think, void(SpiderAttack thiswep, entity actor, .entity weaponentity, int fire)) {
     bool isPlayer = IS_PLAYER(actor);
-    if (fire1)
-    if ((!isPlayer && time >= actor.spider_web_delay) || weapon_prepareattack(thiswep, actor, false, autocvar_g_monster_spider_attack_web_delay)) {
+    if (fire & 1)
+    if ((!isPlayer && time >= actor.spider_web_delay) || weapon_prepareattack(thiswep, actor, weaponentity, false, autocvar_g_monster_spider_attack_web_delay)) {
                if (!isPlayer) {
                        actor.spider_web_delay = time + 3;
                        setanim(actor, actor.anim_shoot, true, true, true);
-                       actor.attack_finished_single = time + (autocvar_g_monster_spider_attack_web_delay);
+                       actor.attack_finished_single[0] = time + (autocvar_g_monster_spider_attack_web_delay);
                        actor.anim_finished = time + 1;
                }
         if (isPlayer) actor.enemy = Monster_FindTarget(actor);
-        W_SetupShot_Dir(actor, v_forward, false, 0, W_Sound("electro_fire"), CH_WEAPON_B, 0);
+        W_SetupShot_Dir(actor, v_forward, false, 0, SND(SpiderAttack_FIRE), CH_WEAPON_B, 0);
        if (!isPlayer) w_shotdir = normalize((actor.enemy.origin + '0 0 10') - actor.origin);
-               M_Spider_Attack_Web();
-        weapon_thinkf(actor, WFRAME_FIRE1, 0, w_ready);
+               M_Spider_Attack_Web(actor);
+        weapon_thinkf(actor, weaponentity, WFRAME_FIRE1, 0, w_ready);
         return;
     }
-    if (fire2)
-    if (!isPlayer || weapon_prepareattack(thiswep, actor, true, 0.5)) {
+    if (fire & 2)
+    if (!isPlayer || weapon_prepareattack(thiswep, actor, weaponentity, true, 0.5)) {
        if (isPlayer) {
                actor.enemy = Monster_FindTarget(actor);
                actor.attack_range = 60;
        }
-       Monster_Attack_Melee(actor.enemy, (autocvar_g_monster_spider_attack_bite_damage), ((random() > 0.5) ? self.anim_melee : self.anim_shoot), self.attack_range, (autocvar_g_monster_spider_attack_bite_delay), DEATH_MONSTER_SPIDER, true);
-        weapon_thinkf(actor, WFRAME_FIRE2, 0, w_ready);
+       Monster_Attack_Melee(actor, actor.enemy, (autocvar_g_monster_spider_attack_bite_damage), ((random() > 0.5) ? self.anim_melee : self.anim_shoot), self.attack_range, (autocvar_g_monster_spider_attack_bite_delay), DEATH_MONSTER_SPIDER.m_id, true);
+        weapon_thinkf(actor, weaponentity, WFRAME_FIRE2, 0, w_ready);
     }
 }
 
@@ -99,7 +137,7 @@ void M_Spider_Attack_Web_Explode()
                Send_Effect(EFFECT_ELECTRO_IMPACT, self.origin, '0 0 0', 1);
                RadiusDamage(self, self.realowner, 0, 0, 25, world, world, 25, self.projectiledeathtype, world);
 
-               for(e = findradius(self.origin, 25); e; e = e.chain) if(e != self) if(e.takedamage && e.deadflag == DEAD_NO) if(e.health > 0) if(e.monsterid != MON_SPIDER.monsterid)
+               for(e = findradius(self.origin, 25); e; e = e.chain) if(e != self) if(e.takedamage && !IS_DEAD(e)) if(e.health > 0) if(e.monsterid != MON_SPIDER.monsterid)
                        e.spider_slowness = time + (autocvar_g_monster_spider_attack_web_damagetime);
 
                remove(self);
@@ -113,23 +151,24 @@ void M_Spider_Attack_Web_Touch()
        M_Spider_Attack_Web_Explode();
 }
 
-void M_Spider_Attack_Web()
-{SELFPARAM();
-       monster_makevectors(self.enemy);
+void adaptor_think2use_hittype_splash();
+
+void M_Spider_Attack_Web(entity this)
+{
+       monster_makevectors(this, this.enemy);
 
-       sound(self, CH_SHOTS, SND_ELECTRO_FIRE2, VOL_BASE, ATTEN_NORM);
+       sound(this, CH_SHOTS, SND_ELECTRO_FIRE2, VOL_BASE, ATTEN_NORM);
 
-       entity proj = spawn ();
-       proj.classname = "plasma";
-       proj.owner = proj.realowner = self;
+       entity proj = new(plasma);
+       proj.owner = proj.realowner = this;
        proj.use = M_Spider_Attack_Web_Explode;
        proj.think = adaptor_think2use_hittype_splash;
        proj.bot_dodge = true;
        proj.bot_dodgerating = 0;
        proj.nextthink = time + 5;
        PROJECTILE_MAKETRIGGER(proj);
-       proj.projectiledeathtype = DEATH_MONSTER_SPIDER;
-       setorigin(proj, CENTER_OR_VIEWOFS(self));
+       proj.projectiledeathtype = DEATH_MONSTER_SPIDER.m_id;
+       setorigin(proj, CENTER_OR_VIEWOFS(this));
 
        //proj.glow_size = 50;
        //proj.glow_color = 45;
@@ -151,19 +190,20 @@ void M_Spider_Attack_Web()
        CSQCProjectile(proj, true, PROJECTILE_ELECTRO, true);
 }
 
-bool M_Spider_Attack(int attack_type, entity targ)
-{SELFPARAM();
+bool M_Spider_Attack(int attack_type, entity actor, entity targ)
+{
+    .entity weaponentity = weaponentities[0];
        switch(attack_type)
        {
                Weapon wep = WEP_SPIDER_ATTACK;
                case MONSTER_ATTACK_MELEE:
                {
-                       wep.wr_think(wep, self, false, true);
+                       wep.wr_think(wep, actor, weaponentity, 2);
                        return true;
                }
                case MONSTER_ATTACK_RANGED:
                {
-                       wep.wr_think(wep, self, true, false);
+                       wep.wr_think(wep, actor, weaponentity, 1);
                        return true;
                }
        }
@@ -171,52 +211,49 @@ bool M_Spider_Attack(int attack_type, entity targ)
        return false;
 }
 
-spawnfunc(monster_spider) { Monster_Spawn(MON_SPIDER.monsterid); }
+spawnfunc(monster_spider) { Monster_Spawn(this, MON_SPIDER.monsterid); }
 #endif // SVQC
 
                #ifdef SVQC
-               METHOD(Spider, mr_think, bool(Spider thismon))
+               METHOD(Spider, mr_think, bool(Spider thismon, entity actor))
                {
                        return true;
                }
-               METHOD(Spider, mr_pain, bool(Spider thismon))
+               METHOD(Spider, mr_pain, bool(Spider thismon, entity actor))
                {
                        return true;
                }
-               METHOD(Spider, mr_death, bool(Spider thismon))
+               METHOD(Spider, mr_death, bool(Spider thismon, entity actor))
                {
-                       SELFPARAM();
-                       setanim(self, self.anim_melee, false, true, true);
-                       self.angles_x = 180;
+                       setanim(actor, actor.anim_melee, false, true, true);
+                       actor.angles_x = 180;
                        return true;
                }
                #endif
                #ifndef MENUQC
-               METHOD(Spider, mr_anim, bool(Spider thismon))
+               METHOD(Spider, mr_anim, bool(Spider thismon, entity actor))
                {
-                       SELFPARAM();
                        vector none = '0 0 0';
-                       self.anim_walk = animfixfps(self, '1 1 1', none);
-                       self.anim_idle = animfixfps(self, '0 1 1', none);
-                       self.anim_melee = animfixfps(self, '2 1 5', none); // analyze models and set framerate
-                       self.anim_shoot = animfixfps(self, '3 1 5', none); // analyze models and set framerate
-                       self.anim_run = animfixfps(self, '1 1 1', none);
-
+                       actor.anim_walk = animfixfps(actor, '1 1 1', none);
+                       actor.anim_idle = animfixfps(actor, '0 1 1', none);
+                       actor.anim_melee = animfixfps(actor, '2 1 5', none); // analyze models and set framerate
+                       actor.anim_shoot = animfixfps(actor, '3 1 5', none); // analyze models and set framerate
+                       actor.anim_run = animfixfps(actor, '1 1 1', none);
                        return true;
                }
                #endif
                #ifdef SVQC
-               METHOD(Spider, mr_setup, bool(Spider thismon))
+               spawnfunc(item_health_medium);
+               METHOD(Spider, mr_setup, bool(Spider thismon, entity actor))
                {
-                       SELFPARAM();
-                       if(!self.health) self.health = (autocvar_g_monster_spider_health);
-                       if(!self.speed) { self.speed = (autocvar_g_monster_spider_speed_walk); }
-                       if(!self.speed2) { self.speed2 = (autocvar_g_monster_spider_speed_run); }
-                       if(!self.stopspeed) { self.stopspeed = (autocvar_g_monster_spider_speed_stop); }
-                       if(!self.damageforcescale) { self.damageforcescale = (autocvar_g_monster_spider_damageforcescale); }
-
-                       self.monster_loot = spawnfunc_item_health_medium;
-                       self.monster_attackfunc = M_Spider_Attack;
+                       if(!actor.health) actor.health = (autocvar_g_monster_spider_health);
+                       if(!actor.speed) { actor.speed = (autocvar_g_monster_spider_speed_walk); }
+                       if(!actor.speed2) { actor.speed2 = (autocvar_g_monster_spider_speed_run); }
+                       if(!actor.stopspeed) { actor.stopspeed = (autocvar_g_monster_spider_speed_stop); }
+                       if(!actor.damageforcescale) { actor.damageforcescale = (autocvar_g_monster_spider_damageforcescale); }
+
+                       actor.monster_loot = spawnfunc_item_health_medium;
+                       actor.monster_attackfunc = M_Spider_Attack;
 
                        return true;
                }