From c432a0b719e06ce3fec3b60bfbc96722ab2058f7 Mon Sep 17 00:00:00 2001 From: UncomfySilence Date: Sat, 8 Oct 2022 22:09:21 +0200 Subject: [PATCH] rings and necks --- assets/common/items/armor/cultist/necklace.ron | 4 ++-- assets/common/items/armor/cultist/ring.ron | 8 ++++---- assets/common/items/armor/misc/neck/amethyst.ron | 3 ++- assets/common/items/armor/misc/neck/ankh_of_life.ron | 2 +- assets/common/items/armor/misc/neck/carcanet_of_wrath.ron | 2 +- assets/common/items/armor/misc/neck/diamond.ron | 4 ++-- assets/common/items/armor/misc/neck/emerald.ron | 4 ++-- assets/common/items/armor/misc/neck/fang.ron | 1 + assets/common/items/armor/misc/neck/gold.ron | 5 ++--- assets/common/items/armor/misc/neck/honeycomb_pendant.ron | 1 + assets/common/items/armor/misc/neck/ruby.ron | 4 ++-- assets/common/items/armor/misc/neck/sapphire.ron | 3 ++- assets/common/items/armor/misc/neck/topaz.ron | 3 ++- assets/common/items/armor/misc/ring/amethyst.ron | 1 + assets/common/items/armor/misc/ring/diamond.ron | 2 +- assets/common/items/armor/misc/ring/gold.ron | 3 +-- assets/common/items/armor/misc/ring/ruby.ron | 2 +- assets/common/items/armor/misc/ring/sapphire.ron | 3 ++- assets/common/items/armor/misc/ring/scratched.ron | 2 +- assets/common/items/armor/misc/ring/topaz.ron | 1 + 20 files changed, 32 insertions(+), 26 deletions(-) diff --git a/assets/common/items/armor/cultist/necklace.ron b/assets/common/items/armor/cultist/necklace.ron index e33300f2e1..1fb6a492ff 100644 --- a/assets/common/items/armor/cultist/necklace.ron +++ b/assets/common/items/armor/cultist/necklace.ron @@ -6,8 +6,8 @@ ItemDef( stats: Direct(( protection: Some(Normal(2.0)), energy_max: Some(4.5), - energy_reward: Some(0.05), - crit_power: Some(0.03), + energy_reward: Some(0.0275), + crit_power: Some(0.015), )), )), quality: Epic, diff --git a/assets/common/items/armor/cultist/ring.ron b/assets/common/items/armor/cultist/ring.ron index 2114360af3..bab00ee455 100644 --- a/assets/common/items/armor/cultist/ring.ron +++ b/assets/common/items/armor/cultist/ring.ron @@ -4,10 +4,10 @@ ItemDef( kind: Armor(( kind: Ring, stats: Direct(( - protection: Some(Normal(1.0)), - energy_max: Some(5), - energy_reward: Some(0.025), - crit_power: Some(0.02), + protection: Some(Normal(0.5)), + energy_max: Some(2.5), + energy_reward: Some(0.0125), + crit_power: Some(0.01), )), )), quality: Epic, diff --git a/assets/common/items/armor/misc/neck/amethyst.ron b/assets/common/items/armor/misc/neck/amethyst.ron index 81a3ac3a38..d19c188aed 100644 --- a/assets/common/items/armor/misc/neck/amethyst.ron +++ b/assets/common/items/armor/misc/neck/amethyst.ron @@ -5,7 +5,8 @@ ItemDef( kind: Neck, stats: Direct(( protection: Some(Normal(1.0)), - energy_reward: Some(0.1), + energy_reward: Some(0.075), + crit_power: Some(-0.03), )), )), quality: Moderate, diff --git a/assets/common/items/armor/misc/neck/ankh_of_life.ron b/assets/common/items/armor/misc/neck/ankh_of_life.ron index 4714ec38b5..0f8d31f157 100644 --- a/assets/common/items/armor/misc/neck/ankh_of_life.ron +++ b/assets/common/items/armor/misc/neck/ankh_of_life.ron @@ -5,7 +5,7 @@ ItemDef( kind: Neck, stats: Direct(( protection: Some(Normal(2.0)), - energy_max: Some(20), + energy_max: Some(15.0), energy_reward: Some(0.1), )), )), diff --git a/assets/common/items/armor/misc/neck/carcanet_of_wrath.ron b/assets/common/items/armor/misc/neck/carcanet_of_wrath.ron index 8b1486c01a..1211d0a123 100644 --- a/assets/common/items/armor/misc/neck/carcanet_of_wrath.ron +++ b/assets/common/items/armor/misc/neck/carcanet_of_wrath.ron @@ -5,7 +5,7 @@ ItemDef( kind: Neck, stats: Direct(( protection: Some(Normal(2.0)), - crit_power: Some(0.2), + crit_power: Some(0.15), )), )), quality: Legendary, diff --git a/assets/common/items/armor/misc/neck/diamond.ron b/assets/common/items/armor/misc/neck/diamond.ron index c9205e0040..4c610b6a23 100644 --- a/assets/common/items/armor/misc/neck/diamond.ron +++ b/assets/common/items/armor/misc/neck/diamond.ron @@ -5,8 +5,8 @@ ItemDef( kind: Neck, stats: Direct(( protection: Some(Normal(1.0)), - energy_reward: Some(-0.1), - crit_power: Some(0.1), + energy_reward: Some(-0.0375), + crit_power: Some(0.075), )), )), quality: Epic, diff --git a/assets/common/items/armor/misc/neck/emerald.ron b/assets/common/items/armor/misc/neck/emerald.ron index f51c350166..643898642e 100644 --- a/assets/common/items/armor/misc/neck/emerald.ron +++ b/assets/common/items/armor/misc/neck/emerald.ron @@ -5,8 +5,8 @@ ItemDef( kind: Neck, stats: Direct(( protection: Some(Normal(1.0)), - energy_max: Some(20.0), - energy_reward: Some(-0.2), + energy_max: Some(15.0), + energy_reward: Some(-0.15), )), )), quality: Epic, diff --git a/assets/common/items/armor/misc/neck/fang.ron b/assets/common/items/armor/misc/neck/fang.ron index 67c0c44825..3606ff99aa 100644 --- a/assets/common/items/armor/misc/neck/fang.ron +++ b/assets/common/items/armor/misc/neck/fang.ron @@ -6,6 +6,7 @@ ItemDef( stats: Direct(( protection: Some(Normal(1.0)), crit_power: Some(0.07), + energy_max: Some(-35.0), )), )), quality: High, diff --git a/assets/common/items/armor/misc/neck/gold.ron b/assets/common/items/armor/misc/neck/gold.ron index 30a176d7a2..0aa36f6a93 100644 --- a/assets/common/items/armor/misc/neck/gold.ron +++ b/assets/common/items/armor/misc/neck/gold.ron @@ -1,12 +1,11 @@ +// Note: Will be used to craft other necklaces, acting as the base. ItemDef( name: "Gold Necklace", description: "An expensive gold necklace... looks stolen.", kind: Armor(( kind: Neck, stats: Direct(( - protection: Some(Normal(1.0)), - energy_max: Some(10), - crit_power: Some(0.02), + protection: Some(Normal(1.5)), )), )), quality: Moderate, diff --git a/assets/common/items/armor/misc/neck/honeycomb_pendant.ron b/assets/common/items/armor/misc/neck/honeycomb_pendant.ron index 5e8823efaa..ac1e1d43d8 100644 --- a/assets/common/items/armor/misc/neck/honeycomb_pendant.ron +++ b/assets/common/items/armor/misc/neck/honeycomb_pendant.ron @@ -7,6 +7,7 @@ ItemDef( protection: Some(Normal(1.0)), energy_max: Some(8.0), energy_reward: Some(0.04), + crit_power: Some(-0.06), )), )), quality: Moderate, diff --git a/assets/common/items/armor/misc/neck/ruby.ron b/assets/common/items/armor/misc/neck/ruby.ron index 29ba6d2b52..118bd9678a 100644 --- a/assets/common/items/armor/misc/neck/ruby.ron +++ b/assets/common/items/armor/misc/neck/ruby.ron @@ -5,8 +5,8 @@ ItemDef( kind: Neck, stats: Direct(( protection: Some(Normal(1.0)), - energy_reward: Some(0.2), - crit_power: Some(-0.06), + energy_reward: Some(0.1125), + crit_power: Some(-0.045), )), )), quality: Epic, diff --git a/assets/common/items/armor/misc/neck/sapphire.ron b/assets/common/items/armor/misc/neck/sapphire.ron index 198bcc31f1..fdf8a72443 100644 --- a/assets/common/items/armor/misc/neck/sapphire.ron +++ b/assets/common/items/armor/misc/neck/sapphire.ron @@ -5,7 +5,8 @@ ItemDef( kind: Neck, stats: Direct(( protection: Some(Normal(1.0)), - crit_power: Some(0.05), + energy_reward: Some(-0.0225), + crit_power: Some(0.0225), )), )), quality: Moderate, diff --git a/assets/common/items/armor/misc/neck/topaz.ron b/assets/common/items/armor/misc/neck/topaz.ron index 24f0ee63f1..b07177b5e5 100644 --- a/assets/common/items/armor/misc/neck/topaz.ron +++ b/assets/common/items/armor/misc/neck/topaz.ron @@ -5,7 +5,8 @@ ItemDef( kind: Neck, stats: Direct(( protection: Some(Normal(0.5)), - energy_max: Some(6.0), + energy_max: Some(9.0), + energy_reward: Some(-0.09), )), )), quality: Common, diff --git a/assets/common/items/armor/misc/ring/amethyst.ron b/assets/common/items/armor/misc/ring/amethyst.ron index 5bf40bdc66..0da3bc471f 100644 --- a/assets/common/items/armor/misc/ring/amethyst.ron +++ b/assets/common/items/armor/misc/ring/amethyst.ron @@ -6,6 +6,7 @@ ItemDef( stats: Direct(( protection: Some(Normal(0.5)), energy_reward: Some(0.05), + crit_power: Some(-0.02), )), )), quality: Moderate, diff --git a/assets/common/items/armor/misc/ring/diamond.ron b/assets/common/items/armor/misc/ring/diamond.ron index 039f5e8e9f..125334d1a6 100644 --- a/assets/common/items/armor/misc/ring/diamond.ron +++ b/assets/common/items/armor/misc/ring/diamond.ron @@ -5,7 +5,7 @@ ItemDef( kind: Ring, stats: Direct(( protection: Some(Normal(0.5)), - energy_reward: Some(-0.05), + energy_reward: Some(-0.025), crit_power: Some(0.05), )), )), diff --git a/assets/common/items/armor/misc/ring/gold.ron b/assets/common/items/armor/misc/ring/gold.ron index b2fe733f37..deafab94c0 100644 --- a/assets/common/items/armor/misc/ring/gold.ron +++ b/assets/common/items/armor/misc/ring/gold.ron @@ -1,3 +1,4 @@ +// Note: Will be used to craft other rings, acting as the base. ItemDef( name: "Gold Ring", description: "A plain gold ring... almost as if it is missing a gem.", @@ -5,8 +6,6 @@ ItemDef( kind: Ring, stats: Direct(( protection: Some(Normal(0.5)), - energy_max: Some(5), - crit_power: Some(0.01), )), )), quality: Moderate, diff --git a/assets/common/items/armor/misc/ring/ruby.ron b/assets/common/items/armor/misc/ring/ruby.ron index 5cc8c85b7c..fec5d08886 100644 --- a/assets/common/items/armor/misc/ring/ruby.ron +++ b/assets/common/items/armor/misc/ring/ruby.ron @@ -5,7 +5,7 @@ ItemDef( kind: Ring, stats: Direct(( protection: Some(Normal(0.5)), - energy_reward: Some(0.1), + energy_reward: Some(0.075), crit_power: Some(-0.03), )), )), diff --git a/assets/common/items/armor/misc/ring/sapphire.ron b/assets/common/items/armor/misc/ring/sapphire.ron index 230e991bef..c7b2d89ea9 100644 --- a/assets/common/items/armor/misc/ring/sapphire.ron +++ b/assets/common/items/armor/misc/ring/sapphire.ron @@ -5,7 +5,8 @@ ItemDef( kind: Ring, stats: Direct(( protection: Some(Normal(0.5)), - crit_power: Some(0.025), + energy_reward: Some(-0.015), + crit_power: Some(0.015), )), )), quality: Moderate, diff --git a/assets/common/items/armor/misc/ring/scratched.ron b/assets/common/items/armor/misc/ring/scratched.ron index a2703e9dd1..728ff3847f 100644 --- a/assets/common/items/armor/misc/ring/scratched.ron +++ b/assets/common/items/armor/misc/ring/scratched.ron @@ -4,7 +4,7 @@ ItemDef( kind: Armor(( kind: Ring, stats: Direct(( - protection: Some(Normal(0.5)), + protection: Some(Normal(0.25)), )), )), quality: Low, diff --git a/assets/common/items/armor/misc/ring/topaz.ron b/assets/common/items/armor/misc/ring/topaz.ron index 91e61a20c7..4d16e19a8b 100644 --- a/assets/common/items/armor/misc/ring/topaz.ron +++ b/assets/common/items/armor/misc/ring/topaz.ron @@ -6,6 +6,7 @@ ItemDef( stats: Direct(( protection: Some(Normal(0.5)), energy_max: Some(5.0), + energy_reward: Some(-0.05), )), )), quality: Moderate,