X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fmonsters%2Fmonster%2Fmage.qh;h=8331c4857ac9ce27ea02b8082a1dbb325557cd47;hb=2e60d4af0278db5d39618bf8fee353c220d90486;hp=04826b39b543da893bb376ab0eefdbb7e9a87400;hpb=e424ba544c41fc40b241b17bd7c1d9c2fc930705;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/common/monsters/monster/mage.qh b/qcsrc/common/monsters/monster/mage.qh index 04826b39b..8331c4857 100644 --- a/qcsrc/common/monsters/monster/mage.qh +++ b/qcsrc/common/monsters/monster/mage.qh @@ -1,13 +1,15 @@ #pragma once +#include "../all.qh" + #ifdef GAMEQC -MODEL(MON_MAGE, M_Model("mage.dpm")); +MODEL(MON_MAGE, M_Model("nanomage.dpm")); #endif CLASS(Mage, Monster) ATTRIB(Mage, spawnflags, int, MON_FLAG_MELEE | MON_FLAG_RANGED); - ATTRIB(Mage, mins, vector, '-36 -36 -24'); - ATTRIB(Mage, maxs, vector, '36 36 50'); + ATTRIB(Mage, m_mins, vector, '-16 -16 -24'); + ATTRIB(Mage, m_maxs, vector, '16 16 55'); #ifdef GAMEQC ATTRIB(Mage, m_model, Model, MDL_MON_MAGE); #endif @@ -15,17 +17,13 @@ CLASS(Mage, Monster) ATTRIB(Mage, monster_name, string, _("Mage")); ENDCLASS(Mage) -REGISTER_MONSTER(MAGE, NEW(Mage)) { -#ifdef GAMEQC - this.mr_precache(this); -#endif -} +REGISTER_MONSTER(MAGE, NEW(Mage)); #include #include CLASS(MageSpike, PortoLaunch) -/* flags */ ATTRIB(MageSpike, spawnflags, int, WEP_TYPE_OTHER | WEP_FLAG_HIDDEN | WEP_FLAG_MUTATORBLOCKED); +/* flags */ ATTRIB(MageSpike, spawnflags, int, WEP_FLAG_HIDDEN | WEP_FLAG_SPECIALATTACK); /* impulse */ ATTRIB(MageSpike, impulse, int, 9); /* refname */ ATTRIB(MageSpike, netname, string, "magespike"); /* wepname */ ATTRIB(MageSpike, m_name, string, _("Mage spike"));