Skip to content

Commit 5b1e8df

Browse files
pr 767
1 parent 614c0a2 commit 5b1e8df

File tree

3 files changed

+38
-10
lines changed

3 files changed

+38
-10
lines changed

items/misc_joker.lua

Lines changed: 27 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7735,11 +7735,34 @@ local oldblueprint = {
77357735
then
77367736
if SMODS.pseudorandom_probability(card, "oldblueprint", 1, card.ability.extra.odds, "Old Blueprint") then
77377737
G.E_MANAGER:add_event(Event({
7738-
card:start_dissolve(),
7738+
func = function()
7739+
play_sound("tarot1")
7740+
card.T.r = -0.2
7741+
card:juice_up(0.3, 0.4)
7742+
card.states.drag.is = true
7743+
card.children.center.pinch.x = true
7744+
G.E_MANAGER:add_event(Event({
7745+
trigger = "after",
7746+
delay = 0.3,
7747+
blockable = false,
7748+
func = function()
7749+
G.jokers:remove_card(card)
7750+
card:remove()
7751+
card = nil
7752+
return true
7753+
end,
7754+
}))
7755+
return true
7756+
end,
77397757
}))
7740-
return {
7741-
message = localize("k_extinct_ex"),
7742-
}
7758+
card_eval_status_text(
7759+
card,
7760+
"extra",
7761+
nil,
7762+
nil,
7763+
nil,
7764+
{ message = localize("cry_destroyed_ex")}
7765+
)
77437766
else
77447767
return {
77457768
message = localize("k_safe_ex"),

items/spooky.lua

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ local wrapped = {
9696
card:add_to_deck()
9797
G.jokers:emplace(card)
9898
return {
99-
message = localize("k_extinct_ex"),
99+
message = localize("k_eaten_ex"),
100100
colour = G.C.FILTER,
101101
}
102102
end
@@ -1534,7 +1534,7 @@ local candy_cane = {
15341534
end,
15351535
}))
15361536
return {
1537-
message = localize("k_extinct_ex"),
1537+
message = localize("k_eaten_ex"),
15381538
colour = G.C.FILTER,
15391539
}
15401540
end
@@ -1570,7 +1570,7 @@ local candy_cane = {
15701570
end,
15711571
}))
15721572
return {
1573-
message = localize("k_extinct_ex"),
1573+
message = localize("k_eaten_ex"),
15741574
colour = G.C.FILTER,
15751575
}
15761576
end
@@ -1623,7 +1623,7 @@ local candy_buttons = {
16231623
end,
16241624
}))
16251625
return {
1626-
message = localize("k_extinct_ex"),
1626+
message = localize("k_eaten_ex"),
16271627
colour = G.C.FILTER,
16281628
}
16291629
end
@@ -1701,7 +1701,7 @@ local jawbreaker = {
17011701
end,
17021702
}))
17031703
return {
1704-
message = localize("k_extinct_ex"),
1704+
message = localize("k_eaten_ex"),
17051705
colour = G.C.FILTER,
17061706
}
17071707
end
@@ -1833,7 +1833,7 @@ local brittle = {
18331833
end,
18341834
}))
18351835
return {
1836-
message = localize("k_extinct_ex"),
1836+
message = localize("k_eaten_ex"),
18371837
colour = G.C.FILTER,
18381838
}
18391839
end
@@ -1995,6 +1995,10 @@ local candy_sticks = {
19951995
return true
19961996
end,
19971997
}))
1998+
return {
1999+
message = localize("k_eaten_ex"),
2000+
colour = G.C.FILTER,
2001+
}
19982002
end
19992003
end
20002004
if context.end_of_round and G.GAME.blind:get_type() == "Boss" then

localization/en-us.lua

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5101,6 +5101,7 @@ return {
51015101
cry_active = "Active",
51025102
cry_inactive = "Inactive",
51035103
cry_divorced = "Divorced!",
5104+
cry_destroyed_ex = "Destroyed!",
51045105

51055106
k_disable_music = "Disable Music",
51065107

0 commit comments

Comments
 (0)