Skip to content

Commit c430a3f

Browse files
committed
ritual stuff
1 parent 2f33189 commit c430a3f

File tree

4 files changed

+25
-14
lines changed

4 files changed

+25
-14
lines changed

items/epic.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1016,7 +1016,7 @@ local number_blocks = {
10161016
}
10171017
end,
10181018
calculate = function(self, card, context)
1019-
if context.after and not context.blueprint and not context.before and not context.after then
1019+
if context.after and not context.blueprint and not context.before and not context.repetition then
10201020
for i, v in pairs(G.hand.cards) do
10211021
if v:get_id() == G.GAME.current_round.cry_nb_card.id and not v.debuff then
10221022
card.ability.extra.money =

items/spectral.lua

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -632,11 +632,11 @@ local ritual = {
632632
if not center.edition or (center.edition and not center.edition.cry_mosaic) then
633633
info_queue[#info_queue + 1] = G.P_CENTERS.e_cry_mosaic
634634
end
635-
if not center.edition or (center.edition and not center.edition.negative) then
636-
info_queue[#info_queue + 1] = G.P_CENTERS.e_negative
635+
if not center.edition or (center.edition and not center.edition.cry_oversat) then
636+
info_queue[#info_queue + 1] = G.P_CENTERS.e_cry_oversat
637637
end
638-
if not center.edition or (center.edition and not center.edition.cry_astral) then
639-
info_queue[#info_queue + 1] = G.P_CENTERS.e_cry_astral
638+
if not center.edition or (center.edition and not center.edition.cry_gold) then
639+
info_queue[#info_queue + 1] = G.P_CENTERS.e_cry_gold
640640
end
641641
return { vars = { center.ability.max_highlighted } }
642642
end,
@@ -672,12 +672,12 @@ local ritual = {
672672
if highlighted then
673673
local random_result = pseudorandom(pseudoseed("cry-Ritual"))
674674
if random_result >= 5 / 6 then
675-
highlighted:set_edition({ cry_astral = true })
675+
highlighted:set_edition({ cry_gold = true })
676676
else
677677
if random_result >= 1 / 2 then
678678
highlighted:set_edition({ cry_mosaic = true })
679679
else
680-
highlighted:set_edition({ negative = true })
680+
highlighted:set_edition({ cry_oversat = true })
681681
end
682682
end
683683
highlighted.will_be_editioned = nil

items/tag.lua

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -107,14 +107,24 @@ local schematic = {
107107
config = { type = "store_joker_create" },
108108
key = "schematic",
109109
loc_vars = function(self, info_queue)
110-
info_queue[#info_queue + 1] = { set = "Joker", key = "j_brainstorm" }
111110
return { vars = {} }
112111
end,
113112
apply = function(self, tag, context)
114113
if context.type == "store_joker_create" then
115114
local card
116-
if not G.GAME.banned_keys["j_brainstorm"] then
117-
card = create_card("Joker", context.area, nil, nil, nil, nil, "j_brainstorm")
115+
if #G.jokers.cards == 0 then
116+
tag:nope()
117+
tag.triggered = true
118+
return
119+
end
120+
local chosen_key = pseudorandom_element(G.jokers.cards, pseudoseed("schematic_tag")).config.center.key
121+
local tries = 0
122+
while G.GAME.banned_keys[chosen_key] and tries <= 10 do
123+
chosen_key = pseudorandom_element(G.jokers.cards, pseudoseed("schematic_tag")).config.center.key
124+
tries = tries + 1
125+
end
126+
if not G.GAME.banned_keys[chosen_key] then
127+
card = create_card("Joker", context.area, nil, nil, nil, nil, chosen_key)
118128
create_shop_card_ui(card, "Joker", context.area)
119129
card.states.visible = false
120130
tag:yep("+", G.C.RED, function()

localization/en-us.lua

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3460,8 +3460,8 @@ return {
34603460
c_cry_ritual = {
34613461
name = "Ritual",
34623462
text = {
3463-
"Apply {C:dark_edition}Negative{}, {C:dark_edition}Mosaic{},",
3464-
"or {C:dark_edition}Astral{} to {C:attention}#1#{}",
3463+
"Apply {C:dark_edition}Mosaic{}, {C:dark_edition}Oversaturated{},",
3464+
"or {C:dark_edition}Golden{} to {C:attention}#1#{}",
34653465
"selected card#<s>1# in hand",
34663466
},
34673467
},
@@ -3773,8 +3773,9 @@ return {
37733773
tag_cry_schematic = {
37743774
name = "Schematic Tag",
37753775
text = {
3776-
"Shop has a",
3777-
"{C:attention}Brainstorm",
3776+
"Shop has a copy",
3777+
"of {C:attention}One{} of",
3778+
"your owned Jokers"
37783779
},
37793780
},
37803781
tag_cry_scope = {

0 commit comments

Comments
 (0)