From 2cf4ba8a4758e0fe46986b15759524a96b171c77 Mon Sep 17 00:00:00 2001 From: Ubaser <134914314+UbaserB@users.noreply.github.com> Date: Mon, 8 Jan 2024 17:27:40 +1100 Subject: [PATCH] Dehydrated cube box overhaul (#23685) * add * yes * fix --- .../Catalog/Cargo/cargo_livestock.yml | 8 ++-- .../Catalog/Fills/Lockers/service.yml | 2 +- .../VendingMachines/Inventories/chefvend.yml | 2 +- .../Entities/Objects/Misc/monkeycube.yml | 36 ++++++++++++------ .../Misc/monkeycube.rsi/box_kobold.png | Bin 0 -> 1393 bytes .../Misc/monkeycube.rsi/box_variant.png | Bin 0 -> 1466 bytes .../Objects/Misc/monkeycube.rsi/meta.json | 11 +++++- .../Misc/monkeycube.rsi/wrapper_kobold.png | Bin 0 -> 1160 bytes Resources/migration.yml | 4 ++ 9 files changed, 45 insertions(+), 18 deletions(-) create mode 100644 Resources/Textures/Objects/Misc/monkeycube.rsi/box_kobold.png create mode 100644 Resources/Textures/Objects/Misc/monkeycube.rsi/box_variant.png create mode 100644 Resources/Textures/Objects/Misc/monkeycube.rsi/wrapper_kobold.png diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_livestock.yml b/Resources/Prototypes/Catalog/Cargo/cargo_livestock.yml index eb5d5cd76e..6ef0ab4e21 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_livestock.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_livestock.yml @@ -121,8 +121,8 @@ - type: cargoProduct id: LivestockMonkeyCube icon: - sprite: Mobs/Animals/monkey.rsi - state: monkey + sprite: Objects/Misc/monkeycube.rsi + state: box product: CrateNPCMonkeyCube cost: 2000 category: Livestock @@ -131,8 +131,8 @@ - type: cargoProduct id: LivestockKoboldCube icon: - sprite: Mobs/Animals/kobold.rsi - state: kobold + sprite: Objects/Misc/monkeycube.rsi + state: box_kobold product: CrateNPCKoboldCube cost: 2000 category: Livestock diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/service.yml b/Resources/Prototypes/Catalog/Fills/Lockers/service.yml index f31e2ff071..ddb7710267 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/service.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/service.yml @@ -33,7 +33,7 @@ - type: StorageFill contents: - id: CrowbarRed - - id: MonkeyCubeBox + - id: VariantCubeBox - id: BoxMousetrap amount: 2 - id: SprayBottleWater diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chefvend.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chefvend.yml index f76b640ec7..c662ef5adc 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chefvend.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chefvend.yml @@ -12,7 +12,7 @@ FoodCondimentBottleBBQ: 1 FoodCondimentBottleVinegar: 2 ReagentContainerOliveoil: 2 - MonkeyCubeBox: 1 + VariantCubeBox: 1 FoodContainerEgg: 1 DrinkMilkCarton: 2 DrinkSoyMilkCarton: 1 diff --git a/Resources/Prototypes/Entities/Objects/Misc/monkeycube.yml b/Resources/Prototypes/Entities/Objects/Misc/monkeycube.yml index acb04c2234..1490af88ca 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/monkeycube.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/monkeycube.yml @@ -8,6 +8,9 @@ contents: - id: MonkeyCubeWrapped amount: 6 + - type: Storage + grid: + - 0,0,2,1 - type: Sprite sprite: Objects/Misc/monkeycube.rsi state: box @@ -34,7 +37,7 @@ - MonkeyCube - type: entity - parent: BoxCardboard + parent: MonkeyCubeBox name: kobold cube box id: KoboldCubeBox description: Condensed kobolds in a cube. Just add water! @@ -45,17 +48,31 @@ amount: 6 - type: Sprite sprite: Objects/Misc/monkeycube.rsi - state: box + state: box_kobold - type: entity - parent: BaseItem + parent: MonkeyCubeBox + name: variant cube box + id: VariantCubeBox + description: Both kobold cubes and monkey cubes. Just add water! + components: + - type: StorageFill + contents: + - id: KoboldCubeWrapped + amount: 3 + - id: MonkeyCubeWrapped + amount: 3 + - type: Sprite + sprite: Objects/Misc/monkeycube.rsi + state: box_variant + +- type: entity + parent: MonkeyCubeWrapped name: kobold cube suffix: Wrapped id: KoboldCubeWrapped description: Unwrap this to get a kobold cube. components: - - type: Item - size: Tiny - type: SpawnItemsOnUse items: - id: KoboldCube @@ -63,13 +80,10 @@ path: /Audio/Effects/unwrap.ogg - type: Sprite sprite: Objects/Misc/monkeycube.rsi - state: wrapper - - type: Tag - tags: - - MonkeyCube + state: wrapper_kobold - type: entity - parent: BoxCardboard + parent: MonkeyCubeBox name: monkey cube box suffix: Syndicate id: SyndicateSpongeBox @@ -88,7 +102,7 @@ state: box - type: entity - parent: BaseItem + parent: MonkeyCubeWrapped name: monkey cube suffix: Wrapped, Syndicate id: SyndicateSpongeWrapped diff --git a/Resources/Textures/Objects/Misc/monkeycube.rsi/box_kobold.png b/Resources/Textures/Objects/Misc/monkeycube.rsi/box_kobold.png new file mode 100644 index 0000000000000000000000000000000000000000..94f5f80e00df0efd1a76450ba1ffebc5f9a995d7 GIT binary patch literal 1393 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}e5nzhX}-P; zT0k}j5QD&_;K@Lev%n*=n1MlK76>znTPbd0U|>$k42dX-@b$4u&d=3LOvz75)vL%Y z0PC`;umUo3Q%e#RDspr3imfVamB1>jfNYSkzLEl1NlCV?QiN}Sf^&XRs)CuGfu4bq z9hZWFf=y9MnpKdC8&o@xXRDM^Qc_^0uU}qXu2*iXmtT~wZ)j<0sc&GUZ)BtkRH0j3 znOBlnp_^B%3^4>|j!SBBa#3bMNoIbY0?6FNr2NtnTO}osMQ{LdXG${Mo`TY%9I!1Z z$@-}|sky0nCB^!NdWQPg^p#|$AzYYO3=Ixo!03ZyfZ7bOYV#~8Nj3q7lxqdhJy8Dv z9hwZbx40xlA4!3}k%57Qu7Q!Rk)=M|e?aHkq$FFFWR~Qlf&&ijA8-gd=9Hj{g4Bb8 zASV+PvQ{~XdFi%F6}l;@X^EvdB}#Tl`4u+$5Cy0jA)=_}+2~`j+6LrdtH_|#;{2Ra zP>|ahnVHytg8@Yp5%>@t5mS*Qt+&_qg?kVFp-d0?uyzew zXS_Z(e=4{5Jcp8nlf+ghC~nOE&^pt^H!UZ$Mbbn4{`o!M_vNPr3EJ1N*RcO9W}kI- zE6e%y*Bu^R?%u4@m#q3|x6`tiE0a^q=1lzC?0hpKcKWr@=!9g0ds(qzIfZM5IM)a_ zFQ~26Q$OzR9CJR<{bx)IPveD+dp6B@lb63r{ijs(s;Rw}))I%M)~KFaaWjiM;^Mt? z(;Ay~PyCv2;7@Zf2(SG{`Ku$p63xu(;0G8 zRErZc93J?DWSep}IlPmX6V()&(f|GS?A=a$t92DV28%ETXKa>UA=Z4vac|y@QxYGO zRU5KB*KjjdPMh)5Z1ZFWrnJ@#NylQJU2=|KVN-lOfw@|T(e+VIa=qSy4_zC$>Mkym z=G}E^rny2XPh5q@>2(U%A~+Q)<_W|$a2p!VWht1b=d!=eOjI~o$+$&F=j`-<4}DtB iH2>iH!S^SG-HuUl?@?PdO+HXj%HZkh=d#Wzp$PzZ^4XdI literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Misc/monkeycube.rsi/box_variant.png b/Resources/Textures/Objects/Misc/monkeycube.rsi/box_variant.png new file mode 100644 index 0000000000000000000000000000000000000000..ae9830f19f1a781a31a5fbe3179a63107858fa75 GIT binary patch literal 1466 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}e5nzhX}-P; zT0k}j5QD&_;K@Lev%n*=n1MlK76>znTPbd0U|>$k42dX-@b$4u&d=3LOvz75)vL%Y z0PC`;umUo3Q%e#RDspr3imfVamB1>jfNYSkzLEl1NlCV?QiN}Sf^&XRs)CuGfu4bq z9hZWFf=y9MnpKdC8&o@xXRDM^Qc_^0uU}qXu2*iXmtT~wZ)j<0sc&GUZ)BtkRH0j3 znOBlnp_^B%3^4>|j!SBBa#3bMNoIbY0?6FNr2NtnTO}osMQ{LdXG${Mo`TY%9I!1Z z$@-}|sky0nCB^!NdWQPg^p#|$AzYYO3=Ixo!03ZyfZ7bOYV#~8Nj3q7lxqdhJy8Dv z9hwZbx40xlA4!3}k%57Qu7Q!Rk)=M|e?aHkq$FFFWR~Qlf&&ijA8-gd=9Hj{g4Bb8 zASV+PvQ{~XdFi%F6}l;@X^EvdB}#Tl`4u+$5Cy0jA)=_}+2~`j+6LrdtH_|#;{2Ra zP>|ahnVHytg8@Yp5%>@t5mS*Qt+&_qg?kVFp-d0?uy00Dn9-Pwp%(v z`4WOwG=_Bb*4pLU<=@o5=)2F%NvtF-J^fy_adwl})z$MHY#aUOIS8;=+O7Zc;qUyU zNqS=3qQ?ytT#gj&ELrs^RLJ2`-uBg%+itIYH1Bz6%akCW1fj-Sv)L z`rT_;U7Z~Kl!PXCH|^Bl6vn8*bvPi)eeuK_)r#Mb1d4dZ&0Mb^J?Zr>D^@2BHb)M_ zla4+`#|yt)&1_&gZpA3DA$ijKGV8`qwedQho$o8>?bsuAtb0vpL*x*dlv%kwpr9`v%!f6si(u=DfJH8%_&zp2?97yWT9CrhiY&>?q$=b;@F`$Ihs zznTPbd0U|>$k42dX-@b$4u&d=3LOvz75)vL%Y z0PC`;umUo3Q%e#RDspr3imfVamB1>jfNYSkzLEl1NlCV?QiN}Sf^&XRs)CuGfu4bq z9hZWFf=y9MnpKdC8&o@xXRDM^Qc_^0uU}qXu2*iXmtT~wZ)j<0sc&GUZ)BtkRH0j3 znOBlnp_^B%3^4>|j!SBBa#3bMNoIbY0?6FNr2NtnTO}osMQ{LdXG${Mo`TY%9I!1Z z$@-}|sky0nCB^!NdWQPg^p#|$AzYYO3=Ixo!03ZyfZ7bOYV#~8Nj3q7lxqdhJy8Dv z9hwZbx40xlA4!3}k%57Qu7Q!Rk)=M|e?aHkq$FFFWR~Qlf&&ijA8-gd=9Hj{g4Bb8 zASV+PvQ{~XdFi%F6}l;@X^EvdB}#Tl`4u+$5Cy0jA)=_}+2~`j+6LrdtH_|#;{2Ra zP>|ahnVHytg8@Yp5%>@t5mS*Qt+&_qg?kVFp-d0?uyRP1X_J>1o0<4WZl#7U4L&w>sIp%_Y9mIrsc-P zaB%uh_}Ffq|IB&nBLzkwAgVBG6mXip^U~om*P2;bYuop1HB0IdJjc#`