Merge branch 'snowram/new-weapons-fix' into 'master'

Fix a staff icon, some offset fixes, lower wolf spawn rate

See merge request veloren/veloren!2025

assets/voxygen/i18n/en/common.ron

@@ -64,8 +64,8 @@ Is the client up to date?"#,
         "common.weapons.bow": "Bow",
         "common.weapons.hammer": "Hammer",
         "common.weapons.general": "General Combat",
-        "common.weapons.sceptre": "Healing Sceptre",
+        "common.weapons.sceptre": "Sceptre",
-        "common.weapons.sceptre": "Shield",
+        "common.weapons.shield": "Shield",
         "common.weapons.spear": "Spear",
         "common.weapons.hammer_simple": "Simple Hammer",
         "common.weapons.sword_simple": "Simple Sword",

assets/voxygen/i18n/fr_FR/common.ron

@@ -63,8 +63,8 @@ Le client est-il à jour?"#,
         "common.weapons.staff": "Bâton",
         "common.weapons.bow": "Arc",
         "common.weapons.hammer": "Marteau",
-        "common.weapons.sceptre": "Sceptre de soin",
+        "common.weapons.sceptre": "Sceptre",
-        "common.weapons.sceptre": "Bouclier",
+        "common.weapons.shield": "Bouclier",
         "common.weapons.spear": "Lance",
         "common.weapons.hammer_simple": "Marteau Simple",
         "common.weapons.sword_simple": "Épée Simple",

assets/voxygen/item_image_manifest.ron

@@ -870,7 +870,7 @@
         (1.0, 0.0, 0.0), (-130., 90.0, 0.0), 1.2,
     ),
     Tool("common.items.weapons.staff.bone_staff"): VoxTrans(
-        "voxel.weapon.staff.firestaff_bone",
+        "voxel.weapon.staff.bone_staff",
         (1.0, 0.0, 0.0), (-130., 90.0, 0.0), 1.2,
     ),
     Tool("common.items.weapons.staff.crimson_eye"): VoxTrans(
@@ -921,10 +921,6 @@
         "voxel.weapon.staff.heated_arm",
         (1.0, 0.0, 0.0), (-130., 90.0, 0.0), 1.1,
     ),
-    Tool("common.items.weapons.staff.eldwood"): VoxTrans(
-        "voxel.weapon.staff.eldwood",
-        (1.0, 0.0, 0.0), (-130., 90.0, 0.0), 1.1,
-    ),
     Tool("common.items.weapons.staff.frostwood_torch"): VoxTrans(
         "voxel.weapon.staff.frostwood_torch",
         (1.0, 0.0, 0.0), (-130., 90.0, 0.0), 1.1,

assets/voxygen/voxel/biped_weapon_manifest.ron

@@ -862,7 +862,7 @@
         color: None
     ),
     "common.items.weapons.staff.bone_staff": (
-        vox_spec: ("weapon.staff.firestaff_bone", (-1.5, -2.5, -3.0)),
+        vox_spec: ("weapon.staff.bone_staff", (-1.5, -2.5, -3.0)),
         color: None
     ),
     "common.items.weapons.staff.crimson_eye": (
@@ -913,32 +913,28 @@
         vox_spec: ("weapon.staff.bent_fuse", (-2.0, -2.5, -5.0)),
         color: None
     ),
-    "common.items.weapons.staff.eldwood": (
-        vox_spec: ("weapon.staff.eldwood", (-1.5, -4.5, -3.0)),
-        color: None
-    ),
     "common.items.weapons.staff.frostwood_torch": (
         vox_spec: ("weapon.staff.frostwood_torch", (-2.5, -3.5, -3.0)),
         color: None
     ),
     "common.items.weapons.staff.golden_khakkara": (
-        vox_spec: ("weapon.staff.golden_khakkara", (-2.5, -3.5, -4.0)),
+        vox_spec: ("weapon.staff.golden_khakkara", (-2.5, -3.5, -6.0)),
         color: None
     ),
     "common.items.weapons.staff.laevateinn": (
-        vox_spec: ("weapon.staff.laevateinn", (-1.5, -4.5, -4.0)),
+        vox_spec: ("weapon.staff.laevateinn", (-1.5, -4.5, -6.0)),
         color: None
     ),
     "common.items.weapons.staff.ruby_rod": (
-        vox_spec: ("weapon.staff.ruby_rod", (-1.5, -3.5, -3.0)),
+        vox_spec: ("weapon.staff.ruby_rod", (-1.5, -3.5, -4.0)),
         color: None
     ),
     "common.items.weapons.staff.dragon_tongue": (
-        vox_spec: ("weapon.staff.dragon_tongue", (-2.5, -6.0, -5.0)),
+        vox_spec: ("weapon.staff.dragon_tongue", (-2.5, -6.0, -7.0)),
         color: None
     ),
     "common.items.weapons.staff.solar": (
-        vox_spec: ("weapon.staff.solar", (-1.5, -4.5, -3.0)),
+        vox_spec: ("weapon.staff.solar", (-1.5, -4.5, -4.0)),
         color: None
     ),
     // Sceptres
@@ -979,7 +975,7 @@
         color: None
     ),
     "common.items.weapons.sceptre.caduceus": (
-        vox_spec: ("weapon.sceptre.caduceus", (-1.5, -4.5, -4.0)),
+        vox_spec: ("weapon.sceptre.caduceus", (-1.5, -4.5, -6.0)),
         color: None
     ),
     "common.items.weapons.sceptre.coralline_cane": (
@@ -995,7 +991,7 @@
         color: None
     ),
     "common.items.weapons.sceptre.druids_arbor": (
-        vox_spec: ("weapon.sceptre.druids_arbor", (-1.5, -4.5, -6.0)),
+        vox_spec: ("weapon.sceptre.druids_arbor", (-1.5, -4.5, -4.0)),
         color: None
     ),
     "common.items.weapons.sceptre.amethyst": (

world/src/layer/wildlife.rs

@@ -171,7 +171,7 @@ pub fn apply_wildlife_supplement<'a, R: Rng>(
             group_size: 3..8,
             is_underwater: false,
             get_density: |c, col| {
-                close(c.temp, CONFIG.snow_temp + 0.2, 0.6) * col.tree_density * BASE_DENSITY * 1.0
+                close(c.temp, CONFIG.snow_temp + 0.2, 0.6) * col.tree_density * BASE_DENSITY * 0.9
             },
         },
         // Taiga pack wild