From 409105936058315bcece8359ec0c69e98da1b470 Mon Sep 17 00:00:00 2001 From: TimePath Date: Wed, 17 Dec 2014 20:27:34 +1100 Subject: [PATCH] Remove jetpack from input menu, jetpack/hook conflict notices --- defaultXonotic.cfg | 2 +- keybinds.txt | 2 +- keybinds.txt.de | 2 +- keybinds.txt.es | 2 +- keybinds.txt.fr | 2 +- keybinds.txt.hu | 2 +- keybinds.txt.it | 2 +- keybinds.txt.ru | 2 +- keybinds.txt.uk | 2 +- qcsrc/server/t_items.qc | 2 -- 10 files changed, 9 insertions(+), 11 deletions(-) diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg index 2939ddf98..bcfa17980 100644 --- a/defaultXonotic.cfg +++ b/defaultXonotic.cfg @@ -1087,7 +1087,7 @@ seta cl_gentle_gibs 0 "client side gentle mode (only replaces gibs); when set t seta cl_gentle_messages 0 "client side gentle mode (only replaces frag messages/centerprints)" seta cl_gentle_damage 0 "client side gentle mode (only replaces damage flash); when set to 1, a white flash replaces the blood image, when set to 2, a randomily colored flash is used instead" -set g_jetpack 0 "Jetpack mutator (uses the hook's button, can't coexist with the offhand hook, but only with the onhand one)" +set g_jetpack 0 "Jetpack mutator" set g_running_guns 0 "... or wonder, till it drives you mad, what would have followed if you had." set g_bastet 0 "don't try" diff --git a/keybinds.txt b/keybinds.txt index 0458a548f..3428f60fa 100644 --- a/keybinds.txt +++ b/keybinds.txt @@ -5,7 +5,7 @@ "+moveright" "strafe right" "+jump" "jump / swim" "+crouch" "crouch / sink" -"+hook" "off-hand hook / jet pack" +"+hook" "off-hand hook" "" "" "" "Attacking" "+fire" "primary fire" diff --git a/keybinds.txt.de b/keybinds.txt.de index 9a6d9e982..4642fdd05 100644 --- a/keybinds.txt.de +++ b/keybinds.txt.de @@ -5,7 +5,7 @@ "+moveright" "rechts" "+jump" "springen / schwimmen" "+crouch" "ducken / sinken" -"+hook" "Enterhaken / Jetpack" +"+hook" "Enterhaken" "" "" "" "Angriff" "+fire" "1. Feuermodus" diff --git a/keybinds.txt.es b/keybinds.txt.es index e7c2fd744..d0da89640 100644 --- a/keybinds.txt.es +++ b/keybinds.txt.es @@ -5,7 +5,7 @@ "+moveright" "derecha" "+jump" "saltar / nadar" "+crouch" "agacharse / bajar" -"+hook" "gancho / jet pack" +"+hook" "gancho" "" "" "" "Ataque" "+fire" "ataque primario" diff --git a/keybinds.txt.fr b/keybinds.txt.fr index 09ee3e3e7..28c2c2cc7 100644 --- a/keybinds.txt.fr +++ b/keybinds.txt.fr @@ -5,7 +5,7 @@ "+moveright" "droite" "+jump" "sauter / nager" "+crouch" "s'accroupir / couler" -"+hook" "grappin / jet pack" +"+hook" "grappin" "" "" "" "Attaque" "+fire" "tir primaire" diff --git a/keybinds.txt.hu b/keybinds.txt.hu index 53bd46c14..e42a6f78d 100644 --- a/keybinds.txt.hu +++ b/keybinds.txt.hu @@ -5,7 +5,7 @@ "+moveright" "jobbra lépés" "+jump" "ugrás / úszás" "+crouch" "guggolás / süllyedés" -"+hook" "kézi kampó / rakéta puttony" +"+hook" "kézi kampó" "" "" "" "Tüzelés" "+fire" "Elsődleges" diff --git a/keybinds.txt.it b/keybinds.txt.it index 8546bdbe8..69d9da217 100644 --- a/keybinds.txt.it +++ b/keybinds.txt.it @@ -5,7 +5,7 @@ "+moveright" "a destra" "+jump" "salta / risalire in acqua" "+crouch" "abbassarsi / scendere in acqua" -"+hook" "off-hand hook / jet pack" +"+hook" "off-hand hook" "" "" "" "Attacco" "+fire" "fuoco primario" diff --git a/keybinds.txt.ru b/keybinds.txt.ru index 3ca70768e..68cd41548 100644 --- a/keybinds.txt.ru +++ b/keybinds.txt.ru @@ -5,7 +5,7 @@ "+moveright" "вправо" "+jump" "прыжок / плыть" "+crouch" "пригнуться / погрузиться" -"+hook" "крюк / реактивный ранец" +"+hook" "крюк" "" "" "" "Нападение" "+fire" "основной огонь" diff --git a/keybinds.txt.uk b/keybinds.txt.uk index 8fc522a82..fd22526d6 100644 --- a/keybinds.txt.uk +++ b/keybinds.txt.uk @@ -5,7 +5,7 @@ "+moveright" "крок праворуч" "+jump" "стрибок / плисти нагору" "+crouch" "присідання / занурення" -"+hook" "гак / реактивний ранець" +"+hook" "гак" "" "" "" "Бій" "+fire" "основний вогонь" diff --git a/qcsrc/server/t_items.qc b/qcsrc/server/t_items.qc index 03081ff4b..de110cd47 100644 --- a/qcsrc/server/t_items.qc +++ b/qcsrc/server/t_items.qc @@ -1458,8 +1458,6 @@ void spawnfunc_item_fuel_regen(void) void spawnfunc_item_jetpack(void) { - if(g_grappling_hook) - return; // sorry, but these two can't coexist (same button); spawn fuel instead if(!self.ammo_fuel) self.ammo_fuel = g_pickup_fuel_jetpack; if(start_items & IT_JETPACK) -- 2.39.2