speed up ballade (#942)

Resources/Prototypes/_CP14/Entities/Actions/Spells/Healing/T0_heal_ballade.yml

@@ -1,6 +1,6 @@
 - type: entity
-  id: CP14ActionSpellHealMusic
-  name: Healing music
+  id: CP14ActionSpellHealBallade
+  name: Healing ballade
   description: Your music is filled with healing magic, slowly healing all the creatures around you.
   components:
   - type: Sprite
@@ -15,11 +15,10 @@
     effects:
     - !type:CP14SpellSpawnEntityOnTarget
       spawns:
-      - CP14ImpactEffectCureWounds
-      - CP14AreaEntityEffectHealMusic
+      - CP14AreaEntityEffectHealBallade
   - type: CP14MagicEffectRequiredMusicTool
   - type: CP14MagicEffectCastingVisual
-    proto: CP14RuneCureWounds
+    proto: CP14RuneHealBallade
   - type: InstantAction
     itemIconStyle: BigAction
     sound: !type:SoundPathSpecifier
@@ -34,10 +33,11 @@
       hidden: true
 
 - type: entity
-  id: CP14AreaEntityEffectHealMusic
-  parent: CP14BaseMagicImpact
+  id: CP14AreaEntityEffectHealBallade
   categories: [ HideSpawnMenu ]
   components:
+  - type: TimedDespawn
+    lifetime: 1.6
   - type: CP14AreaEntityEffect
     range: 3
     maxTargets: 4
@@ -47,18 +47,44 @@
     effects:
     - !type:CP14SpellSpawnEntityOnTarget
       spawns:
-      - CP14ImpactEffectBloodPurification
+      - CP14ImpactEffectHealthBallade
     - !type:CP14SpellApplyEntityEffect
       effects:
       - !type:HealthChange
         damage:
           types:
-            Slash: -2
-            Blunt: -2
-            Piercing: -2
-            Cold: -2
-            Heat: -2
-            Shock: -2
-            Poison: -2
-            Bloodloss: -2
-            Caustic: -2
+            Slash: -1
+            Blunt: -1
+            Piercing: -1
+            Cold: -1
+            Heat: -1
+            Shock: -1
+            Poison: -1
+            Bloodloss: -1
+            Caustic: -1
+
+- type: entity
+  id: CP14ImpactEffectHealthBallade
+  parent: CP14BaseMagicImpact
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: Sprite
+    sprite: _CP14/Effects/music.rsi
+    layers:
+    - state: notes_3
+      color: "#79b330"
+      shader: unshaded
+ 
+- type: entity
+  id: CP14RuneHealBallade
+  parent: CP14BaseMagicRune
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: PointLight
+    color: "#79b330"
+  - type: Sprite
+    sprite: _CP14/Effects/music.rsi
+    layers:
+    - state: notes_3
+      color: "#79b330"
+      shader: unshaded

Resources/Prototypes/_CP14/Entities/Actions/Spells/Healing/T0_speed_ballade.yml

@@ -0,0 +1,82 @@
+- type: entity
+  id: CP14ActionSpellSpeedBallade
+  name: Speed ballade
+  description: Your music is filled with accelerating magic, speeding up the movement of all creatures nearby
+  components:
+  - type: Sprite
+    sprite: _CP14/Actions/Spells/healing.rsi
+    state: speed_music
+  - type: CP14MagicEffectCastSlowdown
+    speedMultiplier: 1
+  - type: CP14MagicEffectManaCost
+    manaCost: 5
+  - type: CP14MagicEffect
+    magicType: Healing
+    effects:
+    - !type:CP14SpellSpawnEntityOnTarget
+      spawns:
+      - CP14AreaEntityEffectSpeedBallade
+  - type: CP14MagicEffectRequiredMusicTool
+  - type: CP14MagicEffectCastingVisual
+    proto: CP14RuneSpeedBallade
+  - type: InstantAction
+    itemIconStyle: BigAction
+    sound: !type:SoundPathSpecifier
+      path: /Audio/Magic/rumble.ogg
+    icon:
+      sprite: _CP14/Actions/Spells/healing.rsi
+      state: speed_music
+    event: !type:CP14ToggleableInstantActionEvent
+      effectFrequency: 1
+      cooldown: 15
+      castTime: 120
+      hidden: true
+
+- type: entity
+  id: CP14AreaEntityEffectSpeedBallade
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: TimedDespawn
+    lifetime: 1.6
+  - type: CP14AreaEntityEffect
+    range: 3
+    maxTargets: 4
+    whitelist:
+      components:
+      - MobState
+    effects:
+    - !type:CP14SpellSpawnEntityOnTarget
+      spawns:
+      - CP14ImpactEffectSpeedBallade
+    - !type:CP14SpellApplyEntityEffect
+      effects:
+      - !type:MovespeedModifier
+        walkSpeedModifier: 1.15
+        sprintSpeedModifier: 1.15
+        statusLifetime: 1.5
+
+- type: entity
+  id: CP14ImpactEffectSpeedBallade
+  parent: CP14BaseMagicImpact
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: Sprite
+    sprite: _CP14/Effects/music.rsi
+    layers:
+    - state: notes_3
+      color: "#e8cb56"
+      shader: unshaded
+ 
+- type: entity
+  id: CP14RuneSpeedBallade
+  parent: CP14BaseMagicRune
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: PointLight
+    color: "#e8cb56"
+  - type: Sprite
+    sprite: _CP14/Effects/music.rsi
+    layers:
+    - state: notes_3
+      color: "#e8cb56"
+      shader: unshaded

Resources/Prototypes/_CP14/Entities/Actions/Spells/base.yml

@@ -5,7 +5,7 @@
   abstract: true
   components:
   - type: TimedDespawn
-    lifetime: 10
+    lifetime: 120
   - type: Sprite
     noRot: true
     drawDepth: FloorTiles

Resources/Prototypes/_CP14/Entities/Objects/Tools/scissors.yml

@@ -24,7 +24,7 @@
     attackRate: 1
     damage:
       types:
-        Piercing: 7
+        Piercing: 4
     soundHit:
       path: "/Audio/Weapons/bladeslice.ogg"
   - type: Tag

Resources/Prototypes/_CP14/Loadouts/spells.yml

@@ -22,7 +22,8 @@
   - CP14ActionSpellBeerCreation
   - CP14ActionSpellSprint
   - CP14ActionSpellKick
-  - CP14ActionSpellHealMusic
+  - CP14ActionSpellHealBallade
+  - CP14ActionSpellSpeedBallade
 
 - type: loadout
   id: CP14ActionSpellBase
@@ -253,10 +254,23 @@
   - CP14ActionSpellKick
 
 - type: loadout
-  id: CP14ActionSpellHealMusic
-  dummyEntity: CP14ActionSpellHealMusic
+  id: CP14ActionSpellHealBallade
+  dummyEntity: CP14ActionSpellHealBallade
   actions:
-  - CP14ActionSpellHealMusic
+  - CP14ActionSpellHealBallade
+  effects:
+  - !type:JobRequirementLoadoutEffect
+    requirement:
+      !type:TraitsRequirement
+      inverted: true
+      traits:
+      - CP14ManaWasting
+
+- type: loadout
+  id: CP14ActionSpellSpeedBallade
+  dummyEntity: CP14ActionSpellSpeedBallade
+  actions:
+  - CP14ActionSpellSpeedBallade
   effects:
   - !type:JobRequirementLoadoutEffect
     requirement:

Resources/Textures/_CP14/Actions/Spells/healing.rsi/meta.json

@@ -5,7 +5,7 @@
     "y": 32
   },
   "license": "All right reserved",
-  "copyright": "Created by .kreks., cure_burn, cure_poison, heal_music, plant_growth by TheShuEd",
+  "copyright": "Created by .kreks., cure_burn, cure_poison, heal_music, speed_music, plant_growth by TheShuEd",
   "states": [
     {
       "name": "cure_burn"
@@ -21,6 +21,9 @@
     },
     {
       "name": "plant_growth"
+    },
+    {
+      "name": "speed_music"
     }
   ]
 }

Resources/Textures/_CP14/Effects/music.rsi/meta.json

@@ -7,17 +7,6 @@
     "y": 32
   },
   "states": [
-    {
-      "name": "notes_1",
-      "delays": [
-        [
-          0.3,
-          0.3,
-          0.3,
-          0.3
-        ]
-      ]
-    },
     {
       "name": "notes_2",
       "delays": [
@@ -61,17 +50,6 @@
           0.3
         ]
       ]
-    },
-    {
-      "name": "notes_6",
-      "delays": [
-        [
-          0.3,
-          0.3,
-          0.3,
-          0.3
-        ]
-      ]
     }
   ]
 }