Skip to content

fix some stuff #61

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lord-ruby merged 2 commits into from
Sep 11, 2025
Merged

fix some stuff #61

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bf883bc
fix solar dagger
lord-ruby Sep 11, 2025
9f85e58
fix chocolate egg
lord-ruby Sep 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions items/jokers/misc_jokers.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -314,7 +314,7 @@ local solar_dagger = {
return true
end,
}))
SMODS.scale_card(card, {ref_table = card.ability, ref_value = "plus_asc", scalar_table = {sell_cost = sliced_card.sell_cost * 0.1}, scalar_value = "sell_cost"})
SMODS.scale_card(card, {ref_table = card.ability, ref_value = "x_asc", scalar_table = {sell_cost = sliced_card.sell_cost * 0.1}, scalar_value = "sell_cost"})
end
end
if context.joker_main then
Expand Down Expand Up @@ -467,7 +467,7 @@ local chocolate_egg = {
{ message = localize("entr_opened"), colour = G.C.GREEN }
)
card.ability.no_destroy = true
local c = create_card("Joker", G.jokers, nil, "cry_epic")
local c = create_card("Joker", G.jokers, nil, (SMODS.Mods["Cryptid"] or {}).can_load and "cry_epic" or 3)
c:add_to_deck()
G.jokers:emplace(c)
c:set_edition("e_entr_sunny")
Expand All @@ -491,7 +491,12 @@ local chocolate_egg = {
entr_credits = {
idea = {"cassknows"},
art = {"missingnumber"}
}
},
loc_vars = function()
return {
key = (SMODS.Mods["Cryptid"] or {}).can_load and "j_entr_chocolate_egg" or "j_entr_chocolate_egg_cryptidless"
}
end
}

local lotteryticket = {
Expand Down
2 changes: 1 addition & 1 deletion lib/hooks.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2324,7 +2324,7 @@ end
local create_cardref = create_card_for_shop
function create_card_for_shop(area)
local card = create_cardref(area)
if card.ability.set == "Joker" and next(SMODS.find_card("j_entr_ieros")) then
if card and card.ability.set == "Joker" and next(SMODS.find_card("j_entr_ieros")) then
for i, v2 in pairs(G.jokers.cards) do
if v2.config.center.key == "j_entr_ieros" then
while pseudorandom("ieros") < 0.33 do
Expand Down
9 changes: 8 additions & 1 deletion localization/en-us.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -445,6 +445,13 @@ local decs = {
"when this Joker is {C:red}banished{}"
}
},
j_entr_chocolate_egg_cryptidless = {
name = "Chocolate Egg",
text = {
"Create a random {C:dark_edition}Sunny{} {C:red}Rare{} Joker",
"when this joker is destroyed",
}
},
j_entr_antireal = {
name = "Antireal Joker",
text = {
Expand Down Expand Up @@ -5777,4 +5784,4 @@ for i, v in pairs(G.localization.descriptions.Blind) do
}
end
decs.descriptions.CBlind = CBlind
return decs
return decs