Balance tweaks (#604)

* x2 damage

* Update CP14MagicWeaknessSystem.cs

* split cure burn

* split blood purification

* extinguish torch by interact

* Update torch.yml

* Update T0_cure_heat.yml

* fix fireSpread

Content.Server/Atmos/Components/FlammableComponent.cs

@@ -88,5 +88,11 @@ namespace Content.Server.Atmos.Components
         /// </summary>
         [DataField]
         public float CP14FireplaceFuel = 10f;
+
+        /// <summary>
+        /// the value is cached to check if it has changed
+        /// </summary>
+        [DataField]
+        public bool OnFireOld = false;
     }
 }

Content.Server/Atmos/EntitySystems/FlammableSystem.cs

@@ -267,8 +267,14 @@ namespace Content.Server.Atmos.EntitySystems
             //CrystallEdge bonfire moment
             if (!Resolve(uid, ref flammable))
                 return;
-            var ev = new OnFireChangedEvent(flammable.OnFire);
-            RaiseLocalEvent(uid, ref ev);
+
+            if (flammable.OnFireOld != flammable.OnFire)
+            {
+                var ev = new OnFireChangedEvent(flammable.OnFire);
+                RaiseLocalEvent(uid, ref ev);
+
+                flammable.OnFireOld = flammable.OnFire;
+            }
             //CrystallEdge bonfire moment end
 
             if (!Resolve(uid, ref flammable, ref appearance))

Content.Shared/_CP14/MagicWeakness/CP14MagicWeaknessSystem.cs

@@ -53,12 +53,12 @@ public partial class CP14MagicWeaknessSystem : EntitySystem
     private void OnMagicEnergyBurnOutDamage(Entity<CP14MagicUnsafeDamageComponent> ent, ref CP14MagicEnergyBurnOutEvent args)
     {
         _popup.PopupEntity(Loc.GetString("cp14-magic-energy-damage-burn-out"), ent, ent, PopupType.LargeCaution);
-        _damageable.TryChangeDamage(ent, ent.Comp.DamagePerEnergy * args.BurnOutEnergy);
+        _damageable.TryChangeDamage(ent, ent.Comp.DamagePerEnergy * args.BurnOutEnergy, interruptsDoAfters: false);
     }
 
     private void OnMagicEnergyOverloadDamage(Entity<CP14MagicUnsafeDamageComponent> ent, ref CP14MagicEnergyOverloadEvent args)
     {
         _popup.PopupEntity(Loc.GetString("cp14-magic-energy-damage-overload"), ent, ent, PopupType.LargeCaution);
-        _damageable.TryChangeDamage(ent, ent.Comp.DamagePerEnergy * args.OverloadEnergy);
+        _damageable.TryChangeDamage(ent, ent.Comp.DamagePerEnergy * args.OverloadEnergy, interruptsDoAfters: false);
     }
 }

Resources/Prototypes/_CP14/Entities/Actions/Spells/Fire/T0_flame_creation.yml

@@ -126,14 +126,14 @@
   - type: DamageOtherOnHit
     damage:
       types:
-        Heat: 8
+        Heat: 12
   - type: MeleeWeapon
     attackRate: 1.8
     wideAnimationRotation: 225
     wideAnimation: CP14WeaponArcSlash
     damage:
       types:
-        Heat: 5
+        Heat: 8
     soundHit:
       path: /Audio/Weapons/Guns/Hits/energy_meat1.ogg
       params:

Resources/Prototypes/_CP14/Entities/Actions/Spells/Healing/T0_cure_heat.yml

