Skip to content

Commit 121276f

Browse files
committed
make rift omen
1 parent 1a82417 commit 121276f

File tree

6 files changed

+49
-66
lines changed

6 files changed

+49
-66
lines changed

assets/2x/other_consumables.png

-52.6 KB
Loading

assets/2x/reverse_tarots.png

-1.48 KB
Loading

items/inversions/reverse_spectrals.lua

Lines changed: 41 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,45 @@ local rendezvous = Entropy.SealSpectral("rendezvous", {x=10,y=5}, "entr_crimson"
121121
local eclipse = Entropy.SealSpectral("eclipse", {x=12,y=5}, "entr_sapphire",2000+12, "c_trance")
122122
local calamity = Entropy.SealSpectral("calamity", {x=6,y=6}, "entr_pink",2000+13, "c_medium",{art = {"Lil. Mr. Slipstream"}})
123123
local downpour = Entropy.SealSpectral("downpour", {x=12,y=7}, "entr_cerulean",2000+24, "c_cry_typhoon")
124+
125+
local rift = {
126+
key = "rift",
127+
set = "Omen",
128+
atlas = "consumables",
129+
object_type = "Consumable",
130+
order = 2000+24.5,
131+
dependencies = {
132+
items = {
133+
"set_entr_inversions"
134+
}
135+
},
136+
config = {
137+
num = 2
138+
},
139+
pos = {x=7,y=2},
140+
inversion = "c_cry_meld",
141+
use = function(self, card2)
142+
local cards = Entropy.GetHighlightedCards({G.jokers, G.consumeables, G.hand}, card2)
143+
Entropy.FlipThen(cards, function(card)
144+
card:juice_up()
145+
card:set_edition(Entropy.pseudorandom_element(G.P_CENTER_POOLS.Edition, pseudoseed("entropy"),function(e)
146+
return G.GAME.banned_keys[e.key] or e.no_doe
147+
end).key)
148+
end)
149+
end,
150+
can_use = function(self, card)
151+
local cards = Entropy.GetHighlightedCards({G.jokers, G.consumeables, G.hand}, card)
152+
return #cards > 0 and #cards < card.ability.num
153+
end,
154+
loc_vars = function(self, q, card)
155+
return {
156+
vars = {
157+
card.ability.num
158+
}
159+
}
160+
end,
161+
}
162+
124163
local script = Entropy.SealSpectral("script", {x=6,y=8}, "entr_verdant",2000+25, "c_cry_source")
125164

126165
local siphon = {
@@ -1935,6 +1974,7 @@ return {
19351974
pure,
19361975
purity,
19371976
transcend,
1938-
weld
1977+
weld,
1978+
rift
19391979
}
19401980
}

items/inversions/reverse_tarots.lua

Lines changed: 0 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -1305,62 +1305,6 @@ local integrity = {
13051305

13061306
}
13071307

1308-
local rift = {
1309-
key = "rift",
1310-
set = "Fraud",
1311-
atlas = "fraud",
1312-
object_type = "Consumable",
1313-
order = -901+26,
1314-
dependencies = {
1315-
items = {
1316-
"set_entr_inversions"
1317-
}
1318-
},
1319-
pos = {x=7,y=2},
1320-
inversion = "c_cry_meld",
1321-
use = function(self, card2)
1322-
local cards = {}
1323-
for i, v in ipairs(G.hand.cards or {}) do
1324-
cards[#cards+1] = v
1325-
end
1326-
for i, v in ipairs(G.jokers.cards or {}) do
1327-
cards[#cards+1] = v
1328-
end
1329-
for i, v in ipairs(G.consumeables.cards or {}) do
1330-
cards[#cards+1] = v
1331-
end
1332-
for i, v in ipairs((G.pack_cards or {cards = {}}).cards or {}) do
1333-
cards[#cards+1] = v
1334-
end
1335-
for i, v in ipairs((G.shop_jokers or {cards = {}}).cards or {}) do
1336-
cards[#cards+1] = v
1337-
end
1338-
for i, v in ipairs((G.shop_booster or {cards = {}}).cards or {}) do
1339-
cards[#cards+1] = v
1340-
end
1341-
for i, v in ipairs((G.shop_vouchers or {cards = {}}).cards or {}) do
1342-
cards[#cards+1] = v
1343-
end
1344-
local card = pseudorandom_element(cards, pseudoseed("rift_card"))
1345-
Entropy.FlipThen({card}, function(card)
1346-
card:juice_up()
1347-
card:set_edition(Entropy.pseudorandom_element(G.P_CENTER_POOLS.Edition, pseudoseed("entropy"),function(e)
1348-
return G.GAME.banned_keys[e.key] or e.no_doe
1349-
end).key)
1350-
end)
1351-
end,
1352-
can_use = function(self, card)
1353-
return #G.I.CARD > 0
1354-
end,
1355-
loc_vars = function(self, q, card)
1356-
return {
1357-
vars = {
1358-
card.ability.create
1359-
}
1360-
}
1361-
end,
1362-
}
1363-
13641308
local mallet = {
13651309
key = "mallet",
13661310
set = "Fraud",
@@ -1442,6 +1386,5 @@ return {
14421386
prophecy,
14431387
mallet,
14441388
village,
1445-
rift
14461389
}
14471390
}

localization/en-us.lua

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1327,13 +1327,6 @@ local decs = {
13271327
"{C:blue}+#1#{} bonus chips"
13281328
}
13291329
},
1330-
c_entr_rift = {
1331-
name = "The Rift",
1332-
text = {
1333-
"Apply a {C:attention}random{} {C:dark_edition}Edition{}",
1334-
"to a {C:attention}random{} Card"
1335-
}
1336-
},
13371330
},
13381331
Voucher = {
13391332
v_entr_marked = {
@@ -1816,6 +1809,13 @@ local decs = {
18161809
},
18171810
},
18181811
Omen = {
1812+
c_entr_rift = {
1813+
name = "Rift",
1814+
text = {
1815+
"Apply a {C:attention}random{} {C:dark_edition}Edition{}",
1816+
"to a {C:attention}random{} Card"
1817+
}
1818+
},
18191819
c_entr_define = {
18201820
name = "#1#define",
18211821
text = {

lovely/core.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1191,7 +1191,7 @@ local bigzero = to_big(0)
11911191
if not G.GAME.blind or to_big(G.GAME.blind.chips or 0) <= bigzero then
11921192
G.ARGS.score_intensity.earned_score = 0
11931193
else
1194-
G.ARGS.score_intensity.earned_score = math.max(Entropy.get_chipmult_score(G.GAME.current_round.current_hand.chips, G.GAME.current_round.current_hand.mult), 100)
1194+
G.ARGS.score_intensity.earned_score = to_number(math.max(Entropy.get_chipmult_score(G.GAME.current_round.current_hand.chips, G.GAME.current_round.current_hand.mult), 100))
11951195
end
11961196
bigzero = nil
11971197
'''

0 commit comments

Comments
 (0)