Compare commits
7 commits
| Author | SHA1 | Date | |
|---|---|---|---|
| e1e0ce0661 | |||
| 8cf3988bcc | |||
| ac2157799e | |||
| 97d50cbb48 | |||
| 270b163c22 | |||
| 396a1ff322 | |||
| 12d7e17b72 |
|
|
@ -20,11 +20,11 @@ continuation_indent = 4
|
|||
|
||||
# this mean utf8 length , if this is 'unset' then the line width is no longer checked
|
||||
# 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
|
||||
# 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
|
||||
table_separator_style = none
|
||||
|
|
|
|||
6
.vscode/settings.json
vendored
|
|
@ -1,6 +0,0 @@
|
|||
{
|
||||
"Lua.diagnostics.globals": [
|
||||
"Jen",
|
||||
"Jane"
|
||||
]
|
||||
}
|
||||
BIN
assets/1x/afterimage.png
Normal file
|
After Width: | Height: | Size: 4.2 KiB |
|
Before Width: | Height: | Size: 5.8 KiB After Width: | Height: | Size: 3.1 KiB |
BIN
assets/2x/afterimage.png
Normal file
|
After Width: | Height: | Size: 3.3 KiB |
|
Before Width: | Height: | Size: 2.6 KiB After Width: | Height: | Size: 2.6 KiB |
|
Before Width: | Height: | Size: 3.3 KiB After Width: | Height: | Size: 1.6 KiB |
|
Before Width: | Height: | Size: 79 KiB After Width: | Height: | Size: 79 KiB |
|
Before Width: | Height: | Size: 13 KiB After Width: | Height: | Size: 13 KiB |
|
|
@ -44,6 +44,14 @@ return {
|
|||
},
|
||||
},
|
||||
Spectral = {
|
||||
c_Roland_afterimage = {
|
||||
name = "Afterimage",
|
||||
text = {
|
||||
"Add {C:dark_edition}Negative {}to {C:attention}#1#",
|
||||
"selected card in hand",
|
||||
"{C:red}#2#{} hand size",
|
||||
},
|
||||
},
|
||||
c_Roland_void = {
|
||||
name = "Void",
|
||||
text = {
|
||||
|
|
@ -54,4 +62,12 @@ return {
|
|||
},
|
||||
},
|
||||
},
|
||||
misc = {
|
||||
challenge_names = {
|
||||
c_Roland_Jokerful = "Jokerful",
|
||||
},
|
||||
v_text = {
|
||||
ch_c_Roland_Jokerful = {"Only the {C:common}default Joker{} can appear in shops"},
|
||||
},
|
||||
},
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
"author": [
|
||||
"Emik"
|
||||
],
|
||||
"version": "1.3.1",
|
||||
"version": "1.4.3",
|
||||
"badge_colour": "8BE9FD",
|
||||
"main_file": "src/main.lua",
|
||||
"badge_text_colour": "44475A",
|
||||
|
|
|
|||
|
|
@ -10,10 +10,10 @@ end
|
|||
local function common_hand()
|
||||
return (G.GAME or {}).current_round and F.reduce(
|
||||
G.GAME.hands,
|
||||
{name = "High Card", order = -1 / 0, played = 0},
|
||||
{ name = "High Card", order = -1 / 0, played = 0 },
|
||||
function(a, v, k)
|
||||
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,
|
||||
pairs
|
||||
).name or "High Card"
|
||||
|
|
@ -41,10 +41,10 @@ SMODS.Atlas {
|
|||
SMODS.Joker {
|
||||
key = "escapey",
|
||||
atlas = "escapey",
|
||||
pos = {x = 0, y = 0},
|
||||
sinis = {x = 2, y = 0},
|
||||
soul_pos = {x = 1, y = 0},
|
||||
config = {extra = {level_up_by = 1}},
|
||||
pos = { x = 0, y = 0 },
|
||||
sinis = { x = 2, y = 0 },
|
||||
soul_pos = { x = 1, y = 0 },
|
||||
config = { extra = { level_up_by = 1 } },
|
||||
cost = 8,
|
||||
rarity = 3,
|
||||
eternal_compat = true,
|
||||
|
|
@ -52,16 +52,19 @@ SMODS.Joker {
|
|||
blueprint_compat = false,
|
||||
loc_vars = function(_, _, card)
|
||||
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 merge = G.jokers
|
||||
and F.count(F.filter(G.jokers.cards, is_mergeable_with(card))) > 0
|
||||
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 {}
|
||||
|
||||
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 {}
|
||||
|
||||
return {
|
||||
|
|
@ -107,7 +110,7 @@ SMODS.Joker {
|
|||
F.filter(G.jokers.cards, is_mergeable_with(card)),
|
||||
function(v)
|
||||
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
|
||||
)
|
||||
|
||||
|
|
@ -162,22 +165,25 @@ SMODS.Joker {
|
|||
F.foreach(
|
||||
F.filter(G.consumeables.cards, destructible),
|
||||
function(v)
|
||||
v:start_dissolve({HEX("57ecab")}, nil, 1.6)
|
||||
v:start_dissolve({ HEX("57ecab") }, nil, 1.6)
|
||||
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(
|
||||
G.GAME.tags,
|
||||
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
|
||||
)
|
||||
|
||||
level_up_hand(card, hand, nil, object_count * card.ability.extra.level_up_by)
|
||||
|
||||
update_hand_text(
|
||||
{sound = "button", volume = 0.7, pitch = 1.1, delay = 0},
|
||||
{mult = 0, chips = 0, handname = "", level = ""}
|
||||
{ sound = "button", volume = 0.7, pitch = 1.1, delay = 0 },
|
||||
{ mult = 0, chips = 0, handname = "", level = "" }
|
||||
)
|
||||
end,
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,3 @@
|
|||
SMODS.Sound({key = "void", path = "void.ogg"})
|
||||
|
||||
local function can_use()
|
||||
return not ((G.play and #G.play.cards > 0 or
|
||||
G.CONTROLLER.locked or
|
||||
|
|
@ -9,6 +7,15 @@ local function can_use()
|
|||
G.STATE ~= G.STATES.PLAY_TAROT)
|
||||
end
|
||||
|
||||
SMODS.Sound({key = "void", path = "void.ogg"})
|
||||
|
||||
SMODS.Atlas {
|
||||
px = 71,
|
||||
py = 95,
|
||||
key = "afterimage",
|
||||
path = "afterimage.png",
|
||||
}
|
||||
|
||||
SMODS.Atlas {
|
||||
px = 71,
|
||||
py = 95,
|
||||
|
|
@ -16,6 +23,42 @@ SMODS.Atlas {
|
|||
path = "void.png",
|
||||
}
|
||||
|
||||
SMODS.Consumable {
|
||||
key = "afterimage",
|
||||
set = "Spectral",
|
||||
pos = {x = 0, y = 0},
|
||||
cost = 6,
|
||||
atlas = "afterimage",
|
||||
config = {extra = {amount = 1, hand = -1}},
|
||||
loc_vars = function(_, _, card)
|
||||
return {vars = {card.ability.extra.amount, card.ability.extra.hand}}
|
||||
end,
|
||||
can_use = function(_, card)
|
||||
return can_use() and card.ability.extra.amount == #Bakery_API.get_highlighted()
|
||||
end,
|
||||
use = function(_, card, _, _)
|
||||
for _, v in ipairs(Bakery_API.get_highlighted()) do
|
||||
G.E_MANAGER:add_event(Event {
|
||||
delay = 0.1,
|
||||
func = function()
|
||||
v:set_edition({negative = true})
|
||||
v:juice_up(0.5, 0.5)
|
||||
return true
|
||||
end,
|
||||
})
|
||||
end
|
||||
|
||||
G.E_MANAGER:add_event(Event {
|
||||
delay = 0.1,
|
||||
func = function()
|
||||
G.hand:change_size(card.ability.extra.hand)
|
||||
Bakery_API.unhighlight_all()
|
||||
return true
|
||||
end,
|
||||
})
|
||||
end,
|
||||
}
|
||||
|
||||
SMODS.Consumable {
|
||||
key = "void",
|
||||
set = "Spectral",
|
||||
|
|
|
|||