From 2871e692684f164460a217b79a637ee5616906df Mon Sep 17 00:00:00 2001 From: lzk <124214523+lzk228@users.noreply.github.com> Date: Mon, 26 Aug 2024 04:46:16 +0200 Subject: [PATCH] Moff cooking. Part one. (#30668) * yml part * guidebook * commit * some fixes * a little * change --- .../Objects/Consumable/Food/Baked/bread.yml | 61 +++++++++++++++++ .../Objects/Consumable/Food/Baked/pizza.yml | 63 ++++++++++++++++++ .../Objects/Consumable/Food/ingredients.yml | 44 ++++++++++++ .../Construction/Graphs/food/cottonpizza.yml | 13 ++++ .../Recipes/Cooking/meal_recipes.yml | 17 +++++ .../Prototypes/Recipes/Reactions/food.yml | 16 +++++ .../Guidebook/Service/FoodRecipes.xml | 6 ++ .../Food/Baked/bread.rsi/cotton-slice.png | Bin 0 -> 721 bytes .../Food/Baked/bread.rsi/cotton.png | Bin 0 -> 1187 bytes .../Consumable/Food/Baked/bread.rsi/meta.json | 8 ++- .../Food/Baked/pizza.rsi/cotton-pizza.png | Bin 0 -> 672 bytes .../Food/Baked/pizza.rsi/cotton-slice.png | Bin 0 -> 501 bytes .../Consumable/Food/Baked/pizza.rsi/meta.json | 8 ++- .../ingredients.rsi/cotton-dough-flat.png | Bin 0 -> 765 bytes .../Food/ingredients.rsi/cotton-dough.png | Bin 0 -> 904 bytes .../Consumable/Food/ingredients.rsi/meta.json | 8 ++- 16 files changed, 241 insertions(+), 3 deletions(-) create mode 100644 Resources/Prototypes/Recipes/Construction/Graphs/food/cottonpizza.yml create mode 100644 Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/cotton-slice.png create mode 100644 Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/cotton.png create mode 100644 Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/cotton-pizza.png create mode 100644 Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/cotton-slice.png create mode 100644 Resources/Textures/Objects/Consumable/Food/ingredients.rsi/cotton-dough-flat.png create mode 100644 Resources/Textures/Objects/Consumable/Food/ingredients.rsi/cotton-dough.png diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bread.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bread.yml index 31e92931db..0fb3df4d27 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bread.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bread.yml @@ -121,6 +121,67 @@ - Bread - Slice +- type: entity + name: cotton bread + parent: FoodBreadBase + id: FoodBreadCotton + description: Bread, but for moff. + components: + - type: FlavorProfile + flavors: + - cotton + - bread + - type: Food + requiresSpecialDigestion: true + - type: Sprite + layers: + - state: cotton + - type: SliceableFood + slice: FoodBreadCottonSlice + - type: Tag + tags: + - ClothMade + - Bread + - type: SolutionContainerManager + solutions: + food: + maxVol: 26 + reagents: + - ReagentId: Nutriment + Quantity: 10 + - ReagentId: Fiber + Quantity: 10 + +- type: entity + name: cotton bread slice + parent: FoodBreadSliceBase + id: FoodBreadCottonSlice + description: A slice of (maybe) delicious cotton bread. + components: + - type: FlavorProfile + flavors: + - cotton + - bread + - type: Food + requiresSpecialDigestion: true + - type: Sprite + layers: + - state: cotton-slice + - type: Tag + tags: + - ClothMade + - Bread + - Slice + - type: SolutionContainerManager + solutions: + food: + maxVol: 8 + reagents: + - ReagentId: Nutriment + Quantity: 2 + - ReagentId: Fiber + Quantity: 2 + - type: entity name: cornbread parent: FoodBreadBase diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pizza.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pizza.yml index 652c60722d..ff38363c9e 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pizza.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pizza.yml @@ -618,3 +618,66 @@ Quantity: 2 # Tastes like crust, tomato, cheese, radiation. + +- type: entity + name: cotton pizza + parent: FoodPizzaBase + id: FoodPizzaCotton + description: Flat fabric cotton dough with cotton topping. Incredible. + components: + - type: FlavorProfile + flavors: + - cotton + - bread + - type: Sprite + layers: + - state: cotton-pizza + - type: Food + requiresSpecialDigestion: true + - type: SliceableFood + slice: FoodPizzaCottonSlice + - type: Tag + tags: + - ClothMade + - Pizza + - type: SolutionContainerManager + solutions: + food: + maxVol: 40 + reagents: + - ReagentId: Nutriment + Quantity: 20 + - ReagentId: Vitamin + Quantity: 5 + - ReagentId: Fiber + Quantity: 10 + +- type: entity + name: slice of cotton pizza + parent: FoodPizzaSliceBase + id: FoodPizzaCottonSlice + description: A slice of cotton pizza. Cotton included. + components: + - type: FlavorProfile + flavors: + - cotton + - bread + - type: Sprite + layers: + - state: cotton-slice + - type: Tag + tags: + - ClothMade + - Pizza + - Slice + - type: SolutionContainerManager + solutions: + food: + maxVol: 6 + reagents: + - ReagentId: Nutriment + Quantity: 3.5 + - ReagentId: Vitamin + Quantity: 0.8 + - ReagentId: Fiber + Quantity: 1.5 diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml index 6e481bb961..1a80a5fe53 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml @@ -414,6 +414,38 @@ graph: Tortilla node: flat +- type: entity + name: cotton dough + parent: FoodBakingBase + id: FoodDoughCotton + description: A piece of fabric dough. + components: + - type: FlavorProfile + flavors: + - dough + - cotton + - type: Sprite + state: cotton-dough + # - type: SliceableFood # TODO add it + # count: 3 + # slice: FoodDoughCottonSlice + - type: Construction + graph: CottonPizza + node: start + - type: Tag + tags: + - Ingredient + - ClothMade + - type: SolutionContainerManager + solutions: + food: + maxVol: 18 + reagents: + - ReagentId: Nutriment + Quantity: 5 + - ReagentId: Fiber + Quantity: 10 + - type: entity name: raw pastry base parent: FoodBakingBase @@ -456,6 +488,18 @@ count: 3 slice: FoodCroissantRaw +- type: entity + name: flat cotton dough + parent: FoodBakingBase + id: FoodDoughCottonFlat + description: A flattened cotton dough. + components: + - type: Sprite + state: cotton-dough-flat + - type: Construction + graph: CottonPizza + node: flat + - type: entity name: pizza bread parent: FoodBakingBase diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/food/cottonpizza.yml b/Resources/Prototypes/Recipes/Construction/Graphs/food/cottonpizza.yml new file mode 100644 index 0000000000..2292d4d299 --- /dev/null +++ b/Resources/Prototypes/Recipes/Construction/Graphs/food/cottonpizza.yml @@ -0,0 +1,13 @@ +- type: constructionGraph + id: CottonPizza + start: start + graph: + - node: start + entity: FoodDoughCotton + edges: + - to: flat + steps: + - tool: Rolling + doAfter: 1 + - node: flat + entity: FoodDoughCottonFlat diff --git a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml index 9a59ab5023..ce38125627 100644 --- a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml +++ b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml @@ -399,6 +399,14 @@ solids: FoodDough: 1 +- type: microwaveMealRecipe + id: RecipeBreadCotton + name: cotton bread recipe + result: FoodBreadCotton + time: 10 + solids: + FoodDoughCotton: 1 + - type: microwaveMealRecipe id: RecipeSausageBread name: sausage bread recipe @@ -602,6 +610,15 @@ FoodTomato: 2 SheetUranium1: 2 +- type: microwaveMealRecipe + id: RecipeCottonPizza + name: cotton pizza recipe + result: FoodPizzaCotton + time: 30 + solids: + FoodDoughCottonFlat: 1 + CottonBol: 4 + #Italian - type: microwaveMealRecipe id: RecipeBoiledSpaghetti diff --git a/Resources/Prototypes/Recipes/Reactions/food.yml b/Resources/Prototypes/Recipes/Reactions/food.yml index 24dca890ed..7d524a9c7a 100644 --- a/Resources/Prototypes/Recipes/Reactions/food.yml +++ b/Resources/Prototypes/Recipes/Reactions/food.yml @@ -72,6 +72,22 @@ - !type:CreateEntityReactionEffect entity: FoodDoughTortilla +- type: reaction + id: CreateDoughCotton + impact: Low + quantized: true + conserveEnergy: false + reactants: + Fiber: + amount: 10 + Flour: + amount: 5 + Water: + amount: 10 + effects: + - !type:CreateEntityReactionEffect + entity: FoodDoughCotton + - type: reaction id: CreateCakeBatter impact: Low diff --git a/Resources/ServerInfo/Guidebook/Service/FoodRecipes.xml b/Resources/ServerInfo/Guidebook/Service/FoodRecipes.xml index 450f5f088b..3eb9c2ca2f 100644 --- a/Resources/ServerInfo/Guidebook/Service/FoodRecipes.xml +++ b/Resources/ServerInfo/Guidebook/Service/FoodRecipes.xml @@ -22,9 +22,15 @@ WARNING: This is not an automatically generated list, things here may become out - Chocolate = 6 Cocoa Powder, 2 Milk, 2 Sugar - Uncooked Animal Protein: Grind Raw Meat +Buzz! Don't forget about Moth diet! +- Cotton Dough = 5 Flour, 10 Fabric, 10 Water +- Cotton bread baked the same as default but with cotton dough instead +- Cotton Pizza: Microwave 1 Flat Cotton Dough and 4 Cotton Bolls for 30 Seconds + + diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/cotton-slice.png b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/cotton-slice.png new file mode 100644 index 0000000000000000000000000000000000000000..0b92e30ae1403dd0b4f78c7e24245cc849ee34ed GIT binary patch literal 721 zcmV;?0xtcDP)7h3fO2K+*#e<;5 zQwv4V90WxVT0x6o@lri%6||sukRo^x^&k;N!BE5&D@CZ6h&C}+JKTC1Mqo2Sp%4^B!A#*W&yU@H+mMik1-v>vz=a7yFoJs}AM`*gk114D zMc>Iu=w%mXFy4@mx+-r*2aTO_0pXFeaJ$M_HM$rUiA0b}ETSXQgG3_1IX`mz)X>WF z6dx`fMBkNIO-{`T0#kwh=qUzE!EVcD%DYQBXqs99`(?CuY-K?d9=Rg2q^#w&22U@i_=WE>y$C8rn-y)^d3N<~fF=m;d6~_Q1lD zf}Vx@P`me|#a)JujA?V_v=sEMWm#rXDN_LTg*drrMq1-XksVMz%^}?8xAs@RxNNg# zvQQ`@zx)WrQl1?MN-L%q71Gad*x*}Z5d@~wv(>*XCntnJ0jFA-ADS(yW)Hl6Fll^E z=aHR%#~Y~^JT2S!)Zf1>ajvNAf1I4ICPi#&0_5VBZ~(hU4>8=%ep*}i7F^udYjlSF zW)oI^HhXro0Rv56pn&{)l4`_K@2 z2Txd6Fn;}vHJ8k2n0P#2_i#-Ks20*casWP`ms8Jf&BAMx5ZWX|Nvk;bWU(QzsMpkD zv5B6u)8htp_RG5u+3ss|%j>RHUDtVc9B>@?{~Y)Q3Yrfabj#tx00000NkvXXu0mjf D_B}(r literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/cotton.png b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/cotton.png new file mode 100644 index 0000000000000000000000000000000000000000..baa9dc777f23cac67e1f24c7d2b324248459ea55 GIT binary patch literal 1187 zcmV;U1YG-xP)a$T@PBu}bd&+t#$&r255&e%sZ`*8a05P<6I<;b zq%#`2gI;;Iug=39jLH~sKT|jaB2*@W-F>~ zeQ;I(#@tE`;c!@lB<}uzmFwTa**8)*FXA*IU(!*uI7CRm>&CH%Gj&(8f6mF=S3dr} ziLar92`eBwHxS z?u#>bLPSp>>5HBbV%pC4U2Ptnj)F{m`s7P!bGp%c>0P9gX>|0D zHjq;UL2`qb&JbJSA$;@c2a;C?tVUxkwSdtJQA|%y3z^GqSG#s#c6Js~zlybbCpkr} zZ3Pf&&jL!s^3^X8c;ihJN@Xms>h*)?(_NNdwoR-*aMSLU%Cg|zLhho9aPmpV&+7DvC*ieQ>Y{{L#?AQXr^$xIZxCR)H-RK#^5L$QMaU2Qq1=c@AB*Dd{eIP{ zO4GoF%Wq-n?kxmW$If~lH?H3nqI7Y8u9?y8t~Kqx$pLmS=EY(WZtn@K<>uvSkaPDD z&j$3(CyC@+jRViWi1KP0wYH=x%_q@d2#CzX41!@LQ9Tc$F(7KxRNKLE&!*VSTp)~7 zkmLroYBnjsI~%=Ha;$Ts=2>oR2ixrO^Nfx)5gQ#10$7T~t(kSH0-l0&gJMW-Qf^Qb z%aPz=!wh#1ossu2Qc~;e=TS^>jC1;wOT90gJK6!pP%Cd>U|>Kdl8hn@P>gXeu#cHd zGM;<}wzqer$tPVfPR0Fm_N!^y1=da<%)eg4bnaETexLE`kf`fZu=)qMKqjzO`e*j!4khJ?fZMR&k|#z z@jn2;ofed^gLv<|+yDCipy{JlN6Ueh1OK%H{{Whh5shRn#{2*P002ovPDHLkV1l$A BHDmw) literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/meta.json index 2761d79f98..f35aa5f4ce 100644 --- a/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation and modified by potato1234x at https://github.com/tgstation/tgstation/commit/0631fe5bde73a68b4c12bdfa633c30b2cee442d5. Crostini created by Github user deathride58, baguette taken from tgstation at commit https://github.com/tgstation/tgstation/commit/7ffd61b6fa6a6183daa8900f9a490f46f7a81955", + "copyright": "Taken from tgstation and modified by potato1234x at https://github.com/tgstation/tgstation/commit/0631fe5bde73a68b4c12bdfa633c30b2cee442d5. Crostini created by Github user deathride58, baguette taken from tgstation at commit https://github.com/tgstation/tgstation/commit/7ffd61b6fa6a6183daa8900f9a490f46f7a81955, cotton made by mlexf (discord 1143460554963427380)", "size": { "x": 32, "y": 32 @@ -70,6 +70,12 @@ { "name": "crostini" }, + { + "name": "cotton" + }, + { + "name": "cotton-slice" + }, { "name": "french-toast" }, diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/cotton-pizza.png b/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/cotton-pizza.png new file mode 100644 index 0000000000000000000000000000000000000000..e047c757fcd952d27343daa0072ae2e1179cf47a GIT binary patch literal 672 zcmV;R0$=@!P)+f4kN(l%?IIO;)c6@4hs(g(ob1*e);jt{8Ixy zy;@_?;z@(Xo=?)5)tEyN1XQcl$n!jEwOaAHZQH!Zx38NINintf+cYvqvMK{Os*o3N zlY8tc?b|CHRxX#>VE{KxlXP9@J;1RS-xii1QBb3R)Dx=Ye^K?2Lj+LF)6KzQm5a5Pka6$kInMI|RWpP5ZAz697UXKaM zvYbgei^S1n3ot~w@`lJ*CD(P?VW>pdU@(ZP`3)jSioIwPR#7zyXf~UKqJr(`6w&@; zsTug`?DF7*-(L`by4^0js;b;$c#;qZ0st<+p_*tFNWjqsfMc$Jk+g{!`1W)u94=hp z!I{5wpJS0ESuJKj3?uq2B*$E!MIe@(3lRG9_8vKIkFMQ)nZnGxh9F@qE>XufNmA1n z<;1x)CRD9fnH;LezTc1D0Bi3(uY(aKVn;aV8jcSduy6pgnN0*H7m><$;1er_*KA#VvPzbUtL(?=i zf&}TE>WZSUS~8hr#uEF>m|r_~G}3Ze8Mr-(82*7Eg8g$S7K;dn!^q`ws8*{?jA~A& z6WMH*)#xsl%WUlX-8K^OgQnut&wBtSy-q@pN7*L9Q3$KwtPR~tyD zu3L)RGN5V|$jLJFLJawvEmMR9^Z7g^Nn)nxNd})!SD5hmix}_m_1Ob7G8Ms_7M#k~A z6O_2wqP67|g&Rc+T(gD48bM%LKxbhFW|wi!9UmEBW_GD8oSVG7 zdEayHx%a*y^2}4fQ@~T;A1kmhFMg?1(w)wHFTbNpR|<38d7#Z!&{!-+!{Lyk(dYz^ zU-fT1?li01*Ecul@{K$D-tW5M#pC;WcI5(PG8w*9Q4|V=LXO{J9etzGASkleYr7J0 zBwz(^Hk%CE@AoMj4s#Du0D|orAlp0Im?-8dl?ny*9xLLehAja|4xmwQiva?Gpdq_T zk!Xy^+CZh>+94*BOeRTgnX-dKDwP_mWF@iw=>uKA{a^;~uw6poV#K&%czVpgM~h3R z83e%oBSAibdD3L+b^|mr=FK@%jdok*GgdP3lPxAOcSzbu_-j-ymVN zQEz)lEgS-c|UB6isAg{D*++aanHAtJP+1ZQ&A74MC z^4sSG5@2ujYPG1-F&(qo3;`qxHX;Ez&W4F9 z=*e9Im;gYJ22dE15DohPE>y&Ml%rh|&Je(%YV{|rudVVWcwqWXVz>dHioMmw|2$RByj(BhkT-?8KTL=09V%v80%tV3i3umB@thlW#{xv#~ZO245Gr> zfTInqu7A?sRJ%oSsK8w8Z}DZal?CQ)y2#l@veZVggMC z63K*Wte7+j1DDElPrw~jO_22#_Iv*4SLO@q2^z|RvRE?jwL(*YmFYf!IJ);^FKS&D zB$;Pr)}^?^`3wF*$OSxfkvZZInJp-~2WZ%AHcbMW3iyKw41IZxG7AAD-KA4WR*d?9 zu3n{6v$d3b4Q4ifnT#hK7-b7;WnmHnpWp6X0fFanz|{o%_PPb?5co9$yH!L~A7`D? zu)B_6-1iP3Dufn8%zV@bbWJ;}otj^orUI9*UFYbgqd>G<-@pfWnoff=SA)}K>MEDf zVec72q!F<#QT2f`1}zEn*-X;?th>`&@4S&raUgpJ(f9`ZGkzGw5>S&yA`v(%ofsV( zWlw6n_ivtq=I3%3WZi^22|l>fDOc4uBep!xj*G07Y}S+ry_jgsP7Hx6m#wk<`@8~q e1@a0g3j785Fk8L?fLE*l0000