From b80b6c04b248002c8febddf8fa961a2f95451510 Mon Sep 17 00:00:00 2001 From: RumiTiger <154005209+RumiTiger@users.noreply.github.com> Date: Thu, 1 Feb 2024 09:41:23 +0300 Subject: [PATCH] A beer can and a wine can (#24365) * A beer can and a wine can * fix wrong file locations Signed-off-by: c4llv07e * Update drinks_cans.yml * A beer can and a wine can * Update drinks_cans.yml * A beer can and a wine can * replace sprites Signed-off-by: c4llv07e * Update meta.json * Update meta.json * Update Resources/Textures/Objects/Consumable/Drinks/wine_can.rsi/meta.json * Update Resources/Textures/Objects/Consumable/Drinks/beer_can.rsi/meta.json --------- Signed-off-by: c4llv07e Co-authored-by: c4llv07e Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> --- .../VendingMachines/Inventories/boozeomat.yml | 2 + .../Random/Food_Drinks/drinks_soda.yml | 2 + .../Objects/Consumable/Drinks/drinks_cans.yml | 38 ++++++++++++++++++ .../Consumable/Drinks/beer_can.rsi/icon.png | Bin 0 -> 517 bytes .../Drinks/beer_can.rsi/icon_open.png | Bin 0 -> 537 bytes .../Consumable/Drinks/beer_can.rsi/meta.json | 17 ++++++++ .../Consumable/Drinks/wine_can.rsi/icon.png | Bin 0 -> 609 bytes .../Drinks/wine_can.rsi/icon_open.png | Bin 0 -> 624 bytes .../Consumable/Drinks/wine_can.rsi/meta.json | 17 ++++++++ 9 files changed, 76 insertions(+) create mode 100644 Resources/Textures/Objects/Consumable/Drinks/beer_can.rsi/icon.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/beer_can.rsi/icon_open.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/beer_can.rsi/meta.json create mode 100644 Resources/Textures/Objects/Consumable/Drinks/wine_can.rsi/icon.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/wine_can.rsi/icon_open.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/wine_can.rsi/meta.json diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml index 6c8d9468a2..793121e2f2 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml @@ -35,5 +35,7 @@ DrinkWhiskeyBottleFull: 5 DrinkWineBottleFull: 5 DrinkChampagneBottleFull: 2 #because the premium drink + DrinkBeerCan: 5 + DrinkWineCan: 5 emaggedInventory: DrinkPoisonWinebottleFull: 2 diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_soda.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_soda.yml index 751fc08554..c8a941c128 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_soda.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_soda.yml @@ -38,6 +38,8 @@ - DrinkTeacup - DrinkGreenTea - DrinkWaterCup + - DrinkBeerCan + - DrinkWineCan chance: 0.8 offset: 0.0 #rare diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml index d028c46221..38ebc132c9 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml @@ -461,3 +461,41 @@ sprite: Objects/Consumable/Drinks/pwrgame.rsi - type: Item sprite: Objects/Consumable/Drinks/pwrgame.rsi + +- type: entity + parent: DrinkCanBaseFull + id: DrinkBeerCan + name: beer can + description: Small joy, big taste, no worries! + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: Beer + Quantity: 30 + - type: Drink + - type: Sprite + sprite: Objects/Consumable/Drinks/beer_can.rsi + - type: Item + sprite: Objects/Consumable/Drinks/beer_can.rsi + +- type: entity + parent: DrinkCanBaseFull + id: DrinkWineCan + name: wine can + description: Your way to forgetting all worries and having fun! + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: Wine + Quantity: 30 + - type: Drink + - type: Sprite + sprite: Objects/Consumable/Drinks/wine_can.rsi + - type: Item + sprite: Objects/Consumable/Drinks/wine_can.rsi diff --git a/Resources/Textures/Objects/Consumable/Drinks/beer_can.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/beer_can.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..9974e5cc972edcd0a0d7c2617c0410a9ba936764 GIT binary patch literal 517 zcmV+g0{Z=lP)Px$rAb6VR9J=Wl|M*=K^VrLqQSl?B?T)TLW^(^5lSS;KOvzMNhD@agM_$86gD&p zArV1ElUb%Uh|pj{{u#o-XlQ6kq3NR<)JfZ}A(GOD?xP&)`@s$GareB>-MzdA@bK{b zciOmYa(VrvaqeVqm6H~y5d5SQ2Abp45Jo+wpj;)}+ppP_?xgV8>M z<&FKO`IW78Je10`a`XlOz&>w)kS*Z$DgywJJC;zX*0@N~*T7H1$$*e8Ae=~{yQdH8 zQ6q$G0l7%1bq2zT6ab*NUs;d!a|@gdP}e{%5`xw3frJqtxU&rau)001tAWOoTHPK_ ziQl2>T1Bahqz^;rVmcvV1OR~N>I(p%QmsMkv|+kb{k={Y4~Ae`{Q9lMP8+Uwk7?xS z(P=Cskj#+BDFZ1=Wuz#Tk+_HPx$xk*GpR9J=Wl`%+LQ51&1h=YBT5f!4wp;9wg5D~11LsC>q1X0kS4Yos+&`d4p zAQ@Z}ibyGlI%!Z85eZ$Qh`tUbAmY$Hfli?~#7xocI20e+TG|uT#rMG-?%~}3{`cO) zxnN^s^Vo4{l0^i7U?eWr;~niy0KA_VQRxAcYZn9~aTyQzXl?NTu=QmhfQ9)bLUc(X}!K-D<1g}=Bv4l=XtN7ywx&IGC*LU*V^<7PgA3H6Zgv8o++>2#UyuH zxG_@ZkuC>6Pv-Va`8nW~tjjG~ms^rmh9s*DiEi#lSNkh< zCsco*oo#(G5}UE+`Lkc$&-}Pd`eawFXJcbya|ufwlfEAa?xFwy01jnXNoGw=04e|g b00;m8000000Mb*F00000NkvXXu0mjfRCDZg literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Drinks/beer_can.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/beer_can.rsi/meta.json new file mode 100644 index 0000000000..b712e503a1 --- /dev/null +++ b/Resources/Textures/Objects/Consumable/Drinks/beer_can.rsi/meta.json @@ -0,0 +1,17 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Github #DrMelon", + "states": [ + { + "name": "icon" + }, + { + "name": "icon_open" + } + ] +} diff --git a/Resources/Textures/Objects/Consumable/Drinks/wine_can.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/wine_can.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..54d5ff6a3d6801f9d1d8db1b30d156ff80a07089 GIT binary patch literal 609 zcmV-n0-pVeP)Px%0ZBwbR9J=WmQP5NVI0RltJO607#++C(usK3VWXr=q#3)&pnr!6U6Nv0FLY{k zP$`l{CnIS>o`ykxFk;a}tfWJlticGu)HWY1@AKpN zeScqm&%^sXU}5pUV^c};2SUcLvHN#}N?Jo!GnsDdJS1$C2E8^$E4i*wQshr#ZK)8Pw0PDpR03(Y@_CG(vk+$m$3AMy$ zz+|ScnfQPY0M}?QHLLr0d;79jN7;bM$YPRY*EP1+EpSk~Db82gg5lI7j%%HatwcGy z*F`#=qsIG+)vR1gsRQSorx;s_0uUeYk%{=JuH8_PQtNjA(01jnXNoGw=04e|g00;m8000000Mb*F00000NkvXXu0mjfYMmRW literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Drinks/wine_can.rsi/icon_open.png b/Resources/Textures/Objects/Consumable/Drinks/wine_can.rsi/icon_open.png new file mode 100644 index 0000000000000000000000000000000000000000..81a8cc741dddceb7dda7cc730a0c062c60d6c1e3 GIT binary patch literal 624 zcmV-$0+0QPP)Px%5J^NqR9J=Wl|N_`Q5?rVr?G#e9mPSbLLfmZWJu8BWW-1o4M^LeK^G&%R1Z5@ z9U4(A1_!BFNx)8}i)vN4QB{n& znCQ58M;PCVo1XE^jPNv{5MBK(;?F9Zk)DAE*M4v*k=jzfkg8#RR#r{H06^--ZUENH zc>o3%a=2ffBY6B41CmR@$#TghSnr?DtZ!!i&2KhX4u*Ob$%rkJOW!_&~*6 zBdiA)@6Qst?8V&pRDA;{yIOdio~8F~g38(#p5C5B(_lyKcFdA=f4Q5>n2U+Jox5<= zdVpUiVR7**b&W2J!W4nf$LigNtTF0000< KMNUMnLSTZJWfl_v literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Drinks/wine_can.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/wine_can.rsi/meta.json new file mode 100644 index 0000000000..b712e503a1 --- /dev/null +++ b/Resources/Textures/Objects/Consumable/Drinks/wine_can.rsi/meta.json @@ -0,0 +1,17 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Github #DrMelon", + "states": [ + { + "name": "icon" + }, + { + "name": "icon_open" + } + ] +} -- 2.51.2