From 229df7c5ecc0c9765c9b8d99315d39b665667dbe Mon Sep 17 00:00:00 2001 From: Vladislav Kadira <130583174+FillerVK@users.noreply.github.com> Date: Sun, 13 Aug 2023 17:35:58 +0300 Subject: [PATCH] Add cocoa cultivation (#18366) * Add cocoa cultivation * fix * Fix 2 * fix 3 Co-authored-by: Pieter-Jan Briers --------- Co-authored-by: Pieter-Jan Briers --- .../reagents/meta/consumable/food/food.ftl | 3 ++ Resources/Locale/en-US/seeds/seeds.ftl | 2 + .../VendingMachines/Inventories/seeds.yml | 1 + .../Objects/Consumable/Food/ingredients.yml | 29 ++++++++++++ .../Objects/Consumable/Food/produce.yml | 30 ++++++++++++ .../Objects/Consumable/Food/snacks.yml | 2 + .../Objects/Specific/Hydroponics/seeds.yml | 10 ++++ Resources/Prototypes/Hydroponics/seeds.yml | 27 +++++++++++ .../Reagents/Consumable/Food/ingredients.yml | 26 +++++++++++ .../Prototypes/Recipes/Reactions/food.yml | 16 +++++++ .../Specific/Hydroponics/cocoa.rsi/dead.png | Bin 0 -> 218 bytes .../Hydroponics/cocoa.rsi/harvest.png | Bin 0 -> 330 bytes .../Specific/Hydroponics/cocoa.rsi/meta.json | 44 ++++++++++++++++++ .../Hydroponics/cocoa.rsi/produce-beans.png | Bin 0 -> 252 bytes .../Hydroponics/cocoa.rsi/produce.png | Bin 0 -> 327 bytes .../Specific/Hydroponics/cocoa.rsi/seed.png | Bin 0 -> 235 bytes .../Hydroponics/cocoa.rsi/stage-1.png | Bin 0 -> 143 bytes .../Hydroponics/cocoa.rsi/stage-2.png | Bin 0 -> 149 bytes .../Hydroponics/cocoa.rsi/stage-3.png | Bin 0 -> 165 bytes .../Hydroponics/cocoa.rsi/stage-4.png | Bin 0 -> 216 bytes .../Hydroponics/cocoa.rsi/stage-5.png | Bin 0 -> 270 bytes .../Hydroponics/cocoa.rsi/stage-6.png | Bin 0 -> 270 bytes 22 files changed, 190 insertions(+) create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/cocoa.rsi/dead.png create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/cocoa.rsi/harvest.png create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/cocoa.rsi/meta.json create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/cocoa.rsi/produce-beans.png create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/cocoa.rsi/produce.png create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/cocoa.rsi/seed.png create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/cocoa.rsi/stage-1.png create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/cocoa.rsi/stage-2.png create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/cocoa.rsi/stage-3.png create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/cocoa.rsi/stage-4.png create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/cocoa.rsi/stage-5.png create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/cocoa.rsi/stage-6.png diff --git a/Resources/Locale/en-US/reagents/meta/consumable/food/food.ftl b/Resources/Locale/en-US/reagents/meta/consumable/food/food.ftl index 1231d7167b..a6b3cb5479 100644 --- a/Resources/Locale/en-US/reagents/meta/consumable/food/food.ftl +++ b/Resources/Locale/en-US/reagents/meta/consumable/food/food.ftl @@ -9,3 +9,6 @@ reagent-desc-vitamin = Found in healthy, complete meals. reagent-name-protein = protein reagent-desc-protein = Found in certain meals, good for bodily health. + +reagent-name-cocoapowder = сocoa powder +reagent-desc-cocoapowder = From the best varieties of cocoa beans diff --git a/Resources/Locale/en-US/seeds/seeds.ftl b/Resources/Locale/en-US/seeds/seeds.ftl index 8e22f046c8..b7d77ca1e6 100644 --- a/Resources/Locale/en-US/seeds/seeds.ftl +++ b/Resources/Locale/en-US/seeds/seeds.ftl @@ -75,3 +75,5 @@ seeds-watermelon-name = watermelon seeds-watermelon-display-name = watermelon plant seeds-grape-name = grape seeds-grape-display-name = grape plant +seeds-cocoa-name = cocoa +seeds-cocoa-display-name = cocoa plant diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/seeds.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/seeds.yml index 05b1d52d53..a0d19b95ea 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/seeds.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/seeds.yml @@ -31,5 +31,6 @@ TowercapSeeds: 5 WheatSeeds: 5 WatermelonSeeds: 5 + CocoaSeeds: 3 emaggedInventory: FlyAmanitaSeeds: 1 diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml index b307510a4e..0477816874 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml @@ -620,3 +620,32 @@ - type: Tag tags: - Trash + +- type: entity + name: cocoa beans + parent: FoodProduceBase + id: FoodCocoaBeans + description: You can never have too much chocolate! + components: + - type: FlavorProfile + flavors: + - chocolate + - type: Sprite + sprite: Objects/Specific/Hydroponics/cocoa.rsi + state: produce-beans + - type: SolutionContainerManager + solutions: + food: + maxVol: 14 + reagents: + - ReagentId: Nutriment + Quantity: 2 + - ReagentId: Vitamin + Quantity: 1 + - ReagentId: CocoaPowder + Quantity: 2 + - type: Extractable + juiceSolution: + reagents: + - ReagentId: CocoaPowder + Quantity: 2 diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml index 4c76bf7f98..097be3c37a 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml @@ -579,6 +579,36 @@ - ReagentId: JuiceApple Quantity: 10 +- type: entity + name: cocoa pod + parent: FoodProduceBase + id: FoodCocoaPod + description: You can never have too much chocolate! + components: + - type: FlavorProfile + flavors: + - chocolate + - type: SolutionContainerManager + solutions: + food: + maxVol: 14 + reagents: + - ReagentId: Nutriment + Quantity: 2 + - ReagentId: Vitamin + Quantity: 1 + - ReagentId: CocoaPowder + Quantity: 1 + - type: Sprite + sprite: Objects/Specific/Hydroponics/cocoa.rsi + - type: Produce + seedId: cocoa + - type: SpawnItemsOnUse + items: + - id: FoodCocoaBeans + sound: + path: /Audio/Effects/packetrip.ogg + - type: entity name: ear of corn parent: FoodProduceBase diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml index 4c60fee616..fb02a92949 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml @@ -118,6 +118,8 @@ Quantity: 10 - ReagentId: Theobromine Quantity: 3 + - ReagentId: CocoaPowder + Quantity: 1 - type: entity name: energy bar diff --git a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml index d64f908a8d..0d98669fae 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml @@ -384,4 +384,14 @@ seedId: grape - type: Sprite sprite: Objects/Specific/Hydroponics/grape.rsi + +- type: entity + parent: SeedBase + name: packet of cocoa seeds + id: CocoaSeeds + components: + - type: Seed + seedId: cocoa + - type: Sprite + sprite: Objects/Specific/Hydroponics/cocoa.rsi \ No newline at end of file diff --git a/Resources/Prototypes/Hydroponics/seeds.yml b/Resources/Prototypes/Hydroponics/seeds.yml index 467f49b8e5..8c8abe478d 100644 --- a/Resources/Prototypes/Hydroponics/seeds.yml +++ b/Resources/Prototypes/Hydroponics/seeds.yml @@ -961,3 +961,30 @@ Min: 1 Max: 5 PotencyDivisor: 20 + +- type: seed + id: cocoa + name: seeds-cocoa-name + noun: seeds-noun-seeds + displayName: seeds-cocoa-display-name + plantRsi: Objects/Specific/Hydroponics/cocoa.rsi + packetPrototype: CocoaSeeds + productPrototypes: + - FoodCocoaPod + harvestRepeat: Repeat + lifespan: 50 + maturation: 6 + production: 6 + yield: 6 + idealLight: 7 + waterConsumption: 6 + idealHeat: 298 + chemicals: + Vitamin: + Min: 1 + Max: 4 + PotencyDivisor: 25 + Nutriment: + Min: 1 + Max: 2 + PotencyDivisor: 50 diff --git a/Resources/Prototypes/Reagents/Consumable/Food/ingredients.yml b/Resources/Prototypes/Reagents/Consumable/Food/ingredients.yml index 1e6b210a0c..be61993e7d 100644 --- a/Resources/Prototypes/Reagents/Consumable/Food/ingredients.yml +++ b/Resources/Prototypes/Reagents/Consumable/Food/ingredients.yml @@ -197,3 +197,29 @@ type: Local messages: [ "capsaicin-effect-light-burn" ] probability: 0.2 + +- type: reagent + id: CocoaPowder #Candy and chocolate + name: reagent-name-cocoapowder + group: Foods + desc: reagent-desc-cocoapowder + physicalDesc: reagent-physical-desc-powdery + flavor: chocolate + color: "#800000" + meltingPoint: 146.0 + metabolisms: + Food: + effects: + - !type:SatiateHunger + conditions: + - !type:ReagentThreshold #Only satiates when eaten with nutriment + reagent: Nutriment + min: 0.1 + factor: 1 + plantMetabolism: + - !type:PlantAdjustNutrition + amount: 0.1 + - !type:PlantAdjustWeeds + amount: 2 + - !type:PlantAdjustPests + amount: 2 diff --git a/Resources/Prototypes/Recipes/Reactions/food.yml b/Resources/Prototypes/Recipes/Reactions/food.yml index 2ef1cf2dab..284b1c763a 100644 --- a/Resources/Prototypes/Recipes/Reactions/food.yml +++ b/Resources/Prototypes/Recipes/Reactions/food.yml @@ -266,3 +266,19 @@ effects: - !type:CreateEntityReactionEffect entity: FoodMeatMeatball + +- type: reaction + id: CreateChocolate + impact: Low + quantized: true + conserveEnergy: false + reactants: + CocoaPowder: + amount: 4 + Milk: + amount: 2 + Sugar: + amount: 2 + effects: + - !type:CreateEntityReactionEffect + entity: FoodSnackChocolateBar diff --git a/Resources/Textures/Objects/Specific/Hydroponics/cocoa.rsi/dead.png b/Resources/Textures/Objects/Specific/Hydroponics/cocoa.rsi/dead.png new file mode 100644 index 0000000000000000000000000000000000000000..df1a43cd506e3aea2ed5a4715dfafca8687e235d GIT binary patch literal 218 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv(Ey(i*GF@n6gV@i&0v@r!w_P` zzz|l-;F)~k;deiv0>+XczhDN3XE)M-oMKNG#}JK)NBa-*HW+ZY+N<8nyu{cee4&J~ zcip1j{Rv+aw0mC$9(rp3Po1GgB=R9+c*h-EJ1Zys=^=bU>{@+uzA5dCvu=#DYPXnS z9C0>rwS>bp$69yhH0B*Q6CJk*-e;B(i4mEytu=V2I?wTQ8Fv3R`*q5)Jy@^vr2uF> NgQu&X%Q~loCIHj)OUnQN literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Hydroponics/cocoa.rsi/harvest.png b/Resources/Textures/Objects/Specific/Hydroponics/cocoa.rsi/harvest.png new file mode 100644 index 0000000000000000000000000000000000000000..5176c3fe5d80adacc8b1646d2289089206ddbdf3 GIT binary patch literal 330 zcmV-Q0k!^#P)Msrj%{(4k8C!FKYgM!<_Jt!Mz|wp`tuAG3`|nOp#pWB^n$ z0035X07+xW2#u!z0004WQchCD3H2+yFZY8 zXmBH7;@d=4tul>51l`}alZY_+u*R!)QZQ2px?64pToOphW0H)1MSDY)MARCj-r32u%Hzz#z;I7VK&;|*6HgMoU^hr8E~?6B4p`>%e*LU5(=eeI8H{Qo>IWq+N< V$sGB`%@*ih22WQ%mvv4FO#uD`kShQH literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Hydroponics/cocoa.rsi/seed.png b/Resources/Textures/Objects/Specific/Hydroponics/cocoa.rsi/seed.png new file mode 100644 index 0000000000000000000000000000000000000000..1c008dff4e849c30b4f6e35368e463fb9487f0b0 GIT binary patch literal 235 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyW&u7Su8-zCiHu_K^kQi5WSl>r z<@DLq#mgC=Y|H(AYvs=kK^GQ!?cUA#^I+Mhm2L;RweQZ6f3_`VbFaH`;NIOp6BtW^ z{DK)Ap4~_Ta*{n=978O6-(J`$)S$rQ8mQFbI_<^(|7#3p=%u(t?_Gap;lUaEj~`5X z-&j-5_k52q>xaGmY;u7I4ohZ>F~S4(Dz+yhHgXp i#HaNJ36?+qz0}K$VTo02czyzC9fPNaU}!zg(US4W=>=2I znH5ztX7XN`BC$C7P><+OQyfJy9z>p#xQug L`njxgN@xNA9$7VX literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Hydroponics/cocoa.rsi/stage-4.png b/Resources/Textures/Objects/Specific/Hydroponics/cocoa.rsi/stage-4.png new file mode 100644 index 0000000000000000000000000000000000000000..666be76cb00c93182f8502cd400f6165b48622c5 GIT binary patch literal 216 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfvi2$Dv*GF@nSZ-xFU&CNHhhb(6 zLxD2`Ls%(;XY#)nhJS!+7)yfuf*Bm1-ADs+@;qG}Lo_BPCn#_mFl}V$>X^X5JXv8A zgRpWlQx}(-f>45sSYUubfrDY|NtP8{t}aI%A_R{nrKvNsF^f!>FqBYQZBUTtxOE1r zO4FjI#-of^t$B2KRJbrUaj<;}rUaj<;}