@@ -0,0 +1,87 @@
+- type: entity
+  id: CP14ActionSpellCureBurn
+  name: Cure burn
+  description: You heal skin damage caused by excessive cooling or heating.
+  components:
+  - type: Sprite
+    sprite: _CP14/Effects/Magic/spells_icons.rsi
+    state: cure_burn
+  - type: CP14MagicEffectCastSlowdown
+    speedMultiplier: 0.5
+  - type: CP14MagicEffect
+    magicType: Healing
+    manaCost: 10
+    telegraphyEffects:
+    - !type:CP14SpellSpawnEntityOnTarget
+      spawns:
+      - CP14ImpactEffectCureBurn
+    effects:
+    - !type:CP14SpellSpawnEntityOnTarget
+      spawns:
+      - CP14ImpactEffectCureBurn
+    - !type:CP14SpellApplyEntityEffect
+      effects:
+      - !type:HealthChange
+        damage:
+          types:
+            Cold: -10
+            Burn: -10
+            Shock: -10
+      - !type:Jitter
+  - type: CP14MagicEffectVerbalAspect
+    startSpeech: "Pellis dolorem..."
+    endSpeech: "non novit"
+  - type: CP14MagicEffectCastingVisual
+    proto: CP14RuneCureBurn
+  - type: EntityTargetAction
+    whitelist:
+      components:
+      - MobState
+    range: 7
+    itemIconStyle: BigAction
+    interactOnMiss: false
+    sound: !type:SoundPathSpecifier
+      path: /Audio/Magic/rumble.ogg
+    icon:
+      sprite: _CP14/Effects/Magic/spells_icons.rsi
+      state: cure_burn
+    event: !type:CP14DelayedEntityTargetActionEvent
+      cooldown: 5
+      castDelay: 1.5
+      breakOnMove: false
+ 
+- type: entity
+  id: CP14RuneCureBurn
+  parent: CP14BaseMagicRune
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: PointLight
+    color: "#328643"
+  - type: Sprite
+    layers:
+    - state: sun
+      color: "#79b330"
+      shader: unshaded
+    - state: double_outer
+      color: "#ed9b4a"
+      shader: unshaded
+
+- type: entity
+  id: CP14ImpactEffectCureBurn
+  parent: CP14BaseMagicImpact
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: Sprite
+    layers:
+    - state: particles_up
+      color: "#79b330"
+      shader: unshaded
+
+- type: entity
+  parent: CP14BaseSpellScrollHealing
+  id: CP14SpellScrollCureBurn
+  name: cure burn spell scroll
+  components:
+  - type: CP14SpellStorage
+    spells:
+    - CP14ActionSpellCureBurn

Resources/Prototypes/_CP14/Entities/Actions/Spells/Healing/T0_cure_poison.yml

@@ -0,0 +1,89 @@
+- type: entity
+  id: CP14ActionSpellBloodPurification
+  name: Blood purification
+  description: You cleanse the target's blood of poisons, and restore its volume slightly
+  components:
+  - type: Sprite
+    sprite: _CP14/Effects/Magic/spells_icons.rsi
+    state: cure_poison
+  - type: CP14MagicEffectCastSlowdown
+    speedMultiplier: 0.5
+  - type: CP14MagicEffect
+    magicType: Healing
+    manaCost: 10
+    telegraphyEffects:
+    - !type:CP14SpellSpawnEntityOnTarget
+      spawns:
+      - CP14ImpactEffectBloodPurification
+    effects:
+    - !type:CP14SpellSpawnEntityOnTarget
+      spawns:
+      - CP14ImpactEffectBloodPurification
+    - !type:CP14SpellApplyEntityEffect
+      effects:
+      - !type:HealthChange
+        damage:
+          types:
+            Poison: -10
+            Caustic: -10
+      - !type:Jitter
+      - !type:ModifyBleedAmount
+      - !type:ModifyBloodLevel
+        amount: 10
+  - type: CP14MagicEffectVerbalAspect
+    startSpeech: "Nella coda..."
+    endSpeech: "sta il veleno"
+  - type: CP14MagicEffectCastingVisual
+    proto: CP14RuneBloodPurification
+  - type: EntityTargetAction
+    whitelist:
+      components:
+      - MobState
+    range: 7
+    itemIconStyle: BigAction
+    interactOnMiss: false
+    sound: !type:SoundPathSpecifier
+      path: /Audio/Magic/rumble.ogg
+    icon:
+      sprite: _CP14/Effects/Magic/spells_icons.rsi
+      state: cure_poison
+    event: !type:CP14DelayedEntityTargetActionEvent
+      cooldown: 5
+      castDelay: 1.5
+      breakOnMove: false
+ 
+- type: entity
+  id: CP14RuneBloodPurification
+  parent: CP14BaseMagicRune
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: PointLight
+    color: "#328643"
+  - type: Sprite
+    layers:
+    - state: sun
+      color: "#79b330"
+      shader: unshaded
+    - state: double_outer
+      color: "#a1252f"
+      shader: unshaded
+
+- type: entity
+  id: CP14ImpactEffectBloodPurification
+  parent: CP14BaseMagicImpact
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: Sprite
+    layers:
+    - state: particles_up
+      color: "#79b330"
+      shader: unshaded
+
+- type: entity
+  parent: CP14BaseSpellScrollHealing
+  id: CP14SpellScrollBloodPurification
+  name: blood purification spell scroll
+  components:
+  - type: CP14SpellStorage
+    spells:
+    - CP14ActionSpellBloodPurification

