From: Ed <96445749+TheShuEd@users.noreply.github.com>
Date: Sat, 21 Sep 2024 19:54:56 +0000 (+0300)
Subject: Flora anomaly seeds (#31987)
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=2ea54b1913c73660ad056e12b891ebc5e99fb8e0;p=space-station-14.git

Flora anomaly seeds (#31987)

* content

* Update meta.json

* Update mobspawn.yml

* Update mobspawn.yml

* Update Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml

* Update Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml

* Update Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml

* Update Resources/Prototypes/Entities/Effects/mobspawn.yml

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
---

diff --git a/Resources/Locale/en-US/flavors/flavor-profiles.ftl b/Resources/Locale/en-US/flavors/flavor-profiles.ftl
index 3e7cde8449..0ba65217ef 100644
--- a/Resources/Locale/en-US/flavors/flavor-profiles.ftl
+++ b/Resources/Locale/en-US/flavors/flavor-profiles.ftl
@@ -20,6 +20,7 @@ flavor-base-fishy = fishy
 flavor-base-crabby = crabby
 flavor-base-cheesy = cheesy
 flavor-base-funny = funny
+flavor-base-strange = strange
 flavor-base-tingly = tingly
 flavor-base-acid = acidic
 flavor-base-leafy = leafy
diff --git a/Resources/Locale/en-US/nutrition/components/food-sequence.ftl b/Resources/Locale/en-US/nutrition/components/food-sequence.ftl
index 97dd7ffcc6..b21d2a8315 100644
--- a/Resources/Locale/en-US/nutrition/components/food-sequence.ftl
+++ b/Resources/Locale/en-US/nutrition/components/food-sequence.ftl
@@ -76,6 +76,7 @@ food-sequence-content-berries = berries
 food-sequence-content-spacemans-trumpet = spaceman's trupmet
 food-sequence-content-cherry = cherry
 food-sequence-content-snail = snail
+food-sequence-content-anomaly-berry = anomaly berry
 
 # BURGERS
 
@@ -116,6 +117,7 @@ food-sequence-burger-content-suppermatter = supper
 food-sequence-burger-content-hamster = hams
 food-sequence-burger-content-berries = berri
 food-sequence-burger-content-spacemans-trumpet = spacetrump
+food-sequence-burger-content-anomaly-berry = anom
 food-sequence-burger-content-extradimensional-orange = 3d
 food-sequence-burger-content-world-pea = peace
 
diff --git a/Resources/Locale/en-US/seeds/seeds.ftl b/Resources/Locale/en-US/seeds/seeds.ftl
index c8d524ba1d..1ca559db30 100644
--- a/Resources/Locale/en-US/seeds/seeds.ftl
+++ b/Resources/Locale/en-US/seeds/seeds.ftl
@@ -140,3 +140,5 @@ seeds-capfruit-name = capfruit
 seeds-capfruit-display-name = capfruit tree
 seeds-cherry-name = cherry
 seeds-cherry-display-name = cherry tree
+seeds-anomaly-berry-name = anomaly berry
+seeds-anomaly-berry-display-name = anomaly berries
diff --git a/Resources/Prototypes/Entities/Effects/mobspawn.yml b/Resources/Prototypes/Entities/Effects/mobspawn.yml
index c4396a775d..1489c26493 100644
--- a/Resources/Prototypes/Entities/Effects/mobspawn.yml
+++ b/Resources/Prototypes/Entities/Effects/mobspawn.yml
@@ -82,36 +82,28 @@
     tags:
       - HideContextMenu
   - type: AnimationPlayer
-  - type: RandomSpawner
+  - type: EntityTableSpawner
     deleteSpawnerAfterSpawn: false
-    rareChance: 0.1
-    offset: 0.3
-    chance: 1
-    prototypes:
-    - FoodAmbrosiaVulgaris
-    - FoodAloe
-    - FoodCabbage
-    - FoodCarrot
-    - FoodGalaxythistle
-    - FoodLemon
-    - FoodLime
-    - FoodPeaPod
-    - FoodPineapple
-    - FoodOnionRed
-    - FoodWatermelon
-    - FoodAmbrosiaVulgaris
-    - FoodAloe
-    - FoodCabbage
-    - FoodCarrot
-    - FoodGalaxythistle
-    - FoodLemon
-    - FoodLime
-    - FoodPeaPod
-    - FoodPineapple
-    - FoodOnionRed
-    - FoodWatermelon
-    - FoodGatfruit
-    - MobTomatoKiller
-    rarePrototypes:
-    - MobLuminousEntity
-    - MobLuminousObject
+    table: !type:NestedSelector
+      tableId: AnomalyFloraLootTable
+
+- type: entityTable
+  id: AnomalyFloraLootTable
+  table: !type:GroupSelector
+    children:
+    - id: FoodAmbrosiaVulgaris
+    - id: FoodAloe
+    - id: FoodCabbage
+    - id: FoodGalaxythistle
+    - id: FoodLemon
+    - id: FoodLime
+    - id: FoodPeaPod
+    - id: FoodPineapple
+    - id: FoodOnionRed
+    - id: FoodWatermelon
+    - id: FoodCherry
+    - id: MobTomatoKiller
+    - id: MobLuminousEntity
+    - id: MobLuminousObject
+    - id: FoodGatfruit # 0.007% spawn chance. 1 / 141
+      weight: 0.10
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
index 42fd0967ff..fa88f30074 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
@@ -2553,3 +2553,39 @@
     seedId: cherry
   - type: SpaceGarbage
   - type: BadFood
+
+- type: entity
+  name: anomaly berry
+  description: A strange blue fruit. Something about it doesn't seem right.
+  parent: FoodProduceBase
+  id: FoodAnomalyBerry
+  components:
+  - type: FlavorProfile
+    flavors:
+      - strange
+  - type: Sprite
+    sprite: Objects/Specific/Hydroponics/anomaly_berry.rsi
+    state: produce
+  - type: Produce
+    seedId: anomalyBerry
+  - type: Food
+    trash:
+    - EffectAnomalyFloraBulb # Random loot
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 5
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 2
+        - ReagentId: Vitamin
+          Quantity: 2
+        - ReagentId: Artifexium
+          Quantity: 1
+  - type: Tag
+    tags:
+    - Fruit
+  - type: FoodSequenceElement
+    entries:
+      Taco: AnomalyBerry
+      Burger: AnomalyBerryBurger
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml
index 6015a8bf01..1ad3dd5bdf 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml
@@ -725,3 +725,13 @@
       seedId: cherry
     - type: Sprite
       sprite: Objects/Specific/Hydroponics/cherry.rsi
+
+- type: entity
+  parent: SeedBase
+  name: packet of anomaly berry seeds
+  id: AnomalyBerrySeeds
+  components:
+    - type: Seed
+      seedId: anomalyBerry
+    - type: Sprite
+      sprite: Objects/Specific/Hydroponics/anomaly_berry.rsi
diff --git a/Resources/Prototypes/Entities/Structures/Specific/Anomaly/cores.yml b/Resources/Prototypes/Entities/Structures/Specific/Anomaly/cores.yml
index 71065a8e3d..315505b81e 100644
--- a/Resources/Prototypes/Entities/Structures/Specific/Anomaly/cores.yml
+++ b/Resources/Prototypes/Entities/Structures/Specific/Anomaly/cores.yml
@@ -147,6 +147,8 @@
   id: AnomalyCoreFlora
   suffix: Flora
   components:
+  - type: Seed
+    seedId: anomalyBerry
   - type: Sprite
     sprite: Structures/Specific/Anomalies/Cores/flora_core.rsi
   - type: PointLight
@@ -307,6 +309,8 @@
   id: AnomalyCoreFloraInert
   suffix: Flora, Inert
   components:
+  - type: Seed
+    seedId: anomalyBerry
   - type: Sprite
     sprite: Structures/Specific/Anomalies/Cores/flora_core.rsi
   - type: PointLight
diff --git a/Resources/Prototypes/Flavors/flavors.yml b/Resources/Prototypes/Flavors/flavors.yml
index 3f536c871a..a351e942e8 100644
--- a/Resources/Prototypes/Flavors/flavors.yml
+++ b/Resources/Prototypes/Flavors/flavors.yml
@@ -59,6 +59,11 @@
   flavorType: Base
   description: flavor-base-funny
 
+- type: flavor
+  id: strange
+  flavorType: Base
+  description: flavor-base-strange
+
 - type: flavor
   id: tingly
   flavorType: Base
diff --git a/Resources/Prototypes/Hydroponics/seeds.yml b/Resources/Prototypes/Hydroponics/seeds.yml
index 54c5c29d55..07e08ef75b 100644
--- a/Resources/Prototypes/Hydroponics/seeds.yml
+++ b/Resources/Prototypes/Hydroponics/seeds.yml
@@ -1951,3 +1951,34 @@
       Min: 1
       Max: 3
       PotencyDivisor: 40
+
+- type: seed
+  id: anomalyBerry
+  name: seeds-anomaly-berry-name
+  noun: seeds-noun-seeds
+  displayName: seeds-anomaly-berry-display-name
+  plantRsi: Objects/Specific/Hydroponics/anomaly_berry.rsi
+  packetPrototype: AnomalyBerrySeeds
+  productPrototypes:
+    - FoodAnomalyBerry
+  lifespan: 25
+  maturation: 12
+  production: 3
+  yield: 3
+  potency: 10
+  growthStages: 2
+  waterConsumption: 0.60
+  nutrientConsumption: 0.50
+  chemicals:
+    Artifexium:
+      Min: 1
+      Max: 1
+      PotencyDivisor: 4
+    Nutriment:
+      Min: 1
+      Max: 2
+      PotencyDivisor: 30
+    Vitamin:
+      Min: 1
+      Max: 2
+      PotencyDivisor: 40
diff --git a/Resources/Prototypes/Recipes/Cooking/food_sequence_element.yml b/Resources/Prototypes/Recipes/Cooking/food_sequence_element.yml
index 43d6fe8852..0654376442 100644
--- a/Resources/Prototypes/Recipes/Cooking/food_sequence_element.yml
+++ b/Resources/Prototypes/Recipes/Cooking/food_sequence_element.yml
@@ -1176,3 +1176,20 @@
   sprites:
   - sprite: Objects/Consumable/Food/Baked/cake.rsi
     state: suppermatter-shard
+
+
+# Anomaly berries
+
+- type: foodSequenceElement
+  id: AnomalyBerry
+  name: food-sequence-content-anomaly-berry
+  sprites:
+  - sprite: Objects/Specific/Hydroponics/anomaly_berry.rsi
+    state: produce
+
+- type: foodSequenceElement
+  id: AnomalyBerryBurger
+  name: food-sequence-burger-content-anomaly-berry
+  sprites:
+  - sprite: Objects/Specific/Hydroponics/anomaly_berry.rsi
+    state: produce
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/anomaly_berry.rsi/dead.png b/Resources/Textures/Objects/Specific/Hydroponics/anomaly_berry.rsi/dead.png
new file mode 100644
index 0000000000..e6082a5744
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/anomaly_berry.rsi/dead.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/anomaly_berry.rsi/harvest.png b/Resources/Textures/Objects/Specific/Hydroponics/anomaly_berry.rsi/harvest.png
new file mode 100644
index 0000000000..5a405285d7
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/anomaly_berry.rsi/harvest.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/anomaly_berry.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/anomaly_berry.rsi/meta.json
new file mode 100644
index 0000000000..7d86d10f9b
--- /dev/null
+++ b/Resources/Textures/Objects/Specific/Hydroponics/anomaly_berry.rsi/meta.json
@@ -0,0 +1,29 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Created by TheShuEd for Space Station 14",
+  "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/anomaly_berry.rsi/produce.png b/Resources/Textures/Objects/Specific/Hydroponics/anomaly_berry.rsi/produce.png
new file mode 100644
index 0000000000..ce9f83bd59
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/anomaly_berry.rsi/produce.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/anomaly_berry.rsi/seed.png b/Resources/Textures/Objects/Specific/Hydroponics/anomaly_berry.rsi/seed.png
new file mode 100644
index 0000000000..dd6f8ea52a
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/anomaly_berry.rsi/seed.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/anomaly_berry.rsi/stage-1.png b/Resources/Textures/Objects/Specific/Hydroponics/anomaly_berry.rsi/stage-1.png
new file mode 100644
index 0000000000..b6511c4e61
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/anomaly_berry.rsi/stage-1.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/anomaly_berry.rsi/stage-2.png b/Resources/Textures/Objects/Specific/Hydroponics/anomaly_berry.rsi/stage-2.png
new file mode 100644
index 0000000000..c3ba2f74e2
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/anomaly_berry.rsi/stage-2.png differ