From: Mario <mario@smbclan.net>
Date: Mon, 9 Jan 2017 10:56:52 +0000 (+1000)
Subject: Spider
X-Git-Tag: xonotic-v0.8.5~7^2~1^2~93
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=2557f1af9cd0948161576343024b771c811d08e7;p=xonotic%2Fxonotic-data.pk3dir.git

Spider
---

diff --git a/qcsrc/common/monsters/monster/spider.qc b/qcsrc/common/monsters/monster/spider.qc
index f3358da944..fb3334d2f6 100644
--- a/qcsrc/common/monsters/monster/spider.qc
+++ b/qcsrc/common/monsters/monster/spider.qc
@@ -203,14 +203,15 @@ METHOD(Spider, mr_think, bool(Spider this, entity actor))
 METHOD(Spider, mr_pain, float(Spider this, entity actor, float damage_take, entity attacker, float deathtype))
 {
     TC(Spider, this);
+    setanim(actor, ((random() > 0.5) ? actor.anim_pain2 : actor.anim_pain1), true, true, false);
+    actor.pain_finished = actor.animstate_endtime;
     return damage_take;
 }
 
 METHOD(Spider, mr_death, bool(Spider this, entity actor))
 {
     TC(Spider, this);
-    setanim(actor, actor.anim_melee, false, true, true);
-    actor.angles_x = 180;
+    setanim(actor, ((random() > 0.5) ? actor.anim_die2 : actor.anim_die1), false, true, true);
     return true;
 }
 #endif
@@ -221,7 +222,7 @@ METHOD(Spider, mr_anim, bool(Spider this, entity actor))
     vector none = '0 0 0';
     actor.anim_melee = animfixfps(actor, '0 1 5', none); // analyze models and set framerate
     actor.anim_die1 = animfixfps(actor, '1 1 1', none);
-    actor.anim_die1 = animfixfps(actor, '2 1 1', none);
+    actor.anim_die2 = animfixfps(actor, '2 1 1', none);
     actor.anim_shoot = animfixfps(actor, '3 1 1', none);
     //actor.anim_fire2 = animfixfps(actor, '4 1 1', none);
     actor.anim_idle = animfixfps(actor, '5 1 1', none);