Merge branch 'master' into fruitiex/fruitbalance

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

diff --git a/physicsNoQWBunny.cfg b/physicsNoQWBunny.cfg
index 7806e4c24f78f7cba8c8151ad671dfa0a2565f5f..3e1cc9629bc3c4d83ba80a8bc5103beb0a329558 100644 (file)
--- a/physicsNoQWBunny.cfg
+++ b/physicsNoQWBunny.cfg
@@ -1,23 +1,30 @@
-// 2.0-2.4.2 physics minus QW-bunnyhopping-bug, faster onground accel, CPMA air control
+// "NoQWBunny" physics based on XPM
 sv_gravity 800
-sv_maxspeed 400
-sv_maxairspeed 220
+sv_maxspeed 320
+
+sv_maxairspeed 320
+
 sv_stopspeed 100
-sv_accelerate 12
-sv_airaccelerate 8
-sv_friction 7
+sv_accelerate 15
+sv_airaccelerate 2
+sv_friction 8
 edgefriction 1
 sv_stepheight 34
-sv_jumpvelocity 300
-sv_wateraccelerate -1
-sv_waterfriction -1
-sv_airaccel_sideways_friction -0.125
-sv_airaccel_qw -0.965
-sv_airstopaccelerate 0
-sv_airstrafeaccelerate 0
-sv_maxairstrafespeed 0
-sv_aircontrol 100
-sv_aircontrol_power 3
+
+sv_jumpvelocity 250
+sv_wateraccelerate 4
+sv_waterfriction 1
+sv_airaccel_sideways_friction 0
+sv_airaccel_qw -0.937
+
+sv_airstopaccelerate 3
+sv_airstrafeaccelerate 20
+sv_maxairstrafespeed 96
+sv_airstrafeaccel_qw -0.979
+sv_aircontrol 125
+sv_aircontrol_penalty 100
+sv_aircontrol_power 2.5
+sv_airspeedlimit_nonqw 0
 sv_warsowbunny_turnaccel 0
 sv_warsowbunny_accel 0.1593
 sv_warsowbunny_topspeed 925
@@ -26,4 +33,4 @@ sv_friction_on_land 0
 sv_doublejump 0
 sv_jumpspeedcap_min ""
 sv_jumpspeedcap_max ""
-sv_jumpspeedcap_max_disable_on_ramps 0
+sv_jumpspeedcap_max_disable_on_ramps 1