diff --git a/Cryptid.lua b/Cryptid.lua index fcd46e9de..17bfa92dd 100644 --- a/Cryptid.lua +++ b/Cryptid.lua @@ -5,7 +5,7 @@ --- MOD_AUTHOR: [MathIsFun_, Cryptid and Balatro Discords] --- MOD_DESCRIPTION: Adds unbalanced ideas to Balatro. --- BADGE_COLOUR: 708b91 ---- DEPENDENCIES: [Talisman>=2.0.0-beta8, Steamodded>=1.0.0~ALPHA-1225a] +--- DEPENDENCIES: [Talisman>=2.0.0-beta8, Steamodded>=1.0.0~ALPHA-1312c] --- VERSION: 0.5.4~dev2 --- PRIORITY: 2147483647 diff --git a/items/m.lua b/items/m.lua index aa49b217f..824dec042 100644 --- a/items/m.lua +++ b/items/m.lua @@ -775,6 +775,7 @@ local reverse = { config = { extra = { type = "Pair" } }, pools = {["Meme"] = true}, pos = { x = 0, y = 0 }, + display_size = { w = 0.7 * 71, h = 0.7 * 95 }, rarity = 2, order = 260, cost = 4, @@ -1051,6 +1052,7 @@ local biggestm = { key = "biggestm", config = { extra = { x_mult = 7, type = "Pair", check = false, text = "Inactive" } }, pos = { x = 3, y = 3 }, + display_size = { w = 1.7 * 71, h = 1.7 * 95 }, dependencies = { items = { "set_cry_m", diff --git a/items/misc_joker.lua b/items/misc_joker.lua index e8fa7154a..27ccdc7dc 100644 --- a/items/misc_joker.lua +++ b/items/misc_joker.lua @@ -291,6 +291,7 @@ local wee_fib = { key = "wee_fib", config = { extra = { mult = 0, mult_mod = 3 } }, pos = { x = 1, y = 5 }, + display_size = { w = 0.7 * 71, h = 0.7 * 95 }, rarity = 3, cost = 9, order = 98, @@ -631,6 +632,7 @@ local cube = { key = "cube", config = { extra = { chips = 6 } }, pos = { x = 5, y = 4 }, + pixel_size = { w = 0.1 * 71, h = 0.1 * 95 }, rarity = 1, order = 11, cost = -27, @@ -709,6 +711,7 @@ local booster = { key = "booster", config = { extra = { booster_slots = 1 } }, pos = { x = 2, y = 0 }, + display_size = { w = 1.17 * 71, h = 1.17 * 95 }, order = 34, rarity = 2, cost = 6, @@ -1108,6 +1111,7 @@ local jimball = { name = "cry-Jimball", key = "jimball", pos = { x = 0, y = 0 }, + pixel_size = { w = 57/69 * 71, h = 57/69 * 71 }, order = 8, config = { x_mult = 1, extra = 0.15, override_x_mult_check = true }, pools = {["Meme"] = true}, @@ -1980,6 +1984,7 @@ local magnet = { name = "cry-magnet", key = "magnet", pos = { x = 4, y = 0 }, + pixel_size = { w = 35, h = 35 }, config = { extra = { money = 2, Xmoney = 5, slots = 4 } }, rarity = 1, cost = 6, diff --git a/items/spooky.lua b/items/spooky.lua index 116cb156c..6ca9fcdf1 100644 --- a/items/spooky.lua +++ b/items/spooky.lua @@ -262,6 +262,7 @@ local potion = { key = "potion", name = "cry-Potion", pos = { x = 0, y = 1 }, + pixel_size = { w = 35/69 * 71, h = 35/69 * 71 }, config = { random_event = 2 }, cost = 4, no_doe = true, diff --git a/lovely/resized.toml b/lovely/resized.toml deleted file mode 100644 index f5cdb2179..000000000 --- a/lovely/resized.toml +++ /dev/null @@ -1,126 +0,0 @@ -[manifest] -version = "1.0.0" -dump_lua = true -priority = -1 - -# Wee Fibonacci rendering -[[patches]] -[patches.pattern] -target = "card.lua" -pattern = 'if center.name == "Wee Joker" and (center.discovered or self.bypass_discovery_center) then' -position = "before" -payload = ''' -if (center.name == "cry-Wee Fibonacci" or center.name == "cry-reverse") and (center.discovered or self.bypass_discovery_center) then - H = H*0.7 - W = W*0.7 - self.T.h = H - self.T.w = W -end -if center.name == "cry-biggestm" and (center.discovered or self.bypass_discovery_center) then - H = H*1.7 - W = W*1.7 - self.T.h = H - self.T.w = W -end -if center.name == "cry-Booster Joker" and (center.discovered or self.bypass_discovery_center) then - H = H*1.17 - W = W*1.17 - self.T.h = H - self.T.w = W -end -if center.name == "cry-Cube" and (center.discovered or self.bypass_discovery_center) then - H = H*0.1 - W = W*0.1 - self.T.h = H - self.T.w = W -end -if center.name == "cry-Potion" and (center.discovered or self.bypass_discovery_center) then - H = W - self.T.h = H - H = H*35/69 - W = W*35/69 - self.T.h = H - self.T.w = W -end -if center.name == "cry-Jimball" and (center.discovered or self.bypass_discovery_center) then - H = W - self.T.h = H - H = H*57/69 - W = W*57/69 - self.T.h = H - self.T.w = W -end -if center.name == "cry-magnet" and (center.discovered or self.bypass_discovery_center) then - H = W - self.T.h = H - H = H*35/71 - W = W*35/71 - self.T.h = H - self.T.w = W -end -''' -match_indent = true - - -# Wee Fibonacci rendering -[[patches]] -[patches.pattern] -target = "card.lua" -pattern = "if _center.name == 'Photograph' and (_center.discovered or self.bypass_discovery_center) then" -position = "before" -payload = ''' -if _center.name == "cry-Cube" and (_center.discovered or self.bypass_discovery_center) then - self.children.center.scale.y = self.children.center.scale.y*0.1 - self.children.center.scale.x = self.children.center.scale.x*0.1 -end -if _center.name == 'cry-Jimball' and (_center.discovered or self.bypass_discovery_center) then - self.children.center.scale.y = self.children.center.scale.x - self.children.center.scale.y = self.children.center.scale.y*57/69 - self.children.center.scale.x = self.children.center.scale.x*57/69 -end -if _center.name == 'cry-Potion' and (_center.discovered or self.bypass_discovery_center) then - self.children.center.scale.y = self.children.center.scale.x - self.children.center.scale.y = self.children.center.scale.y*35/69 - self.children.center.scale.x = self.children.center.scale.x*35/69 -end -if _center.name == 'cry-magnet' and (_center.discovered or self.bypass_discovery_center) then - self.children.center.scale.y = self.children.center.scale.x - self.children.center.scale.y = self.children.center.scale.y*35/71 - self.children.center.scale.x = self.children.center.scale.x*35/71 -end -''' -match_indent = true - -# Cube rendering -[[patches]] -[patches.pattern] -target = "card.lua" -pattern = 'elseif self.config.center.name == "Wee Joker" then' -position = "before" -payload = ''' -elseif self.config.center.name == "cry-Wee Fibonacci" or self.config.center.name == "cry-reverse" then - self.T.h = H*scale*0.7*scale - self.T.w = W*scale*0.7*scale -elseif self.config.center.name == "cry-biggestm" then - self.T.h = H*scale*1.7*scale - self.T.w = W*scale*1.7*scale -elseif self.config.center.name == "cry-Booster Joker" then - self.T.h = H*scale*1.17*scale - self.T.w = W*scale*1.17*scale -elseif self.config.center.name == "cry-Cube" then - self.T.h = H*scale*0.1*scale - self.T.w = W*scale*0.1*scale -elseif self.config.center.name == "cry-Jimball" then - H = W - self.T.h = H*scale*57/69*scale - self.T.w = W*scale*57/69*scale -elseif self.config.center.name == "cry-Potion" then - H = W - self.T.h = H*scale*35/69*scale - self.T.w = W*scale*35/69*scale -elseif self.config.center.name == "cry-magnet" then - H = W - self.T.h = H*scale*35/71*scale - self.T.w = W*scale*35/71*scale -''' -match_indent = true