From f36d0cc21494d50d29f0a31c30e928c21772ae7b Mon Sep 17 00:00:00 2001
From: Paul Chote <pchote@users.noreply.github.com>
Date: Sun, 15 Dec 2019 16:58:37 +0000
Subject: [PATCH] Fix ModContent cursor.

---
 mods/modcontent/cursor.pal   | Bin 768 -> 0 bytes
 mods/modcontent/cursor.png   | Bin 0 -> 2239 bytes
 mods/modcontent/cursor.shp   | Bin 177 -> 0 bytes
 mods/modcontent/cursors.yaml |   8 ++++----
 mods/modcontent/mod.yaml     |   2 +-
 mods/modcontent/rules.yaml   |   4 ++--
 6 files changed, 7 insertions(+), 7 deletions(-)
 delete mode 100644 mods/modcontent/cursor.pal
 create mode 100644 mods/modcontent/cursor.png
 delete mode 100644 mods/modcontent/cursor.shp

diff --git a/mods/modcontent/cursor.pal b/mods/modcontent/cursor.pal
deleted file mode 100644
index 3b29c55f5abd487fc4b49dac922634c83af319d9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 768
zcmW+!4Y#5o5GC{bgA@fs1rx=Wny<88ZM)m?|NpC{WoGW3%W&W@000<2_5r-%O*_UT
z)=JAQ%eGHl=X!D+H$8sZ?WW#0jdHuy?+brl@;?*#GohCXe}uW@U`Akop!b2a0bQPS
zSZO;`K73H;^YgQhKI!aLHmD4cn}C=gH-HI%x!><iZPwnjEX#HsM~CY=wxh}OJU{e(
zKMbNU_)k#;qXa@f@uS!eVhFX!4oPxg8T^POiIOrw2}THEgb88<W0oR@3B!z~oTaQF
zydaDd&MD!!ra~~mxg?pah!kbnP~I@1cq0p?T@{Vws^_EP-N46DP%%g`lBN@_-0cj@
za=ajdC{0L?OU{mZ^%rz45;!9C`p}yqXYsA4WxN4sB|4qx{4LhIIuA{E<eV{3RXfUz
zl$wXkijbdpAr1}<B9T;i*ok=Vvd74_ufujnMGB7;4T89C6vy$Yt1pW;o!#5rJM=JM
z&STq7xBGpW9{210FF5^j+SORsRk!3kzxvvcrBPu6dG^r+?;r8J6w64@N?#x5sRskg
z-0!YaKK8hiY0cx3L4pI6crbDvkH_V5Ih{^T)0AbIWmyzOwrxM3uj}<b440<)Vys4p
z2EjphW?RHqrQNhpDoMg*mRAs|7T5f+DfRn!v?~R$fPH7x9OOjEsZfiQjZ)2^+G%Q~
zoRyq=^*yL@=)ae_9s28eTGx4fJzkD&c<$c!%rLYdbmG`W$j`En5J>Zw6{xH*7qmWp
I9#Mb7e|Zy6uK)l5

diff --git a/mods/modcontent/cursor.png b/mods/modcontent/cursor.png
new file mode 100644
index 0000000000000000000000000000000000000000..59ee13ebe91dc59ad341f703af1903af9e719d1f
GIT binary patch
literal 2239
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
I<Rr@f2O)yv1^@s6

literal 0
HcmV?d00001

diff --git a/mods/modcontent/cursor.shp b/mods/modcontent/cursor.shp
deleted file mode 100644
index 51a268bc6c188ddc33f6471135f4c2a72f7408d4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 177
zcmY+-!41GL2m?U+tc2n%I%mEerxRqg+775H4><gQBUER=^NN_l<Lzr}WG!f+g%+_h
a!7`+^MHZ;c0kHEh(>kljpZ?L^S<V;6hX|Aa

diff --git a/mods/modcontent/cursors.yaml b/mods/modcontent/cursors.yaml
index 61d0a8d6a8..af813736ce 100644
--- a/mods/modcontent/cursors.yaml
+++ b/mods/modcontent/cursors.yaml
@@ -1,6 +1,6 @@
 Cursors:
-	cursor.shp: cursor
+	cursor.png: cursor
 		default:
-			Start:0
-			X: -4
-			Y: -7
\ No newline at end of file
+			Start: 0
+			X: -5
+			Y: -8
diff --git a/mods/modcontent/mod.yaml b/mods/modcontent/mod.yaml
index fc76583d98..feca980b10 100644
--- a/mods/modcontent/mod.yaml
+++ b/mods/modcontent/mod.yaml
@@ -61,7 +61,7 @@ Fonts:
 
 SoundFormats:
 
-SpriteFormats: ShpTD
+SpriteFormats: PngSheet
 
 SpriteSequenceFormat: DefaultSpriteSequence
 
diff --git a/mods/modcontent/rules.yaml b/mods/modcontent/rules.yaml
index 9f69b62495..36c47e5a58 100644
--- a/mods/modcontent/rules.yaml
+++ b/mods/modcontent/rules.yaml
@@ -1,5 +1,5 @@
 World:
-	PaletteFromFile:
+	PaletteFromPng:
 		Name: cursor
-		Filename: cursor.pal
+		Filename: cursor.png
 		CursorPalette: true