diff --git a/Resources/Prototypes/Imperial/Medieval/Magic/Spells/Earth/Earthshaking/projectiles.yml b/Resources/Prototypes/Imperial/Medieval/Magic/Spells/Earth/Earthshaking/projectiles.yml index 514d07329ec..d1af7d774f4 100644 --- a/Resources/Prototypes/Imperial/Medieval/Magic/Spells/Earth/Earthshaking/projectiles.yml +++ b/Resources/Prototypes/Imperial/Medieval/Magic/Spells/Earth/Earthshaking/projectiles.yml @@ -1,3 +1,58 @@ +- type: entity + id: MedievalProjectileInactiveEarthshaking + components: + - type: Sprite + sprite: Imperial/Medieval/Magic/Earth/Spikes/projectiles.rsi + state: beginner-spawn + drawdepth: FloorTiles + - type: TimedDespawn + lifetime: 1 + - type: SpawnOnDespawn + prototype: MedievalProjectileActiveEarthshaking + - type: Fixtures + fixtures: + fix1: + shape: + !type:PhysShapeAabb + bounds: "-0.5,-0.5,0.5,0.5" + density: 100 + + +- type: entity + id: MedievalProjectileActiveEarthshaking + components: + - type: Sprite + sprite: Imperial/Medieval/Magic/Earth/Spikes/projectiles.rsi + state: beginner + drawdepth: FloorTiles + - type: TimedDespawn + lifetime: 1.5 + - type: Clickable + - type: Physics + - type: Fixtures + fixtures: + fix1: + shape: + !type:PhysShapeCircle + radius: 0.45 + density: 60 + mask: + - MachineMask + layer: + - MidImpassable + - LowImpassable + - BulletImpassable + - Opaque + hard: false + - type: MedievalNotAllowDash + - type: SpeedModifierContacts + walkSpeedModifier: 0.5 + sprintSpeedModifier: 0.5 + - type: DamageContacts + damage: + types: + Piercing: 10 + # Beginner - type: entity @@ -7,7 +62,7 @@ - type: RepeatingTrigger delay: 3.5 - type: VectoredSpawnOnTrigger - spawnedEntityID: MedievalProjectileInactiveSpikesBeginner # Proto at Spikes/projectiles.yml + spawnedEntityID: MedievalProjectileInactiveEarthshaking spawnPositions: ["0, 0", "-1, 0", "1, 0", "0, 1", "0, -1"] - type: TimedDespawn lifetime: 9 @@ -21,7 +76,7 @@ - type: RepeatingTrigger delay: 3.5 - type: VectoredSpawnOnTrigger - spawnedEntityID: MedievalProjectileInactiveSpikesBeginner + spawnedEntityID: MedievalProjectileInactiveEarthshaking spawnPositions: ["-1, -1", "1, -1", "-1, 1", "1, 1", "0, -1", "-1, 0", "1, 0", "0, 1", "0, -2", "-2, 0", "2, 0", "0, 2", "0, 0"] - type: TimedDespawn lifetime: 9 @@ -35,7 +90,7 @@ - type: RepeatingTrigger delay: 3.5 - type: VectoredSpawnOnTrigger - spawnedEntityID: MedievalProjectileInactiveSpikesBeginner + spawnedEntityID: MedievalProjectileInactiveEarthshaking spawnPositions: ["0, 0", "-1, 0", "1, 0", "0, 1", "0, -1", "-1, 1", "1, 1", "-1, -1", "1, -1", "-2, 2", "-1, 2", "0, 2", "1, 2", "2, 2", "-2, 1", "-2, 0", "-2, -1", "-2, -2", "-1, -2", "0, -2", "1, -2", "2, -2", "2, -1", "2, 0", "2, 1", "-3, 0", "3, 0", "0, 3", "0, -3"] - type: TimedDespawn lifetime: 9 diff --git a/Resources/Prototypes/Imperial/Medieval/Magic/Spells/Earth/Obelisk/projectiles.yml b/Resources/Prototypes/Imperial/Medieval/Magic/Spells/Earth/Obelisk/projectiles.yml index 9a2eb19f1b9..022e879457c 100644 --- a/Resources/Prototypes/Imperial/Medieval/Magic/Spells/Earth/Obelisk/projectiles.yml +++ b/Resources/Prototypes/Imperial/Medieval/Magic/Spells/Earth/Obelisk/projectiles.yml @@ -23,7 +23,7 @@ delay: 3.5 firstDelay: 1.5 - type: RandomOffsetSpawn - spawnedEntityID: MedievalProjectileInactiveSpikesBeginner + spawnedEntityID: MedievalProjectileInactiveEarthshaking radius: 2 quantity: 5 - type: TimedDespawn @@ -72,7 +72,7 @@ parent: MedievalObeliskEntBeginner components: - type: RandomOffsetSpawn - spawnedEntityID: MedievalProjectileInactiveSpikesBeginner + spawnedEntityID: MedievalProjectileInactiveEarthshaking radius: 3 quantity: 10 # Senior @@ -105,7 +105,7 @@ components: - type: TriggerOnSpawn - type: VectoredSpawnOnTrigger - spawnedEntityID: MedievalProjectileInactiveSpikesBeginner + spawnedEntityID: MedievalProjectileInactiveEarthshaking spawnPositions: ["0, 2", "1, 1", "2, 0", "1, -1", "0, -2", "-1, -1", "-2, 0", "-1, 1"] - type: TimedDespawn lifetime: 0.5 @@ -117,7 +117,7 @@ components: - type: TriggerOnSpawn - type: VectoredSpawnOnTrigger - spawnedEntityID: MedievalProjectileInactiveSpikesBeginner + spawnedEntityID: MedievalProjectileInactiveEarthshaking spawnPositions: ["0, 3", "1, 2", "2, 1", "3, 0", "2, -1", "1, -2", "0, -3", "-1, -2", "-2, -1", "-3, 0", "-2, 1", "-1, 2"] - type: TimedDespawn lifetime: 0.5 @@ -129,7 +129,7 @@ components: - type: TriggerOnSpawn - type: VectoredSpawnOnTrigger - spawnedEntityID: MedievalProjectileInactiveSpikesBeginner + spawnedEntityID: MedievalProjectileInactiveEarthshaking spawnPositions: ["0, 4", "1, 3", "2, 2", "3, 1", "4, 0", "3, -1", "2, -2", "1, -3", "0, -4", "-1, -3", "-2, -2", "-3, -1", "-4, 0", "-3, 1", "-2, 2", "-1, 3"] - type: TimedDespawn lifetime: 1 diff --git a/Resources/Prototypes/Imperial/Medieval/Magic/Spells/Earth/Spikes/projectiles.yml b/Resources/Prototypes/Imperial/Medieval/Magic/Spells/Earth/Spikes/projectiles.yml index 07c49ea1d94..b1bb66de906 100644 --- a/Resources/Prototypes/Imperial/Medieval/Magic/Spells/Earth/Spikes/projectiles.yml +++ b/Resources/Prototypes/Imperial/Medieval/Magic/Spells/Earth/Spikes/projectiles.yml @@ -6,7 +6,7 @@ state: beginner-spawn drawdepth: FloorTiles - type: TimedDespawn - lifetime: 1 + lifetime: 0.5 - type: SpawnOnDespawn prototype: MedievalProjectileActiveSpikeBeginner - type: Fixtures diff --git a/Resources/Prototypes/Imperial/Medieval/Magic/Spells/Fire/FireWall/projectiles.yml b/Resources/Prototypes/Imperial/Medieval/Magic/Spells/Fire/FireWall/projectiles.yml index f30d137f74f..4bd42186a7a 100644 --- a/Resources/Prototypes/Imperial/Medieval/Magic/Spells/Fire/FireWall/projectiles.yml +++ b/Resources/Prototypes/Imperial/Medieval/Magic/Spells/Fire/FireWall/projectiles.yml @@ -35,7 +35,7 @@ - type: DamageContacts damage: types: - Heat: 10 + Heat: 20 - type: IgniteOnCollide fixtureId: fix1 fireStacks: 2 diff --git a/Resources/Prototypes/Imperial/Medieval/Magic/Spells/Fire/Fireball/actions.yml b/Resources/Prototypes/Imperial/Medieval/Magic/Spells/Fire/Fireball/actions.yml index d8ef4689bcd..4ca27014f92 100644 --- a/Resources/Prototypes/Imperial/Medieval/Magic/Spells/Fire/Fireball/actions.yml +++ b/Resources/Prototypes/Imperial/Medieval/Magic/Spells/Fire/Fireball/actions.yml @@ -7,7 +7,7 @@ components: - type: MedievalTargetSpell - type: Action - useDelay: 180 + useDelay: 30 itemIconStyle: BigAction sound: !type:SoundPathSpecifier path: /Audio/Imperial/Medieval/fireball_cast.ogg @@ -37,7 +37,7 @@ - type: SpellCastEffect effectProto: FireballSpellCastEffectBeginner - type: ManaDrainSpell - manaDrain: 70 + manaDrain: 35 canUseWithoutMana: true manaLowMessage: medieval-spell-speach-not-enough-mana-fire-spell damageOnUseWithoutMana: @@ -86,7 +86,7 @@ description: medieval-store-spells-fire-fireball-middle-desc components: - type: ManaDrainSpell - manaDrain: 85 + manaDrain: 40 canUseWithoutMana: true manaLowMessage: medieval-spell-speach-not-enough-mana-fire-spell damageOnUseWithoutMana: @@ -96,7 +96,7 @@ effectProto: FireballSpellCastEffectMiddle - type: MedievalTargetSpell - type: Action - useDelay: 155 + useDelay: 35 itemIconStyle: BigAction sound: !type:SoundPathSpecifier path: /Audio/Imperial/Medieval/fireball_cast.ogg @@ -133,7 +133,7 @@ description: medieval-store-spells-fire-fireball-senior-desc components: - type: ManaDrainSpell - manaDrain: 90 + manaDrain: 40 canUseWithoutMana: true manaLowMessage: medieval-spell-speach-not-enough-mana-fire-spell damageOnUseWithoutMana: @@ -143,7 +143,7 @@ effectProto: FireballSpellCastEffectSenior - type: MedievalTargetSpell - type: Action - useDelay: 135 + useDelay: 60 itemIconStyle: BigAction sound: !type:SoundPathSpecifier path: /Audio/Imperial/Medieval/fireball_cast.ogg diff --git a/Resources/Prototypes/Imperial/Medieval/Magic/Spells/Vodka/IceDagger/actions.yml b/Resources/Prototypes/Imperial/Medieval/Magic/Spells/Vodka/IceDagger/actions.yml index cb588db8c8e..2085e7aa464 100644 --- a/Resources/Prototypes/Imperial/Medieval/Magic/Spells/Vodka/IceDagger/actions.yml +++ b/Resources/Prototypes/Imperial/Medieval/Magic/Spells/Vodka/IceDagger/actions.yml @@ -32,7 +32,7 @@ breakOnWeightlessMove: false breakOnMove: false needHand: true - breakOnDamage: true + breakOnDamage: false speedModifier: 1 speechPoints: 0: @@ -89,7 +89,7 @@ breakOnWeightlessMove: false breakOnMove: false needHand: true - breakOnDamage: true + breakOnDamage: false speedModifier: 1 speechPoints: 0: @@ -140,7 +140,7 @@ breakOnWeightlessMove: false breakOnMove: false needHand: true - breakOnDamage: true + breakOnDamage: false speedModifier: 1 speechPoints: 0: