X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=physicsX.cfg;h=6076dd73d19702226a4fe2efe3a842c4582a843f;hb=refs%2Fmerge-requests%2F796%2Fhead;hp=5cc6b52be804d9f159b7e9bf6ecd888c326c4a84;hpb=5be16497ca10373f33c220f727d88439277352ce;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/physicsX.cfg b/physicsX.cfg
index 5cc6b52be..6076dd73d 100644
--- a/physicsX.cfg
+++ b/physicsX.cfg
@@ -1,4 +1,6 @@
+g_mod_physics Xonotic
 // current Xonotic physics
+
 sv_gravity 800
 sv_maxspeed 360
 sv_maxairspeed 360
@@ -6,16 +8,24 @@ sv_maxairspeed 360
 sv_stopspeed 100
 sv_accelerate 15
 sv_airaccelerate 2
-sv_friction 8
+sv_friction 6
 edgefriction 1
-sv_stepheight 26
+sv_stepheight 31
 // Q1: 16+2
 // Nex: 32+2
-// we try: 24+2
+// Xon 0.7: 24+2
+// Samual: 31 (just below 32, keeping things smooth without allowing 32qu steps)
 
-// actually, what we want is 266.6666 for 180bpm
-// but 260 takes same amount of frames and is nicer to mappers
+// jump duration == 2*sv_jumpvelocity / sv_gravity
+// in this case: 0.65 (thus either 19 or 20 frames)
+// jump height == sv_jumpvelocity^2 / (2*sv_gravity)
+// in this case: 42.25
+// player: 24+45 qu
+// total: 111.25qu
+// this is smaller than 112 qu, so a 112 qu high corridor (7 of 8 grid units in
+// the 16 grid, and the 8th unit used for wall/floor) just lets a player jump!
 sv_jumpvelocity 260
+sv_jumpvelocity_crouch 0
 sv_wateraccelerate -1
 sv_waterfriction -1
 sv_airaccel_sideways_friction 0
@@ -23,18 +33,21 @@ sv_airaccel_qw -0.8
 sv_airaccel_qw_stretchfactor 2
 
 sv_airstopaccelerate 3
-sv_airstrafeaccelerate 24
+sv_airstrafeaccelerate 18
 sv_maxairstrafespeed 100
 sv_airstrafeaccel_qw -0.95
-sv_aircontrol 125
-sv_aircontrol_penalty 180
+sv_aircontrol 100
+sv_aircontrol_penalty 0
 sv_aircontrol_power 2
-sv_airspeedlimit_nonqw 800
+sv_aircontrol_backwards 0
+sv_aircontrol_sidewards 0
+sv_airspeedlimit_nonqw 900
 sv_warsowbunny_turnaccel 0
 sv_warsowbunny_accel 0.1593
 sv_warsowbunny_topspeed 925
 sv_warsowbunny_backtosideratio 0.8
 sv_friction_on_land 0
+sv_friction_slick 0.5
 sv_doublejump 0
 sv_jumpspeedcap_min ""
 sv_jumpspeedcap_max ""