]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Pumpkins, jack o' lanterns and pumpkin hat resprite (#21176)
authorDoru991 <75124791+Doru991@users.noreply.github.com>
Tue, 31 Oct 2023 03:12:23 +0000 (05:12 +0200)
committerGitHub <noreply@github.com>
Tue, 31 Oct 2023 03:12:23 +0000 (23:12 -0400)
* Pumpkin textures

* Pumpkin prototypes

* Jack o lantern prototypes and pumpkin cake

* Finishing touches

* Arbitrageloose

* Restore old pumpkin helmet sprites (God I hope it works)

33 files changed:
Resources/Locale/en-US/flavors/flavor-profiles.ftl
Resources/Locale/en-US/reagents/meta/consumable/food/food.ftl
Resources/Locale/en-US/seeds/seeds.ftl
Resources/Prototypes/Catalog/Cargo/cargo_vending.yml
Resources/Prototypes/Catalog/VendingMachines/Inventories/seeds.yml
Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml
Resources/Prototypes/Entities/Clothing/Head/base_clothinghead.yml
Resources/Prototypes/Entities/Clothing/Head/misc.yml
Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
Resources/Prototypes/Entities/Objects/Decoration/jackolantern.yml [new file with mode: 0644]
Resources/Prototypes/Entities/Objects/Misc/torch.yml
Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml
Resources/Prototypes/Flavors/flavors.yml
Resources/Prototypes/Hydroponics/seeds.yml
Resources/Prototypes/Reagents/Consumable/Food/food.yml
Resources/Prototypes/Recipes/Construction/Graphs/fun/jack_o_lantern.yml [new file with mode: 0644]
Resources/Prototypes/Recipes/Cooking/meal_recipes.yml
Resources/Prototypes/tags.yml
Resources/Textures/Clothing/Head/Misc/pumpkin.rsi/icon-flash.png [new file with mode: 0644]
Resources/Textures/Clothing/Head/Misc/pumpkin.rsi/meta.json
Resources/Textures/Clothing/Head/Misc/pumpkin.rsi/off-equipped-HELMET.png [moved from Resources/Textures/Clothing/Head/Misc/pumpkin.rsi/equipped-HELMET.png with 100% similarity]
Resources/Textures/Clothing/Head/Misc/pumpkin.rsi/off-inhand-left.png [moved from Resources/Textures/Clothing/Head/Misc/pumpkin.rsi/inhand-left.png with 100% similarity]
Resources/Textures/Clothing/Head/Misc/pumpkin.rsi/off-inhand-right.png [moved from Resources/Textures/Clothing/Head/Misc/pumpkin.rsi/inhand-right.png with 100% similarity]
Resources/Textures/Objects/Specific/Hydroponics/pumpkin.rsi/carved.png [new file with mode: 0644]
Resources/Textures/Objects/Specific/Hydroponics/pumpkin.rsi/dead.png [new file with mode: 0644]
Resources/Textures/Objects/Specific/Hydroponics/pumpkin.rsi/harvest.png [new file with mode: 0644]
Resources/Textures/Objects/Specific/Hydroponics/pumpkin.rsi/lantern.png [new file with mode: 0644]
Resources/Textures/Objects/Specific/Hydroponics/pumpkin.rsi/meta.json [new file with mode: 0644]
Resources/Textures/Objects/Specific/Hydroponics/pumpkin.rsi/produce.png [new file with mode: 0644]
Resources/Textures/Objects/Specific/Hydroponics/pumpkin.rsi/seed.png [new file with mode: 0644]
Resources/Textures/Objects/Specific/Hydroponics/pumpkin.rsi/stage-1.png [new file with mode: 0644]
Resources/Textures/Objects/Specific/Hydroponics/pumpkin.rsi/stage-2.png [new file with mode: 0644]
Resources/Textures/Objects/Specific/Hydroponics/pumpkin.rsi/stage-3.png [new file with mode: 0644]

