Bring back old start weapons, and make shockwave a mutator blocked weapon
authorMario <zacjardine@y7mail.com>
Thu, 6 Nov 2014 08:56:10 +0000 (19:56 +1100)
committerMario <zacjardine@y7mail.com>
Thu, 6 Nov 2014 08:56:10 +0000 (19:56 +1100)
bal-wep-xonotic.cfg
qcsrc/common/weapons/all.qh
qcsrc/common/weapons/w_shockwave.qc
qcsrc/common/weapons/w_shotgun.qc

index db8d41d..49ca115 100644 (file)
@@ -107,7 +107,7 @@ set g_balance_machinegun_sustained_refire 0.1
 set g_balance_machinegun_sustained_spread 0.03
 set g_balance_machinegun_switchdelay_drop 0.2
 set g_balance_machinegun_switchdelay_raise 0.2
-set g_balance_machinegun_weaponreplace "arc"
+set g_balance_machinegun_weaponreplace ""
 set g_balance_machinegun_weaponstart 0
 set g_balance_machinegun_weaponstartoverride -1
 set g_balance_machinegun_weaponthrowable 1
@@ -745,7 +745,7 @@ set g_balance_shotgun_secondary_refire 1.25
 set g_balance_shotgun_switchdelay_drop 0.2
 set g_balance_shotgun_switchdelay_raise 0.2
 set g_balance_shotgun_weaponreplace ""
-set g_balance_shotgun_weaponstart 0
+set g_balance_shotgun_weaponstart 1
 set g_balance_shotgun_weaponstartoverride -1
 set g_balance_shotgun_weaponthrowable 1
 // }}}
index f0133ec..a40488f 100644 (file)
@@ -4,12 +4,11 @@
 
 // core weapons
 #include "w_blaster.qc"
-#include "w_shockwave.qc"
+#include "w_shotgun.qc"
 #include "w_machinegun.qc"
 #include "w_mortar.qc"
 #include "w_minelayer.qc"
 #include "w_electro.qc"
-#include "w_arc.qc"
 #include "w_crylink.qc"
 #include "w_vortex.qc"
 #include "w_hagar.qc"
@@ -24,4 +23,5 @@
 #include "w_rifle.qc"
 #include "w_fireball.qc"
 #include "w_seeker.qc"
-#include "w_shotgun.qc"
+#include "w_shockwave.qc"
+#include "w_arc.qc"
index c8fe77c..60e8d84 100644 (file)
@@ -4,7 +4,7 @@ REGISTER_WEAPON(
 /* function  */ W_Shockwave,
 /* ammotype  */ ammo_none,
 /* impulse   */ 2,
-/* flags     */ WEP_FLAG_NORMAL | WEP_TYPE_HITSCAN,
+/* flags     */ WEP_FLAG_NORMAL | WEP_TYPE_HITSCAN | WEP_FLAG_MUTATORBLOCKED,
 /* rating    */ BOT_PICKUP_RATING_LOW,
 /* color     */ '0.5 0.25 0',
 /* modelname */ "shotgun",
index eec7f64..6e500df 100644 (file)
@@ -4,7 +4,7 @@ REGISTER_WEAPON(
 /* function  */ W_Shotgun,
 /* ammotype  */ ammo_none,
 /* impulse   */ 2,
-/* flags     */ WEP_FLAG_RELOADABLE | WEP_TYPE_HITSCAN | WEP_FLAG_MUTATORBLOCKED,
+/* flags     */ WEP_FLAG_RELOADABLE | WEP_TYPE_HITSCAN,
 /* rating    */ BOT_PICKUP_RATING_LOW,
 /* color     */ '0.5 0.25 0',
 /* modelname */ "shotgun",