Prevent monsters from attacking when the match is stopped, rename shambler sounds...

diff --git a/models/monsters/golem.dpm_0.sounds b/models/monsters/golem.dpm_0.sounds
index 7e16968e21f67248d2d7cb40ff7a9ea74d6bad8f..6486da7ee0074d9824e8df6a170ebab850addf2d 100644 (file)
--- a/models/monsters/golem.dpm_0.sounds
+++ b/models/monsters/golem.dpm_0.sounds
@@ -1,8 +1,8 @@
-//TAG: shambler
-//death sound/monsters/shambler/death 0
-sight sound/monsters/shambler/sight 0
-//ranged sound/monsters/shambler/ranged 0
-//melee sound/monsters/shambler/melee 0
-//pain sound/monsters/shambler/pain 0
-//spawn sound/monsters/shambler/spawn 0
-idle sound/monsters/shambler/idle 2
+//TAG: golem
+//death sound/monsters/golem/death 0
+sight sound/monsters/golem/sight 0
+//ranged sound/monsters/golem/ranged 0
+//melee sound/monsters/golem/melee 0
+//pain sound/monsters/golem/pain 0
+//spawn sound/monsters/golem/spawn 0
+idle sound/monsters/golem/idle 2

diff --git a/qcsrc/common/monsters/monster/mage.qc b/qcsrc/common/monsters/monster/mage.qc
index ccdc0223f4c07d557f0b91920df1c9d16c36da6a..22cb9fef95cbb044a27f7b672a1e8948bef8ae96 100644 (file)
--- a/qcsrc/common/monsters/monster/mage.qc
+++ b/qcsrc/common/monsters/monster/mage.qc
@@ -142,7 +142,7 @@ void M_Mage_Attack_Spike_Touch(entity this, entity toucher)
 // copied from W_Seeker_Think
 void M_Mage_Attack_Spike_Think(entity this)
 {
-       if (time > this.ltime || (this.enemy && GetResource(this.enemy, RES_HEALTH) <= 0) || GetResource(this.owner, RES_HEALTH) <= 0) {
+       if (time > this.ltime || (this.enemy && GetResource(this.enemy, RES_HEALTH) <= 0) || !this.owner || GetResource(this.owner, RES_HEALTH) <= 0) {
                this.projectiledeathtype |= HITTYPE_SPLASH;
                M_Mage_Attack_Spike_Explode(this, NULL);
        }
@@ -298,7 +298,7 @@ void M_Mage_Attack_Push(entity this)
 void M_Mage_Attack_Teleport(entity this, entity targ)
 {
        if(!targ) return;
-       if(vdist(targ.origin - this.origin, >, 1500)) return;
+       if(vdist(targ.origin - this.origin, >, autocvar_g_monster_mage_attack_teleport_random_range)) return;
 
        if(autocvar_g_monster_mage_attack_teleport_random && random() <= autocvar_g_monster_mage_attack_teleport_random)
        {

diff --git a/qcsrc/common/monsters/sv_monsters.qc b/qcsrc/common/monsters/sv_monsters.qc
index 244652ef95c6cf93b8f884a06dc67b06e4081e18..483f6a1ac31896a48f4248224bf55c5fad741efb 100644 (file)
--- a/qcsrc/common/monsters/sv_monsters.qc
+++ b/qcsrc/common/monsters/sv_monsters.qc
@@ -452,6 +452,7 @@ void Monster_Attack_Check(entity this, entity targ, .entity weaponentity)
 
        if((!this || !targ)
        || (!this.monster_attackfunc)
+       || (game_stopped)
        || (time < this.attack_finished_single[slot])
        || ((autocvar_g_monsters_target_infront || (this.spawnflags & MONSTERFLAG_INFRONT)) && !monster_facing(this, targ))
        ) { return; }

diff --git a/sound/monsters/golem/idle1.wav b/sound/monsters/golem/idle1.wav
new file mode 100644 (file)
index 0000000..bc0f256
Binary files /dev/null and b/sound/monsters/golem/idle1.wav differ

diff --git a/sound/monsters/golem/idle2.wav b/sound/monsters/golem/idle2.wav
new file mode 100644 (file)
index 0000000..58842b8
Binary files /dev/null and b/sound/monsters/golem/idle2.wav differ

diff --git a/sound/monsters/golem/sight.wav b/sound/monsters/golem/sight.wav
new file mode 100644 (file)
index 0000000..8b75efd
Binary files /dev/null and b/sound/monsters/golem/sight.wav differ

diff --git a/sound/monsters/shambler/idle1.wav b/sound/monsters/shambler/idle1.wav
deleted file mode 100644 (file)
index bc0f256..0000000
Binary files a/sound/monsters/shambler/idle1.wav and /dev/null differ

diff --git a/sound/monsters/shambler/idle2.wav b/sound/monsters/shambler/idle2.wav
deleted file mode 100644 (file)
index 58842b8..0000000
Binary files a/sound/monsters/shambler/idle2.wav and /dev/null differ

diff --git a/sound/monsters/shambler/sight.wav b/sound/monsters/shambler/sight.wav
deleted file mode 100644 (file)
index 8b75efd..0000000
Binary files a/sound/monsters/shambler/sight.wav and /dev/null differ

diff --git a/sound/monsters/troll/death1.wav b/sound/monsters/troll/death1.wav
deleted file mode 100644 (file)
index 211656a..0000000
Binary files a/sound/monsters/troll/death1.wav and /dev/null differ

diff --git a/sound/monsters/troll/death2.wav b/sound/monsters/troll/death2.wav
deleted file mode 100644 (file)
index bd68826..0000000
Binary files a/sound/monsters/troll/death2.wav and /dev/null differ

diff --git a/sound/monsters/troll/death3.wav b/sound/monsters/troll/death3.wav
deleted file mode 100644 (file)
index 09608f5..0000000
Binary files a/sound/monsters/troll/death3.wav and /dev/null differ

diff --git a/sound/monsters/troll/idle1.wav b/sound/monsters/troll/idle1.wav
deleted file mode 100644 (file)
index cc67c22..0000000
Binary files a/sound/monsters/troll/idle1.wav and /dev/null differ

diff --git a/sound/monsters/troll/idle2.wav b/sound/monsters/troll/idle2.wav
deleted file mode 100644 (file)
index 478913d..0000000
Binary files a/sound/monsters/troll/idle2.wav and /dev/null differ

diff --git a/sound/monsters/troll/melee.wav b/sound/monsters/troll/melee.wav
deleted file mode 100644 (file)
index cc67c22..0000000
Binary files a/sound/monsters/troll/melee.wav and /dev/null differ

diff --git a/sound/monsters/troll/pain1.wav b/sound/monsters/troll/pain1.wav
deleted file mode 100644 (file)
index 328dafc..0000000
Binary files a/sound/monsters/troll/pain1.wav and /dev/null differ

diff --git a/sound/monsters/troll/pain2.wav b/sound/monsters/troll/pain2.wav
deleted file mode 100644 (file)
index 2c056bd..0000000
Binary files a/sound/monsters/troll/pain2.wav and /dev/null differ

diff --git a/sound/monsters/troll/sight.wav b/sound/monsters/troll/sight.wav
deleted file mode 100644 (file)
index 85e5682..0000000
Binary files a/sound/monsters/troll/sight.wav and /dev/null differ