]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
New plant mutation: Pyrotton (#27200)
authorUbaser <134914314+UbaserB@users.noreply.github.com>
Sun, 28 Apr 2024 11:07:36 +0000 (21:07 +1000)
committerGitHub <noreply@github.com>
Sun, 28 Apr 2024 11:07:36 +0000 (13:07 +0200)
* WIP

* sprites n stuff

* flavour

* maybe fix

* add stack

* fix parent

20 files changed:
Resources/Locale/en-US/flavors/flavor-profiles.ftl
Resources/Locale/en-US/seeds/seeds.ftl
Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
Resources/Prototypes/Entities/Objects/Materials/materials.yml
Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml
Resources/Prototypes/Flavors/flavors.yml
Resources/Prototypes/Hydroponics/seeds.yml
Resources/Prototypes/Stacks/Materials/materials.yml
Resources/Textures/Objects/Materials/materials.rsi/meta.json
Resources/Textures/Objects/Materials/materials.rsi/pyrotton.png [new file with mode: 0644]
Resources/Textures/Objects/Materials/materials.rsi/pyrotton_2.png [new file with mode: 0644]
Resources/Textures/Objects/Materials/materials.rsi/pyrotton_3.png [new file with mode: 0644]
Resources/Textures/Objects/Specific/Hydroponics/pyrotton.rsi/dead.png [new file with mode: 0644]
Resources/Textures/Objects/Specific/Hydroponics/pyrotton.rsi/harvest.png [new file with mode: 0644]
Resources/Textures/Objects/Specific/Hydroponics/pyrotton.rsi/meta.json [new file with mode: 0644]
Resources/Textures/Objects/Specific/Hydroponics/pyrotton.rsi/produce.png [new file with mode: 0644]
Resources/Textures/Objects/Specific/Hydroponics/pyrotton.rsi/seed.png [new file with mode: 0644]
Resources/Textures/Objects/Specific/Hydroponics/pyrotton.rsi/stage-1.png [new file with mode: 0644]
Resources/Textures/Objects/Specific/Hydroponics/pyrotton.rsi/stage-2.png [new file with mode: 0644]
Resources/Textures/Objects/Specific/Hydroponics/pyrotton.rsi/stage-3.png [new file with mode: 0644]

index 41b575b7d63a50e26e96d277b994a5dbfd242c5c..f861624fb650e6b2aa1fa0718a996e92e58be24d 100644 (file)
@@ -168,6 +168,7 @@ flavor-complex-light = like a light gone out
 flavor-complex-profits = like profits
 flavor-complex-fishops = like the dreaded fishops
 flavor-complex-violets = like violets
+flavor-complex-pyrotton = like a burning mouth
 flavor-complex-mothballs = like mothballs
 flavor-complex-paint-thinner = like paint thinner
 
index bff317a7e6781ae1c58fee8ca9c4c9e9437e0a72..4a125b172421ae3c1cf5f31babfa9012efa80570 100644 (file)
@@ -113,3 +113,5 @@ seeds-pumpkin-name = pumpkin
 seeds-pumpkin-display-name = pumpkins
 seeds-cotton-name = cotton
 seeds-cotton-display-name = cotton plant
+seeds-pyrotton-name = pyrotton
+seeds-pyrotton-display-name = pyrotton plant
index 302c0d98b66dc62a4474408e3e1d272fa7ed4643..1bd895829bde0508081a882fb3a38f272b249965 100644 (file)
     tags:
     - ClothMade
     - CottonBoll
+
+- type: entity
+  name: pyrotton boll
+  description: This will probably set you on fire.
+  id: PyrottonBol
+  parent: FoodProduceBase
+  components:
+  - type: Sprite
+    sprite: Objects/Specific/Hydroponics/pyrotton.rsi
+  - type: FlavorProfile
+    flavors:
+      - pyrotton
+  - type: Food
+    requiresSpecialDigestion: true
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        reagents:
+        - ReagentId: Fiber
+          Quantity: 5
+        - ReagentId: Phlogiston
+          Quantity: 5
+  - type: Log
+    spawnedPrototype: MaterialPyrotton1
+    spawnCount: 2
+  - type: Produce
+    seedId: pyrotton
+  - type: Tag
+    tags:
+    - ClothMade
+    - CottonBoll
+  - type: Extractable
+    grindableSolutionName: food
index d11df5d94e8a4638cccaa9e1d079c4b580413adf..f4ac9e7ee14b5a0d2a75909e72bca0654f3334ac 100644 (file)
   - type: Stack
     count: 1
 
+- type: entity
+  parent: MaterialBase
+  id: MaterialPyrotton
+  name: pyrotton
+  suffix: Full
+  components:
+  - type: Stack
+    stackType: Pyrotton
+    baseLayer: base
+    layerStates:
+    - pyrotton
+    - pyrotton_2
+    - pyrotton_3
+  - type: Sprite
+    state: pyrotton_3
+    layers:
+    - state: pyrotton_3
+      map: ["base"]
+  - type: Appearance
+  - type: Food
+    requiresSpecialDigestion: true
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 10
+        reagents:
+        - ReagentId: Fiber
+          Quantity: 5
+        - ReagentId: Phlogiston
+          Quantity: 5
+  - type: Extractable
+    juiceSolution:
+      reagents:
+      - ReagentId: Fiber
+        Quantity: 3
+      - ReagentId: Phlogiston
+        Quantity: 3
+  - type: Tag
+    tags:
+      - ClothMade
+      - RawMaterial
+
+- type: entity
+  parent: MaterialPyrotton
+  id: MaterialPyrotton1
+  suffix: Single
+  components:
+  - type: Sprite
+    state: pyrotton
+  - type: Stack
+    count: 1
+
 - type: entity
   parent: MaterialBase
   id: MaterialBananium
     materialComposition:
       Gunpowder: 100
   - type: Item
-    size: Tiny
\ No newline at end of file
+    size: Tiny
index 0a084dc2463903d7b0109400c314a5102c4607ca..6e5adac65b3eaa19a084a2e4f9a339880ca52486 100644 (file)
       seedId: cotton
     - type: Sprite
       sprite: Objects/Specific/Hydroponics/cotton.rsi
+
+- type: entity
+  parent: SeedBase
+  name: packet of pyrotton seeds
+  id: PyrottonSeeds
+  components:
+    - type: Seed
+      seedId: pyrotton
+    - type: Sprite
+      sprite: Objects/Specific/Hydroponics/pyrotton.rsi
index 25ed9d337205c3a7fd425c9112ec977ddb1eabca..47a1bc71aa6d575737bb8225d821e16421bde1b0 100644 (file)
   flavorType: Complex
   description: flavor-complex-violets
 
+- type: flavor
+  id: pyrotton
+  flavorType: Complex
+  description: flavor-complex-pyrotton
+
 - type: flavor
   id: mothballs
   flavorType: Complex
 - type: flavor
   id: paintthinner
   flavorType: Complex
-  description: flavor-complex-paint-thinner
+  description: flavor-complex-paint-thinner
\ No newline at end of file
index 053300b9863212a86afbc598f91944b95dba3ec9..c2a5e943b16e070a6f6371f21587702e23efb466 100644 (file)
   packetPrototype: CottonSeeds
   productPrototypes:
     - CottonBol
+  mutationPrototypes:
+    - pyrotton
   lifespan: 25
   maturation: 8
   production: 3
       Max: 10
       PotencyDivisor: 20
 
+- type: seed
+  id: pyrotton
+  name: seeds-pyrotton-name
+  noun: seeds-noun-seeds
+  displayName: seeds-pyrotton-display-name
+  plantRsi: Objects/Specific/Hydroponics/pyrotton.rsi
+  packetPrototype: PyrottonSeeds
+  productPrototypes:
+    - PyrottonBol
+  lifespan: 25
+  maturation: 8
+  production: 3
+  yield: 2
+  potency: 5
+  idealLight: 8
+  growthStages: 3
+  waterConsumption: 0.80
+  chemicals:
+    Fiber:
+      Min: 5
+      Max: 10
+      PotencyDivisor: 20
+    Phlogiston:
+      Min: 4
+      Max: 8
+      PotencyDivisor: 30
index d20bb2f3473aa5c063cae354b1a4287c36e860b4..cc963dde59a4619a9cf8d71bbf0d64050090c1ea 100644 (file)
   maxCount: 30
   itemSize: 1
 
+- type: stack
+  id: Pyrotton
+  name: pyrotton
+  icon: { sprite: /Textures/Objects/Materials/materials.rsi, state: pyrotton }
+  spawn: MaterialPyrotton1
+  maxCount: 30
+  itemSize: 1
+
 - type: stack
   id: Bananium
   name: bananium
   icon: { sprite: /Textures/Objects/Misc/reagent_fillings.rsi, state: powderpile }
   spawn: MaterialGunpowder
   maxCount: 60
-  itemSize: 1
\ No newline at end of file
+  itemSize: 1
index f0307208e92caaa50e733fc9c4a71d0cf399eeca..78f497c0cda6a1f5c5ee3757e6100a2a27e5454a 100644 (file)
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24 , bear pelt remade by Alekshhh, wood sprite modified by MisterMecky, wood_2 and wood_3 made by MisterMecky based on wood sprite, cardboard sprites made by MisterMecky, bananium, bananium_1 and peel made by brainfood1183 (github) for ss14",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24 , bear pelt remade by Alekshhh, wood sprite modified by MisterMecky, wood_2 and wood_3 made by MisterMecky based on wood sprite, cardboard sprites made by MisterMecky, bananium, bananium_1 and peel made by brainfood1183 (github) for ss14. Pyrotton sprites are drawn by Ubaser, using the cotton material sprites as a base.",
   "size": {
     "x": 32,
     "y": 32
     {
       "name": "cotton_3"
     },
+    {
+      "name": "pyrotton"
+    },
+    {
+      "name": "pyrotton_2"
+    },
+    {
+      "name": "pyrotton_3"
+    },
     {
       "name": "diamond"
     },
diff --git a/Resources/Textures/Objects/Materials/materials.rsi/pyrotton.png b/Resources/Textures/Objects/Materials/materials.rsi/pyrotton.png
new file mode 100644 (file)
index 0000000..daa6701
Binary files /dev/null and b/Resources/Textures/Objects/Materials/materials.rsi/pyrotton.png differ
diff --git a/Resources/Textures/Objects/Materials/materials.rsi/pyrotton_2.png b/Resources/Textures/Objects/Materials/materials.rsi/pyrotton_2.png
new file mode 100644 (file)
index 0000000..fcd2689
Binary files /dev/null and b/Resources/Textures/Objects/Materials/materials.rsi/pyrotton_2.png differ
diff --git a/Resources/Textures/Objects/Materials/materials.rsi/pyrotton_3.png b/Resources/Textures/Objects/Materials/materials.rsi/pyrotton_3.png
new file mode 100644 (file)
index 0000000..072ba2c
Binary files /dev/null and b/Resources/Textures/Objects/Materials/materials.rsi/pyrotton_3.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/pyrotton.rsi/dead.png b/Resources/Textures/Objects/Specific/Hydroponics/pyrotton.rsi/dead.png
new file mode 100644 (file)
index 0000000..39d4b40
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/pyrotton.rsi/dead.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/pyrotton.rsi/harvest.png b/Resources/Textures/Objects/Specific/Hydroponics/pyrotton.rsi/harvest.png
new file mode 100644 (file)
index 0000000..1012ccf
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/pyrotton.rsi/harvest.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/pyrotton.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/pyrotton.rsi/meta.json
new file mode 100644 (file)
index 0000000..4a6e3c9
--- /dev/null
@@ -0,0 +1,32 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Drawn by Ubaser, using the cotton sprites as a base.",
+  "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/pyrotton.rsi/produce.png b/Resources/Textures/Objects/Specific/Hydroponics/pyrotton.rsi/produce.png
new file mode 100644 (file)
index 0000000..72a9865
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/pyrotton.rsi/produce.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/pyrotton.rsi/seed.png b/Resources/Textures/Objects/Specific/Hydroponics/pyrotton.rsi/seed.png
new file mode 100644 (file)
index 0000000..6528f4f
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/pyrotton.rsi/seed.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/pyrotton.rsi/stage-1.png b/Resources/Textures/Objects/Specific/Hydroponics/pyrotton.rsi/stage-1.png
new file mode 100644 (file)
index 0000000..c86f85f
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/pyrotton.rsi/stage-1.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/pyrotton.rsi/stage-2.png b/Resources/Textures/Objects/Specific/Hydroponics/pyrotton.rsi/stage-2.png
new file mode 100644 (file)
index 0000000..7bc634c
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/pyrotton.rsi/stage-2.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/pyrotton.rsi/stage-3.png b/Resources/Textures/Objects/Specific/Hydroponics/pyrotton.rsi/stage-3.png
new file mode 100644 (file)
index 0000000..31aa739
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/pyrotton.rsi/stage-3.png differ