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