index 8ecf4cb13e75118ec7ba53f6805f754dae2cb259..2a0c39a0e40bea3ce23a04796c5b21d7adddff0f 100644 (file)
@@ -92,6 +92,7 @@ flavor-complex-eggplant = like eggplant
 flavor-complex-carrot = like carrots
 flavor-complex-cabbage = like cabbages
 flavor-complex-potatoes = like potatoes
+flavor-complex-pumpkin = like pumpkins
 flavor-complex-mushroom = like mushrooms
 flavor-complex-tomato = like tomatoes
 flavor-complex-corn = like corn
index a6b3cb54799c1f44d419c0d0256c1ef971eaaa8b..01c716787e37598e5301de3abb5dbf84023735a2 100644 (file)
@@ -12,3 +12,6 @@ reagent-desc-protein = Found in certain meals, good for bodily health.
 
 reagent-name-cocoapowder = сocoa powder
 reagent-desc-cocoapowder = From the best varieties of cocoa beans
+
+reagent-name-pumpkin-flesh = pumpkin flesh
+reagent-desc-pumpkin-flesh = The mushy, sweet remains of a pumpkin.
\ No newline at end of file
index 2e0388ec527886256c90a4cf9d9f1db34c3baa70..1f4ac7e5f8244a87b912ebd2a862a0f3b4d4c8c8 100644 (file)
@@ -96,4 +96,6 @@ seeds-cocoa-display-name = cocoa plant
 seeds-berries-name = berries
 seeds-berries-display-name = berry bush
 seeds-bungo-name = bungo
-seeds-bungo-display-name = bungo plant
\ No newline at end of file
+seeds-bungo-display-name = bungo plant
+seeds-pumpkin-name = pumpkin
+seeds-pumpkin-display-name = pumpkins
\ No newline at end of file
index 86f121fa18a83abfd07e118ce17d6b8ca61179d3..fb635ae8b5f1b1e6332888ccb4c11473700029d6 100644 (file)
     sprite: Objects/Specific/Service/vending_machine_restock.rsi
     state: base
   product: CrateVendingMachineRestockSeedsFilled
-  cost: 3000
+  cost: 3125
   category: Hydroponics
   group: market
 
index 98de54dc5282138f55d425c75973a45365b0fb14..28972e4913e0cdb14d145189aa7bb8d3bc6cb935 100644 (file)
@@ -24,6 +24,7 @@
     OrangeSeeds: 5
     PoppySeeds: 3
     PotatoSeeds: 5
+    PumpkinSeeds: 5
     RiceSeeds: 5
     SoybeanSeeds: 5
     SugarcaneSeeds: 5
index d4dd657027cbb9515815924fdb80c0a5b370dd5d..f3c108d72a17d6412986aef6d08ea9fb15c20ea1 100644 (file)
@@ -24,7 +24,7 @@
     ClothingOuterSuitChicken: 2
     ClothingHeadHatChickenhead: 2
     ClothingOuterSuitMonkey: 2
-    ClothingHeadHatPumpkin: 2
+    ClothingHeadHatPumpkin: 4 # Extra pumpkins for the season
     ClothingHeadHatShrineMaidenWig: 2
     ClothingOuterSuitShrineMaiden: 2
     Gohei: 2
index 19fc25b233b2888e4cca7a7c7d6cbb6124858eaa..ce1767b1bbf30f98b1df96004bda706786fe72d5 100644 (file)
@@ -73,7 +73,7 @@
   - type: PointLight
     enabled: false
     radius: 3
-    energy: 2
+    energy: 1
     mask: /Textures/Effects/LightMasks/cone.png
     autoRot: true
     netsync: false
index 50e3da93fbfb7a0e676ee8f300d2e2118e902ad8..39e751b17d3dd1ebfb1766a7f5b0ba6c118f6144 100644 (file)
@@ -62,7 +62,7 @@
     node: hairflower
 
 - type: entity
-  parent: ClothingHeadBase
+  parent: ClothingHeadLightBase
   id: ClothingHeadHatPumpkin
   name: pumpkin hat
   description: A jack o' lantern! Believed to ward off evil spirits.
     sprite: Clothing/Head/Misc/pumpkin.rsi
   - type: IngestionBlocker
   - type: IdentityBlocker
