Fix HMG
authorMario <zacjardine@y7mail.com>
Sat, 13 Dec 2014 11:26:13 +0000 (22:26 +1100)
committerMario <zacjardine@y7mail.com>
Sat, 13 Dec 2014 11:26:13 +0000 (22:26 +1100)
12 files changed:
bal-wep-nexuiz25.cfg
bal-wep-overkill.cfg
bal-wep-samual.cfg
bal-wep-xdf.cfg
bal-wep-xonotic.cfg
bal-wep-xpm.cfg
qcsrc/client/hud.qc
qcsrc/common/weapons/w_hmg.qc
qcsrc/common/weapons/w_rpc.qc
qcsrc/server/autocvars.qh
qcsrc/server/mutators/mutator_overkill.qc
qcsrc/server/weapons/weaponsystem.qc

index 0e9db81..c3fefe3 100644 (file)
@@ -762,10 +762,10 @@ set g_balance_arc_weaponstartoverride -1
 set g_balance_arc_weaponthrowable 1
 // }}}
 // {{{ #21: Heavy Machine Gun
-set g_balance_hmg_ammo 0
-set g_balance_hmg_damage 0
-set g_balance_hmg_force 0
-set g_balance_hmg_refire 0
+set g_balance_hmg_ammo 1
+set g_balance_hmg_damage 10
+set g_balance_hmg_force 5
+set g_balance_hmg_refire 0.05
 set g_balance_hmg_reload_ammo 120
 set g_balance_hmg_reload_time 1
 set g_balance_hmg_solidpenetration 32
index ab18a5d..934cf46 100644 (file)
@@ -762,10 +762,10 @@ set g_balance_arc_weaponstartoverride -1
 set g_balance_arc_weaponthrowable 1
 // }}}
 // {{{ #21: Heavy Machine Gun
-set g_balance_hmg_ammo 0
-set g_balance_hmg_damage 0
-set g_balance_hmg_force 0
-set g_balance_hmg_refire 0
+set g_balance_hmg_ammo 1
+set g_balance_hmg_damage 10
+set g_balance_hmg_force 5
+set g_balance_hmg_refire 0.05
 set g_balance_hmg_reload_ammo 120
 set g_balance_hmg_reload_time 1
 set g_balance_hmg_solidpenetration 32
index 82549c8..c0cb54a 100644 (file)
@@ -760,10 +760,10 @@ set g_balance_shotgun_weaponstartoverride -1
 set g_balance_shotgun_weaponthrowable 1
 // }}}
 // {{{ #21: Heavy Machine Gun
-set g_balance_hmg_ammo 0
-set g_balance_hmg_damage 0
-set g_balance_hmg_force 0
-set g_balance_hmg_refire 0
+set g_balance_hmg_ammo 1
+set g_balance_hmg_damage 10
+set g_balance_hmg_force 5
+set g_balance_hmg_refire 0.05
 set g_balance_hmg_reload_ammo 120
 set g_balance_hmg_reload_time 1
 set g_balance_hmg_solidpenetration 32
index be087a5..f65891c 100644 (file)
@@ -762,10 +762,10 @@ set g_balance_arc_weaponstartoverride -1
 set g_balance_arc_weaponthrowable 1
 // }}}
 // {{{ #21: Heavy Machine Gun
-set g_balance_hmg_ammo 0
-set g_balance_hmg_damage 0
-set g_balance_hmg_force 0
-set g_balance_hmg_refire 0
+set g_balance_hmg_ammo 1
+set g_balance_hmg_damage 10
+set g_balance_hmg_force 5
+set g_balance_hmg_refire 0.05
 set g_balance_hmg_reload_ammo 120
 set g_balance_hmg_reload_time 1
 set g_balance_hmg_solidpenetration 32
index e061e69..2e6d10e 100644 (file)
@@ -762,10 +762,10 @@ set g_balance_arc_weaponstartoverride -1
 set g_balance_arc_weaponthrowable 1
 // }}}
 // {{{ #21: Heavy Machine Gun
-set g_balance_hmg_ammo 0
-set g_balance_hmg_damage 0
-set g_balance_hmg_force 0
-set g_balance_hmg_refire 0
+set g_balance_hmg_ammo 1
+set g_balance_hmg_damage 10
+set g_balance_hmg_force 5
+set g_balance_hmg_refire 0.05
 set g_balance_hmg_reload_ammo 120
 set g_balance_hmg_reload_time 1
 set g_balance_hmg_solidpenetration 32
