Merge pull request #21 from IcebergLettuce0/dev

costumes of jimbo patch 1

Author: IcebergLettuce0

config.lua

@@ -0,0 +1,6 @@
+return {
+  ["decks_enabled"] = true,
+  ["seals_enabled"] = true,
+  ["spectral_cards_enabled"] = true,
+  ["vouchers_enabled"] = true,
+}

localization/en-us.lua

@@ -154,8 +154,8 @@ return {
         name = 'Pop-Up Joker',
         text = {
           '{C:green}#1# in #2#{} chance to',
-          'add a random {C:attention}Booster Pack',
-          'to the shop after {C:attention}reroll'
+          'refill 1 {C:attention}Booster Pack',
+          'in shop on {C:attention}reroll'
         }
       },
       j_pl_lamp = {

plantain.json

@@ -10,5 +10,5 @@
     "dependencies": [
         "Steamodded (>=1.0.0~BETA-0509c)"
     ],
-    "version": "1.2.0"
+    "version": "1.2.1"
 }

src/additions/pl_jokers_w2.lua

@@ -60,7 +60,7 @@ SMODS.Joker {
   pos = { x = 1, y = 0 },
   soul_pos = { x = 0, y = 2},
 
-  config = { extra = { chance = 4 } },
+  config = { extra = { chance = 2 } },
   loc_vars = function(self, info_queue, card)
     return { vars = { (G.GAME.probabilities.normal or 1), card.ability.extra.chance} }
   end,
@@ -75,26 +75,28 @@ SMODS.Joker {
 
   calculate = function(self, card, context)
     if context.reroll_shop then
-      if pseudorandom('popup') < G.GAME.probabilities.normal/card.ability.extra.chance then
-        G.E_MANAGER:add_event(Event {
-          func = function()
-            PL_UTIL.add_booster_pack()
-            return true
-          end
-        })
+      if #G.shop_booster.cards < G.GAME.starting_params.boosters_in_shop + (G.GAME.modifiers.extra_boosters or 0) then
+        if pseudorandom('popup') < G.GAME.probabilities.normal/card.ability.extra.chance then
+          G.E_MANAGER:add_event(Event {
+            func = function()
+              PL_UTIL.add_booster_pack()
+              return true
+            end
+          })
 
-        local pop_up_options = {
-          'pl_pop_up_joker_winner_1',
-          'pl_pop_up_joker_winner_2',
-          'pl_pop_up_joker_winner_3',
-          'pl_pop_up_joker_winner_4',
-        }
+          local pop_up_options = {
+            'pl_pop_up_joker_winner_1',
+            'pl_pop_up_joker_winner_2',
+            'pl_pop_up_joker_winner_3',
+            'pl_pop_up_joker_winner_4',
+          }
 
-        local pop_up_message = pop_up_options[ math.random( #pop_up_options ) ]
-  
-        return {
-          message = localize(pop_up_message),
-        }
+          local pop_up_message = pop_up_options[ math.random( #pop_up_options ) ]
+    
+          return {
+            message = localize(pop_up_message),
+          }
+        end
       end
     end
   end
@@ -418,7 +420,7 @@ SMODS.Joker {
   discovered = true,
 
   rarity = 3,
-  cost = 5,
+  cost = 8,
 
   pools = {
     Food = true

src/additions/pl_jokers_w3.lua

@@ -9,6 +9,9 @@ SMODS.Joker {
   eternal_compat = true,
   perishable_compat = true,
   discovered = true,
+  loc_vars = function(self, info_queue, card)
+    info_queue[#info_queue + 1] = G.P_CENTERS.c_wheel_of_fortune
+  end,
 
   rarity = 1,
   cost = 3,
@@ -42,7 +45,7 @@ SMODS.Joker {
 
   config = { extra = { chips = 25 } },
   loc_vars = function(self, info_queue, card)
-    return {vars = { localize(card.ability.extra.suit, 'suits_singular') , card.ability.extra.chips, colours = {G.C.SUITS[card.ability.extra.suit]}}}
+    return {vars = { localize(card.ability.extra.suit, 'suits_singular'), card.ability.extra.chips, colours = {G.C.SUITS[card.ability.extra.suit]}}}
   end,
 
   blueprint_compat = true,
@@ -99,7 +102,7 @@ SMODS.Joker {
   discovered = true,
 
   rarity = 2,
-  cost = 5,
+  cost = 6,
 
   calculate = function (self, card, context)
     if context.individual and context.cardarea == G.play then

src/additions/pl_vouchers.lua

@@ -20,9 +20,7 @@ SMODS.Voucher {
 
   calculate = function(self, card, context)
     if context.reroll_shop then
-      for i=1, #G.shop_booster.cards do
-        PL_UTIL.reroll_booster_pack(i)
-      end
+      PL_UTIL.reroll_booster_packs()
     end
   end,
 }

src/config.lua

@@ -10,74 +10,45 @@ end
 
 function PL_UTIL.add_booster_pack()
   if not G.shop then return end
-  local pack_watch = {}
-  for k, v in pairs(G.P_CENTERS) do
-    if v.set == 'Booster' then
-      table.insert(pack_watch, k)
-    end
-  end
-  local pack_chosen = pseudorandom_element(pack_watch, pseudoseed('pl_pop_up'))
-  local pack = Card(
-    G.shop_booster.T.x + G.shop_booster.T.w / 2,
-    G.shop_booster.T.y,
-    G.CARD_W * 1.27, G.CARD_H * 1.27,
-    G.P_CARDS.empty,
-    G.P_CENTERS[pack_chosen],
-    { bypass_discovery_center = true, bypass_discovery_ui = true }
-  )
-  if price then
-    pack.cost = price
-  end
+  local pack = SMODS.create_card({ set = 'Booster', key_append = 'pl_popup'..G.GAME.round_resets.ante })
+  pack.T.w = G.CARD_W * 1.27
+  pack.T.h = G.CARD_H * 1.27
+  
+  G.shop_booster:emplace(pack)
+
   create_shop_card_ui(pack, 'Booster', G.shop_booster)
   pack:start_materialize()
-  G.shop_booster:emplace(pack)
+  pack:set_card_area(G.shop_booster)
+  pack:juice_up()
 end
 
-function PL_UTIL.reroll_booster_pack(position)
+function PL_UTIL.reroll_booster_packs()
   if not G.shop then return end
-  if #G.shop_booster.cards <= 0 then return end
-  
-  local booster_to_replace = G.shop_booster.cards[position]
 
-  local pack_watch = {}
-  for k, v in pairs(G.P_CENTERS) do
-    if v.set == 'Booster' then
-      table.insert(pack_watch, k)
-    end
-  end
+  local pack_count = #G.shop_booster.cards
 
-  local pack_chosen = pseudorandom_element(pack_watch, pseudoseed(('pl_booster_reroll')..G.GAME.round_resets.ante))
+  if pack_count <= 0 then return end
 
-  local pack = Card(
-    G.shop_booster.T.x + G.shop_booster.T.w / 2,
-    G.shop_booster.T.y,
-    G.CARD_W * 1.27, G.CARD_H * 1.27,
-    G.P_CARDS.empty,
-    G.P_CENTERS[pack_chosen],
-    { bypass_discovery_center = true, bypass_discovery_ui = true }
-  )
+  for i=1, pack_count do
+  
+    local booster_to_replace = G.shop_booster.cards[i]
 
-  if price then
-    pack.cost = price
-  end
+    local pack = SMODS.create_card({ set = 'Booster', key_append = 'pl_booster_reroll'..G.GAME.round_resets.ante })
+    pack.T.w = G.CARD_W * 1.27
+    pack.T.h = G.CARD_H * 1.27
 
-  create_shop_card_ui(pack, 'Booster', G.shop_booster)
-  pack:start_materialize()
+    table.insert(G.shop_booster.cards, i, pack)
 
-  local pack_pos = 1
-  for k, v in ipairs(G.shop_booster.cards) do
-    if v == booster_to_replace then
-      pack_pos = k
-    end
-  end
+    create_shop_card_ui(pack, 'Booster', G.shop_booster)
+    pack:start_materialize()
+    pack:set_card_area(G.shop_booster)
+    pack:juice_up()
 
-  table.insert(G.shop_booster.cards, pack_pos, pack)
-  pack:set_card_area(G.shop_booster)
-  pack:juice_up()
+    local c = G.shop_booster:remove_card(booster_to_replace)
+    c:remove()
+    c = nil
 
-  local c = G.shop_booster:remove_card(booster_to_replace)
-  c:remove()
-  c = nil
+  end
 
 end