X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fmonsters%2Fmonster%2Fwyvern.qc;h=edfc92ba5afb2ddb7d537dcec44d5aaabad63b28;hb=5eea97bc262bfaf271817ca034439ad551f691d4;hp=315e8d66efde5d671b1db69ccda9194686041491;hpb=349aeb508e5a3d577df60bef8a552da2db7d928d;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/common/monsters/monster/wyvern.qc b/qcsrc/common/monsters/monster/wyvern.qc index 315e8d66e..edfc92ba5 100644 --- a/qcsrc/common/monsters/monster/wyvern.qc +++ b/qcsrc/common/monsters/monster/wyvern.qc @@ -2,7 +2,7 @@ #define WYVERN_H #ifndef MENUQC -MODEL(MON_WYVERN, "models/monsters/wizard.mdl"); +MODEL(MON_WYVERN, M_Model("wizard.mdl")); #endif CLASS(Wyvern, Monster) @@ -22,7 +22,7 @@ REGISTER_MONSTER(WYVERN, NEW(Wyvern)) { #endif } -#include "../../weapons/all.qh" +#include CLASS(WyvernAttack, PortoLaunch) /* flags */ ATTRIB(WyvernAttack, spawnflags, int, WEP_TYPE_OTHER | WEP_FLAG_HIDDEN | WEP_FLAG_MUTATORBLOCKED); @@ -45,17 +45,20 @@ 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(); +void M_Wyvern_Attack_Fireball_Explode(entity this); +void M_Wyvern_Attack_Fireball_Touch(entity this); -METHOD(WyvernAttack, wr_think, void(WyvernAttack thiswep, entity actor, int slot, int fire)) { +SOUND(WyvernAttack_FIRE, W_Sound("electro_fire")); +METHOD(WyvernAttack, wr_think, void(WyvernAttack thiswep, entity actor, .entity weaponentity, int fire)) +{ + TC(WyvernAttack, thiswep); if (fire & 1) - if (time > actor.attack_finished_single[0] || weapon_prepareattack(thiswep, actor, slot, false, 1.2)) { - if (IS_PLAYER(actor)) W_SetupShot_Dir(actor, v_forward, false, 0, W_Sound("electro_fire"), CH_WEAPON_B, 0); + if (time > actor.attack_finished_single[0] || weapon_prepareattack(thiswep, actor, weaponentity, false, 1.2)) { + if (IS_PLAYER(actor)) W_SetupShot_Dir(actor, v_forward, false, 0, SND_WyvernAttack_FIRE, CH_WEAPON_B, 0); if (IS_MONSTER(actor)) { actor.attack_finished_single[0] = time + 1.2; actor.anim_finished = time + 1.2; - monster_makevectors(actor.enemy); + monster_makevectors(actor, actor.enemy); } entity missile = spawn(); @@ -69,15 +72,16 @@ METHOD(WyvernAttack, wr_think, void(WyvernAttack thiswep, entity actor, int slot 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; + setthink(missile, M_Wyvern_Attack_Fireball_Explode); + settouch(missile, M_Wyvern_Attack_Fireball_Touch); CSQCProjectile(missile, true, PROJECTILE_FIREMINE, true); - weapon_thinkf(actor, slot, WFRAME_FIRE1, 0, w_ready); + weapon_thinkf(actor, weaponentity, WFRAME_FIRE1, 0, w_ready); } } -METHOD(WyvernAttack, wr_checkammo1, bool(WyvernAttack thiswep)) { +METHOD(WyvernAttack, wr_checkammo1, bool(WyvernAttack this, entity actor)) { + TC(WyvernAttack, this); return true; } @@ -95,40 +99,41 @@ const float wyvern_anim_pain = 3; const float wyvern_anim_death = 4; */ -void M_Wyvern_Attack_Fireball_Explode() +void M_Wyvern_Attack_Fireball_Explode(entity this) { - SELFPARAM(); - Send_Effect(EFFECT_FIREBALL_EXPLODE, self.origin, '0 0 0', 1); + Send_Effect(EFFECT_FIREBALL_EXPLODE, this.origin, '0 0 0', 1); - entity owner = self.realowner; + entity own = this.realowner; - 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); + RadiusDamage(this, own, 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, this.projectiledeathtype, world); - 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); + FOREACH_ENTITY_FLOAT(takedamage, DAMAGE_AIM, + { + if(vdist(it.origin - this.origin, <=, autocvar_g_monster_wyvern_attack_fireball_radius)) + Fire_AddDamage(it, own, 5 * MONSTER_SKILLMOD(own), autocvar_g_monster_wyvern_attack_fireball_damagetime, this.projectiledeathtype); + }); - remove(self); + remove(this); } -void M_Wyvern_Attack_Fireball_Touch() +void M_Wyvern_Attack_Fireball_Touch(entity this) { - PROJECTILE_TOUCH; + PROJECTILE_TOUCH(this); - M_Wyvern_Attack_Fireball_Explode(); + M_Wyvern_Attack_Fireball_Explode(this); } -float M_Wyvern_Attack(float attack_type, entity targ) +bool M_Wyvern_Attack(int attack_type, entity actor, entity targ) { - SELFPARAM(); + .entity weaponentity = weaponentities[0]; switch(attack_type) { case MONSTER_ATTACK_MELEE: case MONSTER_ATTACK_RANGED: { - w_shotdir = normalize((self.enemy.origin + '0 0 10') - self.origin); + w_shotdir = normalize((actor.enemy.origin + '0 0 10') - actor.origin); Weapon wep = WEP_WYVERN_ATTACK; - wep.wr_think(wep, self, 0, 1); + wep.wr_think(wep, actor, weaponentity, 1); return true; } } @@ -136,66 +141,70 @@ float M_Wyvern_Attack(float attack_type, entity targ) return false; } -spawnfunc(monster_wyvern) { Monster_Spawn(MON_WYVERN.monsterid); } +spawnfunc(monster_wyvern) { Monster_Spawn(this, MON_WYVERN.monsterid); } #endif // SVQC - #ifdef SVQC - METHOD(Wyvern, mr_think, bool(Wyvern thismon)) - { - return true; - } - METHOD(Wyvern, mr_pain, bool(Wyvern thismon)) - { - SELFPARAM(); - self.pain_finished = time + 0.5; - setanim(self, self.anim_pain1, true, true, false); - return true; - } - 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(); - self.velocity_z = 100 + 100 * random(); - return true; - } - #endif - #ifndef MENUQC - 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); - self.anim_idle = animfixfps(self, '0 1 1', none); - self.anim_pain1 = animfixfps(self, '3 1 2', none); // 0.5 seconds - self.anim_shoot = animfixfps(self, '2 1 5', none); // analyze models and set framerate - self.anim_run = animfixfps(self, '1 1 1', none); +#ifdef SVQC +METHOD(Wyvern, mr_think, bool(Wyvern this, entity actor)) +{ + TC(Wyvern, this); + return true; +} - return true; - } - #endif - #ifdef SVQC - 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); } - if(!self.stopspeed) { self.stopspeed = (autocvar_g_monster_wyvern_speed_stop); } - if(!self.damageforcescale) { self.damageforcescale = (autocvar_g_monster_wyvern_damageforcescale); } +METHOD(Wyvern, mr_pain, float(Wyvern this, entity actor, float damage_take, entity attacker, float deathtype)) +{ + TC(Wyvern, this); + actor.pain_finished = time + 0.5; + setanim(actor, actor.anim_pain1, true, true, false); + return damage_take; +} - self.monster_loot = spawnfunc_item_cells; - self.monster_attackfunc = M_Wyvern_Attack; +METHOD(Wyvern, mr_death, bool(Wyvern this, entity actor)) +{ + TC(Wyvern, this); + setanim(actor, actor.anim_die1, false, true, true); + actor.velocity_x = -200 + 400 * random(); + actor.velocity_y = -200 + 400 * random(); + actor.velocity_z = 100 + 100 * random(); + return true; +} +#endif +#ifndef MENUQC +METHOD(Wyvern, mr_anim, bool(Wyvern this, entity actor)) +{ + TC(Wyvern, this); + vector none = '0 0 0'; + actor.anim_die1 = animfixfps(actor, '4 1 0.5', none); // 2 seconds + actor.anim_walk = animfixfps(actor, '1 1 1', none); + actor.anim_idle = animfixfps(actor, '0 1 1', none); + actor.anim_pain1 = animfixfps(actor, '3 1 2', none); // 0.5 seconds + actor.anim_shoot = animfixfps(actor, '2 1 5', none); // analyze models and set framerate + actor.anim_run = animfixfps(actor, '1 1 1', none); + return true; +} +#endif +#ifdef SVQC +spawnfunc(item_cells); +METHOD(Wyvern, mr_setup, bool(Wyvern this, entity actor)) +{ + TC(Wyvern, this); + if(!actor.health) actor.health = (autocvar_g_monster_wyvern_health); + if(!actor.speed) { actor.speed = (autocvar_g_monster_wyvern_speed_walk); } + if(!actor.speed2) { actor.speed2 = (autocvar_g_monster_wyvern_speed_run); } + if(!actor.stopspeed) { actor.stopspeed = (autocvar_g_monster_wyvern_speed_stop); } + if(!actor.damageforcescale) { actor.damageforcescale = (autocvar_g_monster_wyvern_damageforcescale); } - return true; - } - METHOD(Wyvern, mr_precache, bool(Wyvern thismon)) - { - return true; - } - #endif + actor.monster_loot = spawnfunc_item_cells; + actor.monster_attackfunc = M_Wyvern_Attack; + + return true; +} + +METHOD(Wyvern, mr_precache, bool(Wyvern this)) +{ + TC(Wyvern, this); + return true; +} +#endif #endif