Merge branch 'master' into Lyberta/StandaloneOverkillWeapons

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

diff --git a/turrets.cfg b/turrets.cfg
index 11c5fa438730b0764af9bec97b48c4dfc827d5e1..b16c16ac4ca23c5f2c531563e123bb7be888f9fc 100644 (file)
--- a/turrets.cfg
+++ b/turrets.cfg
@@ -51,6 +51,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
@@ -420,6 +422,22 @@ 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
@@ -469,17 +487,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