From 3898289f57cb89b4185153772f972b7e50407aad Mon Sep 17 00:00:00 2001
From: Raimon Zamora <jaildoctor@gmail.com>
Date: Sat, 21 Jan 2023 14:29:50 +0100
Subject: [PATCH] - Now Up and Jump can be defined as different keys/buttons.

---
 data/abad.lua |  4 ++--
 data/game.lua | 16 ++++++++++++++++
 data/main.lua |  2 ++
 3 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/data/abad.lua b/data/abad.lua
index 677f877..45db2a6 100644
--- a/data/abad.lua
+++ b/data/abad.lua
@@ -87,7 +87,7 @@ function abad_state_normal()
     elseif btn(keyLeft) or pad(btnLeft) then
         abad.update=abad_state_walking
         abad.flip=true
-    elseif btn(keyUp) or pad(btnUp) then
+    elseif btn(keyJump) or pad(btnJump) then
         abad.update=abad_state_jumping
         abad.step=0
         abad.jumpfwd=false
@@ -185,7 +185,7 @@ function abad_state_walking()
 
     abad_make_safe()
 
-    if btn(keyUp) or pad(btnUp) then
+    if btn(keyJump) or pad(btnJump) then
         abad.update=abad_state_jumping
         abad.step=0
         abad.jumpfwd=true
diff --git a/data/game.lua b/data/game.lua
index 573d4b1..16defe9 100644
--- a/data/game.lua
+++ b/data/game.lua
@@ -436,6 +436,14 @@ function update_menu()
                 setconf("keyright", keyRight)
             end
         elseif menu_count==4 then
+            text("PULSA TECLA PER A BOTAR", 20, 24, 13)
+            local key = btnp();
+            if key ~= 0 and key~=KEY_ESCAPE then
+                menu_count = 5
+                keyJump=key
+                setconf("keyjump", keyJump)
+            end
+        elseif menu_count==5 then
             text("PULSA TECLA PER A DISPAR", 18, 24, 13)
             local key = btnp();
             if key ~= 0 and key~=KEY_ESCAPE then
@@ -483,6 +491,14 @@ function update_menu()
                 setconf("btnright", btnRight)
             end
         elseif menu_count==4 then
+            text("PULSA BOTÓ PER A BOTAR", 22, 24, 13)
+            local btn = padp();
+            if btn ~= -1 then
+                menu_count = 5
+                btnJump=btn
+                setconf("btnjump", btnJump)
+            end
+        elseif menu_count==5 then
             text("PULSA BOTÓ PER A DISPAR", 20, 24, 13)
             local btn = padp();
             if btn ~= -1 then
diff --git a/data/main.lua b/data/main.lua
index beb1756..8ffbdfa 100644
--- a/data/main.lua
+++ b/data/main.lua
@@ -29,12 +29,14 @@ function _init()
     keyDown = tonumber(getconf("keydown")) or KEY_DOWN
     keyLeft = tonumber(getconf("keyleft")) or KEY_LEFT
     keyRight = tonumber(getconf("keyright")) or KEY_RIGHT
+    keyJump = tonumber(getconf("keyjump")) or KEY_UP
     keyShoot = tonumber(getconf("keyshoot")) or KEY_SPACE
 
     btnUp = tonumber(getconf("btnup")) or  BTN_UP
     btnDown = tonumber(getconf("btndown")) or  BTN_DOWN
     btnLeft = tonumber(getconf("btnleft")) or  BTN_LEFT
     btnRight = tonumber(getconf("btnright")) or  BTN_RIGHT
+    btnJump = tonumber(getconf("btnjump")) or  BTN_UP
     btnShoot = tonumber(getconf("btnshoot")) or  BTN_A
 
     --game_init()