From: lapatison <100279397+lapatison@users.noreply.github.com> Date: Sat, 25 Mar 2023 12:15:21 +0000 (+0300) Subject: Watermelon and grapes (#14587) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=ccbf8b5748fe0760d94cf4ddab8085d4c990335d;p=space-station-14.git Watermelon and grapes (#14587) --- diff --git a/Resources/Locale/en-US/flavors/flavor-profiles.ftl b/Resources/Locale/en-US/flavors/flavor-profiles.ftl index 01e3a7d2f1..15ef40d378 100644 --- a/Resources/Locale/en-US/flavors/flavor-profiles.ftl +++ b/Resources/Locale/en-US/flavors/flavor-profiles.ftl @@ -97,6 +97,7 @@ flavor-complex-raisins = like dried grapes flavor-complex-orange = like oranges flavor-complex-watermelon = like watermelon flavor-complex-garlic = like garlic +flavor-complex-grape = like grapes ## Complex foodstuffs (cooked foods, joke flavors, etc) diff --git a/Resources/Locale/en-US/seeds/seeds.ftl b/Resources/Locale/en-US/seeds/seeds.ftl index e3e2369461..8e22f046c8 100644 --- a/Resources/Locale/en-US/seeds/seeds.ftl +++ b/Resources/Locale/en-US/seeds/seeds.ftl @@ -71,3 +71,7 @@ seeds-rice-name = rice seeds-rice-display-name = rice stalks seeds-soybeans-name = soybeans seeds-soybeans-display-name = soy plant +seeds-watermelon-name = watermelon +seeds-watermelon-display-name = watermelon plant +seeds-grape-name = grape +seeds-grape-display-name = grape plant diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml b/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml index 3c1e5db6f1..eaa8ae34cb 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml @@ -132,7 +132,7 @@ sprite: Objects/Specific/Service/vending_machine_restock.rsi state: base product: CrateVendingMachineRestockSeedsFilled - cost: 2700 + cost: 3000 category: Hydroponics group: market diff --git a/Resources/Prototypes/Catalog/Fills/Crates/botany.yml b/Resources/Prototypes/Catalog/Fills/Crates/botany.yml index 6b3f29ff17..0f70bcb8a5 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/botany.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/botany.yml @@ -105,3 +105,7 @@ amount: 1 - id: SoybeanSeeds amount: 1 + - id: GrapeSeeds + amount: 1 + - id: WatermelonSeeds + amount: 1 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/seeds.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/seeds.yml index b18b3ddfb8..198af4db56 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/seeds.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/seeds.yml @@ -14,6 +14,7 @@ EggySeeds: 5 GalaxythistleSeeds: 3 GarlicSeeds: 3 + GrapeSeeds: 5 LemonSeeds: 5 LimeSeeds: 5 LingzhiSeeds: 3 @@ -29,3 +30,4 @@ TomatoSeeds: 5 TowercapSeeds: 5 WheatSeeds: 5 + WatermelonSeeds: 5 diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/meals.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/meals.yml index ccd9f2400c..06731cf55a 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/meals.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/meals.yml @@ -512,3 +512,32 @@ - ReagentId: CapsaicinOil Quantity: 6 # What do Europeans eat instead of enchiladas? 25.4 millimeter-iladas. + + +- type: entity + name: melon fruit bowl + parent: FoodMealBase + id: FoodSaladWatermelonFruitBowl + description: The only salad where you can eat the bowl. + components: + - type: FlavorProfile + flavors: + - fruity + - sour + - type: Sprite + state: melonfruitbowl + - type: SolutionContainerManager + solutions: + food: + maxvol: 65 + reagents: + - ReagentId: Nutriment + Quantity: 30 + - ReagentId: Vitamin + Quantity: 15 + - ReagentId: Water + Quantity: 5 + - ReagentId: Bicaridine + Quantity: 5 + - ReagentId: Kelotane + Quantity: 5 diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml index 631e9aba59..d1493f3a0c 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml @@ -1027,3 +1027,145 @@ reagents: - ReagentId: MilkSoy Quantity: 5 + +- type: entity + name: watermelon + parent: FoodProduceBase + id: FoodWatermelon + description: Round green object that you can slice and eat. + components: + - type: Item + size: 10 + - type: FlavorProfile + flavors: + - watermelon + - type: SolutionContainerManager + solutions: + food: + maxVol: 25 + reagents: + - ReagentId: Nutriment + Quantity: 10 + - ReagentId: Vitamin + Quantity: 5 + - ReagentId: Water + Quantity: 10 + - type: Sprite + sprite: Objects/Specific/Hydroponics/watermelon.rsi + - type: Produce + seedId: watermelon + - type: Extractable + juiceSolution: + reagents: + - ReagentId: JuiceWatermelon + Quantity: 20 + - type: DamageOnLand + damage: + types: + Blunt: 1 + - type: DamageOtherOnHit + damage: + types: + Blunt: 1 + - type: Damageable + damageContainer: Biological + - type: DamageOnHighSpeedImpact + minimumSpeed: 0.1 + damage: + types: + Blunt: 1 + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 1 + behaviors: + - !type:PlaySoundBehavior + sound: + collection: desecration + - !type:SpawnEntitiesBehavior + spawn: + PuddleWatermelon: + min: 1 + max: 1 + - !type:DoActsBehavior + acts: [ "Destruction" ] + - type: SliceableFood + count: 5 + slice: FoodWatermelonSlice + +- type: entity + name: watermelon + id: PuddleWatermelon + parent: PuddleBase + description: Splat. + components: + - type: Sprite + sprite: Fluids/tomato_splat.rsi + state: puddle-0 + netsync: false + - type: SolutionContainerManager + solutions: + puddle: + maxVol: 1000 + reagents: + - ReagentId: JuiceWatermelon + Quantity: 20 + +- type: entity + name: watermelon slice + parent: ProduceSliceBase + id: FoodWatermelonSlice + description: Juicy green and red slice. + components: + - type: Item + size: 2 + - type: FlavorProfile + flavors: + - watermelon + - type: Sprite + sprite: Objects/Specific/Hydroponics/watermelon.rsi + - type: SolutionContainerManager + solutions: + food: + maxVol: 5 + reagents: + - ReagentId: Nutriment + Quantity: 2 + - ReagentId: Vitamin + Quantity: 1 + - ReagentId: Water + Quantity: 2 + - type: Extractable + juiceSolution: + reagents: + - ReagentId: JuiceWatermelon + Quantity: 4 + +- type: entity + name: grapes + parent: FoodProduceBase + id: FoodGrape + description: The food of emperors, Space France inhabitants (usually as wine) and soccer moms. One day it could be used in wine production for the bartender if he ever runs out. + components: + - type: FlavorProfile + flavors: + - grape + - type: SolutionContainerManager + solutions: + food: + maxVol: 9 + reagents: + - ReagentId: Nutriment + Quantity: 5 + - ReagentId: Vitamin + Quantity: 4 + - type: Sprite + sprite: Objects/Specific/Hydroponics/grape.rsi + - type: Produce + seedId: grape + - type: Extractable + juiceSolution: + reagents: + - ReagentId: JuiceGrape + Quantity: 10 diff --git a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml index c4b0e26476..6f60018f80 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml @@ -365,3 +365,24 @@ seedId: onionred - type: Sprite sprite: Objects/Specific/Hydroponics/onion_red.rsi + +- type: entity + parent: SeedBase + name: packet of watermelon seeds + id: WatermelonSeeds + components: + - type: Seed + seedId: watermelon + - type: Sprite + sprite: Objects/Specific/Hydroponics/watermelon.rsi + +- type: entity + parent: SeedBase + name: packet of grape seeds + id: GrapeSeeds + components: + - type: Seed + seedId: grape + - type: Sprite + sprite: Objects/Specific/Hydroponics/grape.rsi + \ No newline at end of file diff --git a/Resources/Prototypes/Flavors/flavors.yml b/Resources/Prototypes/Flavors/flavors.yml index 0cc8713cd4..c820b9f01a 100644 --- a/Resources/Prototypes/Flavors/flavors.yml +++ b/Resources/Prototypes/Flavors/flavors.yml @@ -659,6 +659,11 @@ flavorType: Complex description: flavor-complex-watermelon +- type: flavor + id: grape + flavorType: Complex + description: flavor-complex-grape + - type: flavor id: garlic flavorType: Complex diff --git a/Resources/Prototypes/Hydroponics/seeds.yml b/Resources/Prototypes/Hydroponics/seeds.yml index bf54b9ca06..eaf3c75898 100644 --- a/Resources/Prototypes/Hydroponics/seeds.yml +++ b/Resources/Prototypes/Hydroponics/seeds.yml @@ -866,3 +866,55 @@ Min: 1 Max: 5 PotencyDivisor: 20 + +- type: seed + id: grape + name: seeds-grape-name + noun: seeds-noun-seeds + displayName: seeds-grape-display-name + plantRsi: Objects/Specific/Hydroponics/grape.rsi + productPrototypes: + - FoodGrape + lifespan: 50 + maturation: 3 + production: 5 + yield: 4 + potency: 10 + growthStages: 2 + chemicals: + Nutriment: + Min: 1 + Max: 5 + PotencyDivisor: 20 + Vitamin: + Min: 1 + Max: 4 + PotencyDivisor: 25 + +- type: seed + id: watermelon + name: seeds-watermelon-name + noun: seeds-noun-seeds + displayName: seeds-watermelon-display-name + plantRsi: Objects/Specific/Hydroponics/watermelon.rsi + productPrototypes: + - FoodWatermelon + lifespan: 55 + maturation: 15 + production: 1 + yield: 1 + potency: 1 + idealLight: 8 + chemicals: + Nutriment: + Min: 1 + Max: 10 + PotencyDivisor: 10 + Water: + Min: 1 + Max: 10 + PotencyDivisor: 10 + Vitamin: + Min: 1 + Max: 5 + PotencyDivisor: 20 diff --git a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml index 6c2b8d8a1f..a4c4364003 100644 --- a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml +++ b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml @@ -824,7 +824,7 @@ - type: microwaveMealRecipe id: RecipeAmanitaPie - name: amanita pie + name: amanita pie recipe result: FoodPieAmanita time: 15 solids: @@ -842,6 +842,18 @@ solids: FoodCakePlain: 1 +- type: microwaveMealRecipe + id: RecipeGrapeTart + name: grape tart recipe + result: FoodTartGrape + time: 15 + reagents: + Sugar: 5 + Milk: 5 + solids: + FoodDoughPie: 1 + FoodGrape: 3 + #Donks i guess - type: microwaveMealRecipe id: RecipeWarmDonkpocket @@ -1047,6 +1059,43 @@ FoodCabbage: 1 FoodGarlic: 1 +- type: microwaveMealRecipe + id: RecipeFruitSalad + name: fruit salad recipe + result: FoodSaladFruit + time: 5 + solids: + FoodBowlBig: 1 + FoodOrange: 1 + FoodApple: 1 + FoodGrape: 1 + FoodWatermelonSlice: 2 + +- type: microwaveMealRecipe + id: RecipeJungleSalad + name: jungle salad recipe + result: FoodSaladJungle + time: 5 + solids: + FoodBowlBig: 1 + FoodBanana: 1 + FoodApple: 1 + FoodGrape: 1 + FoodWatermelonSlice: 2 + +- type: microwaveMealRecipe + id: RecipeWatermelonFruitBowlSalad + name: watermelon fruit bowl recipe + result: FoodSaladWatermelonFruitBowl + time: 5 + solids: + FoodWatermelon: 1 + FoodApple: 1 + FoodBanana: 1 + FoodLemon: 1 + FoodOrange: 1 + FoodAmbrosiaVulgaris: 1 + # NOT ACTUAL FOOD - type: microwaveMealRecipe diff --git a/Resources/Textures/Objects/Consumable/Food/meals.rsi/melonfruitbowl.png b/Resources/Textures/Objects/Consumable/Food/meals.rsi/melonfruitbowl.png new file mode 100644 index 0000000000..892c301592 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/meals.rsi/melonfruitbowl.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/meals.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/meals.rsi/meta.json index 2dd0ab1795..9db6ebb819 100644 --- a/Resources/Textures/Objects/Consumable/Food/meals.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Food/meals.rsi/meta.json @@ -139,6 +139,9 @@ { "name": "stewedsoymeat" }, + { + "name": "melonfruitbowl" + }, { "name": "yakiimo" } diff --git a/Resources/Textures/Objects/Specific/Hydroponics/grape.rsi/dead.png b/Resources/Textures/Objects/Specific/Hydroponics/grape.rsi/dead.png new file mode 100644 index 0000000000..b2bfbd028d Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/grape.rsi/dead.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/grape.rsi/harvest.png b/Resources/Textures/Objects/Specific/Hydroponics/grape.rsi/harvest.png new file mode 100644 index 0000000000..08b3df4f47 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/grape.rsi/harvest.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/grape.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/grape.rsi/meta.json new file mode 100644 index 0000000000..7ee8baf2a7 --- /dev/null +++ b/Resources/Textures/Objects/Specific/Hydroponics/grape.rsi/meta.json @@ -0,0 +1,29 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/commit/b459ea3fdee965bdc3e93e7983ad7fa610d05c12", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "dead" + }, + { + "name": "harvest" + }, + { + "name": "produce" + }, + { + "name": "seed" + }, + { + "name": "stage-1" + }, + { + "name": "stage-2" + } + ] +} diff --git a/Resources/Textures/Objects/Specific/Hydroponics/grape.rsi/produce.png b/Resources/Textures/Objects/Specific/Hydroponics/grape.rsi/produce.png new file mode 100644 index 0000000000..c681fb8ff1 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/grape.rsi/produce.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/grape.rsi/seed.png b/Resources/Textures/Objects/Specific/Hydroponics/grape.rsi/seed.png new file mode 100644 index 0000000000..892e7ae0f2 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/grape.rsi/seed.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/grape.rsi/stage-1.png b/Resources/Textures/Objects/Specific/Hydroponics/grape.rsi/stage-1.png new file mode 100644 index 0000000000..b26fc32c2c Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/grape.rsi/stage-1.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/grape.rsi/stage-2.png b/Resources/Textures/Objects/Specific/Hydroponics/grape.rsi/stage-2.png new file mode 100644 index 0000000000..593a494e48 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/grape.rsi/stage-2.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/watermelon.rsi/dead.png b/Resources/Textures/Objects/Specific/Hydroponics/watermelon.rsi/dead.png new file mode 100644 index 0000000000..a3896d57c1 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/watermelon.rsi/dead.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/watermelon.rsi/harvest.png b/Resources/Textures/Objects/Specific/Hydroponics/watermelon.rsi/harvest.png new file mode 100644 index 0000000000..7c718ed6af Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/watermelon.rsi/harvest.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/watermelon.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/watermelon.rsi/meta.json new file mode 100644 index 0000000000..37bc00be88 --- /dev/null +++ b/Resources/Textures/Objects/Specific/Hydroponics/watermelon.rsi/meta.json @@ -0,0 +1,44 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/commit/b459ea3fdee965bdc3e93e7983ad7fa610d05c12", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "dead" + }, + { + "name": "harvest" + }, + { + "name": "produce" + }, + { + "name": "seed" + }, + { + "name": "stage-1" + }, + { + "name": "stage-2" + }, + { + "name": "stage-3" + }, + { + "name": "stage-4" + }, + { + "name": "stage-5" + }, + { + "name": "stage-6" + }, + { + "name": "slice" + } + ] +} diff --git a/Resources/Textures/Objects/Specific/Hydroponics/watermelon.rsi/produce.png b/Resources/Textures/Objects/Specific/Hydroponics/watermelon.rsi/produce.png new file mode 100644 index 0000000000..61e3fb4eaf Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/watermelon.rsi/produce.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/watermelon.rsi/seed.png b/Resources/Textures/Objects/Specific/Hydroponics/watermelon.rsi/seed.png new file mode 100644 index 0000000000..86ff248222 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/watermelon.rsi/seed.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/watermelon.rsi/slice.png b/Resources/Textures/Objects/Specific/Hydroponics/watermelon.rsi/slice.png new file mode 100644 index 0000000000..2c76c9a361 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/watermelon.rsi/slice.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/watermelon.rsi/stage-1.png b/Resources/Textures/Objects/Specific/Hydroponics/watermelon.rsi/stage-1.png new file mode 100644 index 0000000000..f926a279dc Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/watermelon.rsi/stage-1.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/watermelon.rsi/stage-2.png b/Resources/Textures/Objects/Specific/Hydroponics/watermelon.rsi/stage-2.png new file mode 100644 index 0000000000..4213fc3225 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/watermelon.rsi/stage-2.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/watermelon.rsi/stage-3.png b/Resources/Textures/Objects/Specific/Hydroponics/watermelon.rsi/stage-3.png new file mode 100644 index 0000000000..fe04965157 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/watermelon.rsi/stage-3.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/watermelon.rsi/stage-4.png b/Resources/Textures/Objects/Specific/Hydroponics/watermelon.rsi/stage-4.png new file mode 100644 index 0000000000..74315813c2 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/watermelon.rsi/stage-4.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/watermelon.rsi/stage-5.png b/Resources/Textures/Objects/Specific/Hydroponics/watermelon.rsi/stage-5.png new file mode 100644 index 0000000000..1eb32e8bec Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/watermelon.rsi/stage-5.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/watermelon.rsi/stage-6.png b/Resources/Textures/Objects/Specific/Hydroponics/watermelon.rsi/stage-6.png new file mode 100644 index 0000000000..fc47c27bb6 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/watermelon.rsi/stage-6.png differ