Skip to content

Commit aa6b08f

Browse files
committed
update steamodded :cat_owl:
1 parent b6f8463 commit aa6b08f

File tree

8 files changed

+57
-12
lines changed

8 files changed

+57
-12
lines changed

Cryptid.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"version": "0.5.5a~dev",
1313
"dependencies": [
1414
"Talisman (>=2.0.9)",
15-
"Steamodded (>=1.0.0~BETA-0308a)"
15+
"Steamodded (>=1.0.0~BETA-0314c)"
1616
],
1717
"conflicts": [
1818
"Saturn"

Cryptid.lua

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,20 +14,17 @@ Cryptid_config = SMODS.current_mod.config
1414
SMODS.current_mod.optional_features = {
1515
retrigger_joker = true,
1616
post_trigger = true,
17-
cardareas = {
18-
unscored = true,
19-
},
17+
quantum_enhancements = true,
2018
-- Here are some other ones Steamodded has
2119
-- Cryptid doesn't use them YET, but these should be uncommented if Cryptid uses them
2220
--[[
23-
quantum_enhancements = true,
2421
-- These ones add new card areas that Steamodded will calculate through
2522
-- Might already be useful for sticker calc
2623
cardareas = {
2724
deck = true,
2825
discard = true,
2926
}
30-
]]
27+
--]]
3128
}
3229

3330
--Load Library Files

assets/1x/atlasone.png

13.6 KB
Loading

assets/2x/atlasone.png

15.5 KB
Loading

items/code.lua

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4141,6 +4141,7 @@ local pointer = {
41414141
translucent = "translucent joker",
41424142
circulus = "circulus pistoris",
41434143
macabre = "macabre joker",
4144+
cat_owl = "cat owl",
41444145
-- Jen's Almanac aliases
41454146
freddy = "freddy snowshoe",
41464147
paupovlin = "paupovlin revere",

items/epic.lua

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1354,7 +1354,7 @@ local bonusjoker = {
13541354
atlas = "atlasepic",
13551355
calculate = function(self, card, context)
13561356
if context.individual and context.cardarea == G.play then
1357-
if context.other_card.ability.effect == "Bonus Card" then
1357+
if SMODS.has_enhancement(context.other_card, "m_bonus") then
13581358
if
13591359
pseudorandom("bonusjoker")
13601360
< cry_prob(card.ability.cry_prob, card.ability.extra.odds, card.ability.cry_rigged) / card.ability.extra.odds
@@ -1441,7 +1441,7 @@ local multjoker = {
14411441
calculate = function(self, card, context)
14421442
if context.individual and context.cardarea == G.play then
14431443
if
1444-
context.other_card.ability.effect == "Mult Card"
1444+
SMODS.has_enhancement(context.other_card, "m_mult")
14451445
and #G.consumeables.cards + G.GAME.consumeable_buffer < G.consumeables.config.card_limit
14461446
then
14471447
if
@@ -1511,7 +1511,7 @@ local goldjoker = {
15111511
end,
15121512
calculate = function(self, card, context)
15131513
if context.cardarea == G.play and context.individual and not context.blueprint then
1514-
if context.other_card.ability.effect == "Gold Card" then
1514+
if SMODS.has_enhancement(context.other_card, "m_gold") then
15151515
card.ability.extra.percent = card.ability.extra.percent + card.ability.extra.percent_mod
15161516
return {
15171517
extra = { focus = card, message = localize("k_upgrade_ex") },
@@ -1521,7 +1521,7 @@ local goldjoker = {
15211521
end
15221522
end
15231523
if context.individual and context.cardarea == G.play then
1524-
if context.other_card.ability.effect == "Gold Card" then
1524+
if SMODS.has_enhancement(context.other_card, "m_gold") then
15251525
card.ability.extra.percent = card.ability.extra.percent + card.ability.extra.percent_mod
15261526
return {
15271527
message = localize("k_upgrade_ex"),
@@ -2007,7 +2007,7 @@ local clockwork = { -- Steel Support: The Joker
20072007
end
20082008
end
20092009
if context.repetition and context.cardarea == G.hand and card.ability.counters.c1 == 0 then -- effect 1
2010-
if context.other_card.ability.effect == "Steel Card" then
2010+
if SMODS.has_enhancement(context.other_card, "m_steel") then
20112011
return {
20122012
message = localize("k_again_ex"),
20132013
repetitions = 1,
@@ -2033,7 +2033,7 @@ local clockwork = { -- Steel Support: The Joker
20332033
context.individual
20342034
and context.cardarea == G.hand
20352035
and not context.end_of_round
2036-
and context.other_card.ability.effect == "Steel Card"
2036+
and SMODS.has_enhancement(context.other_card, "m_steel")
20372037
and card.ability.extra.steelenhc > 1
20382038
then -- effect 4
20392039
return { xmult = card.ability.extra.steelenhc }

items/misc_joker.lua

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7765,6 +7765,43 @@ local huntingseason = { -- If played hand contains three cards, destroy the midd
77657765
},
77667766
},
77677767
}
7768+
local cat_owl = { -- Lucky Cards are considered Echo Cards and vice versa
7769+
object_type = "Joker",
7770+
dependencies = {
7771+
items = {
7772+
"set_cry_misc_joker",
7773+
"m_cry_echo",
7774+
"set_cry_misc",
7775+
},
7776+
},
7777+
name = "cry-cat_owl",
7778+
pools = { ["Meme"] = true },
7779+
key = "cat_owl",
7780+
pos = { x = 6, y = 5 },
7781+
order = 135,
7782+
rarity = 3,
7783+
cost = 8,
7784+
blueprint_compat = false,
7785+
atlas = "atlasone",
7786+
calculate = function(self, card, context)
7787+
if context.check_enhancement then
7788+
if context.other_card.config.center.key == "m_lucky" then
7789+
return {m_cry_echo = true}
7790+
end
7791+
if context.other_card.config.center.key == "m_cry_echo" then
7792+
return {m_lucky = true}
7793+
end
7794+
end
7795+
end,
7796+
cry_credits = {
7797+
idea = {
7798+
"Math",
7799+
},
7800+
code = {
7801+
"Math",
7802+
},
7803+
},
7804+
}
77687805
local miscitems = {
77697806
jimball_sprite,
77707807
dropshot,
@@ -7878,6 +7915,7 @@ local miscitems = {
78787915
translucent,
78797916
lebaron_james,
78807917
huntingseason,
7918+
cat_owl,
78817919
}
78827920
return {
78837921
name = "Misc. Jokers",

localization/en-us.lua

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1081,6 +1081,15 @@ return {
10811081
"for the next {C:attention}#2#{} round#<s>2#",
10821082
},
10831083
},
1084+
j_cry_cat_owl = {
1085+
name = "Cat Owl",
1086+
text = {
1087+
"{C:attention}Lucky Cards{} are also",
1088+
"considered {C:attention}Echo Cards",
1089+
"{C:attention}Echo Cards{} are also",
1090+
"considered {C:attention}Lucky Cards",
1091+
}
1092+
},
10841093
j_cry_chad = {
10851094
name = "Chad",
10861095
text = {

0 commit comments

Comments
 (0)