Skip to content

Commit 61ff257

Browse files
committed
tweaks to stuff
1 parent 377abd9 commit 61ff257

File tree

2 files changed

+0
-127
lines changed

2 files changed

+0
-127
lines changed

items/epic.lua

Lines changed: 0 additions & 113 deletions
Original file line numberDiff line numberDiff line change
@@ -2664,118 +2664,6 @@ local chad = {
26642664
},
26652665
}
26662666

2667-
local oil_lamp = { --You want it? It's yours my friend
2668-
object_type = "Joker",
2669-
dependencies = {
2670-
items = {
2671-
"set_cry_misc_joker",
2672-
},
2673-
},
2674-
name = "cry-Oil-Lamp",
2675-
key = "oil_lamp",
2676-
pos = { x = 4, y = 5 },
2677-
config = { extra = { increase = 1.2 } },
2678-
rarity = 3,
2679-
cost = 15,
2680-
order = 300.5,
2681-
atlas = "atlastwo",
2682-
demicoloncompat = true,
2683-
immutable = true,
2684-
loc_vars = function(self, info_queue, card)
2685-
card.ability.blueprint_compat_ui = card.ability.blueprint_compat_ui or ""
2686-
card.ability.blueprint_compat_check = nil
2687-
return {
2688-
vars = { number_format(card.ability.extra.increase) },
2689-
main_end = (card.area and card.area == G.jokers) and {
2690-
{
2691-
n = G.UIT.C,
2692-
config = { align = "bm", minh = 0.4 },
2693-
nodes = {
2694-
{
2695-
n = G.UIT.C,
2696-
config = {
2697-
ref_table = card,
2698-
align = "m",
2699-
colour = G.C.JOKER_GREY,
2700-
r = 0.05,
2701-
padding = 0.06,
2702-
func = "blueprint_compat",
2703-
},
2704-
nodes = {
2705-
{
2706-
n = G.UIT.T,
2707-
config = {
2708-
ref_table = card.ability,
2709-
ref_value = "blueprint_compat_ui",
2710-
colour = G.C.UI.TEXT_LIGHT,
2711-
scale = 0.32 * 0.8,
2712-
},
2713-
},
2714-
},
2715-
},
2716-
},
2717-
},
2718-
} or nil,
2719-
}
2720-
end,
2721-
update = function(self, card, front)
2722-
if G.STAGE == G.STAGES.RUN then
2723-
for i = 1, #G.jokers.cards do
2724-
if G.jokers.cards[i] == card then
2725-
other_joker = G.jokers.cards[i + 1]
2726-
end
2727-
end
2728-
if other_joker and other_joker ~= card and not (Card.no(other_joker, "immutable", true)) then
2729-
card.ability.blueprint_compat = "compatible"
2730-
else
2731-
card.ability.blueprint_compat = "incompatible"
2732-
end
2733-
end
2734-
end,
2735-
calculate = function(self, card, context)
2736-
if
2737-
(context.end_of_round and not context.repetition and not context.individual and not context.blueprint)
2738-
or context.forcetrigger
2739-
then
2740-
local check = false
2741-
for i = 1, #G.jokers.cards do
2742-
if G.jokers.cards[i] == card then
2743-
if i < #G.jokers.cards then
2744-
if not Card.no(G.jokers.cards[i + 1], "immutable", true) then
2745-
check = true
2746-
if G.jokers.cards[i + 1].ability.value_manip then
2747-
Cryptid.manipulate(G.jokers.cards[i + 1])
2748-
end
2749-
Cryptid.manipulate(G.jokers.cards[i + 1], { value = card.ability.extra.increase })
2750-
G.jokers.cards[i + 1].ability.value_manip = true
2751-
end
2752-
end
2753-
end
2754-
end
2755-
if check then
2756-
card_eval_status_text(
2757-
card,
2758-
"extra",
2759-
nil,
2760-
nil,
2761-
nil,
2762-
{ message = localize("k_upgrade_ex"), colour = G.C.GREEN }
2763-
)
2764-
end
2765-
end
2766-
end,
2767-
cry_credits = {
2768-
idea = {
2769-
"AlexZGreat",
2770-
},
2771-
art = {
2772-
"AlexZGreat",
2773-
},
2774-
code = {
2775-
"Foegro",
2776-
},
2777-
},
2778-
}
27792667

27802668
return {
27812669
name = "Epic Jokers",
@@ -2808,6 +2696,5 @@ return {
28082696
demicolon,
28092697
starfruit,
28102698
chad,
2811-
oil_lamp,
28122699
},
28132700
}

lib/misc.lua

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1560,17 +1560,3 @@ function Cryptid.upgrade_rarity(card, seed)
15601560
card:juice_up()
15611561
end
15621562
end
1563-
1564-
local er = end_round
1565-
function end_round()
1566-
er()
1567-
if G.GAME.round_resets.blind_states.Big == "Defeated" then
1568-
for i = 1, #G.jokers.cards do
1569-
if G.jokers.cards[i].ability.value_manip then
1570-
m = G.jokers.cards[i].ability.value_manip
1571-
Cryptid.manipulate(G.jokers.cards[i], { value = 1 / m })
1572-
G.jokers.cards[i].ability.value_manip = nil
1573-
end
1574-
end
1575-
end
1576-
end

0 commit comments

Comments
 (0)