Add a force_zscale setting to weapons that use the blaster secondary

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / mutators / mutator / overkill / okshotgun.qh

diff --git a/qcsrc/common/mutators/mutator/overkill/okshotgun.qh b/qcsrc/common/mutators/mutator/overkill/okshotgun.qh
index 80b85039a54b80293bdcc8ef8a5a30c12a1ac0f1..2c75681d970cca83305a0dea2e6363b6c1e04065 100644 (file)
--- a/qcsrc/common/mutators/mutator/overkill/okshotgun.qh
+++ b/qcsrc/common/mutators/mutator/overkill/okshotgun.qh
@@ -1,18 +1,19 @@
 #pragma once
 
 CLASS(OverkillShotgun, Weapon)
-/* ammotype  */ ATTRIB(OverkillShotgun, ammo_field, .int, ammo_shells);
+/* spawnfunc */ ATTRIB(OverkillShotgun, m_canonical_spawnfunc, string, "weapon_okshotgun");
+/* ammotype  */ ATTRIB(OverkillShotgun, ammo_type, int, RES_SHELLS);
 /* impulse   */ ATTRIB(OverkillShotgun, impulse, int, 2);
-/* flags     */ ATTRIB(OverkillShotgun, spawnflags, int, WEP_FLAG_RELOADABLE | WEP_TYPE_HITSCAN);
+/* flags     */ ATTRIB(OverkillShotgun, spawnflags, int, WEP_FLAG_HIDDEN | WEP_FLAG_RELOADABLE | WEP_TYPE_HITSCAN | WEP_FLAG_MUTATORBLOCKED);
 /* rating    */ ATTRIB(OverkillShotgun, bot_pickupbasevalue, float, 6000);
 /* color     */ ATTRIB(OverkillShotgun, wpcolor, vector, '0.5 0.25 0');
 /* modelname */ ATTRIB(OverkillShotgun, mdl, string, "ok_shotgun");
 #ifdef GAMEQC
-/* model     */ ATTRIB(OverkillShotgun, m_model, Model, MDL_SHOTGUN_ITEM);
+/* model     */ ATTRIB(OverkillShotgun, m_model, Model, MDL_OK_SHOTGUN_ITEM);
 #endif
 /* crosshair */ ATTRIB(OverkillShotgun, w_crosshair, string, "gfx/crosshairshotgun");
 /* crosshair */ ATTRIB(OverkillShotgun, w_crosshair_size, float, 0.65);
-/* wepimg    */ ATTRIB(OverkillShotgun, model2, string, "weaponshotgun");
+/* wepimg    */ ATTRIB(OverkillShotgun, model2, string, "ok_weapon_shotgun");
 /* refname   */ ATTRIB(OverkillShotgun, netname, string, "okshotgun");
 /* wepname   */ ATTRIB(OverkillShotgun, m_name, string, _("Overkill Shotgun"));
 
@@ -27,12 +28,12 @@ CLASS(OverkillShotgun, Weapon)
                P(class, prefix, refire, float, PRI) \
                P(class, prefix, solidpenetration, float, PRI) \
                P(class, prefix, spread, float, PRI) \
-               P(class, prefix, ammo, float, SEC) \
                P(class, prefix, animtime, float, SEC) \
                P(class, prefix, damage, float, SEC) \
                P(class, prefix, delay, float, SEC) \
                P(class, prefix, edgedamage, float, SEC) \
                P(class, prefix, force, float, SEC) \
+               P(class, prefix, force_zscale, float, SEC) \
                P(class, prefix, lifetime, float, SEC) \
                P(class, prefix, radius, float, SEC) \
                P(class, prefix, refire, float, SEC) \
@@ -54,3 +55,5 @@ CLASS(OverkillShotgun, Weapon)
 
 ENDCLASS(OverkillShotgun)
 REGISTER_WEAPON(OVERKILL_SHOTGUN, okshotgun, NEW(OverkillShotgun));
+
+//SPAWNFUNC_WEAPON(weapon_okshotgun, WEP_OVERKILL_SHOTGUN)