Change old weapon names to new

diff --git a/scripts/entities.ent b/scripts/entities.ent
index b8208cc41f076229a50fcbe50ca64a50188b165b..db56802275db593d0cc668682bb9628ed0536480 100644 (file)
--- a/scripts/entities.ent
+++ b/scripts/entities.ent
@@ -742,7 +742,7 @@ modeldisabled="models/items/a_cells.md3"
 </point>
 
 <point name="item_rockets" color=".3 .3 1" box="-30 -30 0 30 30 32">
-Rocket Launcher, Hagar and Mortar ammo
+Devastator, Hagar and Mortar ammo
 -------- KEYS --------
 <real key="ammo_rockets" name="ammo_rockets">rockets gained by this item (if unset, g_pickup_rockets is used)</real>
 <real key="respawntime" name="respawntime">time till it respawns (default: 15)</real>
@@ -1443,7 +1443,7 @@ the Vortex
 In Instagib, this turns into an item_vaporizer_cells if no explicit item_vaporizer_cells have been placed.
 -------- KEYS --------
 <real key="ammo_cells" name="ammo_cells">initial cells of the weapon (if unset, g_pickup_cells is used)</real>
-<real key="respawntime" name="respawntime">time till it respawns (default: 15 * g_balance_nex_respawntime_modifier)</real>
+<real key="respawntime" name="respawntime">time till it respawns (default: 15 * g_balance_vortex_respawntime_modifier)</real>
 <real key="respawntimejitter" name="respawntimejitter">respawn time randomization +/- seconds (default: 0)</real>
 <integer key="team" name="team">out of items with the same value here, only one (random one) will spawn. Useful to put multiple items on one spot.</integer>
 <real key="cnt" name="cnt">weight of this item for random selection using &quot;team&quot;. Set to a lower value for items you want to see less likely.</real>
@@ -1454,8 +1454,8 @@ modeldisabled=&quot;models/weapons/g_nex.md3&quot;
 </point>
 
 <point name="weapon_devastator" color="1 0 .5" box="-30 -30 0 30 30 32">
-the Rocket Launcher
-In Instagib, this turns into an item_minst_cells if no explicit item_minst_cells have been placed.
+the Devastator
+In Instagib, this turns into an item_vaporizer_cells if no explicit item_vaporizer_cells have been placed.
 -------- KEYS --------
 <real key="ammo_rockets" name="ammo_rockets">initial rockets of the weapon (if unset, g_pickup_rockets is used)</real>
 <real key="respawntime" name="respawntime">time till it respawns (default: 15)</real>
@@ -1484,7 +1484,7 @@ in your mapinfo file, everyone will already spawn with one, making this pickup u
 modeldisabled=&quot;models/weapons/g_shotgun.md3&quot;
 </point>
 
-<point name="weapon_uzi" color="1 0 .5" box="-30 -30 0 30 30 32">
+<point name="weapon_machinegun" color="1 0 .5" box="-30 -30 0 30 30 32">
 the Machine Gun
 -------- KEYS --------
 <real key="ammo_nails" name="ammo_nails">initial bullets of the weapon (if unset, g_pickup_nails is used)</real>
@@ -1697,9 +1697,9 @@ Makes one entity follow another. Will not work with all entities.
 <flag key="LOCAL" name="LOCAL" bit="1">do not untransform the coordinates (that is, the map specifies local coordinates, not global ones). Mostly useful with ATTACH.</flag>
 </point>
 
-<point name="weapon_minstanex" color="1 0 .5" box="-30 -30 0 30 30 32">
+<point name="weapon_vaporizer" color="1 0 .5" box="-30 -30 0 30 30 32">
 Placing this entity on a map kills your cat, voids the warranty on your toaster, and makes your map an unenjoyable campers' paradise.
-the InstaGib Nex. Always kills with one shot.
+the InstaGib Vortex. Always kills with one shot.
 -------- KEYS --------
 <real key="ammo_cells" name="ammo_cells">initial cells of the weapon (if unset, g_pickup_cells is used)</real>
 <real key="respawntime" name="respawntime">time till it respawns (default: 15)</real>
@@ -1775,7 +1775,7 @@ $E.field
 $E.field+offset
 $E.field+offset+randomoffset
 where &quot;E&quot; can be self, activator, target (the entity being created/modified), killtarget, target2, target3, target4 and pusher.
-Example is a Mario-style question mark block which could throw a new weapon_nex when activated like this:
+Example is a Mario-style question mark block which could throw a new weapon_vortex when activated like this:
 {
 &quot;classname&quot; &quot;func_button&quot;
 &quot;angle&quot; &quot;-1&quot;
@@ -1789,7 +1789,7 @@ Example is a Mario-style question mark block which could throw a new weapon_nex
 &quot;classname&quot; &quot;target_spawn&quot;
 &quot;origin&quot; &quot;0 0 448&quot;
 &quot;targetname&quot; &quot;makenex&quot;
-&quot;message&quot; &quot;origin $self.origin owner $activator flags 65536 colormap $activator.colormap classname droppedweapon $ spawnfunc_weapon_nex think thrown_wep_think nextthink $time+0.5 velocity $activator.velocity velocity_z 512 movetype 3&quot;
+&quot;message&quot; &quot;origin $self.origin owner $activator flags 65536 colormap $activator.colormap classname droppedweapon $ spawnfunc_weapon_vortex think thrown_wep_think nextthink $time+0.5 velocity $activator.velocity velocity_z 512 movetype 3&quot;
 }
 -------- KEYS --------
 <targetname key="targetname" name="targetname">used to trigger this</targetname>
@@ -2542,7 +2542,7 @@ model=&quot;../xonotic-data.pk3dir/models/turrets/radiant/plasma2.md3&quot;
 </point>
 
 <point name="turret_flac" color="1 0 0" box="-32 -32 0 32 32 50">
-Only kills missiles, rockets, grenadelauncher &amp; electro secondaries to be precise.
+Only kills missiles, rockets, mortar &amp; electro secondaries to be precise.
 -------- KEYS --------
 <real key="turret_scale_damage" name="turret_scale_damage">2 = double damage, 0.5 = half</real>
 <real key="turret_scale_range" name="turret_scale_range">2 = double range, 0.5 = half</real>