X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fcommon%2Fmonsters%2Fmonster%2Fspider.qc;h=3ce64e3bd1ac48afbf8ce55fa947df8e122f6454;hp=c6c454547f4898bb96e946cb5994bd585b073e02;hb=4bf20ed169f3f433bc518b055faf5a945ed97264;hpb=57e8b59f96ec28979c3dc01811412c9c26e60fdc diff --git a/qcsrc/common/monsters/monster/spider.qc b/qcsrc/common/monsters/monster/spider.qc index c6c454547f..3ce64e3bd1 100644 --- a/qcsrc/common/monsters/monster/spider.qc +++ b/qcsrc/common/monsters/monster/spider.qc @@ -1,68 +1,132 @@ -#ifdef REGISTER_MONSTER -REGISTER_MONSTER( -/* 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") -); - -#else +#ifndef SPIDER_H +#define SPIDER_H + +#ifndef MENUQC +MODEL(MON_SPIDER, "models/monsters/spider.dpm"); +#endif + +CLASS(Spider, Monster) + ATTRIB(Spider, spawnflags, int, MON_FLAG_MELEE | MON_FLAG_RANGED | MON_FLAG_RIDE); + ATTRIB(Spider, mins, vector, '-18 -18 -25'); + ATTRIB(Spider, maxs, vector, '18 18 30'); +#ifndef MENUQC + ATTRIB(Spider, m_model, Model, MDL_MON_SPIDER); +#endif + ATTRIB(Spider, netname, string, "spider"); + ATTRIB(Spider, monster_name, string, _("Spider")); +ENDCLASS(Spider) + +REGISTER_MONSTER(SPIDER, NEW(Spider)) { +#ifndef MENUQC + MON_ACTION(this, MR_PRECACHE); +#endif +} + +#include "../../weapons/all.qh" + +CLASS(SpiderAttack, PortoLaunch) +/* flags */ ATTRIB(SpiderAttack, spawnflags, int, WEP_TYPE_OTHER); +/* impulse */ ATTRIB(SpiderAttack, impulse, int, 9); +/* refname */ ATTRIB(SpiderAttack, netname, string, "spider"); +/* wepname */ ATTRIB(SpiderAttack, message, string, _("Spider attack")); +ENDCLASS(SpiderAttack) +REGISTER_WEAPON(SPIDER_ATTACK, NEW(SpiderAttack)); + +#endif + +#ifdef IMPLEMENTATION + #ifdef SVQC -float autocvar_g_monster_spider_health; -float autocvar_g_monster_spider_attack_bite_damage; -float autocvar_g_monster_spider_attack_bite_delay; + +.float spider_web_delay; + float autocvar_g_monster_spider_attack_web_damagetime; float autocvar_g_monster_spider_attack_web_speed; float autocvar_g_monster_spider_attack_web_speed_up; 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(); + +METHOD(SpiderAttack, wr_think, bool(SpiderAttack thiswep, bool fire1, bool fire2)) { + SELFPARAM(); + bool isPlayer = IS_PLAYER(self); + if (fire1) + if ((!isPlayer && time >= self.spider_web_delay) || weapon_prepareattack(false, autocvar_g_monster_spider_attack_web_delay)) { + if (!isPlayer) { + self.spider_web_delay = time + 3; + setanim(self, self.anim_shoot, true, true, true); + self.attack_finished_single = time + (autocvar_g_monster_spider_attack_web_delay); + self.anim_finished = time + 1; + } + if (isPlayer) self.enemy = Monster_FindTarget(self); + W_SetupShot_Dir(self, v_forward, false, 0, W_Sound("electro_fire"), CH_WEAPON_B, 0); + if (!isPlayer) w_shotdir = normalize((self.enemy.origin + '0 0 10') - self.origin); + M_Spider_Attack_Web(); + weapon_thinkf(WFRAME_FIRE1, 0, w_ready); + return true; + } + if (fire2) + if (!isPlayer || weapon_prepareattack(true, 0.5)) { + if (isPlayer) { + self.enemy = Monster_FindTarget(self); + self.attack_range = 60; + } + Monster_Attack_Melee(self.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(WFRAME_FIRE2, 0, w_ready); + } + return true; +} + +float autocvar_g_monster_spider_health; +float autocvar_g_monster_spider_damageforcescale = 0.6; float autocvar_g_monster_spider_speed_stop; float autocvar_g_monster_spider_speed_run; float autocvar_g_monster_spider_speed_walk; +/* const float spider_anim_idle = 0; const float spider_anim_walk = 1; const float spider_anim_attack = 2; const float spider_anim_attack2 = 3; +*/ -.float spider_web_delay; - -void spider_web_explode() -{ +void M_Spider_Attack_Web_Explode() +{SELFPARAM(); entity e; if(self) { - pointparticles(particleeffectnum("electro_impact"), self.origin, '0 0 0', 1); + 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) + 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); } } -void spider_web_touch() +void M_Spider_Attack_Web_Touch() { PROJECTILE_TOUCH; - spider_web_explode(); + M_Spider_Attack_Web_Explode(); } -void spider_shootweb() -{ +void M_Spider_Attack_Web() +{SELFPARAM(); monster_makevectors(self.enemy); - sound(self, CH_SHOTS, "weapons/electro_fire2.wav", VOL_BASE, ATTEN_NORM); + sound(self, CH_SHOTS, SND_ELECTRO_FIRE2, VOL_BASE, ATTEN_NORM); entity proj = spawn (); proj.classname = "plasma"; proj.owner = proj.realowner = self; - proj.use = spider_web_touch; + proj.use = M_Spider_Attack_Web_Explode; 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,106 +136,94 @@ void spider_shootweb() //proj.glow_size = 50; //proj.glow_color = 45; proj.movetype = MOVETYPE_BOUNCE; - 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; + 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 = M_Spider_Attack_Web_Touch; setsize(proj, '-4 -4 -4', '4 4 4'); proj.takedamage = DAMAGE_NO; proj.damageforcescale = 0; 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) -{ +bool M_Spider_Attack(int attack_type, entity targ) +{SELFPARAM(); switch(attack_type) { + Weapon wep = WEP_SPIDER_ATTACK; 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 wep.wr_think(wep, false, true); } case MONSTER_ATTACK_RANGED: { - if(time >= self.spider_web_delay) - { - self.frame = spider_anim_attack2; - self.attack_finished_single = time + (autocvar_g_monster_spider_attack_web_delay); - spider_shootweb(); - self.spider_web_delay = time + 3; - return TRUE; - } - - return FALSE; + return wep.wr_think(wep, true, false); } } - return FALSE; + return false; } -void spawnfunc_monster_spider() -{ - self.classname = "monster_spider"; - - if(!monster_initialize(MON_SPIDER)) { remove(self); return; } -} +void spawnfunc_monster_spider() { Monster_Spawn(MON_SPIDER.monsterid); } +#endif // SVQC -float m_spider(float req) -{ - switch(req) - { - case MR_THINK: + #ifdef SVQC + METHOD(Spider, mr_think, bool(Spider thismon)) + { + return true; + } + METHOD(Spider, mr_pain, bool(Spider thismon)) { - 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: + METHOD(Spider, mr_death, bool(Spider thismon)) { - self.frame = spider_anim_attack; + SELFPARAM(); + setanim(self, self.anim_melee, false, true, true); self.angles_x = 180; - return TRUE; + return true; } - case MR_SETUP: + #endif + #ifndef MENUQC + METHOD(Spider, mr_anim, bool(Spider thismon)) { + 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); + + return true; + } + #endif + #ifdef SVQC + METHOD(Spider, mr_setup, bool(Spider thismon)) + { + 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 = spider_attack; - self.frame = spider_anim_idle; + self.monster_attackfunc = M_Spider_Attack; - return TRUE; + return true; } - case MR_PRECACHE: + METHOD(Spider, mr_precache, bool(Spider thismon)) { - precache_model("models/monsters/spider.dpm"); - precache_sound ("weapons/electro_fire2.wav"); - return TRUE; + return true; } - } - - return TRUE; -} - -#endif // SVQC -#ifdef CSQC -float m_spider(float req) -{ - switch(req) - { - case MR_PRECACHE: - { - return TRUE; - } - } - - return TRUE; -} + #endif -#endif // CSQC -#endif // REGISTER_MONSTER +#endif