From: TimePath <andrew.hardaker1995@gmail.com>
Date: Thu, 27 Nov 2014 01:28:36 +0000 (+1100)
Subject: Rename weapon aliases, retain backwards compatibility with aliases
X-Git-Tag: xonotic-v0.8.0~137^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=132af39c3a1b59961f8720c38c5e53ecad372d9a;p=xonotic%2Fxonotic-data.pk3dir.git

Rename weapon aliases, retain backwards compatibility with aliases
---

diff --git a/hook-firing_swap.cfg b/hook-firing_swap.cfg
index 4ed138120..919d2ead2 100644
--- a/hook-firing_swap.cfg
+++ b/hook-firing_swap.cfg
@@ -9,18 +9,18 @@
 // after exec'ing them all from your autoexec.cfg
 
 // Set the cvars for each gun
-seta cl_swapattacks_laser 0
+seta cl_swapattacks_blaster 0
 seta cl_swapattacks_shotgun 0
-seta cl_swapattacks_uzi 0
-seta cl_swapattacks_grenadelauncher 0
+seta cl_swapattacks_machinegun 0
+seta cl_swapattacks_mortar 0
 seta cl_swapattacks_minelayer 0
 seta cl_swapattacks_electro 0
 seta cl_swapattacks_crylink 0
-seta cl_swapattacks_nex 0
+seta cl_swapattacks_vortex 0
 seta cl_swapattacks_hagar 0
-seta cl_swapattacks_rocketlauncher 0
+seta cl_swapattacks_devastator 0
 seta cl_swapattacks_porto 0
-seta cl_swapattacks_minstanex 0
+seta cl_swapattacks_vaporizer 0
 seta cl_swapattacks_hook 0
 seta cl_swapattacks_hlac 0
 seta cl_swapattacks_tuba 0
@@ -28,6 +28,14 @@ seta cl_swapattacks_rifle 0
 seta cl_swapattacks_fireball 0
 seta cl_swapattacks_seeker 0
 
+// Backwards compatibility with 0.7.0
+alias cl_swapattacks_laser $cl_swapattacks_blaster
+alias cl_swapattacks_rocketlauncher $cl_swapattacks_devastator
+alias cl_swapattacks_uzi $cl_swapattacks_machinegun
+alias cl_swapattacks_grenadelauncher $cl_swapattacks_mortar
+alias cl_swapattacks_minstanex $cl_swapattacks_vaporizer
+alias cl_swapattacks_nex $cl_swapattacks_vortex
+
 // This part of the code is necessary to keep us firing when we switch weapons while holding a fire button pressed
 // Also updates the keys before firing, so we don't have to switch to another weapon and back to apply the changes
 set fire_last 0
@@ -48,7 +56,7 @@ alias firing_decision_1 "alias +checkattack +attack2; alias -checkattack -attack
 alias firing_swap_apply "firing_decision_${$1}"
 alias firing_swap "firing_swap_apply cl_swapattacks_$1; set firing_lastweapon cl_swapattacks_$1; firing_switch"
 
-// Not correct, but prevents firing from braking after executing the script until switching weapons
+// Not correct, but prevents firing from breaking after executing the script until switching weapons
 alias +fire +attack
 alias -fire -attack
 alias +fire2 +attack2
diff --git a/weapons.cfg b/weapons.cfg
index 80305a5fe..95b9ddf51 100644
--- a/weapons.cfg
+++ b/weapons.cfg
@@ -1,18 +1,28 @@
-alias weapon_laser "impulse 230"
+alias weapon_blaster "impulse 230"
 alias weapon_shotgun "impulse 231"
-alias weapon_uzi "impulse 232"
-alias weapon_grenadelauncher "impulse 233"
+alias weapon_machinegun "impulse 232"
+alias weapon_mortar "impulse 233"
 alias weapon_minelayer "impulse 234"
 alias weapon_electro "impulse 235"
 alias weapon_crylink "impulse 236"
-alias weapon_nex "impulse 237"
+alias weapon_vortex "impulse 237"
 alias weapon_hagar "impulse 238"
-alias weapon_rocketlauncher "impulse 239"
+alias weapon_devastator "impulse 239"
 alias weapon_porto "impulse 240"
-alias weapon_minstanex "impulse 241"
+alias weapon_vaporizer "impulse 241"
 alias weapon_hook "impulse 242"
 alias weapon_hlac "impulse 243"
 alias weapon_tuba "impulse 244"
 alias weapon_rifle "impulse 245"
 alias weapon_fireball "impulse 246"
 alias weapon_seeker "impulse 247"
+alias weapon_shockwave "impulse 248"
+alias weapon_arc "impulse 249"
+
+// Backwards compatibility with 0.7.0
+alias weapon_laser "weapon_blaster"
+alias weapon_uzi "weapon_machinegun"
+alias weapon_grenadelauncher "weapon_grenadelauncher"
+alias weapon_nex "weapon_vortex"
+alias weapon_rocketlauncher "weapon_devestator"
+alias weapon_minstanex "weapon_vaporizer"