Merge pull request #160 from survovoaneend/dev

Dev to main for 0.6.0b

Author: survovoaneend

Items/Blinds/Pit/the_rains.lua

@@ -25,8 +25,8 @@ local the_rains = {
         end
 
         if context.before and G.hand.cards and not temp then
-            for _, v in pairs(G.hand.cards) do
-                if G.play.cards[i].config.center ~= G.P_CENTERS.c_base then
+            for i = 1, #G.play.cards do
+                if G.play.cards[i].config.center ~= G.P_CENTERS.c_base or G.play.cards[i].edition ~= nil or G.play.cards[i].seal ~= nil  then
                     blind.triggered = true
                     break
                 end
@@ -44,16 +44,22 @@ local the_rains = {
                 G.E_MANAGER:add_event(Event({
                     trigger = 'after',
                     func = (function() 
-                        play_sound("tarot2")
+                        local removed_edition = false
+                        blind:wiggle()
                         for i = 1, #G.play.cards do
                             G.play.cards[i]:set_seal(nil, nil, true)
-                            G.play.cards[i]:set_edition(nil, true)
+                            if G.play.cards[i].edition ~= nil then
+                                removed_edition = true
+                            end
+                            G.play.cards[i]:set_edition(nil, true, true)
                             G.play.cards[i]:juice_up()
                         end
+                        if removed_edition then
+                            play_sound('whoosh2', 1.2, 0.6)
+                        end
                         return true
                     end)
                 }))
-                blind:wiggle()
                 blind.triggered = false
             end
         end

Items/Jokers/banana_man.lua

@@ -39,19 +39,32 @@ local banana_man = {
         end
       end
       if context.after and context.cardarea == G.jokers and not context.blueprint then
+
+        local message_colour = G.C.FILTER
+        if context.blueprint_card then
+            local blueprint_card = context.blueprint_card
+            if blueprint_card.ability.name == "Brainstorm" then
+                message_colour = G.C.RED
+            elseif blueprint_card.ability.name == "Blueprint" then
+                message_colour = G.C.BLUE
+            end
+        end
+
         for i = 1, #G.jokers.cards do
-            if SMODS.pseudorandom_probability(card, 'banana_man', 1, card.ability.extra.odds) and not SMODS.is_eternal(G.jokers.cards[i]) then
-                G.E_MANAGER:add_event(Event({
-                    func = function()
-                        if G.jokers.cards[i] then
-                            G.jokers.cards[i]:start_dissolve()
+            if not SMODS.is_eternal(G.jokers.cards[i]) then
+                if SMODS.pseudorandom_probability(card, 'banana_man', 1, card.ability.extra.odds) then
+                    G.E_MANAGER:add_event(Event({
+                        func = function()
+                            if G.jokers.cards[i] then
+                                SMODS.destroy_cards(G.jokers.cards[i])
+                            end
+                            return true
                         end
-                        return true
-                    end
-                })) 
-                card_eval_status_text(G.jokers.cards[i], 'extra', nil, nil, nil, {message = localize('k_extinct_ex'),colour = G.C.FILTER})
-            elseif not SMODS.is_eternal(G.jokers.cards[i]) then
-                card_eval_status_text(G.jokers.cards[i], 'extra', nil, nil, nil, {message = localize('k_safe_ex'),colour = G.C.FILTER})
+                    })) 
+                    card_eval_status_text(G.jokers.cards[i], 'extra', nil, nil, nil, {message = localize('k_extinct_ex'),colour = message_colour})
+                else
+                    card_eval_status_text(G.jokers.cards[i], 'extra', nil, nil, nil, {message = localize('k_safe_ex'),colour = message_colour})
+                end
             end
         end
       end

Items/Jokers/handsome_joker.lua

@@ -2,17 +2,17 @@
 
 local handsome_joker_calc_mult = function(xmult_mod)
     local handsome_card = G.GAME.current_round.jest_handsome_joker_card
-    local mult = 0
+    local matching_cards = 0
     if G.playing_cards then
         for _, deck_card in ipairs(G.playing_cards) do
             if deck_card:get_id() == handsome_card.id then
                     if SMODS.has_enhancement(deck_card, handsome_card.enhancement) then
-                        mult = mult + 1
+                        matching_cards = matching_cards + 1
                     end
             end
         end
     end
-    return (mult < 1 and 1) or mult * xmult_mod
+    return (matching_cards < 1 and 1) or (1 + matching_cards * xmult_mod)
 end
 
 local handsome_joker = {
@@ -58,7 +58,7 @@ local handsome_joker = {
     end,
 
     calculate = function(self, card, context)
-        local xmult = 1 + handsome_joker_calc_mult(card.ability.extra.xmult_mod)
+        local xmult = handsome_joker_calc_mult(card.ability.extra.xmult_mod)
         if context.joker_main then
             return {
                 xmult = xmult,

Items/Jokers/ijoker_co.lua

@@ -28,12 +28,14 @@ local ijoker_co = {
     calculate = function(self, card, context)
         if context.starting_shop then
             for i = 1, card.ability.extra.tags do
-                local price = pseudorandom('aij_ijoker_co', 5, 10)
                 local tag = get_next_tag_key()
+                local is_gold = G.P_TAGS[tag].config.aij and G.P_TAGS[tag].config.aij.upgrade
+                local price = is_gold and pseudorandom('aij_ijoker_co', 12, 16) or pseudorandom('aij_ijoker_co', 5, 10)
                 All_in_Jest.add_tag_to_shop(tag, price)
             end
         end
     end
 
 }
+
 return { name = {"Jokers"}, items = {ijoker_co} }

Items/Jokers/jerko.lua

@@ -43,7 +43,7 @@ local jerko = {
     calculate = function(self, card, context)
       if context.repetition_only or (context.retrigger_joker_check) then
         local retriggers = pseudorandom('jerko', card.ability.extra.min, card.ability.extra.max)
-        if context.other_card == card then
+        if context.other_card == card and retriggers > 0 then
             return {
                 repetitions = retriggers,
                 card = card,

Items/Jokers/pellucid_joker.lua

@@ -12,42 +12,41 @@ local pellucid_joker = {
     cost = 6,
     unlocked = true,
     discovered = false,
-    blueprint_compat = false,
+    blueprint_compat = true,
     eternal_compat = true,
 
     loc_vars = function(self, info_queue, card)
 
     end,
 
     calculate = function(self, card, context)
-      
-    end
-  
-}
-local start_dissolve_ref = Card.start_dissolve
-function Card:start_dissolve(dissolve_colours, silent, dissolve_time_fac, no_juice)
-  local ref = start_dissolve_ref(self, dissolve_colours, silent, dissolve_time_fac, no_juice)
-  if G.jokers and self.ability.set == 'Joker' and self.edition ~= nil then
-    local has_pellucid_joker = SMODS.find_card("j_aij_pellucid_joker")
-    if has_pellucid_joker then
-        for k, v in pairs(has_pellucid_joker) do
-            local _card = create_playing_card({
-                front = pseudorandom_element(G.P_CARDS, pseudoseed('pellucid_joker')),
-                center = G.P_CENTERS.c_base}, v, true, nil, {G.C.SECONDARY_SET.Enhanced}, true)
-            _card:set_edition(self.edition)
-            _card:start_materialize()
+        if context.jest_destroying_or_selling_joker and context.jest_destroyed_joker.edition ~= nil then
+            local juice_card = context.blueprint_card or card
             G.E_MANAGER:add_event(Event({
-                trigger = 'after',
-                delay = 0.3,
                 func = function()
-                    G.deck:emplace(_card)
-                    G.deck.config.card_limit = G.deck.config.card_limit + 1
+                    juice_card:juice_up()
+                    local new_card = create_playing_card({
+                        front = pseudorandom_element(G.P_CARDS, pseudoseed('pellucid_joker')),
+                        center = G.P_CENTERS.c_base}, juice_card, true, nil, {G.C.SECONDARY_SET.Enhanced}, true)
+                    new_card:set_edition(context.jest_destroyed_joker.edition)
+                    new_card:start_materialize()
+                    G.E_MANAGER:add_event(Event({
+                        trigger = 'after',
+                        delay = 0.3,
+                        func = function()
+                            G.deck:emplace(new_card)
+                            G.deck.config.card_limit = G.deck.config.card_limit + 1
+                            return true
+                        end})
+                    )
+                    playing_card_joker_effects({new_card})
                     return true
-                end}))
-            playing_card_joker_effects({_card})
+                end})
+            )
+            return nil, true
         end
     end
-  end
-  return ref
-end
+  
+}
+
 return { name = {"Jokers"}, items = {pellucid_joker} }

Items/Jokers/pierrot.lua

@@ -20,16 +20,22 @@ local pierrot = {
     end,
 
     calculate = function(self, card, context)
-        if context.individual and context.cardarea == G.hand and not context.end_of_round and context.other_card:get_id() <= 10 then
-            if context.other_card.debuff then
-                 return {
-                    message = localize('k_debuffed'),
-                    colour = G.C.RED
-                }
-            else
-                return {
-                    chips = context.other_card:get_chip_bonus()
-                }
+        if context.individual and context.cardarea == G.hand and not context.end_of_round then
+            local val = context.other_card:get_chip_bonus()
+            local id = context.other_card:get_id()
+            local rank = SMODS.Ranks[context.other_card.base.value]
+            local is_numbered_card = rank and string.find(rank.key, "%d*%d?%d+") ~= nil
+            if context.other_card and is_numbered_card and to_big(val) > to_big(0) and (to_big(id) > to_big(0)) then
+                if context.other_card.debuff then
+                    return {
+                        message = localize('k_debuffed'),
+                        colour = G.C.RED,
+                    }
+                else
+                    return {
+                        h_chips = val
+                    }
+                end
             end
         end
     end

Items/Jokers/the_mycologists.lua

@@ -1,54 +1,62 @@
 local the_mycologists = {
-    object_type = "Joker",
-    order = 47,
-    
-    key = "the_mycologists",
-    config = {
-      poker_hand = "Pair",
-      added = false
-    },
-    rarity = 3,
-    pos = { x = 18, y = 1 },
-    atlas = 'joker_atlas',
-    cost = 8,
-    unlocked = true,
-    discovered = false,
-    blueprint_compat = true,
-    eternal_compat = true,
-  
-    loc_vars = function(self, info_queue, card)
-        return { vars = {localize(card.ability.poker_hand, 'poker_hands')}}
-    end,
-  
-    calculate = function(self, card, context)
-        if context.final_scoring_step then
-            if context.scoring_name == card.ability.poker_hand and #context.full_hand == 2 then
-                local cards = G.play.cards
-                if card.ability.added == false then
-                    card.ability.added = true
-                    G.E_MANAGER:add_event(Event({
-                    trigger = 'after',
-                    delay = 0.1,
-                    func = function() 
-                        cards[1].ability.perma_bonus = cards[1].ability.perma_bonus + (cards[2].base.nominal + cards[2].ability.perma_bonus)
-                        cards[1]:set_ability(cards[2].config.center)
-                        if cards[2].edition ~= nil then
-                            cards[1]:set_edition(cards[2].edition)
-                        end
-                        cards[2]:start_dissolve()
-                        return true end }))
-                end
+  object_type = "Joker",
+  order = 47,
+
+  key = "the_mycologists",
+  config = {
+    poker_hand = "Pair",
+    -- added = false
+  },
+  rarity = 3,
+  pos = { x = 18, y = 1 },
+  atlas = 'joker_atlas',
+  cost = 8,
+  unlocked = true,
+  discovered = false,
+  blueprint_compat = false,
+  eternal_compat = true,
+
+  loc_vars = function(self, info_queue, card)
+    return { vars = { localize(card.ability.poker_hand, 'poker_hands') } }
+  end,
+
+  calculate = function(self, card, context)
+    if context.all_in_jest and context.all_in_jest.before_after and not context.blueprint then
+      if context.scoring_name == card.ability.poker_hand and #context.full_hand == 2 then
+        local cards = G.play.cards
+        -- if card.ability.added == false then
+          -- card.ability.added = true
+          G.E_MANAGER:add_event(Event({
+            trigger = 'after',
+            delay = 0.1,
+            func = function()
+              cards[1].ability.perma_bonus = cards[1].ability.perma_bonus + (cards[2].base.nominal + cards[2].ability.perma_bonus)
+              if cards[2].config.center ~= G.P_CENTERS.c_base then
+                  cards[1]:set_ability(cards[2].config.center)
+              end
+              if cards[2].edition ~= nil then
+                cards[1]:set_edition(cards[2].edition, true, true)
+              end
+              SMODS.destroy_cards(cards[2], nil, true)
+              return true
             end
-        end
-        if not context.blueprint and context.destroying_card and #context.full_hand == 2 then
-            local cards = G.play.cards
-            if context.destroying_card == cards[2] and card.ability.added == true then
-                return {remove = true}
-            end
-        end
-        if context.hand_drawn then
-            card.ability.added = false
-        end
+          }))
+          return {
+            message = localize("k_aij_two_into_one_ex"),
+            sound = 'slice1'
+          }
+        -- end
+      end
     end
+    -- if not context.blueprint and context.destroying_card and #context.full_hand == 2 then
+    --   local cards = G.play.cards
+    --   if context.destroying_card == cards[2] and card.ability.added == true then
+    --     return { remove = true }
+    --   end
+    -- end
+    -- if context.hand_drawn then
+    --   card.ability.added = false
+    -- end
+  end
 }
-return { name = {"Jokers"}, items = {the_mycologists} }
+return { name = { "Jokers" }, items = { the_mycologists } }

Items/Tag/chaos.lua

@@ -89,6 +89,7 @@ local chaos = {
             par.config.object:recalculate()
             G.blind_select_opts.boss.parent = par
             G.blind_select_opts.boss.alignment.offset.y = 0
+            play_sound('other1')
           elseif effect == "open_booster" then
             local boosters = {}
             for k, v in pairs(G.P_CENTERS) do