Merge branch 'scaling_lower_tier_dungeons' into 'master'

Scaling dungeons See merge request veloren/veloren!2991
2024-08-30 18:12:32 +00:00 · 2021-11-20 15:57:18 +00:00 · 2021-11-20 15:57:18 +00:00 · 5274bf9eb3
commit 5274bf9eb3
parent 3018942291 5dca7f9515
73 changed files with 285 additions and 232 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -42,6 +42,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Agents using fireball projectiles aim at the feet instead of the eyes
 - Explosions can now have a nonzero minimum falloff
 - EXP on kill is now shared based on damage contribution
+- Dungeons have somewhat proper scaling. The higher the dungeon the harder it gets, Cultist staying unchanged while Mino is now at its level.

 ### Removed

--- a/assets/common/entity/dungeon/tier-0/staff.ron
+++ b/assets/common/entity/dungeon/tier-0/staff.ron
@ -9,5 +9,6 @@ EntityConfig (

    meta: [
        LoadoutAsset("common.loadout.dungeon.tier-0.gnarling"),
+        SkillSetAsset("common.skillset.dungeon.tier-0.staff"),
    ],
 )
--- a/assets/common/entity/dungeon/tier-1/staff.ron
+++ b/assets/common/entity/dungeon/tier-1/staff.ron
@ -9,5 +9,6 @@ EntityConfig (

    meta: [
        LoadoutAsset("common.loadout.dungeon.tier-1.adlet_spear"),
+        SkillSetAsset("common.skillset.dungeon.tier-1.staff"),
    ],
 )
--- a/assets/common/entity/dungeon/tier-2/staff.ron
+++ b/assets/common/entity/dungeon/tier-2/staff.ron
@ -9,5 +9,6 @@ EntityConfig (

    meta: [
        LoadoutAsset("common.loadout.dungeon.tier-2.sahagin"),
+        SkillSetAsset("common.skillset.dungeon.tier-2.staff"),
    ],
 )
--- a/assets/common/entity/dungeon/tier-3/staff.ron
+++ b/assets/common/entity/dungeon/tier-3/staff.ron
@ -9,5 +9,6 @@ EntityConfig (

    meta: [
        LoadoutAsset("common.loadout.dungeon.tier-3.haniwa"),
+        SkillSetAsset("common.skillset.dungeon.tier-3.staff"),
    ],
 )
