diff --git a/assets/common/abilities/staff/fireshockwave.ron b/assets/common/abilities/staff/fireshockwave.ron index 36671dc626..f52f693179 100644 --- a/assets/common/abilities/staff/fireshockwave.ron +++ b/assets/common/abilities/staff/fireshockwave.ron @@ -1,9 +1,9 @@ Shockwave( - energy_cost: 60.0, - buildup_duration: 0.7, + energy_cost: 50.0, + buildup_duration: 0.5, swing_duration: 0.1, recover_duration: 0.2, - damage: 20.0, + damage: 15.0, poise_damage: 0, knockback: ( strength: 25.0, direction: Away), shockwave_angle: 360.0, diff --git a/assets/common/abilities/sword/spin.ron b/assets/common/abilities/sword/spin.ron index 8509c6a9b4..e0d146db98 100644 --- a/assets/common/abilities/sword/spin.ron +++ b/assets/common/abilities/sword/spin.ron @@ -2,7 +2,7 @@ SpinMelee( buildup_duration: 0.35, swing_duration: 0.4, recover_duration: 0.5, - base_damage: 16.0, + base_damage: 13.0, base_poise_damage: 13, knockback: ( strength: 10.0, direction: Away), range: 3.5, @@ -12,7 +12,7 @@ SpinMelee( strength: DamageFraction(0.1), chance: 0.1, ))), - energy_cost: 15.0, + energy_cost: 20.0, is_infinite: false, movement_behavior: ForwardGround, is_interruptible: true, diff --git a/assets/common/items/armor/cultist/bandana.ron b/assets/common/items/armor/cultist/bandana.ron index 35ee5a83a2..3d61fbdeff 100644 --- a/assets/common/items/armor/cultist/bandana.ron +++ b/assets/common/items/armor/cultist/bandana.ron @@ -4,11 +4,11 @@ ItemDef( kind: Armor(( kind: Head("Cultist"), stats: ( - protection: Normal(12.0), - poise_resilience: Normal(2.0), - energy_max: 5.0, - energy_reward: 0.03, - crit_power: 0.04, + protection: Normal(8.0), + poise_resilience: Normal(1.0), + energy_max: 2.0, + energy_reward: 0.025, + crit_power: 0.01, stealth: 0.04, ), )), diff --git a/assets/common/items/armor/cultist/chest.ron b/assets/common/items/armor/cultist/chest.ron index dfbc93f4e6..9f36b2cec3 100644 --- a/assets/common/items/armor/cultist/chest.ron +++ b/assets/common/items/armor/cultist/chest.ron @@ -4,8 +4,8 @@ ItemDef( kind: Armor(( kind: Chest("Cultist"), stats: ( - protection: Normal(48.0), - poise_resilience: Normal(6.0), + protection: Normal(44.0), + poise_resilience: Normal(5.0), energy_max: 13.5, energy_reward: 0.135, crit_power: 0.125, diff --git a/assets/common/items/armor/cultist/necklace.ron b/assets/common/items/armor/cultist/necklace.ron index fd8ee0af28..8c6ef29de1 100644 --- a/assets/common/items/armor/cultist/necklace.ron +++ b/assets/common/items/armor/cultist/necklace.ron @@ -6,9 +6,9 @@ ItemDef( stats: ( protection: Normal(2.0), poise_resilience: Normal(0.0), - energy_max: 10, + energy_max: 4.5, energy_reward: 0.05, - crit_power: 0.06, + crit_power: 0.03, stealth: 0.0, ), )), diff --git a/assets/common/items/armor/cultist/pants.ron b/assets/common/items/armor/cultist/pants.ron index 540855b886..dd6c8fee97 100644 --- a/assets/common/items/armor/cultist/pants.ron +++ b/assets/common/items/armor/cultist/pants.ron @@ -4,7 +4,7 @@ ItemDef( kind: Armor(( kind: Pants("Cultist"), stats: ( - protection: Normal(32.0), + protection: Normal(30.0), poise_resilience: Normal(4.0), energy_max: 9.0, energy_reward: 0.1, diff --git a/assets/common/items/armor/cultist/shoulder.ron b/assets/common/items/armor/cultist/shoulder.ron index d9334b5866..4df3a2877f 100644 --- a/assets/common/items/armor/cultist/shoulder.ron +++ b/assets/common/items/armor/cultist/shoulder.ron @@ -4,7 +4,7 @@ ItemDef( kind: Armor(( kind: Shoulder("Cultist"), stats: ( - protection: Normal(32.0), + protection: Normal(30.0), poise_resilience: Normal(5.0), energy_max: 9.0, energy_reward: 0.1, diff --git a/assets/common/items/armor/misc/head/crown.ron b/assets/common/items/armor/misc/head/crown.ron index aec605b2a3..3d75d5a2b1 100644 --- a/assets/common/items/armor/misc/head/crown.ron +++ b/assets/common/items/armor/misc/head/crown.ron @@ -5,13 +5,13 @@ ItemDef( kind: Head("Crown"), stats: ( protection: Normal(12.0), - poise_resilience: Normal(0.0), - energy_max: 9.0, + poise_resilience: Normal(2.0), + energy_max: 5.0, energy_reward: 0.1, - crit_power: 0.12, + crit_power: 0.1, stealth: 0.0, ), )), - quality: Common, + quality: Epic, tags: [], ) diff --git a/assets/common/items/armor/misc/head/helmet.ron b/assets/common/items/armor/misc/head/helmet.ron index 79d40e3194..dc4410a79a 100644 --- a/assets/common/items/armor/misc/head/helmet.ron +++ b/assets/common/items/armor/misc/head/helmet.ron @@ -12,6 +12,6 @@ ItemDef( stealth: 0.0, ), )), - quality: Common, + quality: Moderate, tags: [], ) diff --git a/assets/common/items/armor/misc/head/hog_hood.ron b/assets/common/items/armor/misc/head/hog_hood.ron index 9cf10a7c0c..731c3f3d30 100644 --- a/assets/common/items/armor/misc/head/hog_hood.ron +++ b/assets/common/items/armor/misc/head/hog_hood.ron @@ -12,6 +12,6 @@ ItemDef( stealth: 0.0335, ), )), - quality: Common, + quality: Moderate, tags: [], ) diff --git a/assets/common/items/armor/misc/head/hood.ron b/assets/common/items/armor/misc/head/hood.ron index ae81f20d79..42e78d566a 100644 --- a/assets/common/items/armor/misc/head/hood.ron +++ b/assets/common/items/armor/misc/head/hood.ron @@ -4,14 +4,14 @@ ItemDef( kind: Armor(( kind: Head("Hood"), stats: ( - protection: Normal(8.0), + protection: Normal(6.0), poise_resilience: Normal(1.0), energy_max: 0, energy_reward: 0.0, - crit_power: 0.0, + crit_power: 0.04, stealth: 0.12, ), )), - quality: Common, + quality: Moderate, tags: [], ) diff --git a/assets/common/items/armor/misc/head/mitre.ron b/assets/common/items/armor/misc/head/mitre.ron index 7d3c3a7963..2834610599 100644 --- a/assets/common/items/armor/misc/head/mitre.ron +++ b/assets/common/items/armor/misc/head/mitre.ron @@ -4,14 +4,14 @@ ItemDef( kind: Armor(( kind: Head("Mitre"), stats: ( - protection: Normal(0.0), + protection: Normal(4.0), poise_resilience: Normal(0.0), - energy_max: 11.0, + energy_max: 8.0, energy_reward: 0.12, crit_power: 0.1, stealth: 0.0, ), )), - quality: Common, + quality: High, tags: [], ) diff --git a/assets/common/items/armor/misc/head/spikeguard.ron b/assets/common/items/armor/misc/head/spikeguard.ron index 329c323a52..dc0adc36d9 100644 --- a/assets/common/items/armor/misc/head/spikeguard.ron +++ b/assets/common/items/armor/misc/head/spikeguard.ron @@ -4,7 +4,7 @@ ItemDef( kind: Armor(( kind: Head("Spikeguard"), stats: ( - protection: Normal(0.0), + protection: Normal(2.0), poise_resilience: Normal(10.0), energy_max: 0, energy_reward: 0.0, diff --git a/assets/common/items/armor/misc/head/straw.ron b/assets/common/items/armor/misc/head/straw.ron index b55de61781..d5fafbd17d 100644 --- a/assets/common/items/armor/misc/head/straw.ron +++ b/assets/common/items/armor/misc/head/straw.ron @@ -6,8 +6,8 @@ ItemDef( stats: ( protection: Normal(0.0), poise_resilience: Normal(0.0), - energy_max: 0, - energy_reward: 0.0, + energy_max: 4, + energy_reward: 0.04, crit_power: 0.0, stealth: 0.0, ), diff --git a/assets/common/items/armor/misc/head/wanderers_hat.ron b/assets/common/items/armor/misc/head/wanderers_hat.ron index 46b99bb683..9676c2b150 100644 --- a/assets/common/items/armor/misc/head/wanderers_hat.ron +++ b/assets/common/items/armor/misc/head/wanderers_hat.ron @@ -12,6 +12,6 @@ ItemDef( stealth: 0.025, ), )), - quality: Common, + quality: High, tags: [], )