preattack -> fire

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index 603f9980ff4504c319b73dc6b99c3d56e34826fa..2fe6bb36a532ec322db88f4ec1713b8eff9ea645 100644 (file)
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@ -958,8 +958,8 @@ bind 8 "impulse 8"
 bind 9 "impulse 9"
 bind 0 "impulse 14" // cycles the superweapons
 bind q weaplast
 bind 9 "impulse 9"
 bind 0 "impulse 14" // cycles the superweapons
 bind q weaplast

-bind MOUSE1 +preattack
-bind MOUSE2 +preattack2
+bind MOUSE1 +fire
+bind MOUSE2 +fire2

 bind MOUSE3 +zoom
 bind MOUSE4 weaplast
 bind MOUSE5 +hook
 bind MOUSE3 +zoom
 bind MOUSE4 weaplast
 bind MOUSE5 +hook


@@ -993,8 +993,8 @@ bind JOY1 "+crouch"
 bind JOY2 "+jump"
 bind JOY3 "weapprev"
 bind JOY4 "weapnext"
 bind JOY2 "+jump"
 bind JOY3 "weapprev"
 bind JOY4 "weapnext"

-bind JOY5 "+preattack2"
-bind JOY6 "+preattack"
+bind JOY5 "+fire2"
+bind JOY6 "+fire"

 bind JOY7 "+zoom"
 bind JOY8 "dropweapon"
 bind JOY9 "menu_showteamselect"
 bind JOY7 "+zoom"
 bind JOY8 "dropweapon"
 bind JOY9 "menu_showteamselect"


@@ -1537,17 +1537,17 @@ alias gl_flashblend_update "_gl_flashblend_update_$r_shadow_realtime_dlight$r_sh
 // this script allows swapping the primary and secondary fire buttons for any weapon, using the cl_swapattacks_* cvars.
 // 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
 // this script allows swapping the primary and secondary fire buttons for any weapon, using the cl_swapattacks_* cvars.
 // 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 preattack_last 0
-set preattack2_last 0
-alias +preattack "firing_swap_apply $firing_lastweapon; set preattack_last 1; +checkattack"
-alias -preattack "set preattack_last 0; -checkattack"
-alias +preattack2 "firing_swap_apply $firing_lastweapon; set preattack2_last 1; +checkattack2"
-alias -preattack2 "set preattack2_last 0; -checkattack2"
+set fire_last 0
+set fire2_last 0
+alias +fire "firing_swap_apply $firing_lastweapon; set fire_last 1; +checkattack"
+alias -fire "set fire_last 0; -checkattack"
+alias +fire2 "firing_swap_apply $firing_lastweapon; set fire2_last 1; +checkattack2"
+alias -fire2 "set fire2_last 0; -checkattack2"

 alias firing_switch_attack_0 ""
 alias firing_switch_attack2_0 ""
 alias firing_switch_attack_0 ""
 alias firing_switch_attack2_0 ""

-alias firing_switch_attack_1 "+preattack"
-alias firing_switch_attack2_1 "+preattack2"
-alias firing_switch "-preattack; -preattack2; firing_switch_attack_$preattack_last; firing_switch_attack2_$preattack2_last;"
+alias firing_switch_attack_1 "+fire"
+alias firing_switch_attack2_1 "+fire2"
+alias firing_switch "-fire; -fire2; firing_switch_attack_$fire_last; firing_switch_attack2_$fire2_last;"

 // now apply changes to the key binds and get the weapon we are using
 alias firing_decision_0 "alias +checkattack +attack; alias -checkattack -attack; alias +checkattack2 +attack2; alias -checkattack2 -attack2"
 alias firing_decision_1 "alias +checkattack +attack2; alias -checkattack -attack2; alias +checkattack2 +attack; alias -checkattack2 -attack"
 // now apply changes to the key binds and get the weapon we are using
 alias firing_decision_0 "alias +checkattack +attack; alias -checkattack -attack; alias +checkattack2 +attack2; alias -checkattack2 -attack2"
 alias firing_decision_1 "alias +checkattack +attack2; alias -checkattack -attack2; alias +checkattack2 +attack; alias -checkattack2 -attack"

diff --git a/keybinds.txt b/keybinds.txt
index d4c35123aeddf0f3c2c5a5c66b34cf4a94981b20..028547ac27ac68b76f66c1c3696228247888e659 100644 (file)
--- a/keybinds.txt
+++ b/keybinds.txt
@@ -8,8 +8,8 @@
 "+hook"                                 "off-hand hook / jet pack"
 ""                                      ""
 ""                                      "Attacking"
 "+hook"                                 "off-hand hook / jet pack"
 ""                                      ""
 ""                                      "Attacking"

-"+preattack"                            "primary fire"
-"+preattack2"                           "secondary fire"
+"+fire"                                 "primary fire"
+"+fire2"                                "secondary fire"

 ""                                      ""
 ""                                      "Weapon switching"
 "weapprev"                              "previous"
 ""                                      ""
 ""                                      "Weapon switching"
 "weapprev"                              "previous"