Merge branch 'main' of https://github.com/MathIsFun0/Cryptid

Author: MathIsFun0

Cryptid.lua

@@ -69,7 +69,11 @@ local function process_items(f, mod)
 					}
 					item.mod_path = mod.path
 					if item.key then
-						item.key = mod.prefix .. "_" .. item.key
+						if item.object_type and SMODS[item.object_type].class_prefix then
+							item.key = SMODS[item.object_type].class_prefix .. "_" .. mod.prefix .. "_" .. item.key
+						else
+							item.key = mod.prefix .. "_" .. item.key
+						end
 					end
 					if item.atlas then
 						item.atlas = mod.prefix .. "_" .. item.atlas

items/deck.lua

@@ -473,7 +473,7 @@ local antimatter = {
 		},
 	},
 	loc_vars = function(self, info_queue, center)
-		return { key = Cryptid.gameset_loc(self, {mainline = "balanced", modest = "balanced"}) }
+		return { key = Cryptid.gameset_loc(self, { mainline = "balanced", modest = "balanced" }) }
 	end,
 	name = "cry-Antimatter",
 	order = 76,

items/epic.lua

@@ -34,8 +34,10 @@ local supercell = {
 	blueprint_compat = true,
 	atlas = "atlasepic",
 	loc_vars = function(self, info_queue, center)
-		return { key = Cryptid.gameset_loc(self, {modest = "balanced"}),
-			vars = { center.ability.extra.stat1, center.ability.extra.stat2, center.ability.extra.money } }
+		return {
+			key = Cryptid.gameset_loc(self, { modest = "balanced" }),
+			vars = { center.ability.extra.stat1, center.ability.extra.stat2, center.ability.extra.money },
+		}
 	end,
 	calculate = function(self, card, context)
 		if context.joker_main then
@@ -108,7 +110,7 @@ local membershipcardtwo = {
 			a = 8
 		end
 		return {
-			key = Cryptid.gameset_loc(self, {modest = "balanced"}),
+			key = Cryptid.gameset_loc(self, { modest = "balanced" }),
 			vars = { card.ability.extra.chips, card.ability.extra.chips * math.floor(GLOBAL_cry_member_count / a) },
 		}
 	end,
@@ -328,7 +330,7 @@ local canvas = {
 	blueprint_compat = true,
 	atlas = "atlasepic",
 	loc_vars = function(self, info_queue, center)
-		return { key = Cryptid.gameset_loc(self, {modest = "balanced"}) }
+		return { key = Cryptid.gameset_loc(self, { modest = "balanced" }) }
 	end,
 	calculate = function(self, card, context)
 		if context.retrigger_joker_check and not context.retrigger_joker then
@@ -1562,8 +1564,7 @@ local altgoogol = {
 		madness = { center = { blueprint_compat = true }, copies = 2 },
 	},
 	loc_vars = function(self, info_queue, center)
-		return { key = Cryptid.gameset_loc(self, {modest = "balanced"}),
-			vars = { center.ability.copies } }
+		return { key = Cryptid.gameset_loc(self, { modest = "balanced" }), vars = { center.ability.copies } }
 	end,
 	calculate = function(self, card, context)
 		local gameset = Card.get_gameset(card)
@@ -1658,8 +1659,7 @@ local soccer = {
 	cost = 20,
 	atlas = "atlasepic",
 	loc_vars = function(self, info_queue, center)
-		return { key = Cryptid.gameset_loc(self, {modest = "balanced"}),
-			vars = { center.ability.extra.holygrail } }
+		return { key = Cryptid.gameset_loc(self, { modest = "balanced" }), vars = { center.ability.extra.holygrail } }
 	end,
 	add_to_deck = function(self, card, from_debuff)
 		card.ability.extra.holygrail = math.floor(card.ability.extra.holygrail)

localization/de.lua

@@ -619,6 +619,16 @@ return {
 					"{C:inactive,s:0.8}Kopiert keine Nostalgischen Googol Play Karten{}",
 				},
 			},
+			j_cry_altgoogol_balanced = {
+				name = "Nostalgische Googol Play Karte",
+				text = {
+					"Verkaufe diese Karte um",
+					"{C:attention}#1#{} Kopie#<n>1# von dem linkesten {C:attention}Joker{} zu machen",
+					"{C:inactive,s:0.8}Kopiert keine Nostalgischen Googol Play Karten{}",
+					"{C:inactive}(Muss Platz haben){}",
+					--todo: add "removes negative from copy" like Ankh/Invis Joker
+				},
+			},
 			j_cry_antennastoheaven = {
 				name = "...Wie Antennen zum Himmel",
 				text = {
@@ -789,6 +799,20 @@ return {
 					"auf der rechten Seite hast",
 				},
 			},
+			j_cry_canvas_balanced = {
+				name = "Leinwand",
+				text = {
+					"{C:attention}Löse{} alle {C:attention}Jokers{} auf der linken Seite",
+					"{C:attention}so oft neu aus{} wie du nicht-{C:blue}Gewöhnliche{C:attention} Joker{}",
+					"auf der rechten Seite hast",
+					"{C:inactive}(Up to 2 retriggers)",
+				},
+				unlock = {
+					"Löse einen {C:attention}Joker",
+					"{C:attention}114{} mal in einer",
+					"Hand erneut aus.",
+				},
+			},
 			j_cry_caramel = {
 				name = "Karamel",
 				text = {
@@ -1461,6 +1485,15 @@ return {
 					"{C:blue,s:0.7}https://discord.gg/cryptid{}",
 				},
 			},
+			j_cry_membershipcardtwo_balanced = {
+				name = "Alte Mitgliedskarte", --Could probably have a diff Name imo
+				text = {
+					"{C:chips}+#1#{} Chip#<s>1# für jedes Mitglied",
+					"im {C:attention}Cryptid Discord{}",
+					"{C:inactive}(Momentan {C:chips}+#2#{C:inactive} Chip#<s>2#)",
+					"{C:blue,s:0.7}https://discord.gg/cryptid{}",
+				},
+			},
 			j_cry_meteor = {
 				name = "Meteorschauer",
 				text = {
@@ -1864,6 +1897,20 @@ return {
 					"{C:attention}+#1#{} Karte im Shop",
 				},
 			},
+			j_cry_soccer_balanced = {
+				name = "Einer für Alle", --changed the name from latin because this isn't exotic
+				text = {
+					"{C:attention}+#1#{} Joker Slot#<s>1#",
+					"{C:attention}+#1#{} Booster Packer Slot#<s>1#",
+					"{C:attention}+#1#{} Handgröße",
+					"{C:attention}+#1#{} Verbrauchsgegenstand Slot#<s>1#",
+					"{C:attention}+#1#{} Karte#<n>1# im Shop",
+				},
+				unlock = {
+					"Gewinne einen Durchlauf",
+					"mit nur {C:attention}High Card",
+				},
+			},
 			j_cry_fleshpanopticon = {
 				name = "Fleischpanoptikum",
 				text = {
@@ -1941,6 +1988,14 @@ return {
 					"Ende der Runde",
 				},
 			},
+			j_cry_supercell_balanced = {
+				name = "Supercell",
+				text = {
+					"{X:chips,C:white}X#2#{} Chips, {X:mult,C:white}X#2#{} Mult",
+					"Verdiene {C:money}$#3#{} am",
+					"Ende der Runde",
+				},
+			},
 			j_cry_sus = {
 				name = "SUS",
 				text = {

localization/en-us.lua

@@ -1064,7 +1064,7 @@ return {
 					"{C:attention}Retrigger{} all {C:attention}Jokers{} to the left",
 					"once for {C:attention}every{} non-{C:blue}Common{C:attention} Joker{}",
 					"to the right of this Joker",
-					"{C:inactive}(Up to 2 retriggers)"
+					"{C:inactive}(Up to 2 retriggers)",
 				},
 				unlock = {
 					"Retrigger a {C:attention}Joker",