Add rings (Salvage loot real)! (#31372)

* First commit

* I'm silly

* Another fix

* How could I forget the descriptions!

* Forgot

* Made textures alligned properly

* Removed the stuff!

* Opps

* Typo fixes

diff --git a/Resources/Prototypes/Entities/Clothing/Hands/base_clothinghands.yml b/Resources/Prototypes/Entities/Clothing/Hands/base_clothinghands.yml
index c1a53ccf6e5f0dacd434eb897562d0a28d6cfdc2..da0011e1cc27a032aeeb2a4f8c686146b2a2919c 100644 (file)
--- a/Resources/Prototypes/Entities/Clothing/Hands/base_clothinghands.yml
+++ b/Resources/Prototypes/Entities/Clothing/Hands/base_clothinghands.yml
@@ -48,3 +48,16 @@
   - type: Fiber
     fiberMaterial: fibers-synthetic
   - type: FingerprintMask
+
+- type: entity
+  abstract: true
+  parent: BaseItem
+  id: RingBase
+  components:
+    - type: Clothing
+      slots: [ gloves, neck ]
+    - type: Item
+      size: Tiny
+    - type: Tag
+      tags:
+      - Ring

diff --git a/Resources/Prototypes/Entities/Clothing/Hands/rings.yml b/Resources/Prototypes/Entities/Clothing/Hands/rings.yml
new file mode 100644 (file)
index 0000000..e88ee81
--- /dev/null
+++ b/Resources/Prototypes/Entities/Clothing/Hands/rings.yml
@@ -0,0 +1,104 @@
+- type: entity
+  parent: RingBase
+  id: GoldRing
+  name: gold ring
+  description: A precious ring.
+  components:
+    - type: Sprite
+      sprite: Clothing/Hands/Rings/basic.rsi
+      layers:
+        - state: ring
+          color: "#ffc833"
+    - type: StaticPrice
+      price: 300
+    - type: Appearance
+
+- type: entity
+  parent: RingBase
+  id: SilverRing
+  name: silver ring
+  description: Looks slightly less valuable than a gold one.
+  components:
+    - type: Sprite
+      sprite: Clothing/Hands/Rings/basic.rsi
+      layers:
+        - state: ring
+    - type: StaticPrice
+      price: 275
+    - type: Appearance
+
+- type: entity
+  parent: RingBase
+  id: GoldRingDiamond
+  name: gold diamond ring
+  description: Made from ethically mined space diamonds.
+  components:
+    - type: Sprite
+      sprite: Clothing/Hands/Rings/basic.rsi
+      layers:
+        - state: ring
+          color: "#ffc833"
+        - state: gem
+          color: "#c1ffff"
+    - type: StaticPrice
+      price: 1500
+    - type: Appearance
+
+- type: entity
+  parent: RingBase
+  id: SilverRingDiamond
+  name: silver diamond ring
+  description: Made from ethically mined space diamonds.
+  components:
+    - type: Sprite
+      sprite: Clothing/Hands/Rings/basic.rsi
+      layers:
+        - state: ring
+        - state: gem
+          color: "#c1ffff"
+    - type: StaticPrice
+      price: 1400
+    - type: Appearance
+
+- type: entity
+  parent: RingBase
+  id: GoldRingGem
+  name: gold gem ring
+  description: Shiny and valuable!
+  components:
+    - type: Sprite
+      sprite: Clothing/Hands/Rings/basic.rsi
+      layers:
+        - state: ring
+          color: "#ffc833"
+        - state: gem
+          map: [ "gemColor" ]
+    - type: StaticPrice
+      price: 2100
+    - type: Appearance
+    - type: RandomSprite
+      getAllGroups: true
+      available:
+        - gemColor:
+            gem: Rainbow
+
+- type: entity
+  parent: RingBase
+  id: SilverRingGem
+  name: silver gem ring
+  description: Shiny and not quite as valuable!
+  components:
+    - type: Sprite
+      sprite: Clothing/Hands/Rings/basic.rsi
+      layers:
+        - state: ring
+        - state: gem
+          map: [ "gemColor" ]
+    - type: StaticPrice
+      price: 2000
+    - type: Appearance
+    - type: RandomSprite
+      getAllGroups: true
+      available:
+        - gemColor:
+            gem: Rainbow

diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/Salvage/tables_loot.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/Salvage/tables_loot.yml
index 61b3d1081712c647735205852bd1e39ac20e6d19..1ee0f123ef6a6b2fa70697b2d5d4f91775cdbb09 100644 (file)
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/Salvage/tables_loot.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/Salvage/tables_loot.yml
@@ -114,6 +114,8 @@
         range: 4, 7
     - id: SpaceCash1000
     - id: WristwatchGold
+    - !type:NestedSelector
+      tableId: RingTableCommon
 
 - type: entityTable
   id: SalvageTreasureRare
@@ -145,6 +147,8 @@
           weight: 14
         - id: SpaceCash10000
           weight: 1
+    - !type:NestedSelector
+      tableId: RingTableRare
 
 - type: entityTable
   id: SalvageTreasureLegendary
@@ -157,6 +161,10 @@
     - id: TreasureCoinDiamond
       amount: !type:RangeNumberSelector
         range: 2, 5
+    - !type:NestedSelector
+      tableId: RingTableRare
+      rolls: !type:RangeNumberSelector
+        range: 2, 3
 
 # Equipment: Tools and things used by salvagers. Quote unquote "Gamer Loot"
 

diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/rings.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/rings.yml
new file mode 100644 (file)
index 0000000..17f83b2
--- /dev/null
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/rings.yml
@@ -0,0 +1,21 @@
+- type: entityTable
+  id: RingTableCommon
+  table: !type:GroupSelector
+    children:
+    - id: SilverRing
+      weight: 0.55
+    - id: GoldRing
+      weight: 0.45
+
+- type: entityTable
+  id: RingTableRare
+  table: !type:GroupSelector
+    children:
+    - id: GoldRingDiamond
+      weight: 0.1
+    - id: SilverRingDiamond
+      weight: 0.1
+    - id: GoldRingGem
+      weight: 0.35
+    - id: SilverRingGem
+      weight: 0.45

diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
index 91ac7b049a4ad5ed561896072e4c91b15a41b4e7..ba20a7b0cdde68b28c46250ec2676b57abdea511 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -200,6 +200,7 @@
       - ClothingHeadHatWelding
       - WetFloorSign
       - ClothingHeadHatCone
+
   - type: EmagLatheRecipes
     emagStaticRecipes:
       - BoxLethalshot

diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml
index bece1fb479a63490e01b7922f0822486c350a034..d823f93d9daf89f69e7c0587c4cb0a849f8673b6 100644 (file)
--- a/Resources/Prototypes/tags.yml
+++ b/Resources/Prototypes/tags.yml
@@ -1090,6 +1090,9 @@
 - type: Tag
   id: RifleStock
 
+- type: Tag
+  id: Ring
+
 - type: Tag
   id: RipleyCentralControlModule
 

diff --git a/Resources/Textures/Clothing/Hands/Rings/basic.rsi/gem.png b/Resources/Textures/Clothing/Hands/Rings/basic.rsi/gem.png
new file mode 100644 (file)
index 0000000..fcfbce6
Binary files /dev/null and b/Resources/Textures/Clothing/Hands/Rings/basic.rsi/gem.png differ

diff --git a/Resources/Textures/Clothing/Hands/Rings/basic.rsi/meta.json b/Resources/Textures/Clothing/Hands/Rings/basic.rsi/meta.json
new file mode 100644 (file)
index 0000000..44edc26
--- /dev/null
+++ b/Resources/Textures/Clothing/Hands/Rings/basic.rsi/meta.json
@@ -0,0 +1,17 @@
+{
+    "version": 1,
+    "license": "CC0-1.0",
+    "copyright": "Created by Beck Thompson for SS14",
+    "size": {
+      "x": 32,
+      "y": 32
+    },
+    "states": [
+      {
+        "name": "ring"
+      },
+      {
+        "name": "gem"
+      }
+    ]
+  }

diff --git a/Resources/Textures/Clothing/Hands/Rings/basic.rsi/ring.png b/Resources/Textures/Clothing/Hands/Rings/basic.rsi/ring.png
new file mode 100644 (file)
index 0000000..bb8bfac
Binary files /dev/null and b/Resources/Textures/Clothing/Hands/Rings/basic.rsi/ring.png differ