From c9c9d8bdebdd37f207defee079ec80be3d81f4e4 Mon Sep 17 00:00:00 2001 From: Swept Date: Sun, 7 Mar 2021 19:20:00 +0000 Subject: [PATCH] Cigarette packs now use StackVisualizer's sprite specifier (#3530) --- .../Smokeables/Cigarettes/packs.yml | 1 + .../Cigarettes/Packs/black.rsi/meta.json | 18 ----------- .../Cigarettes/Packs/blue.rsi/cig1.png | Bin 103 -> 0 bytes .../Cigarettes/Packs/blue.rsi/cig2.png | Bin 104 -> 0 bytes .../Cigarettes/Packs/blue.rsi/cig3.png | Bin 104 -> 0 bytes .../Cigarettes/Packs/blue.rsi/cig4.png | Bin 104 -> 0 bytes .../Cigarettes/Packs/blue.rsi/cig5.png | Bin 104 -> 0 bytes .../Cigarettes/Packs/blue.rsi/cig6.png | Bin 104 -> 0 bytes .../Cigarettes/Packs/blue.rsi/meta.json | 18 ----------- .../Cigarettes/Packs/green.rsi/cig1.png | Bin 103 -> 0 bytes .../Cigarettes/Packs/green.rsi/cig2.png | Bin 104 -> 0 bytes .../Cigarettes/Packs/green.rsi/cig3.png | Bin 104 -> 0 bytes .../Cigarettes/Packs/green.rsi/cig4.png | Bin 104 -> 0 bytes .../Cigarettes/Packs/green.rsi/cig5.png | Bin 104 -> 0 bytes .../Cigarettes/Packs/green.rsi/cig6.png | Bin 104 -> 0 bytes .../Cigarettes/Packs/green.rsi/meta.json | 18 ----------- .../Cigarettes/Packs/red.rsi/cig1.png | Bin 103 -> 0 bytes .../Cigarettes/Packs/red.rsi/cig2.png | Bin 104 -> 0 bytes .../Cigarettes/Packs/red.rsi/cig3.png | Bin 104 -> 0 bytes .../Cigarettes/Packs/red.rsi/cig4.png | Bin 104 -> 0 bytes .../Cigarettes/Packs/red.rsi/cig5.png | Bin 104 -> 0 bytes .../Cigarettes/Packs/red.rsi/cig6.png | Bin 104 -> 0 bytes .../Cigarettes/Packs/red.rsi/meta.json | 18 ----------- .../{black.rsi => visualizer.rsi}/cig1.png | Bin .../{black.rsi => visualizer.rsi}/cig2.png | Bin .../{black.rsi => visualizer.rsi}/cig3.png | Bin .../{black.rsi => visualizer.rsi}/cig4.png | Bin .../{black.rsi => visualizer.rsi}/cig5.png | Bin .../{black.rsi => visualizer.rsi}/cig6.png | Bin .../Cigarettes/Packs/visualizer.rsi/meta.json | 29 ++++++++++++++++++ 30 files changed, 30 insertions(+), 72 deletions(-) delete mode 100644 Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi/cig1.png delete mode 100644 Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi/cig2.png delete mode 100644 Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi/cig3.png delete mode 100644 Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi/cig4.png delete mode 100644 Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi/cig5.png delete mode 100644 Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi/cig6.png delete mode 100644 Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi/cig1.png delete mode 100644 Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi/cig2.png delete mode 100644 Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi/cig3.png delete mode 100644 Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi/cig4.png delete mode 100644 Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi/cig5.png delete mode 100644 Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi/cig6.png delete mode 100644 Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi/cig1.png delete mode 100644 Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi/cig2.png delete mode 100644 Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi/cig3.png delete mode 100644 Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi/cig4.png delete mode 100644 Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi/cig5.png delete mode 100644 Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi/cig6.png rename Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/{black.rsi => visualizer.rsi}/cig1.png (100%) rename Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/{black.rsi => visualizer.rsi}/cig2.png (100%) rename Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/{black.rsi => visualizer.rsi}/cig3.png (100%) rename Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/{black.rsi => visualizer.rsi}/cig4.png (100%) rename Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/{black.rsi => visualizer.rsi}/cig5.png (100%) rename Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/{black.rsi => visualizer.rsi}/cig6.png (100%) create mode 100644 Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/visualizer.rsi/meta.json diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/packs.yml b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/packs.yml index 79ac055ba7..4201713f2a 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/packs.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/packs.yml @@ -19,6 +19,7 @@ - type: BagOpenCloseVisualizer openIcon: open - type: StackVisualizer + sprite: Objects/Consumable/Smokeables/Cigarettes/Packs/visualizer.rsi composite: true stackLayers: - cig1 diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/black.rsi/meta.json b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/black.rsi/meta.json index aa330b70a5..0da0f0cd38 100644 --- a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/black.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/black.rsi/meta.json @@ -7,24 +7,6 @@ "y": 32 }, "states": [ - { - "name": "cig1" - }, - { - "name": "cig2" - }, - { - "name": "cig3" - }, - { - "name": "cig4" - }, - { - "name": "cig5" - }, - { - "name": "cig6" - }, { "name": "closed" }, diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi/cig1.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi/cig1.png deleted file mode 100644 index cc8c846f3890bfdc891b099b858a19dff763c461..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 103 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzJx>?Mkcif|7aau|6a<(z@_8Aw zd+%xNsQxlp<3=VkgYfq^=CTD_L~S30;rS0)78&qol`;+00@#C A)&Kwi diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi/cig2.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi/cig2.png deleted file mode 100644 index 446d606c89a16e6907f7c0b53e95e087626d7f81..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 104 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzeNPw1kcif|7XvwglFkPcJ#R~1 zOp90<|9%n`5ddms@O1TaS?83{1OT(l BAh`el diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi/cig4.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi/cig4.png deleted file mode 100644 index 0d9b28188e69cf13575b58ae8909e50f45b6c416..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 104 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzeNPw1kcif|7XvwglFkPc#V60W zaAcOFz_;S*4>qzg#Jx2=fBvG|@5U+y28ZxT+$*0l{(X6CVzopr0Jf_j AsQ>@~ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi/cig6.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi/cig6.png deleted file mode 100644 index 8f39716ef266b18cdbb7adac7b4399f3b1bcab85..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 104 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzeNPw1kcif|7XvwglFkPcJ#R~1 z{Vac@n}pTFq#yRnLa!6AGS_hxOT=L=5G`2f_);OXk;vd$@?2>_7f BAou_P diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi/meta.json b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi/meta.json index aa330b70a5..0da0f0cd38 100644 --- a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi/meta.json @@ -7,24 +7,6 @@ "y": 32 }, "states": [ - { - "name": "cig1" - }, - { - "name": "cig2" - }, - { - "name": "cig3" - }, - { - "name": "cig4" - }, - { - "name": "cig5" - }, - { - "name": "cig6" - }, { "name": "closed" }, diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi/cig1.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi/cig1.png deleted file mode 100644 index cc8c846f3890bfdc891b099b858a19dff763c461..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 103 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzJx>?Mkcif|7aau|6a<(z@_8Aw zd+%xNsQxlp<3=VkgYfq^=CTD_L~S30;rS0)78&qol`;+00@#C A)&Kwi diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi/cig2.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi/cig2.png deleted file mode 100644 index 446d606c89a16e6907f7c0b53e95e087626d7f81..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 104 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzeNPw1kcif|7XvwglFkPcJ#R~1 zOp90<|9%n`5ddms@O1TaS?83{1OT(l BAh`el diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi/cig4.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi/cig4.png deleted file mode 100644 index 0d9b28188e69cf13575b58ae8909e50f45b6c416..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 104 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzeNPw1kcif|7XvwglFkPc#V60W zaAcOFz_;S*4>qzg#Jx2=fBvG|@5U+y28ZxT+$*0l{(X6CVzopr0Jf_j AsQ>@~ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi/cig6.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi/cig6.png deleted file mode 100644 index 8f39716ef266b18cdbb7adac7b4399f3b1bcab85..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 104 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzeNPw1kcif|7XvwglFkPcJ#R~1 z{Vac@n}pTFq#yRnLa!6AGS_hxOT=L=5G`2f_);OXk;vd$@?2>_7f BAou_P diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi/meta.json b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi/meta.json index aa330b70a5..0da0f0cd38 100644 --- a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi/meta.json @@ -7,24 +7,6 @@ "y": 32 }, "states": [ - { - "name": "cig1" - }, - { - "name": "cig2" - }, - { - "name": "cig3" - }, - { - "name": "cig4" - }, - { - "name": "cig5" - }, - { - "name": "cig6" - }, { "name": "closed" }, diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi/cig1.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi/cig1.png deleted file mode 100644 index cc8c846f3890bfdc891b099b858a19dff763c461..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 103 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzJx>?Mkcif|7aau|6a<(z@_8Aw zd+%xNsQxlp<3=VkgYfq^=CTD_L~S30;rS0)78&qol`;+00@#C A)&Kwi diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi/cig2.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi/cig2.png deleted file mode 100644 index 446d606c89a16e6907f7c0b53e95e087626d7f81..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 104 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzeNPw1kcif|7XvwglFkPcJ#R~1 zOp90<|9%n`5ddms@O1TaS?83{1OT(l BAh`el diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi/cig4.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi/cig4.png deleted file mode 100644 index 0d9b28188e69cf13575b58ae8909e50f45b6c416..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 104 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzeNPw1kcif|7XvwglFkPc#V60W zaAcOFz_;S*4>qzg#Jx2=fBvG|@5U+y28ZxT+$*0l{(X6CVzopr0Jf_j AsQ>@~ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi/cig6.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi/cig6.png deleted file mode 100644 index 8f39716ef266b18cdbb7adac7b4399f3b1bcab85..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 104 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzeNPw1kcif|7XvwglFkPcJ#R~1 z{Vac@n}pTFq#yRnLa!6AGS_hxOT=L=5G`2f_);OXk;vd$@?2>_7f BAou_P diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi/meta.json b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi/meta.json index aa330b70a5..0da0f0cd38 100644 --- a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi/meta.json @@ -7,24 +7,6 @@ "y": 32 }, "states": [ - { - "name": "cig1" - }, - { - "name": "cig2" - }, - { - "name": "cig3" - }, - { - "name": "cig4" - }, - { - "name": "cig5" - }, - { - "name": "cig6" - }, { "name": "closed" }, diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/black.rsi/cig1.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/visualizer.rsi/cig1.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/black.rsi/cig1.png rename to Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/visualizer.rsi/cig1.png diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/black.rsi/cig2.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/visualizer.rsi/cig2.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/black.rsi/cig2.png rename to Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/visualizer.rsi/cig2.png diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/black.rsi/cig3.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/visualizer.rsi/cig3.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/black.rsi/cig3.png rename to Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/visualizer.rsi/cig3.png diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/black.rsi/cig4.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/visualizer.rsi/cig4.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/black.rsi/cig4.png rename to Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/visualizer.rsi/cig4.png diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/black.rsi/cig5.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/visualizer.rsi/cig5.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/black.rsi/cig5.png rename to Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/visualizer.rsi/cig5.png diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/black.rsi/cig6.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/visualizer.rsi/cig6.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/black.rsi/cig6.png rename to Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/visualizer.rsi/cig6.png diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/visualizer.rsi/meta.json b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/visualizer.rsi/meta.json new file mode 100644 index 0000000000..9e0bb8c848 --- /dev/null +++ b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/visualizer.rsi/meta.json @@ -0,0 +1,29 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cev-eris at commit https://github.com/discordia-space/CEV-Eris/commit/f18aa05685f13c8b424867e4219a1e727019c026", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "cig1" + }, + { + "name": "cig2" + }, + { + "name": "cig3" + }, + { + "name": "cig4" + }, + { + "name": "cig5" + }, + { + "name": "cig6" + } + ] +}