From a04720e2a0a1734b467b817df878fc26446f7b47 Mon Sep 17 00:00:00 2001 From: Red <96445749+TheShuEd@users.noreply.github.com> Date: Thu, 5 Jun 2025 12:46:38 +0300 Subject: [PATCH] fuck rings (#1389) --- .../Clothing/ClientClothingSystem.cs | 2 - .../_CP14/Entities/Clothing/Rings/ring.yml | 63 ------------------ .../Rings => Objects/Misc}/amulet.yml | 21 ++---- .../Objects/Weapons/Magic/twoHandedStaffs.yml | 24 +++++-- .../carcat_inventory_template.yml | 22 ++---- .../human_inventory_template.yml | 32 +++------ .../_CP14/UniqueLoot/demiplane_loot.yml | 4 +- .../Textures/Interface/Default/Slots/ring.png | Bin 391 -> 0 bytes .../Rings/rings.rsi/amethyst_stone_small.png | Bin 163 -> 0 bytes .../Rings/rings.rsi/berill_stone_small.png | Bin 164 -> 0 bytes .../Clothing/Rings/rings.rsi/brass_ring.png | Bin 282 -> 0 bytes .../Rings/rings.rsi/citrine_stone_small.png | Bin 146 -> 0 bytes .../Rings/rings.rsi/emerald_stone_small.png | Bin 163 -> 0 bytes .../Clothing/Rings/rings.rsi/gold_ring.png | Bin 282 -> 0 bytes .../_CP14/Clothing/Rings/rings.rsi/meta.json | 35 ---------- .../Rings/rings.rsi/ruby_stone_small.png | Bin 161 -> 0 bytes .../Rings/rings.rsi/saphhire_stone_small.png | Bin 164 -> 0 bytes .../Misc}/Amulet/amulet.rsi/icon.png | Bin .../Misc}/Amulet/amulet.rsi/meta.json | 0 .../Amulet/amulet_mana.rsi/amethyst_stone.png | Bin .../Misc}/Amulet/amulet_mana.rsi/icon.png | Bin .../Misc}/Amulet/amulet_mana.rsi/meta.json | 0 .../fire_staff.rsi/equipped-NECK.png | Bin 0 -> 525 bytes .../TwoHandedStaff/fire_staff.rsi/icon.png | Bin 0 -> 551 bytes .../fire_staff.rsi/inhand-left.png | Bin 0 -> 716 bytes .../fire_staff.rsi/inhand-right.png | Bin 0 -> 757 bytes .../TwoHandedStaff/fire_staff.rsi/meta.json | 34 ++++++++++ .../fire_staff.rsi/wielded-inhand-left.png | Bin 0 -> 796 bytes .../fire_staff.rsi/wielded-inhand-right.png | Bin 0 -> 796 bytes Resources/migration.yml | 4 ++ 30 files changed, 80 insertions(+), 161 deletions(-) delete mode 100644 Resources/Prototypes/_CP14/Entities/Clothing/Rings/ring.yml rename Resources/Prototypes/_CP14/Entities/{Clothing/Rings => Objects/Misc}/amulet.yml (60%) delete mode 100644 Resources/Textures/Interface/Default/Slots/ring.png delete mode 100644 Resources/Textures/_CP14/Clothing/Rings/rings.rsi/amethyst_stone_small.png delete mode 100644 Resources/Textures/_CP14/Clothing/Rings/rings.rsi/berill_stone_small.png delete mode 100644 Resources/Textures/_CP14/Clothing/Rings/rings.rsi/brass_ring.png delete mode 100644 Resources/Textures/_CP14/Clothing/Rings/rings.rsi/citrine_stone_small.png delete mode 100644 Resources/Textures/_CP14/Clothing/Rings/rings.rsi/emerald_stone_small.png delete mode 100644 Resources/Textures/_CP14/Clothing/Rings/rings.rsi/gold_ring.png delete mode 100644 Resources/Textures/_CP14/Clothing/Rings/rings.rsi/meta.json delete mode 100644 Resources/Textures/_CP14/Clothing/Rings/rings.rsi/ruby_stone_small.png delete mode 100644 Resources/Textures/_CP14/Clothing/Rings/rings.rsi/saphhire_stone_small.png rename Resources/Textures/_CP14/{Clothing/Rings => Objects/Misc}/Amulet/amulet.rsi/icon.png (100%) rename Resources/Textures/_CP14/{Clothing/Rings => Objects/Misc}/Amulet/amulet.rsi/meta.json (100%) rename Resources/Textures/_CP14/{Clothing/Rings => Objects/Misc}/Amulet/amulet_mana.rsi/amethyst_stone.png (100%) rename Resources/Textures/_CP14/{Clothing/Rings => Objects/Misc}/Amulet/amulet_mana.rsi/icon.png (100%) rename Resources/Textures/_CP14/{Clothing/Rings => Objects/Misc}/Amulet/amulet_mana.rsi/meta.json (100%) create mode 100644 Resources/Textures/_CP14/Objects/Weapons/Magic/TwoHandedStaff/fire_staff.rsi/equipped-NECK.png create mode 100644 Resources/Textures/_CP14/Objects/Weapons/Magic/TwoHandedStaff/fire_staff.rsi/icon.png create mode 100644 Resources/Textures/_CP14/Objects/Weapons/Magic/TwoHandedStaff/fire_staff.rsi/inhand-left.png create mode 100644 Resources/Textures/_CP14/Objects/Weapons/Magic/TwoHandedStaff/fire_staff.rsi/inhand-right.png create mode 100644 Resources/Textures/_CP14/Objects/Weapons/Magic/TwoHandedStaff/fire_staff.rsi/meta.json create mode 100644 Resources/Textures/_CP14/Objects/Weapons/Magic/TwoHandedStaff/fire_staff.rsi/wielded-inhand-left.png create mode 100644 Resources/Textures/_CP14/Objects/Weapons/Magic/TwoHandedStaff/fire_staff.rsi/wielded-inhand-right.png 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 188b4a5105ee8addae81619c7150f167f52d3bbd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 391 zcmV;20eJq2P)Px$K}keGR9J=OS3wSfFc4gbfr2+U5cvWhAl^OlAYb5vJbE{Nz%OVxz)h)M^wefq zY62@*66eIG&Ccw0O11!&;ox9btY36PmZxw&T_DTT-bwNP^XbxA-|ml^SAXn^_3LoG z^(OfSo7GZ_a431`dy|siAJ3ME1zuF-fe@3BH&R0Ads+klz=Cd4*unEhmh9r)Rgd88R zZoxM{9tvyoKuds)d0<`>5ycc!G0mxp?wGKVQctjB!!+!+1l%7_2z_sosTgx$%;RZ> lMc|n8F#QB^zZ)srM^=&5XQJ2)L>v(+$_F7A&u`i&?W{?S3j3^P6Px#)Ja4^R9J=WlQ9cHQ5c3FvM3!TgBaz;WFeC~D2sofZ1=yQEVnEc+hsQzd?+bL} z9d*a~kOMR;C1W{QPB0yoIqq+7dC#dDZ*N^d6&26$P9jcjK4|6Mg-o#ehL^z8(IfiU g+(s@4f*=S0FBeoh*RE38R~(s^pseEgYJ*zJJ05NJA6ZAfe0k8N rylv^z;=0@Smy4}vHPoM=;<>+=nRC5LfXtmLkhu(=u6{1-oD!M<@@zDn 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 897dfdbf1d21dab5fe2dcd716a90fe11a2eee665..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 163 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}v7RoDArY;~ z2@Px#)Ja4^R9J=W(xD2%P!z`T|3nN189so5VXPWdRz%R^8|)4C6ss1?z+##)Np?Jp7VW|dqD^x#E)5~gVAKF{4@rj)UHtNEsb^=7ie|5 z%5@xOVU5di17K95Xc`W1ND{X5Jpit4vIz=0hoi|4mV;x_9ibo;s5{u07*qoM6N<$g2Taf;Q#;t 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 cfd1e9572a31e3690590b0b49062d834e4593104..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 161 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}(Vi}jArY-_ zFK*;*Fc5GKeC^Wj;wc%F!kCtDIp?5ENT%{d1E)hgo$LOr|993ki+2V>gTe~ HDWM4f!*)4u 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 f280be4b5ac55d5667e166838981a5f07faff74a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 164 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}ah@)YArY;~ z2@x*~(Jqxw%YZg9c)I$ztaD0e0sz>o BH%kBj 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 0000000000000000000000000000000000000000..5e740b01d504c2f4aa17b017ed9af75a29cc6f06 GIT binary patch literal 525 zcmV+o0`mQdP)Px$$4Nv%RCt{2+ObQ+Kokb>S8-^;K_>@;B1A}MT|%c05^;6!-m%z%IJt^{fJ?S) zW^l3~8Fb6g4$`ioP-&MA%@9yr&gsNOxVtn>F8O{_hTP@xahIgcBLXq=7BMzyv#jg* z51X{vyhYOWt%;ua@V+lQ_sXf%C=>uswz7L$k-owT%v;2wvHyE4Ggc^oTGyq)tg2Aj zYP@VaL_{>0RjJl>mw$nv=dgI>=63&gnhnNl40=vFb*47)lJF2xnLHl3%(l$j1`zZd zW?Lq+Ei;{!iY-9J-2&^PCm!EC=JFB9O+Od(^d>(}_(ezuuhWI}n8F0`5q*=nvz2uj z*|05>U7j_R?oowV0jdx{)&(q!$_t0`=dtt z0Ftf%tK)eR%juTPx$;Ymb6R9J=0mcL6IVHn3h7eq1~l7K-lN=dy!nyv~tBtr&Cv2p5c%;&`X49dP5>H(jQAmXHKGOS)sRLZBaK2Pa)=l}Y8wsU=rqpO>rViTy_%$1 zFDZwJxgXCm-&vSG7XskRR0)8CV@IX`ztsEHte3>B zmI1JK_Bl9qIQ;nwt7Bh@RRRF8T3nRndEGMyq6KheW(@(DO^jotlN2B7EUkZ50&=6w ztRa5g9NQTpTn${y`BhD1E;fDFNxa|vx#x`4!?#{iol1MSwo6Xrm#=? zp+LlL54k9-V{7(FA0wS)eP#5182S$?`J5Q(B*_V#`sVPHF;WV{fEc-kX4a4w<{ZFK z5P^H(vaF7+eXza(@b2Ye;GP&6;4(xdp9=&L>a{w|h=zWz2Zd0wSo}-uHV9>#?eWZv zB=k6N^D0-mS_gp$WeToSyW7?NIAn~-R=d?$X++sK`1SOU#{uXM-OmX p8y-w#04~JxypFZAAEoU**Ev7&&EpF6@f!dD002ovPDHLkV1oWT`}+U@ literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..3254c549a5084cefe2d6bfbd54fced495a38de92 GIT binary patch literal 716 zcmV;-0yF)IP)Px%hDk(0RCt{2n!igMVI0PvmJSJIs9icJNb!Vo*5%0LP$EJn>DcU!QUl^pq?>f; zKX6+%Z*V9LlnmFUTpbdVQS=`psm2mCv)(gnXN!~ zZ_BO#dj%*H006`5D})0xjc}0Qb@<_q%o+U}>JOo_;nhTs&jQVWi}(i4^pugt-p3Q_ zr%%Ik9ksnyjIS^13KRir084lrH?Z8|xlSSWzfiDD6<-0yi83dOat|od3WysJCtsx{ zsk-6@+^PguTc5{ z;UK~AdOXR{_x?a#0fCm`lnEGjELMF0ym<3T>sX2b&h!*6;v0svIN}Cuuhms}`~}hJ zSs}^|;s#726*hTK@ta`LYAvOCC|Z=2vsf(hc&?)sW@hsBL}=XT=7*&*KsP@ug#jkv yX(Px%uSrBfRCt{2nz3u!KorJ5l@2y|XtH!jAe1QJ&dFjtWe5s^Orc}FXAF&@WGEq9 z$dG@)o407lP$~!-)Fr5355b|ugPTHv1I0r;2vV|KhagY&>F#tV`PBPO1|84eeR}se z^d4X^Ol8ynA-B6EZyh3#+g&nhAW{1Z+QTou-pEsw11$Qd8W6iTzIMUlORAtC%aA}q2lV2Y7A~YE4x%n6t{Zs?&g*n`f zpQH)OnzL^|tkgjccIu>7wY97REKoDxf4~@!v_SVlD1{=|fWpE1vY2atPFcXCmB|2| zHqQ%l28^RWDs@PMS0}RpuPP;OF?qnN(`0~(pn1cim&pKK(m#erugL&~I<$bvfR1;F z&6Oq9TBNYKvV@Lz$h@A(fUxaiYpo)xDO0xAD(OCi8Vm+Q60E}qIv{)x$ZB{(^^^*? z0X)M8GEi+aw*frE2WiP-N`>11uN$HJb#*d4p^}-MQb|30z=+>;NYrbQnd(w!JvgCy z^V~-u9-KJZUe082V&mk(0-lXf5uZ9A@Gmw_E-W7)UN^#NaGAdQ%E0jP0l|%$*h2S! zPoICHJTF@c9aSwlEk20cjh|pI%qfYjg#lrIUPx%)=5M`RCt{2+A&BQVH5}O|CL%SM9`uHHMXRtU@R?#8b~-CZU|Q*4n^W-rY=&K z458pqL`n%r5xTf!kT`}8QVb0ll0_7np`=KKrbtsoLclm2C|zEM<2#ZVDABu1EAKab z+~xbe_uhShkaqxMj4{R-V~jDzI;9!`X~hI(V=4iFR!mT*W4f|zOeK+s7*```NURzG ztxvjXebP-YN4-W70%IOq3Lu%e*y4;#rK1`=!+lWhI}n%)BRCt!^7JSIb78!C{tmvO za{$1U`v3z;NK~FD066`c0ss{9PmwNY*gdXbXTM}>e68HP%%oZWxbbv6!+pl}++GDE zy|++0s^RPe0Q98N1r0z7Z{Ak{0KJdG`h?^fq`PYppr3>Bwvs>l?Y za3Hvnk;M2(C4+&axhJol*X5#bhli3F*WY{g;2uOg;#xxi(gh8lzW;1kuzs;#M>l|r zi896*V~jDz7-Nhv#u)ogbmZUN=4OcK6NnzcwUmviMCEy+@;ueH`e}XAP1OiUw8m;% z{lcqyWZI` zLp!nl_2@KL*zTj=F4N-GiV2D;GI?Dt`WKFRyF}bkMW#!=a+i&%w*Dr!%5}+uF~%5U a=KBNMZ%>w8!KnEF00009?H literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..c8ded7cec424310f0610df7ccc6a49b5e9b42be8 GIT binary patch literal 796 zcmV+%1LOROP)Px%)=5M`RCt{2+A&BQVH5}O|CL%SM9`uHHMXRtU@R?#8b~-CZU|Q*4n^W-rY=&K z458pqL`n%r5xTf!kT`}8QVb0ll0_7np`=KKrbtsoLclm2C|zEM<2#ZVDABu1EAKab z+~xbe_uhShkaqxMj4{R-V~jDzI;9!`X~hI(V=4iFR!mT*W4f|zOeK+s7*```NURzG ztxvjXebP-YN4-W70%IOq3Lu%e*y4;#rK1`=!+lWhI}n%)BRCt!^7JSIb78!C{tmvO za{$1U`v3z;NK~FD066`c0ss{9PmwNY*gdXbXTM}>e68HP%%oZWxbbv6!+pl}++GDE zy|++0s^RPe0Q98N1r0z7Z{Ak{0KJdG`h?^fq`PYppr3>Bwvs>l?Y za3Hvnk;M2(C4+&axhJol*X5#bhli3F*WY{g;2uOg;#xxi(gh8lzW;1kuzs;#M>l|r zi896*V~jDz7-Nhv#u)ogbmZUN=4OcK6NnzcwUmviMCEy+@;ueH`e}XAP1OiUw8m;% z{lcqyWZI` zLp!nl_2@KL*zTj=F4N-GiV2D;GI?Dt`WKFRyF}bkMW#!=a+i&%w*Dr!%5}+uF~%5U a=KBNMZ%>w8!KnEF00009?H literal 0 HcmV?d00001 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