Require a minimum velocity for material effects, on either the object or the entity...

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index ea06430d3d686201fc76fa10c5ba65658b9207d7..1415cd8937185c0254ef0a8ddba1cfac70862c43 100644 (file)
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@ -547,6 +547,7 @@ set g_sandbox_editor_distance_spawn 200 "distance at which objects spawn in fron
 set g_sandbox_editor_distance_edit 350 "distance at which players can edit or remove objects they are looking at"
 set g_sandbox_object_scale_min 0.1 "minimum scale that objects can be set to"
 set g_sandbox_object_scale_max 2 "maximum scale that objects can be set to"
+set g_sandbox_object_matvel 50 "velocity objects must have while coliding for material effects to be applied"
 
 seta menu_sandbox_spawn_model "" // used to store the model in the input field
 seta menu_sandbox_edit_skin 0

diff --git a/qcsrc/server/autocvars.qh b/qcsrc/server/autocvars.qh
index 9082b2d25ef645f4c3b7a892c3d9ad756cbf8bd2..6a503d38c054eea2842a783b64207fa15df6d384 100644 (file)
--- a/qcsrc/server/autocvars.qh
+++ b/qcsrc/server/autocvars.qh
@@ -1204,3 +1204,4 @@ float autocvar_g_sandbox_editor_distance_spawn;
 float autocvar_g_sandbox_editor_distance_edit;
 float autocvar_g_sandbox_object_scale_min;
 float autocvar_g_sandbox_object_scale_max;
+float autocvar_g_sandbox_object_matvel;

diff --git a/qcsrc/server/mutators/sandbox.qc b/qcsrc/server/mutators/sandbox.qc
index 005cbb6a102bbf29d4ea5866bc865aeeb7abd19f..af39b1554b416fa88619531aef7d884da11ee68c 100644 (file)
--- a/qcsrc/server/mutators/sandbox.qc
+++ b/qcsrc/server/mutators/sandbox.qc
@@ -30,6 +30,9 @@ void sandbox_EditObject_Scale(entity e, float f)
 
 void sandbox_Object_Touch()
 {
+       if not(vlen(self.velocity) >= autocvar_g_sandbox_object_matvel || vlen(other.velocity) >= autocvar_g_sandbox_object_matvel)
+               return;
+
        switch(self.material)
        {
                case MATERIAL_METAL: