Merge pull request #190 from survovoaneend/dev

Dev

Author: survovoaneend

Items/Blinds/Boss/the_gift.lua

@@ -3,7 +3,7 @@ local the_gift = {
     key = 'the_gift',
 
     boss = {
-        min = 3
+        min = 6
     },
     mult = 2,
     boss_colour = HEX("c75d5d"),

Items/Blinds/Boss/the_storm.lua

@@ -7,7 +7,7 @@ local the_storm = {
     mult = 2,
     boss_colour = HEX("b48b52"),
     atlas = 'blinds',
-    pos = { X = 0, y = 53},
+    pos = { X = 0, y = 53 },
     order = 37,
     dollars = 5,
 
@@ -18,23 +18,18 @@ local the_storm = {
             return
         end
         if context.after and context.full_hand and context.scoring_hand and not temp then
-            local total_cards = {}
-            for i = 1, #context.full_hand do
-                local scoring = false
-                for j = 1, #context.scoring_hand do
-                    if context.full_hand[i] == context.scoring_hand[j] then
-                        scoring = true
-                    end
+            if #context.scoring_hand >= 3 then
+                local cards_to_destroy = {}
+                for i = 1, #context.full_hand do
+                    cards_to_destroy[#cards_to_destroy + 1] = context.full_hand[i]
                 end
-                if not scoring then
-                    total_cards[#total_cards+1] = context.full_hand[i]
+                if #cards_to_destroy > 0 then
+                    blind:wiggle()
+                    SMODS.destroy_cards(cards_to_destroy)
                 end
             end
-            if #total_cards > 0 then
-                SMODS.destroy_cards(total_cards)
-            end
         end
     end
 
 }
-return { name = {"Blinds"}, items = {the_storm} }
+return { name = { "Blinds" }, items = { the_storm } }

Items/Boosters/asteroid_tag_celestial.lua

@@ -0,0 +1,53 @@
+
+
+local asteroid_tag_celestial = {
+    object_type = "Booster",
+    no_collection = true,
+    key = 'asteroid_tag_celestial', 
+    pos = {x=0, y=1}, 
+    cost = 0, 
+    weight =  0, 
+    config = { extra = 3, choose = 1 }, 
+    loc_vars = function(self, info_queue, card)
+        return { vars = {card.ability.choose, card.ability.extra}, key = "p_celestial_normal" }
+    end,
+    ease_background_colour = function(self)
+        ease_background_colour_blind(G.STATES.PLANET_PACK)
+    end,
+    particles = function(self)
+        G.booster_pack_stars = Particles(1, 1, 0,0, {
+            timer = 0.07,
+            scale = 0.1,
+            initialize = true,
+            lifespan = 15,
+            speed = 0.1,
+            padding = -4,
+            attach = G.ROOM_ATTACH,
+            colours = {G.C.WHITE, HEX('a7d6e0'), HEX('fddca0')},
+            fill = true
+        })
+        G.booster_pack_meteors = Particles(1, 1, 0,0, {
+            timer = 2,
+            scale = 0.05,
+            lifespan = 1.5,
+            speed = 4,
+            attach = G.ROOM_ATTACH,
+            colours = {G.C.WHITE},
+            fill = true
+        })
+    end,
+    create_card = function(self, card, i)
+        local tmp_key = 'c_black_hole'
+        if i == 1 then
+          tmp_key = 'c_black_hole'
+        elseif i == 2 then
+          tmp_key = 'c_aij_gravastar'
+        elseif i == 3 then
+          tmp_key = 'c_aij_pulsar'
+        end
+        return {set = "Spectral", area = G.pack_cards, skip_materialize = true, soulable = true, key = tmp_key}
+    end,
+    group_key = "k_celestial_pack",
+}
+
+return { name = {"Boosters"}, items = { asteroid_tag_celestial } }

Items/Boosters/timelost_guess_the_jest.lua

@@ -0,0 +1,54 @@
+
+
+local timelost_guess_the_jest = {
+    object_type = "Booster",
+    no_collection = true,
+    key = 'timelost_guess_the_jest',
+    atlas = 'booster_atlas',
+    pos = { x = 0, y = 0 },
+    cost = 0,
+    weight =  0,
+    config = { extra = 5, choose = 1 },
+    loc_vars = function(self, info_queue, card)
+        return { vars = {card.ability.choose, card.ability.extra}, key = "p_aij_guess_the_jest" }
+    end,
+    ease_background_colour = function(self)
+        ease_background_colour_blind(G.STATES.SPECTRAL_PACK)
+    end,
+    particles = function(self)
+        G.booster_pack_sparkles = Particles(1, 1, 0,0, {
+            timer = 0.015, scale = 0.1, initialize = true, lifespan = 3, speed = 0.2,
+            padding = -1, attach = G.ROOM_ATTACH, colours = {G.C.WHITE, lighten(G.C.GOLD, 0.2)}, fill = true
+        })
+        G.booster_pack_sparkles.fade_alpha = 1
+        G.booster_pack_sparkles:fade(1, 0)
+    end,
+    create_card = function(self, card, i)
+        local card_params = {
+            set = "Joker",
+            legendary = true,
+            area = G.pack_cards,
+            skip_materialize = true,
+            soulable = false,
+            key_append = "leg_guess" ,
+            no_edition = true,
+        }
+        local _card = SMODS.create_card(card_params)
+        if _card then
+            _card.ability = _card.ability or {}
+            _card.ability.from_guess_the_jest = true
+            _card.ability.background = tostring(math.random(1,4))
+            for k, v in pairs(G.shared_stickers) do
+                if _card.ability[k] then
+                    _card.ability[k] = false
+                end
+            end
+            _card.ability.perishable = true
+            _card.ability.perish_tally = G.GAME.perishable_rounds or 5
+        end
+        return _card
+    end,
+    group_key = "k_aij_guess_the_jest",
+}
+
+return { name = {"Boosters"}, items = {timelost_guess_the_jest} }

Items/Consumables/Planets/dark_star.lua

@@ -14,9 +14,7 @@ local dark_star = {
   atlas = 'consumable_atlas',
   loc_vars = function(self, info_queue, card)
     return {
-      vars = {
-
-      },
+      vars = { },
     }
   end,
   can_use = function(self, card)
@@ -32,7 +30,11 @@ local dark_star = {
     local hands_to_upgrade = {}
     for _, k in ipairs(G.handlist) do
       if G.GAME.hands[k].played == 0 then
-        table.insert(hands_to_upgrade, k)
+        if not G.GAME.hands[k].visible then
+            level_up_hand(card, k, true)
+        else
+            table.insert(hands_to_upgrade, k)
+        end
       end
     end
     level_up_hand(card, hands_to_upgrade)

Items/Consumables/Spectrals/reshape.lua

@@ -54,6 +54,7 @@ local reshape = {
                                 end
                             end
                         end
+                        G.jokers.cards[i]:set_edition(nil, true, true)
                         copy_card(selected_joker, G.jokers.cards[i], nil, nil, true)
                         G.jokers.cards[i]:set_edition(original_edition, true, true)
                         for k, v in pairs(original_stickers) do

Items/Consumables/Spectrals/shade.lua

@@ -1,21 +1,22 @@
 local shade_spectral = {
     object_type = "Consumable",
-	key = 'shade',
-	set = 'Spectral',
-	pos = { x = 4, y = 4 },
-	cost = 4,
-	unlocked = true,
-	discovered = false,
+    key = 'shade',
+    set = 'Spectral',
+    pos = { x = 4, y = 4 },
+    cost = 4,
+    unlocked = true,
+    discovered = false,
     order = 1,
-	config ={},
-	atlas = 'consumable_atlas',
+    config = { extra = 1 },
+    atlas = 'consumable_atlas',
     loc_vars = function(self, info_queue, card)
         if All_in_Jest.config and All_in_Jest.config.no_copy_neg then
             info_queue[#info_queue+1] = {key = 'e_negative_playing_card', set = 'Edition', config = {extra = G.P_CENTERS['e_negative'].config.card_limit} }
         else
             info_queue[#info_queue+1] = G.P_CENTERS.e_aij_negative_playing_card
         end
-	end,
+        return {vars = { card.ability.extra }}
+	  end,
     can_use = function(self, card)
         if G.hand and G.hand.cards and #G.hand.cards > 0 then
             for k, v in ipairs(G.hand.cards) do
@@ -27,24 +28,37 @@ local shade_spectral = {
             return false
         end
     end,
-	use = function(self, card, area, copier)
-        local cards = {}
-        for k, v in ipairs(G.hand.cards) do
-            if not v.edition then cards[#cards + 1] = v end
-        end
-        local selected_card = pseudorandom_element(cards, pseudoseed('shade_card'))
+	  use = function(self, card, area, copier)
         G.E_MANAGER:add_event(Event({
             trigger = 'after', 
             delay = 0.4,
             func = function()
-                card:juice_up(0.3, 0.5)
-                play_sound('negative', 1.5, 0.4)
-                selected_card:set_edition({negative = true}, true)
-                G.FUNCS.draw_from_deck_to_hand(math.min(1, (G.hand.config.card_limit + 1) - #G.hand.cards))
-                -- G.hand:handle_card_limit()
-                -- if G.deck and #G.deck.cards > 0 then
-                --     draw_card(G.deck, G.hand, nil, 'up', nil, nil)
-                -- end
+                local activations = 0
+                local i = 0
+                local valid_cards_remain = true
+                while activations < card.ability.extra and valid_cards_remain do
+                    sendDebugMessage(i, "AIJ")
+                    local selected_card = pseudorandom_element(G.hand.cards, pseudoseed('shade_card' .. i))
+                    if not selected_card.edition then
+                        card:juice_up(0.3, 0.5)
+                        play_sound('negative', 1.5, 0.4)
+                        selected_card:set_edition({negative = true}, true)
+                        -- G.FUNCS.draw_from_deck_to_hand(math.min(1, (G.hand.config.card_limit + 1) - #G.hand.cards))
+                        activations = activations + 1
+                    end
+
+                    valid_cards_remain = false
+                    if G.hand and G.hand.cards and #G.hand.cards > 0 then
+                        for _, v in ipairs(G.hand.cards) do
+                            if not v.edition then
+                                valid_cards_remain = true
+                                break
+                            end
+                        end
+                    end
+
+                    i = i + 1
+                end
                 return true
             end
         }))

Items/Consumables/Tarots/Other/broken_fate.lua

@@ -1,3 +1,17 @@
+local function contains_number(table, exclusions)
+    for k, v in pairs(table) do
+        if exclusions and exclusions[k] ~= nil and (exclusions[k] == true or exclusions[k] == v) then
+        else
+            if type(v) == "number" and v ~= 0 then
+                return true
+            elseif type(v) == "table" and contains_number(v, exclusions) then
+                return true
+            end
+        end
+    end
+    return false
+end
+
 local broken_fate = {
   object_type = "Consumable",
   key = 'broken_fate',
@@ -18,8 +32,12 @@ local broken_fate = {
   can_use = function(self, card, area, copier)
     if G.consumeables and #G.consumeables.cards > 0 then
       local leftmost_card = G.consumeables.cards[1]
-      leftmost_card = leftmost_card == card and G.consumeables.cards[2] or leftmost_card
-      return leftmost_card.config.center.key ~= "c_aij_broken_fate"
+      -- Check for Ankh and Hex explicitly, as they have unused variables that make it seem like they are compatible
+      return (
+          leftmost_card.config.center.key ~= "c_aij_broken_fate" and
+          contains_number(leftmost_card.ability, { card_limit = true, h_x_chips = 1, x_chips = 1, h_x_mult = 1, x_mult = 1, hands_played_at_create = true, order = true }) and 
+          leftmost_card.config.center.dongtong_compat ~= false
+      )
     end
   end,
   use = function(self, card)
@@ -29,18 +47,34 @@ local broken_fate = {
       return true end }))
     delay(0.2)
 
+    -- Define the target for clarity
+    local target = G.consumeables.cards[1]
+
+    -- SNAPSHOT LOGIC:
+    if target.aij_original_ability then
+        target.ability = copy_table(target.aij_original_ability)
+    else
+        target.aij_original_ability = copy_table(target.ability)
+    end
+
     local ran_amount = 0.75 + (pseudorandom('aij_broken_fate', 0, math.floor(((2.5 - 0.75) / 0.05) + 0.5)) * 0.05)
     local string = "X" .. tostring(ran_amount)
-    G.consumeables.cards[1].ability.consumeable = copy_table(G.consumeables.cards[1].ability.consumeable)
-    jest_ability_calculate(G.consumeables.cards[1], "*", ran_amount, nil, nil, true, false, "ability")
-    card_eval_status_text(G.consumeables.cards[1], 'extra', nil, nil, nil, { message = string, colour = G.C.FILTER })
+    
+    jest_ability_calculate(target, "*", ran_amount, { card_limit = true, h_x_chips = 1, x_chips = 1, h_x_mult = 1, x_mult = 1, hands_played_at_create = true, order = true }, nil, true, false, "ability")
+    
+    card_eval_status_text(target, 'extra', nil, nil, nil, { message = string, colour = G.C.FILTER })
     delay(0.2)
   end,
-  in_pool = function(self, args)
-    if G.consumeables and #G.consumeables.cards > 0 then
-      return true
-    end
-    return false
-  end,
 }
+
+-- Set some vanilla consumables to be incompatible
+-- These have variables that look like they make it compatible, but actually aren't
+-- Some of these (the seals) should be refactored to work as expected
+G.P_CENTERS["c_ankh"].dongtong_compat = false
+G.P_CENTERS["c_hex"].dongtong_compat = false
+G.P_CENTERS["c_talisman"].dongtong_compat = false
+G.P_CENTERS["c_trance"].dongtong_compat = false
+G.P_CENTERS["c_medium"].dongtong_compat = false
+G.P_CENTERS["c_deja_vu"].dongtong_compat = false
+
 return { name = { "Tarots" }, items = { broken_fate } }