Fix conflict

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

diff --git a/physicsLeeStricklin.cfg b/physicsLeeStricklin.cfg
index c0a5e21a3ac18a4a2dbd778cd946d6bef07f5e0e..dc82a81f54702c34e8273b6003e42fd25f09b1bb 100644 (file)
--- a/physicsLeeStricklin.cfg
+++ b/physicsLeeStricklin.cfg
@@ -1,24 +1,34 @@
-// These have been modified from Nexuiz 2.4.2's physicsQBR.cfg file
+// "NoQWBunny" physics based on XPM
 sv_gravity 800
-sv_gravity 802
-sv_maxspeed 417
-sv_maxairspeed 202
+sv_maxspeed 320
+sv_maxairspeed 424
+
 sv_stopspeed 100
-sv_accelerate 5.8
-sv_airaccelerate 5.5
-sv_friction 4.1
+sv_accelerate 13
+sv_airaccelerate 2
+sv_friction 8
 edgefriction 1
-sv_stepheight 34
-sv_jumpvelocity 307
+sv_stepheight 26
+// Q1: 16+2
+// Nex: 32+2
+// we try: 24+2
+
+// actually, what we want is 266.6666 for 180bpm
+// but 260 takes same amount of frames and is nicer to mappers
+sv_jumpvelocity 260
 sv_wateraccelerate -1
 sv_waterfriction -1
-sv_airaccel_sideways_friction 0.207
-sv_airaccel_qw -0.93
-sv_airstopaccelerate 0
-sv_airstrafeaccelerate 0
-sv_maxairstrafespeed 0
-sv_aircontrol 0
+sv_airaccel_sideways_friction 0
+sv_airaccel_qw -0.8
+
+sv_airstopaccelerate 3
+sv_airstrafeaccelerate 24
+sv_maxairstrafespeed 100
+sv_airstrafeaccel_qw -0.95
+sv_aircontrol 125
+sv_aircontrol_penalty 150
 sv_aircontrol_power 2
+sv_airspeedlimit_nonqw 800
 sv_warsowbunny_turnaccel 0
 sv_warsowbunny_accel 0.1593
 sv_warsowbunny_topspeed 925
@@ -27,4 +37,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