From: Mario <mario.mario@y7mail.com>
Date: Sat, 12 Oct 2013 20:31:39 +0000 (+1100)
Subject: New skill based damage calculation by Melanosuchus
X-Git-Tag: xonotic-v0.8.0~241^2^2~49
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=89b033c2c91be18d8863de5808497773a66e497f;p=xonotic%2Fxonotic-data.pk3dir.git

New skill based damage calculation by Melanosuchus
---

diff --git a/qcsrc/common/monsters/sv_monsters.qc b/qcsrc/common/monsters/sv_monsters.qc
index 58da71cf3..cf651842a 100644
--- a/qcsrc/common/monsters/sv_monsters.qc
+++ b/qcsrc/common/monsters/sv_monsters.qc
@@ -43,7 +43,7 @@ void monster_dropitem()
 
 float Monster_SkillModifier()
 {
-	float t = 1.0 * (self.monster_skill * 0.15);
+	float t = 0.5+self.monster_skill*((1.2-0.3)/10);
 	
 	return t;
 }
@@ -1108,7 +1108,8 @@ float monster_initialize(float mon_id, float nodrop)
 	if not(monster_spawn())
 		return FALSE;
 		
-	monster_setupcolors();
+	if not(self.monster_respawned)
+		monster_setupcolors();
 	
 	CSQCMODEL_AUTOINIT();