From 11da83fd8a2992e7d043c6917e65788287be33d9 Mon Sep 17 00:00:00 2001 From: guzlad <121629562+guzlad@users.noreply.github.com> Date: Mon, 13 Oct 2025 00:06:08 +0200 Subject: [PATCH] Fixed fire flower palette in Cave, Underwater and CastleWater. Added new fireflower sprite for Special (#575) --- Assets/Sprites/Items/FireFlower.json | 87 ++++++++---------- Assets/Sprites/Items/FireFlowerSpecial.png | Bin 0 -> 617 bytes Resources/AssetRipper/SpriteList.json | 1 + .../Sprites/Items/FireFlowerSpecial.json | 1 + 4 files changed, 38 insertions(+), 51 deletions(-) create mode 100644 Assets/Sprites/Items/FireFlowerSpecial.png create mode 100644 Resources/AssetRipper/Sprites/Items/FireFlowerSpecial.json diff --git a/Assets/Sprites/Items/FireFlower.json b/Assets/Sprites/Items/FireFlower.json index 882924a..db94916 100644 --- a/Assets/Sprites/Items/FireFlower.json +++ b/Assets/Sprites/Items/FireFlower.json @@ -33,70 +33,55 @@ }, "variations": { "default": { - "source": "FireFlower.png", - "rect": [ - 0.0, - 0.0, - 64.0, - 16.0 - ] + "SMB1": {"source": "FireFlower.png", "rect": [0.0,0.0,64.0,16.0]}, + "SMBLL": {"link": "SMB1"}, + "SMBANN": {"link": "SMB1"}, + "SMBS": {"source": "FireFlowerSpecial.png", "rect": [0.0,0.0,64.0,16.0]} }, "Underground": { - "source": "FireFlower.png", - "rect": [ - 0.0, - 16.0, - 64.0, - 16.0 - ] + "SMB1": {"source": "FireFlower.png", "rect": [0.0,16.0,64.0,16.0]}, + "SMBLL": {"link": "SMB1"}, + "SMBANN": {"link": "SMB1"}, + "SMBS": {"source": "FireFlowerSpecial.png", "rect": [0.0,16.0,64.0,16.0]} + }, + "Castle": { + "link": "Underground" }, "GhostHouse": { "link": "Underground" }, - "Castle": { - "source": "FireFlower.png", - "rect": [ - 0.0, - 32.0, - 64.0, - 16.0 - ] + "Underwater": { + "SMB1": {"source": "FireFlower.png", "rect": [0.0,32.0,64.0,16.0]}, + "SMBLL": {"link": "SMB1"}, + "SMBANN": {"link": "SMB1"}, + "SMBS": {"source": "FireFlowerSpecial.png", "rect": [0.0,32.0,64.0,16.0]} + }, + "CastleWater": { + "link": "Underwater" }, "Snow": { - "source": "FireFlower.png", - "rect": [ - 0.0, - 48.0, - 64.0, - 16.0 - ] + "SMB1": {"source": "FireFlower.png", "rect": [0.0,48.0,64.0,16.0]}, + "SMBLL": {"link": "SMB1"}, + "SMBANN": {"link": "SMB1"}, + "SMBS": {"source": "FireFlowerSpecial.png", "rect": [0.0,48.0,64.0,16.0]} }, "Space": { - "source": "FireFlower.png", - "rect": [ - 0.0, - 64.0, - 64.0, - 16.0 - ] + "SMB1": {"source": "FireFlower.png", "rect": [0.0,64.0,64.0,16.0]}, + "SMBLL": {"link": "SMB1"}, + "SMBANN": {"link": "SMB1"}, + "SMBS": {"source": "FireFlowerSpecial.png", "rect": [0.0,64.0,64.0,16.0]} }, "Volcano": { - "source": "FireFlower.png", - "rect": [ - 0.0, - 80.0, - 64.0, - 16.0 - ] + "SMB1": {"source": "FireFlower.png", "rect": [0.0,80.0,64.0,16.0]}, + "SMBLL": {"link": "SMB1"}, + "SMBANN": {"link": "SMB1"}, + "SMBS": {"source": "FireFlowerSpecial.png", "rect": [0.0,80.0,64.0,16.0]} }, "Bonus": { - "source": "FireFlower.png", - "rect": [ - 0.0, - 96.0, - 64.0, - 16.0 - ] + "SMB1": {"source": "FireFlower.png", "rect": [0.0,96.0,64.0,16.0]}, + "SMBLL": {"link": "SMB1"}, + "SMBANN": {"link": "SMB1"}, + "SMBS": {"source": "FireFlowerSpecial.png", "rect": [0.0,96.0,64.0,16.0]} } } -} \ No newline at end of file +} diff --git a/Assets/Sprites/Items/FireFlowerSpecial.png b/Assets/Sprites/Items/FireFlowerSpecial.png new file mode 100644 index 0000000000000000000000000000000000000000..0464f485e98600c74b2dbb615ce430fe48b4acfa GIT binary patch literal 617 zcmeAS@N?(olHy`uVBq!ia0vp^4nSPM!3HGP36~WEDaPU;cPEB*=VV?2IV|apzK#qG z8~eHcB(gFvFbR9QIEGZjy`6Q@_ppIP%jCQZ)B6s1Y3w=Zte(K5_JTnn?%~?S22RsC zwicKDmolFkpmclJZ@))(jy-q#?(ld?t@%9HGi-j{Tn(2OF+JF_g26&pi^0!ZC*hBr z!7l&2yxo=MnmoPn&6QKH-Ul z&ENhkG_JUK)|uH0!%NjOwz$Q8XNFsYYHQqwpMP9-*4&Y}_Vb6;)kl@aUskAiO1 zbsfVTF;Rx)uB-<#0~rgVLf~BPcgNLFJ$-y^!@0LvtBxWZ_ZQ*|RO3PJ75}sMAJmHC zZz0{!&t6!)OV}hzdHrt`bHUbB{r|o{yt(%G&&)=LO&8u}zW@8B?t>hs{G3Y(`|k7p zmawXoS;m~V@bi*_GyD6$-^rf6am$SREf;Q|fBuv~EiUm;-nzr7(dUoXH?8OIzuuj~ zk!Wtd^y(gcg)J7_J*4;~-B16tk8e(N>f4#zc9SLt!}Y&RN@dd{7rguE Q3`{Nzp00i_>zopr0G4bOr~m)} literal 0 HcmV?d00001 diff --git a/Resources/AssetRipper/SpriteList.json b/Resources/AssetRipper/SpriteList.json index cb84719..4fcdfd6 100644 --- a/Resources/AssetRipper/SpriteList.json +++ b/Resources/AssetRipper/SpriteList.json @@ -41,6 +41,7 @@ "res://Assets/Sprites/Items/BridgeAxe.png", "res://Assets/Sprites/Items/Fireball.png", "res://Assets/Sprites/Items/FireFlower.png", + "res://Assets/Sprites/Items/FireFlowerSpecial.png", "res://Assets/Sprites/Items/Hammer.png", "res://Assets/Sprites/Items/PoisonMushroom.png", "res://Assets/Sprites/Items/SpinningCoin.png", diff --git a/Resources/AssetRipper/Sprites/Items/FireFlowerSpecial.json b/Resources/AssetRipper/Sprites/Items/FireFlowerSpecial.json new file mode 100644 index 0000000..f3c0528 --- /dev/null +++ b/Resources/AssetRipper/Sprites/Items/FireFlowerSpecial.json @@ -0,0 +1 @@ +{"columns":"4","palette_base":"FireFlower","palettes":"{\n\"FireFlower\": [\"default1\", \"default2\", \"default3\", \"default4\", \"default1\", \"default2\", \"default3\", \"default4\", \"default1\", \"default2\", \"default3\", \"default4\", \"default1\", \"default2\", \"default3\", \"default4\", \"default1\", \"default2\", \"default3\", \"default4\", \"default1\", \"default2\", \"default3\", \"default4\", \"default1\", \"default2\", \"default3\", \"default4\"],\n\"Green\": [\"default\", \"default\", \"default\", \"default\", \"Underground\", \"Underground\", \"Underground\", \"Underground\", \"Underwater\", \"Underwater\", \"Underwater\", \"Underwater\", \"Snow\", \"Snow\", \"Snow\", \"Snow\", \"Space\", \"Space\", \"Space\", \"Space\", \"Volcano\", \"Volcano\", \"Volcano\", \"Volcano\", \"Bonus\", \"Bonus\", \"Bonus\", \"Bonus\"]\n}","sheet_size":"Vector2i(16, 16)","source_path":"res://Assets/Sprites/Items/FireFlowerSpecial.png","tiles":"{\nVector2(0, 0): {\n\"flip_h\": false,\n\"flip_v\": false,\n\"index\": 214\n},\nVector2(0, 8): {\n\"flip_h\": false,\n\"flip_v\": false,\n\"index\": 217,\n\"palette\": \"Green\"\n},\nVector2(8, 0): {\n\"flip_h\": true,\n\"flip_v\": false,\n\"index\": 214\n},\nVector2(8, 8): {\n\"flip_h\": true,\n\"flip_v\": false,\n\"index\": 217,\n\"palette\": \"Green\"\n}\n}"} \ No newline at end of file