Rings now give a small amout of gold / silver when scrapped (#31847)

* Ring

* Silly name fix

diff --git a/Resources/Prototypes/Entities/Clothing/Hands/base_clothinghands.yml b/Resources/Prototypes/Entities/Clothing/Hands/base_clothinghands.yml
index b17140169abd5aa332593eea0705d071ad7c09b5..bb494ffda4167c6ab2642a62b97ca56f1615a602 100644 (file)
--- a/Resources/Prototypes/Entities/Clothing/Hands/base_clothinghands.yml
+++ b/Resources/Prototypes/Entities/Clothing/Hands/base_clothinghands.yml
@@ -64,3 +64,25 @@
   - type: Tag
     tags:
     - Ring
+
+- type: entity
+  abstract: true
+  id: GoldRingBase
+  components:
+    - type: PhysicalComposition
+      materialComposition:
+        Gold: 200 # 2 bars
+    - type: StaticPrice
+      price: 300
+
+- type: entity
+  abstract: true
+  id: SilverRingBase
+  name: silver ring
+  description: Looks slightly less valuable than a gold one.
+  components:
+    - type: PhysicalComposition
+      materialComposition:
+        Silver: 200 # 2 bars
+    - type: StaticPrice
+      price: 275

diff --git a/Resources/Prototypes/Entities/Clothing/Hands/rings.yml b/Resources/Prototypes/Entities/Clothing/Hands/rings.yml
index d5eab870d24c8f2c26d1588db0ea77546afd43e9..f07e64c85a5a5568517f4f8314030e6b80873f2f 100644 (file)
--- a/Resources/Prototypes/Entities/Clothing/Hands/rings.yml
+++ b/Resources/Prototypes/Entities/Clothing/Hands/rings.yml
@@ -1,5 +1,5 @@
 - type: entity
-  parent: RingBase
+  parent: [ RingBase, GoldRingBase ]
   id: GoldRing
   name: gold ring
   description: A precious ring.
@@ -8,11 +8,9 @@
     layers:
       - state: ring
         color: "#ffc833"
-  - type: StaticPrice
-    price: 300
 
 - type: entity
-  parent: RingBase
+  parent: [ RingBase, SilverRingBase ]
   id: SilverRing
   name: silver ring
   description: Looks slightly less valuable than a gold one.
@@ -20,11 +18,9 @@
   - type: Sprite
     layers:
       - state: ring
-  - type: StaticPrice
-    price: 275
 
 - type: entity
-  parent: RingBase
+  parent: [ RingBase, GoldRingBase ]
   id: GoldRingDiamond
   name: gold diamond ring
   description: Made from ethically mined space diamonds.
@@ -39,7 +35,7 @@
     price: 1500
 
 - type: entity
-  parent: RingBase
+  parent: [ RingBase, SilverRingBase ]
   id: SilverRingDiamond
   name: silver diamond ring
   description: Made from ethically mined space diamonds.
@@ -53,7 +49,7 @@
     price: 1400
 
 - type: entity
-  parent: RingBase
+  parent: [ RingBase, GoldRingBase ]
   id: GoldRingGem
   name: gold gem ring
   description: Shiny and valuable!
@@ -73,7 +69,7 @@
           gem: Rainbow
 
 - type: entity
-  parent: RingBase
+  parent: [ RingBase, SilverRingBase ]
   id: SilverRingGem
   name: silver gem ring
   description: Shiny and not quite as valuable!