diff --git a/Content.Server/_CP14/ModularCraft/Modifiers/EditManacostModify.cs b/Content.Server/_CP14/ModularCraft/Modifiers/EditManacostModify.cs index 7ddbb9555c..0f348c6498 100644 --- a/Content.Server/_CP14/ModularCraft/Modifiers/EditManacostModify.cs +++ b/Content.Server/_CP14/ModularCraft/Modifiers/EditManacostModify.cs @@ -24,7 +24,7 @@ public sealed partial class EditManacostModify : CP14ModularCraftModifier if (modifier >= 1f) manacostModifyComp.Modifiers[magicType] += modifier - 1f; else - manacostModifyComp.Modifiers[magicType] += 1f - modifier; + manacostModifyComp.Modifiers[magicType] -= 1f - modifier; } else { diff --git a/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Magic/magic_crystal.yml b/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Magic/magic_crystal.yml index b2f2c88705..7495e9c928 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Magic/magic_crystal.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Magic/magic_crystal.yml @@ -20,6 +20,7 @@ - type: entity id: CP14MagicCrystalSpellSphereOfLight parent: CP14MagicCrystalBase + suffix: SphereOfLight components: - type: Sprite color: "#FFFF00" diff --git a/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Magic/ring.yml b/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Magic/ring.yml index 9b820c60ab..b6f1ee00b8 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Magic/ring.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Magic/ring.yml @@ -4,6 +4,7 @@ id: CP14ClothingMagicRingBase categories: [ ForkFiltered ] abstract: true + name: ring components: - type: Item size: Tiny diff --git a/Resources/Prototypes/_CP14/ModularCraft/Magic/magic_crystal.yml b/Resources/Prototypes/_CP14/ModularCraft/Magic/magic_crystal.yml index 7ededc8668..3f87e0bd28 100644 --- a/Resources/Prototypes/_CP14/ModularCraft/Magic/magic_crystal.yml +++ b/Resources/Prototypes/_CP14/ModularCraft/Magic/magic_crystal.yml @@ -1,3 +1,11 @@ +# SpellSphereOfLight +- type: modularPart + id: BaseCrystalModifiers_SpellSphereOfLight + modifiers: + - !type:AddSpellsToSpellStorage + spells: + - CP14ActionSpellSphereOfLight + - type: modularPart id: RingMagicCrystal1_SpellSphereOfLight targetSlot: RingMagicCrystal1 @@ -7,9 +15,9 @@ state: ring_grey_icon color: "#FFFF00" modifiers: - - !type:AddSpellsToSpellStorage - spells: - - CP14ActionSpellSphereOfLight + - !type:Inherit + copyFrom: + - BaseCrystalModifiers_SpellSphereOfLight - type: modularPart id: BlueHolderMagicCrystal1_SpellSphereOfLight @@ -17,12 +25,12 @@ sourcePart: CP14MagicCrystalSpellSphereOfLight iconSprite: - sprite: _CP14/Objects/ModularTools/Magic/magic_crystal.rsi - state: blueholder_grey_icon1 + state: holder_grey_icon1 color: "#FFFF00" modifiers: - - !type:AddSpellsToSpellStorage - spells: - - CP14ActionSpellSphereOfLight + - !type:Inherit + copyFrom: + - BaseCrystalModifiers_SpellSphereOfLight - type: modularPart id: BlueHolderMagicCrystal2_SpellSphereOfLight @@ -30,12 +38,12 @@ sourcePart: CP14MagicCrystalSpellSphereOfLight iconSprite: - sprite: _CP14/Objects/ModularTools/Magic/magic_crystal.rsi - state: blueholder_grey_icon2 + state: holder_grey_icon2 color: "#FFFF00" modifiers: - - !type:AddSpellsToSpellStorage - spells: - - CP14ActionSpellSphereOfLight + - !type:Inherit + copyFrom: + - BaseCrystalModifiers_SpellSphereOfLight - type: modularPart id: BlueHolderMagicCrystal3_SpellSphereOfLight @@ -43,12 +51,12 @@ sourcePart: CP14MagicCrystalSpellSphereOfLight iconSprite: - sprite: _CP14/Objects/ModularTools/Magic/magic_crystal.rsi - state: blueholder_grey_icon3 + state: holder_grey_icon3 color: "#FFFF00" modifiers: - - !type:AddSpellsToSpellStorage - spells: - - CP14ActionSpellSphereOfLight + - !type:Inherit + copyFrom: + - BaseCrystalModifiers_SpellSphereOfLight - type: modularPart id: BlueHolderMagicCrystal4_SpellSphereOfLight @@ -56,9 +64,9 @@ sourcePart: CP14MagicCrystalSpellSphereOfLight iconSprite: - sprite: _CP14/Objects/ModularTools/Magic/magic_crystal.rsi - state: blueholder_grey_icon4 + state: holder_grey_icon4 color: "#FFFF00" modifiers: - - !type:AddSpellsToSpellStorage - spells: - - CP14ActionSpellSphereOfLight + - !type:Inherit + copyFrom: + - BaseCrystalModifiers_SpellSphereOfLight diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Magic/magic_crystal.rsi/blueholder_grey_icon1.png b/Resources/Textures/_CP14/Objects/ModularTools/Magic/magic_crystal.rsi/holder_grey_icon1.png similarity index 100% rename from Resources/Textures/_CP14/Objects/ModularTools/Magic/magic_crystal.rsi/blueholder_grey_icon1.png rename to Resources/Textures/_CP14/Objects/ModularTools/Magic/magic_crystal.rsi/holder_grey_icon1.png diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Magic/magic_crystal.rsi/blueholder_grey_icon2.png b/Resources/Textures/_CP14/Objects/ModularTools/Magic/magic_crystal.rsi/holder_grey_icon2.png similarity index 100% rename from Resources/Textures/_CP14/Objects/ModularTools/Magic/magic_crystal.rsi/blueholder_grey_icon2.png rename to Resources/Textures/_CP14/Objects/ModularTools/Magic/magic_crystal.rsi/holder_grey_icon2.png diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Magic/magic_crystal.rsi/blueholder_grey_icon3.png b/Resources/Textures/_CP14/Objects/ModularTools/Magic/magic_crystal.rsi/holder_grey_icon3.png similarity index 100% rename from Resources/Textures/_CP14/Objects/ModularTools/Magic/magic_crystal.rsi/blueholder_grey_icon3.png rename to Resources/Textures/_CP14/Objects/ModularTools/Magic/magic_crystal.rsi/holder_grey_icon3.png diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Magic/magic_crystal.rsi/blueholder_grey_icon4.png b/Resources/Textures/_CP14/Objects/ModularTools/Magic/magic_crystal.rsi/holder_grey_icon4.png similarity index 100% rename from Resources/Textures/_CP14/Objects/ModularTools/Magic/magic_crystal.rsi/blueholder_grey_icon4.png rename to Resources/Textures/_CP14/Objects/ModularTools/Magic/magic_crystal.rsi/holder_grey_icon4.png diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Magic/magic_crystal.rsi/meta.json b/Resources/Textures/_CP14/Objects/ModularTools/Magic/magic_crystal.rsi/meta.json index a9b1768bd3..515d30be09 100644 --- a/Resources/Textures/_CP14/Objects/ModularTools/Magic/magic_crystal.rsi/meta.json +++ b/Resources/Textures/_CP14/Objects/ModularTools/Magic/magic_crystal.rsi/meta.json @@ -11,16 +11,16 @@ "name": "ring_grey_icon" }, { - "name": "blueholder_grey_icon1" + "name": "holder_grey_icon1" }, { - "name": "blueholder_grey_icon2" + "name": "holder_grey_icon2" }, { - "name": "blueholder_grey_icon3" + "name": "holder_grey_icon3" }, { - "name": "blueholder_grey_icon4" + "name": "holder_grey_icon4" } ] }