Resources/Prototypes/_CP14/Entities/Actions/Spells/Healing/T0_cure_wounds.yml

@@ -1,7 +1,7 @@
 - type: entity
   id: CP14ActionSpellCureWounds
   name: Cure wounds
-  description: You touch the creature, healing its body from physical damage
+  description: You heal the target from physical damage
   components:
   - type: Sprite
     sprite: _CP14/Effects/Magic/spells_icons.rsi
@@ -10,7 +10,7 @@
     speedMultiplier: 0.5
   - type: CP14MagicEffect
     magicType: Healing
-    manaCost: 20
+    manaCost: 10
     telegraphyEffects:
     - !type:CP14SpellSpawnEntityOnTarget
       spawns:
@@ -27,15 +27,7 @@
             Slash: -10
             Blunt: -10
             Piercing: -10
-            Poison: -10
-            Caustic: -10
-            Cold: -10
-            Heat: -10
-            Shock: -10
       - !type:Jitter
-      - !type:ModifyBleedAmount
-      - !type:ModifyBloodLevel
-        amount: 5
   - type: CP14MagicEffectVerbalAspect
     startSpeech: "Et curabuntur..."
     endSpeech: "vulnera tua"
@@ -54,8 +46,8 @@
       sprite: _CP14/Effects/Magic/spells_icons.rsi
       state: cure_wounds
     event: !type:CP14DelayedEntityTargetActionEvent
-      cooldown: 10
-      castDelay: 3
+      cooldown: 5
+      castDelay: 1.5
       breakOnMove: false
  
 - type: entity

Resources/Prototypes/_CP14/Entities/Actions/Spells/Water/T0_ice_dagger.yml

@@ -73,9 +73,9 @@
   - type: MeleeWeapon
     damage:
       types:
-        Slash: 2
+        Slash: 5
         Piercing: 2
-        Cold: 2
+        Cold: 3
   - type: DamageOtherOnHit
     damage:
       types:

Resources/Prototypes/_CP14/Entities/Markers/Spawners/Random/Loot/spawners.yml

@@ -37,9 +37,10 @@
         - id: CP14SpellScrollIceShards
         - id: CP14SpellScrollIceDagger
         - id: CP14SpellScrollShadowGrab
-        - id: CP14SpellScrollManaGift
         - id: CP14SpellScrollSphereOfLight
         - id: CP14SpellScrollCureWounds
+        - id: CP14SpellScrollBloodPurification
+        - id: CP14SpellScrollCureBurn
         - id: CP14SpellScrollShadowStep
         - id: CP14SpellScrollFireball
         - id: CP14SpellScrollFlameCreation
@@ -47,6 +48,7 @@
         - id: CP14SpellScrollFlashLight
         - id: CP14SpellScrollWaterCreation
         - id: CP14SpellScrollBeerCreation
+          weight: 0.2
       - id: CP14EnergyCrystalSmall
       - id: CP14BaseSharpeningStone
       - id: CP14GlassShard

Resources/Prototypes/_CP14/Entities/Mobs/Species/base.yml

@@ -159,10 +159,10 @@
       collection: Punch
     angle: 30
     animation: WeaponArcFist
-    attackRate: 1
+    attackRate: 1.3
     damage:
       types:
-        Blunt: 5
+        Blunt: 3
   - type: SleepEmitSound
   - type: SSDIndicator
   - type: StandingState

Resources/Prototypes/_CP14/Entities/Mobs/Species/zombie.yml

@@ -114,8 +114,8 @@
       path: /Audio/Effects/bite.ogg
     damage:
       types:
-        Slash: 4
-        Structural: 4
+        Slash: 5
+        Structural: 6
   - type: Pullable
   - type: SpamEmitSound
     minInterval: 10

Resources/Prototypes/_CP14/Entities/Objects/Tools/flashlight.yml

@@ -20,12 +20,12 @@
     slots:
     - belt
   - type: MeleeWeapon
-    attackRate: 0.7
+    attackRate: 0.6
     wideAnimationRotation: 10
     wideAnimation: CP14WeaponArcSlash
     damage:
       types:
-        Blunt: 3
+        Blunt: 8
     soundHit:
       collection: MetalThud
     cPAnimationLength: 0.25

Resources/Prototypes/_CP14/Entities/Objects/Tools/scissors.yml

@@ -24,6 +24,6 @@
     attackRate: 1
     damage:
       types:
-        Piercing: 6
+        Piercing: 7
     soundHit:
       path: "/Audio/Weapons/bladeslice.ogg"

