Skip to content

Commit 2731d96

Browse files
something
1 parent d7d3607 commit 2731d96

10 files changed

Lines changed: 383 additions & 288 deletions

File tree

items/bb.lua

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
BB = {}
2+
function BB.roll_shiny()
3+
local prob = 1
4+
if next(SMODS.find_card("j_lucky_cat")) then
5+
prob = 3
6+
end
7+
if pseudorandom("cry_shiny") < prob / 4096 then
8+
return "shiny"
9+
end
10+
return "normal"
11+
end
12+
13+
function BB.is_shiny()
14+
if BB.roll_shiny() == "shiny" then
15+
return true
16+
end
17+
return false
18+
end

items/dreamyjokers.lua

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,15 +61,16 @@ SMODS.Joker {
6161
pools = { ["Dreamy"] = true, ["bustjokers"] = true },
6262
config = {
6363
extra = {
64-
}
64+
},
65+
immutable = { ante = -8 }
6566
},
6667
loc_vars = function(self, info_queue, card)
67-
return { vars = { card.ability.extra.xchips, card.ability.extra.money, card.ability.extra.xchips_mod, card.ability.extra.dollar_mod } }
68+
return { vars = { card.ability.immutable.ante } }
6869
end,
6970

7071
calculate = function(self, card, context)
7172
if context.end_of_round and context.game_over and context.main_eval then
72-
ease_ante(-G.GAME.round_resets.ante)
73+
ease_ante(card.ability.immutable.ante)
7374
G.E_MANAGER:add_event(Event({
7475
func = function()
7576
G.hand_text_area.blind_chips:juice_up()

items/evilbuttons.lua

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ function Card:highlight(is_highlighted)
6565
config = {
6666
parent = self,
6767
align = 'cm',
68-
offset = { x = 0 , y = 1.5 },
68+
offset = { x = 1.5 , y = 1 },
6969
colour = G.C.CLEAR
7070
}
7171
})
@@ -79,7 +79,7 @@ function Card:highlight(is_highlighted)
7979
config = {
8080
parent = self,
8181
align = 'cm',
82-
offset = { x = 0 , y = 1.5 },
82+
offset = { x = 1.5 , y = 1 },
8383
colour = G.C.CLEAR
8484
}
8585
})
@@ -93,7 +93,7 @@ function Card:highlight(is_highlighted)
9393
config = {
9494
parent = self,
9595
align = 'cm',
96-
offset = { x = 0 , y = 1.75 },
96+
offset = { x = 1.5 , y = 1 },
9797
colour = G.C.CLEAR
9898
}
9999
})

items/grandjokers.lua

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -458,6 +458,7 @@ SMODS.Joker{
458458
},
459459
},
460460
loc_vars = function(self, info_queue, card)
461+
info_queue[#info_queue + 1] = G.P_CENTERS.j_gros_michel
461462
return {
462463
background_colour = G.C.BLACK,
463464
text_colour = G.C.WHITE,

0 commit comments

Comments
 (0)