X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fmonsters%2Fmonster%2Fspider.qc;h=0f46a9620e6683c5d6b8e6a1bcebd94a268d9f33;hb=ae2c1407ec9a05e4f501a6604a7cce8e1030df9f;hp=48ca45b74b9d7face44793589ebfd6cb87d415aa;hpb=981bf0bd7fcd4f69b3ae896a79b2095ff3c81a0d;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/common/monsters/monster/spider.qc b/qcsrc/common/monsters/monster/spider.qc index 48ca45b74..65ba8dad5 100644 --- a/qcsrc/common/monsters/monster/spider.qc +++ b/qcsrc/common/monsters/monster/spider.qc @@ -1,15 +1,19 @@ -#ifdef REGISTER_MONSTER -REGISTER_MONSTER( +#ifndef MENUQC +bool m_spider(int); +#endif +REGISTER_MONSTER_SIMPLE( /* MON_##id */ SPIDER, -/* function */ m_spider, /* spawnflags */ MON_FLAG_MELEE | MON_FLAG_RANGED, /* mins,maxs */ '-18 -18 -25', '18 18 30', /* model */ "spider.dpm", /* netname */ "spider", /* fullname */ _("Spider") -); +) { +#ifndef MENUQC + this.monster_func = m_spider; +#endif +} -#else #ifdef SVQC float autocvar_g_monster_spider_health; float autocvar_g_monster_spider_attack_bite_damage; @@ -34,12 +38,12 @@ void spider_web_explode() entity e; if(self) { - pointparticles(particleeffectnum("electro_impact"), self.origin, '0 0 0', 1); - RadiusDamage(self, self.realowner, 0, 0, 25, 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) + Send_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) e.spider_slowness = time + (autocvar_g_monster_spider_attack_web_damagetime); - + remove(self); } } @@ -47,14 +51,14 @@ void spider_web_explode() void spider_web_touch() { PROJECTILE_TOUCH; - + spider_web_explode(); } void spider_shootweb() { monster_makevectors(self.enemy); - + sound(self, CH_SHOTS, "weapons/electro_fire2.wav", VOL_BASE, ATTEN_NORM); entity proj = spawn (); @@ -62,7 +66,7 @@ void spider_shootweb() proj.owner = proj.realowner = self; proj.use = spider_web_touch; proj.think = adaptor_think2use_hittype_splash; - proj.bot_dodge = TRUE; + proj.bot_dodge = true; proj.bot_dodgerating = 0; proj.nextthink = time + 5; PROJECTILE_MAKETRIGGER(proj); @@ -72,7 +76,7 @@ void spider_shootweb() //proj.glow_size = 50; //proj.glow_color = 45; proj.movetype = MOVETYPE_BOUNCE; - W_SetupProjectileVelocityEx(proj, v_forward, v_up, (autocvar_g_monster_spider_attack_web_speed), (autocvar_g_monster_spider_attack_web_speed_up), 0, 0, FALSE); + W_SetupProjVelocity_Explicit(proj, v_forward, v_up, (autocvar_g_monster_spider_attack_web_speed), (autocvar_g_monster_spider_attack_web_speed_up), 0, 0, false); proj.touch = spider_web_touch; setsize(proj, '-4 -4 -4', '4 4 4'); proj.takedamage = DAMAGE_NO; @@ -80,13 +84,13 @@ void spider_shootweb() proj.health = 500; proj.event_damage = func_null; proj.flags = FL_PROJECTILE; - proj.damagedbycontents = TRUE; + proj.damagedbycontents = true; proj.bouncefactor = 0.3; proj.bouncestop = 0.05; proj.missile_flags = MIF_SPLASH | MIF_ARC; - CSQCProjectile(proj, TRUE, PROJECTILE_ELECTRO, TRUE); + CSQCProjectile(proj, true, PROJECTILE_ELECTRO, true); } float spider_attack(float attack_type) @@ -94,8 +98,8 @@ float spider_attack(float attack_type) switch(attack_type) { case MONSTER_ATTACK_MELEE: - { - return monster_melee(self.enemy, (autocvar_g_monster_spider_attack_bite_damage), ((random() > 0.5) ? spider_anim_attack : spider_anim_attack2), self.attack_range, (autocvar_g_monster_spider_attack_bite_delay), DEATH_MONSTER_SPIDER, TRUE); + { + return monster_melee(self.enemy, (autocvar_g_monster_spider_attack_bite_damage), ((random() > 0.5) ? spider_anim_attack : spider_anim_attack2), self.attack_range, (autocvar_g_monster_spider_attack_bite_delay), DEATH_MONSTER_SPIDER, true); } case MONSTER_ATTACK_RANGED: { @@ -105,26 +109,21 @@ float spider_attack(float attack_type) self.attack_finished_single = time + (autocvar_g_monster_spider_attack_web_delay); spider_shootweb(); self.spider_web_delay = time + 3; - return TRUE; + return true; } - - return FALSE; + + return false; } } - - return FALSE; + + return false; } -void spawnfunc_monster_spider() +void spawnfunc_monster_spider() { self.classname = "monster_spider"; - - self.monster_spawnfunc = spawnfunc_monster_spider; - - if(Monster_CheckAppearFlags(self)) - return; - - if not(monster_initialize(MON_SPIDER, FALSE)) { remove(self); return; } + + if(!monster_initialize(MON_SPIDER.monsterid)) { remove(self); return; } } float m_spider(float req) @@ -134,33 +133,33 @@ float m_spider(float req) case MR_THINK: { monster_move((autocvar_g_monster_spider_speed_run), (autocvar_g_monster_spider_speed_walk), (autocvar_g_monster_spider_speed_stop), spider_anim_walk, spider_anim_walk, spider_anim_idle); - return TRUE; + return true; } case MR_DEATH: { self.frame = spider_anim_attack; self.angles_x = 180; - return TRUE; + return true; } case MR_SETUP: { - if not(self.health) self.health = (autocvar_g_monster_spider_health); - + if(!self.health) self.health = (autocvar_g_monster_spider_health); + self.monster_loot = spawnfunc_item_health_medium; self.monster_attackfunc = spider_attack; self.frame = spider_anim_idle; - - return TRUE; + + return true; } case MR_PRECACHE: { - precache_model ("models/monsters/spider.dpm"); + precache_model("models/monsters/spider.dpm"); precache_sound ("weapons/electro_fire2.wav"); - return TRUE; + return true; } } - - return TRUE; + + return true; } #endif // SVQC @@ -171,13 +170,11 @@ float m_spider(float req) { case MR_PRECACHE: { - precache_model ("models/monsters/spider.dpm"); - return TRUE; + return true; } } - - return TRUE; + + return true; } #endif // CSQC -#endif // REGISTER_MONSTER