Merge branch 'terencehill/countrylist_removal' into 'master'

[xonotic/xonotic-data.pk3dir.git] / turrets.cfg

diff --git a/turrets.cfg b/turrets.cfg
index 6fc860bd1b94246bb608e9de3312b83dc8491566..882af02f96429ea299930ed8e7f2cd7367aa13bd 100644 (file)
--- a/turrets.cfg
+++ b/turrets.cfg
@@ -40,7 +40,6 @@ set g_turrets_unit_ewheel_target_select_playerbias 1
 set g_turrets_unit_ewheel_target_select_missilebias 0
 
 set g_turrets_unit_ewheel_ammo_max 4000
-set g_turrets_unit_ewheel_ammo 500
 set g_turrets_unit_ewheel_ammo_recharge 50
 
 set g_turrets_unit_ewheel_aim_firetolerance_dist 150
@@ -78,7 +77,6 @@ set g_turrets_unit_flac_target_select_playerbias 0
 set g_turrets_unit_flac_target_select_missilebias 1
 
 set g_turrets_unit_flac_ammo_max 1000
-set g_turrets_unit_flac_ammo 400
 set g_turrets_unit_flac_ammo_recharge 100
 
 set g_turrets_unit_flac_aim_firetolerance_dist 150
@@ -103,7 +101,6 @@ set g_turrets_unit_fusreac_target_range 1024
 set g_turrets_unit_fusreac_target_range_min 1
 
 set g_turrets_unit_fusreac_ammo_max 100
-set g_turrets_unit_fusreac_ammo 0
 set g_turrets_unit_fusreac_ammo_recharge 100
 
 set g_turrets_unit_fusreac_shot_radius 0
@@ -154,7 +151,6 @@ set g_turrets_unit_hellion_target_select_playerbias 1
 set g_turrets_unit_hellion_target_select_missilebias 0
 
 set g_turrets_unit_hellion_ammo_max 200
-set g_turrets_unit_hellion_ammo 100
 set g_turrets_unit_hellion_ammo_recharge 50
 
 set g_turrets_unit_hellion_aim_firetolerance_dist 200
@@ -198,7 +194,6 @@ set g_turrets_unit_hk_target_select_playerbias 1
 set g_turrets_unit_hk_target_select_missilebias 0
 
 set g_turrets_unit_hk_ammo_max 240
-set g_turrets_unit_hk_ammo 120
 set g_turrets_unit_hk_ammo_recharge 16
 
 set g_turrets_unit_hk_aim_firetolerance_dist 500
@@ -236,7 +231,6 @@ set g_turrets_unit_machinegun_target_select_playerbias 1
 set g_turrets_unit_machinegun_target_select_missilebias 0
 
 set g_turrets_unit_machinegun_ammo_max 1500
-set g_turrets_unit_machinegun_ammo 300
 set g_turrets_unit_machinegun_ammo_recharge 75
 
 set g_turrets_unit_machinegun_aim_firetolerance_dist 25
@@ -275,7 +269,6 @@ set g_turrets_unit_mlrs_target_select_playerbias 1
 set g_turrets_unit_mlrs_target_select_missilebias 0
 
 set g_turrets_unit_mlrs_ammo_max 300
-set g_turrets_unit_mlrs_ammo 300
 set g_turrets_unit_mlrs_ammo_recharge 75
 
 set g_turrets_unit_mlrs_aim_firetolerance_dist 120
@@ -313,7 +306,6 @@ set g_turrets_unit_phaser_target_select_playerbias 1
 set g_turrets_unit_phaser_target_select_missilebias 0
 
 set g_turrets_unit_phaser_ammo_max 2000
-set g_turrets_unit_phaser_ammo 1000
 set g_turrets_unit_phaser_ammo_recharge 25
 
 set g_turrets_unit_phaser_aim_firetolerance_dist 100
@@ -351,7 +343,6 @@ set g_turrets_unit_plasma_target_select_playerbias 1
 set g_turrets_unit_plasma_target_select_missilebias 0
 
 set g_turrets_unit_plasma_ammo_max 640
-set g_turrets_unit_plasma_ammo 320
 set g_turrets_unit_plasma_ammo_recharge 40
 
 set g_turrets_unit_plasma_aim_firetolerance_dist 120
@@ -389,7 +380,6 @@ set g_turrets_unit_plasma_dual_target_select_playerbias 1
 set g_turrets_unit_plasma_dual_target_select_missilebias 0
 
 set g_turrets_unit_plasma_dual_ammo_max 640
-set g_turrets_unit_plasma_dual_ammo 320
 set g_turrets_unit_plasma_dual_ammo_recharge 40
 
 set g_turrets_unit_plasma_dual_aim_firetolerance_dist 200
@@ -421,7 +411,6 @@ set g_turrets_unit_tesla_target_select_playerbias 1
 set g_turrets_unit_tesla_target_select_missilebias 1
 
 set g_turrets_unit_tesla_ammo_max 1000
-set g_turrets_unit_tesla_ammo 200
 set g_turrets_unit_tesla_ammo_recharge 15
 
 set g_turrets_unit_tesla_shot_radius 0
@@ -478,7 +467,6 @@ set g_turrets_unit_walker_target_select_playerbias 1
 set g_turrets_unit_walker_target_select_missilebias 0
 
 set g_turrets_unit_walker_ammo_max      4000
-set g_turrets_unit_walker_ammo          500
 set g_turrets_unit_walker_ammo_recharge 100
 
 set g_turrets_unit_walker_aim_firetolerance_dist  100