Update

2024-11-15 12:07:15 -05:00 · 2024-11-15 12:07:15 -05:00 · d1e7d66dda
commit d1e7d66dda
parent 38fd93c617
120 changed files with 1185 additions and 255 deletions
--- a/Cargo.lock
+++ b/Cargo.lock
@ -1677,6 +1677,12 @@ dependencies = [
 "simd-adler32",
 ]

+[[package]]
+name = "mint"
+version = "0.5.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e53debba6bda7a793e5f99b8dacf19e626084f525f7829104ba9898f367d85ff"
+
 [[package]]
 name = "mio"
 version = "1.0.2"
@ -3131,6 +3137,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "86dce3b89992dbfee9b6f46d8a98a4a5ecf79f93f3b077fad3cc2759ebe92214"
 dependencies = [
 "approx",
+ "mint",
 "num-integer",
 "num-traits",
 "rustc_version",
@ -3140,7 +3147,7 @@ dependencies = [
 [[package]]
 name = "veloren-client"
 version = "0.16.0"
-source = "git+https://gitlab.com/veloren/veloren?tag=weekly#2dd493e3bc2fc0b274e48e283e9476c7178594d2"
+source = "git+https://gitlab.com/veloren/veloren?tag=weekly#736665224668da63e2299adbd20b109aa0a78e61"
 dependencies = [
 "authc",
 "byteorder",
@ -3166,7 +3173,7 @@ dependencies = [
 [[package]]
 name = "veloren-client-i18n"
 version = "0.13.0"
-source = "git+https://gitlab.com/veloren/veloren?tag=weekly#2dd493e3bc2fc0b274e48e283e9476c7178594d2"
+source = "git+https://gitlab.com/veloren/veloren?tag=weekly#736665224668da63e2299adbd20b109aa0a78e61"
 dependencies = [
 "deunicode",
 "fluent",
@ -3184,7 +3191,7 @@ dependencies = [
 [[package]]
 name = "veloren-common"
 version = "0.10.0"
-source = "git+https://gitlab.com/veloren/veloren?tag=weekly#2dd493e3bc2fc0b274e48e283e9476c7178594d2"
+source = "git+https://gitlab.com/veloren/veloren?tag=weekly#736665224668da63e2299adbd20b109aa0a78e61"
 dependencies = [
 "approx",
 "bitflags 2.6.0",
@ -3224,7 +3231,7 @@ dependencies = [
 [[package]]
 name = "veloren-common-assets"
 version = "0.10.0"
-source = "git+https://gitlab.com/veloren/veloren?tag=weekly#2dd493e3bc2fc0b274e48e283e9476c7178594d2"
+source = "git+https://gitlab.com/veloren/veloren?tag=weekly#736665224668da63e2299adbd20b109aa0a78e61"
 dependencies = [
 "assets_manager",
 "dot_vox",
@ -3239,7 +3246,7 @@ dependencies = [
 [[package]]
 name = "veloren-common-base"
 version = "0.10.0"
-source = "git+https://gitlab.com/veloren/veloren?tag=weekly#2dd493e3bc2fc0b274e48e283e9476c7178594d2"
+source = "git+https://gitlab.com/veloren/veloren?tag=weekly#736665224668da63e2299adbd20b109aa0a78e61"
 dependencies = [
 "directories-next",
 "tracing",
@ -3248,7 +3255,7 @@ dependencies = [
 [[package]]
 name = "veloren-common-ecs"
 version = "0.10.0"
-source = "git+https://gitlab.com/veloren/veloren?tag=weekly#2dd493e3bc2fc0b274e48e283e9476c7178594d2"
+source = "git+https://gitlab.com/veloren/veloren?tag=weekly#736665224668da63e2299adbd20b109aa0a78e61"
 dependencies = [
 "specs",
 "tracing",
@ -3258,7 +3265,7 @@ dependencies = [
 [[package]]
 name = "veloren-common-i18n"
 version = "0.1.0"
-source = "git+https://gitlab.com/veloren/veloren?tag=weekly#2dd493e3bc2fc0b274e48e283e9476c7178594d2"
+source = "git+https://gitlab.com/veloren/veloren?tag=weekly#736665224668da63e2299adbd20b109aa0a78e61"
 dependencies = [
 "hashbrown 0.14.5",
 "rand",
@ -3268,7 +3275,7 @@ dependencies = [
 [[package]]
 name = "veloren-common-net"
 version = "0.10.0"
-source = "git+https://gitlab.com/veloren/veloren?tag=weekly#2dd493e3bc2fc0b274e48e283e9476c7178594d2"
+source = "git+https://gitlab.com/veloren/veloren?tag=weekly#736665224668da63e2299adbd20b109aa0a78e61"
 dependencies = [
 "bincode",
 "flate2",
@ -3286,7 +3293,7 @@ dependencies = [
 [[package]]
 name = "veloren-common-state"
 version = "0.10.0"
-source = "git+https://gitlab.com/veloren/veloren?tag=weekly#2dd493e3bc2fc0b274e48e283e9476c7178594d2"
+source = "git+https://gitlab.com/veloren/veloren?tag=weekly#736665224668da63e2299adbd20b109aa0a78e61"
 dependencies = [
 "async-trait",
 "bytes",
@ -3308,7 +3315,7 @@ dependencies = [
 [[package]]
 name = "veloren-common-systems"
 version = "0.10.0"
-source = "git+https://gitlab.com/veloren/veloren?tag=weekly#2dd493e3bc2fc0b274e48e283e9476c7178594d2"
+source = "git+https://gitlab.com/veloren/veloren?tag=weekly#736665224668da63e2299adbd20b109aa0a78e61"
 dependencies = [
 "itertools",
 "ordered-float",
@ -3326,7 +3333,7 @@ dependencies = [
 [[package]]
 name = "veloren-network"
 version = "0.3.0"
-source = "git+https://gitlab.com/veloren/veloren?tag=weekly#2dd493e3bc2fc0b274e48e283e9476c7178594d2"
+source = "git+https://gitlab.com/veloren/veloren?tag=weekly#736665224668da63e2299adbd20b109aa0a78e61"
 dependencies = [
 "async-channel",
 "async-trait",
@ -3351,7 +3358,7 @@ dependencies = [
 [[package]]
 name = "veloren-network-protocol"
 version = "0.6.1"
-source = "git+https://gitlab.com/veloren/veloren?tag=weekly#2dd493e3bc2fc0b274e48e283e9476c7178594d2"
+source = "git+https://gitlab.com/veloren/veloren?tag=weekly#736665224668da63e2299adbd20b109aa0a78e61"
 dependencies = [
 "async-trait",
 "bitflags 2.6.0",
@ -3365,7 +3372,7 @@ dependencies = [
 [[package]]
 name = "veloren-world"
 version = "0.10.0"
-source = "git+https://gitlab.com/veloren/veloren?tag=weekly#2dd493e3bc2fc0b274e48e283e9476c7178594d2"
+source = "git+https://gitlab.com/veloren/veloren?tag=weekly#736665224668da63e2299adbd20b109aa0a78e61"
 dependencies = [
 "arr_macro",
 "bincode",
--- a/assets/common/abilities/ability_set_manifest.ron
+++ b/assets/common/abilities/ability_set_manifest.ron
@ -277,6 +277,11 @@
        secondary: Simple(None, "common.abilities.custom.bushly.dash"),
        abilities: [],
    ),
+    Custom("Cactid"): (
+        primary: Simple(None, "common.abilities.custom.cactid.singlestrike"),
+        secondary: Simple(None, "common.abilities.custom.cactid.dash"),
+        abilities: [],
+    ),    
    Custom("Irrwurz"): (
        primary: Simple(None, "common.abilities.custom.irrwurz.singlestrike"),
        secondary: Simple(None, "common.abilities.custom.irrwurz.magicball"),
@ -695,7 +700,8 @@
            Simple(None, "common.abilities.custom.mindflayer.dimensionaldoor"),
            Simple(None, "common.abilities.custom.mindflayer.necroticsphere"),
            Simple(None, "common.abilities.custom.mindflayer.summonminions"),
-            Simple(None, "common.abilities.custom.mindflayer.summonextraminions"),
+            Simple(None, "common.abilities.custom.mindflayer.necroticsphere_blast"),
+            Simple(None, "common.abilities.custom.mindflayer.necroticsphere_multiblast"),            
        ],
    ),
    Custom("Flamekeeper"): (
@ -1233,4 +1239,39 @@
        secondary: Simple(None, "common.abilities.vampire.executioner.doublestrike"),
        abilities: [],
    ),
+    Custom("Goblin Thug"): (
+        primary: Simple(None, "common.abilities.custom.goblin_thug.doublestrike"),
+        secondary: Simple(None, "common.abilities.custom.goblin_thug.doublestrike"),
+        abilities: [],
+    ),
+    Custom("Goblin Chucker"): (
+        primary: Simple(None, "common.abilities.custom.goblin_chucker.throw"),
+        secondary: Simple(None, "common.abilities.custom.goblin_chucker.throw"),
+        abilities: [],
+    ),
+    Custom("Goblin Ruffian"): (
+        primary: Simple(None, "common.abilities.custom.goblin_ruffian.stab"),
+        secondary: Simple(None, "common.abilities.custom.goblin_ruffian.stab"),
+        abilities: [],
+    ),
+    Custom("Green Legoom"): (
+        primary: Simple(None, "common.abilities.custom.green_legoom.doublestrike"),
+        secondary: Simple(None, "common.abilities.custom.green_legoom.doublestrike"),
+        abilities: [],
+    ),
+    Custom("Ochre Legoom"): (
+        primary: Simple(None, "common.abilities.custom.ochre_legoom.dash"),
+        secondary: Simple(None, "common.abilities.custom.ochre_legoom.dash"),
+        abilities: [],
+    ),
+    Custom("Purple Legoom"): (
+        primary: Simple(None, "common.abilities.custom.purple_legoom.doublestrike"),
+        secondary: Simple(None, "common.abilities.custom.purple_legoom.doublestrike"),
+        abilities: [],
+    ),
+    Custom("Red Legoom"): (
+        primary: Simple(None, "common.abilities.custom.red_legoom.doublestrike"),
+        secondary: Simple(None, "common.abilities.custom.red_legoom.doublestrike"),
+        abilities: [],
+    ),
 })
--- a/assets/common/abilities/custom/arthropods/blackwidow/ensnaringwebs.ron
+++ b/assets/common/abilities/custom/arthropods/blackwidow/ensnaringwebs.ron
@ -3,7 +3,7 @@ SpriteSummon(
    cast_duration: 0.4,
    recover_duration: 0.3,
    sprite: EnsnaringWeb,
-    del_timeout: None,
+    del_timeout: Some((20, 4)),
    summon_distance: (0, 10),
    sparseness: 0.76,
    angle: 360,
--- a/assets/common/abilities/custom/arthropods/tarantula/ensnaringwebs.ron
+++ b/assets/common/abilities/custom/arthropods/tarantula/ensnaringwebs.ron
@ -3,7 +3,7 @@ SpriteSummon(
    cast_duration: 0.4,
    recover_duration: 0.3,
    sprite: EnsnaringWeb,
-    del_timeout: None,
+    del_timeout: Some((10, 2)),
    summon_distance: (0, 9),
    sparseness: 0.8,
    angle: 360,
--- a/assets/common/abilities/custom/cactid/dash.ron
+++ b/assets/common/abilities/custom/cactid/dash.ron
@ -0,0 +1,28 @@
+DashMelee(
+    energy_cost: 0,
+    melee_constructor: (
+        kind: Slash(
+            damage: 12.0,
+            poise: 8.0,
+            knockback: 4.0,
+            energy_regen: 0.0,
+        ),
+        scaled: Some((
+            kind: Slash(
+                damage: 9.0,
+                poise: 20.0,
+                knockback: 6.0,
+                energy_regen: 0.0,
+            ))),
+        range: 4,
+        angle: 45.0,
+    ),
+    energy_drain: 0,
+    forward_speed: 8,
+    buildup_duration: 1.0,
+    charge_duration: 2.0,
+    swing_duration: 0.1,
+    recover_duration: 2.0,
+    ori_modifier: 0.1,
+    auto_charge: false,
+)
--- a/assets/common/abilities/custom/cactid/singlestrike.ron
+++ b/assets/common/abilities/custom/cactid/singlestrike.ron
@ -0,0 +1,26 @@
+ComboMelee2(
+    strikes: [
+        (
+            melee_constructor: (
+                kind: Slash(
+                    damage: 8.0,
+                    poise: 4,
+                    knockback: 2,
+                    energy_regen: 0,
+                ),
+                range: 3.0,
+                angle: 150.0,
+            ),
+            buildup_duration: 0.9,
+            swing_duration: 0.7,
+            hit_timing: 0.5,
+            recover_duration: 0.8,
+            movement: (
+                swing: None,
+            ),
+            ori_modifier: 0.6,
+        ),
+    ],
+    energy_cost_per_strike: 0,
+    auto_progress: true,
+)
--- a/assets/common/abilities/custom/cloudwyvern/triplestrike.ron
+++ b/assets/common/abilities/custom/cloudwyvern/triplestrike.ron
@ -16,7 +16,7 @@ ComboMelee2(
            hit_timing: 0.5,
            recover_duration: 0.6,
            movement: (
-                swing: Some(Forward(0.5)),
+                swing: Some(Forward(0.1)),
            ),
            ori_modifier: 0.7,
        ),
@ -36,7 +36,7 @@ ComboMelee2(
            hit_timing: 0.5,
            recover_duration: 0.6,
            movement: (
-                swing: Some(Forward(0.5)),
+                swing: Some(Forward(0.1)),
            ),
            ori_modifier: 0.7,
        ),
@ -56,11 +56,11 @@ ComboMelee2(
            hit_timing: 0.5,
            recover_duration: 0.6,
            movement: (
-                swing: Some(Forward(0.5)),
+                swing: Some(Forward(0.2)),
            ),
            ori_modifier: 0.7,
        ),
    ],
    energy_cost_per_strike: 0,
    auto_progress: true,
-)
+)
--- a/assets/common/abilities/custom/flamewyvern/triplestrike.ron
+++ b/assets/common/abilities/custom/flamewyvern/triplestrike.ron
@ -16,7 +16,7 @@ ComboMelee2(
            hit_timing: 0.5,
            recover_duration: 0.6,
            movement: (
-                swing: Some(Forward(0.5)),
+                swing: Some(Forward(0.1)),
            ),
            ori_modifier: 0.7,
        ),
@ -36,7 +36,7 @@ ComboMelee2(
            hit_timing: 0.5,
            recover_duration: 0.6,
            movement: (
-                swing: Some(Forward(0.5)),
+                swing: Some(Forward(0.1)),
            ),
            ori_modifier: 0.7,
        ),
@ -56,11 +56,11 @@ ComboMelee2(
            hit_timing: 0.5,
            recover_duration: 0.6,
            movement: (
-                swing: Some(Forward(0.5)),
+                swing: Some(Forward(0.2)),
            ),
            ori_modifier: 0.7,
        ),
    ],
    energy_cost_per_strike: 0,
    auto_progress: true,
-)
+)
--- a/assets/common/abilities/custom/frostwyvern/triplestrike.ron
+++ b/assets/common/abilities/custom/frostwyvern/triplestrike.ron
@ -16,7 +16,7 @@ ComboMelee2(
            hit_timing: 0.5,
            recover_duration: 0.6,
            movement: (
-                swing: Some(Forward(0.5)),
+                swing: Some(Forward(0.1)),
            ),
            ori_modifier: 0.7,
        ),
@ -36,7 +36,7 @@ ComboMelee2(
            hit_timing: 0.5,
            recover_duration: 0.6,
            movement: (
-                swing: Some(Forward(0.5)),
+                swing: Some(Forward(0.1)),
            ),
            ori_modifier: 0.7,
        ),
@ -56,11 +56,11 @@ ComboMelee2(
            hit_timing: 0.5,
            recover_duration: 0.6,
            movement: (
-                swing: Some(Forward(0.5)),
+                swing: Some(Forward(0.2)),
            ),
            ori_modifier: 0.7,
        ),
    ],
    energy_cost_per_strike: 0,
    auto_progress: true,
-)
+)
--- a/assets/common/abilities/custom/goblin_chucker/throw.ron
+++ b/assets/common/abilities/custom/goblin_chucker/throw.ron
@ -0,0 +1,18 @@
+BasicRanged(
+    energy_cost: 0,
+    buildup_duration: 0.75,
+    recover_duration: 0.75,
+    projectile: (
+        kind: Blunt,
+        attack: Some((
+            damage: 4,
+            energy: 0,
+        )),
+    ),
+    projectile_body: Object(Pebble),
+    projectile_light: None,
+    projectile_speed: 18.0,
+    num_projectiles: Value(2),
+    projectile_spread: 0.2,
+    move_efficiency: 0.3,
+)
--- a/assets/common/abilities/custom/goblin_ruffian/stab.ron
+++ b/assets/common/abilities/custom/goblin_ruffian/stab.ron
@ -0,0 +1,18 @@
+BasicMelee(
+    energy_cost: 0,
+    buildup_duration: 0.2,
+    swing_duration: 0.05,
+    hit_timing: 0.4,
+    recover_duration: 0.375,
+    melee_constructor: (
+        kind: Stab(
+            damage: 5,
+            poise: 2,
+            knockback: 0,
+            energy_regen: 0,
+        ),
+        range: 3,
+        angle: 15,
+    ),
+    ori_modifier: 1.0,
+)
--- a/assets/common/abilities/custom/goblin_thug/doublestrike.ron
+++ b/assets/common/abilities/custom/goblin_thug/doublestrike.ron
@ -0,0 +1,45 @@
+ComboMelee2(
+    strikes: [
+        (
+            melee_constructor: (
+                kind: Bash(
+                    damage: 4,
+                    poise: 1,
+                    knockback: 0,
+                    energy_regen: 0,
+                ),
+                range: 3.5,
+                angle: 50.0,
+            ),
+            buildup_duration: 0.6,
+            swing_duration: 0.25,
+            hit_timing: 0.5,
+            recover_duration: 0.25,
+            movement: (
+                swing: Some(Forward(0.5)),
+            ),
+            ori_modifier: 0.65,
+        ),
+        (
+            melee_constructor: (
+                kind: Bash(
+                    damage: 6,
+                    poise: 1,
+                    knockback: 0,
+                    energy_regen: 0,
+                ),
+                range: 4.0,
+                angle: 30.0,
+            ),
+            buildup_duration: 1,
+            swing_duration: 0.4,
+            hit_timing: 0.5,
+            recover_duration: 1.2,
+            movement: (
+                swing: Some(Forward(0.5)),
+            ),
+            ori_modifier: 0.65,
+        ),
+    ],
+    energy_cost_per_strike: 0,
+)
--- a/assets/common/abilities/custom/green_legoom/doublestrike.ron
+++ b/assets/common/abilities/custom/green_legoom/doublestrike.ron
@ -0,0 +1,45 @@
+ComboMelee2(
+    strikes: [
+        (
+            melee_constructor: (
+                kind: Bash(
+                    damage: 5,
+                    poise: 2,
+                    knockback: 0,
+                    energy_regen: 0,
+                ),
+                range: 3.5,
+                angle: 50.0,
+            ),
+            buildup_duration: 0.6,
+            swing_duration: 0.25,
+            hit_timing: 0.5,
+            recover_duration: 0.25,
+            movement: (
+                swing: Some(Forward(0.5)),
+            ),
+            ori_modifier: 0.65,
+        ),
+        (
+            melee_constructor: (
+                kind: Bash(
+                    damage: 8,
+                    poise: 3,
+                    knockback: 0,
+                    energy_regen: 0,
+                ),
+                range: 4.0,
+                angle: 30.0,
+            ),
+            buildup_duration: 1,
+            swing_duration: 0.4,
+            hit_timing: 0.5,
+            recover_duration: 1.2,
+            movement: (
+                swing: Some(Forward(0.5)),
+            ),
+            ori_modifier: 0.65,
+        ),
+    ],
+    energy_cost_per_strike: 0,
+)
--- a/assets/common/abilities/custom/harvester/ensnaringvines_dense.ron
+++ b/assets/common/abilities/custom/harvester/ensnaringvines_dense.ron
@ -3,7 +3,7 @@ SpriteSummon(
    cast_duration: 0.6,
    recover_duration: 0.5,
    sprite: EnsnaringVines,
-    del_timeout: None,
+    del_timeout: Some((60, 10)),
    summon_distance: (0, 25),
    sparseness: 0.6,
    angle: 360,
--- a/assets/common/abilities/custom/harvester/ensnaringvines_sparse.ron
+++ b/assets/common/abilities/custom/harvester/ensnaringvines_sparse.ron
@ -3,7 +3,7 @@ SpriteSummon(
    cast_duration: 0.4,
    recover_duration: 0.3,
    sprite: EnsnaringVines,
-    del_timeout: None,
+    del_timeout: Some((60, 10)),
    summon_distance: (0, 30),
    sparseness: 0.8,
    angle: 360,
--- a/assets/common/abilities/custom/hydra/multi_bite.ron
+++ b/assets/common/abilities/custom/hydra/multi_bite.ron
@ -16,7 +16,7 @@ ComboMelee2(
            hit_timing: 0.5,
            recover_duration: 0.6,
            movement: (
-                swing: Some(Forward(0.15)),
+                swing: Some(Forward(0.05)),
            ),
            ori_modifier: 0.65,
        ),
@ -36,7 +36,7 @@ ComboMelee2(
            hit_timing: 0.5,
            recover_duration: 0.6,
            movement: (
-                swing: Some(Forward(0.1)),
+                swing: Some(Forward(0.05)),
            ),
            ori_modifier: 0.65,
        ),
@ -56,7 +56,7 @@ ComboMelee2(
            hit_timing: 0.5,
            recover_duration: 0.8,
            movement: (
-                swing: Some(Forward(0.5)),
+                swing: Some(Forward(0.1)),
            ),
            ori_modifier: 0.65,
        ),
--- a/assets/common/abilities/custom/karkatha/riposte.ron
+++ b/assets/common/abilities/custom/karkatha/riposte.ron
@ -3,6 +3,7 @@ RiposteMelee(
    buildup_duration: 0.3,
    swing_duration: 0.9,
    recover_duration: 0.3,
+    whiffed_recover_duration: 0.6,
    block_strength: 50.0,
    melee_constructor: (
        kind: Slash(
--- a/assets/common/abilities/custom/mindflayer/cursedflames.ron
+++ b/assets/common/abilities/custom/mindflayer/cursedflames.ron
@ -14,6 +14,6 @@ BasicBeam(
    ))),
    energy_regen: 0,
    energy_drain: 45,
-    ori_rate: 0.45,
+    ori_rate: 0.3,
    specifier: Cultist,
 )
--- a/assets/common/abilities/custom/mindflayer/necroticsphere_blast.ron
+++ b/assets/common/abilities/custom/mindflayer/necroticsphere_blast.ron
@ -0,0 +1,22 @@
+BasicRanged(
+    energy_cost: 0,
+    buildup_duration: 0.3,
+    recover_duration: 0.8,
+    projectile: (
+        kind: Explosive(
+            radius: 20,
+            min_falloff: 0.2,
+            reagent: Some(Purple),
+        ),
+        attack: Some((
+            damage: 25,
+            energy: 20,
+        )),
+    ),
+    projectile_body: Object(FireworkPurple),
+    projectile_speed: 0.0,
+    num_projectiles: Value(1),
+    projectile_spread: 0.0,
+    move_efficiency: 0.3,
+)
+
--- a/assets/common/abilities/custom/mindflayer/necroticsphere_multiblast.ron
+++ b/assets/common/abilities/custom/mindflayer/necroticsphere_multiblast.ron
@ -0,0 +1,22 @@
+BasicRanged(
+    energy_cost: 0,
+    buildup_duration: 6.0,
+    recover_duration: 0.5,
+    projectile: (
+        kind: Explosive(
+            radius: 10,
+            min_falloff: 0.2,
+            reagent: Some(Purple),
+        ),
+        attack: Some((
+            damage: 30,
+            energy: 40,
+        )),
+    ),
+    projectile_body: Object(FireworkPurple),
+    projectile_speed: 10.0,
+    num_projectiles: Value(6),
+    projectile_spread: 0.5,
+    move_efficiency: 0.3,
+)
+
--- a/assets/common/abilities/custom/mindflayer/necroticvortex.ron
+++ b/assets/common/abilities/custom/mindflayer/necroticvortex.ron
@ -1,15 +1,15 @@
 RapidMelee(
-    buildup_duration: 1.0,
-    swing_duration: 0.45,
-    recover_duration: 1.0,
+    buildup_duration: 0.5,
+    swing_duration: 0.8,
+    recover_duration: 0.1,
    melee_constructor: (
        kind: NecroticVortex(
            damage: 20,
-            pull: 6.5,
-            lifesteal: 3.0,
+            pull: 12.0,
+            lifesteal: 8.0,
            energy_regen: 30,
        ),
-        range: 17.0,
+        range: 25.0,
        angle: 360.0,
        multi_target: Some(Normal),
    ),
--- a/assets/common/abilities/custom/ochre_legoom/dash.ron
+++ b/assets/common/abilities/custom/ochre_legoom/dash.ron
@ -0,0 +1,28 @@
+DashMelee(
+    energy_cost: 0.0,
+    melee_constructor: (
+        kind: Stab(
+            damage: 5.0,
+            poise: 3.0,
+            knockback: 2.0,
+            energy_regen: 0.0,
+        ),
+        scaled: Some((
+            kind: Stab(
+                damage: 5.0,
+                poise: 3.0,
+                knockback: 2.0,
+                energy_regen: 0.0,
+            ))),
+        range: 5.0,
+        angle: 45.0,
+    ),
+    energy_drain: 0,
+    forward_speed: 5.0,
+    buildup_duration: 1.2,
+    charge_duration: 0.4,
+    swing_duration: 0.1,
+    recover_duration: 1.2,
+    ori_modifier: 0.3,
+    auto_charge: false,
+)
--- a/assets/common/abilities/custom/purple_legoom/doublestrike.ron
+++ b/assets/common/abilities/custom/purple_legoom/doublestrike.ron
@ -0,0 +1,45 @@
+ComboMelee2(
+    strikes: [
+        (
+            melee_constructor: (
+                kind: Stab(
+                    damage: 5,
+                    poise: 2,
+                    knockback: 0,
+                    energy_regen: 0,
+                ),
+                range: 3.5,
+                angle: 50.0,
+            ),
+            buildup_duration: 0.6,
+            swing_duration: 0.25,
+            hit_timing: 0.5,
+            recover_duration: 0.25,
+            movement: (
+                swing: Some(Forward(0.5)),
+            ),
+            ori_modifier: 0.65,
+        ),
+        (
+            melee_constructor: (
+                kind: Stab(
+                    damage: 8,
+                    poise: 3,
+                    knockback: 0,
+                    energy_regen: 0,
+                ),
+                range: 4.0,
+                angle: 30.0,
+            ),
+            buildup_duration: 1,
+            swing_duration: 0.4,
+            hit_timing: 0.5,
+            recover_duration: 1.2,
+            movement: (
+                swing: Some(Forward(0.5)),
+            ),
+            ori_modifier: 0.65,
+        ),
+    ],
+    energy_cost_per_strike: 0,
+)
--- a/assets/common/abilities/custom/red_legoom/doublestrike.ron
+++ b/assets/common/abilities/custom/red_legoom/doublestrike.ron
@ -0,0 +1,45 @@
+ComboMelee2(
+    strikes: [
+        (
+            melee_constructor: (
+                kind: Bash(
+                    damage: 5,
+                    poise: 2,
+                    knockback: 0,
+                    energy_regen: 0,
+                ),
+                range: 3.5,
+                angle: 50.0,
+            ),
+            buildup_duration: 0.6,
+            swing_duration: 0.25,
+            hit_timing: 0.5,
+            recover_duration: 0.25,
+            movement: (
+                swing: Some(Forward(0.5)),
+            ),
+            ori_modifier: 0.65,
+        ),
+        (
+            melee_constructor: (
+                kind: Bash(
+                    damage: 8,
+                    poise: 3,
+                    knockback: 0,
+                    energy_regen: 0,
+                ),
+                range: 4.0,
+                angle: 30.0,
+            ),
+            buildup_duration: 1,
+            swing_duration: 0.4,
+            hit_timing: 0.5,
+            recover_duration: 1.2,
+            movement: (
+                swing: Some(Forward(0.5)),
+            ),
+            ori_modifier: 0.65,
+        ),
+    ],
+    energy_cost_per_strike: 0,
+)
--- a/assets/common/abilities/custom/seawyvern/triplestrike.ron
+++ b/assets/common/abilities/custom/seawyvern/triplestrike.ron
@ -16,7 +16,7 @@ ComboMelee2(
            hit_timing: 0.5,
            recover_duration: 0.6,
            movement: (
-                swing: Some(Forward(0.5)),
+                swing: Some(Forward(0.1)),
            ),
            ori_modifier: 0.7,
        ),
@ -36,7 +36,7 @@ ComboMelee2(
            hit_timing: 0.5,
            recover_duration: 0.6,
            movement: (
-                swing: Some(Forward(0.5)),
+                swing: Some(Forward(0.1)),
            ),
            ori_modifier: 0.7,
        ),
@ -56,11 +56,11 @@ ComboMelee2(
            hit_timing: 0.5,
            recover_duration: 0.6,
            movement: (
-                swing: Some(Forward(0.5)),
+                swing: Some(Forward(0.2)),
            ),
            ori_modifier: 0.7,
        ),
    ],
    energy_cost_per_strike: 0,
    auto_progress: true,
-)
+)
--- a/assets/common/abilities/custom/wealdwyvern/triplestrike.ron
+++ b/assets/common/abilities/custom/wealdwyvern/triplestrike.ron
@ -16,7 +16,7 @@ ComboMelee2(
            hit_timing: 0.5,
            recover_duration: 0.6,
            movement: (
-                swing: Some(Forward(0.5)),
+                swing: Some(Forward(0.1)),
            ),
            ori_modifier: 0.7,
        ),
@ -36,7 +36,7 @@ ComboMelee2(
            hit_timing: 0.5,
            recover_duration: 0.6,
            movement: (
-                swing: Some(Forward(0.5)),
+                swing: Some(Forward(0.1)),
            ),
            ori_modifier: 0.7,
        ),
@ -56,11 +56,11 @@ ComboMelee2(
            hit_timing: 0.5,
            recover_duration: 0.6,
            movement: (
-                swing: Some(Forward(0.5)),
+                swing: Some(Forward(0.2)),
            ),
            ori_modifier: 0.7,
        ),
    ],
    energy_cost_per_strike: 0,
    auto_progress: true,
-)
+)
--- a/assets/common/abilities/hammer/dual_iron_tempest.ron
+++ b/assets/common/abilities/hammer/dual_iron_tempest.ron
@ -11,6 +11,7 @@ RapidMelee(
        ),
        range: 4.0,
        angle: 360.0,
+        multi_target: Some(Normal),
        simultaneous_hits: 2,
    ),
    energy_cost: 3,
--- a/assets/common/abilities/hammer/iron_tempest.ron
+++ b/assets/common/abilities/hammer/iron_tempest.ron
@ -11,6 +11,7 @@ RapidMelee(
        ),
        range: 4.0,
        angle: 360.0,
+        multi_target: Some(Normal),
    ),
    energy_cost: 3,
    max_strikes: Some(8),
--- a/assets/common/abilities/hammer/retaliate.ron
+++ b/assets/common/abilities/hammer/retaliate.ron
@ -3,6 +3,7 @@ RiposteMelee(
    buildup_duration: 0.4,
    swing_duration: 0.1,
    recover_duration: 0.2,
+    whiffed_recover_duration: 0.6,
    block_strength: 5.0,
    melee_constructor: (
        kind: Bash(
--- a/assets/common/abilities/haniwa/soldier/riposte.ron
+++ b/assets/common/abilities/haniwa/soldier/riposte.ron
@ -3,6 +3,7 @@ RiposteMelee(
    buildup_duration: 0.7,
    swing_duration: 0.3,
    recover_duration: 0.2,
+    whiffed_recover_duration: 0.4,
    block_strength: 5.0,
    melee_constructor: (
        kind: Slash(
@ -14,4 +15,4 @@ RiposteMelee(
        range: 4.0,
        angle: 60.0,
    ),
-)
+)
--- a/assets/common/abilities/sword/defensive_riposte.ron
+++ b/assets/common/abilities/sword/defensive_riposte.ron
@ -3,6 +3,7 @@ RiposteMelee(
    buildup_duration: 0.4,
    swing_duration: 0.1,
    recover_duration: 0.2,
+    whiffed_recover_duration: 0.6,
    block_strength: 5.0,
    melee_constructor: (
        kind: Slash(
--- a/assets/common/entity/calendar/halloween/aggressive/bloodservant.ron
+++ b/assets/common/entity/calendar/halloween/aggressive/bloodservant.ron
@ -0,0 +1,18 @@
+#![enable(implicit_some)]
+(
+    name: Name("Bloodservant"),
+    body: RandomWith("bloodservant"),
+    alignment: Alignment(Enemy),
+    loot: LootTable("common.loot_tables.calendar.halloween.halloween_bloodservant"),
+    inventory: (
+        loadout: Inline((
+            active_hands: InHands((Item("common.items.npc_weapons.biped_small.vampire.bloodservant_axe"), None)),
+            inherit: Asset("common.loadout.dungeon.vampire.bloodservant"),
+
+        )),    ),
+        agent: (
+        idle_wander_factor: 0.0,
+        aggro_range_multiplier: 2.0,
+    ),
+    meta: [],
+)
--- a/assets/common/entity/calendar/halloween/wild/halloween_strigoi.ron
+++ b/assets/common/entity/calendar/halloween/wild/halloween_strigoi.ron
@ -0,0 +1,11 @@
+#![enable(implicit_some)]
+(
+    name: Name("Strigoi"),
+    body: RandomWith("strigoi"),
+    alignment: Alignment(Wild),
+    loot: LootTable("common.loot_tables.calendar.halloween.halloween_strigoi"),
+    inventory: (
+        loadout: FromBody,
+    ),
+    meta: [],
+)
--- a/assets/common/entity/wild/aggressive/cactid.ron
+++ b/assets/common/entity/wild/aggressive/cactid.ron
@ -0,0 +1,12 @@
+#![enable(implicit_some)]
+(
+    name: Name("Cactid"),
+    body: RandomWith("cactid"),
+    alignment: Alignment(Enemy),
+    loot: LootTable("common.loot_tables.creature.biped_small.cactid"),
+    inventory: (
+        loadout: Inline((
+            inherit: Asset("common.loadout.world.cactid.cactid"),
+        )),    ),
+    meta: [],
+)
--- a/assets/common/entity/wild/aggressive/goblin_chucker.ron
+++ b/assets/common/entity/wild/aggressive/goblin_chucker.ron
@ -0,0 +1,12 @@
+#![enable(implicit_some)]
+(
+    name: Name("Goblin Chucker"),
+    body: RandomWith("goblin_chucker"),
+    alignment: Alignment(Enemy),
+    loot: LootTable("common.loot_tables.creature.biped_small.goblin"),
+    inventory: (
+        loadout: Inline((
+            inherit: Asset("common.loadout.world.goblin.goblin_chucker"),
+        )),    ),
+    meta: [],
+)
--- a/assets/common/entity/wild/aggressive/goblin_ruffian.ron
+++ b/assets/common/entity/wild/aggressive/goblin_ruffian.ron
@ -0,0 +1,12 @@
+#![enable(implicit_some)]
+(
+    name: Name("Goblin Ruffian"),
+    body: RandomWith("goblin_ruffian"),
+    alignment: Alignment(Enemy),
+    loot: LootTable("common.loot_tables.creature.biped_small.goblin"),
+    inventory: (
+        loadout: Inline((
+            inherit: Asset("common.loadout.world.goblin.goblin_ruffian"),
+        )),    ),
+    meta: [],
+)
--- a/assets/common/entity/wild/aggressive/goblin_thug.ron
+++ b/assets/common/entity/wild/aggressive/goblin_thug.ron
@ -0,0 +1,12 @@
+#![enable(implicit_some)]
+(
+    name: Name("Goblin Thug"),
+    body: RandomWith("goblin_thug"),
+    alignment: Alignment(Enemy),
+    loot: LootTable("common.loot_tables.creature.biped_small.goblin"),
+    inventory: (
+        loadout: Inline((
+            inherit: Asset("common.loadout.world.goblin.goblin_thug"),
+        )),    ),
+    meta: [],
+)
--- a/assets/common/entity/wild/aggressive/green_legoom.ron
+++ b/assets/common/entity/wild/aggressive/green_legoom.ron
@ -0,0 +1,12 @@
+#![enable(implicit_some)]
+(
+    name: Name("Green Legoom"),
+    body: RandomWith("green_legoom"),
+    alignment: Alignment(Enemy),
+    loot: LootTable("common.loot_tables.creature.biped_small.legoom"),
+    inventory: (
+        loadout: Inline((
+            inherit: Asset("common.loadout.world.legoom.green_legoom"),
+        )),    ),
+    meta: [],
+)
--- a/assets/common/entity/wild/aggressive/ochre_legoom.ron
+++ b/assets/common/entity/wild/aggressive/ochre_legoom.ron
@ -0,0 +1,12 @@
+#![enable(implicit_some)]
+(
+    name: Name("Ochre Legoom"),
+    body: RandomWith("ochre_legoom"),
+    alignment: Alignment(Enemy),
+    loot: LootTable("common.loot_tables.creature.biped_small.legoom"),
+    inventory: (
+        loadout: Inline((
+            inherit: Asset("common.loadout.world.legoom.ochre_legoom"),
+        )),    ),
+    meta: [],
+)
--- a/assets/common/entity/wild/aggressive/purple_legoom.ron
+++ b/assets/common/entity/wild/aggressive/purple_legoom.ron
@ -0,0 +1,12 @@
+#![enable(implicit_some)]
+(
+    name: Name("Purple Legoom"),
+    body: RandomWith("purple_legoom"),
+    alignment: Alignment(Enemy),
+    loot: LootTable("common.loot_tables.creature.biped_small.legoom"),
+    inventory: (
+        loadout: Inline((
+            inherit: Asset("common.loadout.world.legoom.purple_legoom"),
+        )),    ),
+    meta: [],
+)
--- a/assets/common/entity/wild/aggressive/red_legoom.ron
+++ b/assets/common/entity/wild/aggressive/red_legoom.ron
@ -0,0 +1,12 @@
+#![enable(implicit_some)]
+(
+    name: Name("Red Legoom"),
+    body: RandomWith("red_legoom"),
+    alignment: Alignment(Enemy),
+    loot: LootTable("common.loot_tables.creature.biped_small.legoom"),
+    inventory: (
+        loadout: Inline((
+            inherit: Asset("common.loadout.world.legoom.red_legoom"),
+        )),    ),
+    meta: [],
+)
--- a/assets/common/item_i18n_manifest.ron
+++ b/assets/common/item_i18n_manifest.ron
@ -324,6 +324,21 @@
        Simple(
            "common.items.npc_armor.biped_small.bushly.hand.bushly",
        ): "common-items-npc_armor-biped_small-bushly-hand-bushly",
+        Simple(
+            "common.items.npc_armor.biped_small.cactid.head.cactid",
+        ): "common-items-npc_armor-biped_small-cactid-head-cactid",         
+        Simple(
+            "common.items.npc_armor.biped_small.cactid.foot.cactid",
+        ): "common-items-npc_armor-biped_small-cactid-foot-cactid",
+        Simple(
+            "common.items.npc_armor.biped_small.cactid.pants.cactid",
+        ): "common-items-npc_armor-biped_small-cactid-pants-cactid",
+        Simple(
+            "common.items.npc_armor.biped_small.cactid.chest.cactid",
+        ): "common-items-npc_armor-biped_small-cactid-chest-cactid",
+        Simple(
+            "common.items.npc_armor.biped_small.cactid.hand.cactid",
+        ): "common-items-npc_armor-biped_small-cactid-hand-cactid",        
        Simple(
            "common.items.npc_armor.biped_small.treasure_egg.chest.treasure_egg",
        ): "common-items-npc_armor-biped_small-treasure_egg-chest-treasure_egg",
@ -591,6 +606,111 @@
        Simple(
            "common.items.npc_armor.biped_small.harlequin.pants.harlequin",
        ): "common-items-npc_armor-biped_small-harlequin-pants-harlequin",
+        Simple(
+            "common.items.npc_armor.biped_small.goblin_thug.chest.goblin_thug",
+        ): "common-items-npc_armor-biped_small-goblin_thug-chest-goblin_thug",
+        Simple(
+            "common.items.npc_armor.biped_small.goblin_thug.foot.goblin_thug",
+        ): "common-items-npc_armor-biped_small-goblin_thug-foot-goblin_thug",
+        Simple(
+            "common.items.npc_armor.biped_small.goblin_thug.hand.goblin_thug",
+        ): "common-items-npc_armor-biped_small-goblin_thug-hand-goblin_thug",
+        Simple(
+            "common.items.npc_armor.biped_small.goblin_thug.head.goblin_thug",
+        ): "common-items-npc_armor-biped_small-goblin_thug-head-goblin_thug",
+        Simple(
+            "common.items.npc_armor.biped_small.goblin_thug.pants.goblin_thug",
+        ): "common-items-npc_armor-biped_small-goblin_thug-pants-goblin_thug",
+        Simple(
+            "common.items.npc_armor.biped_small.goblin_chucker.chest.goblin_chucker",
+        ): "common-items-npc_armor-biped_small-goblin_chucker-chest-goblin_chucker",
+        Simple(
+            "common.items.npc_armor.biped_small.goblin_chucker.foot.goblin_chucker",
+        ): "common-items-npc_armor-biped_small-goblin_chucker-foot-goblin_chucker",
+        Simple(
+            "common.items.npc_armor.biped_small.goblin_chucker.hand.goblin_chucker",
+        ): "common-items-npc_armor-biped_small-goblin_chucker-hand-goblin_chucker",
+        Simple(
+            "common.items.npc_armor.biped_small.goblin_chucker.head.goblin_chucker",
+        ): "common-items-npc_armor-biped_small-goblin_chucker-head-goblin_chucker",
+        Simple(
+            "common.items.npc_armor.biped_small.goblin_chucker.pants.goblin_chucker",
+        ): "common-items-npc_armor-biped_small-goblin_chucker-pants-goblin_chucker",
+        Simple(
+            "common.items.npc_armor.biped_small.goblin_ruffian.chest.goblin_ruffian",
+        ): "common-items-npc_armor-biped_small-goblin_ruffian-chest-goblin_ruffian",
+        Simple(
+            "common.items.npc_armor.biped_small.goblin_ruffian.foot.goblin_ruffian",
+        ): "common-items-npc_armor-biped_small-goblin_ruffian-foot-goblin_ruffian",
+        Simple(
+            "common.items.npc_armor.biped_small.goblin_ruffian.hand.goblin_ruffian",
+        ): "common-items-npc_armor-biped_small-goblin_ruffian-hand-goblin_ruffian",
+        Simple(
+            "common.items.npc_armor.biped_small.goblin_ruffian.head.goblin_ruffian",
+        ): "common-items-npc_armor-biped_small-goblin_ruffian-head-goblin_ruffian",
+        Simple(
+            "common.items.npc_armor.biped_small.goblin_ruffian.pants.goblin_ruffian",
+        ): "common-items-npc_armor-biped_small-goblin_ruffian-pants-goblin_ruffian",
+        Simple(
+            "common.items.npc_armor.biped_small.green_legoom.chest.green_legoom",
+        ): "common-items-npc_armor-biped_small-green_legoom-chest-green_legoom",
+        Simple(
+            "common.items.npc_armor.biped_small.green_legoom.foot.green_legoom",
+        ): "common-items-npc_armor-biped_small-green_legoom-foot-green_legoom",
+        Simple(
+            "common.items.npc_armor.biped_small.green_legoom.hand.green_legoom",
+        ): "common-items-npc_armor-biped_small-green_legoom-hand-green_legoom",
+        Simple(
+            "common.items.npc_armor.biped_small.green_legoom.head.green_legoom",
+        ): "common-items-npc_armor-biped_small-green_legoom-head-green_legoom",
+        Simple(
+            "common.items.npc_armor.biped_small.green_legoom.pants.green_legoom",
+        ): "common-items-npc_armor-biped_small-green_legoom-pants-green_legoom",
+        Simple(
+            "common.items.npc_armor.biped_small.ochre_legoom.chest.ochre_legoom",
+        ): "common-items-npc_armor-biped_small-ochre_legoom-chest-ochre_legoom",
+        Simple(
+            "common.items.npc_armor.biped_small.ochre_legoom.foot.ochre_legoom",
+        ): "common-items-npc_armor-biped_small-ochre_legoom-foot-ochre_legoom",
+        Simple(
+            "common.items.npc_armor.biped_small.ochre_legoom.hand.ochre_legoom",
+        ): "common-items-npc_armor-biped_small-ochre_legoom-hand-ochre_legoom",
+        Simple(
+            "common.items.npc_armor.biped_small.ochre_legoom.head.ochre_legoom",
+        ): "common-items-npc_armor-biped_small-ochre_legoom-head-ochre_legoom",
+        Simple(
+            "common.items.npc_armor.biped_small.ochre_legoom.pants.ochre_legoom",
+        ): "common-items-npc_armor-biped_small-ochre_legoom-pants-ochre_legoom",
+        Simple(
+            "common.items.npc_armor.biped_small.purple_legoom.chest.purple_legoom",
+        ): "common-items-npc_armor-biped_small-purple_legoom-chest-purple_legoom",
+        Simple(
+            "common.items.npc_armor.biped_small.purple_legoom.foot.purple_legoom",
+        ): "common-items-npc_armor-biped_small-purple_legoom-foot-purple_legoom",
+        Simple(
+            "common.items.npc_armor.biped_small.purple_legoom.hand.purple_legoom",
+        ): "common-items-npc_armor-biped_small-purple_legoom-hand-purple_legoom",
+        Simple(
+            "common.items.npc_armor.biped_small.purple_legoom.head.purple_legoom",
+        ): "common-items-npc_armor-biped_small-purple_legoom-head-purple_legoom",
+        Simple(
+            "common.items.npc_armor.biped_small.purple_legoom.pants.purple_legoom",
+        ): "common-items-npc_armor-biped_small-purple_legoom-pants-purple_legoom",
+        Simple(
+            "common.items.npc_armor.biped_small.red_legoom.chest.red_legoom",
+        ): "common-items-npc_armor-biped_small-red_legoom-chest-red_legoom",
+        Simple(
+            "common.items.npc_armor.biped_small.red_legoom.foot.red_legoom",
+        ): "common-items-npc_armor-biped_small-red_legoom-foot-red_legoom",
+        Simple(
+            "common.items.npc_armor.biped_small.red_legoom.hand.red_legoom",
+        ): "common-items-npc_armor-biped_small-red_legoom-hand-red_legoom",
+        Simple(
+            "common.items.npc_armor.biped_small.red_legoom.head.red_legoom",
+        ): "common-items-npc_armor-biped_small-red_legoom-head-red_legoom",
+        Simple(
+            "common.items.npc_armor.biped_small.red_legoom.pants.red_legoom",
+        ): "common-items-npc_armor-biped_small-red_legoom-pants-red_legoom",
        Simple(
            "common.items.npc_armor.crustacean.karkatha",
        ): "common-items-npc_armor-crustacean-karkatha",        
@ -1203,6 +1323,9 @@
        Simple(
            "common.items.armor.misc.head.cat_capuche",
        ): "armor-misc-head-cat_capuche",
+        Simple(
+            "common.items.armor.misc.head.scarlet_spectacles",
+        ): "armor-misc-head-scarlet_spectacles",
        Simple(
            "common.items.armor.misc.pants.hunting",
        ): "armor-misc-pants-grayscale",
@ -2505,6 +2628,27 @@
        Simple(
            "common.items.npc_weapons.biped_small.vampire.bloodmoon_heiress_sword",
        ): "common-items-npc_weapons-biped_small-vampire-bloodmoon_heiress_sword",
+        Simple(
+            "common.items.npc_weapons.unique.goblin_thug_club",
+        ): "common-items-npc_weapons-unique-goblin_thug_club",
+        Simple(
+            "common.items.npc_weapons.unique.goblin_chucker",
+        ): "common-items-npc_weapons-unique-goblin_chucker",
+        Simple(
+            "common.items.npc_weapons.unique.goblin_ruffian_knife",
+        ): "common-items-npc_weapons-unique-goblin_ruffian_knife",
+        Simple(
+            "common.items.npc_weapons.unique.green_legoom_rake",
+        ): "common-items-npc_weapons-unique-green_legoom_rake",
+        Simple(
+            "common.items.npc_weapons.unique.ochre_legoom_spade",
+        ): "common-items-npc_weapons-unique-ochre_legoom_spade",
+        Simple(
+            "common.items.npc_weapons.unique.purple_legoom_pitchfork",
+        ): "common-items-npc_weapons-unique-purple_legoom_pitchfork",
+        Simple(
+            "common.items.npc_weapons.unique.red_legoom_hoe",
+        ): "common-items-npc_weapons-unique-red_legoom_hoe",
        Simple(
            "common.items.npc_weapons.bow.bipedlarge-velorite",
        ): "common-items-npc_weapons-bow-bipedlarge-velorite",
@ -2580,6 +2724,9 @@
        Simple(
            "common.items.npc_weapons.unique.bushly",
        ): "common-items-npc_weapons-unique-bushly",
+        Simple(
+            "common.items.npc_weapons.unique.cactid",
+        ): "common-items-npc_weapons-unique-cactid",        
        Simple(
            "common.items.npc_weapons.unique.cardinal",
        ): "common-items-npc_weapons-unique-cardinal",
--- a/assets/common/items/armor/brinestone/crown.ron
+++ b/assets/common/items/armor/brinestone/crown.ron
@ -4,10 +4,11 @@ ItemDef(
    kind: Armor((
        kind: Head,
        stats: Direct((
-            protection: Some(Normal(8.0)),
-            poise_resilience: Some(Normal(4.0)),
-            energy_reward: Some(0.15),
-            precision_power: Some(-0.05),
+            protection: Some(Normal(9.0)),
+            poise_resilience: Some(Normal(3.0)),
+            energy_max: Some(7.0),
+            energy_reward: Some(0.07),
+            precision_power: Some(-0.02),
        )),
    )),
    quality: Legendary,
--- 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,
        stats: Direct((
-            protection: Some(Normal(6.0)),
-            poise_resilience: Some(Normal(1.0)),
-            energy_max: Some(2.0),
-            energy_reward: Some(0.025),
-            precision_power: Some(0.008),
+            protection: Some(Normal(8.0)),
+            poise_resilience: Some(Normal(2.0)),
+            energy_max: Some(3.0),
+            energy_reward: Some(0.04),
+            precision_power: Some(0.025),
            stealth: Some(0.04),
        )),
    )),
--- a/assets/common/items/armor/cultist/necklace.ron
+++ b/assets/common/items/armor/cultist/necklace.ron
@ -4,9 +4,9 @@ ItemDef(
    kind: Armor((
        kind: Neck,
        stats: Direct((
-            protection: Some(Normal(2.0)),
-            energy_max: Some(4.5),
-            energy_reward: Some(0.0275),
+            protection: Some(Normal(1.0)),
+            energy_max: Some(3.0),
+            energy_reward: Some(0.03),
            precision_power: Some(0.015),
        )),
    )),
--- a/assets/common/items/armor/cultist/ring.ron
+++ b/assets/common/items/armor/cultist/ring.ron
@ -5,8 +5,8 @@ ItemDef(
        kind: Ring,
        stats: Direct((
            protection: Some(Normal(0.5)),
-            energy_max: Some(2.5),
-            energy_reward: Some(0.0125),
+            energy_max: Some(2.0),
+            energy_reward: Some(0.02),
            precision_power: Some(0.01),
        )),
    )),
--- a/assets/common/items/armor/golemite/helmet.ron
+++ b/assets/common/items/armor/golemite/helmet.ron
@ -4,10 +4,10 @@ ItemDef(
    kind: Armor((
        kind: Head,
        stats: Direct((
-            protection: Some(Normal(14.0)),
-            poise_resilience: Some(Normal(5.6)),
-            energy_max: Some(10.0),
-            energy_reward: Some(-0.08),
+            protection: Some(Normal(13.0)),
+            poise_resilience: Some(Normal(4.5)),
+            energy_max: Some(6.0),
+            energy_reward: Some(-0.06),
        )),
    )),
    quality: Legendary,
--- a/assets/common/items/armor/mail/orichalcum/head.ron
+++ b/assets/common/items/armor/mail/orichalcum/head.ron
@ -4,7 +4,7 @@ ItemDef(
    kind: Armor((
        kind: Head,
        stats: Direct((
-            protection: Some(Normal(18.0)),
+            protection: Some(Normal(15.0)),
            poise_resilience: Some(Normal(6.0)),
        )),
    )),
--- a/assets/common/items/armor/merchant/turban.ron
+++ b/assets/common/items/armor/merchant/turban.ron
@ -5,9 +5,8 @@ ItemDef(
        kind: Head,
        stats: Direct((
            protection: Some(Normal(5.0)),
-            poise_resilience: Some(Normal(1.5)),
            energy_max: Some(12.0),
-            energy_reward: Some(0.07),
+            energy_reward: Some(0.08),
        )),
    )),
    quality: Epic,
--- a/assets/common/items/armor/misc/head/bamboo_twig.ron
+++ b/assets/common/items/armor/misc/head/bamboo_twig.ron
@ -4,7 +4,7 @@ ItemDef(
 	kind: Armor((
        kind: Head,
        stats: Direct((
-            energy_reward: Some(0.033),
+            energy_reward: Some(0.1),
        )),
    )),
    quality: Common,
--- a/assets/common/items/armor/misc/head/bandana/red.ron
+++ b/assets/common/items/armor/misc/head/bandana/red.ron
@ -4,8 +4,8 @@ ItemDef(
    kind: Armor((
        kind: Head,
        stats: Direct((
-            precision_power: Some(0.006),
-            stealth: Some(0.14),
+            precision_power: Some(0.05),
+            stealth: Some(0.12),
        )),
    )),
    quality: Common,
--- a/assets/common/items/armor/misc/head/bandana/thief.ron
+++ b/assets/common/items/armor/misc/head/bandana/thief.ron
@ -4,8 +4,8 @@ ItemDef(
    kind: Armor((
        kind: Head,
        stats: Direct((
-            precision_power: Some(0.0045),
-            stealth: Some(0.18),
+            precision_power: Some(0.04),
+            stealth: Some(0.15),
        )),
    )),
    quality: Common,
--- a/assets/common/items/armor/misc/head/bear_bonnet.ron
+++ b/assets/common/items/armor/misc/head/bear_bonnet.ron
@ -5,8 +5,8 @@ ItemDef(
        kind: Head,
        stats: Direct((
            protection: Some(Normal(12.0)),
-            precision_power: Some(0.0095),
-            stealth: Some(0.21),
+            precision_power: Some(0.02),
+            stealth: Some(0.15),
        )),
    )),
    quality: Epic,
--- a/assets/common/items/armor/misc/head/boreal_warhelm.ron
+++ b/assets/common/items/armor/misc/head/boreal_warhelm.ron
@ -4,10 +4,10 @@ ItemDef(
    kind: Armor((
        kind: Head,
        stats: Direct((
-            protection: Some(Normal(9.82)),
-            poise_resilience: Some(Normal(5.5)),
-            energy_max: Some(-6.5),
-            precision_power: Some(0.065),
+            protection: Some(Normal(10.0)),
+            poise_resilience: Some(Normal(4.0)),
+            energy_max: Some(-5.0),
+            precision_power: Some(0.05),
            stealth: Some(0.05),
        )),
    )),
--- a/assets/common/items/armor/misc/head/cat_capuche.ron
+++ b/assets/common/items/armor/misc/head/cat_capuche.ron
@ -4,8 +4,8 @@ ItemDef(
    kind: Armor((
        kind: Head,
        stats: Direct((
-            energy_max: Some(4.0),
-            energy_reward: Some(0.04),
+            energy_max: Some(5.0),
+            energy_reward: Some(0.05),
        )),
    )),
    quality: Moderate,
--- a/assets/common/items/armor/misc/head/crown.ron
+++ b/assets/common/items/armor/misc/head/crown.ron
@ -4,10 +4,9 @@ ItemDef(
    kind: Armor((
        kind: Head,
        stats: Direct((
-            protection: Some(Normal(9.0)),
-            poise_resilience: Some(Normal(2.0)),
-            energy_max: Some(5.0),
-            precision_power: Some(0.006),
+            protection: Some(Normal(10.0)),
+            poise_resilience: Some(Normal(3.0)),
+            energy_max: Some(7.0),
        )),
    )),
    quality: Epic,
--- a/assets/common/items/armor/misc/head/facegourd.ron
+++ b/assets/common/items/armor/misc/head/facegourd.ron
@ -4,8 +4,8 @@ ItemDef(
    kind: Armor((
        kind: Head,
        stats: Direct((
-            energy_max: Some(4.0),
-            energy_reward: Some(0.04),
+            energy_max: Some(5.0),
+            energy_reward: Some(0.05),
        )),
    )),
    quality: Common,
--- a/assets/common/items/armor/misc/head/gnarling_mask.ron
+++ b/assets/common/items/armor/misc/head/gnarling_mask.ron
@ -6,7 +6,7 @@ ItemDef(
        stats: Direct((
            protection: Some(Normal(3.0)),
            poise_resilience: Some(Normal(1.0)),
-            energy_max: Some(6.0),
+            energy_max: Some(12.0),
        )),
    )),
    quality: Moderate,
--- a/assets/common/items/armor/misc/head/hare_hat.ron
+++ b/assets/common/items/armor/misc/head/hare_hat.ron
@ -4,8 +4,8 @@ ItemDef(
    kind: Armor((
        kind: Head,
        stats: Direct((
-            energy_max: Some(4.0),
-            energy_reward: Some(0.04),
+            energy_max: Some(5.0),
+            energy_reward: Some(0.05),
        )),
    )),
    quality: Moderate,
--- a/assets/common/items/armor/misc/head/hog_hood.ron
+++ b/assets/common/items/armor/misc/head/hog_hood.ron
@ -4,9 +4,9 @@ ItemDef(
    kind: Armor((
        kind: Head,
        stats: Direct((
-            protection: Some(Normal(3.0)),
-            precision_power: Some(0.0095),
-            stealth: Some(0.21),
+            protection: Some(Normal(5.0)),
+            precision_power: Some(0.04),
+            stealth: Some(0.15),
        )),
    )),
    quality: Moderate,
--- a/assets/common/items/armor/misc/head/hood.ron
+++ b/assets/common/items/armor/misc/head/hood.ron
@ -4,9 +4,9 @@ ItemDef(
    kind: Armor((
        kind: Head,
        stats: Direct((
-            protection: Some(Normal(2.5)),
-            precision_power: Some(0.016),
-            stealth: Some(0.22),
+            protection: Some(Normal(4.0)),
+            precision_power: Some(0.05),
+            stealth: Some(0.15),
        )),
    )),
    quality: Moderate,
--- a/assets/common/items/armor/misc/head/hood_dark.ron
+++ b/assets/common/items/armor/misc/head/hood_dark.ron
@ -4,9 +4,9 @@ ItemDef(
    kind: Armor((
        kind: Head,
        stats: Direct((
-            protection: Some(Normal(4.5)),
-            poise_resilience: Some(Normal(1.0)),
-            stealth: Some(0.2),
+            protection: Some(Normal(6.0)),
+            poise_resilience: Some(Normal(2.0)),
+            stealth: Some(0.15),
        )),
    )),
    quality: Moderate,
--- a/assets/common/items/armor/misc/head/howl_cowl.ron
+++ b/assets/common/items/armor/misc/head/howl_cowl.ron
@ -4,9 +4,9 @@ ItemDef(
    kind: Armor((
        kind: Head,
        stats: Direct((
-            protection: Some(Normal(4.0)),
-            precision_power: Some(0.065),
-            stealth: Some(0.21),
+            protection: Some(Normal(5.0)),
+            precision_power: Some(0.08),
+            stealth: Some(0.15),
        )),
    )),
    quality: Epic,
--- a/assets/common/items/armor/misc/head/mitre.ron
+++ b/assets/common/items/armor/misc/head/mitre.ron
@ -5,9 +5,8 @@ ItemDef(
        kind: Head,
        stats: Direct((
            protection: Some(Normal(2.0)),
-            poise_resilience: Some(Normal(0.5)),
-            energy_max: Some(7.0),
-            energy_reward: Some(0.06),
+            energy_max: Some(12.0),
+            energy_reward: Some(0.09),
        )),
    )),
    quality: High,
--- a/assets/common/items/armor/misc/head/scarlet_spectacles.ron
+++ b/assets/common/items/armor/misc/head/scarlet_spectacles.ron
@ -1,11 +1,11 @@
 ItemDef(
-    legacy_name: "Vampire glasses",
+    legacy_name: "Scarlet Spectacles",
    legacy_description: "Perfect for pulling pranks on your fellow adventurers by pretending to be a devilish creature of the night! We are not liable for any resulting damage, injuries, or angry mobs.",
    kind: Armor((
        kind: Head,
        stats: Direct((
            precision_power: Some(0.08),
-            energy_max: Some(-2.0),
+            energy_max: Some(4.0),
            energy_reward: Some(-0.04),
        )),
    )),
--- a/assets/common/items/armor/misc/head/spikeguard.ron
+++ b/assets/common/items/armor/misc/head/spikeguard.ron
@ -4,9 +4,9 @@ ItemDef(
    kind: Armor((
        kind: Head,
        stats: Direct((
-            protection: Some(Normal(7.0)),
-            poise_resilience: Some(Normal(3.0)),
-            precision_power: Some(0.036),
+            protection: Some(Normal(9.0)),
+            poise_resilience: Some(Normal(4.0)),
+            precision_power: Some(0.04),
        )),
    )),
    quality: High,
--- a/assets/common/items/armor/misc/head/straw.ron
+++ b/assets/common/items/armor/misc/head/straw.ron
@ -4,8 +4,8 @@ ItemDef(
    kind: Armor((
        kind: Head,
        stats: Direct((
-            energy_max: Some(3.0),
-            energy_reward: Some(0.02),
+            energy_max: Some(7.0),
+            energy_reward: Some(0.04),
        )),
    )),
    quality: Common,
--- a/assets/common/items/armor/misc/head/wanderers_hat.ron
+++ b/assets/common/items/armor/misc/head/wanderers_hat.ron
@ -4,7 +4,8 @@ ItemDef(
    kind: Armor((
        kind: Head,
        stats: Direct((
-            precision_power: Some(0.016),
+            energy_reward: Some(0.06),
+            precision_power: Some(0.06),
            stealth: Some(0.1),
        )),
    )),
--- a/assets/common/items/armor/misc/head/winged_coronet.ron
+++ b/assets/common/items/armor/misc/head/winged_coronet.ron
@ -5,10 +5,9 @@ ItemDef(
        kind: Head,
        stats: Direct((
            protection: Some(Normal(2.0)),
-            energy_max: Some(4.5),
-            energy_reward: Some(0.04),
-            precision_power: Some(0.006),
-            stealth: Some(0.17),
+            energy_max: Some(10.0),
+            energy_reward: Some(0.09),
+            stealth: Some(0.1),
        )),
    )),
    quality: High,
--- a/assets/common/items/armor/misc/neck/abyssal_gorget.ron
+++ b/assets/common/items/armor/misc/neck/abyssal_gorget.ron
@ -5,7 +5,8 @@ ItemDef(
        kind: Neck,
        stats: Direct((
            protection: Some(Normal(6.0)),
-            poise_resilience: Some(Normal(4.0)),
+            poise_resilience: Some(Normal(4.5)),
+            energy_max: Some(-4.5),
        )),
    )),
    quality: Legendary,
--- a/assets/common/items/armor/misc/neck/ankh_of_life.ron
+++ b/assets/common/items/armor/misc/neck/ankh_of_life.ron
@ -5,8 +5,9 @@ ItemDef(
        kind: Neck,
        stats: Direct((
            protection: Some(Normal(2.0)),
-            energy_max: Some(15.0),
-            energy_reward: Some(0.1),
+            energy_max: Some(10.0),
+            energy_reward: Some(0.05),
+            precision_power: Some(-0.075),
        )),
    )),
    quality: Legendary,
--- 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,9 @@ ItemDef(
        kind: Neck,
        stats: Direct((
            protection: Some(Normal(2.0)),
-            precision_power: Some(0.1),
+            energy_max: Some(5.0),
+            energy_reward: Some(-0.09375),
+            precision_power: Some(0.08),
        )),
    )),
    quality: Legendary,
--- 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.0375),
-            precision_power: Some(0.075),
+            energy_reward: Some(-0.0563),
+            precision_power: Some(0.09),
        )),
    )),
    quality: Epic,
--- 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(15.0),
-            energy_reward: Some(-0.15),
+            energy_max: Some(11.25),
+            energy_reward: Some(-0.0563),
        )),
    )),
    quality: High,
--- a/assets/common/items/armor/misc/neck/fang.ron
+++ b/assets/common/items/armor/misc/neck/fang.ron
@ -5,8 +5,8 @@ ItemDef(
        kind: Neck,
        stats: Direct((
            protection: Some(Normal(1.0)),
-            precision_power: Some(0.07),
-            energy_max: Some(-3.5),
+            precision_power: Some(0.06),
+            energy_max: Some(-3.75),
        )),
    )),
    quality: High,
--- a/assets/common/items/armor/misc/neck/gem_of_resilience.ron
+++ b/assets/common/items/armor/misc/neck/gem_of_resilience.ron
@ -4,8 +4,8 @@ ItemDef(
    kind: Armor((
        kind: Neck,
        stats: Direct((
-            protection: Some(Normal(2.0)),
-            poise_resilience: Some(Normal(1.0)),
+            protection: Some(Normal(3.0)),
+            poise_resilience: Some(Normal(2.0)),
        )),
    )),
    quality: Moderate,
--- a/assets/common/items/armor/misc/neck/gold.ron
+++ b/assets/common/items/armor/misc/neck/gold.ron
@ -5,7 +5,7 @@ ItemDef(
    kind: Armor((
        kind: Neck,
        stats: Direct((
-            protection: Some(Normal(1.5)),
+            protection: Some(Normal(2.0)),
        )),
    )),
    quality: Moderate,
--- a/assets/common/items/armor/misc/neck/haniwa_talisman.ron
+++ b/assets/common/items/armor/misc/neck/haniwa_talisman.ron
@ -4,9 +4,8 @@ ItemDef(
    kind: Armor((
        kind: Neck,
        stats: Direct((
-            protection: Some(Normal(3.0)),
-            poise_resilience: Some(Normal(2.0)),
-            energy_max: Some(-5.0),
+            protection: Some(Normal(4.0)),
+            poise_resilience: Some(Normal(3.0)),
        )),
    )),
    quality: High,
--- a/assets/common/items/armor/misc/neck/honeycomb_pendant.ron
+++ b/assets/common/items/armor/misc/neck/honeycomb_pendant.ron
@ -5,9 +5,9 @@ ItemDef(
        kind: Neck,
        stats: Direct((
            protection: Some(Normal(1.0)),
-            energy_max: Some(8.0),
-            energy_reward: Some(0.04),
-            precision_power: Some(-0.06),
+            energy_max: Some(5.0),
+            energy_reward: Some(0.025),
+            precision_power: Some(-0.03),
        )),
    )),
    quality: Moderate,
--- a/assets/common/items/armor/misc/neck/pendant_of_protection.ron
+++ b/assets/common/items/armor/misc/neck/pendant_of_protection.ron
@ -4,7 +4,8 @@ ItemDef(
    kind: Armor((
        kind: Neck,
        stats: Direct((
-            protection: Some(Normal(1.5)),
+            protection: Some(Normal(2.0)),
+            poise_resilience: Some(Normal(1.0)),
        )),
    )),
    quality: Common,
--- a/assets/common/items/armor/misc/neck/sapphire.ron
+++ b/assets/common/items/armor/misc/neck/sapphire.ron
@ -5,8 +5,8 @@ ItemDef(
        kind: Neck,
        stats: Direct((
            protection: Some(Normal(1.0)),
-            energy_reward: Some(-0.0225),
-            precision_power: Some(0.0225),
+            energy_reward: Some(-0.0375),
+            precision_power: Some(0.06),
        )),
    )),
    quality: High,
--- a/assets/common/items/armor/misc/neck/scratched.ron
+++ b/assets/common/items/armor/misc/neck/scratched.ron
@ -4,7 +4,7 @@ ItemDef(
    kind: Armor((
        kind: Neck,
        stats: Direct((
-            protection: Some(Normal(0.5)),
+            protection: Some(Normal(1.0)),
        )),
    )),
    quality: Low,
--- a/assets/common/items/armor/misc/neck/shell.ron
+++ b/assets/common/items/armor/misc/neck/shell.ron
@ -4,8 +4,9 @@ ItemDef(
    kind: Armor((
        kind: Neck,
        stats: Direct((
-            protection: Some(Normal(2.0)),
-            poise_resilience: Some(Normal(1.0)),
+            protection: Some(Normal(1.0)),
+            energy_max: Some(7.5),
+            precision_power: Some(-0.03),
        )),
    )),
    quality: Moderate,
--- a/assets/common/items/armor/misc/neck/topaz.ron
+++ b/assets/common/items/armor/misc/neck/topaz.ron
@ -4,9 +4,9 @@ ItemDef(
    kind: Armor((
        kind: Neck,
        stats: Direct((
-            protection: Some(Normal(0.5)),
-            energy_max: Some(9.0),
-            energy_reward: Some(-0.09),
+            protection: Some(Normal(1.0)),
+            energy_max: Some(7.5),
+            energy_reward: Some(-0.0375),
        )),
    )),
    quality: Common,
--- a/assets/common/items/armor/misc/ring/abyssal_ring.ron
+++ b/assets/common/items/armor/misc/ring/abyssal_ring.ron
@ -4,8 +4,9 @@ ItemDef(
    kind: Armor((
        kind: Ring,
        stats: Direct((
-            protection: Some(Normal(2.0)),
-            poise_resilience: Some(Normal(1.5)),
+            protection: Some(Normal(4.0)),
+            poise_resilience: Some(Normal(3.0)),
+            energy_max: Some(-3.0),
        )),
    )),
    quality: Legendary,
--- a/assets/common/items/armor/misc/ring/diamond.ron
+++ b/assets/common/items/armor/misc/ring/diamond.ron
@ -5,8 +5,8 @@ ItemDef(
        kind: Ring,
        stats: Direct((
            protection: Some(Normal(0.5)),
-            energy_reward: Some(-0.025),
-            precision_power: Some(0.04),
+            energy_reward: Some(-0.0375),
+            precision_power: Some(0.06),
        )),
    )),
    quality: Epic,
--- a/assets/common/items/armor/misc/ring/emerald.ron
+++ b/assets/common/items/armor/misc/ring/emerald.ron
@ -5,8 +5,8 @@ ItemDef(
        kind: Ring,
        stats: Direct((
            protection: Some(Normal(0.5)),
-            energy_max: Some(10.0),
-            energy_reward: Some(-0.1),
+            energy_max: Some(7.5),
+            energy_reward: Some(-0.0375),
        )),
    )),
    quality: High,
--- a/assets/common/items/armor/misc/ring/sapphire.ron
+++ b/assets/common/items/armor/misc/ring/sapphire.ron
@ -5,8 +5,8 @@ ItemDef(
        kind: Ring,
        stats: Direct((
            protection: Some(Normal(0.5)),
-            energy_reward: Some(-0.015),
-            precision_power: Some(0.015),
+            energy_reward: Some(-0.025),
+            precision_power: Some(0.04),
        )),
    )),
    quality: High,
--- 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.25)),
+            protection: Some(Normal(0.5)),
        )),
    )),
    quality: Low,
--- a/assets/common/items/armor/misc/ring/topaz.ron
+++ b/assets/common/items/armor/misc/ring/topaz.ron
@ -6,7 +6,7 @@ ItemDef(
        stats: Direct((
            protection: Some(Normal(0.5)),
            energy_max: Some(5.0),
-            energy_reward: Some(-0.05),
+            energy_reward: Some(-0.025),
        )),
    )),
    quality: Common,
--- a/assets/common/items/armor/pirate/hat.ron
+++ b/assets/common/items/armor/pirate/hat.ron
@ -4,8 +4,8 @@ ItemDef(
    kind: Armor((
        kind: Head,
        stats: Direct((
-            protection: Some(Normal(2.5)),
-            energy_reward: Some(0.025),
+            protection: Some(Normal(4.0)),
+            energy_reward: Some(0.03),
            precision_power: Some(0.08),
        )),
    )),
--- a/assets/common/items/armor/witch/hat.ron
+++ b/assets/common/items/armor/witch/hat.ron
@ -5,9 +5,8 @@ ItemDef(
        kind: Head,
        stats: Direct((
            protection: Some(Normal(2.0)),
-            poise_resilience: Some(Normal(1.5)),
-            energy_max: Some(8.0),
-            energy_reward: Some(0.084),
+            energy_max: Some(10.0),
+            energy_reward: Some(0.12),
        )),
    )),
    quality: Epic,
--- a/assets/common/items/npc_armor/biped_small/bushly/hand/bushly.ron
+++ b/assets/common/items/npc_armor/biped_small/bushly/hand/bushly.ron
@ -1,6 +1,6 @@
 ItemDef(
-    legacy_name: "Mandragora",
-    legacy_description: "Ceremonial attire used by members.",
+    legacy_name: "Bushly",
+    legacy_description: "Plant Creature",
    kind: Armor((
        kind: Hand,
        stats: Direct((
--- a/assets/common/items/npc_armor/biped_small/cactid/chest/cactid.ron
+++ b/assets/common/items/npc_armor/biped_small/cactid/chest/cactid.ron
@ -0,0 +1,16 @@
+ItemDef(
+    legacy_name: "Cactid",
+    legacy_description: "Cactid Chest",
+    kind: Armor((
+        kind: Chest,
+        stats: Direct((
+            protection: Some(Normal(4.0)),
+            poise_resilience: Some(Normal(4.0)),
+            energy_max: Some(3.4),
+            energy_reward: Some(0.81),
+            precision_power: Some(0.075),
+        )),
+    )),
+    quality: Low,
+    tags: [],
+)
--- a/assets/common/items/npc_armor/biped_small/cactid/foot/cactid.ron
+++ b/assets/common/items/npc_armor/biped_small/cactid/foot/cactid.ron
@ -0,0 +1,16 @@
+ItemDef(
+    legacy_name: "Cactid",
+    legacy_description: "Cactid Foot",
+    kind: Armor((
+        kind: Foot,
+        stats: Direct((
+            protection: Some(Normal(1.0)),
+            poise_resilience: Some(Normal(4.0)),
+            energy_max: Some(3.4),
+            energy_reward: Some(0.81),
+            precision_power: Some(0.075),
+        )),
+    )),
+    quality: Low,
+    tags: [],
+)
--- a/assets/common/items/npc_armor/biped_small/cactid/hand/cactid.ron
+++ b/assets/common/items/npc_armor/biped_small/cactid/hand/cactid.ron
@ -0,0 +1,16 @@
+ItemDef(
+    legacy_name: "Cactid",
+    legacy_description: "Cactid Hand",
+    kind: Armor((
+        kind: Hand,
+        stats: Direct((
+            protection: Some(Normal(1.0)),
+            poise_resilience: Some(Normal(4.0)),
+            energy_max: Some(3.4),
+            energy_reward: Some(0.81),
+            precision_power: Some(0.075),
+        )),
+    )),
+    quality: Low,
+    tags: [],
+)
--- a/assets/common/items/npc_armor/biped_small/cactid/head/cactid.ron
+++ b/assets/common/items/npc_armor/biped_small/cactid/head/cactid.ron
@ -0,0 +1,16 @@
+ItemDef(
+    legacy_name: "Cactid",
+    legacy_description: "Cactid Head",
+    kind: Armor((
+        kind: Head,
+        stats: Direct((
+            protection: Some(Normal(5.0)),
+            poise_resilience: Some(Normal(8.0)),
+            energy_max: Some(3.4),
+            energy_reward: Some(0.81),
+            precision_power: Some(0.075),
+        )),
+    )),
+    quality: Low,
+    tags: [],
+)
--- a/assets/common/items/npc_armor/biped_small/cactid/pants/cactid.ron
+++ b/assets/common/items/npc_armor/biped_small/cactid/pants/cactid.ron
@ -0,0 +1,16 @@
+ItemDef(
+    legacy_name: "Cactid",
+    legacy_description: "Cactid Pants",
+    kind: Armor((
+        kind: Pants,
+        stats: Direct((
+            protection: Some(Normal(2.0)),
+            poise_resilience: Some(Normal(4.0)),
+            energy_max: Some(3.4),
+            energy_reward: Some(0.81),
+            precision_power: Some(0.075),
+        )),
+    )),
+    quality: Low,
+    tags: [],
+)
--- a/assets/common/items/npc_weapons/unique/cactid.ron
+++ b/assets/common/items/npc_weapons/unique/cactid.ron
@ -0,0 +1,20 @@
+ItemDef(
+    legacy_name: "Cactid",
+    legacy_description: "Cactid.",
+    kind: Tool((
+        kind: Natural,
+        hands: Two,
+        stats: (
+            equip_time_secs: 0.01,
+            power: 1.0,
+            effect_power: 1.0,
+            speed: 1.0,
+            range: 1.0,
+            energy_efficiency: 1.0,
+            buff_strength: 1.0,
+        ),
+    )),
+    quality: Low,
+    tags: [],
+    ability_spec: Some(Custom("Cactid")),
+)
--- a/assets/common/items/weapons/axe/malachite_axe-0.ron
+++ b/assets/common/items/weapons/axe/malachite_axe-0.ron
@ -6,11 +6,11 @@ ItemDef(
        hands: Two,
        stats: (
            equip_time_secs: 0.5,
-            power: 1.45,
-            effect_power: 1.3,
-            speed: 0.8,
+            power: 2.175,
+            effect_power: 1.2,
+            speed: 0.7,
            range: 1.0,
-            energy_efficiency: 1.3,
+            energy_efficiency: 0.8,
            buff_strength: 1.2,
        ),
    )),
--- a/Show More
+++ b/Show More