Magic spells code expansion (#692)

* split manacost in separate component * stamina spells * toggleable actions * swap activeCasting on ActiveDoAfter * remove dublication * Update CP14SharedMagicSystem.ToggleableActions.cs * EntityWoldTarget * mana glove done * fix spell scrolls interrupting * fix cooldown problem * clean up, edit stamina system
2025-01-04 21:35:59 +03:00
parent a6a4a8da3f
commit 36d02fdf6e
35 changed files with 743 additions and 314 deletions
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Earth/T1_earth_wall.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Earth/T1_earth_wall.yml
@@ -8,9 +8,10 @@
    state: earth_wall
  - type: CP14MagicEffectCastSlowdown
    speedMultiplier: 0.3
+  - type: CP14MagicEffectManaCost
+    manaCost: 15
  - type: CP14MagicEffect
    magicType: Earth
-    manaCost: 15
    telegraphyEffects:
    - !type:CP14SpellSpawnEntityOnTarget
      spawns:
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Fire/T0_flame_creation.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Fire/T0_flame_creation.yml
@@ -6,9 +6,10 @@
  - type: Sprite
    sprite: _CP14/Effects/Magic/spells_icons.rsi
    state: flame_creation
+  - type: CP14MagicEffectManaCost
+    manaCost: 5
  - type: CP14MagicEffect
    magicType: Fire
-    manaCost: 5
    effects:
    - !type:CP14SpellSpawnEntityOnTarget
      spawns:
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Fire/T1_fireball.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Fire/T1_fireball.yml
@@ -8,9 +8,10 @@
    state: fireball
  - type: CP14MagicEffectCastSlowdown
    speedMultiplier: 0.3
+  - type: CP14MagicEffectManaCost
+    manaCost: 20
  - type: CP14MagicEffect
    magicType: Fire
-    manaCost: 20
    effects:
    - !type:CP14SpellSpawnEntityOnUser
      spawns:
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Gate/T2_shadow_step.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Gate/T2_shadow_step.yml
@@ -8,9 +8,10 @@
    state: shadow_step
  - type: CP14MagicEffectCastSlowdown
    speedMultiplier: 0.8
+  - type: CP14MagicEffectManaCost
+    manaCost: 20
  - type: CP14MagicEffect
    magicType: Gate
-    manaCost: 20
    telegraphyEffects:
    - !type:CP14SpellSpawnEntityOnTarget
      spawns:
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Healing/T0_cure_heat.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Healing/T0_cure_heat.yml
@@ -8,9 +8,10 @@
    state: cure_burn
  - type: CP14MagicEffectCastSlowdown
    speedMultiplier: 0.5
+  - type: CP14MagicEffectManaCost
+    manaCost: 10
  - type: CP14MagicEffect
    magicType: Healing
-    manaCost: 10
    telegraphyEffects:
    - !type:CP14SpellSpawnEntityOnTarget
      spawns:
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Healing/T0_cure_poison.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Healing/T0_cure_poison.yml
@@ -8,9 +8,10 @@
    state: cure_poison
  - type: CP14MagicEffectCastSlowdown
    speedMultiplier: 0.5
+  - type: CP14MagicEffectManaCost
+    manaCost: 10
  - type: CP14MagicEffect
    magicType: Healing
-    manaCost: 10
    telegraphyEffects:
    - !type:CP14SpellSpawnEntityOnTarget
      spawns:
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Healing/T0_cure_wounds.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Healing/T0_cure_wounds.yml
@@ -8,9 +8,10 @@
    state: cure_wounds
  - type: CP14MagicEffectCastSlowdown
    speedMultiplier: 0.5
+  - type: CP14MagicEffectManaCost
+    manaCost: 10
  - type: CP14MagicEffect
    magicType: Healing
-    manaCost: 10
    telegraphyEffects:
    - !type:CP14SpellSpawnEntityOnTarget
      spawns:
--- 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
@@ -6,9 +6,10 @@
  - type: Sprite
    sprite: _CP14/Effects/Magic/spells_icons.rsi
    state: sphere_of_light
+  - type: CP14MagicEffectManaCost
+    manaCost: 10
  - type: CP14MagicEffect
    magicType: LightDarkness
-    manaCost: 10
    effects:
    - !type:CP14SpellSpawnEntityOnTarget
      spawns:
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/LightDarkness/T1_flash_light.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/LightDarkness/T1_flash_light.yml
@@ -6,9 +6,10 @@
  - type: Sprite
    sprite: _CP14/Effects/Magic/spells_icons.rsi
    state: flash_light
+  - type: CP14MagicEffectManaCost
+    manaCost: 10
  - type: CP14MagicEffect
    magicType: LightDarkness
-    manaCost: 10
    telegraphyEffects:
    - !type:CP14SpellSpawnEntityOnTarget
      spawns:
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Meta/T0_mana_consume.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Meta/T0_mana_consume.yml
@@ -8,8 +8,6 @@
    state: mana_consume
  - type: CP14MagicEffect
    magicType: Meta
-    manaCost: 0
-    canModifyManacost: false
    telegraphyEffects:
    - !type:CP14SpellSpawnEntityOnTarget
      spawns:
@@ -34,9 +32,9 @@
    icon:
      sprite: _CP14/Effects/Magic/spells_icons.rsi
      state: mana_consume
-    event: !type:CP14DelayedEntityTargetActionEvent
-      cooldown: 1
-      castDelay: 2
+    event: !type:CP14ToggleableEntityTargetActionEvent
+      cooldown: 5
+      castTime: 10
      breakOnMove: true

 - type: entity
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Meta/T0_mana_gift.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Meta/T0_mana_gift.yml
@@ -6,10 +6,11 @@
  - type: Sprite
    sprite: _CP14/Effects/Magic/spells_icons.rsi
    state: mana_gift
-  - type: CP14MagicEffect
-    magicType: Meta
+  - type: CP14MagicEffectManaCost
    manaCost: 12
    canModifyManacost: false
+  - type: CP14MagicEffect
+    magicType: Meta
    telegraphyEffects:
    - !type:CP14SpellSpawnEntityOnTarget
      spawns:
@@ -39,9 +40,9 @@
    icon:
      sprite: _CP14/Effects/Magic/spells_icons.rsi
      state: mana_gift
-    event: !type:CP14DelayedEntityTargetActionEvent
-      cooldown: 1
-      castDelay: 1
+    event: !type:CP14ToggleableEntityTargetActionEvent
+      cooldown: 5
+      castTime: 10

 - type: entity
  id: 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
@@ -6,9 +6,10 @@
  - type: Sprite
    sprite: _CP14/Effects/Magic/spells_icons.rsi
    state: shadow_grab
+  - type: CP14MagicEffectManaCost
+    manaCost: 10
  - type: CP14MagicEffect
    magicType: Movement
-    manaCost: 10
    telegraphyEffects:
    - !type:CP14SpellSpawnEntityOnTarget
      spawns:
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Necromancy/T1_resurrection.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Necromancy/T1_resurrection.yml
@@ -8,9 +8,10 @@
    state: resurrection
  - type: CP14MagicEffectCastSlowdown
    speedMultiplier: 0.2
+  - type: CP14MagicEffectManaCost
+    manaCost: 100
  - type: CP14MagicEffect
    magicType: Necromancy
-    manaCost: 100
    telegraphyEffects:
    - !type:CP14SpellSpawnEntityOnTarget
      spawns:
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Water/T0_water_creation.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Water/T0_water_creation.yml
@@ -6,9 +6,10 @@
  - type: Sprite
    sprite: _CP14/Effects/Magic/spells_icons.rsi
    state: water_creation
+  - type: CP14MagicEffectManaCost
+    manaCost: 10
  - type: CP14MagicEffect
    magicType: Water
-    manaCost: 10
    effects:
    - !type:CP14SpellSpawnEntityOnTarget
      spawns:
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Water/T1_beer_creation.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Water/T1_beer_creation.yml
@@ -6,9 +6,10 @@
  - type: Sprite
    sprite: _CP14/Effects/Magic/spells_icons.rsi
    state: beer_creation
+  - type: CP14MagicEffectManaCost
+    manaCost: 50
  - type: CP14MagicEffect
    magicType: Water
-    manaCost: 50
    effects:
    - !type:CP14SpellSpawnEntityOnTarget
      spawns:
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Water/T1_ice_shards.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Water/T1_ice_shards.yml
@@ -8,9 +8,10 @@
    state: ice_shards
  - type: CP14MagicEffectCastSlowdown
    speedMultiplier: 0.75
+  - type: CP14MagicEffectManaCost
+    manaCost: 5
  - type: CP14MagicEffect
    magicType: Water
-    manaCost: 5
    effects:
    - !type:CP14SpellProjectile
      prototype: CP14IceShard