Skip to content

Commit

Permalink
Booster pack crash fix + weird whitespacing
Browse files Browse the repository at this point in the history
Idk why GitHub displays correct whitespace but the code whitespace is bonked
  • Loading branch information
GauntletGames-2086 committed Dec 26, 2024
1 parent 09d53e8 commit 10f2e0c
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 16 deletions.
2 changes: 1 addition & 1 deletion src/game_object.lua
Original file line number Diff line number Diff line change
Expand Up @@ -1385,7 +1385,7 @@ Set `prefix_config.key = false` on your object instead.]]):format(obj.key), obj.
end,
--]]
update_pack = function(self, dt)
if G.buttons then self.buttons:remove(); G.buttons = nil end
if G.buttons then G.buttons:remove(); G.buttons = nil end
if G.shop then G.shop.alignment.offset.y = G.ROOM.T.y+11 end

if not G.STATE_COMPLETE then
Expand Down
28 changes: 14 additions & 14 deletions src/utils.lua
Original file line number Diff line number Diff line change
Expand Up @@ -816,16 +816,16 @@ function SMODS.get_enhancements(card, extra_only)
enhancements[card.config.center.key] = true
end
if G.jokers and G.jokers.cards then
for i=1, #G.jokers.cards do
local eval = G.jokers.cards[i]:calculate_joker({other_card = card, check_enhancement = true})
if eval then
for k, _ in pairs(eval) do
if G.P_CENTERS[k] then
enhancements[k] = true
end
end
end
end
for i=1, #G.jokers.cards do
local eval = G.jokers.cards[i]:calculate_joker({other_card = card, check_enhancement = true})
if eval then
for k, _ in pairs(eval) do
if G.P_CENTERS[k] then
enhancements[k] = true
end
end
end
end
end
if extra_only and enhancements[card.config.center.key] then
enhancements[card.config.center.key] = nil
Expand All @@ -836,10 +836,10 @@ end
function SMODS.has_enhancement(card, key)
if card.config.center.key == key then return true end
if G.jokers and G.jokers.cards then
for i=1, #G.jokers.cards do
local eval = G.jokers.cards[i]:calculate_joker({other_card = card, check_enhancement = true})
if eval and type(eval) == 'table' and eval[key] then return true end
end
for i=1, #G.jokers.cards do
local eval = G.jokers.cards[i]:calculate_joker({other_card = card, check_enhancement = true})
if eval and type(eval) == 'table' and eval[key] then return true end
end
end
return false
end
Expand Down
2 changes: 1 addition & 1 deletion version.lua
Original file line number Diff line number Diff line change
@@ -1 +1 @@
return "1.0.0~ALPHA-1226a-STEAMODDED"
return "1.0.0~ALPHA-1226b-STEAMODDED"

0 comments on commit 10f2e0c

Please sign in to comment.