Skip to content

Commit 44a6aec

Browse files
committed
fix duplicate calculation keys
1 parent 5c1c88c commit 44a6aec

File tree

2 files changed

+27
-27
lines changed

2 files changed

+27
-27
lines changed

Cryptid.lua

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -246,6 +246,15 @@ function SMODS.injectItems(...)
246246
{ rarity = "cry_exotic", base_mult = 20, order = 4, colour = G.C.RARITY.cry_exotic }
247247

248248
Cryptid.reload_localization()
249+
local keys = {}
250+
local a_keys = {}
251+
for i, v in pairs(SMODS.calculation_keys) do
252+
if not keys[v] then
253+
a_keys[#a_keys+1] = v
254+
end
255+
keys[v] = true
256+
end
257+
SMODS.calculation_keys = a_keys
249258
end
250259

251260
local old_repitions = SMODS.calculate_repetitions

lib/overrides.lua

Lines changed: 18 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -2027,6 +2027,20 @@ if SMODS and SMODS.Mods and (not SMODS.Mods.Talisman or not SMODS.Mods.Talisman.
20272027
break
20282028
end
20292029
end
2030+
local calculation_keys = {
2031+
e_mult=true,
2032+
emult=true,
2033+
Emult_mod=true,
2034+
e_chips=true,
2035+
echips=true,
2036+
Echip_mod=true
2037+
}
2038+
for _, v in pairs(SMODS.calculation_keys) do
2039+
if calculation_keys[v] then
2040+
calculation_keys[v] = nil
2041+
break
2042+
end
2043+
end
20302044
local scie = SMODS.calculate_individual_effect
20312045
function SMODS.calculate_individual_effect(effect, scored_card, key, amount, from_edition)
20322046
if (key == "e_chips" or key == "echips" or key == "Echip_mod") and amount ~= 1 then
@@ -2120,33 +2134,10 @@ if SMODS and SMODS.Mods and (not SMODS.Mods.Talisman or not SMODS.Mods.Talisman.
21202134
return ret
21212135
end
21222136
end
2123-
for _, v in ipairs({
2124-
"e_mult",
2125-
"e_chips",
2126-
"ee_mult",
2127-
"ee_chips",
2128-
"eee_mult",
2129-
"eee_chips",
2130-
"hyper_mult",
2131-
"hyper_chips",
2132-
"emult",
2133-
"echips",
2134-
"eemult",
2135-
"eechips",
2136-
"eeemult",
2137-
"eeechips",
2138-
"hypermult",
2139-
"hyperchips",
2140-
"Emult_mod",
2141-
"Echip_mod",
2142-
"EEmult_mod",
2143-
"EEchip_mod",
2144-
"EEEmult_mod",
2145-
"EEEchip_mod",
2146-
"hypermult_mod",
2147-
"hyperchip_mod",
2148-
}) do
2149-
table.insert(SMODS.calculation_keys, v)
2137+
Cryptid.calc_keys = calculation_keys
2138+
print(calculation_keys)
2139+
for i, v in pairs(calculation_keys) do
2140+
table.insert(SMODS.calculation_keys, i)
21502141
end
21512142
if not smods_xchips then
21522143
for _, v in ipairs({ "x_chips", "xchips", "Xchip_mod" }) do

0 commit comments

Comments
 (0)