Merge branch 'juliancoffee/small_fixes' into 'master'

Ranged, Tidal Warrior, spears, assets

See merge request veloren/veloren!2416

assets/common/abilities/bow/charged.ron

@@ -1,15 +1,15 @@
 ChargedRanged(
     energy_cost: 0,
     energy_drain: 0,
-    initial_regen: 20,
+    initial_regen: 5,
     scaled_regen: 120,
-    initial_damage: 20,
+    initial_damage: 5,
-    scaled_damage: 100,
+    scaled_damage: 120,
     initial_knockback: 0.0,
     scaled_knockback: 10.0,
     speed: 1.0,
     buildup_duration: 0.2,
-    charge_duration: 1.2,
+    charge_duration: 1.0,
     recover_duration: 0.3,
     projectile_body: Object(Arrow),
     projectile_light: None,

assets/common/abilities/custom/quadlowbreathe/dash.ron

@@ -13,7 +13,7 @@ DashMelee(
     buildup_duration: 0.5,
     charge_duration: 1.0,
     swing_duration: 0.1,
-    recover_duration: 0.8,
+    recover_duration: 1.0,
     charge_through: true,
     is_interruptible: false,
     damage_kind: Crushing,

assets/common/abilities/custom/quadlowquick/dash.ron

@@ -13,7 +13,7 @@ DashMelee(
     buildup_duration: 0.5,
     charge_duration: 0.8,
     swing_duration: 0.1,
-    recover_duration: 0.5,
+    recover_duration: 1.0,
     charge_through: true,
     is_interruptible: false,
     damage_kind: Crushing,

assets/common/abilities/custom/quadmedquick/dash.ron

@@ -13,7 +13,7 @@ DashMelee(
     buildup_duration: 1.2,
     charge_duration: 1.0,
     swing_duration: 0.1,
-    recover_duration: 0.5,
+    recover_duration: 1.0,
     charge_through: true,
     is_interruptible: false,
     damage_kind: Crushing,

assets/common/abilities/custom/tidalwarrior/bubbles.ron

@@ -2,14 +2,14 @@ BasicBeam(
     buildup_duration: 0.5,
     recover_duration: 0.5,
     beam_duration: 2.5,
-    damage: 100,
+    damage: 50,
     tick_rate: 2.0,
     range: 25.0,
     max_angle: 15.0,
     damage_effect: Some(Buff((
         kind: Wet,
-        dur_secs: 15.0,
+        dur_secs: 5.0,
-        strength: Value(4.5),
+        strength: Value(2.5),
         chance: 1.0,
     ))),
     energy_regen: 0,

assets/common/abilities/custom/tidalwarrior/totem_wave.ron

@@ -1,11 +1,11 @@
 Shockwave(
     energy_cost: 0,
-    buildup_duration: 1.4,
+    buildup_duration: 0.4,
     swing_duration: 0.1,
-    recover_duration: 0.5,
+    recover_duration: 3.5,
     damage: 10,
     poise_damage: 0,
-    knockback: ( strength: 100.0, direction: Up),
+    knockback: ( strength: 25.0, direction: Away),
     shockwave_angle: 360.0,
     shockwave_vertical_angle: 30.0,
     shockwave_speed: 10.0,

assets/common/abilities/spear/dash.ron

@@ -1,9 +1,9 @@
 DashMelee(
     energy_cost: 100,
-    base_damage: 60,
+    base_damage: 10,
-    scaled_damage: 100,
+    scaled_damage: 80,
-    base_poise_damage: 45,
+    base_poise_damage: 0,
-    scaled_poise_damage: 0,
+    scaled_poise_damage: 25,
     base_knockback: 8.0,
     scaled_knockback: 7.0,
     range: 3.0,
@@ -13,7 +13,7 @@ DashMelee(
     buildup_duration: 0.5,
     charge_duration: 1.0,
     swing_duration: 0.1,
-    recover_duration: 0.5,
+    recover_duration: 0.8,
     charge_through: true,
     is_interruptible: true,
     damage_kind: Piercing,

assets/common/abilities/staff/firebomb.ron

@@ -5,7 +5,7 @@ BasicRanged(
     projectile: Fireball(
         damage: 90.0,
         radius: 4.0,
-        energy_regen: 50,
+        energy_regen: 60,
     ),
     projectile_body: Object(BoltFire),
     projectile_speed: 60.0,

assets/common/items/npc_weapons/biped_small/haniwa/adlet_bow.ron

@@ -14,4 +14,4 @@ ItemDef(
     )),
     quality: Moderate,
     tags: [],
-)
+)

assets/server/manifests/kits.ron

@@ -6,33 +6,271 @@
         ("common.items.debug.velorite_bow_debug", 1),
         ("common.items.debug.admin",1),
     ],
-    "admin_cosmetics": [
+    "consumables": [
-        ("common.items.debug.cultist_belt",1),
+        ("common.items.consumable.potion_minor", 100),
-        ("common.items.debug.cultist_boots",1),
+        ("common.items.consumable.potion_med", 100),
-        ("common.items.debug.cultist_chest_blue",1),
+        ("common.items.consumable.potion_big", 100),
-        ("common.items.debug.cultist_hands_blue",1),
+        ("common.items.food.apple_mushroom_curry", 100),
-        ("common.items.debug.cultist_legs_blue",1),
-        ("common.items.debug.cultist_shoulder_blue",1),
-        ("common.items.debug.dungeon_purple",1),
-        ("common.items.debug.admin_back",1),
     ],
-    "cultist": [
+    "endgame": [
-        ("common.items.armor.cultist.chest",1),
+        // Biju
-        ("common.items.armor.cultist.pants",1),
-        ("common.items.armor.cultist.hand",1),
-        ("common.items.armor.cultist.foot",1),
-        ("common.items.armor.cultist.shoulder",1),
-        ("common.items.armor.cultist.belt",1),
         ("common.items.armor.misc.neck.plain_1",1),
         ("common.items.armor.misc.ring.skull",1),
         ("common.items.armor.misc.ring.skull",1),
-        ("common.items.armor.misc.back.dungeon_purple",1),
+
+        // Cultist weapons
         ("common.items.weapons.hammer.cultist_purp_2h-0",1),
         ("common.items.weapons.staff.cultist_staff",1),
         ("common.items.weapons.sword.cultist",1),
         ("common.items.weapons.bow.velorite",1),
         ("common.items.weapons.axe.malachite_axe-0",1),
         ("common.items.weapons.sceptre.sceptre_velorite_0",1),
+
+        // Legendaries
+        ("common.items.weapons.hammer.mjolnir",1),
+        ("common.items.weapons.staff.laevateinn",1),
+        ("common.items.weapons.staff.phoenix",1),
+        ("common.items.weapons.sword.caladbolg",1),
+        ("common.items.weapons.bow.sagitta",1),
+        ("common.items.weapons.axe.parashu",1),
+        ("common.items.weapons.sceptre.caduceus",1),
+        ("common.items.weapons.sceptre.root_evil",1),
+
+    ],
+    "tier-5": [
+         // Hide
+        ("common.items.armor.hide.dragonscale.back", 1),
+        ("common.items.armor.hide.dragonscale.belt", 1),
+        ("common.items.armor.hide.dragonscale.chest", 1),
+        ("common.items.armor.hide.dragonscale.foot", 1),
+        ("common.items.armor.hide.dragonscale.hand", 1),
+        ("common.items.armor.hide.dragonscale.pants", 1),
+        ("common.items.armor.hide.dragonscale.shoulder", 1),
+
+        // Cloth
+        ("common.items.armor.cloth.sunsilk.back", 1),
+        ("common.items.armor.cloth.sunsilk.belt", 1),
+        ("common.items.armor.cloth.sunsilk.chest", 1),
+        ("common.items.armor.cloth.sunsilk.foot", 1),
+        ("common.items.armor.cloth.sunsilk.hand", 1),
+        ("common.items.armor.cloth.sunsilk.pants", 1),
+        ("common.items.armor.cloth.sunsilk.shoulder", 1),
+
+        // Mail
+        ("common.items.armor.mail.orichalcum.back", 1),
+        ("common.items.armor.mail.orichalcum.belt", 1),
+        ("common.items.armor.mail.orichalcum.chest", 1),
+        ("common.items.armor.mail.orichalcum.foot", 1),
+        ("common.items.armor.mail.orichalcum.hand", 1),
+        ("common.items.armor.mail.orichalcum.pants", 1),
+        ("common.items.armor.mail.orichalcum.shoulder", 1),
+
+        // Weapons
+        ("common.items.weapons.sword.bloodsteel-0", 1),
+        ("common.items.weapons.axe.bloodsteel_axe-0", 1),
+        ("common.items.weapons.hammer.runic_hammer", 1),
+        ("common.items.weapons.bow.eldwood-0", 1),
+        ("common.items.weapons.staff.ruby_rod", 1),
+        ("common.items.weapons.sceptre.emerald", 1),
+
+        // Potion Kit
+        ("common.items.consumable.potion_med", 100),
+    ],
+    "tier-4": [
+         // Hide
+        ("common.items.armor.hide.primal.back", 1),
+        ("common.items.armor.hide.primal.belt", 1),
+        ("common.items.armor.hide.primal.chest", 1),
+        ("common.items.armor.hide.primal.foot", 1),
+        ("common.items.armor.hide.primal.hand", 1),
+        ("common.items.armor.hide.primal.pants", 1),
+        ("common.items.armor.hide.primal.shoulder", 1),
+
+        // Cloth
+        ("common.items.armor.cloth.moonweave.back", 1),
+        ("common.items.armor.cloth.moonweave.belt", 1),
+        ("common.items.armor.cloth.moonweave.chest", 1),
+        ("common.items.armor.cloth.moonweave.foot", 1),
+        ("common.items.armor.cloth.moonweave.hand", 1),
+        ("common.items.armor.cloth.moonweave.pants", 1),
+        ("common.items.armor.cloth.moonweave.shoulder", 1),
+
+        // Mail
+        ("common.items.armor.mail.bloodsteel.back", 1),
+        ("common.items.armor.mail.bloodsteel.belt", 1),
+        ("common.items.armor.mail.bloodsteel.chest", 1),
+        ("common.items.armor.mail.bloodsteel.foot", 1),
+        ("common.items.armor.mail.bloodsteel.hand", 1),
+        ("common.items.armor.mail.bloodsteel.pants", 1),
+        ("common.items.armor.mail.bloodsteel.shoulder", 1),
+
+        // Weapons
+        ("common.items.weapons.sword.cobalt-0", 1),
+        ("common.items.weapons.axe.cobalt_axe-0", 1),
+        ("common.items.weapons.hammer.cobalt_hammer-0", 1),
+        ("common.items.weapons.bow.frostwood-0", 1),
+        ("common.items.weapons.staff.frostwood_torch", 1),
+        ("common.items.weapons.sceptre.fork0", 1),
+
+        // Potion Kit
+        ("common.items.consumable.potion_med", 100),
+    ],
+    "tier-3": [
+         // Hide
+        ("common.items.armor.hide.carapace.back", 1),
+        ("common.items.armor.hide.carapace.belt", 1),
+        ("common.items.armor.hide.carapace.chest", 1),
+        ("common.items.armor.hide.carapace.foot", 1),
+        ("common.items.armor.hide.carapace.hand", 1),
+        ("common.items.armor.hide.carapace.pants", 1),
+        ("common.items.armor.hide.carapace.shoulder", 1),
+
+        // Cloth
+        ("common.items.armor.cloth.druid.back", 1),
+        ("common.items.armor.cloth.druid.belt", 1),
+        ("common.items.armor.cloth.druid.chest", 1),
+        ("common.items.armor.cloth.druid.foot", 1),
+        ("common.items.armor.cloth.druid.hand", 1),
+        ("common.items.armor.cloth.druid.pants", 1),
+        ("common.items.armor.cloth.druid.shoulder", 1),
+
+        // Mail
+        ("common.items.armor.mail.cobalt.back", 1),
+        ("common.items.armor.mail.cobalt.belt", 1),
+        ("common.items.armor.mail.cobalt.chest", 1),
+        ("common.items.armor.mail.cobalt.foot", 1),
+        ("common.items.armor.mail.cobalt.hand", 1),
+        ("common.items.armor.mail.cobalt.pants", 1),
+        ("common.items.armor.mail.cobalt.shoulder", 1),
+
+        // Weapons
+        ("common.items.weapons.sword.steel-0", 1),
+        ("common.items.weapons.axe.steel_axe-0", 1),
+        ("common.items.weapons.hammer.steel_hammer-0", 1),
+        ("common.items.weapons.bow.metal-0", 1),
+        ("common.items.weapons.staff.flamethrower_0", 1),
+        ("common.items.weapons.sceptre.coralline_cane", 1),
+
+        // Potion Kit
+        ("common.items.consumable.potion_med", 100),
+    ],
+    "tier-2": [
+        // Hide
+        ("common.items.armor.hide.scale.back", 1),
+        ("common.items.armor.hide.scale.belt", 1),
+        ("common.items.armor.hide.scale.chest", 1),
+        ("common.items.armor.hide.scale.foot", 1),
+        ("common.items.armor.hide.scale.hand", 1),
+        ("common.items.armor.hide.scale.pants", 1),
+        ("common.items.armor.hide.scale.shoulder", 1),
+
+        // Cloth
+        ("common.items.armor.cloth.silken.back", 1),
+        ("common.items.armor.cloth.silken.belt", 1),
+        ("common.items.armor.cloth.silken.chest", 1),
+        ("common.items.armor.cloth.silken.foot", 1),
+        ("common.items.armor.cloth.silken.hand", 1),
+        ("common.items.armor.cloth.silken.pants", 1),
+        ("common.items.armor.cloth.silken.shoulder", 1),
+
+        // Mail
+        ("common.items.armor.mail.steel.back", 1),
+        ("common.items.armor.mail.steel.belt", 1),
+        ("common.items.armor.mail.steel.chest", 1),
+        ("common.items.armor.mail.steel.foot", 1),
+        ("common.items.armor.mail.steel.hand", 1),
+        ("common.items.armor.mail.steel.pants", 1),
+        ("common.items.armor.mail.steel.shoulder", 1),
+
+        // Weapons
+        ("common.items.weapons.sword.iron-0", 1),
+        ("common.items.weapons.axe.iron_axe-0", 1),
+        ("common.items.weapons.hammer.iron_hammer-0", 1),
+        ("common.items.weapons.bow.hardwood-0", 1),
+        ("common.items.weapons.staff.heated_arm", 1),
+        ("common.items.weapons.sceptre.druids_arbor", 1),
+        
+        // Potion Kit
+        ("common.items.consumable.potion_med", 100),
+    ],
+    "tier-1": [
+        // Hide
+        ("common.items.armor.hide.leather.back", 1),
+        ("common.items.armor.hide.leather.belt", 1),
+        ("common.items.armor.hide.leather.chest", 1),
+        ("common.items.armor.hide.leather.foot", 1),
+        ("common.items.armor.hide.leather.hand", 1),
+        ("common.items.armor.hide.leather.pants", 1),
+        ("common.items.armor.hide.leather.shoulder", 1),
+
+        // Cloth
+        ("common.items.armor.cloth.woolen.back", 1),
+        ("common.items.armor.cloth.woolen.belt", 1),
+        ("common.items.armor.cloth.woolen.chest", 1),
+        ("common.items.armor.cloth.woolen.foot", 1),
+        ("common.items.armor.cloth.woolen.hand", 1),
+        ("common.items.armor.cloth.woolen.pants", 1),
+        ("common.items.armor.cloth.woolen.shoulder", 1),
+
+        // Mail
+        ("common.items.armor.mail.iron.back", 1),
+        ("common.items.armor.mail.iron.belt", 1),
+        ("common.items.armor.mail.iron.chest", 1),
+        ("common.items.armor.mail.iron.foot", 1),
+        ("common.items.armor.mail.iron.hand", 1),
+        ("common.items.armor.mail.iron.pants", 1),
+        ("common.items.armor.mail.iron.shoulder", 1),
+
+        // Weapons
+        ("common.items.weapons.sword.bronze-0", 1),
+        ("common.items.weapons.axe.bronze_axe-0", 1),
+        ("common.items.weapons.hammer.bronze_hammer-0", 1),
+        ("common.items.weapons.bow.bone-0", 1),
+        ("common.items.weapons.staff.bone_staff", 1),
+        ("common.items.weapons.sceptre.divine_gohei", 1),
+        
+        // Potion Kit
+        ("common.items.consumable.potion_minor", 100),
+    ],
+    "tier-0": [
+        // Hide
+        ("common.items.armor.hide.rawhide.back", 1),
+        ("common.items.armor.hide.rawhide.belt", 1),
+        ("common.items.armor.hide.rawhide.chest", 1),
+        ("common.items.armor.hide.rawhide.foot", 1),
+        ("common.items.armor.hide.rawhide.hand", 1),
+        ("common.items.armor.hide.rawhide.pants", 1),
+        ("common.items.armor.hide.rawhide.shoulder", 1),
+
+        // Cloth
+        ("common.items.armor.cloth.linen.back", 1),
+        ("common.items.armor.cloth.linen.belt", 1),
+        ("common.items.armor.cloth.linen.chest", 1),
+        ("common.items.armor.cloth.linen.foot", 1),
+        ("common.items.armor.cloth.linen.hand", 1),
+        ("common.items.armor.cloth.linen.pants", 1),
+        ("common.items.armor.cloth.linen.shoulder", 1),
+
+        // Mail
+        ("common.items.armor.mail.bronze.back", 1),
+        ("common.items.armor.mail.bronze.belt", 1),
+        ("common.items.armor.mail.bronze.chest", 1),
+        ("common.items.armor.mail.bronze.foot", 1),
+        ("common.items.armor.mail.bronze.hand", 1),
+        ("common.items.armor.mail.bronze.pants", 1),
+        ("common.items.armor.mail.bronze.shoulder", 1),
+
+        // weapons
+        ("common.items.weapons.sword.stone-0", 1),
+        ("common.items.weapons.axe_1h.stone-0", 1),
+        ("common.items.weapons.axe_1h.stone-1", 1),
+        ("common.items.weapons.hammer.stone_hammer-0", 1),
+        ("common.items.weapons.bow.wood-0", 1),
+        ("common.items.weapons.staff.bent_fuse", 1),
+        ("common.items.weapons.sceptre.divine_gohei", 1),
+
+        // potion kit
+        ("common.items.consumable.potion_minor", 100),
     ],
     "ferocious": [
         ("common.items.armor.ferocious.chest",1),
@@ -44,88 +282,14 @@
         ("common.items.armor.ferocious.back",1),
         ("common.items.weapons.sword.bloodsteel-1",1),
     ],
-    "consumables": [
+    "admin_cosmetics": [
-        ("common.items.consumable.potion_minor", 100),
+        ("common.items.debug.cultist_belt",1),
-        ("common.items.consumable.potion_med", 100),
+        ("common.items.debug.cultist_boots",1),
-        ("common.items.consumable.potion_big", 100),
+        ("common.items.debug.cultist_chest_blue",1),
-        ("common.items.food.apple_mushroom_curry", 100),
+        ("common.items.debug.cultist_hands_blue",1),
-    ],
+        ("common.items.debug.cultist_legs_blue",1),
-    "tier-4": [
+        ("common.items.debug.cultist_shoulder_blue",1),
-        ("common.items.armor.mail.steel.belt", 1),
+        ("common.items.debug.dungeon_purple",1),
-        ("common.items.armor.mail.steel.chest", 1),
+        ("common.items.debug.admin_back",1),
-        ("common.items.armor.mail.steel.foot", 1),
-        ("common.items.armor.mail.steel.hand", 1),
-        ("common.items.armor.mail.steel.pants", 1),
-        ("common.items.armor.mail.steel.shoulder", 1),
-        ("common.items.weapons.sword.cobalt-0", 1),
-        ("common.items.weapons.axe.cobalt_axe-0", 1),
-        ("common.items.weapons.hammer.cobalt_hammer-0", 1),
-        ("common.items.weapons.bow.frostwood-0", 1),
-        ("common.items.weapons.staff.frostwood_torch", 1),
-        ("common.items.weapons.sceptre.fork0", 1),
-        ("common.items.consumable.potion_med", 100),
-    ],
-    "tier-3": [
-        ("common.items.armor.plate.belt", 1),
-        ("common.items.armor.plate.chest", 1),
-        ("common.items.armor.plate.foot", 1),
-        ("common.items.armor.plate.hand", 1),
-        ("common.items.armor.plate.pants", 1),
-        ("common.items.armor.plate.shoulder", 1),
-        ("common.items.weapons.sword.steel-0", 1),
-        ("common.items.weapons.axe.steel_axe-0", 1),
-        ("common.items.weapons.hammer.steel_hammer-0", 1),
-        ("common.items.weapons.bow.metal-0", 1),
-        ("common.items.weapons.staff.flamethrower_0", 1),
-        ("common.items.weapons.sceptre.coralline_cane", 1),
-        ("common.items.consumable.potion_med", 100),
-    ],
-    "tier-2": [
-        ("common.items.armor.twigs.belt", 1),
-        ("common.items.armor.twigs.chest", 1),
-        ("common.items.armor.twigs.foot", 1),
-        ("common.items.armor.twigs.hand", 1),
-        ("common.items.armor.twigs.pants", 1),
-        ("common.items.armor.twigs.shoulder", 1),
-        ("common.items.weapons.sword.iron-0", 1),
-        ("common.items.weapons.axe.iron_axe-0", 1),
-        ("common.items.weapons.hammer.iron_hammer-0", 1),
-        ("common.items.weapons.bow.hardwood-0", 1),
-        ("common.items.weapons.staff.heated_arm", 1),
-        ("common.items.weapons.sceptre.druids_arbor", 1),
-        ("common.items.consumable.potion_med", 100),
-    ],
-    "tier-1": [
-        ("common.items.armor.agile.belt", 1),
-        ("common.items.armor.agile.chest", 1),
-        ("common.items.armor.agile.foot", 1),
-        ("common.items.armor.agile.hand", 1),
-        ("common.items.armor.agile.pants", 1),
-        ("common.items.armor.agile.shoulder", 1),
-        ("common.items.weapons.sword.bronze-0", 1),
-        ("common.items.weapons.axe.bronze_axe-0", 1),
-        ("common.items.weapons.hammer.bronze_hammer-0", 1),
-        ("common.items.weapons.bow.bone-0", 1),
-        ("common.items.weapons.staff.bone_staff", 1),
-        ("common.items.weapons.sceptre.divine_gohei", 1),
-        ("common.items.consumable.potion_minor", 100),
-    ],
-    "tier-0": [
-        ("common.items.armor.cloth_purple.belt", 1),
-        ("common.items.armor.cloth_purple.chest", 1),
-        ("common.items.armor.cloth_purple.foot", 1),
-        ("common.items.armor.cloth_purple.hand", 1),
-        ("common.items.armor.cloth_purple.pants", 1),
-        ("common.items.armor.cloth_purple.shoulder", 1),
-
-        ("common.items.weapons.sword.stone-0", 1),
-        ("common.items.weapons.axe_1h.stone-0", 1),
-        ("common.items.weapons.axe_1h.stone-1", 1),
-        ("common.items.weapons.hammer.stone_hammer-0", 1),
-        ("common.items.weapons.bow.wood-0", 1),
-        ("common.items.weapons.staff.bent_fuse", 1),
-        ("common.items.weapons.sceptre.divine_gohei", 1),
-
-        ("common.items.consumable.potion_minor", 100),
     ],
 })

assets/server/manifests/presets.ron

@@ -128,6 +128,131 @@
         (Sceptre(ARange), 2),
         (Sceptre(ACost), 2),
     ],
+    // Just copypasta from max with random reductions
+    "middle": [
+        // General skills
+        (General(HealthIncrease), 6),
+        (General(EnergyIncrease), 4),
+        (Roll(Cost), 2),
+        (Roll(Strength), 1),
+        (Roll(Duration), 1),
+
+        // Sword
+        (UnlockGroup(Weapon(Sword)), 1),
+
+        (Sword(InterruptingAttacks), 1),
+
+        (Sword(TsCombo), 1),
+        (Sword(TsDamage), 2),
+        (Sword(TsRegen), 1),
+        (Sword(TsSpeed), 2),
+
+        (Sword(DCost), 1),
+        (Sword(DDrain), 2),
+        (Sword(DDamage), 2),
+        (Sword(DScaling), 2),
+        (Sword(DSpeed), 1),
+        (Sword(DInfinite), 1),
+
+        (Sword(UnlockSpin), 1),
+        (Sword(SDamage), 1),
+        (Sword(SSpeed), 2),
+        (Sword(SCost), 2),
+        (Sword(SSpins), 2),
+        // Axe
+        (UnlockGroup(Weapon(Axe)), 1),
+
+        (Axe(DsCombo), 1),
+        (Axe(DsDamage), 2),
+        (Axe(DsRegen), 2),
+        (Axe(DsSpeed), 1),
+
+        (Axe(SInfinite), 1),
+        (Axe(SHelicopter), 1),
+        (Axe(SDamage), 2),
+        (Axe(SSpeed), 2),
+        (Axe(SCost), 2),
+
+        (Axe(UnlockLeap), 1),
+        (Axe(LDamage), 2),
+        (Axe(LKnockback), 2),
+        (Axe(LCost), 2),
+        (Axe(LDistance), 2),
+        // Hammer
+        (UnlockGroup(Weapon(Hammer)), 1),
+
+        (Hammer(SsKnockback), 1),
+        (Hammer(SsDamage), 2),
+        (Hammer(SsRegen), 2),
+        (Hammer(SsSpeed), 2),
+
+        (Hammer(CDamage), 2),
+        (Hammer(CKnockback), 1),
+        (Hammer(CDrain), 2),
+        (Hammer(CSpeed), 2),
+
+        (Hammer(UnlockLeap), 1),
+        (Hammer(LDamage), 2),
+        (Hammer(LCost), 2),
+        (Hammer(LDistance), 1),
+        (Hammer(LKnockback), 2),
+        (Hammer(LRange), 2),
+        // Bow
+        (UnlockGroup(Weapon(Bow)), 1),
+
+        (Bow(ProjSpeed), 2),
+
+        (Bow(CDamage), 2),
+        (Bow(CKnockback), 2),
+        (Bow(CSpeed), 1),
+        (Bow(CRegen), 1),
+        (Bow(CMove), 2),
+
+        (Bow(RDamage), 3),
+        (Bow(RCost), 1),
+        (Bow(RSpeed), 2),
+
+        (Bow(UnlockShotgun), 1),
+        (Bow(SDamage), 2),
+        (Bow(SCost), 1),
+        (Bow(SArrows), 2),
+        (Bow(SSpread), 2),
+
+        // Staff
+        (UnlockGroup(Weapon(Staff)), 1),
+
+        (Staff(BDamage), 1),
+        (Staff(BRegen), 1),
+        (Staff(BRadius), 2),
+
+        (Staff(FRange), 2),
+        (Staff(FDamage), 2),
+        (Staff(FDrain), 1),
+        (Staff(FVelocity), 2),
+
+        (Staff(UnlockShockwave), 1),
+        (Staff(SDamage), 1),
+        (Staff(SKnockback), 2),
+        (Staff(SRange), 2),
+        (Staff(SCost), 2),
+        // Sceptre
+        (UnlockGroup(Weapon(Sceptre)), 1),
+
+        (Sceptre(LDamage), 2),
+        (Sceptre(LRange), 2),
+        (Sceptre(LLifesteal), 2),
+        (Sceptre(LRegen), 2),
+
+        (Sceptre(HHeal), 2),
+        (Sceptre(HCost), 2),
+        (Sceptre(HRange), 2),
+
+        (Sceptre(UnlockAura), 1),
+        (Sceptre(AStrength), 2),
+        (Sceptre(ADuration), 1),
+        (Sceptre(ARange), 2),
+        (Sceptre(ACost), 2),
+    ],
     // Basic skill preset to unlock all abilities
     "basic": [
         // General skills
@@ -135,14 +260,11 @@
         // Sword
         (UnlockGroup(Weapon(Sword)), 1),
 
-        (Sword(InterruptingAttacks), 1),
-        (Sword(DInfinite), 1),
         (Sword(UnlockSpin), 1),
 
         // Axe
         (UnlockGroup(Weapon(Axe)), 1),
 
-        (Axe(SInfinite), 1),
         (Axe(UnlockLeap), 1),
 
         // Hammer

server/src/cmd.rs

@@ -1615,6 +1615,8 @@ fn handle_kit(
                                     comp::InventoryUpdate::new(comp::InventoryUpdateEvent::Debug),
                                 ),
                             );
+                        } else {
+                            warn!("Unknown item: {}", &item_id);
                         }
                     }
                     Ok(())

server/src/events/entity_manipulation.rs

@@ -689,7 +689,7 @@ pub fn handle_explosion(server: &Server, pos: Vec3<f32>, explosion: Explosion, o
 
         // Compare both checks, take whichever gives weaker effect, sets minimum of 0 so
         // that explosions reach a max strength on edge of entity
-        ((horiz_dist.max(vert_distance).max(0.0) / radius).min(1.0) - 1.0).powi(2)
+        ((horiz_dist.max(vert_distance).max(0.0) / radius).min(1.0) - 1.0).abs()
     }
 
     for effect in explosion.effects {

voxygen/src/hud/img_ids.rs

@@ -588,6 +588,7 @@ image_ids! {
         debuff_burning_0: "voxygen.element.de_buffs.debuff_burning_0",
         debuff_crippled_0: "voxygen.element.de_buffs.debuff_cripple_0",
         debuff_frozen_0: "voxygen.element.de_buffs.debuff_frozen_0",
+        debuff_wet_0: "voxygen.element.de_buffs.debuff_wet_0",
 
         // Animation Frames
         // Buff Frame

voxygen/src/hud/mod.rs

@@ -3770,8 +3770,7 @@ pub fn get_buff_image(buff: BuffKind, imgs: &Imgs) -> conrod_core::image::Id {
         BuffKind::Burning { .. } => imgs.debuff_burning_0,
         BuffKind::Crippled { .. } => imgs.debuff_crippled_0,
         BuffKind::Frozen { .. } => imgs.debuff_frozen_0,
-        // TODO: Get icon for this before merging. Anyone doing code review open a comment here.
+        BuffKind::Wet { .. } => imgs.debuff_wet_0,
-        BuffKind::Wet { .. } => imgs.debuff_burning_0,
     }
 }
 

voxygen/src/session/mod.rs

@@ -311,8 +311,8 @@ impl PlayState for SessionState {
                 .read_storage::<comp::CharacterState>()
                 .get(player_entity)
             {
-                if cr.charge_frac() > 0.25 {
+                if cr.charge_frac() > 0.5 {
-                    fov_scaling -= 3.0 * cr.charge_frac() / 4.0;
+                    fov_scaling -= 3.0 * cr.charge_frac() / 5.0;
                 }
                 let max_dist = if let Some(dist) = self.saved_zoom_dist {
                     dist