Playlist fixes (#154)

* dough, compostables

* bone helmet fix

* hammer and brazier fixes, fence gates not bumpable

* roast potatoes

* changelog

* update workflow

* destroyable tiki torches, stackable seeds and healing herbs

* more burnables

* seed stacks fix

* update client fix

* no tags on abstract

* tag fix

* tag fix, again

* workflows

.github/workflows/labeler-untriaged.yml

@@ -0,0 +1,16 @@
+name: "Labels: Untriaged"
+
+on:
+  issues:
+    types: [opened]
+  pull_request_target:
+    types: [opened]
+
+jobs:
+  add_label:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions-ecosystem/action-add-labels@v1
+        if: join(github.event.issue.labels) == ''
+        with:
+          labels: "Untriaged"

.github/workflows/rsi-diff.yml

@@ -0,0 +1,69 @@
+name: Diff RSIs
+
+on:
+  pull_request_target:
+    paths:
+      - "**.rsi/**.png"
+
+jobs:
+  diff:
+    name: Diff
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3.6.0
+
+      - name: Get changed files
+        id: files
+        uses: Ana06/get-changed-files@v2.3.0
+        with:
+          format: "space-delimited"
+          filter: |
+            **.rsi
+            **.png
+
+      - name: Diff changed RSIs
+        id: diff
+        uses: space-wizards/RSIDiffBot@v1.1
+        with:
+          modified: ${{ steps.files.outputs.modified }}
+          removed: ${{ steps.files.outputs.removed }}
+          added: ${{ steps.files.outputs.added }}
+          basename: ${{ github.event.pull_request.base.repo.full_name }}
+          basesha: ${{ github.event.pull_request.base.sha }}
+          headname: ${{ github.event.pull_request.head.repo.full_name }}
+          headsha: ${{ github.event.pull_request.head.sha }}
+
+      - name: Potentially find comment
+        uses: peter-evans/find-comment@v1
+        id: fc
+        with:
+          issue-number: ${{ github.event.number }}
+          comment-author: "github-actions[bot]"
+          body-includes: RSI Diff Bot
+
+      - name: Create comment if it doesn't exist
+        if: steps.fc.outputs.comment-id == ''
+        uses: peter-evans/create-or-update-comment@v1
+        with:
+          issue-number: ${{ github.event.number }}
+          body: |
+            ${{ steps.diff.outputs.summary-details }}
+
+      - name: Update comment if it exists
+        if: steps.fc.outputs.comment-id != ''
+        uses: peter-evans/create-or-update-comment@v1
+        with:
+          comment-id: ${{ steps.fc.outputs.comment-id }}
+          edit-mode: replace
+          body: |
+            ${{ steps.diff.outputs.summary-details }}
+
+      - name: Update comment to read that it has been edited
+        if: steps.fc.outputs.comment-id != ''
+        uses: peter-evans/create-or-update-comment@v1
+        with:
+          comment-id: ${{ steps.fc.outputs.comment-id }}
+          edit-mode: append
+          body: |
+            Edit: diff updated after ${{ github.event.pull_request.head.sha }}

.github/workflows/upload-client.yml

@@ -51,21 +51,32 @@ jobs:
 
       - name: Update Target Repo
         run: |
-          # Copy compiled output to target-repo/
-          rsync -av --update ./bin/Content.Client/win-x64/ target-repo/Content.Client/ || true
-          cd target-repo
-          cd Content.Client
+          echo "--- Updating Client ---"
+          rsync -av --delete --update ./bin/Content.Client/win-x64/ target-repo/Content.Client/
+          cd target-repo/Content.Client
           git config user.name "GitHub Action"
           git config user.email "action@github.com"
           git add .
-          git commit -m "Update compiled client from Civ14"
-          git push
-          cd -
-          # Copy compiled output to target-repo/
-          rsync -av --update ./../bin/Content.Server/win-x64/ Content.Server/ || true
-          cd Content.Server
+          # Check if there are staged changes. git diff exits 0 if no changes, 1 if changes.
+          if git diff --staged --quiet; then
+            echo "No client changes to commit."
+          else
+            git commit -m "Update compiled client from Civ14"
+            git push
+          fi
+          # Go back to the workspace root before processing the server
+          cd ${{ github.workspace }}
+
+          echo "--- Updating Server ---"
+          rsync -av --delete --update ./bin/Content.Server/win-x64/ target-repo/Content.Server/
+          cd target-repo/Content.Server
           git config user.name "GitHub Action"
           git config user.email "action@github.com"
           git add .
-          git commit -m "Update compiled server from Civ14"
-          git push
+          # Check if there are staged changes
+          if git diff --staged --quiet; then
+            echo "No server changes to commit."
+          else
+            git commit -m "Update compiled server from Civ14"
+            git push
+          fi

Resources/Prototypes/Civ14/Entities/Objects/Materials/materials.yml

@@ -53,3 +53,8 @@
             animalpoo2: ""
             animalpoo3: ""
     - type: Compost
+    - type: Tag
+      tags:
+        - Burnable
+    - type: BurnFuel
+      burnTime: 3

Resources/Prototypes/Civ14/Entities/Objects/Specific/Farming/seeds.yml

@@ -9,10 +9,14 @@
       sprite: Civ14/Objects/farming.rsi
       state: seeds
     - type: STWeight
-      self: 1
+      self: 0.01
     - type: Item
       size: Small
-
+    - type: Tag
+      tags:
+        - Burnable
+    - type: BurnFuel
+      burnTime: 0.3
 - type: entity
   parent: SeedBaseCiv
   id: WheatSeedsCiv
@@ -22,7 +26,9 @@
       seedId: wheat
     - type: Sprite
       color: "#B87333"
-
+    - type: Stack
+      stackType: StackWheatSeedsCiv
+      count: 1
 - type: entity
   parent: SeedBaseCiv
   id: CornSeedsCiv
@@ -32,7 +38,9 @@
       seedId: corn
     - type: Sprite
       color: "#FFFF00"
-
+    - type: Stack
+      stackType: StackCornSeedsCiv
+      count: 1
 - type: entity
   parent: SeedBaseCiv
   id: RiceSeedsCiv
@@ -42,7 +50,9 @@
       seedId: rice
     - type: Sprite
       state: riceseeds
-
+    - type: Stack
+      stackType: StackRiceSeedsCiv
+      count: 1
 - type: entity
   parent: SeedBaseCiv
   id: PotatoSeedsCiv
@@ -52,7 +62,9 @@
       seedId: potato
     - type: Sprite
       state: potato
-
+    - type: Stack
+      stackType: StackPotatoSeedsCiv
+      count: 1
 - type: entity
   parent: SeedBaseCiv
   id: HempSeedsCiv
@@ -62,7 +74,9 @@
       seedId: hemp
     - type: Sprite
       color: "#B87333"
-
+    - type: Stack
+      stackType: StackHempSeedsCiv
+      count: 1
 - type: entity
   parent: SeedBaseCiv
   id: HealingHerbsSeedsCiv
@@ -72,7 +86,9 @@
       seedId: HealingHerbs
     - type: Sprite
       color: "#17211B"
-
+    - type: Stack
+      stackType: StackHealingHerbsSeedsCiv
+      count: 1
 - type: entity
   parent: SeedBaseCiv
   id: ComfreySeedsCiv
@@ -82,7 +98,9 @@
       seedId: ComfreyHerbs
     - type: Sprite
       color: "#A020F0"
-
+    - type: Stack
+      stackType: StackComfreySeedsCiv
+      count: 1
 - type: entity
   parent: SeedBaseCiv
   id: YarrowSeedsCiv
@@ -92,7 +110,9 @@
       seedId: YarrowHerbs
     - type: Sprite
       color: "#eef1a9"
-
+    - type: Stack
+      stackType: StackYarrowSeedsCiv
+      count: 1
 - type: entity
   parent: SeedBaseCiv
   id: ElderflowerSeedsCiv
@@ -102,7 +122,9 @@
       seedId: ElderflowerHerbs
     - type: Sprite
       color: "#e4e5ce"
-
+    - type: Stack
+      stackType: StackElderflowerSeedsCiv
+      count: 1
 - type: entity
   parent: SeedBaseCiv
   id: MilkThistleSeedsCiv
@@ -112,7 +134,9 @@
       seedId: MilkThistleHerbs
     - type: Sprite
       color: "#730561"
-
+    - type: Stack
+      stackType: StackMilkThistleSeedsCiv
+      count: 1
 - type: entity
   parent: SeedBaseCiv
   id: AloeSeedsCiv
@@ -122,7 +146,9 @@
       seedId: aloe
     - type: Sprite
       color: "#7E9B39"
-
+    - type: Stack
+      stackType: StackAloeSeedsCiv
+      count: 1
 - type: entity
   parent: SeedBaseCiv
   id: PoppySeedsCiv
@@ -132,3 +158,90 @@
       seedId: poppy
     - type: Sprite
       color: "#580000"
+    - type: Stack
+      stackType: StackPoppySeedsCiv
+      count: 1
+
+- type: stack
+  id: StackElderflowerSeedsCiv
+  name: elderflower seeds
+  icon: { sprite: /Textures/Civ14/Objects/Farming/seeds.rsi, state: seeds_old }
+  spawn: ElderflowerSeedsCiv
+  maxCount: 30
+
+- type: stack
+  id: StackMilkThistleSeedsCiv
+  name: milk thistle seeds
+  icon: { sprite: /Textures/Civ14/Objects/Farming/seeds.rsi, state: seeds_old }
+  spawn: MilkThistleSeedsCiv
+  maxCount: 30
+
+- type: stack
+  id: StackComfreySeedsCiv
+  name: comfrey seeds
+  icon: { sprite: /Textures/Civ14/Objects/Farming/seeds.rsi, state: seeds_old }
+  spawn: ComfreySeedsCiv
+  maxCount: 30
+
+- type: stack
+  id: StackYarrowSeedsCiv
+  name: yarrow seeds
+  icon: { sprite: /Textures/Civ14/Objects/Farming/seeds.rsi, state: seeds_old }
+  spawn: YarrowSeedsCiv
+  maxCount: 30
+
+- type: stack
+  id: StackHealingHerbsSeedsCiv
+  name: healing herbs seeds
+  icon: { sprite: /Textures/Civ14/Objects/Farming/seeds.rsi, state: seeds_old }
+  spawn: HealingHerbsSeedsCiv
+  maxCount: 30
+
+- type: stack
+  id: StackWheatSeedsCiv
+  name: wheat seeds
+  icon: { sprite: /Textures/Civ14/Objects/Farming/seeds.rsi, state: seeds_old }
+  spawn: WheatSeedsCiv
+  maxCount: 30
+
+- type: stack
+  id: StackCornSeedsCiv
+  name: corn seeds
+  icon: { sprite: /Textures/Civ14/Objects/Farming/seeds.rsi, state: seeds_old }
+  spawn: CornSeedsCiv
+  maxCount: 30
+
+- type: stack
+  id: StackRiceSeedsCiv
+  name: rice seeds
+  icon: { sprite: /Textures/Civ14/Objects/Farming/seeds.rsi, state: riceseeds }
+  spawn: RiceSeedsCiv
+  maxCount: 30
+
+- type: stack
+  id: StackPotatoSeedsCiv
+  name: potato seeds
+  icon: { sprite: /Textures/Civ14/Objects/Farming/seeds.rsi, state: potato }
+  spawn: PotatoSeedsCiv
+  maxCount: 30
+
+- type: stack
+  id: StackHempSeedsCiv
+  name: hemp seeds
+  icon: { sprite: /Textures/Civ14/Objects/Farming/seeds.rsi, state: seeds_old }
+  spawn: HempSeedsCiv
+  maxCount: 30
+
+- type: stack
+  id: StackAloeSeedsCiv
+  name: aloe vera seeds
+  icon: { sprite: /Textures/Civ14/Objects/Farming/seeds.rsi, state: seeds_old }
+  spawn: AloeSeedsCiv
+  maxCount: 30
+
+- type: stack
+  id: StackPoppySeedsCiv
+  name: poppy seeds
+  icon: { sprite: /Textures/Civ14/Objects/Farming/seeds.rsi, state: seeds_old }
+  spawn: PoppySeedsCiv
+  maxCount: 30

Resources/Prototypes/Civ14/Entities/Objects/healing.yml

@@ -3,7 +3,7 @@
   description: A bunch of healing herbs collected from bushes. Helps clean burns and superficial wounds.
   parent: BaseHealingItem
   id: HealingHerbs
-  suffix: Full
+  suffix: Single
   components:
     - type: Tag
       tags:
@@ -18,12 +18,12 @@
         - Biological
       damage:
         types:
-          Heat: -5
-          Cold: -5
-          Shock: -5
-          Caustic: -5
+          Heat: -8
+          Cold: -8
+          Shock: -8
+          Caustic: -8
         groups:
-          Brute: -2
+          Brute: -6
       healingBeginSound:
         path: "/Audio/Items/Medical/ointment_begin.ogg"
       healingEndSound:
@@ -32,13 +32,16 @@
       price: 20
     - type: Produce
       seedId: HealingHerbs
+    - type: Stack
+      stackType: StackHealingHerbs
+      count: 1
 
 - type: entity
   name: medicinal yarrow
   description: Yarrow is a coagulant, and will help reduce bleeding when applied.
   parent: BaseHealingItem
   id: YarrowHealingHerbs
-  suffix: Full
+  suffix: Single
   components:
     - type: Tag
       tags:
@@ -62,13 +65,15 @@
       price: 20
     - type: Produce
       seedId: YarrowHerbs
-
+    - type: Stack
+      stackType: StackYarrowHealingHerbs
+      count: 1
 - type: entity
   name: medicinal comfrey
   description: Comfrey has been used historically to heal bruises due to its anti-inflammatory and tissue-repair properties. Heals brute damage.
   parent: BaseHealingItem
   id: ComfreyHealingHerbs
-  suffix: Full
+  suffix: Single
   components:
     - type: Tag
       tags:
@@ -92,13 +97,15 @@
       price: 20
     - type: Produce
       seedId: ComfreyHerbs
-
+    - type: Stack
+      stackType: StackComfreyHealingHerbs
+      count: 1
 - type: entity
   name: medicinal milk thistle
   description: Milk thistle has long been used as a liver tonic. Heals poisoning.
   parent: BaseHealingItem
   id: MilkThistleHealingHerbs
-  suffix: Full
+  suffix: Single
   components:
     - type: Tag
       tags:
@@ -122,13 +129,15 @@
       price: 20
     - type: Produce
       seedId: MilkThistleHerbs
-
+    - type: Stack
+      stackType: StackMilkThistleHealingHerbs
+      count: 1
 - type: entity
   name: medicinal elderflower
   description: Elderflower reduces asphyxiation by clearing airways and boosting oxygen intake.
   parent: BaseHealingItem
   id: ElderflowerHealingHerbs
-  suffix: Full
+  suffix: Single
   components:
     - type: Tag
       tags:
@@ -152,3 +161,41 @@
       price: 20
     - type: Produce
       seedId: ElderflowerHerbs
+    - type: Stack
+      stackType: StackElderflowerHealingHerbs
+      count: 1
+
+- type: stack
+  id: StackElderflowerHealingHerbs
+  name: elderflower
+  icon: { sprite: /Textures/Civ14/Objects/Farming/elderflower.rsi, state: produce }
+  spawn: ElderflowerHealingHerbs
+  maxCount: 10
+
+- type: stack
+  id: StackMilkThistleHealingHerbs
+  name: milk thistle
+  icon: { sprite: /Textures/Objects/Specific/Hydroponics/galaxythistle.rsi, state: produce }
+  spawn: MilkThistleHealingHerbs
+  maxCount: 10
+
+- type: stack
+  id: StackComfreyHealingHerbs
+  name: comfrey
+  icon: { sprite: /Textures/Objects/Specific/Hydroponics/spacemans_trumpet.rsi, state: produce }
+  spawn: ComfreyHealingHerbs
+  maxCount: 10
+
+- type: stack
+  id: StackYarrowHealingHerbs
+  name: yarrow
+  icon: { sprite: /Textures/Civ14/Objects/Farming/yarrow.rsi, state: produce }
+  spawn: YarrowHealingHerbs
+  maxCount: 10
+
+- type: stack
+  id: StackHealingHerbs
+  name: healing herbs
+  icon: { sprite: /Textures/Civ14/Objects/surgery.rsi, state: healing_herbs }
+  spawn: HealingHerbs
+  maxCount: 10

Resources/Prototypes/Civ14/Entities/Structures/warmth.yml

@@ -123,3 +123,11 @@
             - MachineMask
           layer:
             - MachineLayer
+    - type: Destructible
+      thresholds:
+        - trigger: !type:DamageTrigger
+            damage: 40
+
+          behaviors:
+            - !type:DoActsBehavior
+              acts: ["Destruction"]

Resources/Prototypes/Entities/Objects/Materials/materials.yml

@@ -247,6 +247,7 @@
       tags:
         - Wooden
         - RawMaterial
+        - Burnable
     - type: Extractable
       grindableSolutionName: wood
     - type: SolutionContainerManager

Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml

@@ -17,7 +17,11 @@
     - type: GuideHelp
       guides:
         - Medical
-
+    - type: Tag
+      tags:
+        - Burnable
+    - type: BurnFuel
+      burnTime: 0.5
 - type: entity
   name: ointment
   description: Used to treat those nasty burns. Less effective on caustic burns.