X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fmonsters%2Fmonster%2Fwyvern.qc;h=19f8a53be887f2e410e4f50a7cf58c8e49da7c70;hb=16061175d27b01f53646a5f5e94117bd4e310398;hp=ed4962d061ccd47934bd551d6c336189e1d103d8;hpb=6dbd388cb15fe8a3a006292b7332086347250039;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/common/monsters/monster/wyvern.qc b/qcsrc/common/monsters/monster/wyvern.qc index ed4962d06..19f8a53be 100644 --- a/qcsrc/common/monsters/monster/wyvern.qc +++ b/qcsrc/common/monsters/monster/wyvern.qc @@ -1,17 +1,34 @@ -#ifdef REGISTER_MONSTER -REGISTER_MONSTER( -/* MON_##id */ WYVERN, -/* function */ m_wyvern, -/* spawnflags */ MONSTER_TYPE_FLY | MONSTER_SIZE_BROKEN | MON_FLAG_RANGED, -/* mins,maxs */ '-20 -20 -58', '20 20 20', -/* model */ "wizard.mdl", -/* netname */ "wyvern", -/* fullname */ _("Wyvern") -); - -#else +#ifndef WYVERN_H +#define WYVERN_H + +#ifndef MENUQC +MODEL(MON_WYVERN, "models/monsters/wizard.mdl"); +#endif + +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 + MON_ACTION(this, MR_PRECACHE); +#endif +} + +#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; @@ -22,37 +39,39 @@ float autocvar_g_monster_wyvern_speed_stop; float autocvar_g_monster_wyvern_speed_run; float autocvar_g_monster_wyvern_speed_walk; +/* const float wyvern_anim_hover = 0; const float wyvern_anim_fly = 1; const float wyvern_anim_magic = 2; const float wyvern_anim_pain = 3; const float wyvern_anim_death = 4; +*/ -void wyvern_fireball_explode() -{ +void M_Wyvern_Attack_Fireball_Explode() +{SELFPARAM(); entity e; if(self) { - pointparticles(particleeffectnum("fireball_explode"), self.origin, '0 0 0', 1); + 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, (autocvar_g_monster_wyvern_attack_fireball_radius), self.projectiledeathtype, world); + 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); 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_SkillModifier(), (autocvar_g_monster_wyvern_attack_fireball_damagetime), self.projectiledeathtype); + Fire_AddDamage(e, self, 5 * MONSTER_SKILLMOD(self), (autocvar_g_monster_wyvern_attack_fireball_damagetime), self.projectiledeathtype); remove(self); } } -void wyvern_fireball_touch() +void M_Wyvern_Attack_Fireball_Touch() { PROJECTILE_TOUCH; - wyvern_fireball_explode(); + M_Wyvern_Attack_Fireball_Explode(); } -void wyvern_fireball() -{ +void M_Wyvern_Attack_Fireball() +{SELFPARAM(); entity missile = spawn(); vector dir = normalize((self.enemy.origin + '0 0 10') - self.origin); @@ -68,91 +87,90 @@ void wyvern_fireball() missile.velocity = dir * (autocvar_g_monster_wyvern_attack_fireball_speed); missile.avelocity = '300 300 300'; missile.nextthink = time + 5; - missile.think = wyvern_fireball_explode; + missile.think = M_Wyvern_Attack_Fireball_Explode; missile.enemy = self.enemy; - missile.touch = wyvern_fireball_touch; - CSQCProjectile(missile, TRUE, PROJECTILE_FIREMINE, TRUE); + missile.touch = M_Wyvern_Attack_Fireball_Touch; + CSQCProjectile(missile, true, PROJECTILE_FIREMINE, true); } -float wyvern_attack(float attack_type) -{ +float M_Wyvern_Attack(float attack_type) +{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; - wyvern_fireball(); + M_Wyvern_Attack_Fireball(); - return TRUE; + return true; } } - return FALSE; + return false; } -void spawnfunc_monster_wyvern() -{ - self.classname = "monster_wyvern"; - - if(!monster_initialize(MON_WYVERN)) { remove(self); return; } -} - -// compatibility with old spawns -void spawnfunc_monster_wizard() { spawnfunc_monster_wyvern(); } +void spawnfunc_monster_wyvern() { Monster_Spawn(MON_WYVERN.monsterid); } +#endif // SVQC -float m_wyvern(float req) -{ - switch(req) - { - case MR_THINK: + #ifdef SVQC + METHOD(Wyvern, mr_think, bool(Wyvern thismon)) + { + return true; + } + METHOD(Wyvern, mr_pain, bool(Wyvern thismon)) { - monster_move((autocvar_g_monster_wyvern_speed_run), (autocvar_g_monster_wyvern_speed_walk), (autocvar_g_monster_wyvern_speed_stop), wyvern_anim_fly, wyvern_anim_hover, wyvern_anim_hover); - return TRUE; + 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)) { - self.frame = wyvern_anim_death; + 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; + 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); + + return true; } - case MR_SETUP: + #endif + #ifdef SVQC + 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); } self.monster_loot = spawnfunc_item_cells; - self.monster_attackfunc = wyvern_attack; - self.frame = wyvern_anim_hover; + self.monster_attackfunc = M_Wyvern_Attack; - return TRUE; + return true; } - case MR_PRECACHE: + METHOD(Wyvern, mr_precache, bool(Wyvern thismon)) { - precache_model("models/monsters/wizard.mdl"); - return TRUE; + return true; } - } - - return TRUE; -} - -#endif // SVQC -#ifdef CSQC -float m_wyvern(float req) -{ - switch(req) - { - case MR_PRECACHE: - { - return TRUE; - } - } - - return TRUE; -} + #endif -#endif // CSQC -#endif // REGISTER_MONSTER +#endif