Skip to content

Commit 1c28d5e

Browse files
committed
easy tweaks to things that make things
1 parent 436627f commit 1c28d5e

File tree

6 files changed

+152
-170
lines changed

6 files changed

+152
-170
lines changed

items/code.lua

Lines changed: 29 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -4720,7 +4720,7 @@ local encoded = {
47204720
end,
47214721
}
47224722
-- Code Joker
4723-
-- Creates a Negative Code card when starting blind
4723+
-- Creates a Code card when starting blind
47244724
local CodeJoker = {
47254725
dependencies = {
47264726
items = {
@@ -4732,10 +4732,6 @@ local CodeJoker = {
47324732
name = "cry-CodeJoker",
47334733
key = "CodeJoker",
47344734
pos = { x = 2, y = 4 },
4735-
loc_vars = function(self, info_queue, center)
4736-
info_queue[#info_queue + 1] = { key = "e_negative_consumable", set = "Edition", config = { extra = 1 } }
4737-
return { key = Cryptid.gameset_loc(self, { exp_modest = "modest" }) }
4738-
end,
47394735
extra_gamesets = { "exp_modest" },
47404736
rarity = "cry_epic",
47414737
cost = 11,
@@ -4747,24 +4743,19 @@ local CodeJoker = {
47474743
if
47484744
context.setting_blind
47494745
and not (context.blueprint_card or self).getting_sliced
4750-
and (G.GAME.blind:get_type() == "Boss" or Cryptid.gameset(card) ~= "exp_modest")
47514746
then
4752-
play_sound("timpani")
4753-
local card = create_card("Code", G.consumeables, nil, nil, nil, nil)
4754-
card:set_edition({
4755-
negative = true,
4756-
})
4757-
card:add_to_deck()
4758-
G.consumeables:emplace(card)
4759-
card:juice_up(0.3, 0.5)
4760-
return nil, true
4747+
if #G.consumeables.cards + G.GAME.consumeable_buffer < G.consumeables.config.card_limit then
4748+
play_sound("timpani")
4749+
local card = create_card("Code", G.consumeables, nil, nil, nil, nil)
4750+
card:add_to_deck()
4751+
G.consumeables:emplace(card)
4752+
card:juice_up(0.3, 0.5)
4753+
return nil, true
4754+
end
47614755
end
47624756
if context.forcetrigger then
47634757
play_sound("timpani")
47644758
local card = create_card("Code", G.consumeables, nil, nil, nil, nil)
4765-
card:set_edition({
4766-
negative = true,
4767-
})
47684759
card:add_to_deck()
47694760
G.consumeables:emplace(card)
47704761
card:juice_up(0.3, 0.5)
@@ -4822,7 +4813,6 @@ local copypaste = {
48224813
order = 302,
48234814
config = {
48244815
extra = {
4825-
odds = 2,
48264816
ckt = nil,
48274817
},
48284818
}, -- what is a ckt
@@ -4832,13 +4822,8 @@ local copypaste = {
48324822
loc_vars = function(self, info_queue, card)
48334823
return {
48344824
vars = {
4835-
card and cry_prob(
4836-
math.min(card.ability.extra.odds / 2, card.ability.cry_prob or 1),
4837-
card.ability.extra.odds,
4838-
card.ability.cry_rigged
4839-
) or 1,
4840-
card and card.ability.extra.odds or 2,
4841-
}, -- this effectively prevents a copypaste from ever initially misprinting at above 50% odds. still allows rigging/oops
4825+
card.ability.extra.ckt and localize("cry_inactive") or localize("cry_active")
4826+
},
48424827
key = Cryptid.gameset_loc(self, { exp_modest = "modest" }),
48434828
}
48444829
end,
@@ -4874,35 +4859,26 @@ local copypaste = {
48744859
and not context.consumeable.beginning_end
48754860
and not card.ability.extra.ckt
48764861
and Cryptid.gameset(card) ~= "exp_modest"
4862+
and not card.ability.used
48774863
then
48784864
if #G.consumeables.cards + G.GAME.consumeable_buffer < G.consumeables.config.card_limit then
4879-
if
4880-
pseudorandom("cry_copypaste_joker")
4881-
< cry_prob(
4882-
math.min(card.ability.extra.odds / 2, card.ability.cry_prob),
4883-
card.ability.extra.odds,
4884-
card.ability.cry_rigged
4885-
)
4886-
/ card.ability.extra.odds
4887-
then
4888-
G.E_MANAGER:add_event(Event({
4889-
func = function()
4890-
local cards = copy_card(context.consumeable)
4891-
cards:add_to_deck()
4892-
G.consumeables:emplace(cards)
4893-
return true
4894-
end,
4895-
}))
4896-
card_eval_status_text(
4897-
context.blueprint_cards or card,
4898-
"extra",
4899-
nil,
4900-
nil,
4901-
nil,
4902-
{ message = localize("k_copied_ex") }
4903-
)
4904-
card.ability.extra.ckt = true
4905-
end
4865+
G.E_MANAGER:add_event(Event({
4866+
func = function()
4867+
local cards = copy_card(context.consumeable)
4868+
cards:add_to_deck()
4869+
G.consumeables:emplace(cards)
4870+
return true
4871+
end,
4872+
}))
4873+
card_eval_status_text(
4874+
context.blueprint_cards or card,
4875+
"extra",
4876+
nil,
4877+
nil,
4878+
nil,
4879+
{ message = localize("k_copied_ex") }
4880+
)
4881+
card.ability.extra.ckt = true
49064882
end
49074883
elseif
49084884
context.end_of_round

items/epic.lua

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -867,20 +867,16 @@ local M = {
867867
demicoloncompat = true,
868868
loc_vars = function(self, info_queue, center)
869869
info_queue[#info_queue + 1] = G.P_CENTERS.j_jolly
870-
if not center.edition or (center.edition and not center.edition.negative) then
871-
info_queue[#info_queue + 1] = G.P_CENTERS.e_negative
872-
end
873870
end,
874871
atlas = "atlasepic",
875872
calculate = function(self, card, context)
876873
if (context.setting_blind and not (context.blueprint_card or self).getting_sliced) or context.forcetrigger then
877-
local card = create_card("Joker", G.jokers, nil, nil, nil, nil, "j_jolly")
878-
card:set_edition({
879-
negative = true,
880-
})
881-
card:add_to_deck()
882-
G.jokers:emplace(card)
883-
return nil, true
874+
if #G.jokers.cards + G.GAME.joker_buffer < G.jokers.config.card_limit then
875+
local card = create_card("Joker", G.jokers, nil, nil, nil, nil, "j_jolly")
876+
card:add_to_deck()
877+
G.jokers:emplace(card)
878+
return nil, true
879+
end
884880
end
885881
end,
886882
pools = { ["M"] = true },
@@ -1946,11 +1942,10 @@ local fleshpanopticon = {
19461942
name = "cry-fleshpanopticon",
19471943
key = "fleshpanopticon",
19481944
pos = { x = 0, y = 5 },
1949-
config = { extra = { boss_size = 20 } },
1945+
config = { extra = { boss_size = 10 } },
19501946
dependencies = {
19511947
items = {
19521948
"set_cry_epic",
1953-
"c_cry_gateway",
19541949
},
19551950
},
19561951
immutable = true,
@@ -1959,7 +1954,7 @@ local fleshpanopticon = {
19591954
order = 146,
19601955
atlas = "atlasepic",
19611956
loc_vars = function(self, info_queue, center)
1962-
info_queue[#info_queue + 1] = { set = "Spectral", key = "c_cry_gateway" }
1957+
info_queue[#info_queue + 1] = { set = "Spectral", key = "c_cry_soul" }
19631958
if not center.edition or (center.edition and not center.edition.negative) then
19641959
info_queue[#info_queue + 1] = G.P_CENTERS.e_negative
19651960
end
@@ -2008,7 +2003,7 @@ local fleshpanopticon = {
20082003
nil,
20092004
nil,
20102005
nil,
2011-
Cryptid.enabled("c_cry_gateway") and "c_cry_gateway" or "c_soul",
2006+
"c_soul",
20122007
"sup"
20132008
)
20142009
card:set_edition({ negative = true }, true)

items/m.lua

Lines changed: 22 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -846,13 +846,15 @@ local scrabble = {
846846
< cry_prob(card.ability.cry_prob, card.ability.extra.odds, card.ability.cry_rigged)
847847
/ card.ability.extra.odds
848848
then
849-
check = true
850-
local card = create_card("Joker", G.jokers, nil, 0.9, nil, nil, nil, "scrabbletile")
851-
if Cryptid.enabled("e_cry_m") == true then
852-
card:set_edition({ cry_m = true })
849+
if #G.jokers.cards + G.GAME.joker_buffer < G.jokers.config.card_limit then
850+
check = true
851+
local card = create_card("Joker", G.jokers, nil, 0.9, nil, nil, nil, "scrabbletile")
852+
if Cryptid.enabled("e_cry_m") == true then
853+
card:set_edition({ cry_m = true })
854+
end
855+
card:add_to_deck()
856+
G.jokers:emplace(card)
853857
end
854-
card:add_to_deck()
855-
G.jokers:emplace(card)
856858
end
857859
if check then
858860
card_eval_status_text(
@@ -940,16 +942,20 @@ local sacrifice = {
940942
if to_big(card.ability.extra.unc) < to_big(1) then
941943
card.ability.extra.unc = 1
942944
end
943-
for i = 1, math.min(card.ability.immutable.max_spawns, card.ability.extra.jollies) do
944-
local jolly = create_card("Joker", G.jokers, nil, nil, nil, nil, "j_jolly")
945-
jolly:add_to_deck()
946-
G.jokers:emplace(jolly)
947-
end
948945
for i = 1, math.min(card.ability.immutable.max_spawns, card.ability.extra.unc) do
949-
local unc = create_card("Joker", G.jokers, nil, 0.9, nil, nil, nil, "sacrifice")
950-
unc:add_to_deck()
951-
G.jokers:emplace(unc)
952-
unc:start_materialize()
946+
if G.GAME.joker_buffer + #G.jokers.cards < G.jokers.config.card_limit then
947+
local unc = create_card("Joker", G.jokers, nil, 0.9, nil, nil, nil, "sacrifice")
948+
unc:add_to_deck()
949+
G.jokers:emplace(unc)
950+
unc:start_materialize()
951+
end
952+
end
953+
for i = 1, math.min(card.ability.immutable.max_spawns, card.ability.extra.jollies) do
954+
if G.GAME.joker_buffer + #G.jokers.cards < G.jokers.config.card_limit then
955+
local jolly = create_card("Joker", G.jokers, nil, nil, nil, nil, "j_jolly")
956+
jolly:add_to_deck()
957+
G.jokers:emplace(jolly)
958+
end
953959
end
954960
card_eval_status_text(
955961
context.blueprint_card or card,
@@ -1159,7 +1165,7 @@ local doodlem = {
11591165
config = {
11601166
extra = {
11611167
add = 1,
1162-
init = 2,
1168+
init = 1,
11631169
},
11641170
immutable = { max_jollies = 25 },
11651171
},

items/misc_joker.lua

Lines changed: 67 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -9324,70 +9324,84 @@ local pity_prize = {
93249324
name = "cry-Pity-Prize",
93259325
key = "pity_prize",
93269326
pos = { x = 5, y = 5 },
9327-
config = {},
9327+
config = {
9328+
extra = {
9329+
active = true
9330+
}
9331+
},
93289332
rarity = 1,
93299333
cost = 2,
93309334
atlas = "atlastwo",
93319335
order = 129,
93329336
blueprint_compat = true,
93339337
demicoloncompat = true,
93349338
loc_vars = function(self, info_queue, center)
9335-
return { key = Cryptid.gameset_loc(self, { modest = "modest" }), vars = {} }
9339+
return { key = Cryptid.gameset_loc(self, { modest = "modest" }), vars = {
9340+
center.ability.extra.active and localize("cry_active") or localize("cry_inactive")
9341+
} }
93369342
end,
93379343
calculate = function(self, card, context)
9344+
if context.after then
9345+
card.ability.extra.active = true
9346+
end
93389347
if context.skipping_booster or context.forcetrigger then
9339-
local tag_key
9340-
repeat
9341-
tag_key = get_next_tag_key("cry_pity_prize")
9342-
until tag_key ~= "tag_boss" --I saw pickle not generating boss tags because it apparently causes issues, so I did the same here
9343-
-- this is my first time seeing repeat... wtf
9344-
local tag = Tag(tag_key)
9345-
tag.ability.shiny = Cryptid.is_shiny()
9346-
if tag.name == "Orbital Tag" then
9347-
local _poker_hands = {}
9348-
for k, v in pairs(G.GAME.hands) do
9349-
if v.visible then
9350-
_poker_hands[#_poker_hands + 1] = k
9348+
if card.ability.extra.active or context.forcetrigger then
9349+
if not context.forcetrigger then
9350+
card.ability.extra.active = false
9351+
end
9352+
local tag_key
9353+
repeat
9354+
tag_key = get_next_tag_key("cry_pity_prize")
9355+
until tag_key ~= "tag_boss" --I saw pickle not generating boss tags because it apparently causes issues, so I did the same here
9356+
-- this is my first time seeing repeat... wtf
9357+
local tag = Tag(tag_key)
9358+
tag.ability.shiny = Cryptid.is_shiny()
9359+
if tag.name == "Orbital Tag" then
9360+
local _poker_hands = {}
9361+
for k, v in pairs(G.GAME.hands) do
9362+
if v.visible then
9363+
_poker_hands[#_poker_hands + 1] = k
9364+
end
93519365
end
9366+
tag.ability.orbital_hand = pseudorandom_element(_poker_hands, pseudoseed("cry_pity_prize"))
93529367
end
9353-
tag.ability.orbital_hand = pseudorandom_element(_poker_hands, pseudoseed("cry_pity_prize"))
9354-
end
9355-
add_tag(tag)
9356-
if
9357-
Card.get_gameset(card) == "modest"
9358-
and ((not context.blueprint and not context.retrigger_joker) or context.forcetrigger)
9359-
then
9360-
G.E_MANAGER:add_event(Event({
9361-
func = function()
9362-
play_sound("tarot1")
9363-
card.T.r = -0.2
9364-
card:juice_up(0.3, 0.4)
9365-
card.states.drag.is = true
9366-
card.children.center.pinch.x = true
9367-
G.E_MANAGER:add_event(Event({
9368-
trigger = "after",
9369-
delay = 0.3,
9370-
blockable = false,
9371-
func = function()
9372-
G.jokers:remove_card(card)
9373-
card:remove()
9374-
card = nil
9375-
return true
9376-
end,
9377-
}))
9378-
return true
9379-
end,
9380-
}))
9381-
card_eval_status_text(
9382-
card,
9383-
"extra",
9384-
nil,
9385-
nil,
9386-
nil,
9387-
{ message = localize("k_extinct_ex"), colour = G.C.FILTER }
9388-
)
9368+
add_tag(tag)
9369+
if
9370+
Card.get_gameset(card) == "modest"
9371+
and ((not context.blueprint and not context.retrigger_joker) or context.forcetrigger)
9372+
then
9373+
G.E_MANAGER:add_event(Event({
9374+
func = function()
9375+
play_sound("tarot1")
9376+
card.T.r = -0.2
9377+
card:juice_up(0.3, 0.4)
9378+
card.states.drag.is = true
9379+
card.children.center.pinch.x = true
9380+
G.E_MANAGER:add_event(Event({
9381+
trigger = "after",
9382+
delay = 0.3,
9383+
blockable = false,
9384+
func = function()
9385+
G.jokers:remove_card(card)
9386+
card:remove()
9387+
card = nil
9388+
return true
9389+
end,
9390+
}))
9391+
return true
9392+
end,
9393+
}))
9394+
card_eval_status_text(
9395+
card,
9396+
"extra",
9397+
nil,
9398+
nil,
9399+
nil,
9400+
{ message = localize("k_extinct_ex"), colour = G.C.FILTER }
9401+
)
9402+
end
9403+
return nil, true
93899404
end
9390-
return nil, true
93919405
end
93929406
end,
93939407
cry_credits = {
@@ -9798,8 +9812,8 @@ local huntingseason = { -- If played hand contains three cards, destroy the midd
97989812
pos = { x = 4, y = 5 },
97999813
order = 134,
98009814
immutable = true,
9801-
rarity = 2,
9802-
cost = 7,
9815+
rarity = 3,
9816+
cost = 8,
98039817
blueprint_compat = false,
98049818
atlas = "atlasone",
98059819
calculate = function(self, card, context)

0 commit comments

Comments
 (0)