--- a/assets/common/items/npc_armor/biped_small/adlet/chest/adlet_bow.ron
+++ b/assets/common/items/npc_armor/biped_small/adlet/chest/adlet_bow.ron
@ -4,11 +4,11 @@ ItemDef(
    kind: Armor((
        kind: Chest("AdletBow"),
        stats: (
-            protection: Normal(12.0),
-            poise_resilience: Normal(1.0),
-            energy_max: 0,
-            energy_reward: 0.0,
-            crit_power: 0.0,
+            protection: Normal(14.0),
+            poise_resilience: Normal(2.0),
+            energy_max: 4.4,
+            energy_reward: 0.054,
+            crit_power: 0.05,
            stealth: 0.0,
        ),
    )),
--- a/assets/common/items/npc_armor/biped_small/adlet/chest/adlet_spear.ron
+++ b/assets/common/items/npc_armor/biped_small/adlet/chest/adlet_spear.ron
@ -4,11 +4,11 @@ ItemDef(
    kind: Armor((
        kind: Chest("AdletSpear"),
        stats: (
-            protection: Normal(12.0),
-            poise_resilience: Normal(1.0),
+            protection: Normal(16.0),
+            poise_resilience: Normal(3.0),
            energy_max: 0,
            energy_reward: 0.0,
-            crit_power: 0.0,
+            crit_power: 0.06,
            stealth: 0.0,
        ),
    )),
--- a/assets/common/items/npc_armor/biped_small/adlet/foot/adlet.ron
+++ b/assets/common/items/npc_armor/biped_small/adlet/foot/adlet.ron
@ -4,11 +4,11 @@ ItemDef(
    kind: Armor((
        kind: Foot("Adlet"),
        stats: (
-            protection: Normal(10.0),
-            poise_resilience: Normal(1.0),
-            energy_max: 0,
-            energy_reward: 0.0,
-            crit_power: 0.0,
+            protection: Normal(4.0),
+            poise_resilience: Normal(2.0),
+            energy_max: 1.8,
+            energy_reward: 0.018,
+            crit_power: 0.016,
            stealth: 0.0,
        ),
    )),
--- a/assets/common/items/npc_armor/biped_small/adlet/hand/adlet_bow.ron
+++ b/assets/common/items/npc_armor/biped_small/adlet/hand/adlet_bow.ron
@ -4,11 +4,11 @@ ItemDef(
    kind: Armor((
        kind: Hand("AdletBow"),
        stats: (
-            protection: Normal(10.0),
-            poise_resilience: Normal(1.0),
-            energy_max: 0,
-            energy_reward: 0.0,
-            crit_power: 0.0,
+            protection: Normal(4.0),
+            poise_resilience: Normal(2.0),
+            energy_max: 1.8,
+            energy_reward: 0.018,
+            crit_power: 0.016,
            stealth: 0.0,
        ),
    )),
--- a/assets/common/items/npc_armor/biped_small/adlet/hand/adlet_spear.ron
+++ b/assets/common/items/npc_armor/biped_small/adlet/hand/adlet_spear.ron
@ -4,11 +4,11 @@ ItemDef(
    kind: Armor((
        kind: Hand("AdletSpear"),
        stats: (
-            protection: Normal(10.0),
-            poise_resilience: Normal(1.0),
-            energy_max: 0,
+            protection: Normal(6.0),
+            poise_resilience: Normal(3.0),
+            energy_max: 0.0,
            energy_reward: 0.0,
-            crit_power: 0.0,
+            crit_power: 0.016,
            stealth: 0.0,
        ),
    )),
--- a/assets/common/items/npc_armor/biped_small/adlet/head/adlet_bow.ron
+++ b/assets/common/items/npc_armor/biped_small/adlet/head/adlet_bow.ron
@ -4,11 +4,11 @@ ItemDef(
    kind: Armor((
        kind: Head("AdletBow"),
        stats: (
-            protection: Normal(10.0),
-            poise_resilience: Normal(1.0),
-            energy_max: 0,
-            energy_reward: 0.0,
-            crit_power: 0.0,
+            protection: Normal(7.0),
+            poise_resilience: Normal(2.0),
+            energy_max: 3.6,
+            energy_reward: 0.04,
+            crit_power: 0.32,
            stealth: 0.0,
        ),
    )),
--- a/assets/common/items/npc_armor/biped_small/adlet/head/adlet_spear.ron
+++ b/assets/common/items/npc_armor/biped_small/adlet/head/adlet_spear.ron
@ -4,11 +4,11 @@ ItemDef(
    kind: Armor((
        kind: Head("AdletSpear"),
        stats: (
-            protection: Normal(10.0),
-            poise_resilience: Normal(1.0),
+            protection: Normal(9.0),
+            poise_resilience: Normal(3.0),
            energy_max: 0,
            energy_reward: 0.0,
-            crit_power: 0.0,
+            crit_power: 0.032,
            stealth: 0.0,
        ),
    )),
--- a/assets/common/items/npc_armor/biped_small/adlet/pants/adlet_bow.ron
+++ b/assets/common/items/npc_armor/biped_small/adlet/pants/adlet_bow.ron
@ -4,11 +4,11 @@ ItemDef(
    kind: Armor((
        kind: Pants("AdletBow"),
        stats: (
-            protection: Normal(10.0),
-            poise_resilience: Normal(1.0),
-            energy_max: 0,
-            energy_reward: 0.0,
-            crit_power: 0.0,
+            protection: Normal(7.0),
+            poise_resilience: Normal(2.0),
+            energy_max: 3.6,
+            energy_reward: 0.04,
+            crit_power: 0.32,
            stealth: 0.0,
        ),
    )),
--- a/assets/common/items/npc_armor/biped_small/adlet/pants/adlet_spear.ron
+++ b/assets/common/items/npc_armor/biped_small/adlet/pants/adlet_spear.ron
@ -4,11 +4,11 @@ ItemDef(
    kind: Armor((
        kind: Pants("AdletSpear"),
        stats: (
-            protection: Normal(10.0),
-            poise_resilience: Normal(1.0),
+            protection: Normal(9.0),
+            poise_resilience: Normal(3.0),
            energy_max: 0,
            energy_reward: 0.0,
-            crit_power: 0.0,
+            crit_power: 0.032,
            stealth: 0.0,
        ),
    )),
--- a/assets/common/items/npc_armor/biped_small/adlet/tail/adlet.ron
+++ b/assets/common/items/npc_armor/biped_small/adlet/tail/adlet.ron
@ -4,11 +4,11 @@ ItemDef(
    kind: Armor((
        kind: Belt("Adlet"),
        stats: (
-            protection: Normal(10.0),
-            poise_resilience: Normal(1.0),
-            energy_max: 0,
-            energy_reward: 0.0,
-            crit_power: 0.0,
+            protection: Normal(3.0),
+            poise_resilience: Normal(3.0),
+            energy_max: 0.8,
+            energy_reward: 0.01,
+            crit_power: 0.008,
            stealth: 0.0,
        ),
    )),
--- a/assets/common/items/npc_armor/biped_small/gnarling/chest/gnarling.ron
+++ b/assets/common/items/npc_armor/biped_small/gnarling/chest/gnarling.ron
@ -6,9 +6,9 @@ ItemDef(
        stats: (
            protection: Normal(2.0),
            poise_resilience: Normal(1.0),
-            energy_max: 0,
-            energy_reward: 0.0,
-            crit_power: 0.0,
+            energy_max: 2.7,
+            energy_reward: 0.027,
+            crit_power: 0.025,
            stealth: 0.0,
        ),
    )),
--- a/assets/common/items/npc_armor/biped_small/gnarling/foot/gnarling.ron
+++ b/assets/common/items/npc_armor/biped_small/gnarling/foot/gnarling.ron
@ -6,9 +6,9 @@ ItemDef(
        stats: (
            protection: Normal(1.0),
            poise_resilience: Normal(1.0),
-            energy_max: 0,
-            energy_reward: 0.0,
-            crit_power: 0.0,
+            energy_max: 0.9,
+            energy_reward: 0.009,
+            crit_power: 0.008,
            stealth: 0.0,
        ),
    )),
--- a/assets/common/items/npc_armor/biped_small/gnarling/hand/gnarling.ron
+++ b/assets/common/items/npc_armor/biped_small/gnarling/hand/gnarling.ron
@ -6,9 +6,9 @@ ItemDef(
        stats: (
            protection: Normal(1.0),
            poise_resilience: Normal(1.0),
-            energy_max: 0,
-            energy_reward: 0.0,
-            crit_power: 0.0,
+            energy_max: 0.9,
+            energy_reward: 0.009,
+            crit_power: 0.008,
            stealth: 0.0,
        ),
    )),
--- a/assets/common/items/npc_armor/biped_small/gnarling/head/gnarling.ron
+++ b/assets/common/items/npc_armor/biped_small/gnarling/head/gnarling.ron
@ -6,9 +6,9 @@ ItemDef(
        stats: (
            protection: Normal(1.0),
            poise_resilience: Normal(1.0),
-            energy_max: 0,
-            energy_reward: 0.0,
-            crit_power: 0.0,
+            energy_max: 1.8,
+            energy_reward: 0.02,
+            crit_power: 0.016,
            stealth: 0.0,
        ),
    )),
--- a/assets/common/items/npc_armor/biped_small/gnarling/pants/gnarling.ron
+++ b/assets/common/items/npc_armor/biped_small/gnarling/pants/gnarling.ron
@ -6,9 +6,9 @@ ItemDef(
        stats: (
            protection: Normal(1.0),
            poise_resilience: Normal(1.0),
-            energy_max: 0,
-            energy_reward: 0.0,
-            crit_power: 0.0,
+            energy_max: 1.8,
+            energy_reward: 0.02,
+            crit_power: 0.016,
            stealth: 0.0,
        ),
    )),
--- a/assets/common/items/npc_armor/biped_small/gnarling/tail/gnarling.ron
+++ b/assets/common/items/npc_armor/biped_small/gnarling/tail/gnarling.ron
@ -6,9 +6,9 @@ ItemDef(
        stats: (
            protection: Normal(1.0),
            poise_resilience: Normal(1.0),
-            energy_max: 0,
-            energy_reward: 0.0,
-            crit_power: 0.0,
+            energy_max: 0.4,
+            energy_reward: 0.005,
+            crit_power: 0.004,
            stealth: 0.0,
        ),
    )),
--- a/assets/common/items/npc_armor/biped_small/haniwa/chest/haniwa.ron
+++ b/assets/common/items/npc_armor/biped_small/haniwa/chest/haniwa.ron
@ -4,11 +4,11 @@ ItemDef(
    kind: Armor((
        kind: Chest("Haniwa"),
        stats: (
-            protection: Normal(23.0),
-            poise_resilience: Normal(1.0),
-            energy_max: 0,
-            energy_reward: 0.0,
-            crit_power: 0.0,
+            protection: Normal(38.0),
+            poise_resilience: Normal(5.0),
+            energy_max: 5.0,
+            energy_reward: 0.108,
+            crit_power: 0.1,
            stealth: 0.0,
        ),
    )),
--- a/assets/common/items/npc_armor/biped_small/haniwa/foot/haniwa.ron
+++ b/assets/common/items/npc_armor/biped_small/haniwa/foot/haniwa.ron
@ -4,11 +4,11 @@ ItemDef(
    kind: Armor((
        kind: Foot("Haniwa"),
        stats: (
-            protection: Normal(17.0),
-            poise_resilience: Normal(1.0),
-            energy_max: 0,
-            energy_reward: 0.0,
-            crit_power: 0.0,
+            protection: Normal(10.0),
+            poise_resilience: Normal(5.0),
+            energy_max: 5.0,
+            energy_reward: 0.036,
+            crit_power: 0.032,
            stealth: 0.0,
        ),
    )),
--- a/assets/common/items/npc_armor/biped_small/haniwa/hand/haniwa.ron
+++ b/assets/common/items/npc_armor/biped_small/haniwa/hand/haniwa.ron
@ -4,11 +4,11 @@ ItemDef(
    kind: Armor((
        kind: Hand("Haniwa"),
        stats: (
-            protection: Normal(17.0),
-            poise_resilience: Normal(1.0),
-            energy_max: 0,
-            energy_reward: 0.0,
-            crit_power: 0.0,
+            protection: Normal(10.0),
+            poise_resilience: Normal(5.0),
+            energy_max: 5.0,
+            energy_reward: 0.036,
+            crit_power: 0.032,
            stealth: 0.0,
        ),
    )),
--- a/assets/common/items/npc_armor/biped_small/haniwa/head/haniwa.ron
+++ b/assets/common/items/npc_armor/biped_small/haniwa/head/haniwa.ron
@ -4,11 +4,11 @@ ItemDef(
    kind: Armor((
        kind: Head("Haniwa"),
        stats: (
-            protection: Normal(17.0),
-            poise_resilience: Normal(1.0),
-            energy_max: 0,
-            energy_reward: 0.0,
-            crit_power: 0.0,
+            protection: Normal(19.0),
+            poise_resilience: Normal(5.0),
+            energy_max: 5.0,
+            energy_reward: 0.08,
+            crit_power: 0.064,
            stealth: 0.0,
        ),
    )),
--- a/assets/common/items/npc_armor/biped_small/haniwa/pants/haniwa.ron
+++ b/assets/common/items/npc_armor/biped_small/haniwa/pants/haniwa.ron
@ -4,11 +4,11 @@ ItemDef(
    kind: Armor((
        kind: Pants("Haniwa"),
        stats: (
-            protection: Normal(17.0),
-            poise_resilience: Normal(1.0),
-            energy_max: 0,
-            energy_reward: 0.0,
-            crit_power: 0.0,
+            protection: Normal(19.0),
+            poise_resilience: Normal(5.0),
+            energy_max: 5.0,
+            energy_reward: 0.08,
+            crit_power: 0.064,
            stealth: 0.0,
        ),
    )),
--- a/assets/common/items/npc_armor/biped_small/myrmidon/chest/myrmidon.ron
+++ b/assets/common/items/npc_armor/biped_small/myrmidon/chest/myrmidon.ron
@ -4,12 +4,12 @@ ItemDef(
    kind: Armor((
        kind: Chest("Myrmidon"),
        stats: (
-            protection: Normal(36.0),
-            poise_resilience: Normal(1.0),
-            energy_max: 0,
-            energy_reward: 0.0,
-            crit_power: 0.0,
-            stealth: 0.0,
+            protection: Normal(48.0),
+            poise_resilience: Normal(6.0),
+            energy_max: 13.5,
+            energy_reward: 0.135,
+            crit_power: 0.125,
+            stealth: 0.125,
        ),
    )),
    quality: Low,
--- a/assets/common/items/npc_armor/biped_small/myrmidon/foot/myrmidon.ron
+++ b/assets/common/items/npc_armor/biped_small/myrmidon/foot/myrmidon.ron
@ -4,12 +4,12 @@ ItemDef(
    kind: Armor((
        kind: Foot("Myrmidon"),
        stats: (
-            protection: Normal(25.0),
-            poise_resilience: Normal(1.0),
-            energy_max: 0,
-            energy_reward: 0.0,
-            crit_power: 0.0,
-            stealth: 0.0,
+            protection: Normal(16.0),
+            poise_resilience: Normal(2.0),
+            energy_max: 4.5,
+            energy_reward: 0.045,
+            crit_power: 0.04,
+            stealth: 0.04,
        ),
    )),
    quality: Low,
--- a/assets/common/items/npc_armor/biped_small/myrmidon/hand/myrmidon.ron
+++ b/assets/common/items/npc_armor/biped_small/myrmidon/hand/myrmidon.ron
@ -4,12 +4,12 @@ ItemDef(
    kind: Armor((
        kind: Hand("Myrmidon"),
        stats: (
-            protection: Normal(25.0),
-            poise_resilience: Normal(1.0),
-            energy_max: 0,
-            energy_reward: 0.0,
-            crit_power: 0.0,
-            stealth: 0.0,
+            protection: Normal(16.0),
+            poise_resilience: Normal(2.0),
+            energy_max: 4.5,
+            energy_reward: 0.045,
+            crit_power: 0.04,
+            stealth: 0.04,
        ),
    )),
    quality: Low,
--- a/assets/common/items/npc_armor/biped_small/myrmidon/head/myrmidon.ron
+++ b/assets/common/items/npc_armor/biped_small/myrmidon/head/myrmidon.ron
@ -4,12 +4,12 @@ ItemDef(
    kind: Armor((
        kind: Head("Myrmidon"),
        stats: (
-            protection: Normal(25.0),
-            poise_resilience: Normal(1.0),
-            energy_max: 0,
-            energy_reward: 0.0,
-            crit_power: 0.0,
-            stealth: 0.0,
+            protection: Normal(32.0),
+            poise_resilience: Normal(5.0),
+            energy_max: 9.0,
+            energy_reward: 0.1,
+            crit_power: 0.08,
+            stealth: 0.08,
        ),
    )),
    quality: Low,
--- a/assets/common/items/npc_armor/biped_small/myrmidon/pants/myrmidon.ron
+++ b/assets/common/items/npc_armor/biped_small/myrmidon/pants/myrmidon.ron
@ -4,12 +4,12 @@ ItemDef(
    kind: Armor((
        kind: Pants("Myrmidon"),
        stats: (
-            protection: Normal(25.0),
-            poise_resilience: Normal(1.0),
-            energy_max: 0,
-            energy_reward: 0.0,
-            crit_power: 0.0,
-            stealth: 0.0,
+            protection: Normal(32.0),
+            poise_resilience: Normal(4.0),
+            energy_max: 9.0,
+            energy_reward: 0.1,
+            crit_power: 0.08,
+            stealth: 0.08,
        ),
    )),
    quality: Low,
--- a/assets/common/items/npc_armor/biped_small/myrmidon/tail/myrmidon.ron
+++ b/assets/common/items/npc_armor/biped_small/myrmidon/tail/myrmidon.ron
@ -4,12 +4,12 @@ ItemDef(
    kind: Armor((
        kind: Belt("Myrmidon"),
        stats: (
-            protection: Normal(25.0),
+            protection: Normal(8.0),
            poise_resilience: Normal(1.0),
-            energy_max: 0,
-            energy_reward: 0.0,
-            crit_power: 0.0,
-            stealth: 0.0,
+            energy_max: 2.0,
+            energy_reward: 0.025,
+            crit_power: 0.02,
+            stealth: 0.02,
        ),
    )),
    quality: Low,
--- a/assets/common/items/npc_armor/biped_small/sahagin/chest/sahagin.ron
+++ b/assets/common/items/npc_armor/biped_small/sahagin/chest/sahagin.ron
@ -4,11 +4,11 @@ ItemDef(
    kind: Armor((
        kind: Chest("Sahagin"),
        stats: (
-            protection: Normal(18.0),
-            poise_resilience: Normal(1.0),
-            energy_max: 0,
-            energy_reward: 0.0,
-            crit_power: 0.0,
+            protection: Normal(26.0),
+            poise_resilience: Normal(4.0),
+            energy_max: 3.4,
+            energy_reward: 0.81,
+            crit_power: 0.075,
            stealth: 0.0,
        ),
    )),
--- a/assets/common/items/npc_armor/biped_small/sahagin/foot/sahagin.ron
+++ b/assets/common/items/npc_armor/biped_small/sahagin/foot/sahagin.ron
@ -4,11 +4,11 @@ ItemDef(
    kind: Armor((
        kind: Foot("Sahagin"),
        stats: (
-            protection: Normal(14.0),
-            poise_resilience: Normal(1.0),
-            energy_max: 0,
-            energy_reward: 0.0,
-            crit_power: 0.0,
+            protection: Normal(7.0),
+            poise_resilience: Normal(4.0),
+            energy_max: 3.4,
+            energy_reward: 0.027,
+            crit_power: 0.024,
            stealth: 0.0,
        ),
    )),
--- a/assets/common/items/npc_armor/biped_small/sahagin/hand/sahagin.ron
+++ b/assets/common/items/npc_armor/biped_small/sahagin/hand/sahagin.ron
@ -4,11 +4,11 @@ ItemDef(
    kind: Armor((
        kind: Hand("Sahagin"),
        stats: (
-            protection: Normal(14.0),
-            poise_resilience: Normal(1.0),
-            energy_max: 0,
-            energy_reward: 0.0,
-            crit_power: 0.0,
+            protection: Normal(7.0),
+            poise_resilience: Normal(4.0),
+            energy_max: 3.4,
+            energy_reward: 0.027,
+            crit_power: 0.024,
            stealth: 0.0,
        ),
    )),
--- a/assets/common/items/npc_armor/biped_small/sahagin/head/sahagin.ron
+++ b/assets/common/items/npc_armor/biped_small/sahagin/head/sahagin.ron
@ -4,11 +4,11 @@ ItemDef(
    kind: Armor((
        kind: Head("Sahagin"),
        stats: (
-            protection: Normal(14.0),
-            poise_resilience: Normal(1.0),
-            energy_max: 0,
-            energy_reward: 0.0,
-            crit_power: 0.0,
+            protection: Normal(13.0),
+            poise_resilience: Normal(4.0),
+            energy_max: 3.4,
+            energy_reward: 0.06,
+            crit_power: 0.048,
            stealth: 0.0,
        ),
    )),
--- a/assets/common/items/npc_armor/biped_small/sahagin/pants/sahagin.ron
+++ b/assets/common/items/npc_armor/biped_small/sahagin/pants/sahagin.ron
@ -4,11 +4,11 @@ ItemDef(
    kind: Armor((
        kind: Pants("Sahagin"),
        stats: (
-            protection: Normal(14.0),
-            poise_resilience: Normal(1.0),
-            energy_max: 0,
-            energy_reward: 0.0,
-            crit_power: 0.0,
+            protection: Normal(13.0),
+            poise_resilience: Normal(4.0),
+            energy_max: 3.4,
+            energy_reward: 0.06,
+            crit_power: 0.048,
            stealth: 0.0,
        ),
    )),
--- a/assets/common/items/npc_armor/biped_small/sahagin/tail/sahagin.ron
+++ b/assets/common/items/npc_armor/biped_small/sahagin/tail/sahagin.ron
@ -4,11 +4,11 @@ ItemDef(
    kind: Armor((
        kind: Belt("Sahagin"),
        stats: (
-            protection: Normal(14.0),
-            poise_resilience: Normal(1.0),
-            energy_max: 0,
-            energy_reward: 0.0,
-            crit_power: 0.0,
+            protection: Normal(5.0),
+            poise_resilience: Normal(4.0),
+            energy_max: 3.4,
+            energy_reward: 0.015,
+            crit_power: 0.012,
            stealth: 0.0,
        ),
    )),
--- a/assets/common/items/npc_weapons/biped_small/adlet/adlet_bow.ron
+++ b/assets/common/items/npc_weapons/biped_small/adlet/adlet_bow.ron
@ -8,7 +8,7 @@ ItemDef(
            equip_time_secs: 0.0,
            power: 0.7,
            effect_power: 0.8,
-            speed: 0.3,
+            speed: 0.6,
            crit_chance: 0.08406594,
            range: 1.0,
            energy_efficiency: 1.0,
--- a/assets/common/items/npc_weapons/biped_small/adlet/gnoll_staff.ron
+++ b/assets/common/items/npc_weapons/biped_small/adlet/gnoll_staff.ron
@ -8,7 +8,7 @@ ItemDef(
            equip_time_secs: 0.0,
            power: 0.7,
            effect_power: 0.8,
-            speed: 0.5,
+            speed: 0.7,
            crit_chance: 0.05059524,
            range: 1.0,
            energy_efficiency: 1.0,
--- a/assets/common/items/npc_weapons/biped_small/gnarling/adlet_bow.ron
+++ b/assets/common/items/npc_weapons/biped_small/gnarling/adlet_bow.ron
@ -8,8 +8,8 @@ ItemDef(
            equip_time_secs: 0.0,
            power: 0.3,
            effect_power: 0.8,
-            speed: 0.7,
-            crit_chance: 0.26764706,
+            speed: 0.5,
+            crit_chance: 0.13541667,
            range: 1.0,
            energy_efficiency: 1.0,
            buff_strength: 1.0,
--- a/assets/common/items/npc_weapons/biped_small/gnarling/gnoll_staff.ron
+++ b/assets/common/items/npc_weapons/biped_small/gnarling/gnoll_staff.ron
@ -8,8 +8,8 @@ ItemDef(
            equip_time_secs: 0.0,
            power: 0.3,
            effect_power: 0.8,
-            speed: 0.8,
-            crit_chance: 0.12037037,
+            speed: 0.6,
+            crit_chance: 0.26764706,
            range: 1.0,
            energy_efficiency: 1.0,
            buff_strength: 1.0,
--- a/assets/common/items/npc_weapons/biped_small/gnarling/wooden_spear.ron
+++ b/assets/common/items/npc_weapons/biped_small/gnarling/wooden_spear.ron
@ -9,7 +9,7 @@ ItemDef(
            power: 0.3,
            effect_power: 1.0,
            speed: 1.0,
-            crit_chance: 0.13541667,
+            crit_chance: 0.12037037,
            range: 1.0,
            energy_efficiency: 1.0,
            buff_strength: 1.0,
--- a/assets/common/items/npc_weapons/biped_small/haniwa/adlet_bow.ron
+++ b/assets/common/items/npc_weapons/biped_small/haniwa/adlet_bow.ron
@ -8,8 +8,8 @@ ItemDef(
            equip_time_secs: 0.0,
            power: 1.6,
            effect_power: 0.8,
-            speed: 0.3,
-            crit_chance: 0.05625,
+            speed: 0.7,
+            crit_chance: 0.043827,
            range: 1.0,
            energy_efficiency: 1.0,
            buff_strength: 1.0,
--- a/assets/common/items/npc_weapons/biped_small/haniwa/gnoll_staff.ron
+++ b/assets/common/items/npc_weapons/biped_small/haniwa/gnoll_staff.ron
@ -6,10 +6,10 @@ ItemDef(
        hands: Two,
        stats: Direct((
            equip_time_secs: 0.0,
-            power: 1.8,
+            power: 1.6,
            effect_power: 0.8,
-            speed: 0.6,
-            crit_chance: 0.036458332,
+            speed: 0.8,
+            crit_chance: 0.043827,
            range: 1.0,
            energy_efficiency: 1.0,
            buff_strength: 1.0,
--- a/assets/common/items/npc_weapons/biped_small/haniwa/wooden_spear.ron
+++ b/assets/common/items/npc_weapons/biped_small/haniwa/wooden_spear.ron
@ -6,7 +6,7 @@ ItemDef(
        hands: Two,
        stats: Direct((
            equip_time_secs: 0.0,
-            power: 1.4,
+            power: 1.6,
            effect_power: 1.0,
            speed: 1.0,
            crit_chance: 0.05357143,
--- a/assets/common/items/npc_weapons/biped_small/myrmidon/adlet_bow.ron
+++ b/assets/common/items/npc_weapons/biped_small/myrmidon/adlet_bow.ron
@ -6,9 +6,9 @@ ItemDef(
        hands: Two,
        stats: Direct((
            equip_time_secs: 0.0,
-            power: 1.1,
+            power: 2.0,
            effect_power: 0.8,
-            speed: 0.5,
+            speed: 0.8,
            crit_chance: 0.095454544,
            range: 1.0,
            energy_efficiency: 1.0,
--- a/assets/common/items/npc_weapons/biped_small/myrmidon/gnoll_staff.ron
+++ b/assets/common/items/npc_weapons/biped_small/myrmidon/gnoll_staff.ron
@ -6,9 +6,9 @@ ItemDef(
        hands: Two,
        stats: Direct((
            equip_time_secs: 0.0,
-            power: 1.7,
+            power: 2.0,
            effect_power: 0.8,
-            speed: 0.7,
+            speed: 0.9,
            crit_chance: 0.040873703,
            range: 1.0,
            energy_efficiency: 1.0,
--- a/assets/common/items/npc_weapons/biped_small/myrmidon/wooden_spear.ron
+++ b/assets/common/items/npc_weapons/biped_small/myrmidon/wooden_spear.ron
@ -6,7 +6,7 @@ ItemDef(
        hands: Two,
        stats: Direct((
            equip_time_secs: 0.0,
-            power: 1.7,
+            power: 2.0,
            effect_power: 1.0,
            speed: 1.0,
            crit_chance: 0.04963235,
--- a/assets/common/items/npc_weapons/biped_small/sahagin/adlet_bow.ron
+++ b/assets/common/items/npc_weapons/biped_small/sahagin/adlet_bow.ron
@ -6,10 +6,10 @@ ItemDef(
        hands: Two,
        stats: Direct((
            equip_time_secs: 0.0,
-            power: 1.1,
+            power: 1.2,
            effect_power: 0.8,
-            speed: 0.3,
-            crit_chance: 0.066083916,
+            speed: 0.7,
+            crit_chance: 0.05965909,
            range: 1.0,
            energy_efficiency: 1.0,
            buff_strength: 1.0,
--- a/assets/common/items/npc_weapons/biped_small/sahagin/gnoll_staff.ron
+++ b/assets/common/items/npc_weapons/biped_small/sahagin/gnoll_staff.ron
@ -6,10 +6,10 @@ ItemDef(
        hands: Two,
        stats: Direct((
            equip_time_secs: 0.0,
-            power: 1.1,
+            power: 1.2,
            effect_power: 0.8,
            speed: 0.8,
-            crit_chance: 0.053030305,
+            crit_chance: 0.066083916,
            range: 1.0,
            energy_efficiency: 1.0,
            buff_strength: 1.0,
--- a/assets/common/items/npc_weapons/biped_small/sahagin/wooden_spear.ron
+++ b/assets/common/items/npc_weapons/biped_small/sahagin/wooden_spear.ron
@ -6,10 +6,10 @@ ItemDef(
        hands: Two,
        stats: Direct((
            equip_time_secs: 0.0,
-            power: 1.1,
+            power: 1.2,
            effect_power: 1.0,
            speed: 1.0,
-            crit_chance: 0.05965909,
+            crit_chance: 0.053030305,
            range: 1.0,
            energy_efficiency: 1.0,
            buff_strength: 1.0,
--- a/assets/common/loot_tables/dungeon/tier-0/boss.ron
+++ b/assets/common/loot_tables/dungeon/tier-0/boss.ron
@ -1,8 +1,13 @@
 [
    // Weapons
-    (2.0, LootTable("common.loot_tables.weapons.tier-0")),
+    (5.0, LootTable("common.loot_tables.weapons.tier-1")),
    // Armor
-    (2.0, LootTable("common.loot_tables.armor.tier-0")),
-    (1.0, Item("common.items.armor.misc.neck.scratched")),
-    (0.5, Item("common.items.armor.misc.head.straw")),
+    (5.0, LootTable("common.loot_tables.armor.tier-1")),
+    // Misc
+    (3.0, Item("common.items.armor.misc.neck.scratched")),
+    (2.0, Item("common.items.armor.misc.head.straw")),
+    // Indirect crafting materials for T2 gear
+    (1.0, ItemQuantity("common.items.crafting_ing.sticky_thread", 2, 5)),
+    (1.0, ItemQuantity("common.items.mineral.ore.coal", 2, 5)),
+    (1.0, ItemQuantity("common.items.crafting_ing.leather.leather_strips", 2, 5)),
 ]
--- a/assets/common/loot_tables/dungeon/tier-1/boss.ron
+++ b/assets/common/loot_tables/dungeon/tier-1/boss.ron
@ -1,7 +1,8 @@
 [
    // Weapons
-    (1.0, LootTable("common.loot_tables.weapons.tier-1")),
+    (4.0, LootTable("common.loot_tables.weapons.tier-2")),
    // Armor
-    (1.0, LootTable("common.loot_tables.armor.tier-1")),
-    (1.0, Item("common.items.armor.misc.neck.pendant_of_protection")),
+    (4.0, LootTable("common.loot_tables.armor.tier-2")),
+    // Misc
+    (2.0, Item("common.items.armor.misc.neck.pendant_of_protection")),
 ]
--- a/assets/common/loot_tables/dungeon/tier-2/boss.ron
+++ b/assets/common/loot_tables/dungeon/tier-2/boss.ron
@ -1,7 +1,9 @@
 [
-    // Equipment
-    (5.0, LootTable("common.loot_tables.weapons.tier-2")),
-    (5.0, LootTable("common.loot_tables.armor.tier-2")),
+    // Weapons
+    (5.0, LootTable("common.loot_tables.weapons.tier-3")),
+    // Armor
+    (5.0, LootTable("common.loot_tables.armor.tier-3")),
+    // Misc
    (2.0, Item("common.items.armor.misc.neck.gem_of_resilience")),
    // Special Loot
    (1.0, Item("common.items.armor.misc.bag.heavy_seabag")),
--- a/assets/common/loot_tables/dungeon/tier-3/boss.ron
+++ b/assets/common/loot_tables/dungeon/tier-3/boss.ron
@ -1,7 +1,8 @@
 [
    // Weapons
-    (1.0, LootTable("common.loot_tables.weapons.tier-3")),
+    (3.0, LootTable("common.loot_tables.weapons.tier-4")),
    // Armor
-    (1.0, LootTable("common.loot_tables.armor.tier-3")),
-    (0.3, Item("common.items.armor.misc.neck.haniwa_talisman")),
+    (3.0, LootTable("common.loot_tables.armor.tier-4")),
+    // Misc
+    (2.0, Item("common.items.armor.misc.neck.haniwa_talisman")),
 ]
--- a/assets/common/loot_tables/dungeon/tier-4/boss.ron
+++ b/assets/common/loot_tables/dungeon/tier-4/boss.ron
@ -2,6 +2,7 @@
    // Armor
    (10.0, LootTable("common.loot_tables.weapons.tier-5")),
    (10.0, LootTable("common.loot_tables.armor.tier-5")),
+    // Misc
    (1.0, Item("common.items.armor.misc.neck.carcanet_of_wrath")),
    // Legendary weapons
    (1.0, LootTable("common.loot_tables.weapons.legendary_melee")),
--- a/assets/common/loot_tables/dungeon/tier-4/chest.ron
+++ b/assets/common/loot_tables/dungeon/tier-4/chest.ron
@ -2,7 +2,7 @@
    // Gear
    (1.0, LootTable("common.loot_tables.weapons.tier-4")),
    (1.0, LootTable("common.loot_tables.armor.tier-4")),
-    (3.0, Item("common.items.armor.misc.head.spikeguard")),
+    (1.0, Item("common.items.armor.misc.head.spikeguard")),
    // Currency
    (3.0, ItemQuantity("common.items.utility.coins", 200, 500)),
    // Materials
--- a/assets/common/skillset/dungeon/tier-0/enemy.ron
+++ b/assets/common/skillset/dungeon/tier-0/enemy.ron
@ -1,4 +1,5 @@
 ([
    //You can always add more :P
    Tree("common.skillset.dungeon.tier-0.bow"),
+    Tree("common.skillset.dungeon.tier-0.staff"),
 ])
--- a/assets/common/skillset/dungeon/tier-0/staff.ron
+++ b/assets/common/skillset/dungeon/tier-0/staff.ron
@ -0,0 +1,9 @@
+([
+    Group(Weapon(Staff)),
+
+    // Fireball
+    Skill((Staff(BDamage), Some(1))),
+    Skill((Staff(BRegen), Some(1))),
+    Skill((Staff(BRadius), Some(1))),
+
+])
--- a/assets/common/skillset/dungeon/tier-1/bow.ron
+++ b/assets/common/skillset/dungeon/tier-1/bow.ron
@ -2,11 +2,9 @@
    Group(Weapon(Bow)),

    // Charged
-    Skill((Bow(CDamage), Some(1))),
-    Skill((Bow(CKnockback), Some(1))),
+    Skill((Bow(CDamage), Some(2))),
+    Skill((Bow(CKnockback), Some(2))),
    Skill((Bow(CSpeed), Some(1))),
    Skill((Bow(CMove), Some(1))),

-    // Repeater
-    Skill((Bow(RDamage), Some(1))),
 ])
--- a/assets/common/skillset/dungeon/tier-1/enemy.ron
+++ b/assets/common/skillset/dungeon/tier-1/enemy.ron
@ -1,4 +1,5 @@
 ([
    //You can always add more :P
    Tree("common.skillset.dungeon.tier-1.bow"),
+    Tree("common.skillset.dungeon.tier-1.staff"),
 ])
--- a/assets/common/skillset/dungeon/tier-1/staff.ron
+++ b/assets/common/skillset/dungeon/tier-1/staff.ron
@ -0,0 +1,12 @@
+([
+    Group(Weapon(Staff)),
+
+    // Fireball
+    Skill((Staff(BDamage), Some(2))),
+    Skill((Staff(BRegen), Some(2))),
+    Skill((Staff(BRadius), Some(1))),
+
+    // Flamethrower
+    Skill((Staff(FRange), Some(1))),
+
+])
--- a/assets/common/skillset/dungeon/tier-2/bow.ron
+++ b/assets/common/skillset/dungeon/tier-2/bow.ron
@ -2,14 +2,10 @@
    Group(Weapon(Bow)),

    // Charged
-    Skill((Bow(CDamage), Some(1))),
-    Skill((Bow(CKnockback), Some(1))),
-    Skill((Bow(CSpeed), Some(1))),
+    Skill((Bow(CDamage), Some(2))),
+    Skill((Bow(CKnockback), Some(2))),
+    Skill((Bow(CSpeed), Some(2))),
    Skill((Bow(CMove), Some(1))),

-    // Repeater
-    Skill((Bow(RDamage), Some(1))),
-    Skill((Bow(RCost), Some(1))),
-    Skill((Bow(RSpeed), Some(1))),
 ])

--- a/assets/common/skillset/dungeon/tier-2/enemy.ron
+++ b/assets/common/skillset/dungeon/tier-2/enemy.ron
@ -1,4 +1,5 @@
 ([
    //You can always add more :P
    Tree("common.skillset.dungeon.tier-2.bow"),
+    Tree("common.skillset.dungeon.tier-2.staff"),
 ])
--- a/assets/common/skillset/dungeon/tier-2/staff.ron
+++ b/assets/common/skillset/dungeon/tier-2/staff.ron
@ -0,0 +1,13 @@
+([
+    Group(Weapon(Staff)),
+
+    // Fireball
+    Skill((Staff(BDamage), Some(2))),
+    Skill((Staff(BRegen), Some(2))),
+    Skill((Staff(BRadius), Some(1))),
+
+    // Flamethrower
+    Skill((Staff(FRange), Some(2))),
+    Skill((Staff(FDamage), Some(2))),
+
+])
--- a/assets/common/skillset/dungeon/tier-3/bow.ron
+++ b/assets/common/skillset/dungeon/tier-3/bow.ron
@ -2,20 +2,10 @@
    Group(Weapon(Bow)),

    // Charged
-    Skill((Bow(CDamage), Some(1))),
-    Skill((Bow(CRegen), Some(1))),
-    Skill((Bow(CKnockback), Some(1))),
-    Skill((Bow(CSpeed), Some(1))),
-    Skill((Bow(CMove), Some(1))),
+    Skill((Bow(CDamage), Some(2))),
+    Skill((Bow(CRegen), Some(2))),
+    Skill((Bow(CKnockback), Some(2))),
+    Skill((Bow(CSpeed), Some(2))),
+    Skill((Bow(CMove), Some(2))),

-    // Repeater
-    Skill((Bow(RDamage), Some(1))),
-    Skill((Bow(RSpeed), Some(1))),
-
-    // Shotgun
-    Skill((Bow(UnlockShotgun), None)),
-    Skill((Bow(SDamage), Some(1))),
-    Skill((Bow(SSpread), Some(1))),
-    Skill((Bow(SArrows), Some(1))),
-    Skill((Bow(SCost), Some(1))),
 ])
--- a/assets/common/skillset/dungeon/tier-3/enemy.ron
+++ b/assets/common/skillset/dungeon/tier-3/enemy.ron
@ -1,4 +1,5 @@
 ([
    //You can always add more :P
    Tree("common.skillset.dungeon.tier-3.bow"),
+    Tree("common.skillset.dungeon.tier-3.staff"),
 ])
--- a/assets/common/skillset/dungeon/tier-3/sceptre.ron
+++ b/assets/common/skillset/dungeon/tier-3/sceptre.ron
@ -2,16 +2,16 @@
    Group(Weapon(Sceptre)),

    // Beam
-    Skill((Sceptre(LDamage), Some(1))),
-    Skill((Sceptre(LRange), Some(1))),
-    Skill((Sceptre(LLifesteal), Some(1))),
-    Skill((Sceptre(LRegen), Some(1))),
+    Skill((Sceptre(LDamage), Some(3))),
+    Skill((Sceptre(LRange), Some(2))),
+    Skill((Sceptre(LLifesteal), Some(2))),
+    Skill((Sceptre(LRegen), Some(2))),

    // Heal
-    Skill((Sceptre(HHeal), Some(1))),
-    Skill((Sceptre(HDuration), Some(1))),
-    Skill((Sceptre(HRange), Some(1))),
-    Skill((Sceptre(HCost), Some(1))),
+    Skill((Sceptre(HHeal), Some(2))),
+    Skill((Sceptre(HDuration), Some(2))),
+    Skill((Sceptre(HRange), Some(2))),
+    Skill((Sceptre(HCost), Some(2))),
    // Ward
    Skill((Sceptre(UnlockAura), None)),
    Skill((Sceptre(AStrength), Some(1))),
--- a/assets/common/skillset/dungeon/tier-3/staff.ron
+++ b/assets/common/skillset/dungeon/tier-3/staff.ron
@ -0,0 +1,15 @@
+([
+    Group(Weapon(Staff)),
+
+    // Fireball
+    Skill((Staff(BDamage), Some(2))),
+    Skill((Staff(BRegen), Some(2))),
+    Skill((Staff(BRadius), Some(2))),
+
+    // Flamethrower
+    Skill((Staff(FRange), Some(2))),
+    Skill((Staff(FDamage), Some(3))),
+    Skill((Staff(FDrain), Some(2))),
+    Skill((Staff(FVelocity), Some(1))),
+
+])
--- a/assets/common/skillset/dungeon/tier-3/sword.ron
+++ b/assets/common/skillset/dungeon/tier-3/sword.ron
@ -3,16 +3,16 @@

    // TripleStrike
    Skill((Sword(TsCombo), None)),
-    Skill((Sword(TsDamage), Some(1))),
-    Skill((Sword(TsRegen), Some(1))),
+    Skill((Sword(TsDamage), Some(3))),
+    Skill((Sword(TsRegen), Some(2))),

    // Dash
-    Skill((Sword(DDamage), Some(1))),
-    Skill((Sword(DCost), Some(1))),
-    Skill((Sword(DDrain), Some(1))),
+    Skill((Sword(DDamage), Some(2))),
+    Skill((Sword(DCost), Some(2))),
+    Skill((Sword(DDrain), Some(2))),

    // Spin of death
    Skill((Sword(UnlockSpin), None)),
-    Skill((Sword(SDamage), Some(2))),
-    Skill((Sword(SCost), Some(2))),
+    Skill((Sword(SDamage), Some(1))),
+    Skill((Sword(SCost), Some(1))),
 ])
--- a/assets/common/skillset/dungeon/tier-4/enemy.ron
+++ b/assets/common/skillset/dungeon/tier-4/enemy.ron
@ -1,4 +1,5 @@
 ([
    //You can always add more :P
    Tree("common.skillset.preset.max.bow"),
+    Tree("common.skillset.preset.max.staff"),
 ])
--- a/assets/voxygen/item_image_manifest.ron
+++ b/assets/voxygen/item_image_manifest.ron
@ -2949,4 +2949,4 @@
        "voxel.weapon_components.sword.cultist.cultist_purp_2h-0_handle",
        (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5,
    ),
-})
+})