Skip to content

Commit 7ade088

Browse files
lord-rubylord-ruby
authored
Merge pull request #762 from SpectralPack/temp-1
Sync changes to branch
2 parents d3cf6a9 + d12ba04 commit 7ade088

24 files changed

+161
-94
lines changed

‎Cryptid.json‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,11 @@
99
"priority": 114,
1010
"badge_colour": "708b91",
1111
"badge_text_colour": "FFFFFF",
12-
"version": "0.5.10",
12+
"version": "0.5.11",
1313
"dependencies": [
1414
"Steamodded (>=1.0.0~BETA-0711a)"
1515
],
1616
"conflicts": [
17-
"Saturn",
1817
"AntePreview (>= 2.0.0~0c16a) (<<3.0.0)",
1918
"Cartomancer (<= 4.11)"
2019
],

‎assets/1x/cry_misc.png‎

-381 Bytes
Loading

‎assets/1x/intercept_sprite.png‎

-318 Bytes
Binary file not shown.

‎assets/2x/cry_misc.png‎

-1.33 KB
Loading

‎assets/2x/intercept_sprite.png‎

-514 Bytes
Binary file not shown.

‎items/blind.lua‎

Lines changed: 47 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ local oldox = {
1111
boss = {
1212
min = 2,
1313
max = 10,
14+
yes_orb = true,
1415
},
1516
atlas = "nostalgia",
1617
order = 4,
@@ -36,6 +37,7 @@ local oldhouse = {
3637
boss = {
3738
min = 3,
3839
max = 10,
40+
yes_orb = true,
3941
},
4042
atlas = "nostalgia",
4143
order = 5,
@@ -64,6 +66,7 @@ local oldarm = {
6466
boss = {
6567
min = 3,
6668
max = 10,
69+
yes_orb = true,
6770
},
6871
atlas = "nostalgia",
6972
order = 6,
@@ -92,6 +95,7 @@ local oldfish = {
9295
boss = {
9396
min = 2,
9497
max = 10,
98+
yes_orb = true,
9599
},
96100
atlas = "nostalgia",
97101
order = 7,
@@ -117,6 +121,7 @@ local oldmanacle = {
117121
boss = {
118122
min = 1,
119123
max = 10,
124+
yes_orb = true,
120125
},
121126
atlas = "nostalgia",
122127
order = 8,
@@ -142,6 +147,7 @@ local oldserpent = {
142147
boss = {
143148
min = 5,
144149
max = 10,
150+
yes_orb = true,
145151
},
146152
atlas = "nostalgia",
147153
order = 9,
@@ -167,6 +173,7 @@ local oldpillar = {
167173
boss = {
168174
min = 3,
169175
max = 10,
176+
yes_orb = true,
170177
},
171178
atlas = "nostalgia",
172179
order = 10,
@@ -195,6 +202,7 @@ local oldflint = {
195202
boss = {
196203
min = 3,
197204
max = 10,
205+
yes_orb = true,
198206
},
199207
atlas = "nostalgia",
200208
order = 11,
@@ -223,6 +231,7 @@ local oldmark = {
223231
boss = {
224232
min = 4,
225233
max = 10,
234+
yes_orb = true,
226235
},
227236
atlas = "nostalgia",
228237
order = 12,
@@ -251,6 +260,7 @@ local tax = {
251260
boss = {
252261
min = 2,
253262
max = 10,
263+
yes_orb = true,
254264
},
255265
atlas = "blinds",
256266
order = 2,
@@ -303,6 +313,7 @@ local box = {
303313
boss = {
304314
min = 1,
305315
max = 10,
316+
yes_orb = true,
306317
},
307318
atlas = "blinds",
308319
order = 13,
@@ -329,6 +340,7 @@ local clock = {
329340
boss = {
330341
min = 2,
331342
max = 10,
343+
yes_orb = true,
332344
},
333345
config = {
334346
tw_bl = {
@@ -368,6 +380,7 @@ local trick = {
368380
boss = {
369381
min = 1,
370382
max = 10,
383+
yes_orb = true,
371384
},
372385
atlas = "blinds",
373386
order = 14,
@@ -404,6 +417,7 @@ local joke = {
404417
boss = {
405418
min = 1,
406419
max = 10,
420+
yes_orb = true,
407421
},
408422
atlas = "blinds",
409423
order = 15,
@@ -451,6 +465,7 @@ local hammer = {
451465
boss = {
452466
min = 2,
453467
max = 10,
468+
yes_orb = true,
454469
},
455470
atlas = "blinds",
456471
order = 19,
@@ -487,6 +502,7 @@ local magic = {
487502
boss = {
488503
min = 2,
489504
max = 10,
505+
yes_orb = true,
490506
},
491507
atlas = "blinds",
492508
order = 20,
@@ -523,6 +539,7 @@ local windmill = {
523539
boss = {
524540
min = 4,
525541
max = 10,
542+
yes_orb = true,
526543
},
527544
atlas = "blinds",
528545
order = 16,
@@ -547,6 +564,7 @@ local striker = {
547564
boss = {
548565
min = 4,
549566
max = 10,
567+
yes_orb = true,
550568
},
551569
atlas = "blinds",
552570
order = 1,
@@ -571,6 +589,7 @@ local shackle = {
571589
boss = {
572590
min = 1,
573591
max = 10,
592+
yes_orb = true,
574593
},
575594
atlas = "blinds",
576595
order = 18,
@@ -605,6 +624,7 @@ local pin = {
605624
boss = {
606625
min = 4,
607626
max = 10,
627+
yes_orb = true,
608628
},
609629
atlas = "blinds",
610630
order = 17,
@@ -648,6 +668,7 @@ local scorch = {
648668
boss = {
649669
min = 1,
650670
max = 10,
671+
yes_orb = true,
651672
},
652673
atlas = "blinds",
653674
order = 21,
@@ -663,11 +684,11 @@ local scorch = {
663684
and (context.cardarea == G.play or context.cardarea == "unscored")
664685
and not G.GAME.blind.disabled
665686
then
666-
return { remove = not context.destroy_card.ability.eternal }
687+
return { remove = not SMODS.is_eternal(context.destroying_card) }
667688
end
668689
if context.discard and not G.GAME.blind.disabled then
669690
for i, card in ipairs(G.hand.highlighted) do
670-
return { remove = not card.ability.eternal }
691+
return { remove = not SMODS.is_eternal(card) }
671692
end
672693
end
673694
end,
@@ -699,6 +720,7 @@ local greed = {
699720
boss = {
700721
min = 1,
701722
max = 10,
723+
yes_orb = true,
702724
},
703725
atlas = "blinds",
704726
order = 22,
@@ -764,6 +786,7 @@ local decision = {
764786
boss = {
765787
min = 4,
766788
max = 666666,
789+
yes_orb = true,
767790
},
768791
atlas = "blinds",
769792
order = 23,
@@ -848,6 +871,7 @@ local repulsor = {
848871
boss = {
849872
min = 4,
850873
max = 666666,
874+
yes_orb = true,
851875
},
852876
atlas = "blinds_two",
853877
order = 24,
@@ -899,6 +923,7 @@ local chromatic = {
899923
boss = {
900924
min = 1,
901925
max = 666666,
926+
yes_orb = true,
902927
},
903928
atlas = "blinds_two",
904929
order = 25,
@@ -925,31 +950,29 @@ local landlord = {
925950
pos = { x = 0, y = 2 },
926951
dollars = 5,
927952
boss = {
928-
min = 1,
953+
min = 4,
929954
max = 666666,
955+
yes_orb = true,
930956
},
931957
atlas = "blinds_two",
932958
order = 26,
933959
boss_colour = HEX("c89f13"),
934-
calculate = function(self, blind, context)
935-
if context.after then
936-
local jokers = {}
937-
for i, v in pairs(G.jokers.cards) do
938-
if not v.ability.rental then
939-
jokers[#jokers + 1] = v
940-
end
941-
end
942-
if #jokers > 0 then
943-
G.E_MANAGER:add_event(Event({
944-
func = function()
945-
local joker = pseudorandom_element(jokers, pseudoseed("cry_landlord"))
946-
joker.ability.rental = true
947-
joker:juice_up()
948-
return true
949-
end,
950-
}))
960+
debuff_hand = function(self, cards, hand, handname, check)
961+
G.GAME.blind.triggered = false
962+
local jokers = {}
963+
for i, v in pairs(G.jokers.cards) do
964+
if not v.ability.rental then
965+
jokers[#jokers + 1] = v
951966
end
967+
end
968+
if #jokers > 0 then
952969
G.GAME.blind.triggered = true
970+
if not check then
971+
local joker = pseudorandom_element(jokers, pseudoseed("cry_landlord"))
972+
joker:set_rental(true)
973+
joker:juice_up()
974+
G.GAME.blind:wiggle()
975+
end
953976
end
954977
end,
955978
}
@@ -973,6 +996,7 @@ local lavender_loop = {
973996
min = 3,
974997
max = 10,
975998
showdown = true,
999+
yes_orb = true,
9761000
},
9771001
atlas = "blinds",
9781002
order = 91,
@@ -1074,6 +1098,7 @@ local vermillion_virus = {
10741098
min = 3,
10751099
max = 10,
10761100
showdown = true,
1101+
yes_orb = true,
10771102
},
10781103
atlas = "blinds",
10791104
order = 90,
@@ -1083,7 +1108,7 @@ local vermillion_virus = {
10831108
local idx
10841109
--Check for eligible cards (not eternal and not immune)
10851110
for i = 1, #G.jokers.cards do
1086-
if not G.jokers.cards[i].config.center.immune_to_vermillion and not G.jokers.cards[i].ability.eternal then
1111+
if not G.jokers.cards[i].config.center.immune_to_vermillion and not SMODS.is_eternal(G.jokers.cards[i]) then
10871112
eligible_cards[#eligible_cards + 1] = G.jokers.cards[i]
10881113
end
10891114
end
@@ -1125,6 +1150,7 @@ local sapphire_stamp = {
11251150
min = 3,
11261151
max = 10,
11271152
showdown = true,
1153+
yes_orb = true,
11281154
},
11291155
atlas = "blinds",
11301156
order = 92,

‎items/code.lua‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1243,6 +1243,7 @@ local rework = {
12431243
return card.ability.set == "Joker"
12441244
end)
12451245
return #cards == 1
1246+
and not SMODS.is_eternal(cards[1])
12461247
and cards[1].ability.name
12471248
~= ("cry-meteor" or "cry-exoplanet" or "cry-stardust" or "cry_cursed" or "Diet Cola")
12481249
end,
@@ -1318,7 +1319,7 @@ local merge = {
13181319
if
13191320
#hand ~= 1
13201321
or #consumeables ~= 1
1321-
or consumeables[1].ability.eternal
1322+
or SMODS.is_eternal(consumeables[1])
13221323
or consumeables[1].ability.set == "Unique"
13231324
then
13241325
return false
@@ -1421,7 +1422,7 @@ local commit = {
14211422
return card.ability.set == "Joker" and not card.getting_sliced
14221423
end)
14231424
return #jokers == 1
1424-
and not jokers[1].ability.eternal
1425+
and not SMODS.is_eternal(jokers[1])
14251426
and not (type(jokers[1].config.center.rarity) == "number" and jokers[1].config.center.rarity >= 5)
14261427
end,
14271428
use = function(self, card, area, copier)
@@ -2185,6 +2186,8 @@ local hooked = {
21852186
and context.post_trigger
21862187
and not context.forcetrigger
21872188
and not context.other_context.forcetrigger
2189+
and not context.other_context.mod_probability
2190+
and not context.other_context.fixed_probability
21882191
then
21892192
if not card.ability.cry_hook_triggers_left then
21902193
card.ability.cry_hook_triggers_left = 8
@@ -4209,7 +4212,7 @@ local alttab = {
42094212
local tag = nil
42104213
local type = G.GAME.blind:get_type()
42114214
local tag_key = Cryptid.get_next_tag()
4212-
if tag_Key then
4215+
if tag_key then
42134216
tag = Tag(tag_key)
42144217
elseif type == "Boss" then
42154218
tag = Tag(get_next_tag_key())
@@ -4966,7 +4969,7 @@ local cut = {
49664969
if
49674970
G.consumeables.cards[i].ability.set == "Code"
49684971
and not G.consumeables.cards[i].getting_sliced
4969-
and not G.consumeables.cards[i].ability.eternal
4972+
and not SMODS.is_eternal(G.consumeables.cards[i])
49704973
then
49714974
destructable_codecard[#destructable_codecard + 1] = G.consumeables.cards[i]
49724975
end

‎items/epic.lua‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1454,7 +1454,7 @@ local curse_sob = {
14541454
check_for_unlock = function(self, args)
14551455
if Cryptid.safe_get(G, "jokers") then
14561456
for i = 1, #G.jokers.cards do
1457-
if G.jokers.cards[i].config.center.key == "j_obelisk" and G.jokers.cards[i].ability.eternal then
1457+
if G.jokers.cards[i].config.center.key == "j_obelisk" and SMODS.is_eternal(G.jokers.cards[i]) then
14581458
unlock_card(self)
14591459
end
14601460
end
@@ -2052,7 +2052,7 @@ local fleshpanopticon = {
20522052
return true
20532053
end,
20542054
}))
2055-
if not card.ability.eternal then
2055+
if not SMODS.is_eternal(card) then
20562056
G.E_MANAGER:add_event(Event({
20572057
func = function()
20582058
play_sound("tarot1")

‎items/exotic.lua‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ local gateway = {
2323
use = function(self, card, area, copier)
2424
local deletable_jokers = {}
2525
for k, v in pairs(G.jokers.cards) do
26-
if not v.ability.eternal then
26+
if not SMODS.is_eternal(v) then
2727
deletable_jokers[#deletable_jokers + 1] = v
2828
end
2929
end

‎items/m.lua‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1662,7 +1662,7 @@ local macabre = {
16621662
and not v:is_jolly()
16631663
and v.config.center.key ~= "j_cry_mprime"
16641664
and not (
1665-
v.ability.eternal
1665+
SMODS.is_eternal(v)
16661666
or v.getting_sliced
16671667
or Cryptid.safe_get(v.config.center, "pools", "M")
16681668
)

0 commit comments

Comments
 (0)