Bring back old start weapons, and make shockwave a mutator blocked weapon

diff --git a/bal-wep-xonotic.cfg b/bal-wep-xonotic.cfg
index db8d41dd22f87e651406fa8b5eb6b03df8732a0d..49ca11574a47914385d2d4fcd5d114ef997e1666 100644 (file)
--- a/bal-wep-xonotic.cfg
+++ b/bal-wep-xonotic.cfg
@@ -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_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
 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_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
 // }}}
 set g_balance_shotgun_weaponstartoverride -1
 set g_balance_shotgun_weaponthrowable 1
 // }}}

diff --git a/qcsrc/common/weapons/all.qh b/qcsrc/common/weapons/all.qh
index f0133ec6ca6d4d323fe1f271e7772941e8069d64..a40488f8383f432005f52e2ffb7d657a436b77d0 100644 (file)
--- a/qcsrc/common/weapons/all.qh
+++ b/qcsrc/common/weapons/all.qh
@@ -4,12 +4,11 @@
 
 // core weapons
 #include "w_blaster.qc"
 
 // 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_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"
 #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_rifle.qc"
 #include "w_fireball.qc"
 #include "w_seeker.qc"

-#include "w_shotgun.qc"
+#include "w_shockwave.qc"
+#include "w_arc.qc"

diff --git a/qcsrc/common/weapons/w_shockwave.qc b/qcsrc/common/weapons/w_shockwave.qc
index c8fe77c58e5d087a7f53636a602b6301f320ff0f..60e8d8436de69a3fb3fc4a835c25a9a7f843bbea 100644 (file)
--- a/qcsrc/common/weapons/w_shockwave.qc
+++ b/qcsrc/common/weapons/w_shockwave.qc
@@ -4,7 +4,7 @@ REGISTER_WEAPON(
 /* function  */ W_Shockwave,
 /* ammotype  */ ammo_none,
 /* impulse   */ 2,
 /* 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",
 /* rating    */ BOT_PICKUP_RATING_LOW,
 /* color     */ '0.5 0.25 0',
 /* modelname */ "shotgun",

diff --git a/qcsrc/common/weapons/w_shotgun.qc b/qcsrc/common/weapons/w_shotgun.qc
index eec7f649c981de03368e01643406012fab181ba0..6e500dff2c4e17b60d93c3cc96787cc82ec3e1a1 100644 (file)
--- a/qcsrc/common/weapons/w_shotgun.qc
+++ b/qcsrc/common/weapons/w_shotgun.qc
@@ -4,7 +4,7 @@ REGISTER_WEAPON(
 /* function  */ W_Shotgun,
 /* ammotype  */ ammo_none,
 /* impulse   */ 2,
 /* 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",
 /* rating    */ BOT_PICKUP_RATING_LOW,
 /* color     */ '0.5 0.25 0',
 /* modelname */ "shotgun",