The best compatibility hack you've ever seen
This commit is contained in:
parent
96c8732deb
commit
3b39632c17
GPG key ID:
6B0CD72A5E503BDF
13 changed files with 111 additions and 122 deletions
|
|
@ -19,5 +19,5 @@
|
|||
"conflicts": [
|
||||
"Jen"
|
||||
],
|
||||
"version": "1.7.13"
|
||||
"version": "1.7.14"
|
||||
}
|
||||
30
src/back.lua
30
src/back.lua
|
|
@ -102,35 +102,35 @@ back {
|
|||
loc_txt = {
|
||||
name = "Acceleration Deck",
|
||||
text = {
|
||||
Cryptid and "" or "{C:attention}Ante increases twice{} as strong",
|
||||
Jane.cry and "" or "{C:attention}Ante increases twice{} as strong",
|
||||
"After defeating the {C:attention}Boss Blind{},",
|
||||
Cryptid and "set {C:attention}ante {}to the {C:attention}next" or "",
|
||||
Cryptid and "{C:attention}triangle number {}and create" or "",
|
||||
Cryptid and "an {C:spectral,E:1}Empowered Tag" or "create a {C:dark_edition}Negative {C:spectral,E:1}Soul",
|
||||
Jane.cry and "set {C:attention}ante {}to the {C:attention}next" or "",
|
||||
Jane.cry and "{C:attention}triangle number {}and create" or "",
|
||||
Jane.cry and "an {C:spectral,E:1}Empowered Tag" or "create a {C:dark_edition}Negative {C:spectral,E:1}Soul",
|
||||
},
|
||||
},
|
||||
alt_loc_txt = {
|
||||
name = "Jolt Sleeve",
|
||||
text = {
|
||||
Cryptid and "{C:attention}Ante number {}scales with {C:attention}square numbers" or "{C:attention}Ante increases twice{} as strong",
|
||||
Jane.cry and "{C:attention}Ante number {}scales with {C:attention}square numbers" or "{C:attention}Ante increases twice{} as strong",
|
||||
"After defeating the {C:attention}Small {}or {C:attention}Big Blind{},",
|
||||
Cryptid and "create a {C:spectral,E:1}Empowered Tag" or "create a {C:dark_edition}Negative {C:spectral,E:1}Soul",
|
||||
Jane.cry and "create a {C:spectral,E:1}Empowered Tag" or "create a {C:dark_edition}Negative {C:spectral,E:1}Soul",
|
||||
},
|
||||
},
|
||||
loc_vars = function(_, info_queue, _)
|
||||
if info_queue then
|
||||
info_queue[#info_queue + 1] = Cryptid and G.P_TAGS.tag_cry_empowered or G.P_CENTERS.c_soul
|
||||
info_queue[#info_queue + 1] = Jane.cry and G.P_TAGS.tag_cry_empowered or G.P_CENTERS.c_soul
|
||||
end
|
||||
|
||||
return {vars = {}}
|
||||
end,
|
||||
alt_apply = function(_)
|
||||
G.GAME.win_ante = Cryptid and G.GAME.win_ante * G.GAME.win_ante or G.GAME.win_ante * 4 - 1
|
||||
G.GAME.win_ante = Jane.cry and G.GAME.win_ante * G.GAME.win_ante or G.GAME.win_ante * 4 - 1
|
||||
G.GAME.alt_nitro = true
|
||||
G.GAME.nitro = true
|
||||
end,
|
||||
apply = function(_)
|
||||
G.GAME.win_ante = Cryptid and G.GAME.win_ante * (G.GAME.win_ante + 1) / 2 or G.GAME.win_ante * 2 - 1
|
||||
G.GAME.win_ante = Jane.cry and G.GAME.win_ante * (G.GAME.win_ante + 1) / 2 or G.GAME.win_ante * 2 - 1
|
||||
G.GAME.nitro = true
|
||||
end,
|
||||
alt_calculate = function(_, _, context)
|
||||
|
|
@ -212,7 +212,7 @@ back {
|
|||
end,
|
||||
}
|
||||
|
||||
if Cryptid then
|
||||
if Jane.cry then
|
||||
back {
|
||||
key = "mysterious",
|
||||
atlas = "janedecks",
|
||||
|
|
@ -430,14 +430,14 @@ back {
|
|||
name = "Orrery Deck",
|
||||
text = {
|
||||
"{C:attention}Hand stats {}are",
|
||||
"always " .. (Cryptid and "{C:cry_ascendant}" or "{C:attention}") .. "equalized",
|
||||
"always " .. (Jane.cry and "{C:cry_ascendant}" or "{C:attention}") .. "equalized",
|
||||
},
|
||||
},
|
||||
alt_loc_txt = {
|
||||
name = "Ephemeris Sleeve",
|
||||
text = {
|
||||
"{C:blue}Hands{}, {C:red}discards{}, and {C:money}money",
|
||||
"are always " .. (Cryptid and "{C:cry_ascendant}" or "{C:attention}") .. "equalized",
|
||||
"are always " .. (Jane.cry and "{C:cry_ascendant}" or "{C:attention}") .. "equalized",
|
||||
},
|
||||
},
|
||||
alt_apply = function(_)
|
||||
|
|
@ -562,7 +562,7 @@ local function two(x)
|
|||
end
|
||||
end
|
||||
|
||||
local eternal_text = Cryptid and "Absolute" or "Eternal"
|
||||
local eternal_text = Jane.cry and "Absolute" or "Eternal"
|
||||
|
||||
back {
|
||||
key = "weeck",
|
||||
|
|
@ -570,7 +570,7 @@ back {
|
|||
pos = {x = 4, y = 1},
|
||||
loc_txt = {
|
||||
name = "Weeck",
|
||||
text = Cryptid and {
|
||||
text = Jane.cry 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,
|
||||
|
|
@ -754,7 +754,7 @@ function ease_ante(mod)
|
|||
end
|
||||
|
||||
if G.GAME.nitro then
|
||||
mod = Cryptid and
|
||||
mod = Jane.cry and
|
||||
(G.GAME.round_resets.ante < 0 and -G.GAME.round_resets.ante or
|
||||
math.ceil(next_number(G.GAME.round_resets.ante) - G.GAME.round_resets.ante)) or
|
||||
(mod > 0 and mod * 2 or mod)
|
||||
|
|
|
|||
|
|
@ -36,9 +36,9 @@ SMODS.Blind {
|
|||
atlas = "janeblinds",
|
||||
pos = {x = 0, y = 0},
|
||||
vars = {},
|
||||
dollars = Cryptid and 7 or 5,
|
||||
dollars = Jane.cry and 7 or 5,
|
||||
defeat = function(_)
|
||||
if not Cryptid then
|
||||
if not Jane.cry then
|
||||
offset_operator(2 - Jane.get_operator())
|
||||
elseif not G.GAME.blind.disabled then
|
||||
offset_operator(1)
|
||||
|
|
@ -62,7 +62,7 @@ SMODS.Blind {
|
|||
end,
|
||||
}
|
||||
|
||||
if Cryptid then
|
||||
if Jane.cry then
|
||||
SMODS.Blind {
|
||||
loc_txt = {
|
||||
name = "The Insignia",
|
||||
|
|
@ -107,7 +107,7 @@ SMODS.Blind {
|
|||
atlas = "janeblinds",
|
||||
pos = {x = 0, y = 3},
|
||||
vars = {},
|
||||
dollars = Cryptid and 2 or 5,
|
||||
dollars = Jane.cry and 2 or 5,
|
||||
disable = function(self)
|
||||
self.disabled = true
|
||||
end,
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ SMODS.Atlas {
|
|||
path = Jane.config.texture_pack .. "/p_jane_boosters.png",
|
||||
}
|
||||
|
||||
if Cryptid then
|
||||
if Jane.cry then
|
||||
for i = 1, 2 do
|
||||
SMODS.Booster {
|
||||
key = "ministandard" .. i,
|
||||
|
|
|
|||
|
|
@ -5,10 +5,6 @@ SMODS.Sound({key = "e_moire", path = "e_moire.ogg"})
|
|||
SMODS.Sound({key = "e_polygloss", path = "e_polygloss.ogg"})
|
||||
|
||||
local function allow_moire()
|
||||
if Cryptid then
|
||||
return true
|
||||
end
|
||||
|
||||
for _, v in pairs(SMODS.find_card("j_jane_saint")) do
|
||||
if v.ability.extra.is_attuned then
|
||||
return true
|
||||
|
|
@ -27,7 +23,7 @@ SMODS.Edition({
|
|||
loc_txt = {
|
||||
name = "Polygloss",
|
||||
label = "Polygloss",
|
||||
text = Cryptid and {
|
||||
text = Jane.cry and {
|
||||
"{C:chips}+#1#{} Chips",
|
||||
"{C:mult}+#2#{}, {X:mult,C:white}X#3#{}, & {X:mult,C:dark_edition}^#4#{} Mult",
|
||||
"{C:money}$#5# {}when scored",
|
||||
|
|
@ -42,7 +38,7 @@ SMODS.Edition({
|
|||
chips = 12,
|
||||
x_mult = 1.2,
|
||||
p_dollars = 1,
|
||||
e_mult = Cryptid and 1.02 or nil,
|
||||
e_mult = Jane.cry and 1.02 or nil,
|
||||
},
|
||||
sound = {sound = "jane_e_polygloss", per = 1.2, vol = 0.4},
|
||||
weight = 10,
|
||||
|
|
@ -91,7 +87,7 @@ function Sprite:draw_shader(_shader, ...)
|
|||
end
|
||||
end
|
||||
|
||||
local jumbo_modifier = Cryptid and 100 or 2
|
||||
local jumbo_modifier = Jane.cry and 100 or 2
|
||||
|
||||
local jumbo = SMODS.Edition({
|
||||
key = "jumbo",
|
||||
|
|
@ -186,7 +182,7 @@ SMODS.Edition({
|
|||
"{X:mult,C:dark_edition}^#2#{C:mult} Mult",
|
||||
},
|
||||
},
|
||||
config = {e_chips = Cryptid and 0.8 or 0.9, e_mult = Cryptid and 1.2 or 1.1},
|
||||
config = {e_chips = Jane.cry and 0.8 or 0.9, e_mult = Jane.cry and 1.2 or 1.1},
|
||||
sound = {sound = "jane_e_moire", per = 1, vol = 0.7},
|
||||
weight = 2,
|
||||
extra_cost = 10,
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
for _, v in pairs({"7granddad", "betmma", "escapey", "honey", "oxy", "maxie", Cryptid and "peppino" or nil}) do
|
||||
for _, v in pairs({"7granddad", "betmma", "escapey", "honey", "oxy", "maxie", Jane.cry and "peppino" or nil}) do
|
||||
SMODS.Atlas {
|
||||
px = 71,
|
||||
py = 95,
|
||||
|
|
@ -15,7 +15,7 @@ SMODS.Sound({key = "corrupt_milestone", path = "corrupt_milestone.ogg"})
|
|||
SMODS.Sound({key = "corrupt_untick", path = "corrupt_untick.ogg"})
|
||||
SMODS.Sound({key = "corrupt_tick", path = "corrupt_tick.ogg"})
|
||||
|
||||
local exotic = Cryptid and "cry_exotic" or 4
|
||||
local exotic = Jane.cry and "cry_exotic" or 4
|
||||
|
||||
local food = {
|
||||
"j_gros_michel",
|
||||
|
|
@ -154,7 +154,7 @@ local esc = SMODS.Joker {
|
|||
"{C:inactive,s:0.75,E:1}#5#{C:red,s:1.5,E:1}#6#",
|
||||
},
|
||||
},
|
||||
config = {extra = {money = 2, xmoney = 1.5, max = 1000}},
|
||||
config = {extra = {money = 2, xmoney = 2, max = Jane.cry and 2000 or 200}},
|
||||
attributes = {"destroy_card", "economy", "tag"},
|
||||
pos = {x = 0, y = 0},
|
||||
sinis = {x = 2, y = 0},
|
||||
|
|
@ -235,14 +235,14 @@ local esc = SMODS.Joker {
|
|||
end
|
||||
end
|
||||
|
||||
local scaling = Cryptid and G.GAME.dollars or math.min(G.GAME.dollars, extra.max)
|
||||
local scaling = Jane.cry and G.GAME.dollars or math.min(G.GAME.dollars, extra.max)
|
||||
local tags = scaling * (math.pow(extra.xmoney, xtimes) - 1)
|
||||
ease_dollars(math.ceil(times * extra.money + tags))
|
||||
end,
|
||||
tag_threshold = 30,
|
||||
}
|
||||
|
||||
local _ = Cryptid or table.insert(
|
||||
local _ = Jane.cry or table.insert(
|
||||
esc.loc_txt.text,
|
||||
3,
|
||||
"{C:inactive,s:1.25}(Max of {C:money,s:1.25}$#2#{C:inactive,s:1.25})"
|
||||
|
|
@ -276,7 +276,7 @@ SMODS.Joker {
|
|||
"{C:inactive,s:0.75,E:1}#3#{C:red,s:1.5,E:1}#4#",
|
||||
},
|
||||
},
|
||||
config = {extra = {choices = Cryptid and 2 or 1}},
|
||||
config = {extra = {choices = Jane.cry and 2 or 1}},
|
||||
pos = {x = 0, y = 0},
|
||||
sinis = {x = 2, y = 0},
|
||||
soul_pos = {x = 1, y = 0},
|
||||
|
|
@ -440,7 +440,7 @@ SMODS.Joker {
|
|||
end,
|
||||
}
|
||||
|
||||
if Cryptid then
|
||||
if Cryptid and Cryptid.aliases then
|
||||
Cryptid.aliases["honey"] = "j_jane_honey"
|
||||
end
|
||||
|
||||
|
|
@ -522,7 +522,7 @@ SMODS.Joker {
|
|||
"{C:inactive,s:0.75,E:1}#11#{C:red,s:1.5,E:1}#12#",
|
||||
},
|
||||
},
|
||||
config = {extra = {corrupted_steel = Cryptid and 20 or 5, is_corrupted = false, milestone = 3, progress = 0}},
|
||||
config = {extra = {corrupted_steel = Jane.cry and 20 or 5, is_corrupted = false, milestone = 3, progress = 0}},
|
||||
pos = {x = 0, y = 0},
|
||||
sinis = {x = 2, y = 0},
|
||||
soul_pos = {x = 1, y = 0},
|
||||
|
|
@ -621,12 +621,12 @@ SMODS.Joker {
|
|||
end,
|
||||
}
|
||||
|
||||
if Cryptid then
|
||||
if Cryptid and Cryptid.aliases then
|
||||
Cryptid.aliases["oxy"] = "j_jane_oxy"
|
||||
end
|
||||
|
||||
local operator = Cryptid and "^" or "X"
|
||||
local operator_prefix = Cryptid and "{X:dark_edition,C:mult}" or "{X:mult,C:white}"
|
||||
local operator = Jane.cry and "^" or "X"
|
||||
local operator_prefix = Jane.cry and "{X:dark_edition,C:mult}" or "{X:mult,C:white}"
|
||||
|
||||
SMODS.Joker {
|
||||
key = "betmma",
|
||||
|
|
@ -635,16 +635,16 @@ SMODS.Joker {
|
|||
name = "Betmma",
|
||||
text = {
|
||||
operator_prefix .. "+" .. operator .. "#1#{C:mult} Mult{} for every",
|
||||
"{C:attention}" .. (Cryptid and "Unique " or "") .. "Voucher{} redeemed",
|
||||
"{C:attention}" .. (Jane.cry and "Unique " or "") .. "Voucher{} redeemed",
|
||||
"{C:inactive}(Currently " .. operator_prefix .. operator .. "#2#{C:inactive})",
|
||||
},
|
||||
},
|
||||
config = {extra = {tet = Cryptid and 0.25 or 0.5}},
|
||||
config = {extra = {tet = Jane.cry and 0.25 or 0.5}},
|
||||
pos = {x = 0, y = 0},
|
||||
soul_pos = {x = 1, y = 0},
|
||||
blueprint_compat = true,
|
||||
cost = Cryptid and 20 or 8,
|
||||
rarity = Cryptid and 4 or 3,
|
||||
cost = Jane.cry and 20 or 8,
|
||||
rarity = Jane.cry and 4 or 3,
|
||||
loc_vars = function(_, _, center)
|
||||
return {vars = {center.ability.extra.tet, 1 + (voucher_count() * center.ability.extra.tet)}}
|
||||
end,
|
||||
|
|
@ -660,15 +660,15 @@ SMODS.Joker {
|
|||
|
||||
return {
|
||||
card = card,
|
||||
colour = Cryptid and G.C.jane_RGB or nil,
|
||||
message = Cryptid and (operator .. number_format(num)) or nil,
|
||||
[Cryptid and "e_mult" or "x_mult"] = num,
|
||||
colour = Jane.cry and G.C.jane_RGB or nil,
|
||||
message = Jane.cry and (operator .. number_format(num)) or nil,
|
||||
[Jane.cry and "e_mult" or "x_mult"] = num,
|
||||
}, true
|
||||
end
|
||||
end,
|
||||
}
|
||||
|
||||
if not Cryptid then
|
||||
if not Jane.cry then
|
||||
return
|
||||
end
|
||||
|
||||
|
|
@ -686,8 +686,8 @@ SMODS.Joker {
|
|||
soul_pos = {x = 1, y = 0},
|
||||
atlas = "jane7granddad",
|
||||
blueprint_compat = true,
|
||||
cost = Cryptid and 49 or 7,
|
||||
rarity = Cryptid and exotic or 3,
|
||||
cost = Jane.cry and 49 or 7,
|
||||
rarity = Jane.cry and exotic or 3,
|
||||
loc_vars = function(_, _, center)
|
||||
return {vars = {center.ability.shopslots}}
|
||||
end,
|
||||
|
|
@ -706,19 +706,19 @@ SMODS.Joker {
|
|||
if context.other_card and context.other_card:get_id() == 7 and scj(context) then
|
||||
grand_dad(card)
|
||||
local palette = granddad_palette[math.random(#granddad_palette)]
|
||||
local rnd = pseudorandom(pseudoseed("granddad"), 1, Cryptid and 5 or 4)
|
||||
local rnd = pseudorandom(pseudoseed("granddad"), 1, Jane.cry and 5 or 4)
|
||||
|
||||
if rnd == 1 then
|
||||
return {
|
||||
message = Cryptid and "+777" or "+77",
|
||||
chips = Cryptid and 777 or 77,
|
||||
message = Jane.cry and "+777" or "+77",
|
||||
chips = Jane.cry and 777 or 77,
|
||||
colour = palette,
|
||||
card = card,
|
||||
}, true
|
||||
elseif rnd == 2 then
|
||||
return {
|
||||
message = Cryptid and "+777 Mult" or "+77 Mult",
|
||||
mult = Cryptid and 777 or 77,
|
||||
message = Jane.cry and "+777 Mult" or "+77 Mult",
|
||||
mult = Jane.cry and 777 or 77,
|
||||
colour = palette,
|
||||
card = card,
|
||||
}, true
|
||||
|
|
@ -731,8 +731,8 @@ SMODS.Joker {
|
|||
}, true
|
||||
elseif rnd == 4 then
|
||||
return {
|
||||
message = Cryptid and "X7 Mult" or "X1.77 Mult",
|
||||
x_mult = Cryptid and 7 or 1.77,
|
||||
message = Jane.cry and "X7 Mult" or "X1.77 Mult",
|
||||
x_mult = Jane.cry and 7 or 1.77,
|
||||
colour = palette,
|
||||
card = card,
|
||||
}, true
|
||||
|
|
@ -762,8 +762,8 @@ SMODS.Joker {
|
|||
pos = {x = 0, y = 0},
|
||||
soul_pos = {x = 1, y = 0},
|
||||
config = {extra = {base = 2}},
|
||||
cost = Cryptid and 20 or 8,
|
||||
rarity = Cryptid and 4 or 3,
|
||||
cost = Jane.cry and 20 or 8,
|
||||
rarity = Jane.cry and 4 or 3,
|
||||
blueprint_compat = true,
|
||||
loc_vars = function(_, _, card)
|
||||
return {vars = {card.ability.extra.base ^ food_jokers_count()}}
|
||||
|
|
@ -772,7 +772,7 @@ SMODS.Joker {
|
|||
local count = food_jokers_count()
|
||||
|
||||
if context.joker_main and count > 0 then
|
||||
return {[Cryptid and "e_mult" or "x_mult"] = card.ability.extra.base ^ count}
|
||||
return {[Jane.cry and "e_mult" or "x_mult"] = card.ability.extra.base ^ count}
|
||||
end
|
||||
end,
|
||||
}
|
||||
|
|
|
|||
15
src/main.lua
15
src/main.lua
|
|
@ -1,7 +1,5 @@
|
|||
local crying = Cryptid
|
||||
Cryptid = G.P_CENTERS.j_cry_crustulum and Cryptid
|
||||
|
||||
Jane = {
|
||||
cry = not not G.P_CENTERS.j_cry_m,
|
||||
config = {
|
||||
wee_sizemod = 1.25,
|
||||
texture_pack = "default",
|
||||
|
|
@ -9,12 +7,9 @@ Jane = {
|
|||
},
|
||||
}
|
||||
|
||||
-- Jane.misprintize = (Cryptid or {}).misprintize
|
||||
-- Jane.misprintize_tbl = (Cryptid or {}).misprintize_tbl
|
||||
-- Jane.misprinitze_val = (Cryptid or {}).misprintize_val
|
||||
Jane.rarity_ids = Cryptid and {1, 2, 3, "cry_epic", 4, "cry_exotic", "jane_junk"} or {1, 2, 3, 4, "jane_junk"}
|
||||
Jane.rarity_ids = Jane.cry and {1, 2, 3, "cry_epic", 4, "cry_exotic", "jane_junk"} or {1, 2, 3, 4, "jane_junk"}
|
||||
|
||||
Jane.rarity_names = Cryptid and {"Common", "Uncommon", "Rare", "Epic", "Legendary", "Exotic", "Junk"} or
|
||||
Jane.rarity_names = Jane.cry and {"Common", "Uncommon", "Rare", "Epic", "Legendary", "Exotic", "Junk"} or
|
||||
{"Common", "Uncommon", "Rare", "Legendary", "Junk"}
|
||||
|
||||
if not Jane.misprintize then
|
||||
|
|
@ -118,7 +113,7 @@ function Jane.card_status_text(
|
|||
end
|
||||
|
||||
function Jane.empowered()
|
||||
if Cryptid then
|
||||
if Jane.cry then
|
||||
add_tag(Tag("tag_cry_empowered"))
|
||||
return
|
||||
end
|
||||
|
|
@ -369,5 +364,3 @@ for _, v in ipairs({
|
|||
}) do
|
||||
assert(SMODS.load_file("src/" .. v .. ".lua"))()
|
||||
end
|
||||
|
||||
Cryptid = crying
|
||||
|
|
|
|||
|
|
@ -133,8 +133,8 @@ function Jane.misprintize_tbl(name, ref_tbl, ref_value, clear, override, stack,
|
|||
for k, v in pairs(tbl) do
|
||||
if (type(tbl[k]) ~= "table") or is_number(tbl[k]) then
|
||||
if is_number(tbl[k]) and not
|
||||
(k == "x_chips" and not Cryptid) and not
|
||||
(k == "h_x_chips" and not Cryptid) and not
|
||||
(k == "x_chips" and not Jane.cry) and not
|
||||
(k == "h_x_chips" and not Jane.cry) and not
|
||||
(k == "id") and not
|
||||
(k == "colour") and not
|
||||
(k == "suit_nominal") and not
|
||||
|
|
|
|||
|
|
@ -54,8 +54,8 @@ for _, v in pairs({
|
|||
}
|
||||
end
|
||||
|
||||
local epic = Cryptid and "cry_epic" or 3
|
||||
local exotic = Cryptid and "cry_exotic" or 4
|
||||
local epic = Jane.cry and "cry_epic" or 3
|
||||
local exotic = Jane.cry and "cry_exotic" or 4
|
||||
|
||||
SMODS.Rarity {
|
||||
key = "junk",
|
||||
|
|
@ -125,9 +125,9 @@ SMODS.Joker {
|
|||
name = "The Survivor",
|
||||
text = {
|
||||
"All cards held in",
|
||||
"hand also {C:attention}score" .. (Cryptid and " {}and" or ""),
|
||||
Cryptid and "considered as the" or nil,
|
||||
Cryptid and "{C:attention}first {}played card" or nil,
|
||||
"hand also {C:attention}score" .. (Jane.cry and " {}and" or ""),
|
||||
Jane.cry and "considered as the" or nil,
|
||||
Jane.cry and "{C:attention}first {}played card" or nil,
|
||||
},
|
||||
},
|
||||
pos = {x = 0, y = 0},
|
||||
|
|
@ -146,7 +146,7 @@ SMODS.Joker {
|
|||
text = {
|
||||
"{E:1}Succumbs to the",
|
||||
"{X:black,C:white,E:1}Rot{}, creating",
|
||||
(Cryptid and "an {C:spectral}Empowered Tag" or "a {C:dark_edition}Negative {C:spectral}Soul"),
|
||||
(Jane.cry and "an {C:spectral}Empowered Tag" or "a {C:dark_edition}Negative {C:spectral}Soul"),
|
||||
"after #1#",
|
||||
},
|
||||
},
|
||||
|
|
@ -156,15 +156,15 @@ SMODS.Joker {
|
|||
blueprint_compat = false,
|
||||
perishable_compat = false,
|
||||
soul_pos = {x = 1, y = 0},
|
||||
cost = Cryptid and 15 or 8,
|
||||
rarity = Cryptid and epic or 3,
|
||||
cost = Jane.cry and 15 or 8,
|
||||
rarity = Jane.cry and epic or 3,
|
||||
loc_vars = function(_, info_queue, card)
|
||||
local function rounds(amount)
|
||||
return " round" .. ((math.abs(amount) > 1 or math.abs(amount) == 0) and "s" or "")
|
||||
end
|
||||
|
||||
info_queue[#info_queue + 1] = G.P_CENTERS.j_jane_rot
|
||||
info_queue[#info_queue + 1] = Cryptid and G.P_CENTERS.c_cry_empowered or G.P_CENTERS.c_soul
|
||||
info_queue[#info_queue + 1] = Jane.cry and G.P_CENTERS.c_cry_empowered or G.P_CENTERS.c_soul
|
||||
local rounds_left = card.ability.extra.rounds_left
|
||||
local sold = rounds_left - hunter[5]
|
||||
|
||||
|
|
@ -274,15 +274,15 @@ SMODS.Joker {
|
|||
name = "The Gourmand",
|
||||
text = {
|
||||
"Values on {C:attention}consumables",
|
||||
"are {C:attention}" .. (Cryptid and "multiplied" or "added") .. "{} by {C:attention}#1#" .. (Cryptid and "" or "{} when"),
|
||||
(Cryptid and "when " or "") .. "they are created",
|
||||
"are {C:attention}" .. (Jane.cry and "multiplied" or "added") .. "{} by {C:attention}#1#" .. (Jane.cry and "" or "{} when"),
|
||||
(Jane.cry and "when " or "") .. "they are created",
|
||||
"{C:inactive}(If possible)",
|
||||
},
|
||||
},
|
||||
loc_vars = function(_, _, center)
|
||||
return {vars = {center.ability.modifier}}
|
||||
end,
|
||||
config = {modifier = Cryptid and 2 or 1},
|
||||
config = {modifier = Jane.cry and 2 or 1},
|
||||
pos = {x = 0, y = 0},
|
||||
soul_pos = {x = 1, y = 0},
|
||||
blueprint_compat = false,
|
||||
|
|
@ -345,7 +345,7 @@ function Card:set_ability(center, initial, delay_sprites)
|
|||
self.gc and
|
||||
self:gc().key ~= "c_base" and
|
||||
string.sub(self:gc().key, 1, 2) == "c_" then
|
||||
if Cryptid then
|
||||
if Jane.cry then
|
||||
local mod = 1
|
||||
|
||||
for _, v in pairs(SMODS.find_card("j_jane_gourmand")) do
|
||||
|
|
@ -373,16 +373,16 @@ SMODS.Joker {
|
|||
text = {
|
||||
"Use to {C:red}destroy",
|
||||
"selected {C:attention}playing cards",
|
||||
not Cryptid and "{C:red,E:1}Self-destructs" or nil,
|
||||
not Cryptid and "after {C:attention}#1# #2#" or nil,
|
||||
not Jane.cry and "{C:red,E:1}Self-destructs" or nil,
|
||||
not Jane.cry and "after {C:attention}#1# #2#" or nil,
|
||||
},
|
||||
},
|
||||
pos = {x = 0, y = 0},
|
||||
soul_pos = {x = 1, y = 0},
|
||||
config = {extra = {uses = 2}},
|
||||
blueprint_compat = false,
|
||||
cost = Cryptid and 50 or 20,
|
||||
rarity = Cryptid and exotic or 3,
|
||||
cost = Jane.cry and 50 or 20,
|
||||
rarity = Jane.cry and exotic or 3,
|
||||
loc_vars = function(_, _, card)
|
||||
local uses = card.ability.extra.uses
|
||||
return {vars = {uses, uses == 1 and "use" or "uses"}}
|
||||
|
|
@ -400,7 +400,7 @@ SMODS.Joker {
|
|||
v:start_dissolve()
|
||||
end
|
||||
|
||||
if Cryptid then
|
||||
if Jane.cry then
|
||||
return
|
||||
end
|
||||
|
||||
|
|
@ -438,8 +438,8 @@ SMODS.Joker {
|
|||
pos = {x = 0, y = 0},
|
||||
soul_pos = {x = 1, y = 0},
|
||||
blueprint_compat = false,
|
||||
cost = Cryptid and 12 or 20,
|
||||
rarity = Cryptid and epic or 4,
|
||||
cost = Jane.cry and 12 or 20,
|
||||
rarity = Jane.cry and epic or 4,
|
||||
Bakery_can_use = function(_, card)
|
||||
if card.debuff or not
|
||||
Jane.can_use() or not
|
||||
|
|
@ -570,7 +570,7 @@ function Card:set_debuff(should_debuff)
|
|||
end
|
||||
|
||||
local function attunement()
|
||||
return (G.GAME or {}).weeckweeck and 2 or (Cryptid and 1.002 or 1.25)
|
||||
return (G.GAME or {}).weeckweeck and 2 or (Jane.cry and 1.002 or 1.25)
|
||||
end
|
||||
|
||||
SMODS.Joker {
|
||||
|
|
@ -578,7 +578,7 @@ SMODS.Joker {
|
|||
atlas = "janesaint",
|
||||
loc_txt = {
|
||||
name = "The Saint{C:jane_RGB}#1#",
|
||||
text = Cryptid and {
|
||||
text = Jane.cry and {
|
||||
"{C:attention}Use {}to toggle {X:legendary,C:white}Eternal{} stickers to the left",
|
||||
"{C:spectral}Analog{}, {C:spectral}Ankh{}, {C:spectral}Gateway{}, and",
|
||||
"{C:spectral,s:0.95}Summoning {s:0.95}will {C:attention,s:0.95}not destroy Jokers",
|
||||
|
|
@ -590,21 +590,21 @@ SMODS.Joker {
|
|||
"{C:inactive,s:1.25}#6#{C:attention,s:1.25}#7#{C:inactive,s:1.25}#8#{C:inactive}#9#",
|
||||
},
|
||||
},
|
||||
config = {extra = {karma = 0, max_karma = Cryptid and 10 or 2}},
|
||||
config = {extra = {karma = 0, max_karma = Jane.cry and 10 or 2}},
|
||||
pos = {x = 0, y = 0},
|
||||
soul_pos = {x = 1, y = 0},
|
||||
cost = 20,
|
||||
rarity = 4,
|
||||
blueprint_compat = true,
|
||||
loc_vars = function(_, info_queue, card)
|
||||
if Cryptid then
|
||||
if Jane.cry then
|
||||
info_queue[#info_queue + 1] = G.P_CENTERS.c_cry_analog
|
||||
end
|
||||
|
||||
info_queue[#info_queue + 1] = Cryptid and G.P_CENTERS.c_ankh or nil
|
||||
info_queue[#info_queue + 1] = Cryptid and G.P_CENTERS.c_cry_gateway or G.P_CENTERS.c_soul
|
||||
info_queue[#info_queue + 1] = Jane.cry and G.P_CENTERS.c_ankh or nil
|
||||
info_queue[#info_queue + 1] = Jane.cry and G.P_CENTERS.c_cry_gateway or G.P_CENTERS.c_soul
|
||||
|
||||
if Cryptid then
|
||||
if Jane.cry then
|
||||
info_queue[#info_queue + 1] = G.P_CENTERS.c_cry_summoning
|
||||
end
|
||||
|
||||
|
|
@ -614,7 +614,7 @@ SMODS.Joker {
|
|||
local attuned = karma >= max_karma
|
||||
|
||||
return {
|
||||
vars = Cryptid and {
|
||||
vars = Jane.cry and {
|
||||
attuned and " (Attuned)" or "",
|
||||
attuned and "" or "Attune ",
|
||||
attuned and "" or "after using ",
|
||||
|
|
@ -693,11 +693,11 @@ SMODS.Joker {
|
|||
card.ability.perish_tally = 1e9
|
||||
end
|
||||
|
||||
if Cryptid and not context.joker_main then
|
||||
if Jane.cry 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
|
||||
if not Jane.cry and not context.other_joker and (not context.individual or context.cardarea ~= G.play) then
|
||||
return
|
||||
end
|
||||
|
||||
|
|
@ -716,11 +716,11 @@ SMODS.Joker {
|
|||
e_jane_moire = {
|
||||
colour = G.C.jane_RGB,
|
||||
sound = "talisman_eeechip",
|
||||
EEchip_mod = Cryptid and attune or nil,
|
||||
[Cryptid and "EEmult_mod" or "Emult_mod"] = attune,
|
||||
message = (Cryptid and "^^" or "^") .. attune .. (Cryptid and " Chips & Mult" or ""),
|
||||
EEchip_mod = Jane.cry and attune or nil,
|
||||
[Jane.cry and "EEmult_mod" or "Emult_mod"] = attune,
|
||||
message = (Jane.cry and "^^" or "^") .. attune .. (Jane.cry and " Chips & Mult" or ""),
|
||||
},
|
||||
})[Cryptid and "e_jane_moire" or ((context.other_card or context.other_joker or {}).edition or {}).key]
|
||||
})[Jane.cry and "e_jane_moire" or ((context.other_card or context.other_joker or {}).edition or {}).key]
|
||||
|
||||
if trigger then
|
||||
trigger.card = card
|
||||
|
|
@ -740,7 +740,7 @@ SMODS.Joker {
|
|||
|
||||
local key = context.consumeable:gc().key
|
||||
|
||||
if Cryptid and key ~= "c_cry_gateway" or not Cryptid and (key ~= "c_ankh" and key ~= "c_soul") then
|
||||
if Jane.cry and key ~= "c_cry_gateway" or not Jane.cry and (key ~= "c_ankh" and key ~= "c_soul") then
|
||||
return
|
||||
end
|
||||
|
||||
|
|
@ -793,7 +793,7 @@ SMODS.Joker {
|
|||
end,
|
||||
}
|
||||
|
||||
if Cryptid then
|
||||
if Cryptid and Cryptid.aliases then
|
||||
Cryptid.aliases["saint"] = "j_jane_saint"
|
||||
Cryptid.aliases["the saint"] = "j_jane_saint"
|
||||
end
|
||||
|
|
@ -804,8 +804,8 @@ SMODS.Joker {
|
|||
loc_txt = {
|
||||
name = "The Rot",
|
||||
text = {
|
||||
Cryptid and "{C:attention}Duplicates itself{} at the" or "{C:inactive,E:1}Does nothing",
|
||||
Cryptid and "end of {C:attention}every ante" or nil,
|
||||
Jane.cry and "{C:attention}Duplicates itself{} at the" or "{C:inactive,E:1}Does nothing",
|
||||
Jane.cry and "end of {C:attention}every ante" or nil,
|
||||
},
|
||||
},
|
||||
pos = {x = 0, y = 0},
|
||||
|
|
@ -822,7 +822,7 @@ SMODS.Joker {
|
|||
|
||||
return not not next(SMODS.find_card("j_jane_rot"))
|
||||
end,
|
||||
calculate = Cryptid and function(_, card, context)
|
||||
calculate = Jane.cry and function(_, card, context)
|
||||
local function has_room()
|
||||
return G.jokers.config.card_count < G.jokers.config.card_limit
|
||||
end
|
||||
|
|
|
|||
|
|
@ -249,9 +249,9 @@ SMODS.Consumable {
|
|||
key = "obfuscation",
|
||||
atlas = "janeacc",
|
||||
set = "Spectral",
|
||||
hidden = not Cryptid,
|
||||
soul_rate = not Cryptid and 0.003 or nil,
|
||||
soul_set = not Cryptid and "Spectral" or nil,
|
||||
hidden = not Jane.cry,
|
||||
soul_rate = not Jane.cry and 0.003 or nil,
|
||||
soul_set = not Jane.cry and "Spectral" or nil,
|
||||
loc_txt = {
|
||||
name = "Obfuscation",
|
||||
text = {
|
||||
|
|
@ -280,9 +280,9 @@ SMODS.Consumable {
|
|||
key = "rift",
|
||||
atlas = "janeacc",
|
||||
set = "Spectral",
|
||||
hidden = not Cryptid,
|
||||
soul_rate = not Cryptid and 0.003 or nil,
|
||||
soul_set = not Cryptid and "Spectral" or nil,
|
||||
hidden = not Jane.cry,
|
||||
soul_rate = not Jane.cry and 0.003 or nil,
|
||||
soul_set = not Jane.cry and "Spectral" or nil,
|
||||
loc_txt = {
|
||||
name = "Rift",
|
||||
text = {
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
if not Cryptid then
|
||||
if not Jane.cry then
|
||||
return
|
||||
end
|
||||
|
||||
|
|
@ -97,7 +97,7 @@ SMODS.Consumable {
|
|||
end,
|
||||
}
|
||||
|
||||
if Cryptid then
|
||||
if Cryptid and Cryptid.aliases then
|
||||
Cryptid.aliases["joker in a tarot"] = "c_jane_jokerinatarot"
|
||||
Cryptid.aliases["joker-in-a-tarot"] = "c_jane_jokerinatarot"
|
||||
Cryptid.aliases["jolly in a tarot"] = "c_jane_jokerinatarot"
|
||||
|
|
|
|||
|
|
@ -93,7 +93,7 @@ for _, v in pairs({
|
|||
{"tag_cry_scope", "Scope", 5, 7, 3},
|
||||
{"tag_cry_banana", "Banana", 0, 8, 4},
|
||||
}) do
|
||||
if v[1] and (Cryptid or v[1]:sub(1, 7) ~= "tag_cry") then
|
||||
if v[1] and (Jane.cry or v[1]:sub(1, 7) ~= "tag_cry") then
|
||||
SMODS.Consumable {
|
||||
key = "token_" .. v[1],
|
||||
set = "jane_tokens",
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@ SMODS.Atlas {
|
|||
path = Jane.config.texture_pack .. "/v_jane_token_voucher_plus.png",
|
||||
}
|
||||
|
||||
if Cryptid then
|
||||
if Jane.cry then
|
||||
SMODS.Voucher {
|
||||
key = "jolly_voucher",
|
||||
atlas = "janejollyvoucher",
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue