New crop: Cotton (#21536)

* Add cotton plant

* Adddescription and tag to cotton bal allow moth eat it

* Fix typo. Add cotton seed into MegaSeed

* Fix typo

* Fix typo

* Fix cottonbol component typo

* Fix the amount of cotton that bol gives

* Adding correct component to make cotton bol edible

* Change cotton bol parent to see if it is edible

* Adding flavor to cotton bol, and fix typo

* Replace image

* fixing plant image position

* Increase the Megaseed restock crate price to avoid money farming loop hole

diff --git a/Resources/Locale/en-US/flavors/flavor-profiles.ftl b/Resources/Locale/en-US/flavors/flavor-profiles.ftl
index a17b9019d5b4e175cc21c5b82290ac750dece0bf..3998429d1ce2f77def0360f6d014f5340bd75bcd 100644 (file)
--- a/Resources/Locale/en-US/flavors/flavor-profiles.ftl
+++ b/Resources/Locale/en-US/flavors/flavor-profiles.ftl
@@ -99,6 +99,7 @@ flavor-complex-tomato = like tomatoes
 flavor-complex-corn = like corn
 flavor-complex-banana = like bananas
 flavor-complex-apple = like apples
+flavor-complex-cotton = like cottons
 flavor-complex-bungo = like bungo
 flavor-complex-raisins = like dried grapes
 flavor-complex-orange = like oranges

diff --git a/Resources/Locale/en-US/seeds/seeds.ftl b/Resources/Locale/en-US/seeds/seeds.ftl
index 890d2926603323d103aa03854c4741fc5f577b43..64b5e0d4f724990cce7550e41b51bdb49efe30ef 100644 (file)
--- a/Resources/Locale/en-US/seeds/seeds.ftl
+++ b/Resources/Locale/en-US/seeds/seeds.ftl
@@ -101,3 +101,5 @@ seeds-pea-name = pea
 seeds-pea-display-name = pea vines
 seeds-pumpkin-name = pumpkin
 seeds-pumpkin-display-name = pumpkins
+seeds-cotton-name = cotton
+seeds-cotton-display-name = cotton plant
\ No newline at end of file

diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml b/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml
index 0d38d1088ea640967087ac8e2ba7e090e39b3895..cfe69d98d2202a63035a3006147a310abc98bc72 100644 (file)
--- 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: 3250
+  cost: 3375
   category: Hydroponics
   group: market
 

diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/seeds.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/seeds.yml
index c48100f4ec0bf6ce054f5e9fa5637644157a0afd..05e3ae0eb0e791c9de07a402ae0c7d4d5b237421 100644 (file)
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/seeds.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/seeds.yml
@@ -35,5 +35,6 @@
     CocoaSeeds: 3
     BerrySeeds: 5
     PeaSeeds: 5
+    CottonSeeds: 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 6a19f801a6a760591449fa7e7a857f58fa4913cf..8232a34b5967d071b356097d7a17f43ddbbbc1a2 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
@@ -1636,3 +1636,31 @@
   - type: Tag
     tags:
     - Fruit
+
+- type: entity
+  name: cotton bol
+  description: Moth people's favorite snack, and just as fluffy as them.
+  id: CottonBol
+  parent: FoodProduceBase
+  components:
+  - type: Sprite
+    sprite: Objects/Specific/Hydroponics/cotton.rsi
+  - type: FlavorProfile
+    flavors:
+      - cotton
+  - type: Food
+    requiresSpecialDigestion: true
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        reagents:
+        - ReagentId: Fiber
+          Quantity: 10
+  - type: Log
+    spawnedPrototype: MaterialCotton1
+    spawnCount: 2
+  - type: Produce
+    seedId: cotton
+  - type: Tag
+    tags:
+    - ClothMade

diff --git a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml
index a731a12997ca087cb107ccffbe1fc67622efeb57..b225d3afdd8c4cb43e88f1ad4b3da3377ba09da0 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml
@@ -519,3 +519,13 @@
       seedId: pumpkin
     - type: Sprite
       sprite: Objects/Specific/Hydroponics/pumpkin.rsi
+
+- type: entity
+  parent: SeedBase
+  name: packet of cotton seeds
+  id: CottonSeeds
+  components:
+    - type: Seed
+      seedId: cotton
+    - type: Sprite
+      sprite: Objects/Specific/Hydroponics/cotton.rsi

diff --git a/Resources/Prototypes/Hydroponics/seeds.yml b/Resources/Prototypes/Hydroponics/seeds.yml
index 20d3f2d8537f6fc64acb25fcd72e048ed366fce2..2c0a0c87c52ed0bacab729d71f7e2c4e0f1b7f97 100644 (file)
--- a/Resources/Prototypes/Hydroponics/seeds.yml
+++ b/Resources/Prototypes/Hydroponics/seeds.yml
@@ -1357,3 +1357,27 @@
       Min: 1
       Max: 5
       PotencyDivisor: 20
+
+- type: seed
+  id: cotton
+  name: seeds-cotton-name
+  noun: seeds-noun-seeds
+  displayName: seeds-cotton-display-name
+  plantRsi: Objects/Specific/Hydroponics/cotton.rsi
+  packetPrototype: CottonSeeds
+  productPrototypes:
+    - CottonBol
+  lifespan: 25
+  maturation: 8
+  production: 3
+  yield: 3
+  potency: 5
+  idealLight: 8
+  growthStages: 3
+  waterConsumption: 0.60
+  chemicals:
+    Fiber:
+      Min: 5
+      Max: 10
+      PotencyDivisor: 20
+

diff --git a/Resources/Textures/Objects/Specific/Hydroponics/cotton.rsi/dead.png b/Resources/Textures/Objects/Specific/Hydroponics/cotton.rsi/dead.png
new file mode 100644 (file)
index 0000000..490e558
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/cotton.rsi/dead.png differ

diff --git a/Resources/Textures/Objects/Specific/Hydroponics/cotton.rsi/harvest.png b/Resources/Textures/Objects/Specific/Hydroponics/cotton.rsi/harvest.png
new file mode 100644 (file)
index 0000000..9808402
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/cotton.rsi/harvest.png differ

diff --git a/Resources/Textures/Objects/Specific/Hydroponics/cotton.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/cotton.rsi/meta.json
new file mode 100644 (file)
index 0000000..d7f18a4
--- /dev/null
+++ b/Resources/Textures/Objects/Specific/Hydroponics/cotton.rsi/meta.json
@@ -0,0 +1,32 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e245d374b2976c73d0aff37cf4a443d2e75c2f57",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "dead"
+    },
+    {
+      "name": "harvest"
+    },
+    {
+      "name": "produce"
+    },
+    {
+      "name": "seed"
+    },
+    {
+      "name": "stage-1"
+    },
+    {
+      "name": "stage-2"
+    },
+    {
+      "name": "stage-3"
+    }
+  ]
+}

diff --git a/Resources/Textures/Objects/Specific/Hydroponics/cotton.rsi/produce.png b/Resources/Textures/Objects/Specific/Hydroponics/cotton.rsi/produce.png
new file mode 100644 (file)
index 0000000..24e84bf
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/cotton.rsi/produce.png differ

diff --git a/Resources/Textures/Objects/Specific/Hydroponics/cotton.rsi/seed.png b/Resources/Textures/Objects/Specific/Hydroponics/cotton.rsi/seed.png
new file mode 100644 (file)
index 0000000..0fb8ed3
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/cotton.rsi/seed.png differ

diff --git a/Resources/Textures/Objects/Specific/Hydroponics/cotton.rsi/stage-1.png b/Resources/Textures/Objects/Specific/Hydroponics/cotton.rsi/stage-1.png
new file mode 100644 (file)
index 0000000..0b49286
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/cotton.rsi/stage-1.png differ

diff --git a/Resources/Textures/Objects/Specific/Hydroponics/cotton.rsi/stage-2.png b/Resources/Textures/Objects/Specific/Hydroponics/cotton.rsi/stage-2.png
new file mode 100644 (file)
index 0000000..616d32c
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/cotton.rsi/stage-2.png differ

diff --git a/Resources/Textures/Objects/Specific/Hydroponics/cotton.rsi/stage-3.png b/Resources/Textures/Objects/Specific/Hydroponics/cotton.rsi/stage-3.png
new file mode 100644 (file)
index 0000000..77ab34f
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/cotton.rsi/stage-3.png differ