From a302775ac03866094d1aeb953a13caafb039531c Mon Sep 17 00:00:00 2001 From: ZeroDayDaemon <60460608+ZeroDayDaemon@users.noreply.github.com> Date: Tue, 31 Oct 2023 00:09:13 -0400 Subject: [PATCH] Pea Plants (#20504) * Add Pea Plants * Pea soup * Update flavor-profiles.ftl * Update seeds.yml * Add seeds to vendors * Make things more expensive to fix free money exploit * Update textures * Revert "Update textures" This reverts commit b1b7046504afc7468742b0722f601d98684a1c89. Vines dont grow straight into the air. * Shift up 4 pixels * Fuck autofix conflitcs * Shift up 3 more pizels * I finally got byond working so I made sure they were EXACTLY the same * Address Reviews? I think? --------- Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com> --- Resources/Locale/en-US/seeds/seeds.ftl | 4 ++- .../Prototypes/Catalog/Cargo/cargo_botany.yml | 4 +-- .../Catalog/Cargo/cargo_vending.yml | 2 +- .../Catalog/Fills/Crates/botany.yml | 1 + .../VendingMachines/Inventories/seeds.yml | 1 + .../Objects/Consumable/Food/produce.yml | 23 ++++++++++++ .../Entities/Objects/Consumable/Food/soup.yml | 2 +- .../Objects/Specific/Hydroponics/seeds.yml | 11 ++++++ Resources/Prototypes/Hydroponics/seeds.yml | 33 ++++++++++++++++-- .../Recipes/Cooking/meal_recipes.yml | 11 ++++++ .../Specific/Hydroponics/pea.rsi/dead.png | Bin 0 -> 163 bytes .../Specific/Hydroponics/pea.rsi/harvest.png | Bin 0 -> 265 bytes .../Specific/Hydroponics/pea.rsi/meta.json | 32 +++++++++++++++++ .../Specific/Hydroponics/pea.rsi/produce.png | Bin 0 -> 501 bytes .../Specific/Hydroponics/pea.rsi/seed.png | Bin 0 -> 335 bytes .../Specific/Hydroponics/pea.rsi/stage-1.png | Bin 0 -> 157 bytes .../Specific/Hydroponics/pea.rsi/stage-2.png | Bin 0 -> 188 bytes .../Specific/Hydroponics/pea.rsi/stage-3.png | Bin 0 -> 229 bytes 18 files changed, 117 insertions(+), 7 deletions(-) create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/pea.rsi/dead.png create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/pea.rsi/harvest.png create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/pea.rsi/meta.json create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/pea.rsi/produce.png create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/pea.rsi/seed.png create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/pea.rsi/stage-1.png create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/pea.rsi/stage-2.png create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/pea.rsi/stage-3.png diff --git a/Resources/Locale/en-US/seeds/seeds.ftl b/Resources/Locale/en-US/seeds/seeds.ftl index 1f4ac7e5f8..890d292660 100644 --- a/Resources/Locale/en-US/seeds/seeds.ftl +++ b/Resources/Locale/en-US/seeds/seeds.ftl @@ -97,5 +97,7 @@ seeds-berries-name = berries seeds-berries-display-name = berry bush seeds-bungo-name = bungo seeds-bungo-display-name = bungo plant +seeds-pea-name = pea +seeds-pea-display-name = pea vines seeds-pumpkin-name = pumpkin -seeds-pumpkin-display-name = pumpkins \ No newline at end of file +seeds-pumpkin-display-name = pumpkins diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_botany.yml b/Resources/Prototypes/Catalog/Cargo/cargo_botany.yml index f56b729217..4a80b76a3f 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_botany.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_botany.yml @@ -34,10 +34,10 @@ sprite: Objects/Specific/Hydroponics/apple.rsi state: seed product: CrateHydroponicsSeeds - cost: 500 + cost: 550 category: Hydroponics group: market - + - type: cargoProduct id: BulkPlantBGone icon: diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml b/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml index fb635ae8b5..0d38d1088e 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml @@ -164,7 +164,7 @@ sprite: Objects/Specific/Service/vending_machine_restock.rsi state: base product: CrateVendingMachineRestockSeedsFilled - cost: 3125 + cost: 3250 category: Hydroponics group: market diff --git a/Resources/Prototypes/Catalog/Fills/Crates/botany.yml b/Resources/Prototypes/Catalog/Fills/Crates/botany.yml index 5d2798a667..e4297fe62e 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/botany.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/botany.yml @@ -82,3 +82,4 @@ - id: SoybeanSeeds - id: GrapeSeeds - id: WatermelonSeeds + - id: PeaSeeds diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/seeds.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/seeds.yml index 28972e4913..c48100f4ec 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/seeds.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/seeds.yml @@ -34,5 +34,6 @@ WatermelonSeeds: 5 CocoaSeeds: 3 BerrySeeds: 5 + PeaSeeds: 5 emaggedInventory: FlyAmanitaSeeds: 1 diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml index f0da095bbd..6a19f801a6 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml @@ -1566,6 +1566,29 @@ - type: SpaceGarbage - type: BadFood +- type: entity + parent: FoodProduceBase + id: FoodPeaPod + name: pea pod + description: A duck's favorite treat! + components: + - type: FlavorProfile + flavors: + - peas + - type: SolutionContainerManager + solutions: + food: + maxVol: 5 + reagents: + - ReagentId: Nutriment + Quantity: 3 + - ReagentId: Vitamin + Quantity: 2 + - type: Sprite + sprite: Objects/Specific/Hydroponics/pea.rsi + - type: Produce + seedId: pea + - type: entity name: pumpkin parent: FoodProduceBase diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/soup.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/soup.yml index 92946f6f7a..fa87c5a5a0 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/soup.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/soup.yml @@ -79,7 +79,7 @@ maxVol: 15 reagents: - ReagentId: Nutriment - Quantity: 8 + Quantity: 10 - ReagentId: Vitamin Quantity: 5 diff --git a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml index a851ce2626..a731a12997 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml @@ -499,6 +499,17 @@ - type: Sprite sprite: Objects/Specific/Hydroponics/bungo.rsi +- type: entity + parent: SeedBase + id: PeaSeeds + name: packet of pea pods + description: "These humble plants were once a vital part in the study of genetics." + components: + - type: Seed + seedId: pea + - type: Sprite + sprite: Objects/Specific/Hydroponics/pea.rsi + - type: entity parent: SeedBase name: packet of pumpkin seeds diff --git a/Resources/Prototypes/Hydroponics/seeds.yml b/Resources/Prototypes/Hydroponics/seeds.yml index 894f0f0202..20d3f2d853 100644 --- a/Resources/Prototypes/Hydroponics/seeds.yml +++ b/Resources/Prototypes/Hydroponics/seeds.yml @@ -1137,7 +1137,7 @@ Nutriment: Min: 1 Max: 3 - PotencyDivisor: 25 + PotencyDivisor: 25 - type: seed id: koibean @@ -1303,6 +1303,35 @@ Max: 10 PotencyDivisor: 20 +- type: seed + id: pea + name: seeds-pea-name + noun: seeds-noun-seeds + displayName: seeds-pea-display-name + plantRsi: Objects/Specific/Hydroponics/pea.rsi + packetPrototype: PeaSeeds + productPrototypes: + - FoodPeaPod + lifespan: 25 + growthStages: 3 + maturation: 8 + production: 6 + yield: 3 + potency: 25 + idealLight: 8 + harvestRepeat: Repeat + nutrientConsumption: 0.5 + waterConsumption: 0.5 + chemicals: + Nutriment: + Min: 1 + Max: 3 + PotencyDivisor: 33 + Vitamin: + Min: 1 + Max: 2 + PotencyDivisor: 50 + - type: seed id: pumpkin name: seeds-pumpkin-name @@ -1327,4 +1356,4 @@ Vitamin: Min: 1 Max: 5 - PotencyDivisor: 20 \ No newline at end of file + PotencyDivisor: 20 diff --git a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml index 0ebf88e892..92ec105246 100644 --- a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml +++ b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml @@ -1743,6 +1743,17 @@ FoodPlate: 1 FoodButter: 1 +- type: microwaveMealRecipe + id: RecipePeaSoup + name: pea soup recipe + result: FoodSoupPea + time: 10 + solids: + FoodPeaPod: 2 + FoodBowlBig: 1 + reagents: + Water: 10 + - type: microwaveMealRecipe id: RecipeTacoShell name: taco shell recipe diff --git a/Resources/Textures/Objects/Specific/Hydroponics/pea.rsi/dead.png b/Resources/Textures/Objects/Specific/Hydroponics/pea.rsi/dead.png new file mode 100644 index 0000000000000000000000000000000000000000..8fa7120b2964cbc3966c572209fe0d2a7ef7fdfa GIT binary patch literal 163 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJEKe85kch)?CvD_CpuodoE415y zVfKa1?A2DGOEfk;NDU0QQ+h*UZu|^JpyE4c-dr{Qd$CJiFv51piMQ{TY@fe(*RE8r zN3vaQ`?m&9I{m^}Xw?#to9|?<{+rz&_T|3-?|YU-D?|es7>qZwKV2EJ{%wnwD$pPX MPgg&ebxsLQ0N9y7(*OVf literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Hydroponics/pea.rsi/harvest.png b/Resources/Textures/Objects/Specific/Hydroponics/pea.rsi/harvest.png new file mode 100644 index 0000000000000000000000000000000000000000..d4f146d88a045f75a88aa7d3d4950f14817a33bb GIT binary patch literal 265 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ3!W~HArXg@6C_v{Cy4YkEo5Q} zfBjcIEccpS^M8@(jzq|Npw+-DBW>;LE4e?-%;r z5uS8dTr{PX!O+fO+HLXDse+OEp+yc4viAPp!EZIIeAslCy*ZG+ijM!VVu zXW=9O7<>&NHbfw}U;wT@4&-Y*7$*b1#{aIRgK46c%mv`;oFu<#EE+;4n+M}$kl0HY zvKMCVfz)G4;%hv_hKQZrt%x-T%npsRc~{5m%fl6w3gNvp{S>7>*Ed`*lNT22ff6fH$FofZMNYIO#H=grKc<2*VM4 zUXNx7)st{q$zk$@T&FkC5}GI!%ZRw*R7ZG_4v#hg0Iko{sZ)~(U>XQ*wF4NNkwIoX rYY2c6M6P+^h6CuSzyDYK?*V=QmQcuhOh{1p00000NkvXXu0mjfRWH$o literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Hydroponics/pea.rsi/seed.png b/Resources/Textures/Objects/Specific/Hydroponics/pea.rsi/seed.png new file mode 100644 index 0000000000000000000000000000000000000000..7f7931e440f12703caabd7ecc051bfaf25a8a655 GIT binary patch literal 335 zcmV-V0kHmwP)2_4y|Q8!tNpA-dPDgppWt8Hp)~iVyYt zXBWB6;9)JrAjfRQ@aXR`ob-;P&lrBbQ6<_DL`4Cymdi0)F?d)@F|do=CdOFe9e@nv zn62>AqymZ(;i5|$DA7*21LE`o7-k(>Ly-fB&IQ=O<9&Fr2KPR1Oz*c~6|Di&;& z^K;)*^LMh<#|%^7zxMksNM3MhJ6{MjZwUhf%T1*ySCjo~f%Y+Yy85}Sb4q9e0ONT! A<^TWy literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Hydroponics/pea.rsi/stage-2.png b/Resources/Textures/Objects/Specific/Hydroponics/pea.rsi/stage-2.png new file mode 100644 index 0000000000000000000000000000000000000000..b724176aa5c46dfa0f194ef4df7472762d3f3527 GIT binary patch literal 188 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJW=|K#kch*{2@ ztT|%VexDz)HS#ylzu>DyLA)wQH<}nv$m(05V&Qr5bc^?+pSSB%qQCrkYyWCV`+=)f z{|hBs^j9#4zy7;@*0O)|7YQ^pa+~j)EPCYlraYsdql`Cr4n5OI`S9th|EniVH3vPu l>bUzJ?*-ZAc5ng{gXCK4HFb;b%K)9j;OXk;vd$@?2>>D3OqKuu literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Hydroponics/pea.rsi/stage-3.png b/Resources/Textures/Objects/Specific/Hydroponics/pea.rsi/stage-3.png new file mode 100644 index 0000000000000000000000000000000000000000..fd9cfaaa3df94ac3f149f72e1e0d78cbbd7b2fee GIT binary patch literal 229 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJHJ&bxArXg@6C_v{Cy4YkEo5Q} zfBjcIEccpS^M8@(js%-YWf-$m);}CU3Bj+e!bL-k0WO7clqg#KZGJ4WbOSQ zcKM2?KQj*yi09R)Yj^ag-c4E3#k@hXS>9?(^R23&0- a3=AqRxl6WB*(wWkH-o3EpUXO@geCw2MOae+ literal 0 HcmV?d00001 -- 2.51.2