diff --git a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Fire/firebolt.yml b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Fire/firewave.yml similarity index 67% rename from Resources/Prototypes/_CP14/Entities/Actions/Spells/Fire/firebolt.yml rename to Resources/Prototypes/_CP14/Entities/Actions/Spells/Fire/firewave.yml index 896ecd6f81..efea7753e0 100644 --- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Fire/firebolt.yml +++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Fire/firewave.yml @@ -1,11 +1,11 @@ - type: entity - id: CP14ActionSpellFirebolt - name: Firebolt - description: A staple of a pyrokinetic's arsenal - a small but potent bolt of fire. + id: CP14ActionSpellFirewave + name: Firewave + description: You release a wave of hot fire that strikes multiple targets in an area. components: - type: Sprite sprite: _CP14/Actions/Spells/fire.rsi - state: fireball + state: firewave - type: CP14MagicEffectCastSlowdown speedMultiplier: 0.75 - type: CP14MagicEffectManaCost @@ -15,9 +15,9 @@ effects: - !type:CP14SpellProjectile prototype: CP14Firebolt - - !type:CP14SpellSpawnEntityOnUser - spawns: - - CP14ImpactEffectFirebolt + spread: 2 + projectileSpeed: 5 + projectileCount: 6 - type: CP14MagicEffectVerbalAspect endSpeech: "Ignis acus!" - type: CP14MagicEffectCastingVisual @@ -33,10 +33,9 @@ path: /Audio/Magic/rumble.ogg icon: sprite: _CP14/Actions/Spells/fire.rsi - state: firebolt - event: !type:CP14DelayedEntityWorldTargetActionEvent + state: firewave + event: !type:CP14EntityWorldTargetActionEvent cooldown: 1.0 - breakOnMove: false - type: entity id: CP14RuneFirebolt @@ -58,11 +57,11 @@ categories: [ HideSpawnMenu ] save: false components: - - type: Sprite - layers: - - state: wave_up - color: "#eea911" - shader: unshaded + - type: PointLight + color: "#E25822" + radius: 2.0 + energy: 2.0 + - type: LightFade - type: entity id: CP14Firebolt @@ -71,28 +70,35 @@ categories: [ HideSpawnMenu ] save: false components: + - type: TimedDespawn + lifetime: 1 + - type: SpawnOnDespawn + prototype: CP14ImpactEffectFirebolt - type: PointLight color: "#E25822" - radius: 1.1 - energy: 1.0 + radius: 2.0 + energy: 2.0 - type: Projectile + impactEffect: CP14ImpactEffectFirebolt damage: types: - Heat: 10 + Heat: 2 soundHit: path: /Audio/Weapons/Guns/Hits/energy_metal1.ogg - type: Sprite - sprite: _CP14/Effects/Magic/firebolt.rsi + sprite: _CP14/Effects/fire.rsi layers: - - state: firebolt + - state: small shader: unshaded + - type: ChangeTemperatureOnCollide + heat: 10000 - type: entity parent: CP14BaseSpellScrollFire - id: CP14SpellScrollFirebolt - name: firebolt spell scroll + id: CP14SpellScrollFirewave + name: firewave spell scroll components: - type: CP14SpellStorage spells: - - CP14ActionSpellFirebolt + - CP14ActionSpellFirewave diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/NPC/spider.yml b/Resources/Prototypes/_CP14/Entities/Mobs/NPC/spider.yml index 1079d70f4b..d7f42c4b4a 100644 --- a/Resources/Prototypes/_CP14/Entities/Mobs/NPC/spider.yml +++ b/Resources/Prototypes/_CP14/Entities/Mobs/NPC/spider.yml @@ -49,7 +49,7 @@ - type: MobThresholds thresholds: 0: Alive - 90: Dead + 40: Dead #- type: SolutionContainerManager # solutions: # melee: diff --git a/Resources/Prototypes/_CP14/Skill/Basic/pyrokinetic.yml b/Resources/Prototypes/_CP14/Skill/Basic/pyrokinetic.yml index c1a5dc55df..1991782db8 100644 --- a/Resources/Prototypes/_CP14/Skill/Basic/pyrokinetic.yml +++ b/Resources/Prototypes/_CP14/Skill/Basic/pyrokinetic.yml @@ -103,15 +103,15 @@ prerequisite: PyrokineticT2 - type: cp14Skill - id: CP14ActionSpellFirebolt - skillUiPosition: 6, 6 + id: CP14ActionSpellFirewave + skillUiPosition: 8, 4 tree: Pyrokinetic icon: sprite: _CP14/Actions/Spells/fire.rsi - state: firebolt + state: firewave effects: - !type:AddAction - action: CP14ActionSpellFirebolt + action: CP14ActionSpellFirewave restrictions: - !type:NeedPrerequisite prerequisite: PyrokineticT2 diff --git a/Resources/Textures/_CP14/Actions/Spells/fire.rsi/firebolt.png b/Resources/Textures/_CP14/Actions/Spells/fire.rsi/firebolt.png deleted file mode 100644 index ac658353bc..0000000000 Binary files a/Resources/Textures/_CP14/Actions/Spells/fire.rsi/firebolt.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Actions/Spells/fire.rsi/firewave.png b/Resources/Textures/_CP14/Actions/Spells/fire.rsi/firewave.png new file mode 100644 index 0000000000..efcc421ef5 Binary files /dev/null and b/Resources/Textures/_CP14/Actions/Spells/fire.rsi/firewave.png differ diff --git a/Resources/Textures/_CP14/Actions/Spells/fire.rsi/meta.json b/Resources/Textures/_CP14/Actions/Spells/fire.rsi/meta.json index 276d3148d8..8dee19ade6 100644 --- a/Resources/Textures/_CP14/Actions/Spells/fire.rsi/meta.json +++ b/Resources/Textures/_CP14/Actions/Spells/fire.rsi/meta.json @@ -5,7 +5,7 @@ "y": 32 }, "license": "All right reserved", - "copyright": "Created by .kreks., tiefling_revenge, fire_music by TheShuEd, firebolt by TheShuEd + edited by firebat4321", + "copyright": "Created by .kreks., tiefling_revenge, fire_music, firewave by TheShuEd", "states": [ { "name": "fire_music" @@ -23,7 +23,7 @@ "name": "heat" }, { - "name": "firebolt" + "name": "firewave" } ] } diff --git a/Resources/Textures/_CP14/Effects/Magic/firebolt.rsi/firebolt.png b/Resources/Textures/_CP14/Effects/Magic/firebolt.rsi/firebolt.png deleted file mode 100644 index e46b5d8237..0000000000 Binary files a/Resources/Textures/_CP14/Effects/Magic/firebolt.rsi/firebolt.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Effects/Magic/firebolt.rsi/meta.json b/Resources/Textures/_CP14/Effects/Magic/firebolt.rsi/meta.json deleted file mode 100644 index 986c43f1fc..0000000000 --- a/Resources/Textures/_CP14/Effects/Magic/firebolt.rsi/meta.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-4.0", - "copyright": "Created by /tg/station, edited by firebat4321", - "states": [ - { - "name": "firebolt" - } - ] -}