Fix HMG

diff --git a/bal-wep-nexuiz25.cfg b/bal-wep-nexuiz25.cfg
index 0e9db816885d0b5e6f4044e74f94937d5ccc6b9f..c3fefe39da2ab6e9a3e0267e612ff010a7fa4bfd 100644 (file)
--- a/bal-wep-nexuiz25.cfg
+++ b/bal-wep-nexuiz25.cfg
@@ -762,10 +762,10 @@ set g_balance_arc_weaponstartoverride -1
 set g_balance_arc_weaponthrowable 1
 // }}}
 // {{{ #21: Heavy Machine Gun
 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
 set g_balance_hmg_reload_ammo 120
 set g_balance_hmg_reload_time 1
 set g_balance_hmg_solidpenetration 32

diff --git a/bal-wep-overkill.cfg b/bal-wep-overkill.cfg
index ab18a5d894c81e8c18aa7f5d16570bfc9cf76c8e..934cf46a5bc189739864aff9420ea96f67606182 100644 (file)
--- a/bal-wep-overkill.cfg
+++ b/bal-wep-overkill.cfg
@@ -762,10 +762,10 @@ set g_balance_arc_weaponstartoverride -1
 set g_balance_arc_weaponthrowable 1
 // }}}
 // {{{ #21: Heavy Machine Gun
 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
 set g_balance_hmg_reload_ammo 120
 set g_balance_hmg_reload_time 1
 set g_balance_hmg_solidpenetration 32

diff --git a/bal-wep-samual.cfg b/bal-wep-samual.cfg
index 82549c8a449096aeb4fe9ae8c62922f0be5007f9..c0cb54aa315ff4583432ccb1b1d0f39e2d2293e8 100644 (file)
--- a/bal-wep-samual.cfg
+++ b/bal-wep-samual.cfg
@@ -760,10 +760,10 @@ set g_balance_shotgun_weaponstartoverride -1
 set g_balance_shotgun_weaponthrowable 1
 // }}}
 // {{{ #21: Heavy Machine Gun
 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
 set g_balance_hmg_reload_ammo 120
 set g_balance_hmg_reload_time 1
 set g_balance_hmg_solidpenetration 32

diff --git a/bal-wep-xdf.cfg b/bal-wep-xdf.cfg
index be087a5d7e46eb40686bb8e4da5f06b8e8ad72e2..f65891c9f743eaf99f4fa1ec960c534d3e6f9672 100644 (file)
--- a/bal-wep-xdf.cfg
+++ b/bal-wep-xdf.cfg
@@ -762,10 +762,10 @@ set g_balance_arc_weaponstartoverride -1
 set g_balance_arc_weaponthrowable 1
 // }}}
 // {{{ #21: Heavy Machine Gun
 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
 set g_balance_hmg_reload_ammo 120
 set g_balance_hmg_reload_time 1
 set g_balance_hmg_solidpenetration 32

diff --git a/bal-wep-xonotic.cfg b/bal-wep-xonotic.cfg
index e061e6920f4ee4f5c6a525e4a1b5ab7a9464601d..2e6d10e7b1d62b34202c7388d5c74979f0b051ad 100644 (file)
--- a/bal-wep-xonotic.cfg
+++ b/bal-wep-xonotic.cfg
@@ -762,10 +762,10 @@ set g_balance_arc_weaponstartoverride -1
 set g_balance_arc_weaponthrowable 1
 // }}}
 // {{{ #21: Heavy Machine Gun
 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
 set g_balance_hmg_reload_ammo 120
 set g_balance_hmg_reload_time 1
 set g_balance_hmg_solidpenetration 32

diff --git a/bal-wep-xpm.cfg b/bal-wep-xpm.cfg
index e061e6920f4ee4f5c6a525e4a1b5ab7a9464601d..2e6d10e7b1d62b34202c7388d5c74979f0b051ad 100644 (file)
--- a/bal-wep-xpm.cfg
+++ b/bal-wep-xpm.cfg
@@ -762,10 +762,10 @@ set g_balance_arc_weaponstartoverride -1
 set g_balance_arc_weaponthrowable 1
 // }}}
 // {{{ #21: Heavy Machine Gun
 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
 set g_balance_hmg_reload_ammo 120
 set g_balance_hmg_reload_time 1
 set g_balance_hmg_solidpenetration 32

