From a370182cb6bc6f6a89175edfc4c674ca898f79e4 Mon Sep 17 00:00:00 2001 From: Ed <96445749+TheShuEd@users.noreply.github.com> Date: Tue, 25 Feb 2025 17:33:20 +0300 Subject: [PATCH] Spell icons folder restruct (#940) * spell icon sprite restruct * proto edit * Update T1_fire_rune.yml --- .../T0_demiplane_infiltration.yml | 4 +- .../T0_monolith_warp.yml | 4 +- .../T1_shadow_grab.yml | 4 +- .../T2_shadow_step.yml | 4 +- .../Spells/Earth/MOB_subterranean_leap.yml | 2 +- .../Actions/Spells/Earth/T1_earth_wall.yml | 4 +- .../Actions/Spells/Fire/T0_flame_creation.yml | 4 +- .../Spells/Fire/T0_tiefling_inner_fire.yml | 4 +- .../Actions/Spells/Fire/T1_fire_rune.yml | 8 +- .../Actions/Spells/Fire/T1_fireball.yml | 4 +- .../Actions/Spells/Healing/T0_cure_heat.yml | 4 +- .../Actions/Spells/Healing/T0_cure_poison.yml | 4 +- .../Actions/Spells/Healing/T0_cure_wounds.yml | 4 +- .../Actions/Spells/Healing/T0_heal_song.yml | 4 +- .../Spells/Healing/T0_plant_growth.yml | 4 +- .../Spells/Healing/magical_acceleration.yml | 4 +- .../Spells/Light/T0_sphere_of_light.yml | 4 +- .../Actions/Spells/Light/T1_flash_light.yml | 4 +- .../Actions/Spells/Light/T1_signal_light.yml | 8 +- .../Actions/Spells/Meta/T0_counter_spell.yml | 4 +- .../Actions/Spells/Meta/T0_mana_consume.yml | 4 +- .../Actions/Spells/Meta/T0_mana_gift.yml | 4 +- .../Spells/Necromancy/T1_resurrection.yml | 4 +- .../Actions/Spells/Physical/T0_Kick.yml | 4 +- .../Actions/Spells/Physical/T0_Sprint.yml | 4 +- .../Actions/Spells/Water/T0_freeze.yml | 4 +- .../Spells/Water/T0_water_creation.yml | 4 +- .../Actions/Spells/Water/T1_beer_creation.yml | 4 +- .../Actions/Spells/Water/T1_ice_shards.yml | 4 +- .../Spells/dimension.rsi}/demi_arrow.png | Bin .../Actions/Spells/dimension.rsi/meta.json | 26 +++++ .../Spells/dimension.rsi}/rift_arrow.png | Bin .../Spells/dimension.rsi}/rift_shield.png | Bin .../Spells/dimension.rsi}/shadow_grab.png | Bin .../Spells/dimension.rsi}/shadow_step.png | Bin .../Spells/earth.rsi}/earth_wall.png | Bin .../Spells/earth.rsi}/meta.json | 9 +- .../Spells/earth.rsi}/subterranean_leap.png | Bin .../Spells/fire.rsi}/fireball.png | Bin .../Spells/fire.rsi}/flame_creation.png | Bin .../_CP14/Actions/Spells/fire.rsi/meta.json | 20 ++++ .../Spells/fire.rsi}/tiefling_revenge.png | Bin .../Spells/healing.rsi}/cure_burn.png | Bin .../Spells/healing.rsi}/cure_poison.png | Bin .../Spells/healing.rsi}/cure_wounds.png | Bin .../Spells/healing.rsi}/heal_music.png | Bin .../Actions/Spells/healing.rsi/meta.json | 26 +++++ .../Spells/healing.rsi}/plant_growth.png | Bin .../Spells/light.rsi}/flash_light.png | Bin .../_CP14/Actions/Spells/light.rsi/meta.json | 26 +++++ .../Spells/light.rsi}/signal_light_blue.png | Bin .../Spells/light.rsi}/signal_light_red.png | Bin .../Spells/light.rsi}/signal_light_yellow.png | Bin .../Spells/light.rsi}/sphere_of_light.png | Bin .../Spells/meta.rsi}/counter_spell.png | Bin .../Spells/meta.rsi}/mana_consume.png | Bin .../Spells/meta.rsi}/mana_gift.png | Bin .../_CP14/Actions/Spells/meta.rsi/meta.json | 20 ++++ .../Spells/misc.rsi}/magical_acceleration.png | Bin .../_CP14/Actions/Spells/misc.rsi/meta.json | 14 +++ .../Actions/Spells/necromancy.rsi/meta.json | 14 +++ .../Spells/necromancy.rsi}/resurrection.png | Bin .../Spells/physical.rsi}/kick.png | Bin .../Actions/Spells/physical.rsi/meta.json | 17 +++ .../Spells/physical.rsi}/sprint.png | Bin .../Spells/water.rsi}/beer_creation.png | Bin .../Spells/water.rsi}/freeze.png | Bin .../Spells/water.rsi}/ice_dagger.png | Bin .../Spells/water.rsi}/ice_shards.png | Bin .../_CP14/Actions/Spells/water.rsi/meta.json | 26 +++++ .../Spells/water.rsi}/water_creation.png | Bin .../Effects/Magic/spells_icons.rsi/meta.json | 104 ------------------ 72 files changed, 256 insertions(+), 168 deletions(-) rename Resources/Prototypes/_CP14/Entities/Actions/Spells/{Darkness => Dimension}/T0_demiplane_infiltration.yml (94%) rename Resources/Prototypes/_CP14/Entities/Actions/Spells/{Darkness => Dimension}/T0_monolith_warp.yml (95%) rename Resources/Prototypes/_CP14/Entities/Actions/Spells/{Darkness => Dimension}/T1_shadow_grab.yml (93%) rename Resources/Prototypes/_CP14/Entities/Actions/Spells/{Darkness => Dimension}/T2_shadow_step.yml (93%) rename Resources/Textures/_CP14/{Effects/Magic/spells_icons.rsi => Actions/Spells/dimension.rsi}/demi_arrow.png (100%) create mode 100644 Resources/Textures/_CP14/Actions/Spells/dimension.rsi/meta.json rename Resources/Textures/_CP14/{Effects/Magic/spells_icons.rsi => Actions/Spells/dimension.rsi}/rift_arrow.png (100%) rename Resources/Textures/_CP14/{Effects/Magic/spells_icons.rsi => Actions/Spells/dimension.rsi}/rift_shield.png (100%) rename Resources/Textures/_CP14/{Effects/Magic/spells_icons.rsi => Actions/Spells/dimension.rsi}/shadow_grab.png (100%) rename Resources/Textures/_CP14/{Effects/Magic/spells_icons.rsi => Actions/Spells/dimension.rsi}/shadow_step.png (100%) rename Resources/Textures/_CP14/{Effects/Magic/spells_icons.rsi => Actions/Spells/earth.rsi}/earth_wall.png (100%) rename Resources/Textures/_CP14/{Effects/Magic/spells_icons_monster.rsi => Actions/Spells/earth.rsi}/meta.json (52%) rename Resources/Textures/_CP14/{Effects/Magic/spells_icons_monster.rsi => Actions/Spells/earth.rsi}/subterranean_leap.png (100%) rename Resources/Textures/_CP14/{Effects/Magic/spells_icons.rsi => Actions/Spells/fire.rsi}/fireball.png (100%) rename Resources/Textures/_CP14/{Effects/Magic/spells_icons.rsi => Actions/Spells/fire.rsi}/flame_creation.png (100%) create mode 100644 Resources/Textures/_CP14/Actions/Spells/fire.rsi/meta.json rename Resources/Textures/_CP14/{Effects/Magic/spells_icons.rsi => Actions/Spells/fire.rsi}/tiefling_revenge.png (100%) rename Resources/Textures/_CP14/{Effects/Magic/spells_icons.rsi => Actions/Spells/healing.rsi}/cure_burn.png (100%) rename Resources/Textures/_CP14/{Effects/Magic/spells_icons.rsi => Actions/Spells/healing.rsi}/cure_poison.png (100%) rename Resources/Textures/_CP14/{Effects/Magic/spells_icons.rsi => Actions/Spells/healing.rsi}/cure_wounds.png (100%) rename Resources/Textures/_CP14/{Effects/Magic/spells_icons.rsi => Actions/Spells/healing.rsi}/heal_music.png (100%) create mode 100644 Resources/Textures/_CP14/Actions/Spells/healing.rsi/meta.json rename Resources/Textures/_CP14/{Effects/Magic/spells_icons.rsi => Actions/Spells/healing.rsi}/plant_growth.png (100%) rename Resources/Textures/_CP14/{Effects/Magic/spells_icons.rsi => Actions/Spells/light.rsi}/flash_light.png (100%) create mode 100644 Resources/Textures/_CP14/Actions/Spells/light.rsi/meta.json rename Resources/Textures/_CP14/{Effects/Magic/spells_icons.rsi => Actions/Spells/light.rsi}/signal_light_blue.png (100%) rename Resources/Textures/_CP14/{Effects/Magic/spells_icons.rsi => Actions/Spells/light.rsi}/signal_light_red.png (100%) rename Resources/Textures/_CP14/{Effects/Magic/spells_icons.rsi => Actions/Spells/light.rsi}/signal_light_yellow.png (100%) rename Resources/Textures/_CP14/{Effects/Magic/spells_icons.rsi => Actions/Spells/light.rsi}/sphere_of_light.png (100%) rename Resources/Textures/_CP14/{Effects/Magic/spells_icons.rsi => Actions/Spells/meta.rsi}/counter_spell.png (100%) rename Resources/Textures/_CP14/{Effects/Magic/spells_icons.rsi => Actions/Spells/meta.rsi}/mana_consume.png (100%) rename Resources/Textures/_CP14/{Effects/Magic/spells_icons.rsi => Actions/Spells/meta.rsi}/mana_gift.png (100%) create mode 100644 Resources/Textures/_CP14/Actions/Spells/meta.rsi/meta.json rename Resources/Textures/_CP14/{Effects/Magic/spells_icons.rsi => Actions/Spells/misc.rsi}/magical_acceleration.png (100%) create mode 100644 Resources/Textures/_CP14/Actions/Spells/misc.rsi/meta.json create mode 100644 Resources/Textures/_CP14/Actions/Spells/necromancy.rsi/meta.json rename Resources/Textures/_CP14/{Effects/Magic/spells_icons.rsi => Actions/Spells/necromancy.rsi}/resurrection.png (100%) rename Resources/Textures/_CP14/{Effects/Magic/spells_icons.rsi => Actions/Spells/physical.rsi}/kick.png (100%) create mode 100644 Resources/Textures/_CP14/Actions/Spells/physical.rsi/meta.json rename Resources/Textures/_CP14/{Effects/Magic/spells_icons.rsi => Actions/Spells/physical.rsi}/sprint.png (100%) rename Resources/Textures/_CP14/{Effects/Magic/spells_icons.rsi => Actions/Spells/water.rsi}/beer_creation.png (100%) rename Resources/Textures/_CP14/{Effects/Magic/spells_icons.rsi => Actions/Spells/water.rsi}/freeze.png (100%) rename Resources/Textures/_CP14/{Effects/Magic/spells_icons.rsi => Actions/Spells/water.rsi}/ice_dagger.png (100%) rename Resources/Textures/_CP14/{Effects/Magic/spells_icons.rsi => Actions/Spells/water.rsi}/ice_shards.png (100%) create mode 100644 Resources/Textures/_CP14/Actions/Spells/water.rsi/meta.json rename Resources/Textures/_CP14/{Effects/Magic/spells_icons.rsi => Actions/Spells/water.rsi}/water_creation.png (100%) delete mode 100644 Resources/Textures/_CP14/Effects/Magic/spells_icons.rsi/meta.json diff --git a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Darkness/T0_demiplane_infiltration.yml b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Dimension/T0_demiplane_infiltration.yml similarity index 94% rename from Resources/Prototypes/_CP14/Entities/Actions/Spells/Darkness/T0_demiplane_infiltration.yml rename to Resources/Prototypes/_CP14/Entities/Actions/Spells/Dimension/T0_demiplane_infiltration.yml index 6fa9bc51ca..7441b9599e 100644 --- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Darkness/T0_demiplane_infiltration.yml +++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Dimension/T0_demiplane_infiltration.yml @@ -4,7 +4,7 @@ description: You get inside the demiplane of your choice. components: - type: Sprite - sprite: _CP14/Effects/Magic/spells_icons.rsi + sprite: _CP14/Actions/Spells/dimension.rsi state: rift_arrow - type: CP14MagicEffectManaCost manaCost: 25 @@ -32,7 +32,7 @@ sound: !type:SoundPathSpecifier path: /Audio/Magic/rumble.ogg icon: - sprite: _CP14/Effects/Magic/spells_icons.rsi + sprite: _CP14/Actions/Spells/dimension.rsi state: rift_arrow event: !type:CP14DelayedEntityTargetActionEvent cooldown: 50 diff --git a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Darkness/T0_monolith_warp.yml b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Dimension/T0_monolith_warp.yml similarity index 95% rename from Resources/Prototypes/_CP14/Entities/Actions/Spells/Darkness/T0_monolith_warp.yml rename to Resources/Prototypes/_CP14/Entities/Actions/Spells/Dimension/T0_monolith_warp.yml index 8a74500922..0013a058ab 100644 --- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Darkness/T0_monolith_warp.yml +++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Dimension/T0_monolith_warp.yml @@ -4,7 +4,7 @@ description: You open a dimensional rift that transports the creatures around it to the demiplane link crystal components: - type: Sprite - sprite: _CP14/Effects/Magic/spells_icons.rsi + sprite: _CP14/Actions/Spells/dimension.rsi state: demi_arrow - type: CP14MagicEffectManaCost manaCost: 25 @@ -29,7 +29,7 @@ sound: !type:SoundPathSpecifier path: /Audio/Magic/rumble.ogg icon: - sprite: _CP14/Effects/Magic/spells_icons.rsi + sprite: _CP14/Actions/Spells/dimension.rsi state: demi_arrow event: !type:CP14DelayedEntityWorldTargetActionEvent cooldown: 50 diff --git a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Darkness/T1_shadow_grab.yml b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Dimension/T1_shadow_grab.yml similarity index 93% rename from Resources/Prototypes/_CP14/Entities/Actions/Spells/Darkness/T1_shadow_grab.yml rename to Resources/Prototypes/_CP14/Entities/Actions/Spells/Dimension/T1_shadow_grab.yml index c2e841ca3f..c880b1e77f 100644 --- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Darkness/T1_shadow_grab.yml +++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Dimension/T1_shadow_grab.yml @@ -4,7 +4,7 @@ description: You attract a ghostly hand that draws an object or entity to you components: - type: Sprite - sprite: _CP14/Effects/Magic/spells_icons.rsi + sprite: _CP14/Actions/Spells/dimension.rsi state: shadow_grab - type: CP14MagicEffectManaCost manaCost: 10 @@ -34,7 +34,7 @@ sound: !type:SoundPathSpecifier path: /Audio/Magic/rumble.ogg icon: - sprite: _CP14/Effects/Magic/spells_icons.rsi + sprite: _CP14/Actions/Spells/dimension.rsi state: shadow_grab event: !type:CP14DelayedEntityTargetActionEvent cooldown: 5 diff --git a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Darkness/T2_shadow_step.yml b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Dimension/T2_shadow_step.yml similarity index 93% rename from Resources/Prototypes/_CP14/Entities/Actions/Spells/Darkness/T2_shadow_step.yml rename to Resources/Prototypes/_CP14/Entities/Actions/Spells/Dimension/T2_shadow_step.yml index a08a333114..e23077d3d9 100644 --- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Darkness/T2_shadow_step.yml +++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Dimension/T2_shadow_step.yml @@ -4,7 +4,7 @@ description: A step through the gash of reality that allows you to cover a small of distance quickly components: - type: Sprite - sprite: _CP14/Effects/Magic/spells_icons.rsi + sprite: _CP14/Actions/Spells/dimension.rsi state: shadow_step - type: CP14MagicEffectCastSlowdown speedMultiplier: 0.8 @@ -27,7 +27,7 @@ sound: !type:SoundPathSpecifier path: /Audio/Magic/rumble.ogg icon: - sprite: _CP14/Effects/Magic/spells_icons.rsi + sprite: _CP14/Actions/Spells/dimension.rsi state: shadow_step event: !type:CP14DelayedEntityWorldTargetActionEvent cooldown: 10 diff --git a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Earth/MOB_subterranean_leap.yml b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Earth/MOB_subterranean_leap.yml index 4edbb9b0e8..d6c6bb8162 100644 --- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Earth/MOB_subterranean_leap.yml +++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Earth/MOB_subterranean_leap.yml @@ -28,7 +28,7 @@ sound: !type:SoundPathSpecifier path: /Audio/Effects/gib3.ogg icon: - sprite: _CP14/Effects/Magic/spells_icons_monster.rsi + sprite: _CP14/Actions/Spells/earth.rsi state: subterranean_leap event: !type:CP14DelayedEntityWorldTargetActionEvent hidden: true diff --git a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Earth/T1_earth_wall.yml b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Earth/T1_earth_wall.yml index 8ba09a32a1..cb869c83e5 100644 --- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Earth/T1_earth_wall.yml +++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Earth/T1_earth_wall.yml @@ -4,7 +4,7 @@ description: Raises a solid wall of earth from the bowels. components: - type: Sprite - sprite: _CP14/Effects/Magic/spells_icons.rsi + sprite: _CP14/Actions/Spells/earth.rsi state: earth_wall - type: CP14MagicEffectCastSlowdown speedMultiplier: 0.3 @@ -31,7 +31,7 @@ sound: !type:SoundPathSpecifier path: /Audio/Magic/rumble.ogg icon: - sprite: _CP14/Effects/Magic/spells_icons.rsi + sprite: _CP14/Actions/Spells/earth.rsi state: earth_wall event: !type:CP14DelayedEntityWorldTargetActionEvent cooldown: 10 diff --git a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Fire/T0_flame_creation.yml b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Fire/T0_flame_creation.yml index bdfdaf441b..1b891a9076 100644 --- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Fire/T0_flame_creation.yml +++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Fire/T0_flame_creation.yml @@ -4,7 +4,7 @@ description: A artificial flame forms in your hand, illuminating your surroundings. You can throw it to use it as a disposable weapon. components: - type: Sprite - sprite: _CP14/Effects/Magic/spells_icons.rsi + sprite: _CP14/Actions/Spells/fire.rsi state: flame_creation - type: CP14MagicEffectManaCost manaCost: 5 @@ -28,7 +28,7 @@ sound: !type:SoundPathSpecifier path: /Audio/Magic/rumble.ogg icon: - sprite: _CP14/Effects/Magic/spells_icons.rsi + sprite: _CP14/Actions/Spells/fire.rsi state: flame_creation event: !type:CP14DelayedInstantActionEvent cooldown: 10 diff --git a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Fire/T0_tiefling_inner_fire.yml b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Fire/T0_tiefling_inner_fire.yml index 72ed009fbc..1a0d411c4c 100644 --- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Fire/T0_tiefling_inner_fire.yml +++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Fire/T0_tiefling_inner_fire.yml @@ -4,7 +4,7 @@ description: You unleash your inner fire, setting yourself on fire and temporarily speeding up your movement. components: - type: Sprite - sprite: _CP14/Effects/Magic/spells_icons.rsi + sprite: _CP14/Actions/Spells/fire.rsi state: tiefling_revenge - type: CP14MagicEffectCastSlowdown speedMultiplier: 0.5 @@ -33,7 +33,7 @@ sound: !type:SoundPathSpecifier path: /Audio/Magic/rumble.ogg icon: - sprite: _CP14/Effects/Magic/spells_icons.rsi + sprite: _CP14/Actions/Spells/fire.rsi state: tiefling_revenge event: !type:CP14DelayedInstantActionEvent cooldown: 10 diff --git a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Fire/T1_fire_rune.yml b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Fire/T1_fire_rune.yml index 0a1ab2ec4e..257086aceb 100644 --- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Fire/T1_fire_rune.yml +++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Fire/T1_fire_rune.yml @@ -4,8 +4,8 @@ description: You create an area where a scalding stream of fire occurs with little delay. components: - type: Sprite - sprite: _CP14/Effects/Magic/spells_icons.rsi - state: earth_wall + sprite: _CP14/Actions/Spells/fire.rsi + state: tiefling_revenge - type: CP14MagicEffectCastSlowdown speedMultiplier: 0.5 - type: CP14MagicEffectManaCost @@ -28,8 +28,8 @@ sound: !type:SoundPathSpecifier path: /Audio/Magic/rumble.ogg icon: - sprite: _CP14/Effects/Magic/spells_icons.rsi - state: earth_wall + sprite: _CP14/Actions/Spells/fire.rsi + state: tiefling_revenge event: !type:CP14DelayedEntityWorldTargetActionEvent cooldown: 10 diff --git a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Fire/T1_fireball.yml b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Fire/T1_fireball.yml index 9ca3469355..6b6211061a 100644 --- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Fire/T1_fireball.yml +++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Fire/T1_fireball.yml @@ -4,7 +4,7 @@ description: An effective method of destruction - an explosive fireball components: - type: Sprite - sprite: _CP14/Effects/Magic/spells_icons.rsi + sprite: _CP14/Actions/Spells/fire.rsi state: fireball - type: CP14MagicEffectCastSlowdown speedMultiplier: 0.3 @@ -32,7 +32,7 @@ sound: !type:SoundPathSpecifier path: /Audio/Magic/rumble.ogg icon: - sprite: _CP14/Effects/Magic/spells_icons.rsi + sprite: _CP14/Actions/Spells/fire.rsi state: fireball event: !type:CP14DelayedEntityWorldTargetActionEvent cooldown: 25 diff --git a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Healing/T0_cure_heat.yml b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Healing/T0_cure_heat.yml index 93d55813e5..54f5b4e4b3 100644 --- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Healing/T0_cure_heat.yml +++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Healing/T0_cure_heat.yml @@ -4,7 +4,7 @@ description: You heal skin damage caused by excessive cooling or heating. components: - type: Sprite - sprite: _CP14/Effects/Magic/spells_icons.rsi + sprite: _CP14/Actions/Spells/healing.rsi state: cure_burn - type: CP14MagicEffectCastSlowdown speedMultiplier: 0.5 @@ -44,7 +44,7 @@ sound: !type:SoundPathSpecifier path: /Audio/Magic/rumble.ogg icon: - sprite: _CP14/Effects/Magic/spells_icons.rsi + sprite: _CP14/Actions/Spells/healing.rsi state: cure_burn event: !type:CP14DelayedEntityTargetActionEvent cooldown: 5 diff --git a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Healing/T0_cure_poison.yml b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Healing/T0_cure_poison.yml index c3db395de2..cdc4724242 100644 --- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Healing/T0_cure_poison.yml +++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Healing/T0_cure_poison.yml @@ -4,7 +4,7 @@ description: You cleanse the target's blood of poisons, and restore its volume slightly components: - type: Sprite - sprite: _CP14/Effects/Magic/spells_icons.rsi + sprite: _CP14/Actions/Spells/healing.rsi state: cure_poison - type: CP14MagicEffectCastSlowdown speedMultiplier: 0.5 @@ -47,7 +47,7 @@ sound: !type:SoundPathSpecifier path: /Audio/Magic/rumble.ogg icon: - sprite: _CP14/Effects/Magic/spells_icons.rsi + sprite: _CP14/Actions/Spells/healing.rsi state: cure_poison event: !type:CP14DelayedEntityTargetActionEvent cooldown: 5 diff --git a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Healing/T0_cure_wounds.yml b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Healing/T0_cure_wounds.yml index 22d72cee4e..6556256b41 100644 --- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Healing/T0_cure_wounds.yml +++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Healing/T0_cure_wounds.yml @@ -4,7 +4,7 @@ description: You heal the target from physical damage components: - type: Sprite - sprite: _CP14/Effects/Magic/spells_icons.rsi + sprite: _CP14/Actions/Spells/healing.rsi state: cure_wounds - type: CP14MagicEffectCastSlowdown speedMultiplier: 0.5 @@ -44,7 +44,7 @@ sound: !type:SoundPathSpecifier path: /Audio/Magic/rumble.ogg icon: - sprite: _CP14/Effects/Magic/spells_icons.rsi + sprite: _CP14/Actions/Spells/healing.rsi state: cure_wounds event: !type:CP14DelayedEntityTargetActionEvent cooldown: 5 diff --git a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Healing/T0_heal_song.yml b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Healing/T0_heal_song.yml index 8e7fe541c6..537615fb15 100644 --- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Healing/T0_heal_song.yml +++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Healing/T0_heal_song.yml @@ -4,7 +4,7 @@ description: Your music is filled with healing magic, slowly healing all the creatures around you. components: - type: Sprite - sprite: _CP14/Effects/Magic/spells_icons.rsi + sprite: _CP14/Actions/Spells/healing.rsi state: heal_music - type: CP14MagicEffectCastSlowdown speedMultiplier: 0.8 @@ -25,7 +25,7 @@ sound: !type:SoundPathSpecifier path: /Audio/Magic/rumble.ogg icon: - sprite: _CP14/Effects/Magic/spells_icons.rsi + sprite: _CP14/Actions/Spells/healing.rsi state: heal_music event: !type:CP14ToggleableInstantActionEvent effectFrequency: 1 diff --git a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Healing/T0_plant_growth.yml b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Healing/T0_plant_growth.yml index 9468f668b5..e5d7354934 100644 --- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Healing/T0_plant_growth.yml +++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Healing/T0_plant_growth.yml @@ -4,7 +4,7 @@ description: You restore health and internal resources to the selected plant. components: - type: Sprite - sprite: _CP14/Effects/Magic/spells_icons.rsi + sprite: _CP14/Actions/Spells/healing.rsi state: plant_growth - type: CP14MagicEffectCastSlowdown speedMultiplier: 0.8 @@ -60,7 +60,7 @@ sound: !type:SoundPathSpecifier path: /Audio/Magic/rumble.ogg icon: - sprite: _CP14/Effects/Magic/spells_icons.rsi + sprite: _CP14/Actions/Spells/healing.rsi state: plant_growth event: !type:CP14ToggleableEntityTargetActionEvent cooldown: 2 diff --git a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Healing/magical_acceleration.yml b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Healing/magical_acceleration.yml index 3b8befd4f9..56da07921d 100644 --- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Healing/magical_acceleration.yml +++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Healing/magical_acceleration.yml @@ -4,7 +4,7 @@ description: At the cost of magic energy, you significantly accelerate your movement speed components: - type: Sprite - sprite: _CP14/Effects/Magic/spells_icons.rsi + sprite: _CP14/Actions/Spells/misc.rsi state: magical_acceleration - type: CP14MagicEffectCastSlowdown speedMultiplier: 1.3 @@ -20,7 +20,7 @@ sound: !type:SoundPathSpecifier path: /Audio/Magic/rumble.ogg icon: - sprite: _CP14/Effects/Magic/spells_icons.rsi + sprite: _CP14/Actions/Spells/misc.rsi state: magical_acceleration event: !type:CP14ToggleableInstantActionEvent effectFrequency: 0.2 diff --git a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Light/T0_sphere_of_light.yml b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Light/T0_sphere_of_light.yml index f47919e0a5..a176183c80 100644 --- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Light/T0_sphere_of_light.yml +++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Light/T0_sphere_of_light.yml @@ -4,7 +4,7 @@ description: Materialization of a bright and safe light source. components: - type: Sprite - sprite: _CP14/Effects/Magic/spells_icons.rsi + sprite: _CP14/Actions/Spells/light.rsi state: sphere_of_light - type: CP14MagicEffectManaCost manaCost: 10 @@ -28,7 +28,7 @@ sound: !type:SoundPathSpecifier path: /Audio/Magic/rumble.ogg icon: - sprite: _CP14/Effects/Magic/spells_icons.rsi + sprite: _CP14/Actions/Spells/light.rsi state: sphere_of_light event: !type:CP14DelayedInstantActionEvent cooldown: 100 diff --git a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Light/T1_flash_light.yml b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Light/T1_flash_light.yml index 4e4f4ac1d2..c726ce99e7 100644 --- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Light/T1_flash_light.yml +++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Light/T1_flash_light.yml @@ -4,7 +4,7 @@ description: Creates a flash of bright, blinding light. components: - type: Sprite - sprite: _CP14/Effects/Magic/spells_icons.rsi + sprite: _CP14/Actions/Spells/light.rsi state: flash_light - type: CP14MagicEffectManaCost manaCost: 10 @@ -29,7 +29,7 @@ sound: !type:SoundPathSpecifier path: /Audio/Magic/rumble.ogg icon: - sprite: _CP14/Effects/Magic/spells_icons.rsi + sprite: _CP14/Actions/Spells/light.rsi state: flash_light event: !type:CP14DelayedEntityWorldTargetActionEvent cooldown: 5 diff --git a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Light/T1_signal_light.yml b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Light/T1_signal_light.yml index 4bd683cc24..d6cd9e9331 100644 --- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Light/T1_signal_light.yml +++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Light/T1_signal_light.yml @@ -3,7 +3,7 @@ abstract: true components: - type: Sprite - sprite: _CP14/Effects/Magic/spells_icons.rsi + sprite: _CP14/Actions/Spells/light.rsi - type: CP14MagicEffectManaCost manaCost: 5 - type: CP14MagicEffect @@ -37,7 +37,7 @@ proto: CP14RuneSignalLightRed - type: InstantAction icon: - sprite: _CP14/Effects/Magic/spells_icons.rsi + sprite: _CP14/Actions/Spells/light.rsi state: signal_light_red - type: entity @@ -81,7 +81,7 @@ proto: CP14RuneSignalLightYellow - type: InstantAction icon: - sprite: _CP14/Effects/Magic/spells_icons.rsi + sprite: _CP14/Actions/Spells/light.rsi state: signal_light_yellow - type: entity @@ -125,7 +125,7 @@ proto: CP14RuneSignalLightBlue - type: InstantAction icon: - sprite: _CP14/Effects/Magic/spells_icons.rsi + sprite: _CP14/Actions/Spells/light.rsi state: signal_light_blue - type: entity diff --git a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Meta/T0_counter_spell.yml b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Meta/T0_counter_spell.yml index b29f7c1a16..7f554d47a7 100644 --- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Meta/T0_counter_spell.yml +++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Meta/T0_counter_spell.yml @@ -4,7 +4,7 @@ description: By affecting the magical energy itself, you can interrupt the cast of someone else's spell. components: - type: Sprite - sprite: _CP14/Effects/Magic/spells_icons.rsi + sprite: _CP14/Actions/Spells/meta.rsi state: counter_spell - type: CP14MagicEffectCastSlowdown speedMultiplier: 0.7 @@ -30,7 +30,7 @@ sound: !type:SoundPathSpecifier path: /Audio/Magic/rumble.ogg icon: - sprite: _CP14/Effects/Magic/spells_icons.rsi + sprite: _CP14/Actions/Spells/meta.rsi state: counter_spell event: !type:CP14DelayedEntityTargetActionEvent cooldown: 10 diff --git a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Meta/T0_mana_consume.yml b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Meta/T0_mana_consume.yml index a6e2274d92..38cacc6822 100644 --- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Meta/T0_mana_consume.yml +++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Meta/T0_mana_consume.yml @@ -4,7 +4,7 @@ description: You absorb a small amount of mana from the target. components: - type: Sprite - sprite: _CP14/Effects/Magic/spells_icons.rsi + sprite: _CP14/Actions/Spells/meta.rsi state: mana_consume - type: CP14MagicEffect magicType: Meta @@ -30,7 +30,7 @@ sound: !type:SoundPathSpecifier path: /Audio/Magic/rumble.ogg icon: - sprite: _CP14/Effects/Magic/spells_icons.rsi + sprite: _CP14/Actions/Spells/meta.rsi state: mana_consume event: !type:CP14ToggleableEntityTargetActionEvent cooldown: 5 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 f01176a766..248d927eee 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 @@ -4,7 +4,7 @@ description: You can transfer a small amount of your magical energy to a target entity or magical object. components: - type: Sprite - sprite: _CP14/Effects/Magic/spells_icons.rsi + sprite: _CP14/Actions/Spells/meta.rsi state: mana_gift - type: CP14MagicEffectManaCost manaCost: 10 @@ -38,7 +38,7 @@ sound: !type:SoundPathSpecifier path: /Audio/Magic/rumble.ogg icon: - sprite: _CP14/Effects/Magic/spells_icons.rsi + sprite: _CP14/Actions/Spells/meta.rsi state: mana_gift event: !type:CP14ToggleableEntityTargetActionEvent cooldown: 2 diff --git a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Necromancy/T1_resurrection.yml b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Necromancy/T1_resurrection.yml index 3b878441ce..7fa81ef618 100644 --- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Necromancy/T1_resurrection.yml +++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Necromancy/T1_resurrection.yml @@ -4,7 +4,7 @@ description: You're trying to put the soul back into the body. components: - type: Sprite - sprite: _CP14/Effects/Magic/spells_icons.rsi + sprite: _CP14/Actions/Spells/necromancy.rsi state: resurrection - type: CP14MagicEffectCastSlowdown speedMultiplier: 0.2 @@ -51,7 +51,7 @@ sound: !type:SoundPathSpecifier path: /Audio/Magic/rumble.ogg icon: - sprite: _CP14/Effects/Magic/spells_icons.rsi + sprite: _CP14/Actions/Spells/necromancy.rsi state: resurrection event: !type:CP14DelayedEntityTargetActionEvent cooldown: 300 diff --git a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Physical/T0_Kick.yml b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Physical/T0_Kick.yml index 497db562a3..907ca06b10 100644 --- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Physical/T0_Kick.yml +++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Physical/T0_Kick.yml @@ -4,7 +4,7 @@ description: You perform an epic leg kick at your chosen object, pushing it away from you. components: - type: Sprite - sprite: _CP14/Effects/Magic/spells_icons.rsi + sprite: _CP14/Actions/Spells/physical.rsi state: kick - type: CP14MagicEffectCastSlowdown speedMultiplier: 0.4 @@ -36,7 +36,7 @@ range: 1 itemIconStyle: BigAction icon: - sprite: _CP14/Effects/Magic/spells_icons.rsi + sprite: _CP14/Actions/Spells/physical.rsi state: kick event: !type:CP14DelayedEntityTargetActionEvent cooldown: 5 diff --git a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Physical/T0_Sprint.yml b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Physical/T0_Sprint.yml index a488e8d46d..3980b88c43 100644 --- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Physical/T0_Sprint.yml +++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Physical/T0_Sprint.yml @@ -4,7 +4,7 @@ description: At the cost of heavy stamina expenditure, you accelerate significantly in movement. components: - type: Sprite - sprite: _CP14/Effects/Magic/spells_icons.rsi + sprite: _CP14/Actions/Spells/physical.rsi state: sprint - type: CP14MagicEffectCastSlowdown speedMultiplier: 1.3 @@ -20,7 +20,7 @@ sound: !type:SoundPathSpecifier path: /Audio/Magic/rumble.ogg icon: - sprite: _CP14/Effects/Magic/spells_icons.rsi + sprite: _CP14/Actions/Spells/physical.rsi state: sprint event: !type:CP14ToggleableInstantActionEvent effectFrequency: 0.2 diff --git a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Water/T0_freeze.yml b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Water/T0_freeze.yml index e4804438c4..9e306eeb20 100644 --- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Water/T0_freeze.yml +++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Water/T0_freeze.yml @@ -4,7 +4,7 @@ description: You begin to severely cool down the target, slowing its movement speed. components: - type: Sprite - sprite: _CP14/Effects/Magic/spells_icons.rsi + sprite: _CP14/Actions/Spells/water.rsi state: freeze - type: CP14MagicEffectCastSlowdown speedMultiplier: 0.8 @@ -36,7 +36,7 @@ sound: !type:SoundPathSpecifier path: /Audio/Magic/rumble.ogg icon: - sprite: _CP14/Effects/Magic/spells_icons.rsi + sprite: _CP14/Actions/Spells/water.rsi state: freeze event: !type:CP14ToggleableEntityTargetActionEvent cooldown: 5 diff --git a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Water/T0_water_creation.yml b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Water/T0_water_creation.yml index 7a33c8993f..34a67b7bdf 100644 --- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Water/T0_water_creation.yml +++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Water/T0_water_creation.yml @@ -4,7 +4,7 @@ description: Creating a clot of water that is held in a floating balloon shape for some time components: - type: Sprite - sprite: _CP14/Effects/Magic/spells_icons.rsi + sprite: _CP14/Actions/Spells/water.rsi state: water_creation - type: CP14MagicEffectManaCost manaCost: 10 @@ -25,7 +25,7 @@ sound: !type:SoundPathSpecifier path: /Audio/Magic/rumble.ogg icon: - sprite: _CP14/Effects/Magic/spells_icons.rsi + sprite: _CP14/Actions/Spells/water.rsi state: water_creation event: !type:CP14DelayedInstantActionEvent cooldown: 10 diff --git a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Water/T1_beer_creation.yml b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Water/T1_beer_creation.yml index d97dee5c5b..f4e68e9399 100644 --- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Water/T1_beer_creation.yml +++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Water/T1_beer_creation.yml @@ -4,7 +4,7 @@ description: A secret spell that materializes beer from pure mana. components: - type: Sprite - sprite: _CP14/Effects/Magic/spells_icons.rsi + sprite: _CP14/Actions/Spells/water.rsi state: beer_creation - type: CP14MagicEffectManaCost manaCost: 50 @@ -28,7 +28,7 @@ sound: !type:SoundPathSpecifier path: /Audio/Magic/rumble.ogg icon: - sprite: _CP14/Effects/Magic/spells_icons.rsi + sprite: _CP14/Actions/Spells/water.rsi state: beer_creation event: !type:CP14DelayedInstantActionEvent cooldown: 60 diff --git a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Water/T1_ice_shards.yml b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Water/T1_ice_shards.yml index dc09a95463..4cb8916e13 100644 --- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Water/T1_ice_shards.yml +++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Water/T1_ice_shards.yml @@ -4,7 +4,7 @@ description: Fast ice needles, for rapid shooting of targets. components: - type: Sprite - sprite: _CP14/Effects/Magic/spells_icons.rsi + sprite: _CP14/Actions/Spells/water.rsi state: ice_shards - type: CP14MagicEffectCastSlowdown speedMultiplier: 0.75 @@ -31,7 +31,7 @@ sound: !type:SoundPathSpecifier path: /Audio/Magic/rumble.ogg icon: - sprite: _CP14/Effects/Magic/spells_icons.rsi + sprite: _CP14/Actions/Spells/water.rsi state: ice_shards event: !type:CP14EntityWorldTargetActionEvent cooldown: 0.5 diff --git a/Resources/Textures/_CP14/Effects/Magic/spells_icons.rsi/demi_arrow.png b/Resources/Textures/_CP14/Actions/Spells/dimension.rsi/demi_arrow.png similarity index 100% rename from Resources/Textures/_CP14/Effects/Magic/spells_icons.rsi/demi_arrow.png rename to Resources/Textures/_CP14/Actions/Spells/dimension.rsi/demi_arrow.png diff --git a/Resources/Textures/_CP14/Actions/Spells/dimension.rsi/meta.json b/Resources/Textures/_CP14/Actions/Spells/dimension.rsi/meta.json new file mode 100644 index 0000000000..d32017451d --- /dev/null +++ b/Resources/Textures/_CP14/Actions/Spells/dimension.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "All right reserved", + "copyright": "Created by TheShuEd. Shadow step and Shadow grab created by .kreks.", + "states": [ + { + "name": "demi_arrow" + }, + { + "name": "rift_arrow" + }, + { + "name": "rift_shield" + }, + { + "name": "shadow_grab" + }, + { + "name": "shadow_step" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_CP14/Effects/Magic/spells_icons.rsi/rift_arrow.png b/Resources/Textures/_CP14/Actions/Spells/dimension.rsi/rift_arrow.png similarity index 100% rename from Resources/Textures/_CP14/Effects/Magic/spells_icons.rsi/rift_arrow.png rename to Resources/Textures/_CP14/Actions/Spells/dimension.rsi/rift_arrow.png diff --git a/Resources/Textures/_CP14/Effects/Magic/spells_icons.rsi/rift_shield.png b/Resources/Textures/_CP14/Actions/Spells/dimension.rsi/rift_shield.png similarity index 100% rename from Resources/Textures/_CP14/Effects/Magic/spells_icons.rsi/rift_shield.png rename to Resources/Textures/_CP14/Actions/Spells/dimension.rsi/rift_shield.png diff --git a/Resources/Textures/_CP14/Effects/Magic/spells_icons.rsi/shadow_grab.png b/Resources/Textures/_CP14/Actions/Spells/dimension.rsi/shadow_grab.png similarity index 100% rename from Resources/Textures/_CP14/Effects/Magic/spells_icons.rsi/shadow_grab.png rename to Resources/Textures/_CP14/Actions/Spells/dimension.rsi/shadow_grab.png diff --git a/Resources/Textures/_CP14/Effects/Magic/spells_icons.rsi/shadow_step.png b/Resources/Textures/_CP14/Actions/Spells/dimension.rsi/shadow_step.png similarity index 100% rename from Resources/Textures/_CP14/Effects/Magic/spells_icons.rsi/shadow_step.png rename to Resources/Textures/_CP14/Actions/Spells/dimension.rsi/shadow_step.png diff --git a/Resources/Textures/_CP14/Effects/Magic/spells_icons.rsi/earth_wall.png b/Resources/Textures/_CP14/Actions/Spells/earth.rsi/earth_wall.png similarity index 100% rename from Resources/Textures/_CP14/Effects/Magic/spells_icons.rsi/earth_wall.png rename to Resources/Textures/_CP14/Actions/Spells/earth.rsi/earth_wall.png diff --git a/Resources/Textures/_CP14/Effects/Magic/spells_icons_monster.rsi/meta.json b/Resources/Textures/_CP14/Actions/Spells/earth.rsi/meta.json similarity index 52% rename from Resources/Textures/_CP14/Effects/Magic/spells_icons_monster.rsi/meta.json rename to Resources/Textures/_CP14/Actions/Spells/earth.rsi/meta.json index 5aef2be47e..fd3e981117 100644 --- a/Resources/Textures/_CP14/Effects/Magic/spells_icons_monster.rsi/meta.json +++ b/Resources/Textures/_CP14/Actions/Spells/earth.rsi/meta.json @@ -4,11 +4,14 @@ "x": 32, "y": 32 }, - "license": "CC-BY-SA-4.0", - "copyright": "Created by TheShuEd (github)", + "license": "All right reserved", + "copyright": "Created by TheShuEd", "states": [ + { + "name": "earth_wall" + }, { "name": "subterranean_leap" } ] -} +} \ No newline at end of file diff --git a/Resources/Textures/_CP14/Effects/Magic/spells_icons_monster.rsi/subterranean_leap.png b/Resources/Textures/_CP14/Actions/Spells/earth.rsi/subterranean_leap.png similarity index 100% rename from Resources/Textures/_CP14/Effects/Magic/spells_icons_monster.rsi/subterranean_leap.png rename to Resources/Textures/_CP14/Actions/Spells/earth.rsi/subterranean_leap.png diff --git a/Resources/Textures/_CP14/Effects/Magic/spells_icons.rsi/fireball.png b/Resources/Textures/_CP14/Actions/Spells/fire.rsi/fireball.png similarity index 100% rename from Resources/Textures/_CP14/Effects/Magic/spells_icons.rsi/fireball.png rename to Resources/Textures/_CP14/Actions/Spells/fire.rsi/fireball.png diff --git a/Resources/Textures/_CP14/Effects/Magic/spells_icons.rsi/flame_creation.png b/Resources/Textures/_CP14/Actions/Spells/fire.rsi/flame_creation.png similarity index 100% rename from Resources/Textures/_CP14/Effects/Magic/spells_icons.rsi/flame_creation.png rename to Resources/Textures/_CP14/Actions/Spells/fire.rsi/flame_creation.png diff --git a/Resources/Textures/_CP14/Actions/Spells/fire.rsi/meta.json b/Resources/Textures/_CP14/Actions/Spells/fire.rsi/meta.json new file mode 100644 index 0000000000..c68b145155 --- /dev/null +++ b/Resources/Textures/_CP14/Actions/Spells/fire.rsi/meta.json @@ -0,0 +1,20 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "All right reserved", + "copyright": "Created by .kreks., tiefling_revenge by TheShuEd", + "states": [ + { + "name": "fireball" + }, + { + "name": "flame_creation" + }, + { + "name": "tiefling_revenge" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_CP14/Effects/Magic/spells_icons.rsi/tiefling_revenge.png b/Resources/Textures/_CP14/Actions/Spells/fire.rsi/tiefling_revenge.png similarity index 100% rename from Resources/Textures/_CP14/Effects/Magic/spells_icons.rsi/tiefling_revenge.png rename to Resources/Textures/_CP14/Actions/Spells/fire.rsi/tiefling_revenge.png diff --git a/Resources/Textures/_CP14/Effects/Magic/spells_icons.rsi/cure_burn.png b/Resources/Textures/_CP14/Actions/Spells/healing.rsi/cure_burn.png similarity index 100% rename from Resources/Textures/_CP14/Effects/Magic/spells_icons.rsi/cure_burn.png rename to Resources/Textures/_CP14/Actions/Spells/healing.rsi/cure_burn.png diff --git a/Resources/Textures/_CP14/Effects/Magic/spells_icons.rsi/cure_poison.png b/Resources/Textures/_CP14/Actions/Spells/healing.rsi/cure_poison.png similarity index 100% rename from Resources/Textures/_CP14/Effects/Magic/spells_icons.rsi/cure_poison.png rename to Resources/Textures/_CP14/Actions/Spells/healing.rsi/cure_poison.png diff --git a/Resources/Textures/_CP14/Effects/Magic/spells_icons.rsi/cure_wounds.png b/Resources/Textures/_CP14/Actions/Spells/healing.rsi/cure_wounds.png similarity index 100% rename from Resources/Textures/_CP14/Effects/Magic/spells_icons.rsi/cure_wounds.png rename to Resources/Textures/_CP14/Actions/Spells/healing.rsi/cure_wounds.png diff --git a/Resources/Textures/_CP14/Effects/Magic/spells_icons.rsi/heal_music.png b/Resources/Textures/_CP14/Actions/Spells/healing.rsi/heal_music.png similarity index 100% rename from Resources/Textures/_CP14/Effects/Magic/spells_icons.rsi/heal_music.png rename to Resources/Textures/_CP14/Actions/Spells/healing.rsi/heal_music.png diff --git a/Resources/Textures/_CP14/Actions/Spells/healing.rsi/meta.json b/Resources/Textures/_CP14/Actions/Spells/healing.rsi/meta.json new file mode 100644 index 0000000000..2bef58286d --- /dev/null +++ b/Resources/Textures/_CP14/Actions/Spells/healing.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "All right reserved", + "copyright": "Created by .kreks., cure_burn, cure_poison, heal_music, plant_growth by TheShuEd", + "states": [ + { + "name": "cure_burn" + }, + { + "name": "cure_poison" + }, + { + "name": "cure_wounds" + }, + { + "name": "heal_music" + }, + { + "name": "plant_growth" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_CP14/Effects/Magic/spells_icons.rsi/plant_growth.png b/Resources/Textures/_CP14/Actions/Spells/healing.rsi/plant_growth.png similarity index 100% rename from Resources/Textures/_CP14/Effects/Magic/spells_icons.rsi/plant_growth.png rename to Resources/Textures/_CP14/Actions/Spells/healing.rsi/plant_growth.png diff --git a/Resources/Textures/_CP14/Effects/Magic/spells_icons.rsi/flash_light.png b/Resources/Textures/_CP14/Actions/Spells/light.rsi/flash_light.png similarity index 100% rename from Resources/Textures/_CP14/Effects/Magic/spells_icons.rsi/flash_light.png rename to Resources/Textures/_CP14/Actions/Spells/light.rsi/flash_light.png diff --git a/Resources/Textures/_CP14/Actions/Spells/light.rsi/meta.json b/Resources/Textures/_CP14/Actions/Spells/light.rsi/meta.json new file mode 100644 index 0000000000..4aa5d154b7 --- /dev/null +++ b/Resources/Textures/_CP14/Actions/Spells/light.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "All right reserved", + "copyright": "Created by .kreks., signal_light_blue, signal_light_red, signal_light_yellow by TheShuEd", + "states": [ + { + "name": "flash_light" + }, + { + "name": "signal_light_blue" + }, + { + "name": "signal_light_red" + }, + { + "name": "signal_light_yellow" + }, + { + "name": "sphere_of_light" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_CP14/Effects/Magic/spells_icons.rsi/signal_light_blue.png b/Resources/Textures/_CP14/Actions/Spells/light.rsi/signal_light_blue.png similarity index 100% rename from Resources/Textures/_CP14/Effects/Magic/spells_icons.rsi/signal_light_blue.png rename to Resources/Textures/_CP14/Actions/Spells/light.rsi/signal_light_blue.png diff --git a/Resources/Textures/_CP14/Effects/Magic/spells_icons.rsi/signal_light_red.png b/Resources/Textures/_CP14/Actions/Spells/light.rsi/signal_light_red.png similarity index 100% rename from Resources/Textures/_CP14/Effects/Magic/spells_icons.rsi/signal_light_red.png rename to Resources/Textures/_CP14/Actions/Spells/light.rsi/signal_light_red.png diff --git a/Resources/Textures/_CP14/Effects/Magic/spells_icons.rsi/signal_light_yellow.png b/Resources/Textures/_CP14/Actions/Spells/light.rsi/signal_light_yellow.png similarity index 100% rename from Resources/Textures/_CP14/Effects/Magic/spells_icons.rsi/signal_light_yellow.png rename to Resources/Textures/_CP14/Actions/Spells/light.rsi/signal_light_yellow.png diff --git a/Resources/Textures/_CP14/Effects/Magic/spells_icons.rsi/sphere_of_light.png b/Resources/Textures/_CP14/Actions/Spells/light.rsi/sphere_of_light.png similarity index 100% rename from Resources/Textures/_CP14/Effects/Magic/spells_icons.rsi/sphere_of_light.png rename to Resources/Textures/_CP14/Actions/Spells/light.rsi/sphere_of_light.png diff --git a/Resources/Textures/_CP14/Effects/Magic/spells_icons.rsi/counter_spell.png b/Resources/Textures/_CP14/Actions/Spells/meta.rsi/counter_spell.png similarity index 100% rename from Resources/Textures/_CP14/Effects/Magic/spells_icons.rsi/counter_spell.png rename to Resources/Textures/_CP14/Actions/Spells/meta.rsi/counter_spell.png diff --git a/Resources/Textures/_CP14/Effects/Magic/spells_icons.rsi/mana_consume.png b/Resources/Textures/_CP14/Actions/Spells/meta.rsi/mana_consume.png similarity index 100% rename from Resources/Textures/_CP14/Effects/Magic/spells_icons.rsi/mana_consume.png rename to Resources/Textures/_CP14/Actions/Spells/meta.rsi/mana_consume.png diff --git a/Resources/Textures/_CP14/Effects/Magic/spells_icons.rsi/mana_gift.png b/Resources/Textures/_CP14/Actions/Spells/meta.rsi/mana_gift.png similarity index 100% rename from Resources/Textures/_CP14/Effects/Magic/spells_icons.rsi/mana_gift.png rename to Resources/Textures/_CP14/Actions/Spells/meta.rsi/mana_gift.png diff --git a/Resources/Textures/_CP14/Actions/Spells/meta.rsi/meta.json b/Resources/Textures/_CP14/Actions/Spells/meta.rsi/meta.json new file mode 100644 index 0000000000..edcf01fcd4 --- /dev/null +++ b/Resources/Textures/_CP14/Actions/Spells/meta.rsi/meta.json @@ -0,0 +1,20 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "All right reserved", + "copyright": "Created by TheShuEd", + "states": [ + { + "name": "counter_spell" + }, + { + "name": "mana_consume" + }, + { + "name": "mana_gift" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_CP14/Effects/Magic/spells_icons.rsi/magical_acceleration.png b/Resources/Textures/_CP14/Actions/Spells/misc.rsi/magical_acceleration.png similarity index 100% rename from Resources/Textures/_CP14/Effects/Magic/spells_icons.rsi/magical_acceleration.png rename to Resources/Textures/_CP14/Actions/Spells/misc.rsi/magical_acceleration.png diff --git a/Resources/Textures/_CP14/Actions/Spells/misc.rsi/meta.json b/Resources/Textures/_CP14/Actions/Spells/misc.rsi/meta.json new file mode 100644 index 0000000000..4bc6d501a7 --- /dev/null +++ b/Resources/Textures/_CP14/Actions/Spells/misc.rsi/meta.json @@ -0,0 +1,14 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "All right reserved", + "copyright": "Created by TheShuEd", + "states": [ + { + "name": "magical_acceleration" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_CP14/Actions/Spells/necromancy.rsi/meta.json b/Resources/Textures/_CP14/Actions/Spells/necromancy.rsi/meta.json new file mode 100644 index 0000000000..a5593df1a7 --- /dev/null +++ b/Resources/Textures/_CP14/Actions/Spells/necromancy.rsi/meta.json @@ -0,0 +1,14 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "All right reserved", + "copyright": "Created by TheShuEd", + "states": [ + { + "name": "resurrection" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_CP14/Effects/Magic/spells_icons.rsi/resurrection.png b/Resources/Textures/_CP14/Actions/Spells/necromancy.rsi/resurrection.png similarity index 100% rename from Resources/Textures/_CP14/Effects/Magic/spells_icons.rsi/resurrection.png rename to Resources/Textures/_CP14/Actions/Spells/necromancy.rsi/resurrection.png diff --git a/Resources/Textures/_CP14/Effects/Magic/spells_icons.rsi/kick.png b/Resources/Textures/_CP14/Actions/Spells/physical.rsi/kick.png similarity index 100% rename from Resources/Textures/_CP14/Effects/Magic/spells_icons.rsi/kick.png rename to Resources/Textures/_CP14/Actions/Spells/physical.rsi/kick.png diff --git a/Resources/Textures/_CP14/Actions/Spells/physical.rsi/meta.json b/Resources/Textures/_CP14/Actions/Spells/physical.rsi/meta.json new file mode 100644 index 0000000000..d75e4ce1c1 --- /dev/null +++ b/Resources/Textures/_CP14/Actions/Spells/physical.rsi/meta.json @@ -0,0 +1,17 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "All right reserved", + "copyright": "Created by TheShuEd", + "states": [ + { + "name": "kick" + }, + { + "name": "sprint" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_CP14/Effects/Magic/spells_icons.rsi/sprint.png b/Resources/Textures/_CP14/Actions/Spells/physical.rsi/sprint.png similarity index 100% rename from Resources/Textures/_CP14/Effects/Magic/spells_icons.rsi/sprint.png rename to Resources/Textures/_CP14/Actions/Spells/physical.rsi/sprint.png diff --git a/Resources/Textures/_CP14/Effects/Magic/spells_icons.rsi/beer_creation.png b/Resources/Textures/_CP14/Actions/Spells/water.rsi/beer_creation.png similarity index 100% rename from Resources/Textures/_CP14/Effects/Magic/spells_icons.rsi/beer_creation.png rename to Resources/Textures/_CP14/Actions/Spells/water.rsi/beer_creation.png diff --git a/Resources/Textures/_CP14/Effects/Magic/spells_icons.rsi/freeze.png b/Resources/Textures/_CP14/Actions/Spells/water.rsi/freeze.png similarity index 100% rename from Resources/Textures/_CP14/Effects/Magic/spells_icons.rsi/freeze.png rename to Resources/Textures/_CP14/Actions/Spells/water.rsi/freeze.png diff --git a/Resources/Textures/_CP14/Effects/Magic/spells_icons.rsi/ice_dagger.png b/Resources/Textures/_CP14/Actions/Spells/water.rsi/ice_dagger.png similarity index 100% rename from Resources/Textures/_CP14/Effects/Magic/spells_icons.rsi/ice_dagger.png rename to Resources/Textures/_CP14/Actions/Spells/water.rsi/ice_dagger.png diff --git a/Resources/Textures/_CP14/Effects/Magic/spells_icons.rsi/ice_shards.png b/Resources/Textures/_CP14/Actions/Spells/water.rsi/ice_shards.png similarity index 100% rename from Resources/Textures/_CP14/Effects/Magic/spells_icons.rsi/ice_shards.png rename to Resources/Textures/_CP14/Actions/Spells/water.rsi/ice_shards.png diff --git a/Resources/Textures/_CP14/Actions/Spells/water.rsi/meta.json b/Resources/Textures/_CP14/Actions/Spells/water.rsi/meta.json new file mode 100644 index 0000000000..7aba6c3bde --- /dev/null +++ b/Resources/Textures/_CP14/Actions/Spells/water.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "All right reserved", + "copyright": "Created by TheShuEd", + "states": [ + { + "name": "beer_creation" + }, + { + "name": "freeze" + }, + { + "name": "ice_dagger" + }, + { + "name": "ice_shards" + }, + { + "name": "water_creation" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_CP14/Effects/Magic/spells_icons.rsi/water_creation.png b/Resources/Textures/_CP14/Actions/Spells/water.rsi/water_creation.png similarity index 100% rename from Resources/Textures/_CP14/Effects/Magic/spells_icons.rsi/water_creation.png rename to Resources/Textures/_CP14/Actions/Spells/water.rsi/water_creation.png diff --git a/Resources/Textures/_CP14/Effects/Magic/spells_icons.rsi/meta.json b/Resources/Textures/_CP14/Effects/Magic/spells_icons.rsi/meta.json deleted file mode 100644 index 597414698e..0000000000 --- a/Resources/Textures/_CP14/Effects/Magic/spells_icons.rsi/meta.json +++ /dev/null @@ -1,104 +0,0 @@ -{ - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "All right reserved", - "copyright": "Created by .kreks., cure_poison, cure_burn, mana_gift, water creation, plant_growth, beer creation, sprint, tiefling_revenge, demi_arrow, rift_shield, rift_arrow, signal_light_blue, signal_light_red, freeze, counter_spell, magical_acceleration, kick, heal_music, signal_light_yellow and resurrection by TheShuEd", - "states": [ - { - "name": "beer_creation" - }, - { - "name": "counter_spell" - }, - { - "name": "cure_burn" - }, - { - "name": "cure_poison" - }, - { - "name": "cure_wounds" - }, - { - "name": "demi_arrow" - }, - { - "name": "earth_wall" - }, - { - "name": "fireball" - }, - { - "name": "flame_creation" - }, - { - "name": "flash_light" - }, - { - "name": "freeze" - }, - { - "name": "heal_music" - }, - { - "name": "ice_dagger" - }, - { - "name": "ice_shards" - }, - { - "name": "kick" - }, - { - "name": "magical_acceleration" - }, - { - "name": "mana_consume" - }, - { - "name": "mana_gift" - }, - { - "name": "plant_growth" - }, - { - "name": "resurrection" - }, - { - "name": "rift_arrow" - }, - { - "name": "rift_shield" - }, - { - "name": "shadow_grab" - }, - { - "name": "shadow_step" - }, - { - "name": "signal_light_blue" - }, - { - "name": "signal_light_red" - }, - { - "name": "signal_light_yellow" - }, - { - "name": "sphere_of_light" - }, - { - "name": "sprint" - }, - { - "name": "tiefling_revenge" - }, - { - "name": "water_creation" - } - ] -} \ No newline at end of file