+  - type: PointLight
+    enabled: false
+    radius: 3
+    energy: 1
+    mask: /Textures/Effects/LightMasks/cone.png
+    autoRot: true
+    color: "#cc6600"
+    netsync: false
+  - type: ItemSlots
+    slots:
+      cell_slot:
+        name: power-cell-slot-component-slot-name-default
 
 - type: entity
   parent: ClothingHeadBase
index 6439b2eb6c57f69a02b5b55e3ca7106e4099897e..9ce373d63dc9b906ad48c6726f1ef0ea05a8e3cb 100644 (file)
     seedId: bungo
   - type: SpaceGarbage
   - type: BadFood
+
+- type: entity
+  name: pumpkin
+  parent: FoodProduceBase
+  id: FoodPumpkin
+  description: A large, orange... berry. Seriously.
+  components:
+  - type: Item
+    size: 10
+  - type: FlavorProfile
+    flavors:
+      - pumpkin
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 25
+        reagents:
+        - ReagentId: PumpkinFlesh
+          Quantity: 20
+        - ReagentId: Vitamin
+          Quantity: 5
+  - type: Sprite
+    sprite: Objects/Specific/Hydroponics/pumpkin.rsi
+  - type: Produce
+    seedId: pumpkin
+  - type: Damageable
+    damageContainer: Biological
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 16
+      behaviors:
+      - !type:PlaySoundBehavior
+        sound:
+          collection: desecration
+      - !type:SpillBehavior
+        solution: food
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+  - type: Butcherable
+    butcheringType: Knife
+    spawned:
+    - id: CarvedPumpkin
+    - id: PumpkinSeeds
+  - type: Tag
+    tags:
+    - Fruit
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Objects/Decoration/jackolantern.yml b/Resources/Prototypes/Entities/Objects/Decoration/jackolantern.yml
new file mode 100644 (file)
index 0000000..1205c20
--- /dev/null
@@ -0,0 +1,61 @@
+- type: entity
+  parent: BaseItem
+  id: CarvedPumpkin
+  name: carved pumpkin
+  description: A traditional spooky decoration.
+  components:
+  - type: Sprite
+    sprite: Objects/Specific/Hydroponics/pumpkin.rsi
+    state: carved
+  - type: Item
+    size: 10
+  - type: Construction
+    graph: PumpkinAddLight
+    node: start
+
+- type: entity
+  parent: CarvedPumpkin
+  id: PumpkinLantern
+  name: jack o' lantern
+  description: A carved pumpkin, emitting an eerie glow.
+  components:
+    - type: Sprite
+      state: lantern
+    - type: Appearance
+    - type: PointLight
+      enabled: true
+      color: "#cc6600"
+      radius: 2.0
+      energy: 4.0
+
+- type: entity
+  parent: CarvedPumpkin
+  id: CarvedPumpkinSmall
+  suffix: Small
+  components:
+    - type: Sprite
+      scale: 0.75, 0.75
+
+- type: entity
+  parent: CarvedPumpkin
+  id: CarvedPumpkinLarge
+  suffix: Large
+  components:
+    - type: Sprite
+      scale: 1.5, 1.5
+
+- type: entity
+  parent: PumpkinLantern
+  id: PumpkinLanternSmall
+  suffix: Small
+  components:
+    - type: Sprite
+      scale: 0.75, 0.75
+
+- type: entity
+  parent: PumpkinLantern
+  id: PumpkinLanternLarge
+  suffix: Large
+  components:
+    - type: Sprite
+      scale: 1.5, 1.5
\ No newline at end of file
index 0fa918de74a275b854b79644c79d4ddf1dadfdec..f408d0d289f660c29a2a5a34158d17c7c572dc2c 100644 (file)
@@ -74,3 +74,6 @@
           maxDuration: 4.0
           startValue: 6.0
           endValue: 1.0
+    - type: Tag
+      tags:
+      - Torch
\ No newline at end of file
index 16d9fd1a642f19a06986caebf2b74464dff32308..2462c601e424b17cd3a56f572ee39a69705060e6 100644 (file)
     - type: Seed
       seedId: bungo
     - type: Sprite
