From 39898fed1a9887d57040c6b11708ac31a4ac9e07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lilian=20J=C3=B3nsd=C3=B3ttir?= Date: Sat, 14 Aug 2021 12:52:15 -0700 Subject: [PATCH] get rid of mode value altogether, no longer needed --- MWSE/mods/celediel/ASinkingFeeling/common.lua | 6 ------ MWSE/mods/celediel/ASinkingFeeling/config.lua | 2 +- MWSE/mods/celediel/ASinkingFeeling/main.lua | 2 +- MWSE/mods/celediel/ASinkingFeeling/mcm.lua | 2 +- 4 files changed, 3 insertions(+), 9 deletions(-) diff --git a/MWSE/mods/celediel/ASinkingFeeling/common.lua b/MWSE/mods/celediel/ASinkingFeeling/common.lua index 82b3f0c..38b6567 100644 --- a/MWSE/mods/celediel/ASinkingFeeling/common.lua +++ b/MWSE/mods/celediel/ASinkingFeeling/common.lua @@ -10,30 +10,24 @@ this.configString = string.gsub(this.modName, "%s+", "") this.modes = { { mode = "equippedArmour", - value = 0, description = "Actors are pulled down by their combined armour class (Light = 1, Medium = 2, Heavy = 3) multiplied by a tenth of " .. "the down-pull multiplier. Default of 100 makes it impossible to surface in all heavy armour for all but the most Athletic.", }, { mode = "allEquipment", - value = 1, description = "Actors are pulled down by double the weight of all equipped gear multiplied by a hundredth of the down-pull multiplier.", }, - -- keeping these in this order but with the values unchanged is terrible and I don't care { mode = "allEquipmentNecroEdit", - value = 3, description = "Actors are pulled down by double the weight of all equipped gear multiplied by a hundredth of the down-pull multiplier, " .. "except any weight above 135 only counts 10%. Lessens the gap between the lightest and heaviest heavy armours.", }, { mode = "encumbrancePercentage", - value = 2, description = "Actors are pulled down by their encumbrance percentage multiplied by triple the down-pull multiplier.", }, { mode = "worstCaseScenario", - value = 4, description = "Calculates results from all formulas, and uses the highest value.", } } diff --git a/MWSE/mods/celediel/ASinkingFeeling/config.lua b/MWSE/mods/celediel/ASinkingFeeling/config.lua index 1bcc33f..19d64cb 100644 --- a/MWSE/mods/celediel/ASinkingFeeling/config.lua +++ b/MWSE/mods/celediel/ASinkingFeeling/config.lua @@ -11,7 +11,7 @@ this.defaultConfig = { allEquipment = 100, encumbrancePercentage = 100 }, - mode = common.modes[1].value, + mode = common.modes[1].mode, allEquipmentWorstCaseNecroMode = true } diff --git a/MWSE/mods/celediel/ASinkingFeeling/main.lua b/MWSE/mods/celediel/ASinkingFeeling/main.lua index ef8dc6b..9cb914c 100644 --- a/MWSE/mods/celediel/ASinkingFeeling/main.lua +++ b/MWSE/mods/celediel/ASinkingFeeling/main.lua @@ -120,7 +120,7 @@ local function sinkInWater(e) -- calculate the down-pull with the configured formula else for _, t in ipairs(common.modes) do - if t.value == config.mode then + if t.mode == config.mode then downPull, debugStr = formulas[t.mode](actor, mobile, ref) break end diff --git a/MWSE/mods/celediel/ASinkingFeeling/mcm.lua b/MWSE/mods/celediel/ASinkingFeeling/mcm.lua index 776b3a9..2988ea6 100644 --- a/MWSE/mods/celediel/ASinkingFeeling/mcm.lua +++ b/MWSE/mods/celediel/ASinkingFeeling/mcm.lua @@ -31,7 +31,7 @@ local function createOptions() local options = {} for _, t in ipairs(common.modes) do - options[#options+1] = {label = common.camelCaseToWords(t.mode), value = t.value} + options[#options+1] = {label = common.camelCaseToWords(t.mode), value = t.mode} end return options