Resources/Prototypes/_CP14/Entities/Objects/Tools/torch.yml

@@ -74,9 +74,16 @@
     hideCaution: true
   - type: MeleeWeapon
     attackRate: 1.5
-    wideAnimationRotation: 225
+    wideAnimationRotation: 240
     wideAnimation: CP14WeaponArcSlash
     damage:
       types:
         Blunt: 4
-  - type: CP14FlammableBonusDamage
+  - type: CP14FlammableBonusDamage
+  - type: UseDelay
+  - type: ExtinguishOnInteract
+    extinguishAttemptSound:
+      path: /Audio/Items/candle_blowing.ogg #TODO sound
+      params:
+        variation: 0.05
+        volume: 10

Resources/Prototypes/_CP14/Entities/Objects/Weapons/Magic/twoHandedStaffs.yml

@@ -24,7 +24,7 @@
   - type: IncreaseDamageOnWield
     damage:
       types: 
-        Blunt: 4
+        Blunt: 6
   - type: MeleeWeapon
     angle: 100
     attackRate: 1.3
@@ -33,21 +33,23 @@
     wideAnimation: CP14WeaponArcSlash
     damage:
       types:
-        Blunt: 4
+        Blunt: 6
     soundHit:
       collection: MetalThud
     cPAnimationLength: 0.3
     cPAnimationOffset: -1.3
-  #- type: CP14SpellStorageRequireAttune
-  #- type: CP14MagicAttuningItem
+  - type: CP14SpellStorageRequireAttune
+  - type: CP14MagicAttuningItem
   - type: CP14SpellStorageAccessHolding
   - type: CP14SpellStorage
     spells:
     - CP14ActionSpellCureWounds
+    - CP14ActionSpellCureBurn
+    - CP14ActionSpellBloodPurification
     - CP14ActionSpellResurrection
-  #- type: CP14MagicManacostModify
-  #  modifiers:
-  #   Healing: 1.1
+  - type: CP14MagicManacostModify
+    modifiers:
+     Healing: 1.4
   - type: CP14MagicEnergyExaminable
   - type: CP14MagicEnergyContainer
     energy: 80

Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/Tools/crowbar.yml

@@ -17,7 +17,7 @@
     wideAnimationRotation: -135
     damage:
       types:
-        Blunt: 4
+        Blunt: 7
     soundHit:
       collection: MetalThud
   - type: Tool

Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/Tools/hoe.yml

@@ -15,8 +15,8 @@
     wideAnimationRotation: 65
     damage:
       types:
-        Piercing: 2
-        Slash: 2
+        Piercing: 4
+        Slash: 3
     soundHit:
       collection: MetalThud
   - type: Item

Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/Tools/janitor.yml

@@ -19,7 +19,7 @@
     wideAnimationRotation: 10
     damage:
       types:
-        Blunt: 2
+        Blunt: 7
     soundHit:
       collection: MetalThud
   - type: Wieldable
@@ -56,7 +56,7 @@
     wideAnimationRotation: 10
     damage:
       types:
-        Blunt: 2
+        Blunt: 5
     soundHit:
       collection: MetalThud
   - type: CP14DecalCleaner

Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/Tools/pickaxe.yml

@@ -22,13 +22,13 @@
     wideAnimationRotation: 135
     damage:
       types:
-        Piercing: 5
+        Piercing: 8
     soundHit:
       collection: MetalThud
   - type: IncreaseDamageOnWield
     damage:
       groups:
-        Brute: 5
+        Brute: 8
       types:
         Structural: 10
   - type: Wieldable

Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/Tools/shovel.yml

@@ -20,7 +20,7 @@
     wideAnimationRotation: 65
     damage:
       types:
-        Blunt: 5
+        Blunt: 6
         Slash: 2
     soundHit:
       collection: MetalThud

Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/Tools/wrench.yml

@@ -25,7 +25,7 @@
     attackRate: 1.5
     damage:
       types:
-        Blunt: 2.5
+        Blunt: 6
     soundHit:
       collection: MetalThud
   - type: Tool

Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/battleStaff.yml

@@ -24,7 +24,7 @@
   - type: IncreaseDamageOnWield
     damage:
       types: 
-        Blunt: 3
+        Blunt: 8
   - type: MeleeWeapon
     angle: 100
     attackRate: 1.3
@@ -33,7 +33,7 @@
     wideAnimation: CP14WeaponArcSlash
     damage:
       types:
-        Blunt: 3
+        Blunt: 8
     soundHit:
       collection: MetalThud
     cPAnimationLength: 0.3

Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/dagger.yml

