Compare commits

...

5 commits
1.4.0 ... main

Author SHA1 Message Date
e1e0ce0661
Speed up animation when many tags exist 2025-06-29 00:09:03 +02:00
8cf3988bcc
Remove redundant files 2025-06-24 14:35:23 +02:00
ac2157799e
Remove legendary background 2025-06-24 14:32:26 +02:00
97d50cbb48
Add escape hatch 2025-06-24 14:32:07 +02:00
270b163c22
Update .editorconfig 2025-05-02 23:42:36 +02:00
10 changed files with 22 additions and 22 deletions

View file

@ -20,11 +20,11 @@ continuation_indent = 4
# this mean utf8 length , if this is 'unset' then the line width is no longer checked # this mean utf8 length , if this is 'unset' then the line width is no longer checked
# this option decides when to chopdown the code # this option decides when to chopdown the code
max_line_length = lf max_line_length = 120
# optional crlf/lf/cr/auto, if it is 'auto', in windows it is crlf other platforms are lf # optional crlf/lf/cr/auto, if it is 'auto', in windows it is crlf other platforms are lf
# in neovim the value 'auto' is not a valid option, please use 'unset' # in neovim the value 'auto' is not a valid option, please use 'unset'
end_of_line = auto end_of_line = lf
# none/ comma / semicolon / only_kv_colon # none/ comma / semicolon / only_kv_colon
table_separator_style = none table_separator_style = none

View file

@ -1,6 +0,0 @@
{
"Lua.diagnostics.globals": [
"Jen",
"Jane"
]
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.8 KiB

After

Width:  |  Height:  |  Size: 3.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.3 KiB

After

Width:  |  Height:  |  Size: 3.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.6 KiB

After

Width:  |  Height:  |  Size: 2.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.3 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 79 KiB

After

Width:  |  Height:  |  Size: 79 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 13 KiB

View file

@ -6,7 +6,7 @@
"author": [ "author": [
"Emik" "Emik"
], ],
"version": "1.4.0", "version": "1.4.3",
"badge_colour": "8BE9FD", "badge_colour": "8BE9FD",
"main_file": "src/main.lua", "main_file": "src/main.lua",
"badge_text_colour": "44475A", "badge_text_colour": "44475A",

View file

@ -10,10 +10,10 @@ end
local function common_hand() local function common_hand()
return (G.GAME or {}).current_round and F.reduce( return (G.GAME or {}).current_round and F.reduce(
G.GAME.hands, G.GAME.hands,
{name = "High Card", order = -1 / 0, played = 0}, { name = "High Card", order = -1 / 0, played = 0 },
function(a, v, k) function(a, v, k)
return (a.played < v.played or (a.played == v.played) and (a.order > v.order)) and return (a.played < v.played or (a.played == v.played) and (a.order > v.order)) and
{name = k, order = v.order, played = v.played} or a { name = k, order = v.order, played = v.played } or a
end, end,
pairs pairs
).name or "High Card" ).name or "High Card"
@ -41,10 +41,10 @@ SMODS.Atlas {
SMODS.Joker { SMODS.Joker {
key = "escapey", key = "escapey",
atlas = "escapey", atlas = "escapey",
pos = {x = 0, y = 0}, pos = { x = 0, y = 0 },
sinis = {x = 2, y = 0}, sinis = { x = 2, y = 0 },
soul_pos = {x = 1, y = 0}, soul_pos = { x = 1, y = 0 },
config = {extra = {level_up_by = 1}}, config = { extra = { level_up_by = 1 } },
cost = 8, cost = 8,
rarity = 3, rarity = 3,
eternal_compat = true, eternal_compat = true,
@ -52,16 +52,19 @@ SMODS.Joker {
blueprint_compat = false, blueprint_compat = false,
loc_vars = function(_, _, card) loc_vars = function(_, _, card)
local loc_self = G.localization.descriptions.Joker.j_Roland_escapey local loc_self = G.localization.descriptions.Joker.j_Roland_escapey
---@diagnostic disable-next-line: undefined-global
local sinister = (Jen or {}).sinister or G.escapey_sinister
local quotes = loc_self.quotes local quotes = loc_self.quotes
local merge = G.jokers local merge = G.jokers
and F.count(F.filter(G.jokers.cards, is_mergeable_with(card))) > 0 and F.count(F.filter(G.jokers.cards, is_mergeable_with(card))) > 0
and loc_self.merge or {} and loc_self.merge or {}
local normal = (merge[1] or (Jen or Jane or {}).sinister) and {} or local normal = (merge[1] or sinister) and {} or
pseudorandom_element(quotes.normal, pseudoseed("EscapeyQuotes")) or {} pseudorandom_element(quotes.normal, pseudoseed("EscapeyQuotes")) or {}
local scared = (merge[1] or not (Jen or Jane or {}).sinister) and {} or local scared = (merge[1] or not sinister) and {} or
pseudorandom_element(quotes.scared, pseudoseed("EscapeyQuotes")) or {} pseudorandom_element(quotes.scared, pseudoseed("EscapeyQuotes")) or {}
return { return {
@ -107,7 +110,7 @@ SMODS.Joker {
F.filter(G.jokers.cards, is_mergeable_with(card)), F.filter(G.jokers.cards, is_mergeable_with(card)),
function(v) function(v)
sum = sum + v.ability.extra.level_up_by * (v.getEvalQty and v:getEvalQty() or 1) sum = sum + v.ability.extra.level_up_by * (v.getEvalQty and v:getEvalQty() or 1)
v:start_dissolve({HEX("57ecab")}, nil, 1.6) v:start_dissolve({ HEX("57ecab") }, nil, 1.6)
end end
) )
@ -162,22 +165,25 @@ SMODS.Joker {
F.foreach( F.foreach(
F.filter(G.consumeables.cards, destructible), F.filter(G.consumeables.cards, destructible),
function(v) function(v)
v:start_dissolve({HEX("57ecab")}, nil, 1.6) v:start_dissolve({ HEX("57ecab") }, nil, 1.6)
end end
) )
local trigger = #G.GAME.tags >= 30 and "immediate" or "before"
local delay = #G.GAME.tags >= 30 and 0 or 1 / #G.GAME.tags
F.foreach( F.foreach(
G.GAME.tags, G.GAME.tags,
function(v) function(v)
G.E_MANAGER:add_event(Event({trigger = "immediate", func = fast_delete(v)})) G.E_MANAGER:add_event(Event { trigger = trigger, blocking = #G.GAME.tags < 30, delay = delay, func = fast_delete(v) })
end end
) )
level_up_hand(card, hand, nil, object_count * card.ability.extra.level_up_by) level_up_hand(card, hand, nil, object_count * card.ability.extra.level_up_by)
update_hand_text( update_hand_text(
{sound = "button", volume = 0.7, pitch = 1.1, delay = 0}, { sound = "button", volume = 0.7, pitch = 1.1, delay = 0 },
{mult = 0, chips = 0, handname = "", level = ""} { mult = 0, chips = 0, handname = "", level = "" }
) )
end, end,
} }