index e061e69..2e6d10e 100644 (file)
@@ -762,10 +762,10 @@ set g_balance_arc_weaponstartoverride -1
 set g_balance_arc_weaponthrowable 1
 // }}}
 // {{{ #21: Heavy Machine Gun
-set g_balance_hmg_ammo 0
-set g_balance_hmg_damage 0
-set g_balance_hmg_force 0
-set g_balance_hmg_refire 0
+set g_balance_hmg_ammo 1
+set g_balance_hmg_damage 10
+set g_balance_hmg_force 5
+set g_balance_hmg_refire 0.05
 set g_balance_hmg_reload_ammo 120
 set g_balance_hmg_reload_time 1
 set g_balance_hmg_solidpenetration 32
index b928aa5..2169400 100644 (file)
@@ -1029,6 +1029,7 @@ void HUD_Ammo(void)
        float i;
        float infinite_ammo = (getstati(STAT_ITEMS, 0, 24) & IT_UNLIMITED_WEAPON_AMMO);
        row = column = 0;
+       if(!infinite_ammo)
        if(autocvar_hud_panel_ammo_onlycurrent)
        {
                if(autocvar__hud_configure)
index ecc5791..69777c4 100644 (file)
@@ -6,7 +6,7 @@ REGISTER_WEAPON(
 /* impulse      */ 3,
 /* flags        */ WEP_FLAG_MUTATORBLOCKED | WEP_FLAG_HIDDEN | WEP_FLAG_NORMAL | WEP_FLAG_RELOADABLE | WEP_TYPE_HITSCAN | WEP_FLAG_SUPERWEAPON,
 /* rating       */ BOT_PICKUP_RATING_HIGH,
-/* color     */ '1 1 0',
+/* color     */ '0.5 0.5 0',
 /* modelname */ "ok_hmg",
 /* simplemdl */ "foobar",
 /* crosshair */ "gfx/crosshairuzi 0.6",
index c6d68de..81e1144 100644 (file)
@@ -6,7 +6,7 @@ REGISTER_WEAPON(
 /* impulse      */ 7,
 /* flags        */ WEP_FLAG_MUTATORBLOCKED | WEP_FLAG_HIDDEN | WEP_FLAG_NORMAL | WEP_FLAG_CANCLIMB | WEP_FLAG_RELOADABLE | WEP_TYPE_SPLASH | WEP_FLAG_SUPERWEAPON,
 /* rating       */ BOT_PICKUP_RATING_HIGH,
-/* color     */ '1 1 0',
+/* color     */ '0.5 0.5 0',
 /* modelname */ "ok_rl",
 /* simplemdl */ "foobar",
 /* crosshair */ "gfx/crosshairrocketlauncher 0.5875",
index 6cfeb82..f20f070 100644 (file)
@@ -843,7 +843,6 @@ float autocvar_g_overkill_powerups_replace;
 float autocvar_g_overkill_superguns_respawn_time;
 float autocvar_g_overkill_100h_anyway;
 float autocvar_g_overkill_100a_anyway;
-float autocvar_g_overkill_ammo_start;
 float autocvar_g_overkill_ammo_charge;
 float autocvar_g_overkill_ammo_charge_notice;
 float autocvar_g_overkill_ammo_charge_limit;
index ecef7ce..8f94177 100644 (file)
@@ -284,9 +284,6 @@ MUTATOR_HOOKFUNCTION(ok_StartItems)
        start_items |= IT_UNLIMITED_WEAPON_AMMO;
        start_weapons = warmup_start_weapons = ok_start_items;
 
-       start_ammo_nails = start_ammo_cells = start_ammo_shells = start_ammo_rockets =
-       warmup_start_ammo_nails = warmup_start_ammo_cells = warmup_start_ammo_shells = warmup_start_ammo_rockets = autocvar_g_overkill_ammo_start;
-
        return FALSE;
 }
 
index 13123a4..762f9a0 100644 (file)
@@ -641,6 +641,8 @@ float forbidWeaponUse()
                return 1;
        if(self.frozen)
                return 1;
+       if(self.weapon_blocked)
+               return 1;
        return 0;
 }