From 685a9616ab1144c5d34ab101c1a7a85cae25fba5 Mon Sep 17 00:00:00 2001 From: comasqw Date: Thu, 5 Dec 2024 00:41:23 +0400 Subject: [PATCH] =?UTF-8?q?=D0=BC=D0=BD=D0=BE=D0=B3=D0=BE=20=D1=87=D0=B5?= =?UTF-8?q?=D0=B3=D0=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ModularCraft/Modifiers/AddNewSlots.cs | 20 ---- .../Modifiers/AddSpellsToSpellStorage.cs | 2 - .../Modifiers/EditManacostModify.cs | 35 ++++++ .../CP14MagicManacostModifyComponent.cs | 2 +- .../{ => Magic}/magic_crystal.yml | 4 + .../Magic/magic_crystal_holder.yml | 77 +++++++++++++ .../Objects/ModularTools/{ => Magic}/ring.yml | 17 ++- .../Objects/ModularTools/Magic/staff.yml | 107 ++++++++++++++++++ .../ModularCraft/Blade/magic_crystal.yml | 12 -- .../Blade/magic_crystal_holder.yml | 12 -- .../ModularCraft/Magic/magic_crystal.yml | 64 +++++++++++ .../Magic/magic_crystal_holder.yml | 86 ++++++++++++++ .../Prototypes/_CP14/ModularCraft/slots.yml | 12 +- .../magic_crystal_holder_blue.rsi/blue1.png} | Bin .../magic_crystal_holder_blue.rsi/blue2.png | Bin 0 -> 570 bytes .../magic_crystal_holder_blue.rsi/blue3.png | Bin 0 -> 570 bytes .../magic_crystal_holder_blue.rsi/blue4.png | Bin 0 -> 570 bytes .../magic_crystal_holder_blue.rsi/meta.json | 23 ++++ .../equipped-NECK.png | Bin .../magic_crystals_holder_blue.rsi/icon1.png | Bin .../magic_crystals_holder_blue.rsi/icon2.png | Bin .../magic_crystals_holder_blue.rsi/icon3.png | Bin .../magic_crystals_holder_blue.rsi/icon4.png | Bin .../inhand-left.png | Bin .../inhand-right.png | Bin .../magic_crystals_holder_blue.rsi/meta.json | 0 .../wielded-inhand-left.png | Bin .../wielded-inhand-right.png | Bin .../equipped-NECK.png | Bin .../Staffs/glowing_wooden_staff.rsi}/icon.png | Bin .../glowing_wooden_staff.rsi}/inhand-left.png | Bin .../inhand-right.png | Bin .../glowing_wooden_staff.rsi}/meta.json | 0 .../wielded-inhand-left.png | Bin .../wielded-inhand-right.png | Bin .../Staffs/wooden_staff.rsi/equipped-NECK.png | Bin 0 -> 737 bytes .../Magic/Staffs/wooden_staff.rsi/icon.png | Bin 0 -> 705 bytes .../Staffs/wooden_staff.rsi/inhand-left.png | Bin 0 -> 890 bytes .../Staffs/wooden_staff.rsi/inhand-right.png | Bin 0 -> 909 bytes .../Magic/Staffs/wooden_staff.rsi/meta.json | 34 ++++++ .../wooden_staff.rsi/wielded-inhand-left.png | Bin 0 -> 912 bytes .../wooden_staff.rsi/wielded-inhand-right.png | Bin 0 -> 912 bytes .../blueholder_grey_icon1.png | Bin .../blueholder_grey_icon2.png | Bin .../blueholder_grey_icon3.png | Bin .../blueholder_grey_icon4.png | Bin .../{ => Magic}/magic_crystal.rsi/meta.json | 0 .../magic_crystal.rsi/ring_grey_icon.png | Bin 48 files changed, 454 insertions(+), 53 deletions(-) delete mode 100644 Content.Server/_CP14/ModularCraft/Modifiers/AddNewSlots.cs create mode 100644 Content.Server/_CP14/ModularCraft/Modifiers/EditManacostModify.cs rename Resources/Prototypes/_CP14/Entities/Objects/ModularTools/{ => Magic}/magic_crystal.yml (80%) create mode 100644 Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Magic/magic_crystal_holder.yml rename Resources/Prototypes/_CP14/Entities/Objects/ModularTools/{ => Magic}/ring.yml (63%) create mode 100644 Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Magic/staff.yml delete mode 100644 Resources/Prototypes/_CP14/ModularCraft/Blade/magic_crystal.yml delete mode 100644 Resources/Prototypes/_CP14/ModularCraft/Blade/magic_crystal_holder.yml create mode 100644 Resources/Prototypes/_CP14/ModularCraft/Magic/magic_crystal.yml create mode 100644 Resources/Prototypes/_CP14/ModularCraft/Magic/magic_crystal_holder.yml rename Resources/Textures/_CP14/Objects/Magic/{magic_crystal_holder.rsi/icon.png => Holders/magic_crystal_holder_blue.rsi/blue1.png} (100%) create mode 100644 Resources/Textures/_CP14/Objects/Magic/Holders/magic_crystal_holder_blue.rsi/blue2.png create mode 100644 Resources/Textures/_CP14/Objects/Magic/Holders/magic_crystal_holder_blue.rsi/blue3.png create mode 100644 Resources/Textures/_CP14/Objects/Magic/Holders/magic_crystal_holder_blue.rsi/blue4.png create mode 100644 Resources/Textures/_CP14/Objects/Magic/Holders/magic_crystal_holder_blue.rsi/meta.json rename Resources/Textures/_CP14/Objects/ModularTools/{ => Magic/Holders}/magic_crystals_holder_blue.rsi/equipped-NECK.png (100%) rename Resources/Textures/_CP14/Objects/ModularTools/{ => Magic/Holders}/magic_crystals_holder_blue.rsi/icon1.png (100%) rename Resources/Textures/_CP14/Objects/ModularTools/{ => Magic/Holders}/magic_crystals_holder_blue.rsi/icon2.png (100%) rename Resources/Textures/_CP14/Objects/ModularTools/{ => Magic/Holders}/magic_crystals_holder_blue.rsi/icon3.png (100%) rename Resources/Textures/_CP14/Objects/ModularTools/{ => Magic/Holders}/magic_crystals_holder_blue.rsi/icon4.png (100%) rename Resources/Textures/_CP14/Objects/ModularTools/{ => Magic/Holders}/magic_crystals_holder_blue.rsi/inhand-left.png (100%) rename Resources/Textures/_CP14/Objects/ModularTools/{ => Magic/Holders}/magic_crystals_holder_blue.rsi/inhand-right.png (100%) rename Resources/Textures/_CP14/Objects/ModularTools/{ => Magic/Holders}/magic_crystals_holder_blue.rsi/meta.json (100%) rename Resources/Textures/_CP14/Objects/ModularTools/{ => Magic/Holders}/magic_crystals_holder_blue.rsi/wielded-inhand-left.png (100%) rename Resources/Textures/_CP14/Objects/ModularTools/{ => Magic/Holders}/magic_crystals_holder_blue.rsi/wielded-inhand-right.png (100%) rename Resources/Textures/_CP14/Objects/ModularTools/{wooden_staff_grip.rsi => Magic/Staffs/glowing_wooden_staff.rsi}/equipped-NECK.png (100%) rename Resources/Textures/_CP14/Objects/ModularTools/{wooden_staff_grip.rsi => Magic/Staffs/glowing_wooden_staff.rsi}/icon.png (100%) rename Resources/Textures/_CP14/Objects/ModularTools/{wooden_staff_grip.rsi => Magic/Staffs/glowing_wooden_staff.rsi}/inhand-left.png (100%) rename Resources/Textures/_CP14/Objects/ModularTools/{wooden_staff_grip.rsi => Magic/Staffs/glowing_wooden_staff.rsi}/inhand-right.png (100%) rename Resources/Textures/_CP14/Objects/ModularTools/{wooden_staff_grip.rsi => Magic/Staffs/glowing_wooden_staff.rsi}/meta.json (100%) rename Resources/Textures/_CP14/Objects/ModularTools/{wooden_staff_grip.rsi => Magic/Staffs/glowing_wooden_staff.rsi}/wielded-inhand-left.png (100%) rename Resources/Textures/_CP14/Objects/ModularTools/{wooden_staff_grip.rsi => Magic/Staffs/glowing_wooden_staff.rsi}/wielded-inhand-right.png (100%) create mode 100644 Resources/Textures/_CP14/Objects/ModularTools/Magic/Staffs/wooden_staff.rsi/equipped-NECK.png create mode 100644 Resources/Textures/_CP14/Objects/ModularTools/Magic/Staffs/wooden_staff.rsi/icon.png create mode 100644 Resources/Textures/_CP14/Objects/ModularTools/Magic/Staffs/wooden_staff.rsi/inhand-left.png create mode 100644 Resources/Textures/_CP14/Objects/ModularTools/Magic/Staffs/wooden_staff.rsi/inhand-right.png create mode 100644 Resources/Textures/_CP14/Objects/ModularTools/Magic/Staffs/wooden_staff.rsi/meta.json create mode 100644 Resources/Textures/_CP14/Objects/ModularTools/Magic/Staffs/wooden_staff.rsi/wielded-inhand-left.png create mode 100644 Resources/Textures/_CP14/Objects/ModularTools/Magic/Staffs/wooden_staff.rsi/wielded-inhand-right.png rename Resources/Textures/_CP14/Objects/ModularTools/{ => Magic}/magic_crystal.rsi/blueholder_grey_icon1.png (100%) rename Resources/Textures/_CP14/Objects/ModularTools/{ => Magic}/magic_crystal.rsi/blueholder_grey_icon2.png (100%) rename Resources/Textures/_CP14/Objects/ModularTools/{ => Magic}/magic_crystal.rsi/blueholder_grey_icon3.png (100%) rename Resources/Textures/_CP14/Objects/ModularTools/{ => Magic}/magic_crystal.rsi/blueholder_grey_icon4.png (100%) rename Resources/Textures/_CP14/Objects/ModularTools/{ => Magic}/magic_crystal.rsi/meta.json (100%) rename Resources/Textures/_CP14/Objects/ModularTools/{ => Magic}/magic_crystal.rsi/ring_grey_icon.png (100%) diff --git a/Content.Server/_CP14/ModularCraft/Modifiers/AddNewSlots.cs b/Content.Server/_CP14/ModularCraft/Modifiers/AddNewSlots.cs deleted file mode 100644 index b9164ad375..0000000000 --- a/Content.Server/_CP14/ModularCraft/Modifiers/AddNewSlots.cs +++ /dev/null @@ -1,20 +0,0 @@ -using Content.Shared._CP14.ModularCraft.Prototypes; -using Content.Shared._CP14.ModularCraft; -using Content.Shared._CP14.ModularCraft.Components; -using Robust.Shared.Prototypes; - -namespace Content.Server._CP14.ModularCraft.Modifiers; - -public sealed partial class AddNewSlots : CP14ModularCraftModifier -{ - [DataField] - public List> Slots; - - public override void Effect(EntityManager entManager, Entity start, Entity? part) - { - foreach (var slot in Slots) - { - start.Comp.FreeSlots.Add(slot); - } - } -} diff --git a/Content.Server/_CP14/ModularCraft/Modifiers/AddSpellsToSpellStorage.cs b/Content.Server/_CP14/ModularCraft/Modifiers/AddSpellsToSpellStorage.cs index e26f46f271..85fdefe64e 100644 --- a/Content.Server/_CP14/ModularCraft/Modifiers/AddSpellsToSpellStorage.cs +++ b/Content.Server/_CP14/ModularCraft/Modifiers/AddSpellsToSpellStorage.cs @@ -1,7 +1,5 @@ -using System.Linq; using Content.Shared._CP14.ModularCraft; using Content.Shared._CP14.ModularCraft.Components; -using Content.Shared.Item; using Content.Shared._CP14.MagicSpellStorage; using Robust.Shared.Prototypes; diff --git a/Content.Server/_CP14/ModularCraft/Modifiers/EditManacostModify.cs b/Content.Server/_CP14/ModularCraft/Modifiers/EditManacostModify.cs new file mode 100644 index 0000000000..7ddbb9555c --- /dev/null +++ b/Content.Server/_CP14/ModularCraft/Modifiers/EditManacostModify.cs @@ -0,0 +1,35 @@ +using Content.Shared._CP14.ModularCraft; +using Content.Shared._CP14.ModularCraft.Components; +using Content.Shared._CP14.MagicManacostModify; +using Content.Shared._CP14.MagicRitual.Prototypes; +using Content.Shared.FixedPoint; +using Content.Shared._CP14.MagicSpellStorage; +using Robust.Shared.Prototypes; + +namespace Content.Server._CP14.ModularCraft.Modifiers; + +public sealed partial class EditManacostModify : CP14ModularCraftModifier +{ + [DataField] + public Dictionary, FixedPoint2> Modifiers = new(); + public override void Effect(EntityManager entManager, Entity start, Entity? part) + { + if (!entManager.TryGetComponent(start, out var manacostModifyComp)) + return; + + foreach (var (magicType, modifier) in Modifiers) + { + if (manacostModifyComp.Modifiers.ContainsKey(magicType)) + { + if (modifier >= 1f) + manacostModifyComp.Modifiers[magicType] += modifier - 1f; + else + manacostModifyComp.Modifiers[magicType] += 1f - modifier; + } + else + { + manacostModifyComp.Modifiers[magicType] = modifier; + } + } + } +} diff --git a/Content.Shared/_CP14/MagicManacostModify/CP14MagicManacostModifyComponent.cs b/Content.Shared/_CP14/MagicManacostModify/CP14MagicManacostModifyComponent.cs index 688957520e..26c325c8bb 100644 --- a/Content.Shared/_CP14/MagicManacostModify/CP14MagicManacostModifyComponent.cs +++ b/Content.Shared/_CP14/MagicManacostModify/CP14MagicManacostModifyComponent.cs @@ -7,7 +7,7 @@ namespace Content.Shared._CP14.MagicManacostModify; /// /// Changes the manacost of spells for the bearer /// -[RegisterComponent, Access(typeof(CP14MagicManacostModifySystem))] +[RegisterComponent] public sealed partial class CP14MagicManacostModifyComponent : Component { [DataField] diff --git a/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/magic_crystal.yml b/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Magic/magic_crystal.yml similarity index 80% rename from Resources/Prototypes/_CP14/Entities/Objects/ModularTools/magic_crystal.yml rename to Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Magic/magic_crystal.yml index 9fe278984f..b2f2c88705 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/magic_crystal.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Magic/magic_crystal.yml @@ -31,3 +31,7 @@ - type: CP14ModularCraftPart possibleParts: - RingMagicCrystal1_SpellSphereOfLight + - BlueHolderMagicCrystal1_SpellSphereOfLight + - BlueHolderMagicCrystal2_SpellSphereOfLight + - BlueHolderMagicCrystal3_SpellSphereOfLight + - BlueHolderMagicCrystal4_SpellSphereOfLight diff --git a/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Magic/magic_crystal_holder.yml b/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Magic/magic_crystal_holder.yml new file mode 100644 index 0000000000..daceae3f36 --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Magic/magic_crystal_holder.yml @@ -0,0 +1,77 @@ +# Base holder +- type: entity + id: CP14MagicCrystalHolderBase + parent: BaseItem + abstract: true + name: magic crystals holder + categories: [ ForkFiltered ] + components: + - type: Item + size: Tiny + +# Blue holder + +- type: entity + id: CP14MagicCrystalHolder_BaseBlue + parent: CP14MagicCrystalHolderBase + name: magic crystals holder + abstract: true + components: + - type: PointLight + radius: 1.3 + energy: 2 + color: "#87CEEB" + - type: Sprite + sprite: _CP14/Objects/Magic/Holders/magic_crystal_holder_blue.rsi + +- type: entity + id: CP14MagicCrystalHolder_Blue1 + parent: CP14MagicCrystalHolder_BaseBlue + name: magic crystals holder + description: Holder for magic crystals, has one slot. + suffix: 1 slot + components: + - type: Sprite + state: blue1 + - type: CP14ModularCraftPart + possibleParts: + - StaffMagicCrystalHolder_Blue1 + +- type: entity + id: CP14MagicCrystalHolder_Blue2 + parent: CP14MagicCrystalHolder_BaseBlue + name: magic crystals holder + description: Holder for magic crystals, has two slots. + suffix: 2 slots + components: + - type: Sprite + state: blue2 + - type: CP14ModularCraftPart + possibleParts: + - StaffMagicCrystalHolder_Blue2 + +- type: entity + id: CP14MagicCrystalHolder_Blue3 + parent: CP14MagicCrystalHolder_BaseBlue + name: magic crystals holder + description: Holder for magic crystals, has three slots. + suffix: 3 slots + components: + - type: Sprite + state: blue3 + - type: CP14ModularCraftPart + possibleParts: + - StaffMagicCrystalHolder_Blue3 + +- type: entity + id: CP14MagicCrystalHolder_Blue4 + parent: CP14MagicCrystalHolder_BaseBlue + name: magic crystals holder + description: Holder for magic crystals, has four slots. + suffix: 4 slots + components: + - type: Sprite + state: blue4 + - type: CP14ModularCraftPart + possibleParts: + - StaffMagicCrystalHolder_Blue4 diff --git a/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/ring.yml b/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Magic/ring.yml similarity index 63% rename from Resources/Prototypes/_CP14/Entities/Objects/ModularTools/ring.yml rename to Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Magic/ring.yml index c8ff3a34bf..5c00bfb21d 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/ring.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Magic/ring.yml @@ -1,7 +1,9 @@ +# Base ring - type: entity parent: Clothing id: CP14ClothingMagicRingBase categories: [ ForkFiltered ] + abstract: true components: - type: Item size: Tiny @@ -10,10 +12,21 @@ - ring - type: Sprite sprite: _CP14/Clothing/Rings/rings.rsi - state: brass_ring_blue - type: CP14SpellStorageAccessWearing - type: CP14SpellStorage - type: CP14ModularCraftStartPoint startProtoPart: CP14ClothingMagicRingBase startSlots: - - MagicCrystal1 + - RingMagicCrystal1 + +# Blue ring +- type: entity + parent: CP14ClothingMagicRingBase + id: CP14ClothingMagicRingBlue + components: + - type: PointLight + radius: 1.3 + energy: 2 + color: "#87CEEB" + - type: Sprite + state: brass_ring_blue diff --git a/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Magic/staff.yml b/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Magic/staff.yml new file mode 100644 index 0000000000..b1ccdddf04 --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Magic/staff.yml @@ -0,0 +1,107 @@ +# Base staff +- type: entity + id: CP14MagicStaffBase + abstract: true + parent: + - BaseItem + - CP14BaseWeaponDestructible + name: magic staff + description: A long, magic stick designed to convert magical energy into spells. + components: + - type: Item + size: Ginormous + - type: Wieldable + - type: IncreaseDamageOnWield + damage: + types: + Blunt: 6 + - type: MeleeWeapon + angle: 100 + attackRate: 1.3 + range: 1.3 + wideAnimationRotation: 135 + wideAnimation: CP14WeaponArcSlash + damage: + types: + Blunt: 6 + soundHit: + collection: MetalThud + cPAnimationLength: 0.3 + cPAnimationOffset: -1.3 + - type: CP14SpellStorageRequireAttune + - type: CP14MagicAttuningItem + - type: CP14SpellStorageAccessHolding + - type: CP14SpellStorage + - type: CP14MagicEnergyExaminable + - type: CP14MagicEnergyContainer + - type: CP14MagicManacostModify + +# Glowing wooden Staff +- type: entity + id: CP14MagicStaff_GlowingWooden + parent: CP14MagicStaffBase + components: + - type: PointLight + radius: 1.3 + energy: 2 + color: "#87CEEB" + - type: Sprite + sprite: _CP14/Objects/ModularTools/Magic/Staffs/glowing_wooden_staff.rsi + layers: + - state: icon + - type: Clothing + equipDelay: 1 + unequipDelay: 1 + sprite: _CP14/Objects/ModularTools/Magic/Staffs/glowing_wooden_staff.rsi + quickEquip: false + breakOnMove: false + slots: + - neck + - type: CP14ModularCraftStartPoint + startProtoPart: CP14MagicStaff_GlowingWooden + startSlots: + - MagicCrystalHolder + - type: CP14MagicManacostModify + modifiers: + Earth: 1.1 + Fire: 1.1 + Gate: 1.1 + Healing: 1.1 + LightDarkness: 1.1 + Meta: 1.1 + Movement: 1.1 + Water: 1.1 + Necromancy: 1.1 + +# Wooden staff +- type: entity + id: CP14MagicStaff_Wooden + parent: CP14MagicStaffBase + components: + - type: Sprite + sprite: _CP14/Objects/ModularTools/Magic/Staffs/wooden_staff.rsi + layers: + - state: icon + - type: Clothing + equipDelay: 1 + unequipDelay: 1 + sprite: _CP14/Objects/ModularTools/Magic/Staffs/wooden_staff.rsi + quickEquip: false + breakOnMove: false + slots: + - neck + - type: CP14ModularCraftStartPoint + startProtoPart: CP14MagicStaff_Wooden + startSlots: + - MagicCrystalHolder + - type: CP14MagicManacostModify + modifiers: + Earth: 0.9 + Fire: 0.9 + Gate: 0.9 + Healing: 0.9 + LightDarkness: 0.9 + Meta: 0.9 + Movement: 0.9 + Water: 0.9 + Necromancy: 0.9 diff --git a/Resources/Prototypes/_CP14/ModularCraft/Blade/magic_crystal.yml b/Resources/Prototypes/_CP14/ModularCraft/Blade/magic_crystal.yml deleted file mode 100644 index 4f6c06c4da..0000000000 --- a/Resources/Prototypes/_CP14/ModularCraft/Blade/magic_crystal.yml +++ /dev/null @@ -1,12 +0,0 @@ -- type: modularPart - id: RingMagicCrystal1_SpellSphereOfLight - targetSlot: MagicalCrystal1 - sourcePart: CP14MagicCrystalSpellSphereOfLight - iconSprite: - - sprite: _CP14/Objects/ModularTools/magic_crystal.rsi - state: ring_grey_icon - color: "#FFFF00" - modifiers: - - !type:AddSpellsToSpellStorage - spells: - - CP14ActionSpellSphereOfLight diff --git a/Resources/Prototypes/_CP14/ModularCraft/Blade/magic_crystal_holder.yml b/Resources/Prototypes/_CP14/ModularCraft/Blade/magic_crystal_holder.yml deleted file mode 100644 index 8706e6812e..0000000000 --- a/Resources/Prototypes/_CP14/ModularCraft/Blade/magic_crystal_holder.yml +++ /dev/null @@ -1,12 +0,0 @@ -- type: modularPart - id: StaffMagicCrystalHolder_Blue1 - targetSlot: MagicCrystalHolders - sourcePart: CP14MagicalCrystalSpellSphereOfLight - iconSprite: - - sprite: _CP14/Objects/ModularTools/magic_crystal.rsi - state: ring_grey_icon - color: "#FFFF00" - modifiers: - - !type:AddSpellsToSpellStorage - spells: - - CP14ActionSpellSphereOfLight diff --git a/Resources/Prototypes/_CP14/ModularCraft/Magic/magic_crystal.yml b/Resources/Prototypes/_CP14/ModularCraft/Magic/magic_crystal.yml new file mode 100644 index 0000000000..7ededc8668 --- /dev/null +++ b/Resources/Prototypes/_CP14/ModularCraft/Magic/magic_crystal.yml @@ -0,0 +1,64 @@ +- type: modularPart + id: RingMagicCrystal1_SpellSphereOfLight + targetSlot: RingMagicCrystal1 + sourcePart: CP14MagicCrystalSpellSphereOfLight + iconSprite: + - sprite: _CP14/Objects/ModularTools/Magic/magic_crystal.rsi + state: ring_grey_icon + color: "#FFFF00" + modifiers: + - !type:AddSpellsToSpellStorage + spells: + - CP14ActionSpellSphereOfLight + +- type: modularPart + id: BlueHolderMagicCrystal1_SpellSphereOfLight + targetSlot: HolderMagicCrystal1 + sourcePart: CP14MagicCrystalSpellSphereOfLight + iconSprite: + - sprite: _CP14/Objects/ModularTools/Magic/magic_crystal.rsi + state: blueholder_grey_icon1 + color: "#FFFF00" + modifiers: + - !type:AddSpellsToSpellStorage + spells: + - CP14ActionSpellSphereOfLight + +- type: modularPart + id: BlueHolderMagicCrystal2_SpellSphereOfLight + targetSlot: HolderMagicCrystal2 + sourcePart: CP14MagicCrystalSpellSphereOfLight + iconSprite: + - sprite: _CP14/Objects/ModularTools/Magic/magic_crystal.rsi + state: blueholder_grey_icon2 + color: "#FFFF00" + modifiers: + - !type:AddSpellsToSpellStorage + spells: + - CP14ActionSpellSphereOfLight + +- type: modularPart + id: BlueHolderMagicCrystal3_SpellSphereOfLight + targetSlot: HolderMagicCrystal3 + sourcePart: CP14MagicCrystalSpellSphereOfLight + iconSprite: + - sprite: _CP14/Objects/ModularTools/Magic/magic_crystal.rsi + state: blueholder_grey_icon3 + color: "#FFFF00" + modifiers: + - !type:AddSpellsToSpellStorage + spells: + - CP14ActionSpellSphereOfLight + +- type: modularPart + id: BlueHolderMagicCrystal4_SpellSphereOfLight + targetSlot: HolderMagicCrystal4 + sourcePart: CP14MagicCrystalSpellSphereOfLight + iconSprite: + - sprite: _CP14/Objects/ModularTools/Magic/magic_crystal.rsi + state: blueholder_grey_icon4 + color: "#FFFF00" + modifiers: + - !type:AddSpellsToSpellStorage + spells: + - CP14ActionSpellSphereOfLight diff --git a/Resources/Prototypes/_CP14/ModularCraft/Magic/magic_crystal_holder.yml b/Resources/Prototypes/_CP14/ModularCraft/Magic/magic_crystal_holder.yml new file mode 100644 index 0000000000..d850a28ebf --- /dev/null +++ b/Resources/Prototypes/_CP14/ModularCraft/Magic/magic_crystal_holder.yml @@ -0,0 +1,86 @@ +# Blue Holders + +- type: modularPart + id: BaseBlueHolderManacostModify + modifiers: + - !type:EditManacostModify + modifiers: + Earth: 1.05 + Fire: 1.05 + Gate: 1.05 + Healing: 1.05 + LightDarkness: 1.05 + Meta: 1.05 + Movement: 1.05 + Water: 1.05 + Necromancy: 1.05 + +- type: modularPart + id: StaffMagicCrystalHolder_Blue1 + targetSlot: MagicCrystalHolder + sourcePart: CP14MagicCrystalHolder_Blue1 + iconSprite: + - sprite: _CP14/Objects/ModularTools/Magic/Holders/magic_crystals_holder_blue.rsi + state: icon1 + rsiPath: _CP14/Objects/ModularTools/Magic/Holders/magic_crystals_holder_blue.rsi + modifiers: + - !type:EditModularSlots + addSlots: + - HolderMagicCrystal1 + - !type:Inherit + copyFrom: + - BaseBlueHolderManacostModify + +- type: modularPart + id: StaffMagicCrystalHolder_Blue2 + targetSlot: MagicCrystalHolder + sourcePart: CP14MagicCrystalHolder_Blue2 + iconSprite: + - sprite: _CP14/Objects/ModularTools/Magic/Holders/magic_crystals_holder_blue.rsi + state: icon2 + rsiPath: _CP14/Objects/ModularTools/Magic/Holders/magic_crystals_holder_blue.rsi + modifiers: + - !type:EditModularSlots + addSlots: + - HolderMagicCrystal1 + - HolderMagicCrystal3 + - !type:Inherit + copyFrom: + - BaseBlueHolderManacostModify + +- type: modularPart + id: StaffMagicCrystalHolder_Blue3 + targetSlot: MagicCrystalHolder + sourcePart: CP14MagicCrystalHolder_Blue3 + iconSprite: + - sprite: _CP14/Objects/ModularTools/Magic/Holders/magic_crystals_holder_blue.rsi + state: icon3 + rsiPath: _CP14/Objects/ModularTools/Magic/Holders/magic_crystals_holder_blue.rsi + modifiers: + - !type:EditModularSlots + addSlots: + - HolderMagicCrystal1 + - HolderMagicCrystal2 + - HolderMagicCrystal4 + - !type:Inherit + copyFrom: + - BaseBlueHolderManacostModify + +- type: modularPart + id: StaffMagicCrystalHolder_Blue4 + targetSlot: MagicCrystalHolder + sourcePart: CP14MagicCrystalHolder_Blue4 + iconSprite: + - sprite: _CP14/Objects/ModularTools/Magic/Holders/magic_crystals_holder_blue.rsi + state: icon4 + rsiPath: _CP14/Objects/ModularTools/Magic/Holders/magic_crystals_holder_blue.rsi + modifiers: + - !type:EditModularSlots + addSlots: + - HolderMagicCrystal1 + - HolderMagicCrystal2 + - HolderMagicCrystal3 + - HolderMagicCrystal4 + - !type:Inherit + copyFrom: + - BaseBlueHolderManacostModify diff --git a/Resources/Prototypes/_CP14/ModularCraft/slots.yml b/Resources/Prototypes/_CP14/ModularCraft/slots.yml index 245af5caed..dd1d4782c3 100644 --- a/Resources/Prototypes/_CP14/ModularCraft/slots.yml +++ b/Resources/Prototypes/_CP14/ModularCraft/slots.yml @@ -3,19 +3,19 @@ name: cp14-modular-slot-blade - type: modularSlot - id: MagicCrystal1 + id: HolderMagicCrystal1 name: cp14-modular-slot-magical-crystal - type: modularSlot - id: MagicCrystal2 + id: HolderMagicCrystal2 name: cp14-modular-slot-magical-crystal - type: modularSlot - id: MagicCrystal3 + id: HolderMagicCrystal3 name: cp14-modular-slot-magical-crystal - type: modularSlot - id: MagicCrystal4 + id: HolderMagicCrystal4 name: cp14-modular-slot-magic-crystal - type: modularSlot @@ -25,3 +25,7 @@ - type: modularSlot id: Garde name: cp14-modular-slot-garde + +- type: modularSlot + id: RingMagicCrystal1 + name: cp14-modular-slot-magical-crystal diff --git a/Resources/Textures/_CP14/Objects/Magic/magic_crystal_holder.rsi/icon.png b/Resources/Textures/_CP14/Objects/Magic/Holders/magic_crystal_holder_blue.rsi/blue1.png similarity index 100% rename from Resources/Textures/_CP14/Objects/Magic/magic_crystal_holder.rsi/icon.png rename to Resources/Textures/_CP14/Objects/Magic/Holders/magic_crystal_holder_blue.rsi/blue1.png diff --git a/Resources/Textures/_CP14/Objects/Magic/Holders/magic_crystal_holder_blue.rsi/blue2.png b/Resources/Textures/_CP14/Objects/Magic/Holders/magic_crystal_holder_blue.rsi/blue2.png new file mode 100644 index 0000000000000000000000000000000000000000..cfa47175e0ca604c2fb3581dedfe02f66ace6720 GIT binary patch literal 570 zcmV-A0>%A_P)QZzuM%Vaxlv;_0fYqyeUB?(qrF8{t{lc?~su{vE4dE?AwRlh1t>h9Z z;S*uMCIbrJT6(ggmb0ak7n-oK_H?6!sSKWu-Zf^(D@9aV08w zOwKqu5kds6(_D5j`zWo{F{i z|NGQ4Gt-Uk&LH%@n&zhu`u3q#HO=2s)2y9=;{~pZEq_V&H1{ofwWWEF!L{s0anXb@jL zSsMTV010qNS#tmYTt)x@Tt)#DltV!P0044HL_t(o!((6=1*2dTjDi6MjQAu~q7VJ2 zh9!5F+TpZ^X`n-3XgMII)DVn`6(15IK=nij3W+)0=LaSck`oOqq!^6uGi(;)QbUmg zV1}XxFC`X}Dt$f>AIEM!|ps0AV&IGZ-Gt8~^|S07*qo IM6N<$g8z)~2mk;8 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Objects/Magic/Holders/magic_crystal_holder_blue.rsi/blue3.png b/Resources/Textures/_CP14/Objects/Magic/Holders/magic_crystal_holder_blue.rsi/blue3.png new file mode 100644 index 0000000000000000000000000000000000000000..cfa47175e0ca604c2fb3581dedfe02f66ace6720 GIT binary patch literal 570 zcmV-A0>%A_P)QZzuM%Vaxlv;_0fYqyeUB?(qrF8{t{lc?~su{vE4dE?AwRlh1t>h9Z z;S*uMCIbrJT6(ggmb0ak7n-oK_H?6!sSKWu-Zf^(D@9aV08w zOwKqu5kds6(_D5j`zWo{F{i z|NGQ4Gt-Uk&LH%@n&zhu`u3q#HO=2s)2y9=;{~pZEq_V&H1{ofwWWEF!L{s0anXb@jL zSsMTV010qNS#tmYTt)x@Tt)#DltV!P0044HL_t(o!((6=1*2dTjDi6MjQAu~q7VJ2 zh9!5F+TpZ^X`n-3XgMII)DVn`6(15IK=nij3W+)0=LaSck`oOqq!^6uGi(;)QbUmg zV1}XxFC`X}Dt$f>AIEM!|ps0AV&IGZ-Gt8~^|S07*qo IM6N<$g8z)~2mk;8 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Objects/Magic/Holders/magic_crystal_holder_blue.rsi/blue4.png b/Resources/Textures/_CP14/Objects/Magic/Holders/magic_crystal_holder_blue.rsi/blue4.png new file mode 100644 index 0000000000000000000000000000000000000000..cfa47175e0ca604c2fb3581dedfe02f66ace6720 GIT binary patch literal 570 zcmV-A0>%A_P)QZzuM%Vaxlv;_0fYqyeUB?(qrF8{t{lc?~su{vE4dE?AwRlh1t>h9Z z;S*uMCIbrJT6(ggmb0ak7n-oK_H?6!sSKWu-Zf^(D@9aV08w zOwKqu5kds6(_D5j`zWo{F{i z|NGQ4Gt-Uk&LH%@n&zhu`u3q#HO=2s)2y9=;{~pZEq_V&H1{ofwWWEF!L{s0anXb@jL zSsMTV010qNS#tmYTt)x@Tt)#DltV!P0044HL_t(o!((6=1*2dTjDi6MjQAu~q7VJ2 zh9!5F+TpZ^X`n-3XgMII)DVn`6(15IK=nij3W+)0=LaSck`oOqq!^6uGi(;)QbUmg zV1}XxFC`X}Dt$f>AIEM!|ps0AV&IGZ-Gt8~^|S07*qo IM6N<$g8z)~2mk;8 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Objects/Magic/Holders/magic_crystal_holder_blue.rsi/meta.json b/Resources/Textures/_CP14/Objects/Magic/Holders/magic_crystal_holder_blue.rsi/meta.json new file mode 100644 index 0000000000..46d15e3afb --- /dev/null +++ b/Resources/Textures/_CP14/Objects/Magic/Holders/magic_crystal_holder_blue.rsi/meta.json @@ -0,0 +1,23 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Created by comasqw (Github)", + "states": [ + { + "name": "blue1" + }, + { + "name": "blue2" + }, + { + "name": "blue3" + }, + { + "name": "blue4" + } + ] +} diff --git a/Resources/Textures/_CP14/Objects/ModularTools/magic_crystals_holder_blue.rsi/equipped-NECK.png b/Resources/Textures/_CP14/Objects/ModularTools/Magic/Holders/magic_crystals_holder_blue.rsi/equipped-NECK.png similarity index 100% rename from Resources/Textures/_CP14/Objects/ModularTools/magic_crystals_holder_blue.rsi/equipped-NECK.png rename to Resources/Textures/_CP14/Objects/ModularTools/Magic/Holders/magic_crystals_holder_blue.rsi/equipped-NECK.png diff --git a/Resources/Textures/_CP14/Objects/ModularTools/magic_crystals_holder_blue.rsi/icon1.png b/Resources/Textures/_CP14/Objects/ModularTools/Magic/Holders/magic_crystals_holder_blue.rsi/icon1.png similarity index 100% rename from Resources/Textures/_CP14/Objects/ModularTools/magic_crystals_holder_blue.rsi/icon1.png rename to Resources/Textures/_CP14/Objects/ModularTools/Magic/Holders/magic_crystals_holder_blue.rsi/icon1.png diff --git a/Resources/Textures/_CP14/Objects/ModularTools/magic_crystals_holder_blue.rsi/icon2.png b/Resources/Textures/_CP14/Objects/ModularTools/Magic/Holders/magic_crystals_holder_blue.rsi/icon2.png similarity index 100% rename from Resources/Textures/_CP14/Objects/ModularTools/magic_crystals_holder_blue.rsi/icon2.png rename to Resources/Textures/_CP14/Objects/ModularTools/Magic/Holders/magic_crystals_holder_blue.rsi/icon2.png diff --git a/Resources/Textures/_CP14/Objects/ModularTools/magic_crystals_holder_blue.rsi/icon3.png b/Resources/Textures/_CP14/Objects/ModularTools/Magic/Holders/magic_crystals_holder_blue.rsi/icon3.png similarity index 100% rename from Resources/Textures/_CP14/Objects/ModularTools/magic_crystals_holder_blue.rsi/icon3.png rename to Resources/Textures/_CP14/Objects/ModularTools/Magic/Holders/magic_crystals_holder_blue.rsi/icon3.png diff --git a/Resources/Textures/_CP14/Objects/ModularTools/magic_crystals_holder_blue.rsi/icon4.png b/Resources/Textures/_CP14/Objects/ModularTools/Magic/Holders/magic_crystals_holder_blue.rsi/icon4.png similarity index 100% rename from Resources/Textures/_CP14/Objects/ModularTools/magic_crystals_holder_blue.rsi/icon4.png rename to Resources/Textures/_CP14/Objects/ModularTools/Magic/Holders/magic_crystals_holder_blue.rsi/icon4.png diff --git a/Resources/Textures/_CP14/Objects/ModularTools/magic_crystals_holder_blue.rsi/inhand-left.png b/Resources/Textures/_CP14/Objects/ModularTools/Magic/Holders/magic_crystals_holder_blue.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/_CP14/Objects/ModularTools/magic_crystals_holder_blue.rsi/inhand-left.png rename to Resources/Textures/_CP14/Objects/ModularTools/Magic/Holders/magic_crystals_holder_blue.rsi/inhand-left.png diff --git a/Resources/Textures/_CP14/Objects/ModularTools/magic_crystals_holder_blue.rsi/inhand-right.png b/Resources/Textures/_CP14/Objects/ModularTools/Magic/Holders/magic_crystals_holder_blue.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/_CP14/Objects/ModularTools/magic_crystals_holder_blue.rsi/inhand-right.png rename to Resources/Textures/_CP14/Objects/ModularTools/Magic/Holders/magic_crystals_holder_blue.rsi/inhand-right.png diff --git a/Resources/Textures/_CP14/Objects/ModularTools/magic_crystals_holder_blue.rsi/meta.json b/Resources/Textures/_CP14/Objects/ModularTools/Magic/Holders/magic_crystals_holder_blue.rsi/meta.json similarity index 100% rename from Resources/Textures/_CP14/Objects/ModularTools/magic_crystals_holder_blue.rsi/meta.json rename to Resources/Textures/_CP14/Objects/ModularTools/Magic/Holders/magic_crystals_holder_blue.rsi/meta.json diff --git a/Resources/Textures/_CP14/Objects/ModularTools/magic_crystals_holder_blue.rsi/wielded-inhand-left.png b/Resources/Textures/_CP14/Objects/ModularTools/Magic/Holders/magic_crystals_holder_blue.rsi/wielded-inhand-left.png similarity index 100% rename from Resources/Textures/_CP14/Objects/ModularTools/magic_crystals_holder_blue.rsi/wielded-inhand-left.png rename to Resources/Textures/_CP14/Objects/ModularTools/Magic/Holders/magic_crystals_holder_blue.rsi/wielded-inhand-left.png diff --git a/Resources/Textures/_CP14/Objects/ModularTools/magic_crystals_holder_blue.rsi/wielded-inhand-right.png b/Resources/Textures/_CP14/Objects/ModularTools/Magic/Holders/magic_crystals_holder_blue.rsi/wielded-inhand-right.png similarity index 100% rename from Resources/Textures/_CP14/Objects/ModularTools/magic_crystals_holder_blue.rsi/wielded-inhand-right.png rename to Resources/Textures/_CP14/Objects/ModularTools/Magic/Holders/magic_crystals_holder_blue.rsi/wielded-inhand-right.png diff --git a/Resources/Textures/_CP14/Objects/ModularTools/wooden_staff_grip.rsi/equipped-NECK.png b/Resources/Textures/_CP14/Objects/ModularTools/Magic/Staffs/glowing_wooden_staff.rsi/equipped-NECK.png similarity index 100% rename from Resources/Textures/_CP14/Objects/ModularTools/wooden_staff_grip.rsi/equipped-NECK.png rename to Resources/Textures/_CP14/Objects/ModularTools/Magic/Staffs/glowing_wooden_staff.rsi/equipped-NECK.png diff --git a/Resources/Textures/_CP14/Objects/ModularTools/wooden_staff_grip.rsi/icon.png b/Resources/Textures/_CP14/Objects/ModularTools/Magic/Staffs/glowing_wooden_staff.rsi/icon.png similarity index 100% rename from Resources/Textures/_CP14/Objects/ModularTools/wooden_staff_grip.rsi/icon.png rename to Resources/Textures/_CP14/Objects/ModularTools/Magic/Staffs/glowing_wooden_staff.rsi/icon.png diff --git a/Resources/Textures/_CP14/Objects/ModularTools/wooden_staff_grip.rsi/inhand-left.png b/Resources/Textures/_CP14/Objects/ModularTools/Magic/Staffs/glowing_wooden_staff.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/_CP14/Objects/ModularTools/wooden_staff_grip.rsi/inhand-left.png rename to Resources/Textures/_CP14/Objects/ModularTools/Magic/Staffs/glowing_wooden_staff.rsi/inhand-left.png diff --git a/Resources/Textures/_CP14/Objects/ModularTools/wooden_staff_grip.rsi/inhand-right.png b/Resources/Textures/_CP14/Objects/ModularTools/Magic/Staffs/glowing_wooden_staff.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/_CP14/Objects/ModularTools/wooden_staff_grip.rsi/inhand-right.png rename to Resources/Textures/_CP14/Objects/ModularTools/Magic/Staffs/glowing_wooden_staff.rsi/inhand-right.png diff --git a/Resources/Textures/_CP14/Objects/ModularTools/wooden_staff_grip.rsi/meta.json b/Resources/Textures/_CP14/Objects/ModularTools/Magic/Staffs/glowing_wooden_staff.rsi/meta.json similarity index 100% rename from Resources/Textures/_CP14/Objects/ModularTools/wooden_staff_grip.rsi/meta.json rename to Resources/Textures/_CP14/Objects/ModularTools/Magic/Staffs/glowing_wooden_staff.rsi/meta.json diff --git a/Resources/Textures/_CP14/Objects/ModularTools/wooden_staff_grip.rsi/wielded-inhand-left.png b/Resources/Textures/_CP14/Objects/ModularTools/Magic/Staffs/glowing_wooden_staff.rsi/wielded-inhand-left.png similarity index 100% rename from Resources/Textures/_CP14/Objects/ModularTools/wooden_staff_grip.rsi/wielded-inhand-left.png rename to Resources/Textures/_CP14/Objects/ModularTools/Magic/Staffs/glowing_wooden_staff.rsi/wielded-inhand-left.png diff --git a/Resources/Textures/_CP14/Objects/ModularTools/wooden_staff_grip.rsi/wielded-inhand-right.png b/Resources/Textures/_CP14/Objects/ModularTools/Magic/Staffs/glowing_wooden_staff.rsi/wielded-inhand-right.png similarity index 100% rename from Resources/Textures/_CP14/Objects/ModularTools/wooden_staff_grip.rsi/wielded-inhand-right.png rename to Resources/Textures/_CP14/Objects/ModularTools/Magic/Staffs/glowing_wooden_staff.rsi/wielded-inhand-right.png diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Magic/Staffs/wooden_staff.rsi/equipped-NECK.png b/Resources/Textures/_CP14/Objects/ModularTools/Magic/Staffs/wooden_staff.rsi/equipped-NECK.png new file mode 100644 index 0000000000000000000000000000000000000000..fa5836d0a67ce5b45baeaabd10a89292d1caf6b0 GIT binary patch literal 737 zcmV<70v`Q|P)QZzuM%Vaxlv;_0fYqyeUB?(qrF8{t{lc?~su{vE4dE?AwRlh1t>h9Z z;S*uMCIbrJT6(ggmb0ak7n-oK_H?6!sSKWu-Zf^(D@9aV08w zOwKqu5kds6(_D5j`zWo{F{i z|NGQ4Gt-Uk&LH%@n&zhu`u3q#HO=2s)2y9=;{~pZEq_V&H1{ofwWWEF!L{s0anXb@jL zSsMTV010qNS#tmY3labT3lag+-G2N4009|EL_t(|+U?rC4gov7e#24FdEs^d1%vPQW#Vly3So3m8b_wTQtIRnHk z{&-p5nFA0fZ|fgMO4V2ZT+nYf%mv^aMWvuizy+84Gu!~kCY`4Qym?XEuje}W5+DE} z2O!S|NCx<_0p{re$N*mgP_##JJ^=Mvl?({hu+!0UQ38|zZ-M{-0Dvj!kc12(6gh&j zP3B%89g>higgpPkdXojV4@wyC22asT1seeAy^9_|IG+JQpTPkD000000D$Yh>KjoW TGm*^^00000NkvXXu0mjfm*qpb literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Magic/Staffs/wooden_staff.rsi/icon.png b/Resources/Textures/_CP14/Objects/ModularTools/Magic/Staffs/wooden_staff.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..94ad714dd2b3672678f8a74240d17ef9670e22ae GIT binary patch literal 705 zcmV;y0zUnTP)QZzuM%Vaxlv;_0fYqyeUB?(qrF8{t{lc?~su{vE4dE?AwRlh1t>h9Z z;S*uMCIbrJT6(ggmb0ak7n-oK_H?6!sSKWu-Zf^(D@9aV08w zOwKqu5kds6(_D5j`zWo{F{i z|NGQ4Gt-Uk&LH%@n&zhu`u3q#HO=2s)2y9=;{~pZEq_V&H1{ofwWWEF!L{s0anXb@jL zSsMTV010qNS#tmYTt)x@Tt)#DltV!P008+(L_t(o!((6=1*2dT40cfHXw6`$q4J+r z<}(peaN_yP|FrZVUI)N@E-S#sP!(+bKW_DFsyl#@7)2n5fE)n=t4>^Fq-zv_!0{V* z7$1N5#h@ZB$Pi|s^`Gt`fE*Hz+Tsj%p1!AANHCG27!(p9%c&U>WcdPQImi)$d^`-L z^LH}R-2v2e1Vyf=h9f9WNT7rnWT^~hlj8^`N*w@7nCp(;1+zhg72O?x?g&zI2USZo za>@y+I)EHUP~8FOl^7vM(8K{CpeZBsUx0@Lo<`{I0Ad}%L`w%;fAWO!!QZzuM%Vaxlv;_0fYqyeUB?(qrF8{t{lc?~su{vE4dE?AwRlh1t>h9Z z;S*uMCIbrJT6(ggmb0ak7n-oK_H?6!sSKWu-Zf^(D@9aV08w zOwKqu5kds6(_D5j`zWo{F{i z|NGQ4Gt-Uk&LH%@n&zhu`u3q#HO=2s)2y9=;{~pZEq_V&H1{ofwWWEF!L{s0anXb@jL zSsMTV010qNS#tmY3labT3lag+-G2N400FW|L_t(|+U=UZN&`U<#`hKx0~U#mN@5|T z@K0kIu@JHF0R-P9g+73-?;%)OTAWSL7f>vMAd(_gQXD8YD-*FlW^eX(Zogl(&3-rc z?d%?VGsXY_0H~J3oxZ!gKQPEpw=w;2H0Em1eA3}+ z)Sd+wgFUa6qxo0oM@}+MD{^Okix6iMc(FlD4r9WRPwg3!B*?I=wUrsnBwoF!>M9aUkUXD(G8jJCFx z#{3l3vgH5(GPlp&UXOL_Y|J6ZtsgeV0B-%zru_1aF~FyMjtsyz1OSjSznZhJJWX^E QzyJUM07*qoM6N<$g2QW#761SM literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Magic/Staffs/wooden_staff.rsi/inhand-right.png b/Resources/Textures/_CP14/Objects/ModularTools/Magic/Staffs/wooden_staff.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..da2711245e16aac3df1f246bd5fe2fb0315f58f7 GIT binary patch literal 909 zcmV;819JR{P)QZzuM%Vaxlv;_0fYqyeUB?(qrF8{t{lc?~su{vE4dE?AwRlh1t>h9Z z;S*uMCIbrJT6(ggmb0ak7n-oK_H?6!sSKWu-Zf^(D@9aV08w zOwKqu5kds6(_D5j`zWo{F{i z|NGQ4Gt-Uk&LH%@n&zhu`u3q#HO=2s)2y9=;{~pZEq_V&H1{ofwWWEF!L{s0anXb@jL zSsMTV010qNS#tmY3labT3lag+-G2N400G5GL_t(|+U=UZN&`U<#y3k4g%q)hl2`~S z{L@%QEJQ4P0Kqp&p%0MO_YkZsEzTyy7f>vMAd(_gQUny6lUXGdbyIpjzuEgb=A@l;Zyp}!YL~yAINEKgi|_i2l#V$;dP(=% z^re{gv))e1ZT7!wr&r$R%Vb#7iQe24;Eay`+!WARNJ8c6{;^j0OD;|i*lvZDUISo2Sq5-l2uuB81R|U) z8DkWfXq8n@0qqEwFWy-U$W*7c0nNrT3j<7bA_8I>yp3KNQ~2BHMFil{2><{9008J= z(tN-H<457rnh!M1CZk<;sTdnDxE`u<6P2E`V^@&DWHcGxTW^IC0omYv^bKSN)8MJv z8;k)y89j~Fz;F8}PEw$5d!f&Y(d2C=l4l`;iU8lOGp-D`GQfAw0Nu}(;Vk|UqIDp7 zn5tfdU<~+=sQZzuM%Vaxlv;_0fYqyeUB?(qrF8{t{lc?~su{vE4dE?AwRlh1t>h9Z z;S*uMCIbrJT6(ggmb0ak7n-oK_H?6!sSKWu-Zf^(D@9aV08w zOwKqu5kds6(_D5j`zWo{F{i z|NGQ4Gt-Uk&LH%@n&zhu`u3q#HO=2s)2y9=;{~pZEq_V&H1{ofwWWEF!L{s0anXb@jL zSsMTV010qNS#tmY3labT3lag+-G2N400GEJL_t(|+U?rCN&`U@1>l(=Y7r$?DU57k z1b@)NM#V<4v9S=rC-5n(tYTr|JJ^e0VVf!hu@OWJm?juOD}z{wP2?gwUY^RU(qTpasg>T|SZpth7u%*f z)NIaAc2t{&p0tOo-#)0~@Q}hM$aVShUftybt!j1S_uRBz)JU#ZRee1I_=V&e0}2d@ z#$^b={oA!(+RLilwe!RykoNY+PHH_phu3E(J32eFmAn8Gg+e%7F59oFwYvUna2YNx zULW5bSfHeuG@$>hW>ZIJ5vyZ?-Y-`=TL2OLGAxQ|P$D8CA|fIpA|fIp3Uh(u+NiM( zHK=vfSH{Id5U3oTHdOU`z*vhK)JD@Mo2&;Mh^7#aT{IuVdkI>;BEigbVKBT$3S~2h z$=KZTGCYRBKQZzuM%Vaxlv;_0fYqyeUB?(qrF8{t{lc?~su{vE4dE?AwRlh1t>h9Z z;S*uMCIbrJT6(ggmb0ak7n-oK_H?6!sSKWu-Zf^(D@9aV08w zOwKqu5kds6(_D5j`zWo{F{i z|NGQ4Gt-Uk&LH%@n&zhu`u3q#HO=2s)2y9=;{~pZEq_V&H1{ofwWWEF!L{s0anXb@jL zSsMTV010qNS#tmY3labT3lag+-G2N400GEJL_t(|+U?rCN&`U@1>l(=Y7r$?DU57k z1b@)NM#V<4v9S=rC-5n(tYTr|JJ^e0VVf!hu@OWJm?juOD}z{wP2?gwUY^RU(qTpasg>T|SZpth7u%*f z)NIaAc2t{&p0tOo-#)0~@Q}hM$aVShUftybt!j1S_uRBz)JU#ZRee1I_=V&e0}2d@ z#$^b={oA!(+RLilwe!RykoNY+PHH_phu3E(J32eFmAn8Gg+e%7F59oFwYvUna2YNx zULW5bSfHeuG@$>hW>ZIJ5vyZ?-Y-`=TL2OLGAxQ|P$D8CA|fIpA|fIp3Uh(u+NiM( zHK=vfSH{Id5U3oTHdOU`z*vhK)JD@Mo2&;Mh^7#aT{IuVdkI>;BEigbVKBT$3S~2h z$=KZTGCYRBK