X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fcommon%2Fmonsters%2Fmonster%2Fmage.qc;h=fd86dbbfc4e7595dbfad9a5c4f155fb810e3a9eb;hp=6822363c56888742788beedd7e3af894caddc685;hb=3adaa0873ad9eac20f32e6e3fc0455d4f9e044cd;hpb=695a573f7bf796ab9d1f936ae0b161a5a4f057d2

diff --git a/qcsrc/common/monsters/monster/mage.qc b/qcsrc/common/monsters/monster/mage.qc
index 6822363c5..fd86dbbfc 100644
--- a/qcsrc/common/monsters/monster/mage.qc
+++ b/qcsrc/common/monsters/monster/mage.qc
@@ -1,12 +1,12 @@
 #ifdef REGISTER_MONSTER
 REGISTER_MONSTER(
-/* MON_##id	  */ MAGE,
-/* function	  */ m_mage,
+/* MON_##id   */ MAGE,
+/* function   */ m_mage,
 /* spawnflags */ MON_FLAG_MELEE | MON_FLAG_RANGED,
 /* mins,maxs  */ '-36 -36 -24', '36 36 50',
-/* model	  */ "mage.dpm",
-/* netname	  */ "mage",
-/* fullname	  */ _("Mage")
+/* model      */ "mage.dpm",
+/* netname    */ "mage",
+/* fullname   */ _("Mage")
 );
 
 #else
@@ -60,17 +60,17 @@ float friend_needshelp(entity e)
 		return FALSE;
 	if(DIFF_TEAM(e, self) && e != self.monster_owner)
 		return FALSE;
-	if(e.frozen)
+	if(e.freezetag_frozen)
 		return FALSE;
 	if(!IS_PLAYER(e))
-		return (e.flags & FL_MONSTER && e.health < e.max_health);
+		return ((e.flags & FL_MONSTER) && e.health < e.max_health);
 	if(e.items & IT_INVINCIBLE)
 		return FALSE;
 
 	switch(self.skin)
 	{
 		case 0: return (e.health < autocvar_g_balance_health_regenstable);
-		case 1: return ((e.ammo_cells && e.ammo_cells < g_pickup_cells_max) || (e.ammo_rockets && e.ammo_rockets < g_pickup_rockets_max) || (e.ammo_nails && e.ammo_nails < g_pickup_nails_max) || (e.ammo_shells && e.ammo_shells < g_pickup_shells_max));
+		case 1: return ((e.ammo_cells && e.ammo_cells < g_pickup_cells_max) || (e.ammo_plasma && e.ammo_plasma < g_pickup_plasma_max) || (e.ammo_rockets && e.ammo_rockets < g_pickup_rockets_max) || (e.ammo_nails && e.ammo_nails < g_pickup_nails_max) || (e.ammo_shells && e.ammo_shells < g_pickup_shells_max));
 		case 2: return (e.armorvalue < autocvar_g_balance_armor_regenstable);
 		case 3: return (e.health > 0);
 	}
@@ -87,7 +87,7 @@ void mage_spike_explode()
 	self.realowner.mage_spike = world;
 
 	pointparticles(particleeffectnum("explosion_small"), self.origin, '0 0 0', 1);
-	RadiusDamage (self, self.realowner, (autocvar_g_monster_mage_attack_spike_damage), (autocvar_g_monster_mage_attack_spike_damage) * 0.5, (autocvar_g_monster_mage_attack_spike_radius), world, 0, DEATH_MONSTER_MAGE, other);
+	RadiusDamage (self, self.realowner, (autocvar_g_monster_mage_attack_spike_damage), (autocvar_g_monster_mage_attack_spike_damage) * 0.5, (autocvar_g_monster_mage_attack_spike_radius), world, world, 0, DEATH_MONSTER_MAGE, other);
 
 	remove (self);
 }
@@ -209,6 +209,7 @@ void mage_heal()
 					break;
 				case 1:
 					if(head.ammo_cells) head.ammo_cells = bound(head.ammo_cells, head.ammo_cells + 1, g_pickup_cells_max);
+					if(head.ammo_plasma) head.ammo_plasma = bound(head.ammo_plasma, head.ammo_plasma + 1, g_pickup_plasma_max);
 					if(head.ammo_rockets) head.ammo_rockets = bound(head.ammo_rockets, head.ammo_rockets + 1, g_pickup_rockets_max);
 					if(head.ammo_shells) head.ammo_shells = bound(head.ammo_shells, head.ammo_shells + 2, g_pickup_shells_max);
 					if(head.ammo_nails) head.ammo_nails = bound(head.ammo_nails, head.ammo_nails + 5, g_pickup_nails_max);
@@ -233,7 +234,8 @@ void mage_heal()
 		{
 			pointparticles(particleeffectnum("healing_fx"), head.origin, '0 0 0', 1);
 			head.health = bound(0, head.health + (autocvar_g_monster_mage_heal_allies), head.max_health);
-			WaypointSprite_UpdateHealth(head.sprite, head.health);
+			if(!(head.spawnflags & MONSTERFLAG_INVINCIBLE))
+				WaypointSprite_UpdateHealth(head.sprite, head.health);
 		}
 	}
 
@@ -247,7 +249,7 @@ void mage_heal()
 void mage_push()
 {
 	sound(self, CH_SHOTS, "weapons/tagexp1.wav", 1, ATTEN_NORM);
-	RadiusDamage (self, self, (autocvar_g_monster_mage_attack_push_damage), (autocvar_g_monster_mage_attack_push_damage), (autocvar_g_monster_mage_attack_push_radius), world, (autocvar_g_monster_mage_attack_push_force), DEATH_MONSTER_MAGE, self.enemy);
+	RadiusDamage (self, self, (autocvar_g_monster_mage_attack_push_damage), (autocvar_g_monster_mage_attack_push_damage), (autocvar_g_monster_mage_attack_push_radius), world, world, (autocvar_g_monster_mage_attack_push_force), DEATH_MONSTER_MAGE, self.enemy);
 	pointparticles(particleeffectnum("TE_EXPLOSION"), self.origin, '0 0 0', 1);
 
 	self.frame = mage_anim_attack;
@@ -335,12 +337,7 @@ void spawnfunc_monster_mage()
 {
 	self.classname = "monster_mage";
 
-	self.monster_spawnfunc = spawnfunc_monster_mage;
-
-	if(Monster_CheckAppearFlags(self))
-		return;
-
-	if(!monster_initialize(MON_MAGE, FALSE)) { remove(self); return; }
+	if(!monster_initialize(MON_MAGE)) { remove(self); return; }
 }
 
 // compatibility with old spawns
@@ -397,7 +394,7 @@ float m_mage(float req)
 		}
 		case MR_PRECACHE:
 		{
-			precache_model ("models/monsters/mage.dpm");
+			precache_model("models/monsters/mage.dpm");
 			precache_sound ("weapons/grenade_impact.wav");
 			precache_sound ("weapons/tagexp1.wav");
 			return TRUE;
@@ -415,7 +412,6 @@ float m_mage(float req)
 	{
 		case MR_PRECACHE:
 		{
-			precache_model ("models/monsters/mage.dpm");
 			return TRUE;
 		}
 	}