X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=turrets.cfg;h=882af02f96429ea299930ed8e7f2cd7367aa13bd;hp=11c5fa438730b0764af9bec97b48c4dfc827d5e1;hb=8c79ffeea6057c22e10f314300bccda4fabdabf1;hpb=04bbc270623d9f75f19d00c93b6f5b2c51734bf4

diff --git a/turrets.cfg b/turrets.cfg
index 11c5fa438..882af02f9 100644
--- 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
@@ -51,6 +50,8 @@ set g_turrets_unit_ewheel_aim_maxpitch 45
 set g_turrets_unit_ewheel_track_type 1
 set g_turrets_unit_ewheel_track_accel_pitch 0
 set g_turrets_unit_ewheel_track_accel_rot 0
+
+set g_turrets_unit_ewheel_track_blendrate 0
 // }}}
 // {{{ #2: FLAC Cannon
 set g_turrets_unit_flac_health 700
@@ -76,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
@@ -101,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
@@ -114,6 +113,7 @@ set g_turrets_unit_fusreac_target_select_rangebias 0
 set g_turrets_unit_fusreac_target_select_samebias 0
 set g_turrets_unit_fusreac_target_select_anglebias 0
 set g_turrets_unit_fusreac_target_select_playerbias 0
+set g_turrets_unit_fusreac_target_select_missilebias 0
 set g_turrets_unit_fusreac_aim_firetolerance_dist 0
 set g_turrets_unit_fusreac_aim_speed 0
 set g_turrets_unit_fusreac_aim_maxrot 0
@@ -151,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
@@ -195,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
@@ -233,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
@@ -272,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
@@ -310,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
@@ -348,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
@@ -386,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
@@ -418,8 +411,23 @@ 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
+set g_turrets_unit_tesla_shot_speed 0
+set g_turrets_unit_tesla_shot_spread 0
+set g_turrets_unit_tesla_target_range_optimal 0
+set g_turrets_unit_tesla_target_select_rangebias 0
+set g_turrets_unit_tesla_target_select_samebias 0
+set g_turrets_unit_tesla_target_select_anglebias 0
+set g_turrets_unit_tesla_aim_firetolerance_dist 0
+set g_turrets_unit_tesla_aim_speed 0
+set g_turrets_unit_tesla_aim_maxrot 0
+set g_turrets_unit_tesla_aim_maxpitch 0
+set g_turrets_unit_tesla_track_type 0
+set g_turrets_unit_tesla_track_accel_pitch 0
+set g_turrets_unit_tesla_track_accel_rot 0
+set g_turrets_unit_tesla_track_blendrate 0
 // }}}
 // {{{ #12: Walker Turret
 set g_turrets_unit_walker_health 500
@@ -459,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
@@ -469,17 +476,17 @@ set g_turrets_unit_walker_aim_maxpitch            15
 
 set g_turrets_unit_walker_track_type 1
 
-set g_turrets_unit_walker_rockets_range     4000
-set g_turrets_unit_walker_rockets_range_min 500
-set g_turrets_unit_walker_rocket_refire     10
-set g_turrets_unit_walker_rocket_dmg        45
-set g_turrets_unit_walker_rocket_radius     150
-set g_turrets_unit_walker_rocket_force      150
-set g_turrets_unit_walker_rocket_turnrate   0.05
-set g_turrets_unit_walker_rocket_speed      1000
+set g_turrets_unit_walker_rocket_range 4000
+set g_turrets_unit_walker_rocket_range_min 500
+set g_turrets_unit_walker_rocket_refire 10
+set g_turrets_unit_walker_rocket_damage 45
+set g_turrets_unit_walker_rocket_radius 150
+set g_turrets_unit_walker_rocket_force 150
+set g_turrets_unit_walker_rocket_turnrate 0.05
+set g_turrets_unit_walker_rocket_speed 1000
 
 set g_turrets_unit_walker_melee_range 100
-set g_turrets_unit_walker_melee_dmg   100
+set g_turrets_unit_walker_melee_damage 100
 set g_turrets_unit_walker_melee_force 600
 
 set g_turrets_unit_walker_track_accel_pitch 0.5