Merge pull request #58 from lord-ruby/dev

Dev

Author: lord-ruby

assets/sounds/music_dread.ogg

@@ -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
+})

items/misc/sounds.lua

@@ -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
@@ -249,4 +249,4 @@ return {
         iridium,
         zenith
     }
-}
+}

items/misc/stakes.lua

@@ -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
@@ -3780,4 +3780,4 @@ function Card:sell_card()
 		end
 	end
 	sell_card_stuff(self)
-end 
+end