diff --git a/qcsrc/client/hud.qc b/qcsrc/client/hud.qc
index b928aa512a514ddd6181c409bc46b630dc91c831..216940009dfed6fa0071e0e859686803b090f8d9 100644 (file)
--- a/qcsrc/client/hud.qc
+++ b/qcsrc/client/hud.qc
@@ -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;
        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)
        if(autocvar_hud_panel_ammo_onlycurrent)
        {
                if(autocvar__hud_configure)

diff --git a/qcsrc/common/weapons/w_hmg.qc b/qcsrc/common/weapons/w_hmg.qc
index ecc5791ed336f7ecf0929fa233b8f5abec400092..69777c4c2ccafcef98d0860e244ccfba854a447e 100644 (file)
--- a/qcsrc/common/weapons/w_hmg.qc
+++ b/qcsrc/common/weapons/w_hmg.qc
@@ -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,
 /* 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",
 /* modelname */ "ok_hmg",
 /* simplemdl */ "foobar",
 /* crosshair */ "gfx/crosshairuzi 0.6",

diff --git a/qcsrc/common/weapons/w_rpc.qc b/qcsrc/common/weapons/w_rpc.qc
index c6d68de3b171c678d4388c878c48efbbfe1e3d2e..81e1144434287fde8164cc48e27679ef7a20f117 100644 (file)
--- a/qcsrc/common/weapons/w_rpc.qc
+++ b/qcsrc/common/weapons/w_rpc.qc
@@ -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,
 /* 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",
 /* modelname */ "ok_rl",
 /* simplemdl */ "foobar",
 /* crosshair */ "gfx/crosshairrocketlauncher 0.5875",

diff --git a/qcsrc/server/autocvars.qh b/qcsrc/server/autocvars.qh
index 6cfeb82ae5a2c1d1465ed024b436d4e329495a83..f20f07047af715517e226dcad8c7f8090bedfc27 100644 (file)
--- a/qcsrc/server/autocvars.qh
+++ b/qcsrc/server/autocvars.qh
@@ -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_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;
 float autocvar_g_overkill_ammo_charge;
 float autocvar_g_overkill_ammo_charge_notice;
 float autocvar_g_overkill_ammo_charge_limit;

diff --git a/qcsrc/server/mutators/mutator_overkill.qc b/qcsrc/server/mutators/mutator_overkill.qc
index ecef7ceac1c2001d23890c545e527a5eceef5ade..8f94177a84ce2a9630a7d801dd997678c70beb23 100644 (file)
--- a/qcsrc/server/mutators/mutator_overkill.qc
+++ b/qcsrc/server/mutators/mutator_overkill.qc
@@ -284,9 +284,6 @@ MUTATOR_HOOKFUNCTION(ok_StartItems)
        start_items |= IT_UNLIMITED_WEAPON_AMMO;
        start_weapons = warmup_start_weapons = ok_start_items;
 
        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;
 }
 
        return FALSE;
 }
 

diff --git a/qcsrc/server/weapons/weaponsystem.qc b/qcsrc/server/weapons/weaponsystem.qc
index 13123a4601bf91a791018e37a232c5626c5dda45..762f9a0e3dc12b619b531128366b6d9f0c36506f 100644 (file)
--- a/qcsrc/server/weapons/weaponsystem.qc
+++ b/qcsrc/server/weapons/weaponsystem.qc
@@ -641,6 +641,8 @@ float forbidWeaponUse()
                return 1;
        if(self.frozen)
                return 1;
                return 1;
        if(self.frozen)
                return 1;

+       if(self.weapon_blocked)
+               return 1;

        return 0;
 }
 
        return 0;
 }