From 188257cdeed2eb77064914ef05ba1554df3a41a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lilian=20J=C3=B3nsd=C3=B3ttir?= Date: Sat, 12 Sep 2020 13:58:53 -0700 Subject: [PATCH] slight refactor --- MWSE/mods/celediel/Keyboard Layout Changer/common.lua | 6 ++---- MWSE/mods/celediel/Keyboard Layout Changer/main.lua | 9 ++++++++- MWSE/mods/celediel/Keyboard Layout Changer/mcm.lua | 11 ++++++++--- 3 files changed, 18 insertions(+), 8 deletions(-) diff --git a/MWSE/mods/celediel/Keyboard Layout Changer/common.lua b/MWSE/mods/celediel/Keyboard Layout Changer/common.lua index d501687..1764e66 100644 --- a/MWSE/mods/celediel/Keyboard Layout Changer/common.lua +++ b/MWSE/mods/celediel/Keyboard Layout Changer/common.lua @@ -15,16 +15,14 @@ function this.log(str) mwse.log("[%s] %s", this.modName, str) end function this.changedLayout(layout) local changed = false + if keys[layout] and (#keys[layout].lowercase == 256 and #keys[layout].uppercase == 256) then -- Thanks NullCascade mwse.memory.writeBytes({address = 0x775148, bytes = keys[layout].lowercase}) mwse.memory.writeBytes({address = 0x775248, bytes = keys[layout].uppercase}) changed = true - else - local message = "Bad keys.lua file, please re-install." - this.log(message) - tes3.messageBox(string.format("(%s) %s", this.modName, message)) end + return changed end diff --git a/MWSE/mods/celediel/Keyboard Layout Changer/main.lua b/MWSE/mods/celediel/Keyboard Layout Changer/main.lua index 283b063..05ac5ad 100644 --- a/MWSE/mods/celediel/Keyboard Layout Changer/main.lua +++ b/MWSE/mods/celediel/Keyboard Layout Changer/main.lua @@ -2,9 +2,16 @@ local common = require("celediel.Keyboard Layout Changer.common") local config = require("celediel.Keyboard Layout Changer.config").getConfig() local function onInitialized() + local message = "" + if common.changedLayout(config.keyboardLayout) then - common.log("Changed layout to " .. config.keyboardLayout) + message = "Changed layout to " .. config.keyboardLayout + else + message = "Bad keys.lua file, please re-install." + tes3.messageBox(string.format("(%s) %s", common.modName, message)) end + + common.log(message) end event.register("initialized", onInitialized) diff --git a/MWSE/mods/celediel/Keyboard Layout Changer/mcm.lua b/MWSE/mods/celediel/Keyboard Layout Changer/mcm.lua index ebbe209..83c03be 100644 --- a/MWSE/mods/celediel/Keyboard Layout Changer/mcm.lua +++ b/MWSE/mods/celediel/Keyboard Layout Changer/mcm.lua @@ -25,11 +25,16 @@ local function createOptions() end local function applyLayout() + local message = "" + if common.changedLayout(config.keyboardLayout) then - local message = "Changed layout to " .. config.keyboardLayout - tes3.messageBox(message) - common.log(message) + message = "Changed layout to " .. config.keyboardLayout + else + message = "Bad keys.lua file, length must be 256." end + + tes3.messageBox(message) + common.log(message) end local template = mwse.mcm.createTemplate(common.modName)