-      sprite: Objects/Specific/Hydroponics/bungo.rsi
\ No newline at end of file
+      sprite: Objects/Specific/Hydroponics/bungo.rsi
+      
+- type: entity
+  parent: SeedBase
+  name: packet of pumpkin seeds
+  id: PumpkinSeeds
+  components:
+    - type: Seed
+      seedId: pumpkin
+    - type: Sprite
+      sprite: Objects/Specific/Hydroponics/pumpkin.rsi
index fc3b0ba5771a75452fea89bf99287f1f1e2b9333..ba8f2c34769150b1bc9f9de8a2ceacbd6e0cbdb4 100644 (file)
   id: lostfriendship
   flavorType: Complex
   description: flavor-complex-lost-friendship
+
+- type: flavor
+  id: pumpkin
+  flavorType: Complex
+  description: flavor-complex-pumpkin
\ No newline at end of file
index 8e1c6c932850172f9f3fb5d8c4fb22e9586104ca..894f0f020234f0bb4144b5260f8c3ea8a312941d 100644 (file)
       Min: 5
       Max: 10
       PotencyDivisor: 20
+
+- type: seed
+  id: pumpkin
+  name: seeds-pumpkin-name
+  noun: seeds-noun-seeds
+  displayName: seeds-pumpkin-display-name
+  plantRsi: Objects/Specific/Hydroponics/pumpkin.rsi
+  packetPrototype: PumpkinSeeds
+  productPrototypes:
+    - FoodPumpkin
+  lifespan: 55
+  maturation: 10
+  production: 4
+  yield: 2
+  potency: 10
+  idealHeat: 288
+  growthStages: 3
+  chemicals:
+    PumpkinFlesh:
+      Min: 1
+      Max: 20
+      PotencyDivisor: 5
+    Vitamin:
+      Min: 1
+      Max: 5
+      PotencyDivisor: 20
\ No newline at end of file
index b9e565f5afcbc4a40b46a74759aafd632152ec45..03ebf7cc321d9b38758e1e1b4214f98294d9ef11 100644 (file)
     amount: 2
   - !type:PlantAdjustPests
     amount: 2
+
+- type: reagent
+  id: PumpkinFlesh #Just so pumpkins spill orange stuff when smashed
+  parent: Nutriment
+  name: reagent-name-pumpkin-flesh
+  desc: reagent-desc-pumpkin-flesh
+  flavor: pumpkin
+  color: "#fc9300"
\ No newline at end of file
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/fun/jack_o_lantern.yml b/Resources/Prototypes/Recipes/Construction/Graphs/fun/jack_o_lantern.yml
new file mode 100644 (file)
index 0000000..efd2007
--- /dev/null
@@ -0,0 +1,13 @@
+- type: constructionGraph
+  id: PumpkinAddLight
+  start: start
+  graph:
+    - node: start
+      edges:
+        - to: lit
+          steps:
+            - tag: Torch
+              doAfter: 2
+
+    - node: lit
+      entity: PumpkinLantern
\ No newline at end of file
index 4ec4118177826ca3bdd037e0e0b07f5ecaf50e6c..0ebf88e892ec814d4c254f02845e0e61d9194163 100644 (file)
     FoodCakePlain: 1
     FoodCheeseSlice: 3
 
+- type: microwaveMealRecipe
+  id: RecipePumpkinCake
+  name: pumpkin cake recipe
+  result: FoodCakePumpkin
+  time: 5
+  solids:
+    FoodCakePlain: 1
+    FoodPumpkin: 1
+
 - type: microwaveMealRecipe
   id: RecipeClownCake
   name: clown cake recipe
index 67a27be41607b1add224fb31b922b39cb920cb8b..8a120d7bf034760bd0be06d165aaaa8a1f6dfe27 100644 (file)
 - type: Tag
   id: Toolbox
 
+- type: Tag
+  id: Torch
+
 - type: Tag
   id: Trash
 
