From c6cc4daa3fe5dde7ee8058ddea3554157e15b272 Mon Sep 17 00:00:00 2001 From: Ed <96445749+TheShuEd@users.noreply.github.com> Date: Wed, 26 Feb 2025 17:23:53 +0300 Subject: [PATCH] Magical ballade (#946) * mana ballade * mana gift + consume merged in 1 loadout option * Update T0_mana_gift.yml --- .../Actions/Spells/Meta/T0_mana_ballade.yml | 83 ++++++++++++++++++ .../Actions/Spells/Meta/T0_mana_gift.yml | 10 +++ .../Prototypes/_CP14/Loadouts/spells.yml | 59 +++++++------ .../Actions/Spells/meta.rsi/magic_music.png | Bin 0 -> 436 bytes .../_CP14/Actions/Spells/meta.rsi/mana.png | Bin 0 -> 451 bytes .../_CP14/Actions/Spells/meta.rsi/meta.json | 6 ++ 6 files changed, 133 insertions(+), 25 deletions(-) create mode 100644 Resources/Prototypes/_CP14/Entities/Actions/Spells/Meta/T0_mana_ballade.yml create mode 100644 Resources/Textures/_CP14/Actions/Spells/meta.rsi/magic_music.png create mode 100644 Resources/Textures/_CP14/Actions/Spells/meta.rsi/mana.png diff --git a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Meta/T0_mana_ballade.yml b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Meta/T0_mana_ballade.yml new file mode 100644 index 0000000000..85ff47ea56 --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Meta/T0_mana_ballade.yml @@ -0,0 +1,83 @@ +- type: entity + id: CP14ActionSpellMagicBallade + name: Magic ballade + description: With your music, you infuse the objects around you with mana + components: + - type: Sprite + sprite: _CP14/Actions/Spells/meta.rsi + state: magic_music + - type: CP14MagicEffectCastSlowdown + speedMultiplier: 0.8 + - type: CP14MagicEffectManaCost + manaCost: 9 + canModifyManacost: false + - type: CP14MagicEffect + magicType: Meta + effects: + - !type:CP14SpellSpawnEntityOnTarget + spawns: + - CP14AreaEntityEffectMagicBallade + - type: CP14MagicEffectRequiredMusicTool + - type: CP14MagicEffectCastingVisual + proto: CP14RuneMagicBallade + - type: InstantAction + itemIconStyle: BigAction + sound: !type:SoundPathSpecifier + path: /Audio/Magic/rumble.ogg + icon: + sprite: _CP14/Actions/Spells/meta.rsi + state: magic_music + event: !type:CP14ToggleableInstantActionEvent + effectFrequency: 1 + cooldown: 15 + castTime: 120 + hidden: true + +- type: entity + id: CP14AreaEntityEffectMagicBallade + categories: [ HideSpawnMenu ] + components: + - type: TimedDespawn + lifetime: 1.6 + - type: CP14AreaEntityEffect + range: 3 + maxTargets: 4 + whitelist: + components: + - CP14MagicEnergyContainer + - CP14MagicEnergyCrystalSlot + effects: + - !type:CP14SpellSpawnEntityOnTarget + spawns: + - CP14ImpactEffectMagicBallade + - !type:CP14SpellApplyEntityEffect + effects: + - !type:CP14ManaChange + manaDelta: 3 + safe: false + +- type: entity + id: CP14ImpactEffectMagicBallade + parent: CP14BaseMagicImpact + categories: [ HideSpawnMenu ] + components: + - type: Sprite + sprite: _CP14/Effects/music.rsi + layers: + - state: notes_5 + color: "#5096d4" + shader: unshaded + +- type: entity + id: CP14RuneMagicBallade + parent: CP14BaseMagicRune + categories: [ HideSpawnMenu ] + components: + - type: PointLight + color: "#5096d4" + - type: Sprite + sprite: _CP14/Effects/music.rsi + layers: + - state: notes_3 + color: "#5096d4" + shader: unshaded \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Meta/T0_mana_gift.yml b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Meta/T0_mana_gift.yml index 248d927eee..2f5fdad860 100644 --- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Meta/T0_mana_gift.yml +++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Meta/T0_mana_gift.yml @@ -1,3 +1,13 @@ +- type: entity + id: CP14DummyActionSpellManaManipulation + name: Mana manipulation + description: You can manipulate mana by giving it to other objects or taking it from them. + categories: [ HideSpawnMenu ] + components: + - type: Sprite + sprite: _CP14/Actions/Spells/meta.rsi + state: mana + - type: entity id: CP14ActionSpellManaGift name: Mana transfer diff --git a/Resources/Prototypes/_CP14/Loadouts/spells.yml b/Resources/Prototypes/_CP14/Loadouts/spells.yml index e04511394c..82e50e5b1c 100644 --- a/Resources/Prototypes/_CP14/Loadouts/spells.yml +++ b/Resources/Prototypes/_CP14/Loadouts/spells.yml @@ -6,26 +6,34 @@ minLimit: 0 maxLimit: 3 loadouts: + #Dimension + - CP14ActionSpellShadowGrab + #Earth + #Fire - CP14ActionSpellFlameCreation + - CP14ActionSpellHellBallade + #Healing - CP14ActionSpellCureWounds - CP14ActionSpellCureBurn - CP14ActionSpellBloodPurification - CP14ActionSpellPlantGrowth + - CP14ActionSpellHealBallade + - CP14ActionSpellSpeedBallade + - CP14ActionSpellPeaceBallade + #Light - CP14ActionSpellSphereOfLight - - CP14ActionSpellManaConsume - - CP14ActionSpellManaGift + #Meta + - CP14ActionSpellManaManipulation - CP14ActionSpellCounterSpell - - CP14ActionSpellShadowGrab + - CP14ActionSpellMagicBallade + #Physical + - CP14ActionSpellSprint + - CP14ActionSpellKick + #Water - CP14ActionSpellWaterCreation - CP14ActionSpellIceShards - CP14ActionSpellFreeze - CP14ActionSpellBeerCreation - - CP14ActionSpellSprint - - CP14ActionSpellKick - - CP14ActionSpellHealBallade - - CP14ActionSpellSpeedBallade - - CP14ActionSpellPeaceBallade - - CP14ActionSpellHellBallade - type: loadout id: CP14ActionSpellBase @@ -122,9 +130,10 @@ - CP14ManaWasting - type: loadout - id: CP14ActionSpellManaConsume - dummyEntity: CP14ActionSpellManaConsume + id: CP14ActionSpellManaManipulation + dummyEntity: CP14DummyActionSpellManaManipulation actions: + - CP14ActionSpellManaGift - CP14ActionSpellManaConsume effects: - !type:JobRequirementLoadoutEffect @@ -140,19 +149,6 @@ traits: - CP14ManaWasting -- type: loadout - id: CP14ActionSpellManaGift - dummyEntity: CP14ActionSpellManaGift - actions: - - CP14ActionSpellManaGift - effects: - - !type:JobRequirementLoadoutEffect - requirement: - !type:TraitsRequirement - inverted: true - traits: - - CP14ManaWasting - - type: loadout id: CP14ActionSpellCounterSpell dummyEntity: CP14ActionSpellCounterSpell @@ -310,4 +306,17 @@ requirement: !type:SpeciesRequirement species: - - CP14Tiefling \ No newline at end of file + - CP14Tiefling + +- type: loadout + id: CP14ActionSpellMagicBallade + dummyEntity: CP14ActionSpellMagicBallade + actions: + - CP14ActionSpellMagicBallade + effects: + - !type:JobRequirementLoadoutEffect + requirement: + !type:TraitsRequirement + inverted: true + traits: + - CP14ManaWasting \ No newline at end of file diff --git a/Resources/Textures/_CP14/Actions/Spells/meta.rsi/magic_music.png b/Resources/Textures/_CP14/Actions/Spells/meta.rsi/magic_music.png new file mode 100644 index 0000000000000000000000000000000000000000..effb3a752dfb1a8fcea6cb145964d3c7c99d5f0c GIT binary patch literal 436 zcmV;l0ZaagP)Px$Zb?KzR9J=WR=bVEFbw4#(gi6sPbP2^Agvbg2u^8@pas+#2oA^uS?5$5xmH)v z5Cl>`8iyrqh3pi3L({wba z``oFj7C?a`jVplQTF@;ZB}q$7ff8|uHv#I0$vVJXa(E2ul+lY1skyuFf);WBzA{?{ zdd6rAxT7sHA)w4Xa`**JhU4SNL^^Z;0000Px$eMv+?R9J=WRy%IQAP{{-sn&AIUdJb}w6f%u3vdKndXL}>(5|$N%T&2eD6LKF zRO7I-_ybNCzm75R-po9}z<~q*9U^6sR?hh2&dO`5fcMx1>gLA58|OWmRB|A)0_x^Q zf1LMd_GBL=fXFH1y~IfZ@*d4lqV?mpmPtM$yzL?1+karA2|4*()>=73^S1h9wS4}j zL{71)$fkMs&qq)=u2%~CviESqQnd(TJjMva|%M)Q%u9bcRB!cwG`FY_movtWRoei za)#QVl{0jWQ|v{6KZ!`@+A)-9*Ss;5Xf<5$n^w+