X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fmonsters%2Fmonster%2Fwyvern.qc;h=ac9f32205dae432e9104065d29957df55dd7debd;hb=437d67dbc7631d6c49e922990d96461d3ff4b7b2;hp=d65bcf648da3ce62286f1d852f9ec2b858d87d01;hpb=541c234fd442f5857209128fc7a907e406f4be03;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/common/monsters/monster/wyvern.qc b/qcsrc/common/monsters/monster/wyvern.qc index d65bcf648..ac9f32205 100644 --- a/qcsrc/common/monsters/monster/wyvern.qc +++ b/qcsrc/common/monsters/monster/wyvern.qc @@ -1,29 +1,88 @@ +#ifndef WYVERN_H +#define WYVERN_H + #ifndef MENUQC -bool M_Wyvern(int); +MODEL(MON_WYVERN, "models/monsters/wizard.mdl"); #endif -REGISTER_MONSTER_SIMPLE( -/* MON_##id */ WYVERN, -/* spawnflags */ MONSTER_TYPE_FLY | MONSTER_SIZE_BROKEN | MON_FLAG_RANGED | MON_FLAG_RIDE, -/* mins,maxs */ '-20 -20 -58', '20 20 20', -/* model */ "wizard.mdl", -/* netname */ "wyvern", -/* fullname */ _("Wyvern") -) { + +CLASS(Wyvern, Monster) + ATTRIB(Wyvern, spawnflags, int, MONSTER_TYPE_FLY | MONSTER_SIZE_BROKEN | MON_FLAG_RANGED | MON_FLAG_RIDE); + ATTRIB(Wyvern, mins, vector, '-20 -20 -58'); + ATTRIB(Wyvern, maxs, vector, '20 20 20'); +#ifndef MENUQC + ATTRIB(Wyvern, m_model, Model, MDL_MON_WYVERN); +#endif + ATTRIB(Wyvern, netname, string, "wyvern"); + ATTRIB(Wyvern, monster_name, string, _("Wyvern")); +ENDCLASS(Wyvern) + +REGISTER_MONSTER(WYVERN, NEW(Wyvern)) { #ifndef MENUQC - this.monster_func = M_Wyvern; - this.monster_func(MR_PRECACHE); + this.mr_precache(this); #endif } +#include "../../weapons/all.qh" + +CLASS(WyvernAttack, PortoLaunch) +/* flags */ ATTRIB(WyvernAttack, spawnflags, int, WEP_TYPE_OTHER | WEP_FLAG_HIDDEN | WEP_FLAG_MUTATORBLOCKED); +/* impulse */ ATTRIB(WyvernAttack, impulse, int, 9); +/* refname */ ATTRIB(WyvernAttack, netname, string, "wyvern"); +/* wepname */ ATTRIB(WyvernAttack, message, string, _("Wyvern attack")); +ENDCLASS(WyvernAttack) +REGISTER_WEAPON(WYVERN_ATTACK, NEW(WyvernAttack)); + +#endif + +#ifdef IMPLEMENTATION + #ifdef SVQC -float autocvar_g_monster_wyvern_health; -float autocvar_g_monster_wyvern_damageforcescale = 0.6; + 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; + +void M_Wyvern_Attack_Fireball_Explode(); +void M_Wyvern_Attack_Fireball_Touch(); + +METHOD(WyvernAttack, wr_think, void(WyvernAttack thiswep, entity actor, bool fire1, bool fire2)) { + if (fire1) + if (time > actor.attack_finished_single || weapon_prepareattack(thiswep, actor, false, 1.2)) { + if (IS_PLAYER(actor)) W_SetupShot_Dir(actor, v_forward, false, 0, W_Sound("electro_fire"), CH_WEAPON_B, 0); + if (IS_MONSTER(actor)) { + actor.attack_finished_single = time + 1.2; + actor.anim_finished = time + 1.2; + monster_makevectors(actor.enemy); + } + + entity missile = spawn(); + missile.owner = missile.realowner = actor; + missile.solid = SOLID_TRIGGER; + missile.movetype = MOVETYPE_FLYMISSILE; + missile.projectiledeathtype = DEATH_MONSTER_WYVERN.m_id; + setsize(missile, '-6 -6 -6', '6 6 6'); + setorigin(missile, actor.origin + actor.view_ofs + v_forward * 14); + missile.flags = FL_PROJECTILE; + missile.velocity = w_shotdir * (autocvar_g_monster_wyvern_attack_fireball_speed); + missile.avelocity = '300 300 300'; + missile.nextthink = time + 5; + missile.think = M_Wyvern_Attack_Fireball_Explode; + missile.touch = M_Wyvern_Attack_Fireball_Touch; + CSQCProjectile(missile, true, PROJECTILE_FIREMINE, true); + + weapon_thinkf(actor, WFRAME_FIRE1, 0, w_ready); + } +} + +METHOD(WyvernAttack, wr_checkammo1, bool(WyvernAttack thiswep)) { + return true; +} + +float autocvar_g_monster_wyvern_health; +float autocvar_g_monster_wyvern_damageforcescale = 0.6; float autocvar_g_monster_wyvern_speed_stop; float autocvar_g_monster_wyvern_speed_run; float autocvar_g_monster_wyvern_speed_walk; @@ -37,19 +96,19 @@ const float wyvern_anim_death = 4; */ void M_Wyvern_Attack_Fireball_Explode() -{SELFPARAM(); - entity e; - if(self) - { - Send_Effect(EFFECT_FIREBALL_EXPLODE, self.origin, '0 0 0', 1); +{ + SELFPARAM(); + Send_Effect(EFFECT_FIREBALL_EXPLODE, self.origin, '0 0 0', 1); - 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, world, (autocvar_g_monster_wyvern_attack_fireball_radius), self.projectiledeathtype, world); + entity owner = self.realowner; - 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_SKILLMOD(self), (autocvar_g_monster_wyvern_attack_fireball_damagetime), self.projectiledeathtype); + RadiusDamage(self, owner, autocvar_g_monster_wyvern_attack_fireball_damage, autocvar_g_monster_wyvern_attack_fireball_edgedamage, autocvar_g_monster_wyvern_attack_fireball_force, world, world, autocvar_g_monster_wyvern_attack_fireball_radius, self.projectiledeathtype, world); - remove(self); - } + for (entity e = world; (e = findfloat(e, takedamage, DAMAGE_AIM)); ) + if (vlen(e.origin - self.origin) <= (autocvar_g_monster_wyvern_attack_fireball_radius)) + Fire_AddDamage(e, owner, 5 * MONSTER_SKILLMOD(owner), (autocvar_g_monster_wyvern_attack_fireball_damagetime), self.projectiledeathtype); + + remove(self); } void M_Wyvern_Attack_Fireball_Touch() @@ -59,41 +118,17 @@ void M_Wyvern_Attack_Fireball_Touch() M_Wyvern_Attack_Fireball_Explode(); } -void M_Wyvern_Attack_Fireball() -{SELFPARAM(); - entity missile = spawn(); - vector dir = normalize((self.enemy.origin + '0 0 10') - self.origin); - - monster_makevectors(self.enemy); - - missile.owner = missile.realowner = self; - missile.solid = SOLID_TRIGGER; - missile.movetype = MOVETYPE_FLYMISSILE; - missile.projectiledeathtype = DEATH_MONSTER_WYVERN; - 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 * (autocvar_g_monster_wyvern_attack_fireball_speed); - missile.avelocity = '300 300 300'; - missile.nextthink = time + 5; - missile.think = M_Wyvern_Attack_Fireball_Explode; - missile.enemy = self.enemy; - missile.touch = M_Wyvern_Attack_Fireball_Touch; - CSQCProjectile(missile, true, PROJECTILE_FIREMINE, true); -} - -float M_Wyvern_Attack(float attack_type) -{SELFPARAM(); +float M_Wyvern_Attack(float attack_type, entity targ) +{ + SELFPARAM(); switch(attack_type) { case MONSTER_ATTACK_MELEE: case MONSTER_ATTACK_RANGED: { - self.attack_finished_single = time + 1.2; - self.anim_finished = time + 1.2; - - M_Wyvern_Attack_Fireball(); - + w_shotdir = normalize((self.enemy.origin + '0 0 10') - self.origin); + Weapon wep = WEP_WYVERN_ATTACK; + wep.wr_think(wep, self, true, false); return true; } } @@ -104,23 +139,21 @@ float M_Wyvern_Attack(float attack_type) spawnfunc(monster_wyvern) { Monster_Spawn(MON_WYVERN.monsterid); } #endif // SVQC -bool M_Wyvern(int req) -{SELFPARAM(); - switch(req) - { #ifdef SVQC - case MR_THINK: + METHOD(Wyvern, mr_think, bool(Wyvern thismon)) { return true; } - case MR_PAIN: + METHOD(Wyvern, mr_pain, bool(Wyvern thismon)) { + SELFPARAM(); self.pain_finished = time + 0.5; setanim(self, self.anim_pain1, true, true, false); return true; } - case MR_DEATH: + METHOD(Wyvern, mr_death, bool(Wyvern thismon)) { + SELFPARAM(); setanim(self, self.anim_die1, false, true, true); self.velocity_x = -200 + 400 * random(); self.velocity_y = -200 + 400 * random(); @@ -129,8 +162,9 @@ bool M_Wyvern(int req) } #endif #ifndef MENUQC - case MR_ANIM: + METHOD(Wyvern, mr_anim, bool(Wyvern thismon)) { + SELFPARAM(); vector none = '0 0 0'; self.anim_die1 = animfixfps(self, '4 1 0.5', none); // 2 seconds self.anim_walk = animfixfps(self, '1 1 1', none); @@ -143,8 +177,10 @@ bool M_Wyvern(int req) } #endif #ifdef SVQC - case MR_SETUP: + spawnfunc(item_cells); + METHOD(Wyvern, mr_setup, bool(Wyvern thismon)) { + SELFPARAM(); if(!self.health) self.health = (autocvar_g_monster_wyvern_health); if(!self.speed) { self.speed = (autocvar_g_monster_wyvern_speed_walk); } if(!self.speed2) { self.speed2 = (autocvar_g_monster_wyvern_speed_run); } @@ -156,12 +192,10 @@ bool M_Wyvern(int req) return true; } - case MR_PRECACHE: + METHOD(Wyvern, mr_precache, bool(Wyvern thismon)) { return true; } #endif - } - return true; -} +#endif