From: Mario <mario.mario@y7mail.com>
Date: Thu, 18 Apr 2013 06:23:13 +0000 (+1000)
Subject: Some fixes for mage shield
X-Git-Tag: xonotic-v0.8.0~241^2^2~359
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=a4810d8b8e718d1a50906d18a2b98b3499dcdf82;p=xonotic%2Fxonotic-data.pk3dir.git

Some fixes for mage shield
---

diff --git a/qcsrc/server/monsters/monster/shalrath.qc b/qcsrc/server/monsters/monster/shalrath.qc
index fbd61d0b8..7971d1d72 100644
--- a/qcsrc/server/monsters/monster/shalrath.qc
+++ b/qcsrc/server/monsters/monster/shalrath.qc
@@ -66,6 +66,7 @@ void shalrath_think ()
 		shalrath_heal();
 		
 	if(self.enemy)
+	if not(self.spawnflags & MONSTERFLAG_GIANT) // giants are too big to hold a shield
 	if(self.health < self.max_health)
 	if(time >= self.lastshielded)
 	if(random() < 0.5)
@@ -288,7 +289,11 @@ void shalrath_shield()
 	self.weaponentity.ltime = time + 3;
 	self.weaponentity.health = 70;
 	self.weaponentity.alpha = 0.5;
-	self.weaponentity.scale = self.scale;
+	self.weaponentity.scale = self.scale * 0.6;
+	self.weaponentity.effects = EF_ADDITIVE;
+	self.weaponentity.solid = SOLID_NOT;
+	self.weaponentity.movetype = MOVETYPE_NOCLIP;
+	self.weaponentity.avelocity = '7 0 11';
 	
 	self.lastshielded = time + 7; // 1 shield every 7 seconds?