Merge branch 'master' into mirceakitsune/damage_effects

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

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index 75950a9cd7fec160222a90d1ef53e615d065c6b0..10595968035cd43cbeec22787751a25bb66ac547 100644 (file)
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@ -321,6 +321,13 @@ set g_telefrags_teamplay 1 "never telefrag team mates"
 set g_telefrags_avoid 1 "when teleporters have a random destination, avoid teleporting to locations where a telefrag would happen"
 set g_teleport_maxspeed 0 "maximum speed that a player can keep when going through a teleporter (if a misc_teleporter_dest also has a cap the smallest one of these will be used), 0 = don't limit, -1 = keep no speed"
 
+set cl_damageeffect 2 "enable weapon damage effects. 1 enables effects on players, 2 on players and objects"
+set cl_damageeffect_ticrate 0.05 "particles spawn rate"
+set cl_damageeffect_limit 3 "how many damages to show on a player at once (objects are limited to one effect)"
+set cl_damageeffect_lifetime 0.1 "how much a damage effect lasts, multiplied by damage amount"
+set cl_damageeffect_lifetime_min 2 "minimum lifetime a damage effect may have"
+set cl_damageeffect_lifetime_max 6 "maximum lifetime a damage effect may have"
+
 set g_respawn_ghosts 1 "if 1 dead bodies become ghosts and float away when the player respawns"
 set g_respawn_ghosts_speed 5 "the speed with which respawn ghosts float and rotate"
 set g_respawn_ghosts_maxtime 6 "maximum amount of time a respawn ghost can last, minimum time is half this value. 0 disables and ghosts fade when the body would"