fuck rings (#1389)

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"},

Resources/Prototypes/_CP14/Entities/Clothing/Rings/ring.yml

@@ -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
-

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

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

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

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

Resources/Prototypes/_CP14/UniqueLoot/demiplane_loot.yml

@@ -14,8 +14,8 @@
   - CP14UniqueSpawnDemiplanetLoot
 
 - type: uniqueSpawn
-  id: CP14ClothingRingFireball
-  entity: CP14ClothingRingFireball
+  id: CP14MagicFireStaff
+  entity: CP14MagicFireStaff
   tags:
   - CP14UniqueSpawnDemiplanetLoot
 

Resources/Textures/_CP14/Clothing/Rings/rings.rsi/meta.json

@@ -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"
-        }
-    ]
-}

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
+    }
+  ]
+}

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