emik/Jane
1
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix Saint mechanics and Wee phrasing in non-cryptid

Browse source
This commit is contained in:
Emik 2025-05-11 02:49:34 +02:00
parent 9de61821c5
commit 91a5163b20
Signed by: emik
GPG key ID: 09CDFF9E5703688D
4 changed files with 24 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
manifest.json
View file

@ -17,5 +17,5 @@
"conflicts": [
"Jen"
],
"version": "1.5.8"
"version": "1.5.9"
}

10
src/back.lua
View file

@ -95,8 +95,6 @@ local function back(x)
}
end
local eternal_text = Cryptid and "Absolute" or "Eternal"
back {
key = "nitro",
atlas = "janedecks",
@ -608,17 +606,23 @@ local function two(x)
end
end
local eternal_text = Cryptid and "Absolute" or "Eternal"
back {
key = "weeck",
atlas = "janedecks",
pos = {x = 4, y = 1},
loc_txt = {
name = "Weeck",
text = {
text = Cryptid and {
"Start with an {C:purple,E:1}" .. eternal_text,
"{C:attention}Wee Joker {}and a deck",
"containing {C:attention}2 {C:purple,E:1}" .. eternal_text,
"{C:attention}2's {}of {C:attention}each suit",
} or {
"Start with an {C:purple,E:1}" .. eternal_text,
"{C:attention}Wee Joker {}and a deck",
"of {C:attention}2 2's {}of {C:attention}each suit",
},
},
alt_loc_txt = {

8
src/edition.lua
View file

@ -28,12 +28,12 @@ SMODS.Edition({
name = "Polygloss",
label = "Polygloss",
text = Cryptid and {
"{C:chips}+#1#{}, {X:chips,C:white}x#2#{} & {X:chips,C:dark_edition}^#3#{} Chips",
"{C:mult}+#4#{}, {X:mult,C:white}x#5#{} & {X:mult,C:dark_edition}^#6#{} Mult",
"{C:chips}+#1#{}, {X:chips,C:white}X#2#{} & {X:chips,C:dark_edition}^#3#{} Chips",
"{C:mult}+#4#{}, {X:mult,C:white}X#5#{} & {X:mult,C:dark_edition}^#6#{} Mult",
"{C:money}$#7# {}when scored",
} or {
"{C:chips}+#1#{} & {X:chips,C:white}x#2#{}",
"{C:mult}+#3#{} & {X:mult,C:white}x#4#{}",
"{C:chips}+#1#{} & {X:chips,C:white}X#2#{} Chips",
"{C:mult}+#3#{} & {X:mult,C:white}X#4#{} Mult",
"{C:money}$#5# {}when scored",
},
},

21
src/slugcat.lua
View file

@ -539,10 +539,7 @@ SMODS.Joker {
}
end,
update = function(_, card, _)
if card.ability.extra.is_attuned then
card.debuff = false
card.debuff_immune = true
end
card.debuff_immune = card.ability.extra.is_attuned
if card.added_to_deck and card.children.center and card.children.floating_sprite then
local extra = card.ability.extra
@ -589,21 +586,27 @@ SMODS.Joker {
end
if extra.is_attuned then
card.debuff = false
if card.ability then
card.ability.perishable = false
card.ability.perish_tally = 1e9
end
if ({[false] = context.repetition, [true] = not context.joker_main})[not not Cryptid] then
if Cryptid and not context.joker_main then
return
end
if not Cryptid and not context.other_joker and (not context.individual or context.cardarea ~= G.play) then
return
end
local attune = attunement()
local trigger = ({
e_holo = {mult_mod = 50},
e_foil = {chip_mod = 250},
e_polychrome = {xmult_mod = 2.5},
e_holo = {mult = 50},
e_foil = {chips = 250},
e_polychrome = {x_mult = 2.5},
e_jane_polygloss = {
mult = 10,
chips = 10,
@ -618,7 +621,7 @@ SMODS.Joker {
[Cryptid and "EEmult_mod" or "Emult_mod"] = attune,
message = (Cryptid and "^^" or "^") .. attune .. " Chips & Mult",
},
})[Cryptid and "e_jane_moire" or ((context.other_card or {}).edition or {}).key]
})[Cryptid and "e_jane_moire" or ((context.other_card or context.other_joker or {}).edition or {}).key]
if trigger then
trigger.card = card