Corrections and documentation for physicsCPMA.cfg and physicsQ3.cfg

Adds sv_track_canjump to configs that lacked it.

diff --git a/physicsCPMA.cfg b/physicsCPMA.cfg
index 30a18cab993a223fbb779e3a3febefdc3043d58e..e2e45d41046b438db62e8ed03d729170fe75d971 100644 (file)
--- a/physicsCPMA.cfg
+++ b/physicsCPMA.cfg
@@ -1,13 +1,21 @@
 g_mod_physics CPMA
 // these values match CPMA
 
-sv_gravity 800
+// CPMA uses gravity 800 but the strength of Q3 gravity is frametime-dependent.
+// This number simulates 125fps Q3 gravity and was calculated by measuring jump height
+// by adding debug prints to Q3.  An average of 24 samples gave the height 48.138171516
+// which was used to calculate this gravity with the formula in physicsX.cfg
+// Modern CPMA has frametime-independent physics that ~match 125fps frametime-dependent.
+// DeFRaG still has frametime-dependent physics and DFWC rules mandate 125fps.
+sv_gravity 757.195357698
 sv_maxspeed 320
 sv_maxairspeed 320
 sv_stopspeed 100
 sv_accelerate 15
 sv_airaccelerate 1
-sv_friction 8
+// The cpm1_dev_docs.zip (only CPMA source code release) used friction 8,
+// but friction is 6 in all ~modern CPMA releases, and in DeFRaG CPM.
+sv_friction 6
 edgefriction 1
 sv_stepheight 18
 sv_jumpvelocity 270
@@ -34,10 +42,13 @@ sv_warsowbunny_backtosideratio 0.8
 sv_friction_on_land 0
 sv_friction_slick 0
 sv_doublejump 0
-sv_jumpspeedcap_min ""
+// match the downhill ramp jumping behaviour of CPMA
+sv_jumpspeedcap_min 0
 sv_jumpspeedcap_max ""
-sv_jumpspeedcap_max_disable_on_ramps 0
+// CPMA has ramp jumping
+sv_jumpspeedcap_max_disable_on_ramps 1
+// FIXME: Q3 teleporters _set_ speed to 400, not cap it
 g_teleport_maxspeed 400
-sv_track_canjump 0
+sv_track_canjump 1
 sv_gameplayfix_stepdown_maxspeed 0
 g_movement_highspeed_q3_compat 1

diff --git a/physicsOverkill.cfg b/physicsOverkill.cfg
index be6ea49633831011627d7976ff60ca5d00a1c27e..aa97fb15b4882198f22757aea2be809eca3e5a08 100644 (file)
--- a/physicsOverkill.cfg
+++ b/physicsOverkill.cfg
@@ -52,5 +52,6 @@ sv_jumpspeedcap_min ""
 sv_jumpspeedcap_max ""
 sv_jumpspeedcap_max_disable_on_ramps 1
 g_teleport_maxspeed 0
+sv_track_canjump 0
 sv_gameplayfix_stepdown_maxspeed 400
 g_movement_highspeed_q3_compat 0

diff --git a/physicsQ3.cfg b/physicsQ3.cfg
index 76ee484ec6261c15864e660e499ee7806e6583df..a8911b7397327bb1f5e1a47394564173a7c3c67c 100644 (file)
--- a/physicsQ3.cfg
+++ b/physicsQ3.cfg
@@ -1,7 +1,8 @@
 g_mod_physics Q3
 // these values match Quake3
 
-sv_gravity 800
+// See physicsCPMA.cfg for the source of this sv_gravity
+sv_gravity 757.195357698
 sv_maxspeed 320
 sv_maxairspeed 320
 sv_stopspeed 100
@@ -17,8 +18,8 @@ sv_waterfriction 1
 sv_airaccel_sideways_friction 0
 sv_airaccel_qw 1
 sv_airaccel_qw_stretchfactor 0
-sv_airstopaccelerate 0
-sv_airstrafeaccelerate 0
+sv_airstopaccelerate 1
+sv_airstrafeaccelerate 1
 sv_maxairstrafespeed 0
 sv_airstrafeaccel_qw 0
 sv_aircontrol 0
