Skip to content

Commit 7f15926

Browse files
committed
fix typo
1 parent ffaf30d commit 7f15926

File tree

4 files changed

+52
-52
lines changed

4 files changed

+52
-52
lines changed

assets/1x/other_consumables.png

3.65 KB
Loading

items/inversions/reverse_spectrals.lua

Lines changed: 47 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -815,79 +815,41 @@ local quasar = {
815815
}
816816
}
817817

818-
local weld = {
818+
local dispel = {
819819
dependencies = {
820820
items = {
821821
"set_entr_inversions",
822822
}
823823
},
824824
object_type = "Consumable",
825825
order = 2000 + 17,
826-
key = "weld",
826+
key = "dispel",
827827
set = "Omen",
828828

829829
inversion = "c_cry_lock",
830830

831831
atlas = "consumables",
832832
config = {
833833
select = 1,
834-
discard = 1
835834
},
836835
pos = {x=11,y=6},
837836
--soul_pos = { x = 5, y = 0},
838837
use = function(self, card, area, copier)
839-
for i = 1, card.ability.select do
840-
local card = G.jokers.highlighted[i]
841-
if card then
842-
G.E_MANAGER:add_event(Event({
843-
trigger = "after",
844-
delay = 0.2,
845-
func = function()
846-
card:flip()
847-
return true
848-
end
849-
}))
850-
end
851-
end
852-
for i = 1, card.ability.select do
853-
local card = G.jokers.highlighted[i]
854-
if card then
855-
G.E_MANAGER:add_event(Event({
856-
trigger = "after",
857-
delay = 0.2,
858-
func = function()
859-
card.ability.eternal = true
860-
return true
861-
end
862-
}))
863-
end
864-
end
865-
for i = 1, card.ability.select do
866-
local card = G.jokers.highlighted[i]
867-
if card then
868-
G.E_MANAGER:add_event(Event({
869-
trigger = "after",
870-
delay = 0.2,
871-
func = function()
872-
card:flip()
873-
return true
874-
end
875-
}))
838+
for i, v in pairs(Entropy.GetHighlightedCards({G.jokers}, card)) do
839+
if not v.entr_aleph then
840+
v:start_dissolve()
841+
G.GAME.banned_keys[v.config.center.key] = true
876842
end
877843
end
878-
--G.GAME.round_resets.discards = G.GAME.round_resets.discards - card.ability.discard
879-
--ease_discard(-card.ability.discard)
880844
end,
881845
can_use = function(self, card)
882846
local cards = Entropy.GetHighlightedCards({G.jokers}, card)
883847
return #cards > 0 and #cards <= card.ability.select
884848
end,
885849
loc_vars = function(self, q, card)
886-
q[#q+1] = {key = "eternal", set="Other"}
887850
return {
888851
vars = {
889852
card.ability.select,
890-
-card.ability.discard
891853
}
892854
}
893855
end,
@@ -1805,6 +1767,44 @@ local transcend = {
18051767
end
18061768
}
18071769

1770+
local weld = {
1771+
dependencies = {
1772+
items = {
1773+
"set_entr_inversions",
1774+
}
1775+
},
1776+
object_type = "Consumable",
1777+
order = 2000 + 36,
1778+
key = "weld",
1779+
set = "Omen",
1780+
1781+
inversion = "c_entr_antithesis",
1782+
1783+
atlas = "consumables",
1784+
config = {
1785+
select = 1,
1786+
},
1787+
pos = {x=10,y=8},
1788+
--soul_pos = { x = 5, y = 0},
1789+
use = function(self, card, area, copier)
1790+
Entropy.FlipThen(Entropy.GetHighlightedCards({G.jokers}, card), function(card)
1791+
card.ability.entr_aleph = true
1792+
card:set_edition("e_negative")
1793+
end)
1794+
end,
1795+
can_use = function(self, card)
1796+
local cards = Entropy.GetHighlightedCards({G.jokers}, card)
1797+
return #cards > 0 and #cards <= card.ability.select
1798+
end,
1799+
loc_vars = function(self, q, card)
1800+
return {
1801+
vars = {
1802+
card.ability.select,
1803+
}
1804+
}
1805+
end,
1806+
}
1807+
18081808
return {
18091809
items = {
18101810
changeling,
@@ -1828,7 +1828,7 @@ return {
18281828
entropy,
18291829
quasar,
18301830
fervour,
1831-
weld,
1831+
dispel,
18321832
cleanse,
18331833
fusion,
18341834
substitute,
@@ -1845,6 +1845,7 @@ return {
18451845
beyond,
18461846
pure,
18471847
purity,
1848-
transcend
1848+
transcend,
1849+
weld
18491850
}
18501851
}

lib/hooks.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1334,7 +1334,7 @@ function level_up_hand(card, hand, instant, amount, ...)
13341334
hand = "High Card"
13351335
end
13361336
local val = ref(card,hand,instant,amount, ...)
1337-
if card and and card.config and card.config.center and card.config.center.set == "Joker" then
1337+
if card and card.config and card.config.center and card.config.center.set == "Joker" then
13381338
G.E_MANAGER:add_event(Event({
13391339
func = function()
13401340
G.GAME.hands[hand].level = level

localization/en-us.lua

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1803,12 +1803,11 @@ local decs = {
18031803
}
18041804
},
18051805

1806-
c_entr_weld = {
1807-
name = "Weld",
1806+
c_entr_dispel = {
1807+
name = "Dispel",
18081808
text = {
1809-
"Apply {C:legendary,E:1}Eternal{}",
1810-
"to {C:attention}#1#{} selected Joker",
1811-
--"{C:red}#2#{} discard"
1809+
"Banish {C:attention}#1#{} selected Joker#s<1>#",
1810+
"{C:inactive}(Bypasses Eternal){}"
18121811
}
18131812
},
18141813
c_entr_cleanse = {

0 commit comments

Comments
 (0)