Magic redesign (#594)

* water spell textures * water creation spell * mana consume, and mana glove * remove mana transfer ring * Update migration.yml * copy Wizden loadout PR * add sprite component to all spells * spell dummy loadouts * delete spell traits * really give spells from loadouts * update crates fill and demiplane spawners * beer creation spell, fix passivedamage * Update PassiveDamageSystem.cs
2024-11-20 00:23:44 +03:00
parent ec278dc98f
commit e79b046c4a
50 changed files with 742 additions and 197 deletions
--- a/Resources/Prototypes/_CP14/Catalog/Fills/crates.yml
+++ b/Resources/Prototypes/_CP14/Catalog/Fills/crates.yml
@@ -44,9 +44,12 @@
    children:
    - !type:GroupSelector
      children:
-      - id: CP14Scissors
      - id: CP14BaseCrowbar
+        weight: 2
      - id: CP14BaseWrench
+        weight: 2
+      - id: CP14Scissors
+      - id: CP14ManaOperationGlove
      - id: CP14BaseShovel
      - id: CP14BaseMop
      - id: CP14BaseBroom
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Earth/T1_earth_wall.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Earth/T1_earth_wall.yml
@@ -3,6 +3,9 @@
  name: Earth wall
  description: Raises a solid wall of earth from the bowels.
  components:
+  - type: Sprite
+    sprite: _CP14/Effects/Magic/spells_icons.rsi
+    state: earth_wall
  - type: CP14MagicEffectCastSlowdown
    speedMultiplier: 0.3
  - type: CP14MagicEffect
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Fire/T0_flame_creation.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Fire/T0_flame_creation.yml
@@ -3,6 +3,9 @@
  name: Flame creation
  description: A artificial flame forms in your hand, illuminating your surroundings. You can throw it to use it as a disposable weapon.
  components:
+  - type: Sprite
+    sprite: _CP14/Effects/Magic/spells_icons.rsi
+    state: flame_creation
  - type: CP14MagicEffect
    magicType: Fire
    manaCost: 5
@@ -73,7 +76,7 @@
      - state: inhand-right
        shader: unshaded
  - type: TimedDespawn
-    lifetime: 300 # 5 min
+    lifetime: 60 # 1 min
  - type: Sprite
    sprite: _CP14/Objects/Misc/artificial_flame.rsi
    layers:
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Fire/T1_fireball.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Fire/T1_fireball.yml
@@ -3,6 +3,9 @@
  name: Fireball
  description: An effective method of destruction - an explosive fireball
  components:
+  - type: Sprite
+    sprite: _CP14/Effects/Magic/spells_icons.rsi
+    state: fireball
  - type: CP14MagicEffectCastSlowdown
    speedMultiplier: 0.3
  - type: CP14MagicEffect
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Gate/T2_shadow_step.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Gate/T2_shadow_step.yml
@@ -3,6 +3,9 @@
  name: Shadow step
  description: A step through the gash of reality that allows you to cover a small of distance quickly
  components:
+  - type: Sprite
+    sprite: _CP14/Effects/Magic/spells_icons.rsi
+    state: shadow_step
  - type: CP14MagicEffectCastSlowdown
    speedMultiplier: 0.8
  - type: CP14MagicEffect
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Healing/T1_cure_wounds.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Healing/T1_cure_wounds.yml
@@ -3,6 +3,9 @@
  name: Cure wounds
  description: You touch the creature, healing its body from physical damage
  components:
+  - type: Sprite
+    sprite: _CP14/Effects/Magic/spells_icons.rsi
+    state: cure_wounds
  - type: CP14MagicEffectCastSlowdown
    speedMultiplier: 0.5
  - type: CP14MagicEffect
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/LightDarkness/T0_sphere_of_light.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/LightDarkness/T0_sphere_of_light.yml
@@ -3,6 +3,9 @@
  name: Sphere of Light
  description: Materialization of a bright and safe light source.
  components:
+  - type: Sprite
+    sprite: _CP14/Effects/Magic/spells_icons.rsi
+    state: sphere_of_light
  - type: CP14MagicEffect
    magicType: LightDarkness
    manaCost: 10
@@ -63,7 +66,7 @@
  categories: [ ForkFiltered ]
  components:
  - type: TimedDespawn
-    lifetime: 300 # 5 min
+    lifetime: 180 # 3 min
  - type: Sprite
    sprite: _CP14/Effects/Magic/sphere_of_light.rsi
    noRot: true
@@ -90,8 +93,8 @@
  - type: LandAtCursor
  - type: MovementIgnoreGravity
  - type: PointLight
-    radius: 6.0
-    energy: 2
+    radius: 5.0
+    energy: 1
    color: "#efedff"
  - type: Damageable
  - type: EmitSoundOnLand
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/LightDarkness/T1_flash_light.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/LightDarkness/T1_flash_light.yml
@@ -3,6 +3,9 @@
  name: Flash Light
  description: Creates a flash of bright, blinding light.
  components:
+  - type: Sprite
+    sprite: _CP14/Effects/Magic/spells_icons.rsi
+    state: flash_light
  - type: CP14MagicEffect
    magicType: LightDarkness
    manaCost: 10
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Meta/T0_mana_consume.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Meta/T0_mana_consume.yml
@@ -0,0 +1,67 @@
+- type: entity
+  id: CP14ActionSpellManaConsume
+  name: Mana consume
+  description: You absorb a small amount of mana from the target. 
+  components:
+  - type: Sprite
+    sprite: _CP14/Effects/Magic/spells_icons.rsi
+    state: mana_consume
+  - type: CP14MagicEffect
+    magicType: Meta
+    manaCost: 0
+    canModifyManacost: false
+    telegraphyEffects:
+    - !type:CP14SpellSpawnEntityOnTarget
+      spawns:
+      - CP14ImpactEffectManaConsume
+    effects:
+    - !type:CP14SpellSpawnEntityOnTarget
+      spawns:
+      - CP14ImpactEffectManaConsume
+    - !type:CP14SpellConsumeManaEffect
+      mana: 10
+  - type: CP14MagicEffectSomaticAspect
+  - type: CP14MagicEffectCastingVisual
+    proto: CP14RuneManaConsume
+  - type: EntityTargetAction
+    whitelist:
+      components:
+      - CP14MagicEnergyContainer
+    itemIconStyle: BigAction
+    interactOnMiss: false
+    sound: !type:SoundPathSpecifier
+      path: /Audio/Magic/rumble.ogg
+    icon:
+      sprite: _CP14/Effects/Magic/spells_icons.rsi
+      state: mana_consume
+    event: !type:CP14DelayedEntityTargetActionEvent
+      cooldown: 1
+      castDelay: 2
+      breakOnMove: true
+
+- type: entity
+  id: CP14RuneManaConsume
+  parent: CP14BaseMagicRune
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: PointLight
+    color: "#5096d4"
+  - type: Sprite
+    layers:
+    - state: medium_line
+      color: "#5096d4"
+      shader: unshaded
+    - state: double_outer
+      color: "#5096d4"
+      shader: unshaded
+
+- type: entity
+  id: CP14ImpactEffectManaConsume
+  parent: CP14BaseMagicImpact
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: Sprite
+    layers:
+    - state: particles_down
+      color: "#5096d4"
+      shader: unshaded
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Meta/T0_mana_gift.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Meta/T0_mana_gift.yml
@@ -3,6 +3,9 @@
  name: Mana transfer
  description: You can transfer a small amount of your magical energy to a target entity or magical object.
  components:
+  - type: Sprite
+    sprite: _CP14/Effects/Magic/spells_icons.rsi
+    state: mana_gift
  - type: CP14MagicEffect
    magicType: Meta
    manaCost: 12
@@ -20,9 +23,6 @@
      - !type:CP14ManaChange
        manaDelta: 10
        safe: false
-  - type: CP14MagicEffectVerbalAspect
-    startSpeech: "Energia..."
-    endSpeech: "te reficit"
  - type: CP14MagicEffectSomaticAspect
  - type: CP14MagicEffectCastingVisual
    proto: CP14RuneManaGift
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Movement/T0_shadow_grab.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Movement/T0_shadow_grab.yml
@@ -3,6 +3,9 @@
  name: Shadow grab
  description: You attract a ghostly hand that draws an object or entity to you
  components:
+  - type: Sprite
+    sprite: _CP14/Effects/Magic/spells_icons.rsi
+    state: shadow_grab
  - type: CP14MagicEffect
    magicType: Movement
    manaCost: 10
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Necromancy/T1_resurrection.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Necromancy/T1_resurrection.yml
@@ -3,6 +3,9 @@
  name: Resurrection
  description: You're trying to put the soul back into the body.
  components:
+  - type: Sprite
+    sprite: _CP14/Effects/Magic/spells_icons.rsi
+    state: resurrection
  - type: CP14MagicEffectCastSlowdown
    speedMultiplier: 0.2
  - type: CP14MagicEffect
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Water/T0_ice_dagger.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Water/T0_ice_dagger.yml
@@ -3,6 +3,9 @@
  name: Ice dagger
  description: Materialization of a temporary sharp ice throwing dagger
  components:
+  - type: Sprite
+    sprite: _CP14/Effects/Magic/spells_icons.rsi
+    state: ice_dagger
  - type: CP14MagicEffect
    magicType: Water
    manaCost: 15
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Water/T0_water_creation.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Water/T0_water_creation.yml
@@ -0,0 +1,147 @@
+- type: entity
+  id: CP14ActionSpellWaterCreation
+  name: Water creation
+  description: Creating a clot of water that is held in a floating balloon shape for some time
+  components:
+  - type: Sprite
+    sprite: _CP14/Effects/Magic/spells_icons.rsi
+    state: water_creation
+  - type: CP14MagicEffect
+    magicType: Water
+    manaCost: 10
+    effects:
+    - !type:CP14SpellSpawnEntityOnTarget
+      spawns:
+      - CP14ImpactEffectWaterCreation
+    - !type:CP14SpellSpawnInHandEntity
+      spawns:
+      - CP14LiquidDropWater
+  - type: CP14MagicEffectSomaticAspect
+  - type: CP14MagicEffectCastingVisual
+    proto: CP14RuneWaterCreation
+  - type: InstantAction
+    itemIconStyle: BigAction
+    sound: !type:SoundPathSpecifier
+      path: /Audio/Magic/rumble.ogg
+    icon:
+      sprite: _CP14/Effects/Magic/spells_icons.rsi
+      state: water_creation
+    event: !type:CP14DelayedInstantActionEvent
+      cooldown: 10
+      castDelay: 0.8
+      breakOnMove: false
+
+- type: entity
+  id: CP14RuneWaterCreation
+  parent: CP14BaseMagicRune
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: PointLight
+    color: "#5eabeb"
+  - type: Sprite
+    layers:
+    - state: medium_line
+      color: "#5eabeb"
+      shader: unshaded
+
+- type: entity
+  id: CP14LiquidDropWater
+  parent: BaseItem
+  name: floating liquid drop
+  description: A clot of liquid held in the shape of a ball by magic
+  categories: [ ForkFiltered ]
+  components:
+  - type: Item
+    size: Ginormous
+  - type: BadFood
+  - type: SolutionContainerManager
+    solutions:
+      drop:
+        maxVol: 10
+        reagents:
+        - ReagentId: Water
+          Quantity: 10
+  - type: CP14MeleeSelfDamage
+    damageToSelf:
+      types:
+        Blunt: 1 # 1 hits
+  - type: LandAtCursor
+  - type: DamageOnHighSpeedImpact
+    minimumSpeed: 0.1
+    damage:
+      types:
+        Blunt: 1
+  - type: MeleeWeapon
+    attackRate: 1.8
+    wideAnimationRotation: 225
+    wideAnimation: CP14WeaponArcSlash
+    damage:
+      types:
+        Blunt: 0
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 1
+      behaviors:
+      - !type:PlaySoundBehavior
+        sound:
+          collection: desecration
+      - !type:SpillBehavior
+        solution: drop
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+  - type: PassiveDamage # Around 8 damage a minute healed
+    damage:
+      groups:
+        Brute: 0.016 # ~ 1 minute
+  - type: Damageable
+    damageContainer: Biological
+  - type: Food
+    solution: drop
+    useSound: /Audio/Items/drink.ogg
+    eatMessage: drink-component-try-use-drink-success-slurp
+    delay: 0.5
+    forceFeedDelay: 1.5
+  - type: ExaminableSolution
+    solution: drop
+  - type: RefillableSolution
+    solution: drop
+  - type: InjectableSolution
+    solution: drop
+  - type: FitsInDispenser
+    solution: drop
+  - type: MixableSolution
+    solution: drop
+  - type: CP14SolutionTemperature
+  - type: Appearance
+  - type: Sprite
+    sprite: _CP14/Objects/Misc/liquid_drop.rsi
+    layers:
+      - state: liq-1
+        map: ["enum.SolutionContainerLayers.Fill"]
+  - type: SolutionContainerVisuals
+    maxFillLevels: 1
+    fillBaseName: liq-
+    inHandsMaxFillLevels: 1
+    inHandsFillBaseName: -fill
+
+- type: entity
+  id: CP14ImpactEffectWaterCreation
+  parent: CP14BaseMagicImpact
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: Sprite
+    layers:
+    - state: particles_up
+      color: "#5eabeb"
+      shader: unshaded
+
+- type: entity
+  parent: CP14BaseSpellScrollWater
+  id: CP14SpellScrollWaterCreation
+  name: water creation spell scroll
+  components:
+  - type: CP14SpellStorage
+    spells:
+    - CP14ActionSpellWaterCreation
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Water/T1_beer_creation.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Water/T1_beer_creation.yml
@@ -0,0 +1,87 @@
+- type: entity
+  id: CP14ActionSpellBeerCreation
+  name: Beer creation
+  description: A secret spell that materializes beer from pure mana.
+  components:
+  - type: Sprite
+    sprite: _CP14/Effects/Magic/spells_icons.rsi
+    state: beer_creation
+  - type: CP14MagicEffect
+    magicType: Water
+    manaCost: 50
+    effects:
+    - !type:CP14SpellSpawnEntityOnTarget
+      spawns:
+      - CP14ImpactEffectBeerCreation
+    - !type:CP14SpellSpawnInHandEntity
+      spawns:
+      - CP14LiquidDropBeer
+  - type: CP14MagicEffectVerbalAspect
+    startSpeech: "beer..."
+    endSpeech: "Arriva la birra"
+  - type: CP14MagicEffectSomaticAspect
+  - type: CP14MagicEffectCastingVisual
+    proto: CP14RuneBeerCreation
+  - type: InstantAction
+    itemIconStyle: BigAction
+    sound: !type:SoundPathSpecifier
+      path: /Audio/Magic/rumble.ogg
+    icon:
+      sprite: _CP14/Effects/Magic/spells_icons.rsi
+      state: beer_creation
+    event: !type:CP14DelayedInstantActionEvent
+      cooldown: 60
+      castDelay: 5
+      breakOnMove: true
+
+- type: entity
+  id: CP14RuneBeerCreation
+  parent: CP14BaseMagicRune
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: PointLight
+    color: "#5eabeb"
+  - type: Sprite
+    layers:
+    - state: medium_line
+      color: "#9e522c"
+      shader: unshaded
+    - state: medium_circle
+      color: "#5eabeb"
+      shader: unshaded
+
+- type: entity
+  id: CP14LiquidDropBeer
+  parent: CP14LiquidDropWater
+  categories: [ ForkFiltered ]
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drop:
+        maxVol: 10
+        reagents:
+        - ReagentId: Beer
+          Quantity: 10
+
+- type: entity
+  id: CP14ImpactEffectBeerCreation
+  parent: CP14BaseMagicImpact
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: Sprite
+    layers:
+    - state: particles_up
+      color: "#5eabeb"
+      shader: unshaded
+    - state: particles_down
+      color: "#9e522c"
+      shader: unshaded
+
+- type: entity
+  parent: CP14BaseSpellScrollWater
+  id: CP14SpellScrollBeerCreation
+  name: beer creation spell scroll
+  components:
+  - type: CP14SpellStorage
+    spells:
+    - CP14ActionSpellBeerCreation
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Water/T1_ice_shards.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Water/T1_ice_shards.yml
@@ -3,6 +3,9 @@
  name: Ice Shards
  description: Fast ice needles, for rapid shooting of targets.
  components:
+  - type: Sprite
+    sprite: _CP14/Effects/Magic/spells_icons.rsi
+    state: ice_shards
  - type: CP14MagicEffectCastSlowdown
    speedMultiplier: 0.75
  - type: CP14MagicEffect
--- a/Resources/Prototypes/_CP14/Entities/Clothing/Rings/ring.yml
+++ b/Resources/Prototypes/_CP14/Entities/Clothing/Rings/ring.yml
@@ -12,38 +12,6 @@
  - type: Sprite
    sprite: _CP14/Clothing/Rings/rings.rsi

- type: entity
-  id: CP14ClothingRingIceDagger
-  parent: CP14ClothingRingBase
-  name: ice dagger conductive ring
-  suffix: Ice Dagger
-  description: A standard mana-conductive ring that allows the user to summon ice daggers.
-  components:
-  - type: Sprite
-    layers:
-    - state: brass_ring
-    - state: saphhire_stone_small
-  - type: CP14SpellStorageAccessWearing
-  - type: CP14SpellStorage
-    spells:
-    - CP14ActionSpellIceDagger
-
- type: entity
-  id: CP14ClothingRingManaGift
-  parent: CP14ClothingRingBase
-  name: mana transfering conductive ring
-  suffix: Mana gift
-  description: A standard mana-conductive ring that allows you to transfer some of your magical energy to other objects.
-  components:
-  - type: Sprite
-    layers:
-    - state: brass_ring
-    - state: saphhire_stone_small
-  - type: CP14SpellStorageAccessWearing
-  - type: CP14SpellStorage
-    spells:
-    - CP14ActionSpellManaGift
-
 - type: entity
  id: CP14ClothingRingIceShards
  parent: CP14ClothingRingBase
@@ -60,22 +28,6 @@
    spells:
    - CP14ActionSpellIceShards

- type: entity
-  id: CP14ClothingRingFlameCreation
-  parent: CP14ClothingRingBase
-  name: flame creation conductive ring
-  description: A standard mana-conductive ring that allows the user to summon artificial flames.
-  suffix: Flame creation
-  components:
-  - type: Sprite
-    layers:
-    - state: brass_ring
-    - state: ruby_stone_small
-  - type: CP14SpellStorageAccessWearing
-  - type: CP14SpellStorage
-    spells:
-    - CP14ActionSpellFlameCreation
-
 - type: entity
  id: CP14ClothingRingFireball
  parent: CP14ClothingRingBase
@@ -92,54 +44,6 @@
    spells:
    - CP14ActionSpellFireball

- type: entity
-  id: CP14ClothingRingShadowGrab
-  parent: CP14ClothingRingBase
-  name: shadow grab conductive ring
-  description: A standard mana-conductive ring that allows the user to summon grabbing shadow hand.
-  suffix: Shadow grab
-  components:
-  - type: Sprite
-    layers:
-    - state: brass_ring
-    - state: amethyst_stone_small
-  - type: CP14SpellStorageAccessWearing
-  - type: CP14SpellStorage
-    spells:
-    - CP14ActionSpellShadowGrab
-
- type: entity
-  id: CP14ClothingRingEarthWall
-  parent: CP14ClothingRingBase
-  name: earth wall conductive ring
-  description: A standard mana-conductive ring that allows you to lift a piece of earth rock.
-  suffix: Earth wall
-  components:
-  - type: Sprite
-    layers:
-    - state: brass_ring
-    - state: berill_stone_small
-  - type: CP14SpellStorageAccessWearing
-  - type: CP14SpellStorage
-    spells:
-    - CP14ActionSpellEarthWall
-
- type: entity
-  id: CP14ClothingRingSphereOfLight
-  parent: CP14ClothingRingBase
-  name: light sphere conductive ring
-  description: A standard mana-conductive ring that allows the user to create a sphere of light.
-  suffix: Sphere of Light
-  components:
-  - type: Sprite
-    layers:
-    - state: brass_ring
-    - state: citrine_stone_small
-  - type: CP14SpellStorageAccessWearing
-  - type: CP14SpellStorage
-    spells:
-    - CP14ActionSpellSphereOfLight
-
 - type: entity
  id: CP14ClothingRingFlashLight
  parent: CP14ClothingRingBase
--- a/Resources/Prototypes/_CP14/Entities/Markers/Spawners/Random/Loot/spawners.yml
+++ b/Resources/Prototypes/_CP14/Entities/Markers/Spawners/Random/Loot/spawners.yml
@@ -45,6 +45,8 @@
        - id: CP14SpellScrollFlameCreation
        - id: CP14SpellScrollEarthWall
        - id: CP14SpellScrollFlashLight
+        - id: CP14SpellScrollWaterCreation
+        - id: CP14SpellScrollBeerCreation
      - id: CP14EnergyCrystalSmall
      - id: CP14BaseSharpeningStone
      - id: CP14GlassShard
@@ -75,16 +77,10 @@
      # remove this when players can create their own magic items
      - !type:GroupSelector
        children:
-        - id: CP14ClothingRingIceDagger
        - id: CP14ClothingRingIceShards
-        - id: CP14ClothingRingFlameCreation
        - id: CP14ClothingRingFireball
-        - id: CP14MagicHealingStaff
-        - id: CP14ClothingRingShadowGrab
-        - id: CP14ClothingRingEarthWall
-        - id: CP14ClothingRingManaGift
-        - id: CP14ClothingRingSphereOfLight
        - id: CP14ClothingRingFlashLight
+        - id: CP14MagicHealingStaff
        - id: CP14SpellScrollResurrection
      # Rare standard village crates loot
      - !type:NestedSelector
--- a/Resources/Prototypes/_CP14/Entities/Objects/Specific/Thaumaturgy/tools.yml
+++ b/Resources/Prototypes/_CP14/Entities/Objects/Specific/Thaumaturgy/tools.yml
@@ -30,4 +30,49 @@
    sprite: _CP14/Objects/Specific/Thaumaturgy/ritual_chalk.rsi
    state: icon
  - type: Item
-    sprite: _CP14/Objects/Specific/Thaumaturgy/ritual_chalk.rsi 
+    sprite: _CP14/Objects/Specific/Thaumaturgy/ritual_chalk.rsi 
+
+- type: entity
+  id: CP14ManaOperationGlove
+  parent: 
+  - BaseItem
+  - CP14BaseWeaponLight
+  - CP14BaseWeaponShort
+  name: mana glove
+  description: "An unsophisticated but aesthetically pleasing blend of technology and magic crystals that allows you to operate with raw mana: siphoning it from some objects and pumping it into others."
+  categories: [ ForkFiltered ]
+  components:
+  - type: Sprite
+    sprite: _CP14/Objects/Specific/Thaumaturgy/powerline_gauntlet.rsi
+    state: icon
+  - type: Item
+    size: Normal
+    shape:
+    - 0,0,0,1
+    storedRotation: -45
+    sprite: _CP14/Objects/Specific/Thaumaturgy/powerline_gauntlet.rsi 
+  - type: CP14MagicEnergyContainer
+    magicAlert: CP14MagicEnergy
+    maxEnergy: 50
+    energy: 0
+  - type: CP14MagicEnergyExaminable
+  - type: CP14SpellStorageAccessHolding
+  - type: CP14SpellStorage
+    spells:
+    - CP14ActionSpellManaGift
+    - CP14ActionSpellManaConsume
+  - type: ThrowingAngle #Fun
+    angle: 225
+  - type: MeleeWeapon
+    angle: 0
+    attackRate: 1.2
+    range: 1.2
+    wideAnimationRotation: 225
+    wideAnimation: CP14WeaponArcThrust
+    damage:
+      types:
+        Blunt: 5
+    soundHit:
+      collection: MetalThud
+    cPAnimationLength: 0.25
+    cPAnimationOffset: -1.3
--- a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Magic/twoHandedStaffs.yml
+++ b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Magic/twoHandedStaffs.yml
@@ -24,7 +24,7 @@
  - type: IncreaseDamageOnWield
    damage:
      types: 
-        Blunt: 3
+        Blunt: 4
  - type: MeleeWeapon
    angle: 100
    attackRate: 1.3
@@ -33,7 +33,7 @@
    wideAnimation: CP14WeaponArcSlash
    damage:
      types:
-        Blunt: 2
+        Blunt: 4
    soundHit:
      collection: MetalThud
    cPAnimationLength: 0.3
--- a/Resources/Prototypes/_CP14/Loadouts/Jobs/general.yml
+++ b/Resources/Prototypes/_CP14/Loadouts/Jobs/general.yml
@@ -291,7 +291,7 @@
  maxLimit: 2
  loadouts:
  - CP14MagicHealingStaff
-  - CP14ClothingRingManaGift
+  - CP14ManaOperationGlove
  - CP14EnergyCrystalSmall
  - CP14CrystalLampOrangeEmpty
  - CP14BaseSharpeningStone
@@ -307,15 +307,14 @@

 - type: loadout
  id: CP14MagicHealingStaff
-  storage:
-    neck:
-    - CP14MagicHealingStaff
+  inhand:
+  - CP14MagicHealingStaff

 - type: loadout
-  id: CP14ClothingRingManaGift
+  id: CP14ManaOperationGlove
  storage:
    back:
-    - CP14ClothingRingManaGift
+    - CP14ManaOperationGlove

 - type: loadout
  id: CP14EnergyCrystalSmall
@@ -387,4 +386,87 @@
  id: CP14BasePickaxe
  storage:
    back:
-    - CP14BasePickaxe
+    - CP14BasePickaxe
+
+# Spells
+
+- type: loadoutGroup
+  id: CP14GeneralSpells
+  name: cp14-loadout-general-spells
+  minLimit: 0
+  maxLimit: 2
+  loadouts:
+  - CP14ActionSpellFlameCreation
+  - CP14ActionSpellCureWounds
+  - CP14ActionSpellSphereOfLight
+  - CP14ActionSpellManaConsume
+  - CP14ActionSpellManaGift
+  - CP14ActionSpellShadowGrab
+  - CP14ActionSpellIceDagger
+  - CP14ActionSpellWaterCreation
+  - CP14ActionSpellBeerCreation
+
+- type: loadout
+  id: CP14ActionSpellFlameCreation
+  dummyEntity: CP14ActionSpellFlameCreation
+  actions:
+  - CP14ActionSpellFlameCreation
+
+- type: loadout
+  id: CP14ActionSpellCureWounds
+  dummyEntity: CP14ActionSpellCureWounds
+  actions:
+  - CP14ActionSpellCureWounds
+
+- type: loadout
+  id: CP14ActionSpellSphereOfLight
+  dummyEntity: CP14ActionSpellSphereOfLight
+  actions:
+  - CP14ActionSpellSphereOfLight
+
+- type: loadout
+  id: CP14ActionSpellManaConsume
+  dummyEntity: CP14ActionSpellManaConsume
+  actions:
+  - CP14ActionSpellManaConsume
+
+- type: loadout
+  id: CP14ActionSpellManaGift
+  dummyEntity: CP14ActionSpellManaGift
+  actions:
+  - CP14ActionSpellManaGift
+
+- type: loadout
+  id: CP14ActionSpellShadowGrab
+  dummyEntity: CP14ActionSpellShadowGrab
+  actions:
+  - CP14ActionSpellShadowGrab
+
+- type: loadout
+  id: CP14ActionSpellIceDagger
+  dummyEntity: CP14ActionSpellIceDagger
+  actions:
+  - CP14ActionSpellIceDagger
+
+- type: loadout
+  id: CP14ActionSpellWaterCreation
+  dummyEntity: CP14ActionSpellWaterCreation
+  actions:
+  - CP14ActionSpellWaterCreation
+
+- type: loadout
+  id: CP14ActionSpellBeerCreation
+  dummyEntity: CP14ActionSpellBeerCreation
+  actions:
+  - CP14ActionSpellBeerCreation
+  effects:
+  - !type:JobRequirementLoadoutEffect
+    requirement:
+      !type:SpeciesRequirement
+      species:
+      - CP14Dwarf
+  - !type:JobRequirementLoadoutEffect
+    requirement:
+      !type:RoleTimeRequirement
+      role: CP14JobInnkeeper
+      time: 7200 # 2 hour
--- a/Resources/Prototypes/_CP14/Loadouts/role_loadouts.yml
+++ b/Resources/Prototypes/_CP14/Loadouts/role_loadouts.yml
@@ -1,6 +1,7 @@
 - type: roleLoadout
  id: JobCP14Adventurer
  groups:
+  - CP14GeneralSpells
  - CP14GeneralHead
  - CP14GeneralEyes
  - CP14GeneralMask
@@ -15,6 +16,7 @@
 - type: roleLoadout
  id: JobCP14Alchemist
  groups:
+  - CP14GeneralSpells
  - CP14AlchemistHead #
  - CP14AlchemistEyes #
  - CP14GeneralMask
@@ -29,6 +31,7 @@
 - type: roleLoadout
  id: JobCP14Innkeeper
  groups:
+  - CP14GeneralSpells
  - CP14GeneralHead
  - CP14GeneralEyes
  - CP14GeneralMask
@@ -43,6 +46,7 @@
 - type: roleLoadout
  id: JobCP14Blacksmith
  groups:
+  - CP14GeneralSpells
  - CP14GeneralHead
  - CP14GeneralEyes
  - CP14GeneralMask
@@ -57,6 +61,7 @@
 - type: roleLoadout
  id: JobCP14Captain
  groups:
+  - CP14GeneralSpells
  - CP14CaptainHead #
  - CP14GeneralEyes
  - CP14GeneralMask
@@ -71,6 +76,7 @@
 - type: roleLoadout
  id: JobCP14GuardCommander
  groups:
+  - CP14GeneralSpells
  - CP14GeneralHead
  - CP14GeneralEyes
  - CP14GeneralMask
@@ -85,6 +91,7 @@
 - type: roleLoadout
  id: JobCP14Commandant
  groups:
+  - CP14GeneralSpells
  - CP14CommandantHead
  - CP14GeneralEyes
  - CP14CommandantCloak
@@ -97,6 +104,7 @@
 - type: roleLoadout
  id: JobCP14Banker
  groups:
+  - CP14GeneralSpells
  - CP14BankHead
  - CP14GeneralEyes
  - CP14BankShirt
--- a/Resources/Prototypes/_CP14/Traits/categories.yml
+++ b/Resources/Prototypes/_CP14/Traits/categories.yml
@@ -1,8 +1,3 @@
- type: traitCategory
-  id: CP14Magic
-  name: cp14-trait-category-magic
-  maxTraitPoints: 1
-
 - type: traitCategory
  id: CP14PhysicalTraits
  name: cp14-trait-category-physical
--- a/Resources/Prototypes/_CP14/Traits/spells.yml
+++ b/Resources/Prototypes/_CP14/Traits/spells.yml
@@ -1,17 +0,0 @@
- type: trait
-  id: CP14MagicFlameCreation
-  name: cp14-trait-spell-flamecreation-name
-  description: cp14-trait-spell-flamecreation-desc
-  cost: 1
-  category: CP14Magic
-  actions:
-  - CP14ActionSpellFlameCreation
-
- type: trait
-  id: CP14MagicManaGift
-  name: cp14-trait-spell-managift-name
-  description: cp14-trait-spell-managift-desc
-  cost: 1
-  category: CP14Magic
-  actions:
-  - CP14ActionSpellManaGift