Skip to content

Commit 7360fdb

Browse files
committed
quantify art
1 parent 250ee43 commit 7360fdb

File tree

4 files changed

+25
-31
lines changed

4 files changed

+25
-31
lines changed

assets/1x/atlasnotjokers.png

326 Bytes
Loading

assets/2x/atlasnotjokers.png

519 Bytes
Loading

items/code.lua

Lines changed: 21 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -2324,7 +2324,7 @@ local cryupdate = {
23242324
"HexaCryonic",
23252325
},
23262326
art = {
2327-
"Gemstonez",
2327+
"gemstonez",
23282328
},
23292329
code = {
23302330
"Nova",
@@ -3827,7 +3827,7 @@ local quantify = {
38273827
"HexaCryonic",
38283828
},
38293829
art = {
3830-
"?",
3830+
"gemstonez",
38313831
},
38323832
code = {
38333833
"lord.ruby",
@@ -3846,36 +3846,22 @@ local quantify = {
38463846
cost = 4,
38473847
atlas = "atlasnotjokers",
38483848
order = 425,
3849+
config = {extra = 1},
3850+
loc_vars = function(self, queue, card)
3851+
return {
3852+
vars = {
3853+
card.ability.extra
3854+
}
3855+
}
3856+
end,
38493857
can_use = function(self, card)
3850-
return true
3858+
local h, t = Cryptid.get_quantify(card)
3859+
return t > 0 and t <= card.ability.extra
38513860
end,
38523861
use = function(self, card)
3853-
G.GAME.USING_CODE = true
3854-
G.GAME.cry_quantify = true
3862+
Cryptid.handle_quantify(Cryptid.get_quantify(card))
38553863
end,
38563864
init = function()
3857-
local love_mousepressedref = love.mousepressed
3858-
function love.mousepressed(x, y, button, istouch)
3859-
love_mousepressedref(x, y, button, istouch)
3860-
if G.GAME.cry_quantify and G.CONTROLLER.hovering.target.config then
3861-
if Cryptid.handle_quantify(G.CONTROLLER.hovering.target) then
3862-
G.GAME.USING_CODE = nil
3863-
G.GAME.cry_quantify = nil
3864-
else
3865-
play_sound("tarot1")
3866-
attention_text({
3867-
text = localize("k_nope_ex"),
3868-
backdrop_colour = G.C.SECONDARY_SET.Code,
3869-
scale = 0.8,
3870-
hold = 2,
3871-
align = "cm",
3872-
offset = { x = 0, y = 0 },
3873-
major = G.play,
3874-
})
3875-
end
3876-
end
3877-
end
3878-
38793865
local calculate_ref = Card.calculate_joker
38803866
function Card:calculate_joker(context)
38813867
local ret, post = calculate_ref(self, context)
@@ -3944,6 +3930,14 @@ local quantify = {
39443930
end
39453931
return debuff_handref(self, Cryptid.table_merge(cards, tbl), hand, handname, check)
39463932
end
3933+
function Cryptid.get_quantify(card)
3934+
local highlighted
3935+
local total = 0
3936+
for i, v in pairs(G.I.CARD) do
3937+
if v.highlighted and v ~= card then highlighted = v; total = total + 1 end
3938+
end
3939+
return highlighted, total
3940+
end
39473941
function Cryptid.handle_quantify(target)
39483942
if type(target) == "table" and target.calculate_joker then
39493943
local highlighted = target
@@ -3973,8 +3967,6 @@ local quantify = {
39733967
return true
39743968
end
39753969
end
3976-
if type(target) == "table" and target.config and target.config.blind then
3977-
end
39783970
end
39793971
end,
39803972
-- use = function(self, card, area, copier)

localization/en-us.lua

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -673,8 +673,10 @@ return {
673673
c_cry_quantify = {
674674
name = "://QUANTIFY",
675675
text = { -- "{C:cry_code}J{C:cry_exotic}o{C:legendary}k{C:cry_epic}e{C:cry_candy}r{C:rare}i{C:uncommon}z{C:common}e{C:dark_edition}!{} an object",
676-
"To Be {C:cry_code}Implemented{}",
677-
"in a future {C:cry_code}update{}",
676+
"Transfer {C:attention}#1#{} selected",
677+
"{C:attention}Card#<s>1#{}, or {C:attention}Booster#<s>1#{}",
678+
"to the {C:attention}Jokers{} tray"
679+
678680
},
679681
},
680682
c_cry_divide = {

0 commit comments

Comments
 (0)