@@ -35,8 +35,8 @@
     wideAnimation: CP14WeaponArcSlash
     damage:
       types:
-        Slash: 3
-        Piercing: 3
+        Slash: 5
+        Piercing: 5
     soundHit:
       collection: MetalThud
     cPAnimationLength: 0.15

Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/handheldAxe.yml

@@ -24,7 +24,7 @@
     wideAnimation: CP14WeaponArcSlash
     damage:
       types:
-        Slash: 6
+        Slash: 12
     soundHit:
       collection: MetalThud
     cPAnimationLength: 0.25

Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/lightHammer.yml

@@ -33,7 +33,7 @@
     cPAnimationLength: 0.18
     damage:
       types:
-        Blunt: 5
+        Blunt: 9
     soundHit:
       collection: MetalThud
   - type: StaminaDamageOnHit

Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/mace.yml

@@ -31,8 +31,8 @@
     wideAnimation: CP14WeaponArcSlash
     damage:
       types:
-        Blunt: 8
-        Piercing: 2
+        Blunt: 15
+        Piercing: 4
     soundHit:
       collection: MetalThud
     cPAnimationLength: 0.25

Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/shield.yml

@@ -47,7 +47,7 @@
     wideAnimation: CP14WeaponArcSlash
     damage:
       types:
-        Blunt: 3
+        Blunt: 6
     soundHit:
       collection: MetalThud
     cPAnimationLength: 0.3

Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/sickle.yml

@@ -33,8 +33,8 @@
     cPAnimationLength: 0.18
     damage:
       types:
-        Slash: 4
-        Piercing: 2
+        Slash: 7
+        Piercing: 3
     soundHit:
       collection: MetalThud
   - type: Tag

Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/spear.yml

@@ -26,7 +26,7 @@
     wideAnimation: CP14WeaponArcThrust
     damage:
       types:
-        Piercing: 8
+        Piercing: 15
     soundHit:
       collection: MetalThud
     cPAnimationLength: 0.25

Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/sword.yml

@@ -30,7 +30,7 @@
     cPAnimationLength: 0.18
     damage:
       types:
-        Slash: 9
+        Slash: 17
     soundHit:
       collection: MetalThud
   - type: CP14SkillRequirement

Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/twoHandedSword.yml

@@ -27,8 +27,8 @@
     wideAnimation: CP14WeaponArcSlash
     damage:
       types:
-        Slash: 4
-        Blunt: 3
+        Slash: 5
+        Blunt: 4
         Structural: 1
     soundHit:
       collection: MetalThud
@@ -37,8 +37,8 @@
   - type: IncreaseDamageOnWield
     damage:
       types:
-        Slash: 7
-        Blunt: 2
+        Slash: 12
+        Blunt: 4
         Structural: 3
   - type: Item
     size: Ginormous

Resources/Prototypes/_CP14/Loadouts/Jobs/general.yml

@@ -412,6 +412,8 @@
   loadouts:
   - CP14ActionSpellFlameCreation
   - CP14ActionSpellCureWounds
+  - CP14ActionSpellCureBurn
+  - CP14ActionSpellBloodPurification
   - CP14ActionSpellSphereOfLight
   - CP14ActionSpellManaConsume
   - CP14ActionSpellManaGift
@@ -432,6 +434,19 @@
   actions:
   - CP14ActionSpellCureWounds
 
+- type: loadout
+  id: CP14ActionSpellCureBurn
+  dummyEntity: CP14ActionSpellCureBurn
+  actions:
+  - CP14ActionSpellCureBurn
+
+
+- type: loadout
+  id: CP14ActionSpellBloodPurification
+  dummyEntity: CP14ActionSpellBloodPurification
+  actions:
+  - CP14ActionSpellBloodPurification
+
 - type: loadout
   id: CP14ActionSpellSphereOfLight
   dummyEntity: CP14ActionSpellSphereOfLight

Resources/Textures/_CP14/Effects/Magic/spells_icons.rsi/meta.json

@@ -5,11 +5,17 @@
     "y": 32
   },
   "license": "CLA",
-  "copyright": "Created by .kreks., mana_gift and resurrection by TheShuEd",
+  "copyright": "Created by .kreks., cure_poison, cure_burn, mana_gift, water creation, beer creation and resurrection by TheShuEd",
   "states": [
     {
       "name": "beer_creation"
     },
+    {
+      "name": "cure_burn"
+    },
+    {
+      "name": "cure_poison"
+    },
     {
       "name": "cure_wounds"
     },