From 4f8476efd4cf69b13eb769ef47a92159b7f626fc Mon Sep 17 00:00:00 2001 From: Mads Buvik Sandvei Date: Wed, 31 Jan 2024 23:01:16 +0100 Subject: [PATCH] Comments --- .../lua-scripting/interface_skill_progression.rst | 2 +- docs/source/reference/lua-scripting/tables/interfaces.rst | 2 +- files/data/scripts/omw/mechanics/playercontroller.lua | 4 +--- files/data/scripts/omw/skillhandlers.lua | 8 ++++---- 4 files changed, 7 insertions(+), 9 deletions(-) diff --git a/docs/source/reference/lua-scripting/interface_skill_progression.rst b/docs/source/reference/lua-scripting/interface_skill_progression.rst index 5cd2e87812..f27f03d556 100644 --- a/docs/source/reference/lua-scripting/interface_skill_progression.rst +++ b/docs/source/reference/lua-scripting/interface_skill_progression.rst @@ -1,5 +1,5 @@ Interface SkillProgression -=================== +========================== .. raw:: html :file: generated_html/scripts_omw_skillhandlers.html diff --git a/docs/source/reference/lua-scripting/tables/interfaces.rst b/docs/source/reference/lua-scripting/tables/interfaces.rst index 0692e60b1c..f2e5921b02 100644 --- a/docs/source/reference/lua-scripting/tables/interfaces.rst +++ b/docs/source/reference/lua-scripting/tables/interfaces.rst @@ -28,7 +28,7 @@ * - :ref:`SkillProgression ` - by local scripts - | Control, extend, and override skill progression of the - - | player. + | player. * - :ref:`Settings ` - by player and global scripts - Save, display and track changes of setting values. diff --git a/files/data/scripts/omw/mechanics/playercontroller.lua b/files/data/scripts/omw/mechanics/playercontroller.lua index 29baf32020..935bf5029f 100644 --- a/files/data/scripts/omw/mechanics/playercontroller.lua +++ b/files/data/scripts/omw/mechanics/playercontroller.lua @@ -68,9 +68,7 @@ local function skillLevelUpHandler(skillid, source, params) ambient.playSound("skillraise") - local message = core.getGMST('sNotifyMessage39') - message = message:gsub("%%s", skillRecord.name) - message = message:gsub("%%d", tostring(skillStat.base)) + local message = string.format(core.getGMST('sNotifyMessage39'),skillRecord.name,skillStat.base) if source == I.SkillProgression.SKILL_INCREASE_SOURCES.Book then message = '#{sBookSkillMessage}\n'..message diff --git a/files/data/scripts/omw/skillhandlers.lua b/files/data/scripts/omw/skillhandlers.lua index 1f3b856344..30188f2341 100644 --- a/files/data/scripts/omw/skillhandlers.lua +++ b/files/data/scripts/omw/skillhandlers.lua @@ -212,7 +212,7 @@ return { skillUsedHandlers[#skillUsedHandlers + 1] = handler end, - --- Register a skill use, activating relevant handlers + --- Trigger a skill use, activating relevant handlers -- @function [parent=#SkillProgression] skillUsed -- @param #string skillid The if of the skill that was used -- @param #SkillUseType useType A number from 0 to 3 (inclusive) representing the way the skill was used, with each use type having a different skill progression rate. Available use types and its effect is skill specific. See @{SkillProgression#skillUseType} @@ -250,9 +250,9 @@ return { Athletics_SwimOneSecond = 0, }, - --- Register a skill increase, activating relevant handlers - -- @function [parent=#SkillProgression] skillUsed - -- @param #string skillid The id of the skill to be increased. + --- Trigger a skill level up, activating relevant handlers + -- @function [parent=#SkillProgression] skillLevelUp + -- @param #string skillid The id of the skill to level up. -- @param #SkillLevelUpSource source The source of the skill increase. skillLevelUp = skillLevelUp,