From b7e4fbb74addd9e59c5a2aa4e4aef7300c0709ce Mon Sep 17 00:00:00 2001
From: Nim <128169402+Nimfar11@users.noreply.github.com>
Date: Mon, 14 Apr 2025 14:50:07 +0300
Subject: [PATCH] Amulets are jewellery (#1126)

* amulets are jewellery

* transfer textures
---
 .../Clothing/{Cloak => Rings}/amulet.yml      |  30 ++++++++++++------
 .../Amulet/amulet.rsi/icon.png                | Bin
 .../Amulet/amulet.rsi/meta.json               |   0
 .../Amulet/amulet_mana.rsi/amethyst_stone.png | Bin
 .../Amulet/amulet_mana.rsi/icon.png           | Bin
 .../Amulet/amulet_mana.rsi/meta.json          |   0
 6 files changed, 20 insertions(+), 10 deletions(-)
 rename Resources/Prototypes/_CP14/Entities/Clothing/{Cloak => Rings}/amulet.yml (51%)
 rename Resources/Textures/_CP14/Clothing/{Cloak => Rings}/Amulet/amulet.rsi/icon.png (100%)
 rename Resources/Textures/_CP14/Clothing/{Cloak => Rings}/Amulet/amulet.rsi/meta.json (100%)
 rename Resources/Textures/_CP14/Clothing/{Cloak => Rings}/Amulet/amulet_mana.rsi/amethyst_stone.png (100%)
 rename Resources/Textures/_CP14/Clothing/{Cloak => Rings}/Amulet/amulet_mana.rsi/icon.png (100%)
 rename Resources/Textures/_CP14/Clothing/{Cloak => Rings}/Amulet/amulet_mana.rsi/meta.json (100%)

diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/Cloak/amulet.yml b/Resources/Prototypes/_CP14/Entities/Clothing/Rings/amulet.yml
similarity index 51%
rename from Resources/Prototypes/_CP14/Entities/Clothing/Cloak/amulet.yml
rename to Resources/Prototypes/_CP14/Entities/Clothing/Rings/amulet.yml
index af1a6a915e..70ba0c3def 100644
--- a/Resources/Prototypes/_CP14/Entities/Clothing/Cloak/amulet.yml
+++ b/Resources/Prototypes/_CP14/Entities/Clothing/Rings/amulet.yml
@@ -1,33 +1,43 @@
 - type: entity
-  parent: 
-  - CP14ClothingCloakBase
-  - ClothingSlotBase
+  abstract: true
+  parent: Clothing
+  id: CP14ClothingJewelleryBase
+  categories: [ ForkFiltered ]
+  components:
+  - type: Item
+    size: Small
+  - type: Clothing
+    slots:
+    - ring
+
+- type: entity
+  parent: CP14ClothingJewelleryBase
   id: CP14ClothingCloakAmuletGold
   name: gold amulet
   description: A gold amulet, a valuable trinket.
   components:
   - type: Sprite
-    sprite: _CP14/Clothing/Cloak/Amulet/amulet.rsi
+    sprite: _CP14/Clothing/Rings/Amulet/amulet.rsi
+    layers:
+    - state: icon
   - type: Clothing
-    sprite: _CP14/Clothing/Cloak/Amulet/amulet.rsi
+    sprite: _CP14/Clothing/Rings/Amulet/amulet.rsi
   - type: CP14Material
     materials:
       CP14Gold: 5
 
 - type: entity
-  parent: 
-  - CP14ClothingCloakBase
-  - ClothingSlotBase
+  parent: CP14ClothingJewelleryBase
   id: CP14ClothingCloakAmuletMana
   name: mana amulet
   description: A gold amulet with a magical stone inside that helps you conjure more easily.
   components:
   - type: Sprite
-    sprite: _CP14/Clothing/Cloak/Amulet/amulet_mana.rsi
+    sprite: _CP14/Clothing/Rings/Amulet/amulet_mana.rsi
     layers:
     - state: icon
     - state: amethyst_stone
   - type: Clothing
-    sprite: _CP14/Clothing/Cloak/Amulet/amulet_mana.rsi
+    sprite: _CP14/Clothing/Rings/Amulet/amulet_mana.rsi
   - type: CP14MagicManacostModify
     globalModifier: 0.9
diff --git a/Resources/Textures/_CP14/Clothing/Cloak/Amulet/amulet.rsi/icon.png b/Resources/Textures/_CP14/Clothing/Rings/Amulet/amulet.rsi/icon.png
similarity index 100%
rename from Resources/Textures/_CP14/Clothing/Cloak/Amulet/amulet.rsi/icon.png
rename to Resources/Textures/_CP14/Clothing/Rings/Amulet/amulet.rsi/icon.png
diff --git a/Resources/Textures/_CP14/Clothing/Cloak/Amulet/amulet.rsi/meta.json b/Resources/Textures/_CP14/Clothing/Rings/Amulet/amulet.rsi/meta.json
similarity index 100%
rename from Resources/Textures/_CP14/Clothing/Cloak/Amulet/amulet.rsi/meta.json
rename to Resources/Textures/_CP14/Clothing/Rings/Amulet/amulet.rsi/meta.json
diff --git a/Resources/Textures/_CP14/Clothing/Cloak/Amulet/amulet_mana.rsi/amethyst_stone.png b/Resources/Textures/_CP14/Clothing/Rings/Amulet/amulet_mana.rsi/amethyst_stone.png
similarity index 100%
rename from Resources/Textures/_CP14/Clothing/Cloak/Amulet/amulet_mana.rsi/amethyst_stone.png
rename to Resources/Textures/_CP14/Clothing/Rings/Amulet/amulet_mana.rsi/amethyst_stone.png
diff --git a/Resources/Textures/_CP14/Clothing/Cloak/Amulet/amulet_mana.rsi/icon.png b/Resources/Textures/_CP14/Clothing/Rings/Amulet/amulet_mana.rsi/icon.png
similarity index 100%
rename from Resources/Textures/_CP14/Clothing/Cloak/Amulet/amulet_mana.rsi/icon.png
rename to Resources/Textures/_CP14/Clothing/Rings/Amulet/amulet_mana.rsi/icon.png
diff --git a/Resources/Textures/_CP14/Clothing/Cloak/Amulet/amulet_mana.rsi/meta.json b/Resources/Textures/_CP14/Clothing/Rings/Amulet/amulet_mana.rsi/meta.json
similarity index 100%
rename from Resources/Textures/_CP14/Clothing/Cloak/Amulet/amulet_mana.rsi/meta.json
rename to Resources/Textures/_CP14/Clothing/Rings/Amulet/amulet_mana.rsi/meta.json