From: Mircea Kitsune Date: Sun, 30 Jan 2011 17:25:45 +0000 (+0200) Subject: Fix ammo types X-Git-Tag: xonotic-v0.5.0~309^2~7^2~71 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=1deb0bcb992f6b3b00b20438bcf6beba11f89ab3;p=xonotic%2Fxonotic-data.pk3dir.git Fix ammo types --- diff --git a/qcsrc/server/w_grenadelauncher.qc b/qcsrc/server/w_grenadelauncher.qc index a3ba552b93..0e4e0b852e 100644 --- a/qcsrc/server/w_grenadelauncher.qc +++ b/qcsrc/server/w_grenadelauncher.qc @@ -19,7 +19,7 @@ void W_GrenadeLauncher_SetAmmoCounter() void W_GrenadeLauncher_Reload() { - self.reload_ammo_player = ammo_fuel; + self.reload_ammo_player = ammo_rockets; self.reload_ammo_min = min(autocvar_g_balance_grenadelauncher_primary_ammo, autocvar_g_balance_grenadelauncher_secondary_ammo); self.reload_ammo_amount = autocvar_g_balance_grenadelauncher_reload_ammo; self.reload_time = autocvar_g_balance_grenadelauncher_reload_time; diff --git a/qcsrc/server/w_hlac.qc b/qcsrc/server/w_hlac.qc index bb27001ba0..2913ff2f35 100644 --- a/qcsrc/server/w_hlac.qc +++ b/qcsrc/server/w_hlac.qc @@ -17,7 +17,7 @@ void W_HLAC_SetAmmoCounter() void W_HLAC_Reload() { - self.reload_ammo_player = ammo_fuel; + self.reload_ammo_player = ammo_cells; self.reload_ammo_min = min(autocvar_g_balance_hlac_primary_ammo, autocvar_g_balance_hlac_secondary_ammo); self.reload_ammo_amount = autocvar_g_balance_hlac_reload_ammo; self.reload_time = autocvar_g_balance_hlac_reload_time; diff --git a/qcsrc/server/w_minelayer.qc b/qcsrc/server/w_minelayer.qc index 5739d6e457..3db7ad4f7a 100644 --- a/qcsrc/server/w_minelayer.qc +++ b/qcsrc/server/w_minelayer.qc @@ -20,7 +20,7 @@ void W_MineLayer_SetAmmoCounter() void W_MineLayer_Reload() { - self.reload_ammo_player = ammo_fuel; + self.reload_ammo_player = ammo_rockets; self.reload_ammo_min = autocvar_g_balance_minelayer_ammo; self.reload_ammo_amount = autocvar_g_balance_minelayer_reload_ammo; self.reload_time = autocvar_g_balance_minelayer_reload_time; diff --git a/qcsrc/server/w_minstanex.qc b/qcsrc/server/w_minstanex.qc index 91132e7d20..de6fcff245 100644 --- a/qcsrc/server/w_minstanex.qc +++ b/qcsrc/server/w_minstanex.qc @@ -18,7 +18,7 @@ void W_Minstanex_SetAmmoCounter() void W_Minstanex_Reload() { - self.reload_ammo_player = ammo_fuel; + self.reload_ammo_player = ammo_cells; if(autocvar_g_balance_minstanex_laser_ammo) self.reload_ammo_min = min(autocvar_g_balance_minstanex_ammo, autocvar_g_balance_minstanex_laser_ammo); else diff --git a/qcsrc/server/w_nex.qc b/qcsrc/server/w_nex.qc index fd0cbf9ab8..66aea05638 100644 --- a/qcsrc/server/w_nex.qc +++ b/qcsrc/server/w_nex.qc @@ -17,7 +17,7 @@ void W_Nex_SetAmmoCounter() void W_Nex_Reload() { - self.reload_ammo_player = ammo_fuel; + self.reload_ammo_player = ammo_cells; self.reload_ammo_min = min(autocvar_g_balance_nex_primary_ammo, autocvar_g_balance_nex_secondary_ammo); self.reload_ammo_amount = autocvar_g_balance_nex_reload_ammo; self.reload_time = autocvar_g_balance_nex_reload_time; diff --git a/qcsrc/server/w_rocketlauncher.qc b/qcsrc/server/w_rocketlauncher.qc index 50b9ad0aad..1198bc7419 100644 --- a/qcsrc/server/w_rocketlauncher.qc +++ b/qcsrc/server/w_rocketlauncher.qc @@ -19,7 +19,7 @@ void W_RocketLauncher_SetAmmoCounter() void W_RocketLauncher_Reload() { - self.reload_ammo_player = ammo_fuel; + self.reload_ammo_player = ammo_rockets; self.reload_ammo_min = autocvar_g_balance_rocketlauncher_ammo; self.reload_ammo_amount = autocvar_g_balance_rocketlauncher_reload_ammo; self.reload_time = autocvar_g_balance_rocketlauncher_reload_time; diff --git a/qcsrc/server/w_seeker.qc b/qcsrc/server/w_seeker.qc index d3b7f45789..18c5bc95ad 100644 --- a/qcsrc/server/w_seeker.qc +++ b/qcsrc/server/w_seeker.qc @@ -19,7 +19,7 @@ void W_Seeker_SetAmmoCounter() void W_Seeker_Reload() { - self.reload_ammo_player = ammo_fuel; + self.reload_ammo_player = ammo_rockets; self.reload_ammo_min = min(autocvar_g_balance_seeker_missile_ammo, autocvar_g_balance_seeker_tag_ammo); self.reload_ammo_amount = autocvar_g_balance_seeker_reload_ammo; self.reload_time = autocvar_g_balance_seeker_reload_time; diff --git a/qcsrc/server/w_shotgun.qc b/qcsrc/server/w_shotgun.qc index c355fc19d7..68b4ab2b18 100644 --- a/qcsrc/server/w_shotgun.qc +++ b/qcsrc/server/w_shotgun.qc @@ -17,7 +17,7 @@ void W_Shotgun_SetAmmoCounter() void W_Shotgun_Reload() { - self.reload_ammo_player = ammo_fuel; + self.reload_ammo_player = ammo_shells; self.reload_ammo_min = autocvar_g_balance_shotgun_primary_ammo; self.reload_ammo_amount = autocvar_g_balance_shotgun_reload_ammo; self.reload_time = autocvar_g_balance_shotgun_reload_time; diff --git a/qcsrc/server/w_sniperrifle.qc b/qcsrc/server/w_sniperrifle.qc index 34fab001ee..6147953968 100644 --- a/qcsrc/server/w_sniperrifle.qc +++ b/qcsrc/server/w_sniperrifle.qc @@ -22,7 +22,7 @@ void W_SniperRifle_SetAmmoCounter() void W_SniperRifle_Reload() { - self.reload_ammo_player = ammo_fuel; + self.reload_ammo_player = ammo_nails; self.reload_ammo_min = min(autocvar_g_balance_sniperrifle_primary_ammo, autocvar_g_balance_sniperrifle_secondary_ammo); self.reload_ammo_amount = autocvar_g_balance_sniperrifle_reload_ammo; self.reload_time = autocvar_g_balance_sniperrifle_reload_time; diff --git a/qcsrc/server/w_uzi.qc b/qcsrc/server/w_uzi.qc index 9ceb48f534..0482f43772 100644 --- a/qcsrc/server/w_uzi.qc +++ b/qcsrc/server/w_uzi.qc @@ -17,7 +17,7 @@ void W_UZI_SetAmmoCounter() void W_UZI_Reload() { - self.reload_ammo_player = ammo_fuel; + self.reload_ammo_player = ammo_nails; self.reload_ammo_min = min(max(autocvar_g_balance_uzi_sustained_ammo, autocvar_g_balance_uzi_first_ammo), autocvar_g_balance_uzi_burst_ammo); self.reload_ammo_amount = autocvar_g_balance_uzi_reload_ammo; self.reload_time = autocvar_g_balance_uzi_reload_time;