Merge remote branch 'origin/master' into tzork/gm_nexball

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

diff --git a/vehicle_raptor.cfg b/vehicle_raptor.cfg
index b3a0b51ccad75cb86f22c79dd43187f900fec5b3..2a46dd28250be16fad45df4f06cb233780357db2 100644 (file)
--- a/vehicle_raptor.cfg
+++ b/vehicle_raptor.cfg
@@ -1,4 +1,4 @@
-set g_vehicle_raptor_respawntime 30
+set g_vehicle_raptor_respawntime 35
 
 // 0: go where player aims, +forward etc relative to aim angles
 // 1: ignore aim for up/down movement. +forward always moved forward, +jump always moves up
@@ -58,4 +58,8 @@ set g_vehicle_raptor_shield             120
 set g_vehicle_raptor_shield_regen       25
 set g_vehicle_raptor_shield_regen_pause 1.5
 
+set g_vehicle_raptor_bouncefactor 0.2
+set g_vehicle_raptor_bouncestop 0
+set g_vehicle_raptor_bouncepain "1 1.5 500"
+
 set g_vehicle_raptor_mass              2200