Spell/Shield tweaks (#1804)

* Spell changes * shield changes
2025-09-27 15:17:27 -04:00
parent ae43454da2
commit f6ef53e24e
20 changed files with 51 additions and 37 deletions
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Electric/lightning_strike.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Electric/lightning_strike.yml
@@ -23,6 +23,7 @@
    range: 5
  - type: DoAfterArgs
    delay: 2
+    breakOnDamage: true
  - type: EntityTargetAction
    canTargetSelf: false
    event: !type:CP14EntityTargetModularEffectEvent
@@ -103,4 +104,4 @@
    layers:
    - state: medium_circle
      color: "#e8ff4c"
-      shader: unshaded
+      shader: unshaded
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Fire/heat.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Fire/heat.yml
@@ -14,7 +14,7 @@
    proto: CP14RuneHeat
  - type: CP14ActionDangerous
  - type: Action
-    useDelay: 8
+    useDelay: 4
    icon:
      sprite: _CP14/Actions/Spells/fire.rsi
      state: heat
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Life/air_saturation.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Life/air_saturation.yml
@@ -10,8 +10,8 @@
    manaCost: 5
  - type: DoAfterArgs
    repeat: true
-    delay: 1
-    breakOnMove: true
+    delay: 2
+    breakOnDamage: true
  - type: CP14ActionDoAfterVisuals
    proto: CP14RuneAirSaturation
  - type: Action
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Life/cure_heat.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Life/cure_heat.yml
@@ -7,7 +7,7 @@
  - type: CP14ActionDoAfterSlowdown
    speedMultiplier: 0.5
  - type: CP14ActionManaCost
-    manaCost: 12
+    manaCost: 10
  - type: CP14ActionTargetMobStatusRequired
  - type: CP14ActionSpeaking
    startSpeech: "Pellis dolorem..."
@@ -21,6 +21,7 @@
      state: cure_burn
  - type: DoAfterArgs
    delay: 1.5
+    breakOnDamage: true
  - type: TargetAction
    range: 7
    interactOnMiss: false
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Life/cure_poison.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Life/cure_poison.yml
@@ -7,7 +7,7 @@
  - type: CP14ActionDoAfterSlowdown
    speedMultiplier: 0.5
  - type: CP14ActionManaCost
-    manaCost: 12
+    manaCost: 10
  - type: CP14ActionSpeaking
    startSpeech: "Nella coda..."
    endSpeech: "sta il veleno"
@@ -24,6 +24,7 @@
    interactOnMiss: false
  - type: DoAfterArgs
    delay: 1.5
+    breakOnDamage: true
  - type: EntityTargetAction
    whitelist:
      components:
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Life/cure_wounds.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Life/cure_wounds.yml
@@ -7,9 +7,10 @@
  - type: CP14ActionDoAfterSlowdown
    speedMultiplier: 0.5
  - type: CP14ActionManaCost
-    manaCost: 12
+    manaCost: 10
  - type: DoAfterArgs
    delay: 1.5
+    breakOnDamage: true
  - type: CP14ActionSpeaking
    startSpeech: "Et curabuntur..."
    endSpeech: "vulnera tua"
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Life/sheep_polymorph.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Life/sheep_polymorph.yml
@@ -27,6 +27,7 @@
    interactOnMiss: false
  - type: DoAfterArgs
    delay: 1.5
+    breakOnDamage: true
  - type: EntityTargetAction
    whitelist:
      components:
@@ -79,4 +80,4 @@
  components:
  - type: CP14SpellStorage
    spells:
-    - CP14ActionSpellSheepPolymorph
+    - CP14ActionSpellSheepPolymorph
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Light/flash_light.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Light/flash_light.yml
@@ -13,6 +13,7 @@
    proto: CP14RuneFlashLight
  - type: DoAfterArgs
    delay: 0.5
+    breakOnDamage: true
  - type: Action
    useDelay: 6
    icon:
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Light/search_of_life.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Light/search_of_life.yml
@@ -14,6 +14,7 @@
    proto: CP14RuneSearchOfLife
  - type: DoAfterArgs
    delay: 1.5
+    breakOnDamage: true
  - type: Action
    useDelay: 30
    icon:
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Lurker/Fear.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Lurker/Fear.yml
@@ -19,6 +19,7 @@
  - type: DoAfterArgs
    delay: 1.5
    hidden: true
+    breakOnDamage: true
  - type: EntityTargetAction
    canTargetSelf: false
    whitelist:
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Meta/mana_armor.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Meta/mana_armor.yml
@@ -10,6 +10,7 @@
    manaCost: 15
  - type: DoAfterArgs
    delay: 1.0
+    breakOnDamage: true
  - type: CP14ActionDoAfterVisuals
    proto: CP14RuneManaTrance
  - type: Action
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Meta/mana_consume.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Meta/mana_consume.yml
@@ -15,6 +15,7 @@
    repeat: true
    breakOnMove: true
    delay: 1
+    breakOnDamage: true
  - type: TargetAction
  - type: EntityTargetAction
    whitelist:
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Meta/mana_gift.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Meta/mana_gift.yml
@@ -11,6 +11,7 @@
    repeat: true
    breakOnMove: true
    delay: 1
+    breakOnDamage: true
  - type: CP14ActionDoAfterVisuals
    proto: CP14RuneManaGift
  - type: Action
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Meta/mana_splitting.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Meta/mana_splitting.yml
@@ -12,6 +12,7 @@
    delay: 1
    repeat: true
    breakOnMove: true
+    breakOnDamage: true
  - type: CP14ActionDoAfterVisuals
    proto: CP14RuneMagicSplitting
  - type: Action
@@ -73,4 +74,4 @@
    energy: 2
    netsync: false
  - type: LightFade
-    duration: 1
+    duration: 1
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Meta/mana_splitting_small.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Meta/mana_splitting_small.yml
@@ -17,6 +17,7 @@
      state: counter_spell_small
  - type: DoAfterArgs
    delay: 1
+    breakOnDamage: true
  - type: TargetAction
    range: 5
  - type: EntityTargetAction
@@ -37,4 +38,4 @@
        effects:
        - !type:CP14ManaChange
          manaDelta: -5
-          safe: false
+          safe: false
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Meta/mana_trance.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Meta/mana_trance.yml
@@ -10,6 +10,7 @@
    repeat: true
    delay: 1
    hidden: true
+    breakOnDamage: true
  - type: CP14ActionDoAfterVisuals
    proto: CP14RuneManaTrance
  - type: Action
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Water/freeze.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Water/freeze.yml
@@ -15,7 +15,7 @@
  - type: CP14ActionDangerous
  - type: DoAfterArgs
    repeat: true
-    breakOnMove: true
+    breakOnDamage: true
    delay: 1.5
    distanceThreshold: 5
  - type: Action
--- a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/shield.yml
+++ b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/shield.yml
@@ -15,16 +15,16 @@
    activeBlockFraction: 0.8
    passiveBlockModifier:
      coefficients:
-        Blunt: 0.9
-        Slash: 0.9
-        Piercing: 0.9
-        Heat: 0.9
+        Blunt: 0.75
+        Slash: 0.6
+        Piercing: 0.6
+        Heat: 0.75
    activeBlockModifier:
      coefficients:
-        Blunt: 0.75
-        Slash: 0.75
-        Piercing: 0.75
-        Heat: 0.75
+        Blunt: 0.5
+        Slash: 0.4
+        Piercing: 0.4
+        Heat: 0.5
      flatReductions:
        Blunt: 1
        Slash: 1
@@ -63,7 +63,7 @@
            acts: [ "Destruction" ]
      - trigger:
          !type:DamageTrigger
-          damage: 100 
+          damage: 150
        behaviors:
          - !type:DoActsBehavior
            acts: [ "Destruction" ]
--- a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/shieldBuckler.yml
+++ b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/shieldBuckler.yml
@@ -15,16 +15,16 @@
    activeBlockFraction: 0.6
    passiveBlockModifier:
      coefficients:
-        Blunt: 0.9
-        Slash: 0.9
-        Piercing: 0.9
-        Heat: 0.9
+        Blunt: 0.75
+        Slash: 0.6
+        Piercing: 0.6
+        Heat: 0.6
    activeBlockModifier:
      coefficients:
-        Blunt: 0.8
-        Slash: 0.8
-        Piercing: 0.8
-        Heat: 0.8
+        Blunt: 0.5
+        Slash: 0.4
+        Piercing: 0.4
+        Heat: 0.4
  - type: Clothing
    equipDelay: 0.5
    unequipDelay: 0.5
@@ -60,7 +60,7 @@
            acts: [ "Destruction" ]
      - trigger:
          !type:DamageTrigger
-          damage: 75 
+          damage: 125
        behaviors:
          - !type:DoActsBehavior
            acts: [ "Destruction" ]
@@ -69,9 +69,9 @@
              collection: MetalBreak
          - !type:SpawnEntitiesBehavior
            spawn:
-              CP14WoodenPlanks1:
+              CP14IronBar1:
                min: 1
-                max: 2
+                max: 1

 - type: entity
  parent: CP14BaseWeaponShieldBuckler
--- a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/towerShield.yml
+++ b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/towerShield.yml
@@ -13,16 +13,16 @@
  - type: Blocking
    passiveBlockModifier:
      coefficients:
-        Blunt: 0.8
+        Blunt: 0.9
        Slash: 0.8
        Piercing: 0.8
-        Heat: 0.8
+        Heat: 0.9
    activeBlockModifier:
      coefficients:
-        Blunt: 0.5
+        Blunt: 0.6
        Slash: 0.5
        Piercing: 0.5
-        Heat: 0.5
+        Heat: 0.6
      flatReductions:
        Blunt: 3
        Slash: 3
@@ -62,7 +62,7 @@
            acts: [ "Destruction" ]
      - trigger:
          !type:DamageTrigger
-          damage: 200
+          damage: 250
        behaviors:
          - !type:DoActsBehavior
            acts: [ "Destruction" ]
@@ -91,4 +91,4 @@
  - type: PhysicalComposition
    materialComposition:
      CP14WoodenPlanks: 50
-      CP14Iron: 40
+      CP14Iron: 40