diff --git a/Resources/Textures/Clothing/Head/Misc/pumpkin.rsi/icon-flash.png b/Resources/Textures/Clothing/Head/Misc/pumpkin.rsi/icon-flash.png
new file mode 100644 (file)
index 0000000..21b898a
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Misc/pumpkin.rsi/icon-flash.png differ
index f1c7bacf205e1917582ffbec2411246974154f4a..5e4c46c868832a99a2e16b2cef086a5641df881c 100644 (file)
       "name": "icon-on"
     },
     {
-      "name": "equipped-HELMET",
+      "name": "icon-flash"
+    },
+    {
+      "name": "off-equipped-HELMET",
       "directions": 4
     },
     {
       "directions": 4
     },
     {
-      "name": "inhand-left",
+      "name": "off-inhand-left",
       "directions": 4
     },
     {
-      "name": "inhand-right",
+      "name": "off-inhand-right",
       "directions": 4
     },
     {
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/pumpkin.rsi/carved.png b/Resources/Textures/Objects/Specific/Hydroponics/pumpkin.rsi/carved.png
new file mode 100644 (file)
index 0000000..6eb43ad
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/pumpkin.rsi/carved.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/pumpkin.rsi/dead.png b/Resources/Textures/Objects/Specific/Hydroponics/pumpkin.rsi/dead.png
new file mode 100644 (file)
index 0000000..e66da20
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/pumpkin.rsi/dead.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/pumpkin.rsi/harvest.png b/Resources/Textures/Objects/Specific/Hydroponics/pumpkin.rsi/harvest.png
new file mode 100644 (file)
index 0000000..ea6a13e
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/pumpkin.rsi/harvest.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/pumpkin.rsi/lantern.png b/Resources/Textures/Objects/Specific/Hydroponics/pumpkin.rsi/lantern.png
new file mode 100644 (file)
index 0000000..e07dacb
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/pumpkin.rsi/lantern.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/pumpkin.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/pumpkin.rsi/meta.json
new file mode 100644 (file)
index 0000000..a6409ac
--- /dev/null
@@ -0,0 +1,47 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from https://github.com/tgstation/tgstation/blob/5d507cfbad6f73d1beaba66d93f31f893adb3a84/icons/obj/hydroponics/harvest.dmi, carved sprites by ps3moira",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "dead"
+    },
+    {
+      "name": "harvest"
+    },
+    {
+      "name": "produce"
+    },
+    {
+      "name": "seed"
+    },
+    {
+      "name": "stage-1"
+    },
+    {
+      "name": "stage-2"
+    },
+    {
+      "name": "stage-3"
+    },
+    {
+      "name": "carved"
+    },
+    {
+      "name": "lantern",
+      "delays": [
+        [
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+                 0.2
+        ]
+      ]
+    }
+  ]
+}
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/pumpkin.rsi/produce.png b/Resources/Textures/Objects/Specific/Hydroponics/pumpkin.rsi/produce.png
new file mode 100644 (file)
index 0000000..6fa2ec1
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/pumpkin.rsi/produce.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/pumpkin.rsi/seed.png b/Resources/Textures/Objects/Specific/Hydroponics/pumpkin.rsi/seed.png
new file mode 100644 (file)
index 0000000..a60957f
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/pumpkin.rsi/seed.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/pumpkin.rsi/stage-1.png b/Resources/Textures/Objects/Specific/Hydroponics/pumpkin.rsi/stage-1.png
new file mode 100644 (file)
index 0000000..762e986
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/pumpkin.rsi/stage-1.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/pumpkin.rsi/stage-2.png b/Resources/Textures/Objects/Specific/Hydroponics/pumpkin.rsi/stage-2.png
new file mode 100644 (file)
index 0000000..22f418d
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/pumpkin.rsi/stage-2.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/pumpkin.rsi/stage-3.png b/Resources/Textures/Objects/Specific/Hydroponics/pumpkin.rsi/stage-3.png
new file mode 100644 (file)
index 0000000..eb08406
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/pumpkin.rsi/stage-3.png differ