yaml restructuring

Resources/Prototypes/Entities/Structures/Decoration/bonfire.yml

@@ -1,23 +1,44 @@
+# imp edit - base bonfire so legionnaire bonfire and other static bonfires can parent off this
 - type: entity
-  id: Bonfire
+  id: BonfireBase
   parent: BaseStructure
   name: bonfire
   description: What can be better than a late evening under the sky with guitar and friends?
+  abstract: true
   components:
   - type: Sprite
     noRot: true
     sprite: Structures/Decoration/bonfire.rsi
     layers:
-      - state: bonfire
+    - state: bonfire
+    - state: burning
+  - type: Damageable
+    damageContainer: StructuralInorganic
+    damageModifierSet: Wood
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 50
+      behaviors:
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
   - type: AmbientSound
     volume: -5
     range: 5
     sound:
       path: /Audio/Ambience/Objects/fireplace.ogg
-  - type: Damageable
-    damageContainer: StructuralInorganic
-    damageModifierSet: Wood
-  # imp edits
+
+# imp edit - most of these components are new, with old ones rolled into BaseBonfire. and yet, we are still in an upstream file
+- type: entity
+  id: Bonfire
+  parent: BonfireBase
+  name: bonfire
+  description: What can be better than a late evening under the sky with guitar and friends?
+  components:
+  - type: Sprite
+    layers:
+    - state: bonfire
   - type: Appearance
   - type: Fixtures
     fixtures:
@@ -79,16 +100,20 @@
   - type: Construction
     graph: Bonfire
     node: bonfire
-  # end imp edits
 
 - type: entity
   id: LegionnaireBonfire
-  parent: Bonfire
+  parent: BonfireBase
   name: legionnaire bonfire
   description: There, in the land of lava and ash, place to to cook marshmallow and potato.
   components:
   - type: Sprite
     layers:
       - state: legionnaire_bonfire
+  # imp edits
   - type: PointLight
+    radius: 5
+    energy: 3
     color: "#FF5601"
+  - type: AlwaysHot
+  # end imp edits