From 810fa100095a5a516407025a322378fd2c2f2720 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gon=C3=A7alo=20Correia?= Date: Fri, 15 May 2026 14:51:23 +0100 Subject: [PATCH] Fixing roll labels for items/armor --- Data.lua | 16 ++++++++-------- Roll.lua | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Data.lua b/Data.lua index 6706c49..d1a1ae2 100755 --- a/Data.lua +++ b/Data.lua @@ -249,18 +249,18 @@ for _, skill in ipairs(DEFAULT_SKILLS) do table.insert(AltSystem.Data.Skills, { name = skill.name, level = skill.level, modifier = skill.modifier }) end --- Item options: name and modifier (first entry = no item) +-- Item options: name, label (used in roll messages), and modifier (first entry = no item) AltSystem.Data.Items = { - { name = "No item", modifier = 0 }, - { name = "Rare", modifier = 3 }, - { name = "Epic", modifier = 5 }, + { name = "No item", label = "No item", modifier = 0 }, + { name = "Rare", label = "Rare item", modifier = 3 }, + { name = "Epic", label = "Epic item", modifier = 5 }, } --- Defense / Armor options: name and modifier +-- Defense / Armor options: name, label (used in roll messages), and modifier AltSystem.Data.Defenses = { - { name = "None", modifier = 0 }, - { name = "Partial", modifier = 1 }, - { name = "Full", modifier = 2 }, + { name = "None", label = "No armor", modifier = 0 }, + { name = "Partial", label = "Extra armor", modifier = 1 }, + { name = "Full", label = "Extra armor", modifier = 2 }, } -- Shield modifier diff --git a/Roll.lua b/Roll.lua index 29d9190..036a680 100755 --- a/Roll.lua +++ b/Roll.lua @@ -198,7 +198,7 @@ function AltSystem:CalculateAndDisplayResult(rollType, rollValue, petRollValue) table.insert(modifiers, { name = skill and skill.name or "Skill", value = skillMod }) end if itemMod ~= 0 then - table.insert(modifiers, { name = item and item.name or "Item", value = itemMod }) + table.insert(modifiers, { name = item and (item.label or item.name) or "Item", value = itemMod }) end if petMod ~= 0 then table.insert(modifiers, { name = "Pet", value = petMod }) @@ -216,10 +216,10 @@ function AltSystem:CalculateAndDisplayResult(rollType, rollValue, petRollValue) table.insert(modifiers, { name = skill and skill.name or "Skill", value = skillMod }) end if itemMod ~= 0 then - table.insert(modifiers, { name = item and item.name or "Item", value = itemMod }) + table.insert(modifiers, { name = item and (item.label or item.name) or "Item", value = itemMod }) end if defenseMod ~= 0 then - table.insert(modifiers, { name = defense and defense.name or "Armor", value = defenseMod }) + table.insert(modifiers, { name = defense and (defense.label or defense.name) or "Armor", value = defenseMod }) end if shieldMod ~= 0 then table.insert(modifiers, { name = "Shield", value = shieldMod })