Make it so that minelayer shows up in g_weaponarena "most" -- fix the comments in...

diff --git a/balanceSamual.cfg b/balanceSamual.cfg
index 1aeea25914e84c694a633bc59d3f4bfd34297c5d..4fa89a1dae99c91a9896e7d814c37b6dc19fec24 100644 (file)
--- a/balanceSamual.cfg
+++ b/balanceSamual.cfg
@@ -341,8 +341,8 @@ set g_balance_minelayer_edgedamage 20
 set g_balance_minelayer_force 250
 set g_balance_minelayer_radius 175
 set g_balance_minelayer_proximityradius 150
-set g_balance_minelayer_speed 750
-set g_balance_minelayer_lifetime 3
+set g_balance_minelayer_speed 1000
+set g_balance_minelayer_lifetime 10
 set g_balance_minelayer_lifetime_countdown 0.5
 set g_balance_minelayer_refire 1.5
 set g_balance_minelayer_animtime 0.4

diff --git a/qcsrc/server/w_minelayer.qc b/qcsrc/server/w_minelayer.qc
index 1d2b5c8024d57b1be9b382e7a66b9d34854a347e..50aed0e1e3bc74934b3547cd3f612263194a683c 100644 (file)
--- a/qcsrc/server/w_minelayer.qc
+++ b/qcsrc/server/w_minelayer.qc
@@ -1,5 +1,5 @@
 #ifdef REGISTER_WEAPON
-REGISTER_WEAPON(MINE_LAYER, w_minelayer, IT_ROCKETS, 4, WEP_TYPE_SPLASH, BOT_PICKUP_RATING_HIGH, "minelayer", "minelayer", _("Mine Layer"))
+REGISTER_WEAPON(MINE_LAYER, w_minelayer, IT_ROCKETS, 4, WEP_FLAG_NORMAL | WEP_TYPE_SPLASH, BOT_PICKUP_RATING_HIGH, "minelayer", "minelayer", _("Mine Layer"))
 #else
 #ifdef SVQC
 void W_Mine_Think (void);
@@ -131,6 +131,9 @@ void W_Mine_Think (void)
        entity head;
 
        self.nextthink = time;
+       
+       // our lifetime has expired, it's time to die - mine_time just allows us to play a sound for this
+       // TODO: replace this mine_trigger.wav sound with a real countdown
        if ((time > self.cnt) && (!self.mine_time))
        {
                spamsound (self, CHAN_PROJECTILE, "weapons/mine_trigger.wav", VOL_BASE, ATTN_NORM);