Merge branch 'master' into Mario/rifle_arena

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

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index 66ac0b20b23ce711a0efa48b3f022781676ecbe1..3428112b113964db8af748dd7c1aa182bfde10d8 100644 (file)
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@ -463,10 +463,12 @@ set sv_dodging_wall_dodging 0 "set to 1 to allow dodging off walls. 0 to disable
 set sv_dodging_delay 0.5 "determines how long a player has to wait to be able to dodge again after dodging"
 set sv_dodging_up_speed 200 "the jump velocity of the dodge"
 set sv_dodging_horiz_speed 400 "the horizontal velocity of the dodge"
+set sv_dodging_horiz_speed_frozen 200 "the horizontal velocity of the dodge (while frozen)"
 set sv_dodging_ramp_time 0.1 "a ramp so that the horizontal part of the dodge is added smoothly (seconds)"
 set sv_dodging_height_threshold 10 "the maximum height above ground where to allow dodging"
 set sv_dodging_wall_distance_threshold 10 "the maximum distance from a wall that still allows dodging"
 set sv_dodging_sound 1 "if 1 dodging makes a sound. if 0 dodging is silent"
+set sv_dodging_frozen 0 "allow dodging while frozen"
 
 set g_spawn_alloweffects 1 "allow clients to enable spawn point and event effects such as particles and sounds, see cl_spawn_ cvars for more info"
 set g_spawn_furthest 1 "this amount of the spawns shall be far away from any players"
@@ -1601,3 +1603,21 @@ set cl_weapon_stay_color "2 0.5 0.5" "Color of picked up weapons when g_weapon_s
 set cl_weapon_stay_alpha 0.75 "Alpha of picked up weapons when g_weapon_stay > 0"
 
 seta g_superspectate 0 "server side, allows extended spectator functions through the cmd interface. followpowerup, followstrength, followstshield or followfc [red|blue] will transfer spectation to the relevent player, if any"
+
+set g_riflearena 0
+set g_riflearena_nades 1
+set g_riflearena_nade_lifetime 3.5
+set g_riflearena_nade_damage 225
+set g_riflearena_nade_edgedamage 90
+set g_riflearena_nade_radius 300
+set g_riflearena_nade_force 650
+set g_riflearena_nade_health 25
+set g_riflearena_nade_newton_style 0
+set g_riflearena_nade_minforce 400
+set g_riflearena_nade_maxforce 2000
+set g_riflearena_nade_refire 6
+set g_riflearena_rifle_secondary_spread 0
+set g_riflearena_rifle_secondary_shots 1
+set g_riflearena_rifle_secondary_animtime 0.15
+set g_riflearena_rifle_secondary_refire 0.15
+set g_riflearena_rifle_secondary_damage 40