Merge pull request #397 from Dragokillfist/refactor

taxfraud art
MathIsFun0 · Feb 19, 2025 · 9c5fdf9 · 9c5fdf9
2 parents 631593e + 992d362
commit 9c5fdf9
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 2 deletions.
diff --git a/assets/1x/atlastwo.png b/assets/1x/atlastwo.png
diff --git a/assets/2x/atlastwo.png b/assets/2x/atlastwo.png
diff --git a/items/code.lua b/items/code.lua
@@ -3704,6 +3704,7 @@ local pointer = {
 			paupovlin = "paupovlin revere",
 			poppin = "paupovlin revere",
 			jen = "jen walter",
+			dandy = 'Dandicus "Dandy" Dancifer',
 			--should I add "reverse ___" prefixes for the reverse tarots?
 			survivor = "the survivor",
 			monk = "the monk",

diff --git a/items/misc_joker.lua b/items/misc_joker.lua
@@ -6518,12 +6518,12 @@ local tax_fraud = {
 	object_type = "Joker",
 	name = "cry-Tax-Fraud",
 	key = "tax_fraud",
-	pos = { x = 2, y = 0 },
+	pos = { x = 4, y = 6 },
 	config = { extra = { money = 6 } },
 	rarity = 3,
 	cost = 10,
 	order = 128,
-	atlas = "placeholders",
+	atlas = "atlastwo",
 	in_pool = function(self)
 		if not G.GAME.modifiers.enable_rentals_in_shop then return false end
 		return true
@@ -6540,6 +6540,9 @@ local tax_fraud = {
 		idea = {
 			"DoNotSus"
 		},
+		art = {
+			"Dragokillfist"
+		},
 		code = {
 			"Foegro"
 		}