From f4f2cb9f608de3ba8145d0c29d34ccbb9e4be1b8 Mon Sep 17 00:00:00 2001 From: LukeeGD Date: Fri, 29 May 2020 13:00:09 +0800 Subject: [PATCH] Update keys and stuff --- game/conf.lua | 6 ++++++ game/ddlclove/main.lua | 8 ++++++++ game/ddlclove/menu.lua | 8 ++++++-- game/ddlclove/states/game.lua | 6 +++--- game/ddlclove/states/poemgame.lua | 2 +- game/scripts/eng/text.lua | 12 ++++++------ game/scripts/event.lua | 4 ++-- game/scripts/spa/text.lua | 12 ++++++------ 8 files changed, 38 insertions(+), 20 deletions(-) diff --git a/game/conf.lua b/game/conf.lua index e47b4bcc..645d41a5 100644 --- a/game/conf.lua +++ b/game/conf.lua @@ -1,3 +1,9 @@ function love.conf(t) t.identity = 'DDLC-LOVE' end + +lv1luaconf = { + keyconf = "SE", + imgscale = false, + resscale = true +} diff --git a/game/ddlclove/main.lua b/game/ddlclove/main.lua index efe91caf..937fbafe 100644 --- a/game/ddlclove/main.lua +++ b/game/ddlclove/main.lua @@ -23,6 +23,14 @@ function love.gamepadpressed(joy, button) button = 'left' elseif button == 'dpright' then button = 'right' + elseif button == 'a' then + button = 'b' + elseif button == 'b' then + button = 'a' + elseif button == 'x' then + button = 'y' + elseif button == 'y' then + button = 'x' end love.keypressed(button) end diff --git a/game/ddlclove/menu.lua b/game/ddlclove/menu.lua index 646cd174..11318688 100644 --- a/game/ddlclove/menu.lua +++ b/game/ddlclove/menu.lua @@ -215,9 +215,13 @@ function menu_draw() lg.print(menutext,140,90) local keys = {} if global_os == 'LOVE-WrapLua' then - keys = {'Cross, L','Circle','Square','Triangle','R','Select'} + if not lv1lua.confirm then + keys = {'Cross, (L)','Circle','Square','Triangle','Start','Select'} + else + keys = {'Circle, (L)','Cross','Triangle','Square','Start','Select'} + end else - keys = {'A','B','X','Y','Plus','Minus'} + keys = {'(A), (L)','(B)','(X)','(Y)','(+)','(-)'} end lgsetColor(0,0,0) lg.print('Key Bindings:',160,120) diff --git a/game/ddlclove/states/game.lua b/game/ddlclove/states/game.lua index bebd7714..509dfb9f 100644 --- a/game/ddlclove/states/game.lua +++ b/game/ddlclove/states/game.lua @@ -126,7 +126,7 @@ function game_keypressed(key) end function newgame_keypressed(key) - if (key == 'a' or key == 'lbutton') and unitimer >= uniduration then + if (key == 'a' or key == 'leftshoulder') and unitimer >= uniduration then textboxd = true if print_full_text then autotimer = 0 @@ -138,9 +138,9 @@ function newgame_keypressed(key) end collectgarbage() collectgarbage() - elseif key == 'r' or key == 'rbutton' or key == 'plus' then + elseif key == '=' or key == 'start' then textboxd = not textboxd - elseif key == 'minus' or key == '-' or key == 'select' then + elseif key == '-' or key == 'back' then if settings.o ~= 1 then settings.o = 1 else settings.o = 0 end end diff --git a/game/ddlclove/states/poemgame.lua b/game/ddlclove/states/poemgame.lua index af1946ba..83e3b3a1 100644 --- a/game/ddlclove/states/poemgame.lua +++ b/game/ddlclove/states/poemgame.lua @@ -392,7 +392,7 @@ function poemgamekeypressed(key) menuselect() end - if key == 'a' or key == 'lbutton' then + if key == 'a' or key == 'leftshoulder' then if xaload >= 35 then if poemstate == 0 then poemstate = nil diff --git a/game/scripts/eng/text.lua b/game/scripts/eng/text.lua index d4f4015c..4cd0a392 100644 --- a/game/scripts/eng/text.lua +++ b/game/scripts/eng/text.lua @@ -55,11 +55,11 @@ tr.splash = { } tr.menuitem = {'Yes','No','Delete ','Restore All'} tr.menuhelp = { - ' - Advances through the game, activates menu choices', - ' - Exit Menu, Auto-Forward On/Off', - ' - (Menu) Previous Page, Skipping On/Off', - ' - (Menu) Next Page, Enter Game Menu', - ' - Show/hide text window', + ' : Advances through the game, activates menu choices', + ' : Exit Menu, Auto-Forward On/Off', + ' : (Menu) Previous Page, Skipping On/Off', + ' : (Menu) Next Page, Enter Game Menu', + ' : Show/hide text window', 'Managing files: Go to Settings > Characters', [[ Deleting save data: Delete the save folder: @@ -108,7 +108,7 @@ tr.menuhelp = { me?will you promise to spend the most time with me?will you promise to spend the most time with ]], - ' - Toggle text outline' + ' : Toggle text outline' } tr.error = { 'Press Y/Triangle to quit', diff --git a/game/scripts/event.lua b/game/scripts/event.lua index 0c93c7f2..c587458a 100644 --- a/game/scripts/event.lua +++ b/game/scripts/event.lua @@ -149,7 +149,7 @@ function event_next() end function event_keypressed(key) - if ((textbox_enabled and event_type ~= 'show_vignette') or (event_type == 'yuri_eyes' and cl < 700)) and (key == 'a' or key == 'lbutton') then + if ((textbox_enabled and event_type ~= 'show_vignette') or (event_type == 'yuri_eyes' and cl < 700)) and (key == 'a' or key == 'leftshoulder') then newgame_keypressed('a') elseif key == 'y' and event_type == 'ch23-30' then menu_mchance = math.random(1,50) @@ -161,7 +161,7 @@ function event_keypressed(key) elseif key == 'b' and event_type == 'ch23-30' and chapter == 30 then --auto sfx1:play() if autotimer == 0 then autotimer = 0.01 else autotimer = 0 end - elseif (key == 'minus' or key == '-' or key == 'select') and event_type == 'ch23-30' then + elseif (key == '-' or key == 'back') and event_type == 'ch23-30' then if settings.o ~= 1 then settings.o = 1 else settings.o = 0 end end diff --git a/game/scripts/spa/text.lua b/game/scripts/spa/text.lua index 91018694..22e58ce6 100644 --- a/game/scripts/spa/text.lua +++ b/game/scripts/spa/text.lua @@ -55,11 +55,11 @@ tr.splash = { } tr.menuitem = {'Sí','No','Borrar ','Restaurar todo'} tr.menuhelp = { - ' - Avanzas en el juego, seleccionas alguna opción en las elecciones', - ' - Te sales del menú, activas o desactivas el modo automático', - ' - (Menú) Página anterior, activas o desactivas el modo saltar', - ' - (Menú) Página siguiente, entras en el menú del juego', - ' - Muestra o oculta la ventana de diálogos', + ' : Avanzas en el juego, seleccionas alguna opción en las elecciones', + ' : Te sales del menú, activas o desactivas el modo automático', + ' : (Menú) Página anterior, activas o desactivas el modo saltar', + ' : (Menú) Página siguiente, entras en el menú del juego', + ' : Muestra o oculta la ventana de diálogos', 'Configurar archivos: Vete a ajustes > Characters', [[ Borrar los datos guardados: Para borrar los datos guardados tienes que ir a la siguiente ruta: @@ -158,7 +158,7 @@ tr.menuhelp = { club sea un lugar más íntimo para todos. Como veo que eres un amorcito, ¿me prometes que pasarás la mayor parte del tiempo conmigo? ]], - ' - Mostrar sombreado del texto' + ' : Mostrar sombreado del texto' } tr.error = { 'Pulsa Y/Triangulo para salir',