Module:Abilities/card: Difference between revisionsGive feedback
Better fontsize calculation for upgrades who don't have readymade lang keys |
m undo the undo, it works now Tag: Undo |
||
| (29 intermediate revisions by 8 users not shown) | |||
| Line 2: | Line 2: | ||
local commonutils = require "Module:Utilities" | local commonutils = require "Module:Utilities" | ||
local utils = require "Module:Abilities/utils" | local utils = require "Module:Abilities/utils" | ||
local Icon = require"Module:Abilities/icon" | |||
local textfit = require "Module:TextFit" | |||
local p = {} | local p = {} | ||
local data = mw.loadJsonData("Data:AbilityCards.json") | local data = mw.loadJsonData("Data:AbilityCards.json") | ||
| Line 65: | Line 63: | ||
local info1_desc = get_info_desc(hero_key, ability_num, 1) | local info1_desc = get_info_desc(hero_key, ability_num, 1) | ||
local info1_main_boxes = get_main_boxes(hero_key, ability_num, 1) | local info1_main_boxes = get_main_boxes(hero_key, ability_num, 1) | ||
local info1_alt_boxes = get_alt_boxes(hero_key, ability_num, 1) | local info1_alt_boxes = get_alt_boxes(hero_key, ability_num, 1) | ||
| Line 122: | Line 101: | ||
channel_time = ability.AbilityChannelTime and ability.AbilityChannelTime.Value ~= 9999 and ability.AbilityChannelTime.Value, | channel_time = ability.AbilityChannelTime and ability.AbilityChannelTime.Value ~= 9999 and ability.AbilityChannelTime.Value, | ||
channel_time_scale = get_attr_scale(ability.AbilityChannelTime), | |||
channel_time_scale_type = get_attr_scale_type(ability.AbilityChannelTime), | |||
channel_time_scale_multiply = get_attr_scale_multiply(ability.AbilityChannelTime), | |||
radius = ability.Radius and ability.Radius.Value, | radius = ability.Radius and ability.Radius.Value, | ||
radius_scale = get_attr_scale(ability.Radius), | |||
radius_scale_type = get_attr_scale_type(ability.Radius), | |||
radius_scale_multiply = get_attr_scale_multiply(ability.Radius), | |||
range = ability.AbilityCastRange and ability.AbilityCastRange.Value, | range = ability.AbilityCastRange and ability.AbilityCastRange.Value, | ||
range_scale = get_attr_scale(ability.AbilityCastRange), | |||
range_scale_type = get_attr_scale_type(ability.AbilityCastRange), | |||
range_scale_multiply = get_attr_scale_multiply(ability.AbilityCastRange), | |||
duration = ability.AbilityDuration and ability.AbilityDuration.Value, | duration = ability.AbilityDuration and ability.AbilityDuration.Value, | ||
duration_scale = get_attr_scale(ability.AbilityDuration), | |||
duration_scale_type = get_attr_scale_type(ability.AbilityDuration), | |||
duration_scale_multiply = get_attr_scale_multiply(ability.AbilityDuration), | |||
-- ability_width = format_value_with_prepost(width_key, ability[width_key]), | -- ability_width = format_value_with_prepost(width_key, ability[width_key]), | ||
cooldown =ability.AbilityCooldown and ability.AbilityCooldown.Value, | cooldown =ability.AbilityCooldown and ability.AbilityCooldown.Value, | ||
cooldown_scale = get_attr_scale(ability.AbilityCooldown), | |||
cooldown_scale_type = get_attr_scale_type(ability.AbilityCooldown), | |||
cooldown_scale_multiply = get_attr_scale_multiply(ability.AbilityCooldown), | |||
charge_cooldown = ability.AbilityCooldownBetweenCharge and ability.AbilityCooldownBetweenCharge.Value ~= -1 and ability.AbilityCooldownBetweenCharge.Value, | charge_cooldown = ability.AbilityCooldownBetweenCharge and ability.AbilityCooldownBetweenCharge.Value ~= -1 and ability.AbilityCooldownBetweenCharge.Value, | ||
charge_cooldown_scale = get_attr_scale(ability.AbilityCooldownBetweenCharge), | |||
num_of_charges = ability.AbilityCharges and ability.AbilityCharges.Value, | charge_cooldown_scale_type = get_attr_scale_type(ability.AbilityCooldownBetweenCharge), | ||
charge_cooldown_scale_multiply = get_attr_scale_multiply(ability.AbilityCooldownBetweenCharge), | |||
num_of_charges = ability.AbilityCharges and ability.AbilityCharges.Value or 0, | |||
-- Info section #1 defined in "Info1" attribute | -- Info section #1 defined in "Info1" attribute | ||
| Line 204: | Line 195: | ||
end | end | ||
-- | -- An attribute may carry either a single scaling or a list of them. | ||
function | -- Extra entries are stat-category markers (duration, cooldown, range, radius, | ||
if not attr then | -- healing, charges) that always hold a value of 1 and are never displayed, so | ||
return nil | -- return the first entry that actually renders a badge. | ||
-- A zero-valued scaling is still returned when nothing else is displayable. The | |||
-- card renders it as an x0 placeholder, and the ability upgrade gadget fills | |||
-- that element in when an upgrade grants real scaling (Doorman's Doorway). | |||
local function pick_scale(attr) | |||
if not attr then | |||
return nil | |||
end | end | ||
local scale = attr.Scale | local scale = attr.Scale | ||
if type(scale) ~= 'table' then | |||
return nil | |||
end | |||
-- A single scaling is stored directly as an object | |||
if scale[1] == nil then | |||
return scale | |||
end | |||
local placeholder = nil | |||
for _, entry in ipairs(scale) do | |||
if type(entry) == 'table' and Icon.isDisplayedScale(entry.Type) then | |||
if entry.Value ~= 0 then | |||
return entry | |||
end | |||
placeholder = placeholder or entry | |||
end | |||
end | |||
return placeholder | |||
end | |||
-- Get scaling of attribute, return nil if none is found | |||
function get_attr_scale(attr) | |||
local scale = pick_scale(attr) | |||
if not scale then | if not scale then | ||
return nil | return nil | ||
end | end | ||
if scale. | if scale.Value == 0 then | ||
return nil | return nil | ||
end | |||
return commonutils.round_to_sig_fig(scale.Value, 3) | |||
end | |||
-- Get scaling type of attribute, return nil if none is found | |||
function get_attr_scale_type(attr) | |||
local scale = pick_scale(attr) | |||
if not scale then | |||
return nil | |||
end | end | ||
| Line 223: | Line 255: | ||
end | end | ||
return | return scale.Type | ||
end | |||
-- Check if scaling should be multiplied instead of added | |||
function get_attr_scale_multiply(attr) | |||
local scale = pick_scale(attr) | |||
if not scale then | |||
return nil | |||
end | |||
return scale.Multiply | |||
end | end | ||
| Line 292: | Line 334: | ||
for k, prop in ipairs(props) do -- use ipairs for ordered iteration | for k, prop in ipairs(props) do -- use ipairs for ordered iteration | ||
local value = prop.Value | local value = prop.Value | ||
local scale = pick_scale(prop) | |||
-- If it scales with melee damage, set the value using the hero's base melee to match in game visuals | -- If it scales with melee damage, set the value using the hero's base melee to match in game visuals | ||
if | if scale and scale.Type == 'melee' then | ||
local hero = get_hero_data(hero_key) | local hero = get_hero_data(hero_key) | ||
value = prop.Value + hero.LightMeleeDamage * prop. | value = prop.Value + hero.LightMeleeDamage * scale.Value | ||
elseif scale and scale.Type == 'heavy_melee' then | |||
local hero = get_hero_data(hero_key) | |||
value = prop.Value + hero.HeavyMeleeDamage * scale.Value | |||
elseif scale and scale.Type == 'weapon_power' then | |||
local hero = get_hero_data(hero_key) | |||
value = hero.Weapon.BulletDamage * hero.Weapon.BulletsPerBurst * (scale.Value + 100) / 100 | |||
end | end | ||
local icon = | local icon = Icon.getAttrIcon(prop.Type) | ||
local main_box | local main_box | ||
| Line 309: | Line 358: | ||
value = value, | value = value, | ||
status_effect = prop.StatusEffect, | status_effect = prop.StatusEffect, | ||
icon = icon.img, | icon = icon and icon.img, | ||
icon_link = icon.link, | icon_link = icon and icon.link, | ||
icon_color = icon.color, | icon_color = icon and icon.color, | ||
icon_size = icon.size, | icon_size = icon and icon.size, | ||
scale_value = | scale_value = scale and commonutils.round_to_sig_fig(scale.Value, 3), | ||
scale_type = | scale_type = scale and scale.Type, | ||
-- allow nil value here as some status effects don't have a value but should not be hidden | -- allow nil value here as some status effects don't have a value but should not be hidden | ||
hide = value == 0 and "true" or "false", | hide = value == 0 and "true" or "false", | ||
| Line 326: | Line 375: | ||
key = prop.Key, | key = prop.Key, | ||
value = value, | value = value, | ||
icon = icon.img, | icon = icon and icon.img, | ||
icon_link = icon.link, | icon_link = icon and icon.link, | ||
icon_color = icon.color, | icon_color = icon and icon.color, | ||
icon_size = icon.size, | icon_size = icon and icon.size, | ||
scale_value = | scale_value = scale and commonutils.round_to_sig_fig(scale.Value, 3), | ||
scale_type = | scale_type = scale and scale.Type, | ||
hide = (value == nil or value == 0) and "true" or "false", | hide = (value == nil or value == 0) and "true" or "false", | ||
} | } | ||
| Line 367: | Line 416: | ||
local alt_boxes = {} | local alt_boxes = {} | ||
for k, prop in ipairs(props) do | |||
-- Some props don't have values, as those come from upgrades | |||
-- For now, we will ignore these and only show data for the base ability | |||
if prop.Value then | |||
local icon = Icon.getAttrIcon(prop.Type) | |||
local value = prop.Value | |||
local scale = pick_scale(prop) | |||
if scale and scale.Type == 'weapon_power' then | |||
local hero = get_hero_data(hero_key) | |||
value = hero.Weapon.BulletDamage * hero.Weapon.BulletsPerBurst * (scale.Value + 100) / 100 | |||
end | |||
local alt_box = frame:expandTemplate{ | |||
title = "Ability_card_v2/Card/AltBox", | |||
args = { | |||
key = prop.Key, | |||
value = value, | |||
icon = icon and icon.img, | |||
icon_link = icon and icon.link, | |||
icon_color = icon and icon.color, | |||
icon_size = icon and icon.size, | |||
scale_value = scale and commonutils.round_to_sig_fig(scale.Value, 3), | |||
scale_type = scale and scale.Type, | |||
hide = value == 0 and "true" or "false", | |||
} | |||
} | |||
table.insert(alt_boxes, alt_box) | |||
end | |||
end | |||
return alt_boxes | return alt_boxes | ||
| Line 394: | Line 452: | ||
local UPGRADE_COST_MAP = {1, 2, 5} | local UPGRADE_COST_MAP = {1, 2, 5} | ||
-- Upgrade description sizing. These are design proportions, not copies of any | |||
-- CSS measurement: the browser supplies the box width through the container | |||
-- query on .ac-upgrade-descwrap, so nothing here needs updating if the card's | |||
-- widths, margins or padding change. | |||
local UG_DESC_ASPECT = 0.357 -- max height of the text block, as a multiple of its width | |||
local UG_LINE_HEIGHT = 1.4 -- emitted alongside the size so the two cannot drift | |||
local UG_MAX_CQW = 11.9 -- ceiling, as % of the text width (~16px on a full-width card) | |||
local UG_MIN_CQW = 6.7 -- floor (~9px) | |||
function get_upgrade_boxes(hero_key, ability_num) | function get_upgrade_boxes(hero_key, ability_num) | ||
local ability = utils.get_ability_card_data(hero_key, ability_num) | local ability = utils.get_ability_card_data(hero_key, ability_num) | ||
| Line 403: | Line 471: | ||
local upgrade_boxes = {} | local upgrade_boxes = {} | ||
for k, upgrade in | for k, upgrade in ipairs(upgrades) do | ||
local description = lang.get_string(upgrade.DescKey) | local description = lang.get_string(upgrade.DescKey) | ||
-- bypass some keys if they are mistakenly left in game files | -- bypass some keys if they are mistakenly left in game files | ||
| Line 425: | Line 492: | ||
end | end | ||
-- | -- Expand once, then size from the text the reader actually sees, rather | ||
local | -- than from a character count of the unexpanded string. | ||
local rendered = frame:preprocess(description) | |||
local cqw = textfit.fit(rendered, { | |||
aspect = UG_DESC_ASPECT, | |||
lineHeight = UG_LINE_HEIGHT, | |||
max = UG_MAX_CQW, | |||
min = UG_MIN_CQW, | |||
}) | |||
local upgrade_scale = pick_scale(upgrade) | |||
local upgrade_box = frame:expandTemplate{ | local upgrade_box = frame:expandTemplate{ | ||
title = "Ability_card_v2/Card/UpgradeBox", | title = "Ability_card_v2/Card/UpgradeBox", | ||
| Line 440: | Line 508: | ||
index = k, | index = k, | ||
cost = UPGRADE_COST_MAP[k], | cost = UPGRADE_COST_MAP[k], | ||
description = | description = rendered, | ||
scale_value = | scale_value = upgrade_scale and commonutils.round_to_sig_fig(upgrade_scale.Value, 3), | ||
scale_type = | scale_type = upgrade_scale and upgrade_scale.Type, | ||
fontsize = | -- Measured against the box's own width, so the size stays correct | ||
-- when the card renders below its 500px max-width. | |||
fontsize = string.format('%.2fcqw', cqw), | |||
lineheight = UG_LINE_HEIGHT | |||
} | } | ||
} | } | ||
| Line 454: | Line 525: | ||
function create_description(prop, frame) | function create_description(prop, frame) | ||
local | local value_lines = {} -- normal stat changes | ||
local | local scale_lines = {} -- "Increased X scaling" notes | ||
local seen = {} | local seen = {} | ||
for k, v in pairs(prop) do | for k, v in pairs(prop) do | ||
if k == 'DescKey' then | |||
-- skip | |||
elseif type(v) == 'table' then | |||
local has_value = v.Value ~= nil | |||
local has_scale = v.Scale and v.Scale.Value and v.Scale.Value ~= 0 | |||
-- Value is 0 and we have a scaling change → scaling note | |||
if has_value and has_scale and v.Value == 0 then | |||
if not seen["scale_" .. k] then | |||
local scale_type = v.Scale.Type | |||
local capitalized = scale_type:sub(1,1):upper() .. scale_type:sub(2) | |||
table.insert(scale_lines, "Increased " .. capitalized .. " scaling") | |||
seen["scale_" .. k] = true | |||
end | |||
-- Only a scaling change, no value → scaling note (future bot correction) | |||
elseif not has_value and has_scale then | |||
if not seen["scale_" .. k] then | |||
local scale_type = v.Scale.Type | |||
local capitalized = scale_type:sub(1,1):upper() .. scale_type:sub(2) | |||
table.insert(scale_lines, "Increased " .. capitalized .. " scaling") | |||
seen["scale_" .. k] = true | |||
end | |||
-- Normal value (0 without scale, or non‑zero with/without scale) | |||
elseif has_value then | |||
local formatted_value = utils.format_value_with_prepost(k, v.Value, frame) | |||
local attr_name = lang.get_string(k .. '_label') | |||
local key = formatted_value .. '|' .. attr_name | |||
if not seen[key] then | |||
table.insert(value_lines, string.format('%s %s', formatted_value, attr_name)) | |||
seen[key] = true | |||
end | |||
end | |||
else | |||
-- Plain number/string (e.g. OutgoingDamagePenaltyPercent = -15) | |||
local formatted_value = utils.format_value_with_prepost(k, v, frame) | |||
local attr_name = lang.get_string(k .. '_label') | |||
local key = formatted_value .. '|' .. attr_name | |||
if not seen[key] then | |||
table.insert(value_lines, string.format('%s %s', formatted_value, attr_name)) | |||
seen[key] = true | |||
end | |||
end | end | ||
end | end | ||
-- Combine: value lines first, then scaling lines | |||
local all_lines = {} | |||
for _, line in ipairs(value_lines) do | |||
table.insert(all_lines, line) | |||
end | |||
for _, line in ipairs(scale_lines) do | |||
table.insert(all_lines, line) | |||
end | |||
end | |||
return table.concat(all_lines, '<br>') | |||
end | end | ||
| Line 594: | Line 668: | ||
icon = lang.get_string(ability.Key, 'en') .. '.png', | icon = lang.get_string(ability.Key, 'en') .. '.png', | ||
description = mw.getCurrentFrame():preprocess(lang.get_string(ability.DescKey)), | description = mw.getCurrentFrame():preprocess(lang.get_string(ability.DescKey)), | ||
channel_time = ability.AbilityChannelTime and ability.AbilityChannelTime.Value ~= 9999 and ability.AbilityChannelTime.Value, | |||
channel_time_scale = get_attr_scale(ability.AbilityChannelTime), | |||
channel_time_scale_type = get_attr_scale_type(ability.AbilityChannelTime), | |||
channel_time_scale_multiply = get_attr_scale_multiply(ability.AbilityChannelTime), | |||
radius = ability.Radius and ability.Radius.Value, | radius = ability.Radius and ability.Radius.Value, | ||
radius_scale = get_attr_scale(ability.Radius), | |||
radius_scale_type = get_attr_scale_type(ability.Radius), | |||
radius_scale_multiply = get_attr_scale_multiply(ability.Radius), | |||
range = ability.AbilityCastRange and ability.AbilityCastRange.Value, | range = ability.AbilityCastRange and ability.AbilityCastRange.Value, | ||
range_scale = get_attr_scale(ability.AbilityCastRange), | |||
range_scale_type = get_attr_scale_type(ability.AbilityCastRange), | |||
range_scale_multiply = get_attr_scale_multiply(ability.AbilityCastRange), | |||
duration = ability.AbilityDuration and ability.AbilityDuration.Value, | duration = ability.AbilityDuration and ability.AbilityDuration.Value, | ||
duration_scale = get_attr_scale(ability.AbilityDuration), | |||
duration_scale_type = get_attr_scale_type(ability.AbilityDuration), | |||
duration_scale_multiply = get_attr_scale_multiply(ability.AbilityDuration), | |||
-- ability_width = format_value_with_prepost(width_key, ability[width_key]), | -- ability_width = format_value_with_prepost(width_key, ability[width_key]), | ||
cooldown =ability.AbilityCooldown and ability.AbilityCooldown.Value, | cooldown =ability.AbilityCooldown and ability.AbilityCooldown.Value, | ||
cooldown_scale = get_attr_scale(ability.AbilityCooldown), | |||
charge_cooldown = ability.AbilityCooldownBetweenCharge and ability.AbilityCooldownBetweenCharge.Value, | cooldown_scale_type = get_attr_scale_type(ability.AbilityCooldown), | ||
cooldown_scale_multiply = get_attr_scale_multiply(ability.AbilityCooldown), | |||
num_of_charges = ability.AbilityCharges and ability.AbilityCharges.Value | charge_cooldown = ability.AbilityCooldownBetweenCharge and ability.AbilityCooldownBetweenCharge.Value ~= -1 and ability.AbilityCooldownBetweenCharge.Value, | ||
charge_cooldown_scale = get_attr_scale(ability.AbilityCooldownBetweenCharge), | |||
charge_cooldown_scale_type = get_attr_scale_type(ability.AbilityCooldownBetweenCharge), | |||
charge_cooldown_scale_multiply = get_attr_scale_multiply(ability.AbilityCooldownBetweenCharge), | |||
num_of_charges = ability.AbilityCharges and ability.AbilityCharges.Value or 0, | |||
} | } | ||
} | } | ||