Skip to content

Fix more code that caused warnings #933

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

Open
Nanuzer0 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix more code that caused warnings #933

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion items/code.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -842,7 +842,7 @@ local crash = {
G.GAME.USING_CODE = true
G.ENTERED_ACE = ""
G.CHOOSE_ACE = UIBox({
definition = create_UIBox_crash(card),
definition = create_UIBox_crash(),
config = {
align = "bmi",
offset = { x = 0, y = G.ROOM.T.y + 29 },
Expand Down
22 changes: 10 additions & 12 deletions items/epic.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2542,18 +2542,16 @@ local starfruit = {
colour = G.C.RARITY.cry_epic,
}
else
if not msg or type(msg) == "string" then
return {
message = msg or localize({
type = "variable",
key = "a_powmult_minus",
vars = {
number_format(card.ability.emult_mod),
},
}),
colour = G.C.RARITY.cry_epic,
}
end
return {
message = localize({
type = "variable",
key = "a_powmult_minus",
vars = {
number_format(card.ability.emult_mod),
},
}),
colour = G.C.RARITY.cry_epic,
}
end
end
end,
Expand Down
21 changes: 9 additions & 12 deletions items/misc_joker.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1150,17 +1150,14 @@ local chili_pepper = {
no_message = true,
})
if to_big(card.ability.extra.rounds_remaining) > to_big(0) then
if not msg or type(msg) == "string" then
return {
message = msg or localize({
type = "variable",
key = "a_xmult",
vars = { number_format(card.ability.extra.Xmult) },
}),
colour = G.C.FILTER,
}
end
return nil, true
return {
message = localize({
type = "variable",
key = "a_xmult",
vars = { number_format(card.ability.extra.Xmult) },
}),
colour = G.C.FILTER,
}
else
G.E_MANAGER:add_event(Event({
func = function()
Expand Down Expand Up @@ -9975,7 +9972,7 @@ local highfive = {
whapoosh = true
G.E_MANAGER:add_event(Event({
func = function()
assert(SMODS.change_base(v, _, "5"))
assert(SMODS.change_base(v, nil, "5"))
v:juice_up()
return true
end,
Expand Down
17 changes: 5 additions & 12 deletions items/spooky.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1172,22 +1172,15 @@ local ghost = {
end,
loc_vars = function(self, info_queue, card)
info_queue[#info_queue + 1] = { set = "Other", key = "cry_possessed" }
local num, denom = SMODS.get_probability_vars(
card,
1,
(card and card.ability.extra.odds or self.config.extra.odds) * card.ability.extra.destroy_rate
)
local num2, denom2 = SMODS.get_probability_vars(
card,
1,
(card and card.ability.extra.odds or self.config.extra.odds) * card.ability.extra.possess_rate
)
local extra = card and card.ability and card.ability.extra or self.config.extra
local num1, denom1 = SMODS.get_probability_vars(card, 1, extra.possess_rate, "Ghost Possess")
local num2, denom2 = SMODS.get_probability_vars(card, 1, extra.destroy_rate, "Ghost Destroy")
return {
vars = {
num2,
num1,
denom2,
num2,
denom1,
denom2,
},
}
end,
Expand Down
2 changes: 1 addition & 1 deletion lib/misc.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -774,7 +774,7 @@ function Controller:key_press_update(key, dt)
G.DEBUG_POINTER = true
G.ENTERED_CARD = ""
G.CHOOSE_CARD = UIBox({
definition = create_UIBox_pointer(card),
definition = create_UIBox_pointer(),
config = {
align = "cm",
offset = { x = 0, y = 10 },
Expand Down