From: Mirio <opivy@hotmail.de>
Date: Mon, 15 Apr 2019 14:19:17 +0000 (+0000)
Subject: Change Laser to Blaster and fix few cvar names
X-Git-Tag: xonotic-v0.8.5~59
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=d6527fb05f5b913353501723928070ff37c8d153;p=xonotic%2Fxonotic-maps.pk3dir.git

Change Laser to Blaster and fix few cvar names
---

diff --git a/scripts/entities.ent b/scripts/entities.ent
index e3e4e131..8b390327 100644
--- a/scripts/entities.ent
+++ b/scripts/entities.ent
@@ -1426,9 +1426,9 @@ the Hagar
 modeldisabled=&quot;models/weapons/g_hagar.md3&quot;
 </point>
 
-<point name="weapon_laser" color="1 0 .5" box="-30 -30 0 30 30 32">
-the Laser. Note that unless you use
-  settemp_for_type all g_start_weapon_laser 0
+<point name="weapon_blaster" color="1 0 .5" box="-30 -30 0 30 30 32">
+the Blaster. Note that unless you use
+  settemp_for_type all g_balance_blaster_weaponstart 0
 in your mapinfo file, everyone will already spawn with one, making this pickup useless.
 -------- KEYS --------
 <real key="respawntime" name="respawntime">time till it respawns (default: 15)</real>
@@ -1473,7 +1473,7 @@ modeldisabled=&quot;models/weapons/g_rl.md3&quot;
 
 <point name="weapon_shotgun" color="1 0 .5" box="-30 -30 0 30 30 32">
 the Shotgun. Note that unless you use
-  settemp_for_type all g_start_weapon_shotgun 0
+  settemp_for_type all g_balance_shotgun_weaponstart 0
 in your mapinfo file, everyone will already spawn with one, making this pickup useless.
 -------- KEYS --------
 <real key="ammo_shells" name="ammo_shells">initial shells of the weapon (if unset, g_pickup_shells is used)</real>
@@ -1736,7 +1736,7 @@ For the number fields, not specifying a value means not changing it. To clear ar
 You may want to target this by a race checkpoint, a teleporter, or a trigger_multiple with ALLENTS set (so it removes weapons thrown through the field to avoid getting a weapon through it).
 -------- KEYS --------
 <targetname key="targetname" name="targetname">used to trigger this</targetname>
-<string key="netname" name="netname">space separated list of items (either weapon short names (like in g_start_weapon_* cvars), or item short names &quot;unlimited_ammo&quot;, &quot;unlimited_weapon_ammo&quot;, &quot;unlimited_superweapons&quot;, &quot;invincible&quot;, &quot;strength&quot;, &quot;jetpack&quot; and &quot;fuel_regen&quot;)</string>
+<string key="netname" name="netname">space separated list of items (either weapon short names or item short names &quot;unlimited_ammo&quot;, &quot;unlimited_weapon_ammo&quot;, &quot;unlimited_superweapons&quot;, &quot;invincible&quot;, &quot;strength&quot;, &quot;jetpack&quot; and &quot;fuel_regen&quot;)</string>
 <string key="message" name="message">message to print</string>
 <real key="ammo_shells" name="ammo_shells">amount of shells</real>
 <real key="ammo_nails" name="ammo_nails">amount of bullets</real>