@@ -35,9 +36,11 @@ sv_friction_on_land 0
 sv_friction_slick 0
 sv_doublejump 0
 sv_jumpspeedcap_min ""
-sv_jumpspeedcap_max ""
+// VQ3 has no ramp jumping
+sv_jumpspeedcap_max 270
 sv_jumpspeedcap_max_disable_on_ramps 0
-g_teleport_maxspeed 320
-sv_track_canjump 0
+// FIXME: Q3 teleporters _set_ speed to 400, not cap it
+g_teleport_maxspeed 400
+sv_track_canjump 1
 sv_gameplayfix_stepdown_maxspeed 0
-g_movement_highspeed_q3_compat 0
+g_movement_highspeed_q3_compat 1

diff --git a/physicsX.cfg b/physicsX.cfg
index 252c2e7e9bc044d6806ea7e7ae596afac22eab26..21ded2a8c859376b438e9b49d7db39e7393bd3b3 100644 (file)
--- a/physicsX.cfg
+++ b/physicsX.cfg
@@ -53,5 +53,6 @@ sv_jumpspeedcap_min ""
 sv_jumpspeedcap_max ""
 sv_jumpspeedcap_max_disable_on_ramps 1
 g_teleport_maxspeed 0
+sv_track_canjump 0
 sv_gameplayfix_stepdown_maxspeed 400
 g_movement_highspeed_q3_compat 0

diff --git a/physicsX010.cfg b/physicsX010.cfg
index 8b81ca0421b71b4c5f9225313ed8a4559571cb0d..e350037e60e2da0591270e83014e2c1fcfc6595e 100644 (file)
--- a/physicsX010.cfg
+++ b/physicsX010.cfg
@@ -46,5 +46,6 @@ sv_jumpspeedcap_min ""
 sv_jumpspeedcap_max ""
 sv_jumpspeedcap_max_disable_on_ramps 1
 g_teleport_maxspeed 0
+sv_track_canjump 0
 sv_gameplayfix_stepdown_maxspeed 400
 g_movement_highspeed_q3_compat 0

diff --git a/physicsX07.cfg b/physicsX07.cfg
index aa582bd991ddad8e5dac2cae8ef7ba86aaeaa6f3..c7c2250e7c91a74f47cc64a8f6600f2a2f39464c 100644 (file)
--- a/physicsX07.cfg
+++ b/physicsX07.cfg
@@ -52,5 +52,6 @@ sv_jumpspeedcap_min ""
 sv_jumpspeedcap_max ""
 sv_jumpspeedcap_max_disable_on_ramps 1
 g_teleport_maxspeed 0
+sv_track_canjump 0
 sv_gameplayfix_stepdown_maxspeed 400
 g_movement_highspeed_q3_compat 0

diff --git a/physicsXDF.cfg b/physicsXDF.cfg
index 8bbe28eaa41d1807e79c4e6dcd4f7ac3c38e00cc..1436bbdcb85bd00952a04855674d21957a779820 100644 (file)
--- a/physicsXDF.cfg
+++ b/physicsXDF.cfg
@@ -44,6 +44,7 @@ sv_jumpspeedcap_min 0
 sv_jumpspeedcap_max 0.5
 sv_jumpspeedcap_max_disable_on_ramps 1
 g_teleport_maxspeed 600
+sv_track_canjump 0
 sv_gameplayfix_stepdown_maxspeed 400
 // needed for correct q3 haste simulation
 g_movement_highspeed_q3_compat 1

diff --git a/physicsXDFLight.cfg b/physicsXDFLight.cfg
index dd657afaf71a97178c029cb38b957a4874dbd31b..1c86e786d1051d79643a7d0199ff4669421f7674 100644 (file)
--- a/physicsXDFLight.cfg
+++ b/physicsXDFLight.cfg
@@ -44,5 +44,6 @@ sv_jumpspeedcap_min ""
 sv_jumpspeedcap_max ""
 sv_jumpspeedcap_max_disable_on_ramps 1
 g_teleport_maxspeed 0
+sv_track_canjump 0
 sv_gameplayfix_stepdown_maxspeed 400
 g_movement_highspeed_q3_compat 0