Merge branch 'terencehill/arc_suicide_message' into 'master'

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / monsters / monster / mage.qh

diff --git a/qcsrc/common/monsters/monster/mage.qh b/qcsrc/common/monsters/monster/mage.qh
index 98fb7667341dc6e13a5cfc168e2d43e76258de6e..8331c4857ac9ce27ea02b8082a1dbb325557cd47 100644 (file)
--- a/qcsrc/common/monsters/monster/mage.qh
+++ b/qcsrc/common/monsters/monster/mage.qh
@@ -3,13 +3,13 @@
 #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, m_mins, vector, '-36 -36 -24');
-    ATTRIB(Mage, m_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
@@ -23,7 +23,7 @@ REGISTER_MONSTER(MAGE, NEW(Mage));
 #include <common/items/_mod.qh>
 
 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"));