diff --git a/Content.Client/Clothing/ClientClothingSystem.cs b/Content.Client/Clothing/ClientClothingSystem.cs index ad2de7ef5d..53c8c3a6d5 100644 --- a/Content.Client/Clothing/ClientClothingSystem.cs +++ b/Content.Client/Clothing/ClientClothingSystem.cs @@ -48,8 +48,6 @@ public sealed class ClientClothingSystem : ClothingSystem {"pocket1", "POCKET1"}, {"pocket2", "POCKET2"}, {"suitstorage", "SUITSTORAGE"}, - {"ring1", "RING1"}, - {"ring2", "RING2"}, {"pants", "PANTS"}, {"shirt", "SHIRT"}, {"cloak", "CLOAK"}, diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/Rings/ring.yml b/Resources/Prototypes/_CP14/Entities/Clothing/Rings/ring.yml deleted file mode 100644 index 8d3cadc6cb..0000000000 --- a/Resources/Prototypes/_CP14/Entities/Clothing/Rings/ring.yml +++ /dev/null @@ -1,63 +0,0 @@ -- type: entity - abstract: true - parent: Clothing - id: CP14ClothingRingBase - categories: [ ForkFiltered ] - components: - - type: Item - size: Tiny - - type: Clothing - slots: - - ring - - type: Sprite - sprite: _CP14/Clothing/Rings/rings.rsi - -- type: entity - id: CP14ClothingRingIceShards - parent: CP14ClothingRingBase - name: ice shards conductive ring - suffix: Ice Shards - description: A standard mana-conductive ring that allows the user to summon ice shards. - components: - - type: Sprite - layers: - - state: brass_ring - - state: saphhire_stone_small - - type: CP14SpellStorageAccessWearing - - type: CP14SpellStorage - spells: - - CP14ActionSpellIceShards - -- type: entity - id: CP14ClothingRingFireball - parent: CP14ClothingRingBase - name: fireball conductive ring - description: A standard mana-conductive ring that allows the user to summon fireballs. - categories: [ DoNotMap ] - suffix: Fireball, Artifact - components: - - type: Sprite - layers: - - state: brass_ring - - state: ruby_stone_small - - type: CP14SpellStorageAccessWearing - - type: CP14SpellStorage - spells: - - CP14ActionSpellFireball - -- type: entity - id: CP14ClothingRingFlashLight - parent: CP14ClothingRingBase - name: flash conductive ring - description: A standard mana-conductive ring that allows the user to create a bright flash of light that blinds enemies. - suffix: Flash Light - components: - - type: Sprite - layers: - - state: brass_ring - - state: citrine_stone_small - - type: CP14SpellStorageAccessWearing - - type: CP14SpellStorage - spells: - - CP14ActionSpellFlashLight - diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/Rings/amulet.yml b/Resources/Prototypes/_CP14/Entities/Objects/Misc/amulet.yml similarity index 60% rename from Resources/Prototypes/_CP14/Entities/Clothing/Rings/amulet.yml rename to Resources/Prototypes/_CP14/Entities/Objects/Misc/amulet.yml index f92fd78edb..23306f1885 100644 --- a/Resources/Prototypes/_CP14/Entities/Clothing/Rings/amulet.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Misc/amulet.yml @@ -1,14 +1,13 @@ +# TODO remove amulets from the game and replace with something not-wearable visually + - type: entity abstract: true - parent: Clothing + parent: BaseItem id: CP14ClothingJewelleryBase categories: [ ForkFiltered ] components: - type: Item size: Small - - type: Clothing - slots: - - ring - type: entity parent: CP14ClothingJewelleryBase @@ -17,11 +16,9 @@ description: A gold amulet, a valuable trinket. components: - type: Sprite - sprite: _CP14/Clothing/Rings/Amulet/amulet.rsi + sprite: _CP14/Objects/Misc/Amulet/amulet.rsi layers: - state: icon - - type: Clothing - sprite: _CP14/Clothing/Rings/Amulet/amulet.rsi - type: PhysicalComposition materialComposition: CP14Gold: 5 @@ -31,18 +28,14 @@ - type: entity parent: CP14ClothingJewelleryBase id: CP14ClothingCloakAmuletMana - name: mana amulet - description: A gold amulet with a magical stone inside that helps you conjure more easily. + name: strange amulet + description: A gold amulet with a magical stone inside. components: - type: Sprite - sprite: _CP14/Clothing/Rings/Amulet/amulet_mana.rsi + sprite: _CP14/Objects/Misc/Amulet/amulet_mana.rsi layers: - state: icon - state: amethyst_stone - - type: Clothing - sprite: _CP14/Clothing/Rings/Amulet/amulet_mana.rsi - - type: CP14MagicManacostModify - globalModifier: 0.9 - type: PhysicalComposition materialComposition: CP14Gold: 5 diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Magic/twoHandedStaffs.yml b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Magic/twoHandedStaffs.yml index c4646d7353..1aa4db81ad 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Magic/twoHandedStaffs.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Magic/twoHandedStaffs.yml @@ -62,9 +62,6 @@ - CP14ActionSpellCureBurn - CP14ActionSpellBloodPurification - CP14ActionSpellResurrection - #- type: CP14MagicManacostModify - # modifiers: - # Life: 1.4 - type: CP14MagicEnergyExaminable - type: CP14MagicEnergyContainer energy: 80 @@ -78,9 +75,6 @@ categories: [ DoNotMap ] suffix: Artifact components: - # - type: CP14MagicManacostModify - # modifiers: - # tempus: 1.4 - type: CP14SpellStorage spells: - CP14ActionSpellShadowStep @@ -91,3 +85,21 @@ sprite: _CP14/Objects/Weapons/Magic/TwoHandedStaff/shadow_staff.rsi - type: Clothing sprite: _CP14/Objects/Weapons/Magic/TwoHandedStaff/shadow_staff.rsi + +- type: entity + id: CP14MagicFireStaff + parent: CP14MagicShadowStaff + name: magic fire staff + description: A long, half-tech, half-magic stick designed to convert magical energy into fire spells. + categories: [ DoNotMap ] + suffix: Artifact + components: + - type: CP14SpellStorage + spells: + - CP14ActionSpellFireball + - CP14ActionSpellHeat + - CP14ActionSpellFlameCreation + - type: Sprite + sprite: _CP14/Objects/Weapons/Magic/TwoHandedStaff/fire_staff.rsi + - type: Clothing + sprite: _CP14/Objects/Weapons/Magic/TwoHandedStaff/fire_staff.rsi diff --git a/Resources/Prototypes/_CP14/InventoryTemplates/carcat_inventory_template.yml b/Resources/Prototypes/_CP14/InventoryTemplates/carcat_inventory_template.yml index 8eedb4f3ef..d6fb4945f0 100644 --- a/Resources/Prototypes/_CP14/InventoryTemplates/carcat_inventory_template.yml +++ b/Resources/Prototypes/_CP14/InventoryTemplates/carcat_inventory_template.yml @@ -3,12 +3,12 @@ slots: # Left hotbar # 0, y - - name: ring1 - slotTexture: ring - slotFlags: RING + - name: gloves + slotTexture: gloves + slotFlags: GLOVES uiWindowPos: 0,1 - strippingWindowPos: 0,3 - displayName: Ring + strippingWindowPos: 0,2 + displayName: Gloves - name: mask slotTexture: mask slotFlags: MASK @@ -47,18 +47,6 @@ strippingWindowPos: 1,1 displayName: Head # 2, y - - name: gloves - slotTexture: gloves - slotFlags: GLOVES - uiWindowPos: 2,0 - strippingWindowPos: 0,2 - displayName: Gloves - - name: ring2 - slotTexture: ring - slotFlags: RING - uiWindowPos: 2,1 - strippingWindowPos: 2,3 - displayName: Ring - name: outerClothing slotTexture: suit slotFlags: OUTERCLOTHING diff --git a/Resources/Prototypes/_CP14/InventoryTemplates/human_inventory_template.yml b/Resources/Prototypes/_CP14/InventoryTemplates/human_inventory_template.yml index 46a24d1d37..70eb7c8169 100644 --- a/Resources/Prototypes/_CP14/InventoryTemplates/human_inventory_template.yml +++ b/Resources/Prototypes/_CP14/InventoryTemplates/human_inventory_template.yml @@ -3,12 +3,12 @@ slots: # Left hotbar # 0, y - - name: ring1 - slotTexture: ring - slotFlags: RING + - name: gloves + slotTexture: gloves + slotFlags: GLOVES uiWindowPos: 0,1 - strippingWindowPos: 0,3 - displayName: Ring + strippingWindowPos: 0,2 + displayName: Gloves - name: mask slotTexture: mask slotFlags: MASK @@ -22,12 +22,6 @@ strippingWindowPos: 0,1 displayName: Eyes # 1, y - - name: shoes - slotTexture: shoes - slotFlags: FEET - uiWindowPos: 1,0 - strippingWindowPos: 1,5 - displayName: Shoes - name: pants slotTexture: pants slotFlags: PANTS @@ -47,18 +41,12 @@ strippingWindowPos: 1,1 displayName: Head # 2, y - - name: gloves - slotTexture: gloves - slotFlags: GLOVES - uiWindowPos: 2,0 - strippingWindowPos: 0,2 - displayName: Gloves - - name: ring2 - slotTexture: ring - slotFlags: RING + - name: shoes + slotTexture: shoes + slotFlags: FEET uiWindowPos: 2,1 - strippingWindowPos: 2,3 - displayName: Ring + strippingWindowPos: 1,5 + displayName: Shoes - name: outerClothing slotTexture: suit slotFlags: OUTERCLOTHING diff --git a/Resources/Prototypes/_CP14/UniqueLoot/demiplane_loot.yml b/Resources/Prototypes/_CP14/UniqueLoot/demiplane_loot.yml index 0673a93b39..991712dd93 100644 --- a/Resources/Prototypes/_CP14/UniqueLoot/demiplane_loot.yml +++ b/Resources/Prototypes/_CP14/UniqueLoot/demiplane_loot.yml @@ -14,8 +14,8 @@ - CP14UniqueSpawnDemiplanetLoot - type: uniqueSpawn - id: CP14ClothingRingFireball - entity: CP14ClothingRingFireball + id: CP14MagicFireStaff + entity: CP14MagicFireStaff tags: - CP14UniqueSpawnDemiplanetLoot diff --git a/Resources/Textures/Interface/Default/Slots/ring.png b/Resources/Textures/Interface/Default/Slots/ring.png deleted file mode 100644 index 188b4a5105..0000000000 Binary files a/Resources/Textures/Interface/Default/Slots/ring.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Clothing/Rings/rings.rsi/amethyst_stone_small.png b/Resources/Textures/_CP14/Clothing/Rings/rings.rsi/amethyst_stone_small.png deleted file mode 100644 index b483af555a..0000000000 Binary files a/Resources/Textures/_CP14/Clothing/Rings/rings.rsi/amethyst_stone_small.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Clothing/Rings/rings.rsi/berill_stone_small.png b/Resources/Textures/_CP14/Clothing/Rings/rings.rsi/berill_stone_small.png deleted file mode 100644 index 8a6a9b4636..0000000000 Binary files a/Resources/Textures/_CP14/Clothing/Rings/rings.rsi/berill_stone_small.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Clothing/Rings/rings.rsi/brass_ring.png b/Resources/Textures/_CP14/Clothing/Rings/rings.rsi/brass_ring.png deleted file mode 100644 index 7d99503bce..0000000000 Binary files a/Resources/Textures/_CP14/Clothing/Rings/rings.rsi/brass_ring.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Clothing/Rings/rings.rsi/citrine_stone_small.png b/Resources/Textures/_CP14/Clothing/Rings/rings.rsi/citrine_stone_small.png deleted file mode 100644 index 20ff822b6c..0000000000 Binary files a/Resources/Textures/_CP14/Clothing/Rings/rings.rsi/citrine_stone_small.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Clothing/Rings/rings.rsi/emerald_stone_small.png b/Resources/Textures/_CP14/Clothing/Rings/rings.rsi/emerald_stone_small.png deleted file mode 100644 index 897dfdbf1d..0000000000 Binary files a/Resources/Textures/_CP14/Clothing/Rings/rings.rsi/emerald_stone_small.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Clothing/Rings/rings.rsi/gold_ring.png b/Resources/Textures/_CP14/Clothing/Rings/rings.rsi/gold_ring.png deleted file mode 100644 index 42f30221f6..0000000000 Binary files a/Resources/Textures/_CP14/Clothing/Rings/rings.rsi/gold_ring.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Clothing/Rings/rings.rsi/meta.json b/Resources/Textures/_CP14/Clothing/Rings/rings.rsi/meta.json deleted file mode 100644 index 5fd444d4b3..0000000000 --- a/Resources/Textures/_CP14/Clothing/Rings/rings.rsi/meta.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "version": 1, - "license": "CC-BY-SA-4.0", - "copyright": "Created by TheShuEd, gold_ring by trushnikov_daniel", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "brass_ring" - }, - { - "name": "gold_ring" - }, - { - "name": "saphhire_stone_small" - }, - { - "name": "ruby_stone_small" - }, - { - "name": "emerald_stone_small" - }, - { - "name": "amethyst_stone_small" - }, - { - "name": "berill_stone_small" - }, - { - "name": "citrine_stone_small" - } - ] -} diff --git a/Resources/Textures/_CP14/Clothing/Rings/rings.rsi/ruby_stone_small.png b/Resources/Textures/_CP14/Clothing/Rings/rings.rsi/ruby_stone_small.png deleted file mode 100644 index cfd1e9572a..0000000000 Binary files a/Resources/Textures/_CP14/Clothing/Rings/rings.rsi/ruby_stone_small.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Clothing/Rings/rings.rsi/saphhire_stone_small.png b/Resources/Textures/_CP14/Clothing/Rings/rings.rsi/saphhire_stone_small.png deleted file mode 100644 index f280be4b5a..0000000000 Binary files a/Resources/Textures/_CP14/Clothing/Rings/rings.rsi/saphhire_stone_small.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Clothing/Rings/Amulet/amulet.rsi/icon.png b/Resources/Textures/_CP14/Objects/Misc/Amulet/amulet.rsi/icon.png similarity index 100% rename from Resources/Textures/_CP14/Clothing/Rings/Amulet/amulet.rsi/icon.png rename to Resources/Textures/_CP14/Objects/Misc/Amulet/amulet.rsi/icon.png diff --git a/Resources/Textures/_CP14/Clothing/Rings/Amulet/amulet.rsi/meta.json b/Resources/Textures/_CP14/Objects/Misc/Amulet/amulet.rsi/meta.json similarity index 100% rename from Resources/Textures/_CP14/Clothing/Rings/Amulet/amulet.rsi/meta.json rename to Resources/Textures/_CP14/Objects/Misc/Amulet/amulet.rsi/meta.json diff --git a/Resources/Textures/_CP14/Clothing/Rings/Amulet/amulet_mana.rsi/amethyst_stone.png b/Resources/Textures/_CP14/Objects/Misc/Amulet/amulet_mana.rsi/amethyst_stone.png similarity index 100% rename from Resources/Textures/_CP14/Clothing/Rings/Amulet/amulet_mana.rsi/amethyst_stone.png rename to Resources/Textures/_CP14/Objects/Misc/Amulet/amulet_mana.rsi/amethyst_stone.png diff --git a/Resources/Textures/_CP14/Clothing/Rings/Amulet/amulet_mana.rsi/icon.png b/Resources/Textures/_CP14/Objects/Misc/Amulet/amulet_mana.rsi/icon.png similarity index 100% rename from Resources/Textures/_CP14/Clothing/Rings/Amulet/amulet_mana.rsi/icon.png rename to Resources/Textures/_CP14/Objects/Misc/Amulet/amulet_mana.rsi/icon.png diff --git a/Resources/Textures/_CP14/Clothing/Rings/Amulet/amulet_mana.rsi/meta.json b/Resources/Textures/_CP14/Objects/Misc/Amulet/amulet_mana.rsi/meta.json similarity index 100% rename from Resources/Textures/_CP14/Clothing/Rings/Amulet/amulet_mana.rsi/meta.json rename to Resources/Textures/_CP14/Objects/Misc/Amulet/amulet_mana.rsi/meta.json diff --git a/Resources/Textures/_CP14/Objects/Weapons/Magic/TwoHandedStaff/fire_staff.rsi/equipped-NECK.png b/Resources/Textures/_CP14/Objects/Weapons/Magic/TwoHandedStaff/fire_staff.rsi/equipped-NECK.png new file mode 100644 index 0000000000..5e740b01d5 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Weapons/Magic/TwoHandedStaff/fire_staff.rsi/equipped-NECK.png differ diff --git a/Resources/Textures/_CP14/Objects/Weapons/Magic/TwoHandedStaff/fire_staff.rsi/icon.png b/Resources/Textures/_CP14/Objects/Weapons/Magic/TwoHandedStaff/fire_staff.rsi/icon.png new file mode 100644 index 0000000000..c9737c5c32 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Weapons/Magic/TwoHandedStaff/fire_staff.rsi/icon.png differ diff --git a/Resources/Textures/_CP14/Objects/Weapons/Magic/TwoHandedStaff/fire_staff.rsi/inhand-left.png b/Resources/Textures/_CP14/Objects/Weapons/Magic/TwoHandedStaff/fire_staff.rsi/inhand-left.png new file mode 100644 index 0000000000..3254c549a5 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Weapons/Magic/TwoHandedStaff/fire_staff.rsi/inhand-left.png differ diff --git a/Resources/Textures/_CP14/Objects/Weapons/Magic/TwoHandedStaff/fire_staff.rsi/inhand-right.png b/Resources/Textures/_CP14/Objects/Weapons/Magic/TwoHandedStaff/fire_staff.rsi/inhand-right.png new file mode 100644 index 0000000000..cd77070888 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Weapons/Magic/TwoHandedStaff/fire_staff.rsi/inhand-right.png differ diff --git a/Resources/Textures/_CP14/Objects/Weapons/Magic/TwoHandedStaff/fire_staff.rsi/meta.json b/Resources/Textures/_CP14/Objects/Weapons/Magic/TwoHandedStaff/fire_staff.rsi/meta.json new file mode 100644 index 0000000000..669cb9d0f4 --- /dev/null +++ b/Resources/Textures/_CP14/Objects/Weapons/Magic/TwoHandedStaff/fire_staff.rsi/meta.json @@ -0,0 +1,34 @@ +{ + "version": 1, + "license": "CC-BY-SA-4.0", + "copyright": "Created by TheShuEd (Github)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "wielded-inhand-left", + "directions": 4 + }, + { + "name": "wielded-inhand-right", + "directions": 4 + }, + { + "name": "equipped-NECK", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_CP14/Objects/Weapons/Magic/TwoHandedStaff/fire_staff.rsi/wielded-inhand-left.png b/Resources/Textures/_CP14/Objects/Weapons/Magic/TwoHandedStaff/fire_staff.rsi/wielded-inhand-left.png new file mode 100644 index 0000000000..c8ded7cec4 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Weapons/Magic/TwoHandedStaff/fire_staff.rsi/wielded-inhand-left.png differ diff --git a/Resources/Textures/_CP14/Objects/Weapons/Magic/TwoHandedStaff/fire_staff.rsi/wielded-inhand-right.png b/Resources/Textures/_CP14/Objects/Weapons/Magic/TwoHandedStaff/fire_staff.rsi/wielded-inhand-right.png new file mode 100644 index 0000000000..c8ded7cec4 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Weapons/Magic/TwoHandedStaff/fire_staff.rsi/wielded-inhand-right.png differ diff --git a/Resources/migration.yml b/Resources/migration.yml index 4f3f4adef8..80072c1f1d 100644 --- a/Resources/migration.yml +++ b/Resources/migration.yml @@ -338,6 +338,10 @@ CP14WoodenChestFilledEnergyCrystals: null CP14WoodenChestFilledAlchemy: null CP14WoodenChestFilledCheese: null +#2025-05-06 +CP14ClothingRingFireball: null +CP14ClothingRingFlashLight: null +CP14ClothingRingIceShards: null # <---> CrystallEdge migration zone end