Merge branch 'master' into Mario/vaporizer_damage

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

diff --git a/turrets.cfg b/turrets.cfg
index 11c5fa438730b0764af9bec97b48c4dfc827d5e1..0c7b3be58a5ba96db025c59ff4e615ef95517efc 100644 (file)
--- a/turrets.cfg
+++ b/turrets.cfg
@@ -469,17 +469,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