From: Martin Taibr <taibr.martin@gmail.com>
Date: Sun, 18 Aug 2019 16:34:13 +0000 (+0200)
Subject: improve description for apropos, remove repeated descriptions
X-Git-Tag: xonotic-v0.8.5~1274^2~3
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=0ae17929fade051984a1c76e49f86f36263e79b1;p=xonotic%2Fxonotic-data.pk3dir.git

improve description for apropos, remove repeated descriptions
---

diff --git a/ruleset-XDF.cfg b/ruleset-XDF.cfg
index a0cc24b7b..843347eca 100644
--- a/ruleset-XDF.cfg
+++ b/ruleset-XDF.cfg
@@ -15,8 +15,8 @@ g_forced_respawn 1
 g_powerups 0  // set to -1 or patch xonotic
 g_spawnpoints_auto_move_out_of_solid 1
 g_start_delay 3
-g_use_ammunition 0 "if set to 0 all weapons have unlimited ammunition"
-g_weapon_stay 1 "1: ghost weapons can be picked up too but give no ammo, 2: ghost weapons refill ammo to one pickup size, thrown guns have no ammo"
+g_use_ammunition 0
+g_weapon_stay 1
 teamplay_mode 2 // friendly fire and self damage
 sv_vote_nospectators 1
 timelimit_override 20
diff --git a/xonotic-server.cfg b/xonotic-server.cfg
index d261e262e..35a511442 100644
--- a/xonotic-server.cfg
+++ b/xonotic-server.cfg
@@ -190,7 +190,7 @@ set g_pinata 0 "if set to 1 you will not only drop your current weapon when you
 set g_weapon_stay 0 "1: ghost weapons can be picked up too but give no ammo, 2: ghost weapons refill ammo to one pickup size, thrown guns have no ammo"
 set g_weapon_throwable 1 "if set to 1, weapons can be dropped"
 set g_powerups -1 "if set to 0 the strength and shield (invincibility) will not spawn on the map, if 1 they will spawn in all game modes, -1 is game mode default"
-set g_use_ammunition 1 "if set to 0 all weapons have unlimited ammunition"
+set g_use_ammunition 1 "if set to 0 all weapons have unlimited ammo"
 set g_pickup_items -1 "if set to 0 all items (health, armor, ammo, weapons...) are removed from the map, if 1 they are forced to spawn"
 set g_pickup_respawntime_scaling_reciprocal 0 "Multiply respawn time by `reciprocal / (p + offset) + linear` where `p` is the current number of players, takes effect with 2 or more players present, `reciprocal` (with `offset` and `linear` set to 0) can be used to achieve a constant number of items spawned *per player*"
 set g_pickup_respawntime_scaling_offset 0 "Multiply respawn time by `reciprocal / (p + offset) + linear` where `p` is the current number of players, takes effect with 2 or more players present, `offset` offsets the curve left or right - the results are not intuitive and I recommend plotting the respawn time and the number of items per player to see what's happening"