New skill based damage calculation by Melanosuchus

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / monsters / sv_monsters.qc

diff --git a/qcsrc/common/monsters/sv_monsters.qc b/qcsrc/common/monsters/sv_monsters.qc
index 58da71cf307aa29100e8cc7be8b63d05cb0558c9..cf651842a667ef66e1471ab5532f1382ba1166cf 100644 (file)
--- 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();