From 5641792f04f8b6c6a2ff421c695c5ad985aa0e35 Mon Sep 17 00:00:00 2001
From: cool dolphin <36332236+Afrokada@users.noreply.github.com>
Date: Fri, 18 Jul 2025 10:59:37 +0200
Subject: [PATCH] Bottomless goblet (#1534)

* added bottom goblet

* artifact suffix and donotmap category
---
 .../Objects/Consumable/Drinks/goblet.yml      |  31 ++++++++++++++++++
 .../_CP14/UniqueLoot/demiplane_loot.yml       |   6 ++++
 .../Drinks/goblet.rsi/bottomless-fill-1.png   | Bin 0 -> 663 bytes
 .../Drinks/goblet.rsi/bottomless-fill-2.png   | Bin 0 -> 663 bytes
 .../Drinks/goblet.rsi/bottomless_goblet.png   | Bin 0 -> 612 bytes
 .../Consumable/Drinks/goblet.rsi/meta.json    |  31 ++++++++++++++++--
 6 files changed, 66 insertions(+), 2 deletions(-)
 create mode 100644 Resources/Textures/_CP14/Objects/Consumable/Drinks/goblet.rsi/bottomless-fill-1.png
 create mode 100644 Resources/Textures/_CP14/Objects/Consumable/Drinks/goblet.rsi/bottomless-fill-2.png
 create mode 100644 Resources/Textures/_CP14/Objects/Consumable/Drinks/goblet.rsi/bottomless_goblet.png

diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Consumable/Drinks/goblet.yml b/Resources/Prototypes/_CP14/Entities/Objects/Consumable/Drinks/goblet.yml
index 2b148e22a7..0e2b67a870 100644
--- a/Resources/Prototypes/_CP14/Entities/Objects/Consumable/Drinks/goblet.yml
+++ b/Resources/Prototypes/_CP14/Entities/Objects/Consumable/Drinks/goblet.yml
@@ -61,3 +61,34 @@
   - type: PhysicalComposition
     materialComposition:
       CP14Gold: 10
+      
+- type: entity
+  parent: CP14DrinkBaseGoblet
+  id: CP14SteelGobletBottomless
+  name: bottomless goblet
+  description: A jeweled goblet enchanted to have no bottom, fit for a never ending king's banquet.
+  categories: [ DoNotMap ]
+  suffix: Artifact
+  components:
+  - type: SolutionContainerVisuals
+    maxFillLevels: 2
+    fillBaseName: bottomless-fill-
+  - type: Sprite
+    sprite: _CP14/Objects/Consumable/Drinks/goblet.rsi
+    layers:
+      - state: bottomless_goblet
+      - map: [ "enum.SolutionContainerLayers.Fill" ]
+        state: bottomless-fill-2
+        visible: false
+  - type: SolutionContainerManager
+    solutions:
+      mug:
+        maxVol: 1000
+  - type: Injector
+    solutionName: mug
+    injectOnly: false
+    ignoreMobs: true
+    minTransferAmount: 1
+    maxTransferAmount: 100
+    transferAmount: 1
+    toggleState: 1 # draw
diff --git a/Resources/Prototypes/_CP14/UniqueLoot/demiplane_loot.yml b/Resources/Prototypes/_CP14/UniqueLoot/demiplane_loot.yml
index 991712dd93..6d3edafe51 100644
--- a/Resources/Prototypes/_CP14/UniqueLoot/demiplane_loot.yml
+++ b/Resources/Prototypes/_CP14/UniqueLoot/demiplane_loot.yml
@@ -54,3 +54,9 @@
   entity: CP14LockpickSkeletonArtifact
   tags:
   - CP14UniqueSpawnDemiplanetLoot
+  
+- type: uniqueSpawn
+  id: CP14SteelGobletBottomless
+  entity: CP14SteelGobletBottomless
+  tags:
+  - CP14UniqueSpawnDemiplanetLoot
diff --git a/Resources/Textures/_CP14/Objects/Consumable/Drinks/goblet.rsi/bottomless-fill-1.png b/Resources/Textures/_CP14/Objects/Consumable/Drinks/goblet.rsi/bottomless-fill-1.png
new file mode 100644
index 0000000000000000000000000000000000000000..8c231a273a29c0ac3bd1d1fd9adab46950d07e1f
GIT binary patch
literal 663
zcmeAS@N?(olHy`uVBq!ia0vp^3xHUGgAGVdtuOuxq!^2X+?^QKos)S9<glbW`Z_W&
zZ0zU$lgJ9>a~60+7BevL9R^{><M}I6fPxYwt`Q}{`DrEPiAAXl0g0J;C3=3YAqu8?
zhI&T7_b_h*s@awr;hE;?sl~tn<ghYGF|sl+0$E-_EDdFYT%*Cr3>IesvJDxT7zBWH
z6cA^&vw+33fNT&*0Ai4S7>#Br12Y4|1a<}%pb7&cV*|zo5K}=qSQkJ{ngV2l029z0
zCa}sNOA8<is>{&803`eJ>Nks1w{oh0wz+w_IEGZjy}jX>*K8orn)rfs*Gt}AFZP*d
zOyB9Z{^IK`r)3uY)~jmHt70;0+s@D^xXk!q&_Dl8IY}Q9(nKbjfQ&2fUHeNZ_WIpy
zi;LUd&Tm_&^KWsRu-Je1!vSLdmpp7a`u~bS2<z|i)AfanT0agKn0%IwZK?X<fB52=
z@)Dttn)N`2<t`5G8~d~Wb#oPn*!*T#(<=J##lv*&15pt|Zb!f0sW<qZs=EfL<bUB$
z|AUvAJv=u|oBZsOWq16={|iem|9XF|=u%8Q|E@E=*L+{kU;A{)&VO<xGo_<Hzxdn!
z<iB5SC;wOPYtQ!VSsA~{?D<pIzmv9F>bt+cZ~DKQOQ67+@ln8R?hQ|l8a-0o^5m%1
zBh@?C?)*8t=*gY6S~u!F{(b+)e<RZ(v9Ww@c-N2ZvhpA=BZI69CgQ4X?pi!Iw*-L1
NJzf1=);T3K0RWGV;KBd^

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_CP14/Objects/Consumable/Drinks/goblet.rsi/bottomless-fill-2.png b/Resources/Textures/_CP14/Objects/Consumable/Drinks/goblet.rsi/bottomless-fill-2.png
new file mode 100644
index 0000000000000000000000000000000000000000..8c231a273a29c0ac3bd1d1fd9adab46950d07e1f
GIT binary patch
literal 663
zcmeAS@N?(olHy`uVBq!ia0vp^3xHUGgAGVdtuOuxq!^2X+?^QKos)S9<glbW`Z_W&
zZ0zU$lgJ9>a~60+7BevL9R^{><M}I6fPxYwt`Q}{`DrEPiAAXl0g0J;C3=3YAqu8?
zhI&T7_b_h*s@awr;hE;?sl~tn<ghYGF|sl+0$E-_EDdFYT%*Cr3>IesvJDxT7zBWH
z6cA^&vw+33fNT&*0Ai4S7>#Br12Y4|1a<}%pb7&cV*|zo5K}=qSQkJ{ngV2l029z0
zCa}sNOA8<is>{&803`eJ>Nks1w{oh0wz+w_IEGZjy}jX>*K8orn)rfs*Gt}AFZP*d
zOyB9Z{^IK`r)3uY)~jmHt70;0+s@D^xXk!q&_Dl8IY}Q9(nKbjfQ&2fUHeNZ_WIpy
zi;LUd&Tm_&^KWsRu-Je1!vSLdmpp7a`u~bS2<z|i)AfanT0agKn0%IwZK?X<fB52=
z@)Dttn)N`2<t`5G8~d~Wb#oPn*!*T#(<=J##lv*&15pt|Zb!f0sW<qZs=EfL<bUB$
z|AUvAJv=u|oBZsOWq16={|iem|9XF|=u%8Q|E@E=*L+{kU;A{)&VO<xGo_<Hzxdn!
z<iB5SC;wOPYtQ!VSsA~{?D<pIzmv9F>bt+cZ~DKQOQ67+@ln8R?hQ|l8a-0o^5m%1
zBh@?C?)*8t=*gY6S~u!F{(b+)e<RZ(v9Ww@c-N2ZvhpA=BZI69CgQ4X?pi!Iw*-L1
NJzf1=);T3K0RWGV;KBd^

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_CP14/Objects/Consumable/Drinks/goblet.rsi/bottomless_goblet.png b/Resources/Textures/_CP14/Objects/Consumable/Drinks/goblet.rsi/bottomless_goblet.png
new file mode 100644
index 0000000000000000000000000000000000000000..c29c7338a5778472d91925db3c047e3541feef08
GIT binary patch
literal 612
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl
z_H+M9WCikF1AIbU{~s^@|7}KvwesRfv;Y4u=9tP)4lwxN-kzW@)9kK&_y5EH3=AI1
zqRD0oY5&X5S9$A;^FDa;fANO@8IAvq0{@qo%L7f?`9qWwNQsvO`33*S3K*U_Jc|P=
z;VkfoEM{QfI|Ravq8eTeKtYKT*NBqf{Irtt#G+J&fW*wa5<NfH5Cu~`Lp`J4dziNY
z)oe?R@J#dc)MDTOa#$Ip7+Dz@fh;c|mWHxHA)vv?3>IesvJDxT7zBWH6cA^&vw+33
zfNT)>RL02g0vJ#*8qHD$pwt9*1{R=710!Pt#sv^lK{m23fS5D|$OZu>pt($7l|hyk
zKo(S&p@9KNw$J)t_+{}uen94YPZ!4!3;(;5PD?Q<a=6tW$=Vg<`|)4D)MA|@CvTmP
z<ecX((E2a2n~6c`(*hwDm1fK8h>X@v`!(K5I^GEV#{AGB_^F4wzhrO0GViBe=Khko
zoF~6C-4Nz>Trg*IZ16FrhaX#bSd9(#A2@l~NxvcTSkop`f$!FixqbQZR&y6@WK`xV
zW31NU*NUBdMzhtjwCOK<XL7_;fq$Woq@x8w>_58uEABWemkV;Xr>mdKI;Vst08~M|
A^Z)<=

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_CP14/Objects/Consumable/Drinks/goblet.rsi/meta.json b/Resources/Textures/_CP14/Objects/Consumable/Drinks/goblet.rsi/meta.json
index d6aabc8cd2..21820bfef2 100644
--- a/Resources/Textures/_CP14/Objects/Consumable/Drinks/goblet.rsi/meta.json
+++ b/Resources/Textures/_CP14/Objects/Consumable/Drinks/goblet.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-4.0",
-    "copyright": "Created by prazat911",
+    "copyright": "Created by prazat911, Bottomless goblet by Afrokada",
     "size": {
         "x": 32,
         "y": 32
@@ -30,6 +30,33 @@
         },
         {
             "name": "fill-5"
-        }
+        },
+		{
+			"name": "bottomless_goblet"
+		},
+		{
+			"name": "bottomless-fill-1",
+			"delays": [
+				[
+					0.3,
+					0.3,
+					0.3,
+					0.3,
+					0.3
+				]
+			]
+		},
+		{
+			"name": "bottomless-fill-2",
+			"delays": [
+				[
+					0.1,
+					0.1,
+					0.1,
+					0.1,
+					0.1
+				]
+			]
+		}
     ]
 }
\ No newline at end of file