Skip to content
Merged

Dev #58

Show file tree
Hide file tree
Changes from all commits
Commits
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
Binary file added assets/sounds/music_dread.ogg
Binary file not shown.
12 changes: 11 additions & 1 deletion items/misc/sounds.lua
Original file line number Diff line number Diff line change
Expand Up @@ -52,4 +52,14 @@ SMODS.Sound({
key = "e_rizz",
path = "e_rizz.ogg",
volume = 0.7
})
})

SMODS.Sound({
key = "music_dread",
path = "music_dread.ogg",
select_music_track = function()
if not G.screenwipe and G.STATE == G.STATES.SMODS_BOOSTER_OPENED and SMODS.OPENED_BOOSTER and string.find(SMODS.OPENED_BOOSTER.config.center.key, "twisted", 0, true) ~= nil then
return 1339
end
end
})
6 changes: 3 additions & 3 deletions items/misc/stakes.lua
Original file line number Diff line number Diff line change
Expand Up @@ -187,8 +187,8 @@ function Blind:defeat(s)
end

local ccfs = create_card_for_shop
function create_card_for_shop(area)
local card = ccfs(area)
function create_card_for_shop(...)
local card = ccfs(...)
if G.GAME.curse == "entr_blind" then
if pseudorandom("entr_blind_curse") < 0.5 then
card.cry_flipped = true
Expand Down Expand Up @@ -249,4 +249,4 @@ return {
iridium,
zenith
}
}
}
4 changes: 2 additions & 2 deletions lib/hooks.lua
Original file line number Diff line number Diff line change
Expand Up @@ -1828,7 +1828,7 @@ function Card:set_ability(center, initial, delay_sprites)
matref(self, center, initial, delay_sprites)
else
if self.config and self.config.center and Entropy.FlipsideInversions and not Entropy.is_inverted(center)
and pseudorandom("marked") < 0.10 and G.GAME.Marked and G.STATE == G.STATES.SHOP and (not self.area or not self.area.config.collection) then
and pseudorandom("marked") < 0.10 and G.GAME.Marked and G.STATE == G.STATES.SHOP and (not self.area or not self.area.config.collection) and Entropy.Inversion(center) then
matref(self, G.P_CENTERS[Entropy.Inversion(center)], initial, delay_sprites)
elseif self.config and self.config.center
and pseudorandom("trump_card") < 0.10 and G.GAME.TrumpCard and G.STATE == G.STATES.SMODS_BOOSTER_OPENED
Expand Down Expand Up @@ -3780,4 +3780,4 @@ function Card:sell_card()
end
end
sell_card_stuff(self)
end
end