From 71c8d08e4ce0e9c00607f9b4466725c9dfb4b569 Mon Sep 17 00:00:00 2001 From: KIBORG04 Date: Tue, 12 Jul 2022 13:11:12 +0700 Subject: [PATCH] Kvass (#9082) * add kvass * nevermind * forgot about double 's' * Update tanks.yml * gotovo * Update meta.json --- .../reagents/meta/consumable/drink/drinks.ftl | 3 +++ .../Prototypes/Catalog/Cargo/cargo_food.yml | 14 ++++++++++- .../Prototypes/Catalog/Fills/Crates/food.yml | 10 ++++++++ .../Objects/Consumable/Drinks/drinks.yml | 15 ++++++++++++ .../Structures/Storage/Tanks/tanks.yml | 23 ++++++++++++++++++ .../Reagents/Consumable/Drink/drinks.yml | 9 +++++++ .../Consumable/Drinks/kvass.rsi/icon.png | Bin 0 -> 219 bytes .../Consumable/Drinks/kvass.rsi/meta.json | 1 + .../Structures/Storage/kvass.rsi/kvass.png | Bin 0 -> 2963 bytes .../Structures/Storage/kvass.rsi/meta.json | 14 +++++++++++ 10 files changed, 88 insertions(+), 1 deletion(-) create mode 100644 Resources/Textures/Objects/Consumable/Drinks/kvass.rsi/icon.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/kvass.rsi/meta.json create mode 100644 Resources/Textures/Structures/Storage/kvass.rsi/kvass.png create mode 100644 Resources/Textures/Structures/Storage/kvass.rsi/meta.json diff --git a/Resources/Locale/en-US/reagents/meta/consumable/drink/drinks.ftl b/Resources/Locale/en-US/reagents/meta/consumable/drink/drinks.ftl index f1b00cdf1c..09099d96fa 100644 --- a/Resources/Locale/en-US/reagents/meta/consumable/drink/drinks.ftl +++ b/Resources/Locale/en-US/reagents/meta/consumable/drink/drinks.ftl @@ -72,3 +72,6 @@ reagent-desc-hot-ramen = Hot noodles. reagent-name-pilk = pilk reagent-desc-pilk = A sickening mixture of milk and cola. + +reagent-name-kvass = kvass +reagent-desc-kvass = A cool refreshing drink with a taste of socialism. diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_food.yml b/Resources/Prototypes/Catalog/Cargo/cargo_food.yml index 23b3ee55ad..0527f852dc 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_food.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_food.yml @@ -33,4 +33,16 @@ cost: 5000 category: Food group: market - + +- type: cargoProduct + name: kvass tank crate + id: FoodCrateKvassTank + description: A tank with refreshing kvass, which helps so much in the heat. + icon: + sprite: Structures/Storage/kvass.rsi + state: kvass + product: CrateFoodKvassTank + cost: 2000 + category: Food + group: market + diff --git a/Resources/Prototypes/Catalog/Fills/Crates/food.yml b/Resources/Prototypes/Catalog/Fills/Crates/food.yml index 85ce07d8d3..681881fc8e 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/food.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/food.yml @@ -44,3 +44,13 @@ amount: 3 - id: KitchenKnife amount: 1 + +- type: entity + id: CrateFoodKvassTank + name: kvass tank crate + parent: CrateGenericSteel + components: + - type: StorageFill + contents: + - id: KvassTankFull + amount: 1 diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml index 6b952d07a2..98e4e50432 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml @@ -2117,3 +2117,18 @@ - ReagentId: CapsaicinOil Quantity: 5 +- type: entity + parent: DrinkGlassBase + id: DrinkKvassGlass + name: kvass glass + description: A cool refreshing drink with a taste of socialism. + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 50 + reagents: + - ReagentId: Kvass + Quantity: 50 + - type: Sprite + sprite: Objects/Consumable/Drinks/kvass.rsi diff --git a/Resources/Prototypes/Entities/Structures/Storage/Tanks/tanks.yml b/Resources/Prototypes/Entities/Structures/Storage/Tanks/tanks.yml index fa93ce6671..caf618c3c9 100644 --- a/Resources/Prototypes/Entities/Structures/Storage/Tanks/tanks.yml +++ b/Resources/Prototypes/Entities/Structures/Storage/Tanks/tanks.yml @@ -107,3 +107,26 @@ - type: ReagentTank transferAmount: 100 +# Kvass +- type: entity + id: KvassTank + parent: StorageTank + name: КВАС + suffix: Empty + description: A cool refreshing drink with a taste of socialism. + components: + - type: Sprite + sprite: Structures/Storage/kvass.rsi + state: kvass + +- type: entity + parent: KvassTank + id: KvassTankFull + suffix: Full + components: + - type: SolutionContainerManager + solutions: + tank: + reagents: + - ReagentId: Kvass + Quantity: 1500 diff --git a/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml b/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml index f082374c99..9415d67a75 100644 --- a/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml +++ b/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml @@ -317,3 +317,12 @@ physicalDesc: strong-smelling color: "#485000" spritePath: rewriter.rsi + +- type: reagent + id: Kvass + name: reagent-name-kvass + parent: BaseDrink + desc: reagent-desc-kvass + physicalDesc: reagent-physical-desc-bubbly + color: "#381600" + spritePath: kvass.rsi diff --git a/Resources/Textures/Objects/Consumable/Drinks/kvass.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/kvass.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..58a6f2157621e53c398a386d9100cca4be13cadd GIT binary patch literal 219 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfvl>na**8>L*RBSs@x@zys2RE)? zICSmEw!eQqn(;AMh%p>|{L)Q|!BUK2j+(C`P(5QwkY6x^!?PP{Ku)Tsi(`n!#N-5t zq=vwN00CErn>VkxFh)9fczSv=L^|kPxhm?~A5rPrsC>kgdPhIpX<%lU^j7Rj>3Qi0 PpoI*cu6{1-oD!M+5T)=gz)mHi95?T{TV*{71DX&j8;_d;5P7M7Kn$tgNpP zWgkF2)ef|fwArjh2vT@hXl|w=>fKRrLv!=~gC#|?qjAqe4{h)?mmf~OmO6kK*8gGO zjEy>785+Cu-aCu+hR&GMbea;O2-HT9((*)v7uEq4^?`sCwj0k34I5EO zv>R75Zo(a@1T9icdlWRZ*LsEab%ISamY1QW2@V3(9~v&j48R@H8VNHZaXA~~~RB})?|3{UV8oHP+yNNGh;$mvB|qrtRuQNTeEgg{tT zpe~uyjkL(BthC5iFr5=$}z#W(MO~zZnC(m8V&jVFX~CuvQn9 z;6~?zQ>|*KL}-x`eS(iS157kqX^b?R35=)V%gQho)=&6pD+`RMRu~*K10nI+Zn7K6 z>|~=>W5L$Uq=h2j4=1&ER^D_C`J{MNSc0jbjHp&x8TK1sqk=5MXlN!oUoRyl1a)Y!mogdQDCtu**@do1KCkfD*HOTl;T=bfs4@0C}Rk}y2ng{ zYa|UpTh?y_xI2dcP48}w7c!Iz+QtH+F*_|?rm((R3NvQoEdVC(D!VPCrpSIZ&PPE- z0A_rm%SNPa9(6a<%V`&ldGd3Qx`e7m4ECPdxjE^OGs~He1I}v>jJ!}9J zMv`9A#*r+?z|Tyt_=f1S5h#S9oJYQ{_Uy_Y0HMFl0k9BH$&8)j5o^-Wl zN)5lX3e&PF$K^yx!!uYL<_>@Ok-I*CFr+F9F9)(eUJb8qJ6z5RZ{sVcw~@7aGQVm! zDC#u58+&R?cZ+q}kLTQ8+w<^7eSJffZN?0H{KOKodC|Rn@)sKdzNNQ2dOY{oUVNQC z{I@?hJ-xmEm!H=$flfN*(%thCv+3=KJhyeY=(O^4;oSZ_qO5daY{an$`TdCg8R?}t`OAJb5PHvz z42^tr{2yngb(T>(hw6~gmmm9fiFYm%JII0*{i`;^ie)Pe>Zh~N;^LzfeMf$n`grWn zb92T^PWDt+y!g)X4?q9+Tjv+1y7nAf`N*!G`AaVV=dBj~Gs|cHVqOs0<#_jrlR77~ zx_a15c>cb$cT4a+dotD-=s4)#J#chOH!^y<`VBgGe&CI+e;wJqWAFQ(wbPoh$7;pmq?;d{d-+_Ur8SlbP+6W0xOe6)Vm@;v0Wao_K196OZi;hX60r$7GArcH)M ZU3f*uC*}HIZ`Lk>uBuw+fTQ{T{{t!_`$zx) literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Storage/kvass.rsi/meta.json b/Resources/Textures/Structures/Storage/kvass.rsi/meta.json new file mode 100644 index 0000000000..52432bc6e2 --- /dev/null +++ b/Resources/Textures/Structures/Storage/kvass.rsi/meta.json @@ -0,0 +1,14 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/TauCetiStation/TauCetiClassic/commit/c449d65dff642f44f3e0d8a312f70aec43ab2eae", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "kvass" + } + ] +}