Editing Module:Sandbox/LVLGive feedback

local p = {}
local lang = require "Module:Lang"
local util_module = require "Module:Utilities"
local data = mw.loadJsonData("Data:Monster_Domosed/ItemData.json")

-- Helper function: get first non-nil string from variants (moved to module level)
local function first_non_nil(...)
    for i = 1, select("#", ...) do
        local v = select(i, ...)
        if v and v ~= "" then return v end
    end
    return ""
end

-- Helper: get lang string with case fallback (from Domo's version)
local function get_lang_with_fallback(base_key, suffix1, suffix2)
    return first_non_nil(
        lang.get_string(base_key .. suffix1),
        lang.get_string(base_key .. suffix2)
    )
end

-- Get component-of items sorted by tier (your fix, kept here until ready to move to Module:ItemData)
local function get_component_of_sorted(item_input)
    local target_key = nil
    if data[item_input] then
        target_key = item_input
    else
        for k, v in pairs(data) do
            if v.Name == item_input and (v.IsDisabled == false or v.IsDisabled == nil) then
                target_key = k; break
            end
        end
    end
    if not target_key then return {} end

    local parents = {}
    for key, item in pairs(data) do
        if item.IsDisabled ~= true and item.Components and type(item.Components) == "table" then
            for _, comp in ipairs(item.Components) do
                if comp == target_key then
                    table.insert(parents, key)
                    break
                end
            end
        end
    end

    -- Sort by Tier instead of alphabetically (your fix)
    table.sort(parents, function(a, b)
        local tier_a = tonumber(data[a] and data[a]["Tier"]) or 0
        local tier_b = tonumber(data[b] and data[b]["Tier"]) or 0
        return tier_a < tier_b
    end)

    return parents
end

-- Get raw value, CSS class, and LocTokenOverride for a property
local function get_raw_value(item_name, prop)
    local item = data[item_name] or nil
    if not item then
        for k,v in pairs(data) do
            if v.Name == item_name then item = v; break end
        end
    end
    if not item then return nil, nil, nil end

    local raw_prop = item[prop]
    if type(raw_prop) == "table" then
        local loc_override = raw_prop.LocTokenOverride or prop
        return raw_prop.Value, raw_prop.CSSClass, loc_override
    else
        return raw_prop, nil, prop
    end
end

-- Check if property exists in language data (refactored to loop, from Domo's version)
local function is_property_in_lang_data(prop)
    local suffixes = {"_label", "_Label", "_prefix", "_Prefix", "_postfix", "_Postfix", "_postvalue_label", "_Postvalue_Label"}
    for _, suffix in ipairs(suffixes) do
        if lang.get_string(prop .. suffix) then
            return true
        end
    end
    return false
end

-- Get item by name, ignoring disabled if possible
local function get_json_item(name)
    for _, v in pairs(data) do
        if v.Name == name and (v.IsDisabled == false or v.IsDisabled == nil) then
            return v
        end
    end
    for _, v in pairs(data) do
        if v.Name == name then return v end
    end
    return nil
end

-- Format stat value for Infobox, handling prefix/postfix, CSS, scaling, and conditional
local function format_stat(item_name, prop, skip_label, debug, allow_conditional)
    if allow_conditional == nil then allow_conditional = true end

    if prop == "AbilityCooldown" and not skip_label then
        return nil
    end

    local value, css, loc_key = get_raw_value(item_name, prop)
    if value == nil or value == 0 or value == "" then
        return nil
    end

    -- Convert string like "0m" or "0.0" to number for zero check
    local numeric_val = tonumber(tostring(value):match("^-?%d+%.?%d*")) or 0
    if numeric_val == 0 then
        return nil
    end

    -- Skip if property has no lang data
    local label_key = loc_key:gsub("^#", "")
    if not (
        lang.get_string(label_key.."_label") or
        lang.get_string(label_key.."_Label") or
        lang.get_string(label_key.."_prefix") or
        lang.get_string(label_key.."_Prefix") or
        lang.get_string(label_key.."_postfix") or
        lang.get_string(label_key.."_Postfix") or
        lang.get_string(label_key.."_postvalue_label") or
        lang.get_string(label_key.."_Postvalue_Label")
    ) then
        return nil
    end

    if debug == 2 then
        local label_val = lang.get_string(label_key.."_label") and label_key.."_label"
                       or lang.get_string(label_key.."_Label") and label_key.."_Label"
                       or "(none)"
        local prefix_val = lang.get_string(label_key.."_prefix") and label_key.."_prefix"
                        or lang.get_string(label_key.."_Prefix") and label_key.."_Prefix"
                        or "(none)"
        local postfix_val = lang.get_string(label_key.."_postfix") and label_key.."_postfix"
                         or lang.get_string(label_key.."_Postfix") and label_key.."_Postfix"
                         or "(none)"
        return string.format(
            "raw invoke key: %s | raw value: %s | label key used: %s | prefix key used: %s | postfix key used: %s",
            loc_key, tostring(value), label_val, prefix_val, postfix_val
        )
    end

    if prop == "BuildUpPerShot" then label_key = "BuildupPerShot"
    elseif prop == "DotDuration" then label_key = "DOTDuration"
    end

    -- Get actual label, prefix, postfix with fallbacks (using helper from Domo's version)
    local label = skip_label and "" or get_lang_with_fallback(label_key, "_label", "_Label")
    local prefix = get_lang_with_fallback(label_key, "_prefix", "_Prefix")
    local postfix = get_lang_with_fallback(label_key, "_postfix", "_Postfix")

    if prefix == "" and postfix == "" and label == "" then
        return nil
    end

    local val_str = tostring(value)

    ------------------------------------------------------------------
    -- Apply prefix
    ------------------------------------------------------------------
    if prefix ~= "" then
        if prefix == "{s:sign}" then
            local num = tonumber(val_str:match("^-?%d+%.?%d*"))
            if num and num >= 0 and not val_str:find("^%+") then
                val_str = "+"..val_str
            end
        else
            val_str = prefix..val_str
        end
    end

    ------------------------------------------------------------------
    -- CSS-specific formatting (after prefix to avoid double +)
    ------------------------------------------------------------------
    if css == "move_speed" or css == "sprint_speed" then
        if postfix == "" or not postfix:find("%%") then
            val_str = val_str:gsub("/s", "") .. "/s"
        end
        local num = tonumber(val_str:match("^-?%d+%.?%d*"))
        if num and num > 0 and not val_str:find("^%+") then
            val_str = "+" .. val_str
        end
    end

    ------------------------------------------------------------------
    -- Append postfix
    ------------------------------------------------------------------
    if prop ~= "BuildUpPerShot" and postfix ~= "" and not val_str:find(postfix, 1, true) then
        if postfix == "HP/s" then
            val_str = val_str .. " " .. postfix
        else
            val_str = val_str .. postfix
        end
    end

    ------------------------------------------------------------------
    -- Append scaling template {{Boon}} or {{Ss}}
    ------------------------------------------------------------------
    local item = get_json_item(item_name)
    local raw_prop = item[prop]
    if type(raw_prop) == "table" and raw_prop.Scale and raw_prop.Scale.Value ~= 0 then
        local scale_val = util_module.round_to_sig_fig(raw_prop.Scale.Value, 2)
        local template_name = (raw_prop.Scale.Type == "power_increase") and "Boon" or "Ss"
        val_str = val_str .. " " .. mw.getCurrentFrame():expandTemplate{ title = template_name, args = { scale_val } }
    end

    ------------------------------------------------------------------
    -- Append label
    ------------------------------------------------------------------
    if label ~= "" then
        val_str = val_str.." "..label
    end

    ------------------------------------------------------------------
    -- Append (Conditional) ONLY if allowed (your fix: only for ImportantProperties)
    ------------------------------------------------------------------
    if allow_conditional
        and type(raw_prop) == "table"
        and (raw_prop.UsageFlags == "ConditionallyApplied" or raw_prop.UsageFlags == "ConditionallyEnemyApplied")
    then
        local conditional_text = lang.get_string("Citadel_Shop_ConditionalAttribute")
        val_str = val_str .. string.format(' <span style="color:#C0C0C0">(%s)</span>', conditional_text)
    end

    return val_str
end

-- Special formatting for StatusEffect
local function format_property_for_infobox(item_name, prop, skip_label, debug)
    if prop:match("^StatusEffect") then
        return string.format(
            "[[{{#invoke:Lang|get_string|Citadel_%s}}]] [[{{#invoke:Lang|get_string|Citadel_StatusEffect}}]]",
            prop
        )
    else
        -- allow_conditional = true: ImportantProperties can show Conditional (your fix)
        return format_stat(item_name, prop, skip_label, debug, true)
    end
end

function p.fill_tooltip(frame)
    local item_name = frame.args[1]
    if not item_name then return "Item name missing" end

    local debug = tonumber(frame.args.debug) or 0
    local item = get_json_item(item_name)
    if not item then return "Item not found" end

    local ItemData = require("Module:ItemData")
    local lines = {
	    "{{Infobox item",
	    "| item_name = " .. item_name
	}
	
	if item.StreetBrawl == true then
	    table.insert(lines, "| street_brawl = true")
	end

    ----------------------------------------------------------------------
    -- Check if AbilityCooldown or AbilityChargeUpTime exists in sections
    ----------------------------------------------------------------------
    local cooldown_found_in_sections = false
    local chargeup_found_in_sections = false
    for _, section in ipairs(item.TooltipSections or {}) do
        for _, entry in ipairs(section.Entries or {}) do
            for _, prop in ipairs(entry.Properties or {}) do
                if prop == "AbilityCooldown" then cooldown_found_in_sections = true end
                if prop == "AbilityChargeUpTime" then chargeup_found_in_sections = true end
            end
            for _, prop in ipairs(entry.ImportantProperties or {}) do
                if prop == "AbilityCooldown" then cooldown_found_in_sections = true end
                if prop == "AbilityChargeUpTime" then chargeup_found_in_sections = true end
            end
        end
    end

    ----------------------------------------------------------------------
    -- Innate stats
    ----------------------------------------------------------------------
    local innate_index = 1
    for _, section in ipairs(item.TooltipSections or {}) do
        if section.Type == "EArea_Innate" then
            for _, entry in ipairs(section.Entries or {}) do
                for _, prop in ipairs(entry.Properties or {}) do
                    if prop ~= "AbilityCooldown" and prop ~= "AbilityChargeUpTime" then
                        -- allow_conditional = false for innate stats (your fix)
                        local val = format_stat(item_name, prop, false, debug, false)
                        if val then
                            table.insert(lines, string.format("| item_stat%d = %s", innate_index, val))
                            innate_index = innate_index + 1
                        end
                    end
                end
            end
        end
    end

    ----------------------------------------------------------------------
    -- Passive stats
    ----------------------------------------------------------------------
    local passive_counter = 1
    for _, section in ipairs(item.TooltipSections or {}) do
        if section.Type ~= "EArea_Innate" and section.Type ~= "EArea_Active" then
            for _, entry in ipairs(section.Entries or {}) do
                local loc = entry.LocString and entry.LocString:gsub("#","") or nil
                if loc then
                    table.insert(lines, string.format(
                        "| passive%d_description = {{#invoke:Lang|get_string|%s|item_name=%s}}",
                        passive_counter, loc, item_name
                    ))
                end

                local stat_index = 1
                local seen_props = {}

                -- ImportantProperties: allow_conditional = true (via format_property_for_infobox)
                for _, prop in ipairs(entry.ImportantProperties or {}) do
                    if prop ~= "AbilityCooldown" and prop ~= "AbilityChargeUpTime"
                       and is_property_in_lang_data(prop) and not seen_props[prop] then
                        local val = format_property_for_infobox(item_name, prop, false, debug)
                        if val then
                            table.insert(lines, string.format("| passive%d_stat%d = %s", passive_counter, stat_index, val))
                            stat_index = stat_index + 1
                            seen_props[prop] = true
                        end
                    end
                end

                -- Properties: allow_conditional = false (your fix)
                for _, prop in ipairs(entry.Properties or {}) do
                    if prop ~= "AbilityCooldown" and prop ~= "AbilityChargeUpTime"
                       and is_property_in_lang_data(prop) and not seen_props[prop] then
                        local val = format_stat(item_name, prop, false, debug, false)
                        if val then
                            table.insert(lines, string.format("| passive%d_stat%d = %s", passive_counter, stat_index, val))
                            stat_index = stat_index + 1
                            seen_props[prop] = true
                        end
                    end
                end

                -- AbilityCooldown
                for _, prop_list in ipairs({entry.Properties or {}, entry.ImportantProperties or {}}) do
                    for _, prop in ipairs(prop_list) do
                        if prop == "AbilityCooldown" then
                            local cd = format_stat(item_name, prop, true, debug)
                            if cd then
                                table.insert(lines, string.format("| passive%d_cooldown = %s", passive_counter, cd))
                            end
                        end
                    end
                end

                -- AbilityChargeUpTime
                for _, prop_list in ipairs({entry.Properties or {}, entry.ImportantProperties or {}}) do
                    for _, prop in ipairs(prop_list) do
                        if prop == "AbilityChargeUpTime" then
                            local cu = format_stat(item_name, prop, true, debug)
                            if cu then
                                table.insert(lines, string.format("| passive%d_chargeup = %s", passive_counter, cu))
                            end
                        end
                    end
                end

                passive_counter = passive_counter + 1
            end
        end
    end

    ----------------------------------------------------------------------
    -- Active stats
    ----------------------------------------------------------------------
    local active_index = 1
    for _, section in ipairs(item.TooltipSections or {}) do
        if section.Type == "EArea_Active" then
            for _, entry in ipairs(section.Entries or {}) do
                if entry.LocString then
                    table.insert(lines, string.format(
                        "| active%d_description = {{#invoke:Lang|get_string|%s|item_name=%s}}",
                        active_index, entry.LocString:gsub("#",""), item_name
                    ))
                end

                local stat_index = 1
                local seen_props = {}

                -- ImportantProperties: allow_conditional = true (via format_property_for_infobox)
                for _, prop in ipairs(entry.ImportantProperties or {}) do
                    if prop ~= "AbilityCooldown" and prop ~= "AbilityChargeUpTime"
                       and is_property_in_lang_data(prop) and not seen_props[prop] then
                        local val = format_property_for_infobox(item_name, prop, false, debug)
                        if val then
                            table.insert(lines, string.format("| active%d_stat%d = %s", active_index, stat_index, val))
                            stat_index = stat_index + 1
                            seen_props[prop] = true
                        end
                    end
                end

                -- Properties: allow_conditional = false (your fix)
                for _, prop in ipairs(entry.Properties or {}) do
                    if prop ~= "AbilityCooldown" and prop ~= "AbilityChargeUpTime"
                       and is_property_in_lang_data(prop) and not seen_props[prop] then
                        local val = format_stat(item_name, prop, false, debug, false)
                        if val then
                            table.insert(lines, string.format("| active%d_stat%d = %s", active_index, stat_index, val))
                            stat_index = stat_index + 1
                            seen_props[prop] = true
                        end
                    end
                end

                -- AbilityCooldown
                for _, prop_list in ipairs({entry.Properties or {}, entry.ImportantProperties or {}}) do
                    for _, prop in ipairs(prop_list) do
                        if prop == "AbilityCooldown" then
                            local cd = format_stat(item_name, prop, true, debug)
                            if cd then
                                table.insert(lines, string.format("| active%d_cooldown = %s", active_index, cd))
                            end
                        end
                    end
                end

                -- AbilityChargeUpTime
                for _, prop_list in ipairs({entry.Properties or {}, entry.ImportantProperties or {}}) do
                    for _, prop in ipairs(prop_list) do
                        if prop == "AbilityChargeUpTime" then
                            local cu = format_stat(item_name, prop, true, debug)
                            if cu then
                                table.insert(lines, string.format("| active%d_chargeup = %s", active_index, cu))
                            end
                        end
                    end
                end

                active_index = active_index + 1
            end
        end
    end

    ----------------------------------------------------------------------
    -- Global fallback for AbilityCooldown (your fix: attaches to active section)
    ----------------------------------------------------------------------
    if not cooldown_found_in_sections and not chargeup_found_in_sections and item.AbilityCooldown then
        local cd = format_stat(item_name, "AbilityCooldown", true, debug)
        if cd then
            local has_active = false
            for _, section in ipairs(item.TooltipSections or {}) do
                if section.Type == "EArea_Active" then has_active = true; break end
            end
            if has_active then
                table.insert(lines, "| active1_cooldown = " .. cd)
            else
                table.insert(lines, "| item_stat_cooldown = " .. cd)
            end
        end
    end

    if not chargeup_found_in_sections and item.AbilityChargeUpTime then
        local cu = format_stat(item_name, "AbilityChargeUpTime", true, debug)
        if cu then
            table.insert(lines, "| item_stat_chargeup = " .. cu)
        end
    end

    ----------------------------------------------------------------------
    -- Components
    ----------------------------------------------------------------------
    for i = 1, 2 do
        local comp = ItemData.get_component_name {
            args = { item_name, i }
        }
        if comp and comp ~= "" then
            table.insert(lines, string.format("| component%d_name = %s", i, comp))
        end
    end

    ----------------------------------------------------------------------
    -- Is Component Of (your tier-sorted fix)
    ----------------------------------------------------------------------
    local parents = get_component_of_sorted(item_name)
    for i, key in ipairs(parents) do
        local parent_name = data[key] and data[key]["Name"] or ""
        if parent_name ~= "" then
            table.insert(lines, string.format("| iscomponentof%d_name = %s", i, parent_name))
        end
    end

    ----------------------------------------------------------------------
    -- Sounds (always manual, passed as sound1= sound2= etc.)
    ----------------------------------------------------------------------
    for key, value in pairs(frame.args) do
        local index = tostring(key):match("^sound(%d+)$")
        if index and value ~= "" then
            table.insert(lines, string.format("| sound%s = %s", index, value))
        end
    end

    ----------------------------------------------------------------------
    table.insert(lines, "}}")
    local output = table.concat(lines, "\n")

    if debug == 1 or debug == 2 then
        return output
    end

    return mw.getCurrentFrame():preprocess(output)
end

return p
@@ Line 1: / Line 1: @@
 local p = {}
+local lang = require "Module:Lang"
+local util_module = require "Module:Utilities"
+local data = mw.loadJsonData("Data:Monster_Domosed/ItemData.json")
-local heroes_data       = mw.loadJsonData("Data:HeroData.json")
+-- Helper function: get first non-nil string from variants (moved to module level)
-local attributes_data   = mw.loadJsonData("Data:AttributeData.json")
+local function first_non_nil(...)
-local attribute_orders  = mw.loadJsonData("Data:StatInfoboxOrder.json")
+    for i = 1, select("#", ...) do
-local util_module       = require('Module:Utilities')
+        local v = select(i, ...)
-local lang_module       = require('Module:Lang')
+         if v and v ~= "" then return v end
-local dictionary_module = require('Module:Dictionary')
-local attribute_module  = require('Module:AttributeData')
-local hero_data_module  = require('Module:HeroData')
-local function get_nested_stat_value(hero_data, stat_key)
-    if hero_data[stat_key] ~= nil then
-        return hero_data[stat_key]
-    elseif hero_data.Weapon and hero_data.Weapon[stat_key] ~= nil then
-         return hero_data.Weapon[stat_key]
-    elseif hero_data.Weapon and hero_data.Weapon.AltFire and hero_data.Weapon.AltFire[stat_key] ~= nil then
-        return hero_data.Weapon.AltFire[stat_key]
      end
-     return 0
+     return ""
 end
-local function localize(key, fallback)
+-- Helper: get lang string with case fallback (from Domo's version)
-     local result = lang_module.get_string(key)
+local function get_lang_with_fallback(base_key, suffix1, suffix2)
-    if result == "" or result == nil then
+     return first_non_nil(
-         result = util_module.add_space_before_cap(fallback) ..
+        lang.get_string(base_key .. suffix1),
-                 mw.getCurrentFrame():expandTemplate{title = "MissingValveTranslationTooltip"}
+         lang.get_string(base_key .. suffix2)
-     end
+     )
-    return result
 end
--- =========================================================================
+-- Get component-of items sorted by tier (your fix, kept here until ready to move to Module:ItemData)
---  DPS calculation helpers
+local function get_component_of_sorted(item_input)
--- =========================================================================
+    local target_key = nil
+    if data[item_input] then
+        target_key = item_input
+    else
+        for k, v in pairs(data) do
+            if v.Name == item_input and (v.IsDisabled == false or v.IsDisabled == nil) then
+                target_key = k; break
+            end
+        end
+    end
+    if not target_key then return {} end
-local function calculate_dps(stats, dps_type)
+    local parents = {}
-    local rps = stats.RoundsPerSecond or 0
+    for key, item in pairs(data) do
-    if rps == 0 then return 0 end
+        if item.IsDisabled ~= true and item.Components and type(item.Components) == "table" then
+            for _, comp in ipairs(item.Components) do
+                if comp == target_key then
+                    table.insert(parents, key)
+                    break
+                end
+            end
+        end
+    end
-     local bullets_per_shot = (stats.HitOnceAcrossAllBullets and 1) or (stats.BulletsPerShot or 1)
+     -- Sort by Tier instead of alphabetically (your fix)
-    local burst_count = stats.BulletsPerBurst or 1
+    table.sort(parents, function(a, b)
-    local cycle_time = 1 / rps
+        local tier_a = tonumber(data[a] and data[a]["Tier"]) or 0
-     local total_cycle_time = cycle_time * burst_count
+        local tier_b = tonumber(data[b] and data[b]["Tier"]) or 0
+        return tier_a < tier_b
+     end)
-     if total_cycle_time == 0 then return 0 end
+     return parents
+end
-     local base_damage = stats.BulletDamage or 0
+-- Get raw value, CSS class, and LocTokenOverride for a property
-     if dps_type == 'burst' then
+local function get_raw_value(item_name, prop)
-         return base_damage * bullets_per_shot * burst_count / total_cycle_time
+     local item = data[item_name] or nil
-    end
+     if not item then
+         for k,v in pairs(data) do
-    local clip_size = stats.ClipSize or 0
+            if v.Name == item_name then item = v; break end
-    if clip_size <= 0 then
+         end
-         return base_damage * bullets_per_shot * burst_count / total_cycle_time
      end
+    if not item then return nil, nil, nil end
-     local reload_time
+     local raw_prop = item[prop]
-     if stats.ReloadSingle then
+     if type(raw_prop) == "table" then
-         reload_time = (stats.ReloadTime or 0) * clip_size
+         local loc_override = raw_prop.LocTokenOverride or prop
+        return raw_prop.Value, raw_prop.CSSClass, loc_override
      else
-         reload_time = stats.ReloadTime or 0
+         return raw_prop, nil, prop
      end
-    reload_time = reload_time + (stats.ReloadDelay or 0)
-    local time_to_empty_clip = (clip_size / burst_count) * total_cycle_time
-    local damage_from_clip = base_damage * bullets_per_shot * clip_size
-    local total_time = time_to_empty_clip + reload_time
-    if total_time == 0 then return 0 end
-    return damage_from_clip / total_time
 end
--- Compute how much DPS changes when all relevant component scalings are applied.
+-- Check if property exists in language data (refactored to loop, from Domo's version)
--- Used for alt-fire rows where explicit DPS/SustainedDPS scaling keys are missing.
+local function is_property_in_lang_data(prop)
-local function compute_dps_scaling(hero_data, base_stats, dps_type, scaling_type)
+     local suffixes = {"_label", "_Label", "_prefix", "_Prefix", "_postfix", "_Postfix", "_postvalue_label", "_Postvalue_Label"}
-     local scaling_source = hero_data[scaling_type .. "Scaling"] or {}
+     for _, suffix in ipairs(suffixes) do
+         if lang.get_string(prop .. suffix) then
-    local component_scalings = {}
+             return true
-    local possible_keys = {
-        "BulletDamage", "RoundsPerSecond", "ClipSize", "ReloadTime",
-        "ReloadDelay", "BulletsPerShot", "BulletsPerBurst"
-    }
-     for _, key in ipairs(possible_keys) do
-         local alt_key = key .. "AltFire"
-        if scaling_source[alt_key] then
-             component_scalings[key] = scaling_source[alt_key]
          end
      end
+    return false
+end
-    -- ClipSize is shared between fire modes; fall back to primary scaling
+-- Get item by name, ignoring disabled if possible
-     if base_stats.ClipSize and not component_scalings.ClipSize then
+local function get_json_item(name)
-        local primary_clip_scale = scaling_source["ClipSize"]
+     for _, v in pairs(data) do
-        if primary_clip_scale then
+        if v.Name == name and (v.IsDisabled == false or v.IsDisabled == nil) then
-             component_scalings.ClipSize = primary_clip_scale
+             return v
          end
      end
+    for _, v in pairs(data) do
+        if v.Name == name then return v end
+    end
+    return nil
+end
+-- Format stat value for Infobox, handling prefix/postfix, CSS, scaling, and conditional
+local function format_stat(item_name, prop, skip_label, debug, allow_conditional)
+    if allow_conditional == nil then allow_conditional = true end
-     if next(component_scalings) == nil then
+     if prop == "AbilityCooldown" and not skip_label then
-         return 0
+         return nil
      end
-     local base_dps = calculate_dps(base_stats, dps_type)
+     local value, css, loc_key = get_raw_value(item_name, prop)
-     local scaled_stats = {}
+     if value == nil or value == 0 or value == "" then
-    for k, v in pairs(base_stats) do scaled_stats[k] = v end
+         return nil
-    for comp_key, scale_val in pairs(component_scalings) do
-        if scaled_stats[comp_key] ~= nil then
-            scaled_stats[comp_key] = scaled_stats[comp_key] + scale_val
-         end
      end
-    local scaled_dps = calculate_dps(scaled_stats, dps_type)
-    return scaled_dps - base_dps
-end
--- =========================================================================
+    -- Convert string like "0m" or "0.0" to number for zero check
---  Main module function
+    local numeric_val = tonumber(tostring(value):match("^-?%d+%.?%d*")) or 0
--- =========================================================================
+    if numeric_val == 0 then
+        return nil
+    end
-p.write_hero_comparison_table = function(frame)
+    -- Skip if property has no lang data
-     local power_increases = tonumber(frame.args[1]) or 0
+    local label_key = loc_key:gsub("^#", "")
-    local spirit_power    = tonumber(frame.args[2]) or 0
+     if not (
-    local max_power       = tonumber(frame.args[3]) or 25
+        lang.get_string(label_key.."_label") or
-    local max_spirit      = tonumber(frame.args[4]) or 500
+        lang.get_string(label_key.."_Label") or
+        lang.get_string(label_key.."_prefix") or
+        lang.get_string(label_key.."_Prefix") or
+        lang.get_string(label_key.."_postfix") or
+        lang.get_string(label_key.."_Postfix") or
+        lang.get_string(label_key.."_postvalue_label") or
+        lang.get_string(label_key.."_Postvalue_Label")
+    ) then
+        return nil
+    end
-     local display_scaling_icons = (power_increases == 0 and spirit_power == 0)
+     if debug == 2 then
+        local label_val = lang.get_string(label_key.."_label") and label_key.."_label"
+                       or lang.get_string(label_key.."_Label") and label_key.."_Label"
+                       or "(none)"
+        local prefix_val = lang.get_string(label_key.."_prefix") and label_key.."_prefix"
+                        or lang.get_string(label_key.."_Prefix") and label_key.."_Prefix"
+                        or "(none)"
+        local postfix_val = lang.get_string(label_key.."_postfix") and label_key.."_postfix"
+                         or lang.get_string(label_key.."_Postfix") and label_key.."_Postfix"
+                         or "(none)"
+        return string.format(
+            "raw invoke key: %s | raw value: %s | label key used: %s | prefix key used: %s | postfix key used: %s",
+            loc_key, tostring(value), label_val, prefix_val, postfix_val
+        )
+    end
-     local body_str = ""
+     if prop == "BuildUpPerShot" then label_key = "BuildupPerShot"
+    elseif prop == "DotDuration" then label_key = "DOTDuration"
+    end
-     local stats_to_include = {
+     -- Get actual label, prefix, postfix with fallbacks (using helper from Domo's version)
-        Weapon = {
+    local label = skip_label and "" or get_lang_with_fallback(label_key, "_label", "_Label")
-            "DPS", "SustainedDPS", "BulletDamage", "RoundsPerSecond", "FireRate",
+    local prefix = get_lang_with_fallback(label_key, "_prefix", "_Prefix")
-            "ClipSize", "ReloadTime", "ReloadDelay", "ReloadSingle", "BulletsPerShot", "BulletsPerBurst",
+    local postfix = get_lang_with_fallback(label_key, "_postfix", "_Postfix")
-            "BurstInterShotInterval", "LightMeleeDamage", "HeavyMeleeDamage",
-            "BulletSpeed", "FalloffStartRange", "FalloffEndRange",
-            "CritDamageBonusPercent", "BulletRadius", "RoundsPerSecondAtMaxSpin", "SpinAcceleration", "SpinDeceleration"
-        },
-        Vitality = {
-            "MaxHealth", "BaseHealthRegen", "BulletResist", "TechResist", "MeleeResist",
-            "CritDamageReceivedPercent", "DebuffResist", "BulletLifesteal", "MaxMoveSpeed",
-            "SprintSpeed", "StaminaCooldown", "Stamina", "GroundDashSpeed", "GravityChange"
-        },
-        Spirit = { "TechPower" }
-    }
-     -- Collect and sort heroes alphabetically, excluding disabled/in-development
+     if prefix == "" and postfix == "" and label == "" then
-    local sorted_heroes = {}
+         return nil
-    for hero_key, hero_data in pairs(heroes_data) do
-        if not hero_data["InDevelopment"] and not hero_data["IsDisabled"] then
-            table.insert(sorted_heroes, {key = hero_key, data = hero_data})
-         end
      end
-    table.sort(sorted_heroes, function(a, b)
-        local function get_sort_name(name)
-            return (name:gsub("^The ", ""))
-        end
-        return get_sort_name(a.data["Name"] or a.key) < get_sort_name(b.data["Name"] or b.key)
-    end)
-    -- Build a single stat cell (<td>) with data attributes for JS recalculation
+     local val_str = tostring(value)
-     local function buildStatCell(hero_data, hero_key, attr_key, is_alt_fire, category)
-        -- Conversion factors for stats that need unit changes (e.g. metres → centimetres)
-        local unit_conversion = {
-            BulletRadius = 100  -- metres to centimetres
-        }
-        local conv_factor = unit_conversion[attr_key] or 1
-        local base_value
+    ------------------------------------------------------------------
-        if is_alt_fire then
+    -- Apply prefix
-            if attr_key == "ClipSize" or attr_key == "ReloadTime" then
+    ------------------------------------------------------------------
-                base_value = get_nested_stat_value(hero_data, attr_key)
+    if prefix ~= "" then
-             elseif hero_data.Weapon and hero_data.Weapon.AltFire
+        if prefix == "{s:sign}" then
-                and hero_data.Weapon.AltFire[attr_key] ~= nil then
+            local num = tonumber(val_str:match("^-?%d+%.?%d*"))
-                 base_value = hero_data.Weapon.AltFire[attr_key]
+             if num and num >= 0 and not val_str:find("^%+") then
-            else
+                 val_str = "+"..val_str
-                base_value = get_nested_stat_value(hero_data, attr_key)
              end
          else
-             base_value = get_nested_stat_value(hero_data, attr_key)
+             val_str = prefix..val_str
          end
+    end
-        -- Apply unit conversion to the base value
+    ------------------------------------------------------------------
-         if type(base_value) == "number" then
+    -- CSS-specific formatting (after prefix to avoid double +)
-             base_value = base_value * conv_factor
+    ------------------------------------------------------------------
+    if css == "move_speed" or css == "sprint_speed" then
+         if postfix == "" or not postfix:find("%%") then
+            val_str = val_str:gsub("/s", "") .. "/s"
+        end
+        local num = tonumber(val_str:match("^-?%d+%.?%d*"))
+        if num and num > 0 and not val_str:find("^%+") then
+             val_str = "+" .. val_str
          end
+    end
-        local stat_value = base_value
+    ------------------------------------------------------------------
+    -- Append postfix
-        -- Scaling lookup
+    ------------------------------------------------------------------
-        local scaling_data
+    if prop ~= "BuildUpPerShot" and postfix ~= "" and not val_str:find(postfix, 1, true) then
-        if is_alt_fire then
+        if postfix == "HP/s" then
-            if attr_key == "ClipSize" or attr_key == "ReloadTime" then
+             val_str = val_str .. " " .. postfix
-                scaling_data = hero_data_module.get_hero_scaling_data(hero_data, attr_key)
-            elseif (attr_key == "DPS" or attr_key == "SustainedDPS")
-                and hero_data.Weapon and hero_data.Weapon.AltFire then
-                -- Alt-fire DPS/SustainedDPS: use explicit key if present, otherwise compute from components
-                local direct_scaling = hero_data_module.get_hero_scaling_data(hero_data, attr_key .. "AltFire")
-                if direct_scaling and next(direct_scaling) ~= nil then
-                    scaling_data = direct_scaling
-                else
-                    local alt_stats = hero_data.Weapon.AltFire
-                    local dps_type = attr_key == "DPS" and 'burst' or 'sustained'
-                    local level_scale = compute_dps_scaling(hero_data, alt_stats, dps_type, "Level")
-                    local spirit_scale = compute_dps_scaling(hero_data, alt_stats, dps_type, "Spirit")
-                    level_scale = util_module.round_to_sig_fig(level_scale, 5)
-                    spirit_scale = util_module.round_to_sig_fig(spirit_scale, 5)
-                    scaling_data = {}
-                    if level_scale ~= 0 then scaling_data[level_scale] = "Level" end
-                    if spirit_scale ~= 0 then scaling_data[spirit_scale] = "Spirit" end
-                    if next(scaling_data) == nil then scaling_data = nil end
-                end
-             elseif hero_data.Weapon and hero_data.Weapon.AltFire
-                and hero_data.Weapon.AltFire[attr_key] ~= nil then
-                scaling_data = hero_data_module.get_hero_scaling_data(hero_data, attr_key .. "AltFire")
-            else
-                scaling_data = hero_data_module.get_hero_scaling_data(hero_data, attr_key)
-            end
          else
-             scaling_data = hero_data_module.get_hero_scaling_data(hero_data, attr_key)
+             val_str = val_str .. postfix
          end
+    end
-        local scaling_strs = ""
+    ------------------------------------------------------------------
-        local spirit_scale = 0
+    -- Append scaling template {{Boon}} or {{Ss}}
-        local level_scale  = 0
+    ------------------------------------------------------------------
-         local spirit_val = 0
+    local item = get_json_item(item_name)
-         local level_val  = 0
+    local raw_prop = item[prop]
-        if scaling_data ~= nil then
+    if type(raw_prop) == "table" and raw_prop.Scale and raw_prop.Scale.Value ~= 0 then
-            for scaling_val, scaling_type in pairs(scaling_data) do
+         local scale_val = util_module.round_to_sig_fig(raw_prop.Scale.Value, 2)
-                if scaling_type == "Spirit" then
+         local template_name = (raw_prop.Scale.Type == "power_increase") and "Boon" or "Ss"
-                    spirit_val = scaling_val * conv_factor  -- apply unit conversion
+        val_str = val_str .. " " .. mw.getCurrentFrame():expandTemplate{ title = template_name, args = { scale_val } }
-                elseif scaling_type == "Level" then
+    end
-                    level_val = scaling_val * conv_factor   -- apply unit conversion
-                end
-            end
-            -- Output Spirit icon before Level icon
+    ------------------------------------------------------------------
-            local function append_scaling(val, stype)
+    -- Append label
-                if val ~= 0 then
+    ------------------------------------------------------------------
-                    local scaling_str = hero_data_module.write_scalar_str(val, stype, true)
+    if label ~= "" then
-                    if scaling_str ~= "" then
+        val_str = val_str.." "..label
-                        scaling_strs = scaling_strs .. " " .. scaling_str
+    end
-                    end
-                end
-            end
-            append_scaling(spirit_val, "Spirit")
-            append_scaling(level_val, "Level")
-            if type(stat_value) == "number" then
+    ------------------------------------------------------------------
-                stat_value = stat_value + (spirit_power * spirit_val)
+    -- Append (Conditional) ONLY if allowed (your fix: only for ImportantProperties)
-                stat_value = stat_value + (power_increases * level_val)
+    ------------------------------------------------------------------
-            end
+    if allow_conditional
+        and type(raw_prop) == "table"
+        and (raw_prop.UsageFlags == "ConditionallyApplied" or raw_prop.UsageFlags == "ConditionallyEnemyApplied")
+    then
+        local conditional_text = lang.get_string("Citadel_Shop_ConditionalAttribute")
+        val_str = val_str .. string.format(' <span style="color:#C0C0C0">(%s)</span>', conditional_text)
+    end
-            spirit_scale = spirit_val
+    return val_str
-            level_scale  = level_val
+end
-        end
-        if attr_key == "TechPower" and spirit_scale == 0 then
+-- Special formatting for StatusEffect
-            spirit_scale = 1.0
+local function format_property_for_infobox(item_name, prop, skip_label, debug)
-             if type(stat_value) == "number" then
+    if prop:match("^StatusEffect") then
-                stat_value = stat_value + (spirit_power * spirit_scale)
+        return string.format(
-            end
+             "[[{{#invoke:Lang|get_string|Citadel_%s}}]] [[{{#invoke:Lang|get_string|Citadel_StatusEffect}}]]",
-        end
+            prop
+        )
+    else
+        -- allow_conditional = true: ImportantProperties can show Conditional (your fix)
+        return format_stat(item_name, prop, skip_label, debug, true)
+    end
+end
-        local innate_spirit_scale =
+function p.fill_tooltip(frame)
-            (hero_data["LevelScaling"] and hero_data["LevelScaling"]["TechPower"]) or 0
+    local item_name = frame.args[1]
+    if not item_name then return "Item name missing" end
-        if not display_scaling_icons then scaling_strs = "" end
+    local debug = tonumber(frame.args.debug) or 0
+    local item = get_json_item(item_name)
+    if not item then return "Item not found" end
-        if type(stat_value) == "boolean" then
+    local ItemData = require("Module:ItemData")
-            stat_value = tostring(stat_value)
+    local lines = {
-        else
+	    "{{Infobox item",
-            stat_value = util_module.round_to_sig_fig(stat_value, 5)
+	    "| item_name = " .. item_name
-        end
+	}
+	if item.StreetBrawl == true then
+	    table.insert(lines, "| street_brawl = true")
+	end
-        local cell_inner = string.format(
+    ----------------------------------------------------------------------
-            '<span class="stat-num">%s</span><span class="stat-scaling">%s</span>',
+    -- Check if AbilityCooldown or AbilityChargeUpTime exists in sections
-            stat_value,
+    ----------------------------------------------------------------------
-            scaling_strs
+    local cooldown_found_in_sections = false
-        )
+    local chargeup_found_in_sections = false
+    for _, section in ipairs(item.TooltipSections or {}) do
-        local weapon_table = hero_data.Weapon
+         for _, entry in ipairs(section.Entries or {}) do
-         if is_alt_fire and weapon_table and weapon_table.AltFire then
+             for _, prop in ipairs(entry.Properties or {}) do
-             weapon_table = weapon_table.AltFire
+                if prop == "AbilityCooldown" then cooldown_found_in_sections = true end
-        end
+                if prop == "AbilityChargeUpTime" then chargeup_found_in_sections = true end
-        local hit_once = "false"
+             end
-        if (attr_key == "DPS" or attr_key == "SustainedDPS")
+             for _, prop in ipairs(entry.ImportantProperties or {}) do
-             and weapon_table
+                if prop == "AbilityCooldown" then cooldown_found_in_sections = true end
-             and weapon_table.HitOnceAcrossAllBullets
+                if prop == "AbilityChargeUpTime" then chargeup_found_in_sections = true end
-        then
+            end
-            hit_once = "true"
          end
-        local data_attrs = string.format(
-            'data-stat-name="%s" data-base="%s" data-spirit-scale="%s" data-level-scale="%s" data-innate-spirit-scale="%s" data-sort-value="%s" data-hit-once="%s"',
-            attr_key,
-            tostring(type(base_value) == "number" and util_module.round_to_sig_fig(base_value, 3) or base_value),
-            tonumber(spirit_scale) or 0,
-            (attr_key == "TechPower") and "0" or (tonumber(level_scale) or 0),
-            innate_spirit_scale or 0,
-            stat_value,
-            hit_once
-        )
-        return string.format('<td style="white-space: nowrap;" %s>%s</td>', data_attrs, cell_inner)
      end
-     -- Generate a hero's primary stat row
+     ----------------------------------------------------------------------
-     local function generatePrimaryRow(hero_data, hero_key, has_alt)
+     -- Innate stats
-        local row_str = ""
+    ----------------------------------------------------------------------
-        local hero_name_local = localize(hero_key, hero_key)
+    local innate_index = 1
-        local hero_name_en = hero_data["Name"]
+    for _, section in ipairs(item.TooltipSections or {}) do
-        local template_args = {[1] = hero_name_en, l1 = hero_name_local}
+        if section.Type == "EArea_Innate" then
-        local hero_icon = mw.getCurrentFrame():expandTemplate{ title = "Template:HeroIcon", args = template_args }
+            for _, entry in ipairs(section.Entries or {}) do
-        local hero_cell_content = hero_icon
+                 for _, prop in ipairs(entry.Properties or {}) do
-        if has_alt then
+                     if prop ~= "AbilityCooldown" and prop ~= "AbilityChargeUpTime" then
-            hero_cell_content = '[[#alt-fire-' .. hero_key .. '|+]] ' .. hero_cell_content
+                        -- allow_conditional = false for innate stats (your fix)
-        end
+                        local val = format_stat(item_name, prop, false, debug, false)
-        local sort_name = (hero_data["Name"] or hero_key):gsub("^The ", "")
+                        if val then
-        row_str = row_str .. '<td style="position: sticky; left: 0; z-index: 10; background-color: var(--background-color-base-2); isolation: isolate; overflow: hidden; min-width: 150px;" data-sort-value="' .. sort_name .. '">' .. hero_cell_content .. '</td>'
+                            table.insert(lines, string.format("| item_stat%d = %s", innate_index, val))
-        for _, category in ipairs(attribute_orders["category_order"]) do
+                            innate_index = innate_index + 1
-            if stats_to_include[category] ~= nil then
+                        end
-                 for _, attr_key in ipairs(stats_to_include[category]) do
+                    end
-                     row_str = row_str .. buildStatCell(hero_data, hero_key, attr_key, false, category)
                  end
              end
          end
-        return "<tr>" .. row_str .. "</tr>"
      end
-     -- Generate an expandable alt-fire sub-row (weapon stats only)
+     ----------------------------------------------------------------------
-     local function generateAltFireSubRow(hero_data, hero_key)
+    -- Passive stats
-        local row_str = ""
+     ----------------------------------------------------------------------
-        local hero_name_local = localize(hero_key, hero_key)
+    local passive_counter = 1
-         local hero_name_en = hero_data["Name"]
+    for _, section in ipairs(item.TooltipSections or {}) do
-        local template_args = {[1] = hero_name_en, l1 = hero_name_local}
+         if section.Type ~= "EArea_Innate" and section.Type ~= "EArea_Active" then
-        local hero_icon = mw.getCurrentFrame():expandTemplate{ title = "Template:HeroIcon", args = template_args }
+            for _, entry in ipairs(section.Entries or {}) do
-        local hero_cell_content = hero_icon .. ' <small style="color:#aaa;">(Alt‑fire)</small>'
+                local loc = entry.LocString and entry.LocString:gsub("#","") or nil
-        local sort_name = (hero_data["Name"] or hero_key):gsub("^The ", "")
+                if loc then
-        row_str = row_str .. '<td style="position: sticky; left: 0; z-index: 9; background-color: #202122; isolation: isolate; overflow: hidden; min-width: 150px;" data-sort-value="' .. sort_name .. '">' .. hero_cell_content .. '</td>'
+                    table.insert(lines, string.format(
-        for _, category in ipairs(attribute_orders["category_order"]) do
+                        "| passive%d_description = {{#invoke:Lang|get_string|%s|item_name=%s}}",
-            if stats_to_include[category] ~= nil then
+                        passive_counter, loc, item_name
-                 for _, attr_key in ipairs(stats_to_include[category]) do
+                    ))
-                     if category == "Weapon" then
+                end
-                         row_str = row_str .. buildStatCell(hero_data, hero_key, attr_key, true, category)
-                    else
+                local stat_index = 1
-                         row_str = row_str .. '<td></td>'
+                local seen_props = {}
+                -- ImportantProperties: allow_conditional = true (via format_property_for_infobox)
+                 for _, prop in ipairs(entry.ImportantProperties or {}) do
+                     if prop ~= "AbilityCooldown" and prop ~= "AbilityChargeUpTime"
+                       and is_property_in_lang_data(prop) and not seen_props[prop] then
+                         local val = format_property_for_infobox(item_name, prop, false, debug)
+                        if val then
+                            table.insert(lines, string.format("| passive%d_stat%d = %s", passive_counter, stat_index, val))
+                            stat_index = stat_index + 1
+                            seen_props[prop] = true
+                         end
                      end
                  end
-            end
-        end
-        return '<tr class="alt-fire-sub" data-parent="' .. hero_key .. '">' .. row_str .. '</tr>'
-    end
-    -- Build all body rows
+                -- Properties: allow_conditional = false (your fix)
-    for _, hero_entry in ipairs(sorted_heroes) do
+                for _, prop in ipairs(entry.Properties or {}) do
-        local hero_key  = hero_entry.key
+                    if prop ~= "AbilityCooldown" and prop ~= "AbilityChargeUpTime"
-        local hero_data = hero_entry.data
+                       and is_property_in_lang_data(prop) and not seen_props[prop] then
-        local has_alt = hero_data.Weapon and hero_data.Weapon.AltFire and true or false
+                        local val = format_stat(item_name, prop, false, debug, false)
-        body_str = body_str .. generatePrimaryRow(hero_data, hero_key, has_alt)
+                        if val then
-        if has_alt then
+                            table.insert(lines, string.format("| passive%d_stat%d = %s", passive_counter, stat_index, val))
-            body_str = body_str .. generateAltFireSubRow(hero_data, hero_key)
+                            stat_index = stat_index + 1
-        end
+                            seen_props[prop] = true
-    end
+                        end
+                    end
+                end
-    -- Pre-pass: determine which stats have any scaling, and which have both types.
+                -- AbilityCooldown
-    -- Used to set column widths in the header.
+                for _, prop_list in ipairs({entry.Properties or {}, entry.ImportantProperties or {}}) do
-    local stats_with_any_scaling  = {}
+                    for _, prop in ipairs(prop_list) do
-    local stats_with_both_scaling = {}
+                        if prop == "AbilityCooldown" then
-    for _, hero_entry in ipairs(sorted_heroes) do
+                            local cd = format_stat(item_name, prop, true, debug)
-        local hero_data = hero_entry.data
+                            if cd then
-        for _, category in ipairs(attribute_orders["category_order"]) do
+                                table.insert(lines, string.format("| passive%d_cooldown = %s", passive_counter, cd))
-            if stats_to_include[category] ~= nil then
+                             end
-                for _, attr_key in ipairs(stats_to_include[category]) do
-                    -- Primary scaling
-                    local scaling_data = hero_data_module.get_hero_scaling_data(hero_data, attr_key)
-                    if scaling_data ~= nil and next(scaling_data) ~= nil then
-                        stats_with_any_scaling[attr_key] = true
-                        local has_spirit, has_level = false, false
-                        for _, scaling_type in pairs(scaling_data) do
-                             if scaling_type == "Spirit" then has_spirit = true
-                            elseif scaling_type == "Level" then has_level = true end
                          end
-                        if has_spirit and has_level then stats_with_both_scaling[attr_key] = true end
                      end
+                end
-                    -- Alt-fire scaling (only for stats present in the AltFire table)
+                -- AbilityChargeUpTime
-                    if hero_data.Weapon
+                for _, prop_list in ipairs({entry.Properties or {}, entry.ImportantProperties or {}}) do
-                        and hero_data.Weapon.AltFire
+                    for _, prop in ipairs(prop_list) do
-                        and hero_data.Weapon.AltFire[attr_key] ~= nil
+                        if prop == "AbilityChargeUpTime" then
-                    then
+                             local cu = format_stat(item_name, prop, true, debug)
-                        if attr_key ~= "ClipSize" then
+                            if cu then
-                            local alt_scaling = hero_data_module.get_hero_scaling_data(hero_data, attr_key .. "AltFire")
+                                table.insert(lines, string.format("| passive%d_chargeup = %s", passive_counter, cu))
-                            if alt_scaling and next(alt_scaling) ~= nil then
-                                stats_with_any_scaling[attr_key] = true
-                                local has_spirit_alt, has_level_alt = false, false
-                                for _, stype in pairs(alt_scaling) do
-                                    if stype == "Spirit" then has_spirit_alt = true
-                                    elseif stype == "Level" then has_level_alt = true end
-                                end
-                                if has_spirit_alt and has_level_alt then stats_with_both_scaling[attr_key] = true end
-                             else
-                                if attr_key == "DPS" or attr_key == "SustainedDPS" then
-                                    local alt_stats = hero_data.Weapon.AltFire
-                                    local dps_type = attr_key == "DPS" and 'burst' or 'sustained'
-                                    local lv = compute_dps_scaling(hero_data, alt_stats, dps_type, "Level")
-                                    local sp = compute_dps_scaling(hero_data, alt_stats, dps_type, "Spirit")
-                                    lv = util_module.round_to_sig_fig(lv, 5)
-                                    sp = util_module.round_to_sig_fig(sp, 5)
-                                    if lv ~= 0 or sp ~= 0 then
-                                        stats_with_any_scaling[attr_key] = true
-                                        if lv ~= 0 and sp ~= 0 then
-                                            stats_with_both_scaling[attr_key] = true
-                                        end
-                                    end
-                                end
                              end
                          end
                      end
                  end
+                passive_counter = passive_counter + 1
              end
          end
      end
-     -- Build table header row
+     ----------------------------------------------------------------------
-     local headers_str = '<th style="position: sticky; left: 0; top: -1px; z-index: 12; background-color: var(--background-color-base-5); isolation: isolate; min-width: 150px;">Hero</th>'
+    -- Active stats
-     local category_data = attribute_module.get_category_data()
+     ----------------------------------------------------------------------
-     local postfix_key_map = {
+     local active_index = 1
-         ["ReloadDelay"] = "StatDesc_ReloadTime_postfix",
+     for _, section in ipairs(item.TooltipSections or {}) do
-        ["BulletsPerShot"] = "",
+         if section.Type == "EArea_Active" then
-        ["BulletsPerBurst"] = "",
+            for _, entry in ipairs(section.Entries or {}) do
-        ["BurstInterShotInterval"] = "StatDesc_ReloadTime_postfix",
+                if entry.LocString then
-        ["ReloadSingle"] = "",
+                    table.insert(lines, string.format(
-        ["BonusAttackRange"] = "StatDesc_WeaponRangeFalloffMax_postfix",
+                        "| active%d_description = {{#invoke:Lang|get_string|%s|item_name=%s}}",
-        ["SustainedDPS"] = "DPS_postfix",
+                        active_index, entry.LocString:gsub("#",""), item_name
-        ["RoundsPerSecondAtMaxSpin"] = "",
+                    ))
-        ["CritDamageBonusPercent"]   = "StatDesc_CritDamageBonusScale_postfix",
+                end
-		["CritDamageReceivedPercent"] = "StatDesc_CritDamageReceivedScale_postfix",
-        ["BulletLifesteal"] = "BulletLifestealPercentHero_postfix",
+                local stat_index = 1
-        ["GroundDashSpeed"] = "DashSpeed_postfix"
+                local seen_props = {}
-    }
-    for _, category in ipairs(attribute_orders["category_order"]) do
+                -- ImportantProperties: allow_conditional = true (via format_property_for_infobox)
-        local category_attrs = attributes_data[category]
+                for _, prop in ipairs(entry.ImportantProperties or {}) do
-        local category_rgb   = category_data[category]["rgb"]
+                    if prop ~= "AbilityCooldown" and prop ~= "AbilityChargeUpTime"
-        if stats_to_include[category] ~= nil then
+                       and is_property_in_lang_data(prop) and not seen_props[prop] then
-            for _, attr_key in ipairs(stats_to_include[category]) do
+                        local val = format_property_for_infobox(item_name, prop, false, debug)
-                local attr_data = category_attrs[attr_key]
+                        if val then
+                            table.insert(lines, string.format("| active%d_stat%d = %s", active_index, stat_index, val))
-                -- Fallback: if the stat is missing from this category, check all other categories
+                            stat_index = stat_index + 1
-                if attr_data == nil then
+                            seen_props[prop] = true
-                    for _, fallback_cat_data in pairs(attributes_data) do
+                        end
-                        if fallback_cat_data[attr_key] ~= nil then
+                    end
-                             attr_data = fallback_cat_data[attr_key]
+                end
-                            break
+                -- Properties: allow_conditional = false (your fix)
+                for _, prop in ipairs(entry.Properties or {}) do
+                    if prop ~= "AbilityCooldown" and prop ~= "AbilityChargeUpTime"
+                       and is_property_in_lang_data(prop) and not seen_props[prop] then
+                        local val = format_stat(item_name, prop, false, debug, false)
+                        if val then
+                            table.insert(lines, string.format("| active%d_stat%d = %s", active_index, stat_index, val))
+                            stat_index = stat_index + 1
+                             seen_props[prop] = true
                          end
                      end
                  end
-                 local attr_localized, postfix
+                 -- AbilityCooldown
-                 if attr_data ~= nil then
+                 for _, prop_list in ipairs({entry.Properties or {}, entry.ImportantProperties or {}}) do
-                     attr_localized = lang_module.get_string(attr_data["label"])
+                     for _, prop in ipairs(prop_list) do
-                    if attr_localized == nil or attr_localized == "" then
+                        if prop == "AbilityCooldown" then
-                        attr_localized = util_module.add_space_before_cap(attr_key)
+                            local cd = format_stat(item_name, prop, true, debug)
+                            if cd then
+                                table.insert(lines, string.format("| active%d_cooldown = %s", active_index, cd))
+                            end
+                        end
                      end
-                    postfix = lang_module.get_string(attr_data["postfix"])
-                    if postfix == nil or postfix == "" then postfix = ""
-                    else postfix = " (" .. postfix .. ")" end
-                    if attr_key == "BulletRadius" then postfix = " (cm)" end
-                else
-                    attr_localized = dictionary_module.translate(attr_key)
-                    postfix = lang_module.get_string(postfix_key_map[attr_key])
-                    if postfix == nil then return "attr_key " .. attr_key .. " must be added to postfix_key_map" end
-                    if postfix ~= "" then postfix = " (" .. postfix .. ")" end
                  end
-                 local th_style = 'position: sticky; top: -1px; z-index: 3; background-color: rgb(' .. category_rgb .. ');'
-                if stats_with_both_scaling[attr_key] then
+                 -- AbilityChargeUpTime
-                    th_style = th_style .. ' min-width: 130px;'
+                for _, prop_list in ipairs({entry.Properties or {}, entry.ImportantProperties or {}}) do
-                elseif stats_with_any_scaling[attr_key] then
+                    for _, prop in ipairs(prop_list) do
-                     th_style = th_style .. ' min-width: 75px;'
+                        if prop == "AbilityChargeUpTime" then
+                            local cu = format_stat(item_name, prop, true, debug)
+                            if cu then
+                                table.insert(lines, string.format("| active%d_chargeup = %s", active_index, cu))
+                            end
+                        end
+                     end
                  end
-                 headers_str = headers_str .. '<th style="' .. th_style .. '">' .. attr_localized .. postfix .. "</th>"
+                 active_index = active_index + 1
+            end
+        end
+    end
+    ----------------------------------------------------------------------
+    -- Global fallback for AbilityCooldown (your fix: attaches to active section)
+    ----------------------------------------------------------------------
+    if not cooldown_found_in_sections and not chargeup_found_in_sections and item.AbilityCooldown then
+        local cd = format_stat(item_name, "AbilityCooldown", true, debug)
+        if cd then
+            local has_active = false
+            for _, section in ipairs(item.TooltipSections or {}) do
+                if section.Type == "EArea_Active" then has_active = true; break end
+            end
+            if has_active then
+                table.insert(lines, "| active1_cooldown = " .. cd)
+            else
+                table.insert(lines, "| item_stat_cooldown = " .. cd)
              end
          end
      end
-    headers_str = "<tr>" .. headers_str .. "</tr>"
-     return string.format(
+     if not chargeup_found_in_sections and item.AbilityChargeUpTime then
-         '<div id="hero-comparison-container" data-max-power="%s" data-max-spirit="%s">' ..
+        local cu = format_stat(item_name, "AbilityChargeUpTime", true, debug)
-         '<div style="overflow: auto; max-height: 70vh; width: 100%%;">' ..
+         if cu then
-         '<table class="wikitable sortable" style="table-layout: auto; width: 100%%;" id="hero-comparison-table">%s%s</table>' ..
+            table.insert(lines, "| item_stat_chargeup = " .. cu)
-         '</div></div>',
+        end
-        max_power, max_spirit, headers_str, body_str
+    end
-     )
+    ----------------------------------------------------------------------
+    -- Components
+    ----------------------------------------------------------------------
+    for i = 1, 2 do
+        local comp = ItemData.get_component_name {
+            args = { item_name, i }
+        }
+        if comp and comp ~= "" then
+            table.insert(lines, string.format("| component%d_name = %s", i, comp))
+        end
+    end
+    ----------------------------------------------------------------------
+    -- Is Component Of (your tier-sorted fix)
+    ----------------------------------------------------------------------
+    local parents = get_component_of_sorted(item_name)
+    for i, key in ipairs(parents) do
+        local parent_name = data[key] and data[key]["Name"] or ""
+         if parent_name ~= "" then
+            table.insert(lines, string.format("| iscomponentof%d_name = %s", i, parent_name))
+        end
+    end
+    ----------------------------------------------------------------------
+    -- Sounds (always manual, passed as sound1= sound2= etc.)
+    ----------------------------------------------------------------------
+    for key, value in pairs(frame.args) do
+         local index = tostring(key):match("^sound(%d+)$")
+        if index and value ~= "" then
+            table.insert(lines, string.format("| sound%s = %s", index, value))
+        end
+    end
+    ----------------------------------------------------------------------
+    table.insert(lines, "}}")
+    local output = table.concat(lines, "\n")
+    if debug == 1 or debug == 2 then
+         return output
+    end
+     return mw.getCurrentFrame():preprocess(output)
 end
 return p