diff --git a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Healing/T0_heal_song.yml b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Healing/T0_heal_ballade.yml similarity index 56% rename from Resources/Prototypes/_CP14/Entities/Actions/Spells/Healing/T0_heal_song.yml rename to Resources/Prototypes/_CP14/Entities/Actions/Spells/Healing/T0_heal_ballade.yml index 537615fb15..e88461df09 100644 --- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Healing/T0_heal_song.yml +++ b/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 \ No newline at end of file + 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 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Healing/T0_speed_ballade.yml b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Healing/T0_speed_ballade.yml new file mode 100644 index 0000000000..f8dd9eb012 --- /dev/null +++ b/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 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Actions/Spells/base.yml b/Resources/Prototypes/_CP14/Entities/Actions/Spells/base.yml index 2d265a0036..721a1dbb23 100644 --- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/base.yml +++ b/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 diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Tools/scissors.yml b/Resources/Prototypes/_CP14/Entities/Objects/Tools/scissors.yml index edf5fb369f..1e52d3341c 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Tools/scissors.yml +++ b/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 diff --git a/Resources/Prototypes/_CP14/Loadouts/spells.yml b/Resources/Prototypes/_CP14/Loadouts/spells.yml index a634d77a00..041e4b59bf 100644 --- a/Resources/Prototypes/_CP14/Loadouts/spells.yml +++ b/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: diff --git a/Resources/Textures/_CP14/Actions/Spells/healing.rsi/meta.json b/Resources/Textures/_CP14/Actions/Spells/healing.rsi/meta.json index 2bef58286d..183475062f 100644 --- a/Resources/Textures/_CP14/Actions/Spells/healing.rsi/meta.json +++ b/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" } ] } \ No newline at end of file diff --git a/Resources/Textures/_CP14/Actions/Spells/healing.rsi/speed_music.png b/Resources/Textures/_CP14/Actions/Spells/healing.rsi/speed_music.png new file mode 100644 index 0000000000..e4af409d88 Binary files /dev/null and b/Resources/Textures/_CP14/Actions/Spells/healing.rsi/speed_music.png differ diff --git a/Resources/Textures/_CP14/Effects/music.rsi/meta.json b/Resources/Textures/_CP14/Effects/music.rsi/meta.json index d068dba36b..52d7e48fe2 100644 --- a/Resources/Textures/_CP14/Effects/music.rsi/meta.json +++ b/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 - ] - ] } ] } diff --git a/Resources/Textures/_CP14/Effects/music.rsi/notes_1.png b/Resources/Textures/_CP14/Effects/music.rsi/notes_1.png deleted file mode 100644 index 2ce16cafc2..0000000000 Binary files a/Resources/Textures/_CP14/Effects/music.rsi/notes_1.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Effects/music.rsi/notes_2.png b/Resources/Textures/_CP14/Effects/music.rsi/notes_2.png index a0dedfb9aa..5b46a5b5f4 100644 Binary files a/Resources/Textures/_CP14/Effects/music.rsi/notes_2.png and b/Resources/Textures/_CP14/Effects/music.rsi/notes_2.png differ diff --git a/Resources/Textures/_CP14/Effects/music.rsi/notes_3.png b/Resources/Textures/_CP14/Effects/music.rsi/notes_3.png index e76352be54..b44bed10a2 100644 Binary files a/Resources/Textures/_CP14/Effects/music.rsi/notes_3.png and b/Resources/Textures/_CP14/Effects/music.rsi/notes_3.png differ diff --git a/Resources/Textures/_CP14/Effects/music.rsi/notes_4.png b/Resources/Textures/_CP14/Effects/music.rsi/notes_4.png index 9d7be84d55..f9305a8871 100644 Binary files a/Resources/Textures/_CP14/Effects/music.rsi/notes_4.png and b/Resources/Textures/_CP14/Effects/music.rsi/notes_4.png differ diff --git a/Resources/Textures/_CP14/Effects/music.rsi/notes_5.png b/Resources/Textures/_CP14/Effects/music.rsi/notes_5.png index 35d0a875f4..ef9434b4ee 100644 Binary files a/Resources/Textures/_CP14/Effects/music.rsi/notes_5.png and b/Resources/Textures/_CP14/Effects/music.rsi/notes_5.png differ diff --git a/Resources/Textures/_CP14/Effects/music.rsi/notes_6.png b/Resources/Textures/_CP14/Effects/music.rsi/notes_6.png deleted file mode 100644 index f6f63e7a9d..0000000000 Binary files a/Resources/Textures/_CP14/Effects/music.rsi/notes_6.png and /dev/null differ