new loading bg, staff models

item images

fix paths

loot tables, adjustments

Update main.ron

assets/common/items/armor/misc/chest/worker_purple_0.ron

@@ -1,10 +1,10 @@
 ItemDef(
     name: "Purple Worker Shirt",
-    description: "Was used by a farmer, until recently.",
+    description: "Resilient and reliable.",
     kind: Armor((
         kind: Chest("WorkerPurple0"),
         stats: (
-            protection: Normal(1.0),
+            protection: Normal(0.1),
             poise_resilience: Normal(1.0),
         ),
     )),

assets/common/items/armor/misc/chest/worker_purple_brown.ron

@@ -0,0 +1,13 @@
+ItemDef(
+    name: "Purple Worker Shirt",
+    description: "Resilient and reliable.",
+    kind: Armor((
+        kind: Chest("WorkerPurpBrown"),
+        stats: (
+            protection: Normal(0.1),
+            poise_resilience: Normal(1.0),
+        ),
+    )),
+    quality: Low,
+    tags: [ClothItem],
+)

assets/common/items/armor/misc/pants/worker_blue.ron

@@ -1,10 +1,10 @@
 ItemDef(
     name: "Blue Worker Pants",
-    description: "Pants used by a farmer, until recently.",
+    description: "Resilient and reliable.",
     kind: Armor((
         kind: Pants("WorkerBlue"),
         stats: (
-            protection: Normal(1.0),
+            protection: Normal(0.1),
             poise_resilience: Normal(1.0),
         ),
     )),

assets/common/items/armor/misc/pants/worker_brown.ron

@@ -0,0 +1,13 @@
+ItemDef(
+    name: "Comfortable Worker Pants",
+    description: "Resilient and reliable.",
+    kind: Armor((
+        kind: Pants("WorkerBrown"),
+        stats: (
+            protection: Normal(0.1),
+            poise_resilience: Normal(1.0),
+        ),
+    )),
+    quality: Low,
+    tags: [ClothItem],
+)

assets/common/items/lantern/geode_purp.ron

@@ -0,0 +1,14 @@
+ItemDef(
+    name: "Purple Geode",
+    description: "Emits a calming glow",
+    kind: Lantern(
+        (
+            kind: "GeodePurp",
+            color: (r: 144, g: 88, b: 181),
+            strength_thousandths: 8000,
+            flicker_thousandths: 600,
+        ),
+    ),
+    quality: High,
+    tags: [],
+)

assets/common/items/weapons/staff/amethyst_staff.ron

@@ -7,7 +7,7 @@ ItemDef(
         stats: Direct((
             equip_time_secs: 0.3,
             power: 1.5,
-            poise_strength: 1.4,
+            poise_strength: 1.0,
             speed: 1.0,
             crit_chance: 0.125,
             crit_mult: 1.4571428,

assets/common/items/weapons/staff/aurora.ron

@@ -0,0 +1,18 @@
+ItemDef(
+    name: "Aurora",
+    description: "Praise the sun!",
+    kind: Tool((
+        kind: Staff,
+        hands: Two,
+        stats: Direct((
+            equip_time_secs: 0.3,
+            power: 0.8,
+            poise_strength: 1.0,
+            speed: 2.0,
+            crit_chance: 0.2625,
+            crit_mult: 1.4761904,
+        )),
+    )),
+    quality: High,
+    tags: [],
+)

assets/common/items/weapons/staff/bent_fuse.ron

@@ -0,0 +1,18 @@
+ItemDef(
+    name: "Bent Fuse",
+    description: "It's twitching from being charged with elemental powers",
+    kind: Tool((
+        kind: Staff,
+        hands: Two,
+        stats: Direct((
+            equip_time_secs: 0.3,
+            power: 1.5,
+            poise_strength: 1.0,
+            speed: 1.2,
+            crit_chance: 0.17045455,
+            crit_mult: 1.4469842,
+        )),
+    )),
+    quality: Epic,
+    tags: [],
+)

assets/common/items/weapons/staff/bone_staff.ron

@@ -7,7 +7,7 @@ ItemDef(
         stats: Direct((
             equip_time_secs: 0.3,
             power: 1.0,
-            poise_strength: 1.5,
+            poise_strength: 1.0,
             speed: 1.0,
             crit_chance: 0.1125,
             crit_mult: 1.6349206,

assets/common/items/weapons/staff/cultist_staff.ron

@@ -7,7 +7,7 @@ ItemDef(
         stats: Direct((
             equip_time_secs: 0.3,
             power: 2.0,
-            poise_strength: 1.5,
+            poise_strength: 1.0,
             speed: 1.0,
             crit_chance: 0.140625,
             crit_mult: 1.4063492,

assets/common/items/weapons/staff/fiery_wishing_rod.ron

@@ -0,0 +1,18 @@
+ItemDef(
+    name: "Fiery Wishing-Rod",
+    description: "Fulfills all your wishes from medium-rare to well-done",
+    kind: Tool((
+        kind: Staff,
+        hands: Two,
+        stats: Direct((
+            equip_time_secs: 0.3,
+            power: 1.5,
+            poise_strength: 1.0,
+            speed: 0.8,
+            crit_chance: 0.11111111,
+            crit_mult: 1.5142857,
+        )),
+    )),
+    quality: Moderate,
+    tags: [],
+)

assets/common/items/weapons/staff/flamethrower_0.ron

@@ -0,0 +1,18 @@
+ItemDef(
+    name: "Unstable Flamethrower MK II",
+    description: "Definitely-A-Flamethrower",
+    kind: Tool((
+        kind: Staff,
+        hands: Two,
+        stats: Direct((
+            equip_time_secs: 0.3,
+            power: 2.2,
+            poise_strength: 1.0,
+            speed: 0.8,
+            crit_chance: 0.113131315,
+            crit_mult: 1.4017857,
+        )),
+    )),
+    quality: High,
+    tags: [],
+)

assets/common/items/weapons/staff/heated_arm.ron

@@ -0,0 +1,18 @@
+ItemDef(
+    name: "Heated Grip Arm",
+    description: "'Caution, hot surface!'",
+    kind: Tool((
+        kind: Staff,
+        hands: Two,
+        stats: Direct((
+            equip_time_secs: 0.1,
+            power: 1.2,
+            poise_strength: 1.0,
+            speed: 1.2,
+            crit_chance: 0.15,
+            crit_mult: 1.4761904,
+        )),
+    )),
+    quality: Moderate,
+    tags: [],
+)

assets/common/items/weapons/staff/infused_tower.ron

@@ -0,0 +1,18 @@
+ItemDef(
+    name: "Infused Tower",
+    description: "Portable Beacon",
+    kind: Tool((
+        kind: Staff,
+        hands: Two,
+        stats: Direct((
+            equip_time_secs: 0.3,
+            power: 1.2,
+            poise_strength: 1.0,
+            speed: 1.4,
+            crit_chance: 0.18715277,
+            crit_mult: 1.445269,
+        )),
+    )),
+    quality: High,
+    tags: [],
+)

assets/common/items/weapons/staff/lava_rod.ron

@@ -0,0 +1,18 @@
+ItemDef(
+    name: "Lava Rod",
+    description: "'Property of Rob MacLava'",
+    kind: Tool((
+        kind: Staff,
+        hands: Two,
+        stats: Direct((
+            equip_time_secs: 0.3,
+            power: 2.125,
+            poise_strength: 1.0,
+            speed: 0.8,
+            crit_chance: 0.114379086,
+            crit_mult: 1.4114286,
+        )),
+    )),
+    quality: High,
+    tags: [],
+)

assets/common/items/weapons/staff/ley_seeker.ron

@@ -0,0 +1,18 @@
+ItemDef(
+    name: "Ley Seeker",
+    description: "Starts swinging when pointed away from water",
+    kind: Tool((
+        kind: Staff,
+        hands: Two,
+        stats: Direct((
+            equip_time_secs: 0.3,
+            power: 1.0,
+            poise_strength: 1.0,
+            speed: 1.0,
+            crit_chance: 0.1125,
+            crit_mult: 1.6349206,
+        )),
+    )),
+    quality: Common,
+    tags: [],
+)

assets/common/items/weapons/staff/orc_iron.ron

@@ -0,0 +1,18 @@
+ItemDef(
+    name: "Orcish Branding Iron",
+    description: "Used to mark animals and captured foes",
+    kind: Tool((
+        kind: Staff,
+        hands: Two,
+        stats: Direct((
+            equip_time_secs: 0.3,
+            power: 0.9,
+            poise_strength: 1.0,
+            speed: 2.0,
+            crit_chance: 0.2638889,
+            crit_mult: 1.481203,
+        )),
+    )),
+    quality: Epic,
+    tags: [],
+)

assets/common/items/weapons/staff/phoenix.ron

@@ -0,0 +1,18 @@
+ItemDef(
+    name: "Phoenix",
+    description: "The ashes never stop glowing",
+    kind: Tool((
+        kind: Staff,
+        hands: Two,
+        stats: Direct((
+            equip_time_secs: 0.6,
+            power: 3.0,
+            poise_strength: 1.0,
+            speed: 0.67,
+            crit_chance: 0.1002994,
+            crit_mult: 1.3798152,
+        )),
+    )),
+    quality: Legendary,
+    tags: [],
+)

assets/common/items/weapons/sword/caladbolg.ron

@@ -1,5 +1,5 @@
 ItemDef(
-    name: "Caladborg",
+    name: "Caladbolg",
     description: "You sense an eldritch presence watching you.",
     kind: Tool((
         kind: Sword,

assets/common/loot_tables/loot_table_cave_large.ron

@@ -7,7 +7,8 @@
     (0.05, "common.items.glider.glider_morpho"),
     (0.05, "common.items.glider.glider_monarch"),
     (0.05, "common.items.glider.glider_moth"),
-    (0.05, "common.items.armor.misc.ring.gold"),   
+    (0.05, "common.items.armor.misc.ring.gold"),
+    (0.1, "common.items.lantern.geode_purp"),     
     // swords
     (0.03, "common.items.weapons.sword.steel-0"),
     (0.03, "common.items.weapons.sword.steel-1"),
@@ -44,10 +45,15 @@
     (0.04, "common.items.weapons.axe.steel_axe-6"),
     // healing staff
     (0.5, "common.items.weapons.sceptre.staff_nature"),
-    // staves
-    (1.00, "common.items.weapons.staff.bone_staff"),
-    (1.00, "common.items.weapons.staff.amethyst_staff"),
     (0.001, "common.items.weapons.sceptre.sceptre_velorite_0"),
+    // staves
+    (0.20, "common.items.weapons.staff.bone_staff"),
+    (0.20, "common.items.weapons.staff.ley_seeker"),
+    (0.15, "common.items.weapons.staff.fiery_wishing_rod"),
+    (0.15, "common.items.weapons.staff.heated_arm"),
+    (0.10, "common.items.weapons.staff.amethyst_staff"),
+    (0.10, "common.items.weapons.staff.lava_rod"),
+    (0.01, "common.items.weapons.staff.orc_iron"),
     // hammers
     (0.30, "common.items.weapons.hammer.cobalt_hammer-0"),
     (0.30, "common.items.weapons.hammer.cobalt_hammer-1"),

assets/common/loot_tables/loot_table_cultists.ron

@@ -156,7 +156,9 @@
     // healing staff
     (0.5, "common.items.weapons.sceptre.staff_nature"),
     // staves
-    (1.00, "common.items.weapons.staff.bone_staff"),
+    (0.40, "common.items.weapons.staff.bone_staff"),
+    (0.40, "common.items.weapons.staff.amethyst_staff"),
+    (0.20, "common.items.weapons.staff.aurora"),
     // hammers
     (0.15, "common.items.weapons.hammer.bronze_hammer-0"),
     (0.15, "common.items.weapons.hammer.bronze_hammer-1"),
@@ -205,7 +207,12 @@
     // healing staff
     (0.25, "common.items.weapons.sceptre.staff_nature"),
     // staves
-    (1.00, "common.items.weapons.staff.amethyst_staff"),
+    (0.2, "common.items.weapons.staff.infused_tower"),
+    (0.15, "common.items.weapons.staff.lava_rod"),
+    (0.10, "common.items.weapons.staff.flamethrower_0"),
+    (0.05, "common.items.weapons.staff.bent_fuse"),
+    (0.05, "common.items.weapons.staff.orc_iron"),
+    (0.001, "common.items.weapons.staff.phoenix"),
     // hammers
     (0.01, "common.items.weapons.hammer.cobalt_hammer-0"),
     (0.01, "common.items.weapons.hammer.cobalt_hammer-1"),

assets/common/loot_tables/loot_table_weapon_rare.ron

@@ -21,6 +21,10 @@
     (0.10, "common.items.weapons.sceptre.fork0"),
     // staves
     (1.00, "common.items.weapons.staff.amethyst_staff"),
+    (0.7, "common.items.weapons.staff.aurora"),
+    (0.65, "common.items.weapons.staff.lava_rod"),
+    (0.75, "common.items.weapons.staff.infused_tower"),
+    (0.5, "common.items.weapons.staff.flamethrower_0"),
     // hammers
     (0.30, "common.items.weapons.hammer.cobalt_hammer-0"),
     (0.30, "common.items.weapons.hammer.cobalt_hammer-1"),

assets/common/loot_tables/loot_table_weapon_uncommon.ron

@@ -50,6 +50,8 @@
     (0.25, "common.items.weapons.sceptre.totem_green"),
     // staves
     (1.00, "common.items.weapons.staff.bone_staff"),
+    (0.7, "common.items.weapons.staff.heated_arm"),
+    (0.8, "common.items.weapons.staff.fiery_wishing_rod"),
     // hammers
     (0.15, "common.items.weapons.hammer.bronze_hammer-0"),
     (0.15, "common.items.weapons.hammer.bronze_hammer-1"),

assets/voxygen/i18n/en/main.ron

@@ -33,7 +33,7 @@ Thanks for taking the time to read this notice, we hope you enjoy the game!
         // Login process description
         "main.login_process": r#"Information on the Login Process:
 
-Please note that you now need an account
+Please note that you need an account
 to play on auth-enabled servers.
 
 You can create an account over at

assets/voxygen/item_image_manifest.ron

@@ -881,6 +881,46 @@
         "voxel.weapon.staff.firestaff_cultist",
         (1.0, 0.0, 0.0), (-130., 90.0, 0.0), 1.2,
     ),
+    Tool("common.items.weapons.staff.phoenix"): VoxTrans(
+        "voxel.weapon.staff.phoenix",
+        (1.0, 0.0, 0.0), (-130., 90.0, 0.0), 1.2,
+    ),
+    Tool("common.items.weapons.staff.aurora"): VoxTrans(
+        "voxel.weapon.staff.aurora",
+        (1.0, 0.0, 0.0), (-130., 90.0, 0.0), 1.1,
+    ),
+    Tool("common.items.weapons.staff.infused_tower"): VoxTrans(
+        "voxel.weapon.staff.infused_tower",
+        (1.0, 0.0, 0.0), (-130., 90.0, 0.0), 1.2,
+    ),
+    Tool("common.items.weapons.staff.flamethrower_0"): VoxTrans(
+        "voxel.weapon.staff.unstable_thrower",
+        (1.0, 0.0, 0.0), (-130., 90.0, 0.0), 1.2,
+    ),
+    Tool("common.items.weapons.staff.ley_seeker"): VoxTrans(
+        "voxel.weapon.staff.ley_seeker",
+        (2.0, 0.0, 1.0), (-130., 90.0, 0.0), 1.1,
+    ),
+    Tool("common.items.weapons.staff.lava_rod"): VoxTrans(
+        "voxel.weapon.staff.lava_rod",
+        (1.0, 0.0, 0.0), (-130., 90.0, 0.0), 1.1,
+    ),
+    Tool("common.items.weapons.staff.fiery_wishing_rod"): VoxTrans(
+        "voxel.weapon.staff.fiery_wishing_rod",
+        (1.0, 0.0, 0.0), (-130., 90.0, 0.0), 1.1,
+    ),
+    Tool("common.items.weapons.staff.orc_iron"): VoxTrans(
+        "voxel.weapon.staff.orcish_branding_iron",
+        (1.0, 0.0, 0.0), (-130., 90.0, 0.0), 1.2,
+    ),
+    Tool("common.items.weapons.staff.bent_fuse"): VoxTrans(
+        "voxel.weapon.staff.bent_fuse",
+        (1.0, 0.0, 0.0), (-130., 90.0, 0.0), 1.2,
+    ),
+    Tool("common.items.weapons.staff.heated_arm"): VoxTrans(
+        "voxel.weapon.staff.heated_arm",
+        (1.0, 0.0, 0.0), (-130., 90.0, 0.0), 1.1,
+    ),
     // Healing Sceptres
     Tool("common.items.weapons.sceptre.starter_sceptre"): VoxTrans(
         "voxel.weapon.sceptre.wood-simple",
@@ -936,6 +976,10 @@
     Lantern("Red0"): Png(
         "element.icons.lantern_red-0",
     ),
+    Lantern("GeodePurp"): VoxTrans(
+        "voxel.lantern.geode_purp",
+        (0.0, 0.0, 0.0), (-90.0, 120.0, 0.0), 0.9,
+    ),
     // Farming Equipment
     Tool("common.items.weapons.tool.broom"): VoxTrans(
         "voxel.weapon.tool.broom-0",
@@ -992,6 +1036,14 @@
         "voxel.armor.rugged.pants",
         (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
     ),
+    Armor(Chest("WorkerPurpBrown")): VoxTrans(
+        "voxel.armor.misc.chest.worker_purp_brown",
+        (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
+    ),
+    Armor(Pants("WorkerBrown")): VoxTrans(
+        "voxel.armor.misc.pants.worker_brown",
+        (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
+    ),
     // Cultist Clothing
     Armor(Chest("Cultist")): VoxTrans(
         "voxel.armor.cultist.chest",

assets/voxygen/voxel/biped_weapon_manifest.ron

@@ -873,6 +873,46 @@
         vox_spec: ("weapon.staff.firestaff_cultist", (-2.5, -2.5, -4.0)),
         color: None
     ),
+    "common.items.weapons.staff.phoenix": (
+        vox_spec: ("weapon.staff.phoenix", (-2.5, -3.5, -5.0)),
+        color: None
+    ),    
+    "common.items.weapons.staff.heated_arm": (
+        vox_spec: ("weapon.staff.heated_arm", (-2.5, -2.5, -3.0)),
+        color: None
+    ),    
+    "common.items.weapons.staff.aurora": (
+        vox_spec: ("weapon.staff.aurora", (-2.5, -2.5, -3.0)),
+        color: None
+    ),    
+    "common.items.weapons.staff.infused_tower": (
+        vox_spec: ("weapon.staff.infused_tower", (-2.5, -2.5, -3.0)),
+        color: None
+    ),    
+    "common.items.weapons.staff.flamethrower_0": (
+        vox_spec: ("weapon.staff.unstable_thrower", (-1.5, -2.5, -5.0)),
+        color: None
+    ),    
+    "common.items.weapons.staff.ley_seeker": (
+        vox_spec: ("weapon.staff.ley_seeker", (-2.5, -2.5, -3.0)),
+        color: None
+    ),   
+    "common.items.weapons.staff.lava_rod": (
+        vox_spec: ("weapon.staff.lava_rod", (-2.5, -2.5, -3.0)),
+        color: None
+    ),    
+    "common.items.weapons.staff.fiery_wishing_rod": (
+        vox_spec: ("weapon.staff.fiery_wishing_rod", (-2.5, -2.5, -3.0)),
+        color: None
+    ),    
+    "common.items.weapons.staff.orc_iron": (
+        vox_spec: ("weapon.staff.orcish_branding_iron", (-2.5, -2.5, -3.0)),
+        color: None
+    ),    
+    "common.items.weapons.staff.bent_fuse": (
+        vox_spec: ("weapon.staff.bent_fuse", (-2.0, -2.5, -5.0)),
+        color: None
+    ),    
     // Healing sceptre
     "common.items.weapons.sceptre.starter_sceptre": (
         vox_spec: ("weapon.sceptre.wood-simple", (-1.5, -2.5, -6.0)),

assets/voxygen/voxel/humanoid_armor_chest_manifest.ron

@@ -68,6 +68,10 @@
             vox_spec: ("armor.rugged.chest", (-7.0, -3.5, 2.0)),
             color: None
         ),
+        "WorkerPurpBrown": (
+            vox_spec: ("armor.misc.chest.worker_purp_brown", (-7.0, -3.5, 2.0)),
+            color: None
+        ),
         // Villagers
         "WorkerGreen0": (
             vox_spec: ("armor.misc.chest.worker_white", (-7.0, -3.5, 2.0)),

assets/voxygen/voxel/humanoid_armor_pants_manifest.ron

@@ -64,6 +64,10 @@
             vox_spec: ("armor.misc.pants.worker_blue", (-5.0, -3.5, 1.0)),
             color: None
         ),
+        "WorkerBrown": (
+            vox_spec: ("armor.misc.pants.worker_brown", (-5.0, -3.5, 1.0)),
+            color: None
+        ),
         "Cultist": (
             vox_spec: ("armor.cultist.pants", (-5.0, -3.5, 1.0)),
             color: Some((30, 0, 64))

assets/voxygen/voxel/humanoid_lantern_manifest.ron

@@ -20,5 +20,9 @@
           vox_spec: ("armor.misc.lantern.blue-0", (-2.0, -2.0, -7.0)),
           color: None
       ),
+      "GeodePurp": (
+          vox_spec: ("lantern.geode_purp", (-3.0, -3.0, -7.0)),
+          color: None
+      ),
     },
 ))

assets/voxygen/voxel/humanoid_main_weapon_manifest.ron

@@ -873,6 +873,50 @@
         vox_spec: ("weapon.staff.firestaff_cultist", (-2.5, -2.5, -4.0)),
         color: None
     ),
+    "common.items.weapons.staff.phoenix": (
+        vox_spec: ("weapon.staff.phoenix", (-2.5, -2.5, -3.0)),
+        color: None
+    ),    
+    "common.items.weapons.staff.heated_arm": (
+        vox_spec: ("weapon.staff.heated_arm", (-2.5, -2.5, -3.0)),
+        color: None
+    ),    
+    "common.items.weapons.staff.aurora": (
+        vox_spec: ("weapon.staff.aurora", (-2.5, -2.5, -3.0)),
+        color: None
+    ),    
+    "common.items.weapons.staff.infused_tower": (
+        vox_spec: ("weapon.staff.infused_tower", (-2.5, -2.5, -3.0)),
+        color: None
+    ),    
+    "common.items.weapons.staff.flamethrower_0": (
+        vox_spec: ("weapon.staff.unstable_thrower", (-2.5, -2.5, -3.0)),
+        color: None
+    ),    
+    "common.items.weapons.staff.ley_seeker": (
+        vox_spec: ("weapon.staff.ley_seeker", (-2.5, -2.5, -3.0)),
+        color: None
+    ),   
+    "common.items.weapons.staff.lava_rod": (
+        vox_spec: ("weapon.staff.lava_rod", (-2.5, -2.5, -3.0)),
+        color: None
+    ),    
+    "common.items.weapons.staff.fiery_wishing_rod": (
+        vox_spec: ("weapon.staff.fiery_wishing_rod", (-2.5, -2.5, -3.0)),
+        color: None
+    ),    
+    "common.items.weapons.staff.orcish_iron": (
+        vox_spec: ("weapon.staff.orcish_branding_iron", (-2.5, -2.5, -3.0)),
+        color: None
+    ),    
+    "common.items.weapons.staff.bent_fuse": (
+        vox_spec: ("weapon.staff.bent_fuse", (-2.5, -2.5, -3.0)),
+        color: None
+    ),
+    "common.items.weapons.staff.heated_arm": (
+        vox_spec: ("weapon.staff.heated_arm", (-2.5, -2.5, -3.0)),
+        color: None
+    ),    
     // Healing sceptre
     "common.items.weapons.sceptre.starter_sceptre": (
         vox_spec: ("weapon.sceptre.wood-simple", (-1.5, -2.5, -6.0)),

common/src/comp/inventory/loadout_builder.rs

@@ -61,10 +61,10 @@ impl LoadoutBuilder {
     /// updates, but should be safe defaults for a new character.
     pub fn defaults(self) -> Self {
         self.chest(Some(Item::new_from_asset_expect(
-            "common.items.armor.rugged.chest",
+            "common.items.armor.misc.chest.worker_purple_brown",
         )))
         .pants(Some(Item::new_from_asset_expect(
-            "common.items.armor.rugged.pants",
+            "common.items.armor.misc.pants.worker_brown",
         )))
         .feet(Some(Item::new_from_asset_expect(
             "common.items.armor.misc.foot.sandals",

voxygen/src/hud/util.rs

@@ -262,7 +262,7 @@ fn statblock_desc(stats: &Stats) -> String {
         stats.poise_strength * 10.0,
         stats.speed,
     ) + &format!(
-        "Critical chance: {:0.1}%\n\nCritical multiplier: {:0.1}x\n\n",
+        "Crit chance: {:0.1}%\n\nCrit damage: x{:0.1}\n\n",
         stats.crit_chance * 100.0,
         stats.crit_mult,
     )
@@ -333,8 +333,7 @@ mod tests {
         );
         assert_eq!(
             "Crafting Ingredient\n\nA bronze ingot.\n\nStat multipliers:\nPower: 30.0\n\nPoise \
-             Strength: 50.0\n\nSpeed: 7.0\n\nCritical chance: 50.0%\n\nCritical multiplier: \
-             2.0x\n\n",
+             Strength: 50.0\n\nSpeed: 7.0\n\nCrit chance: 50.0%\n\nCrit damage: x2.0\n\n",
             ingredient_desc(
                 "A bronze ingot.",
                 "common.items.crafting_ing.bronze_ingot",

voxygen/src/menu/main/ui/mod.rs

@@ -62,7 +62,7 @@ image_ids_ice! {
 }
 
 // Randomly loaded background images
-const BG_IMGS: [&str; 10] = [
+const BG_IMGS: [&str; 12] = [
     //"voxygen.background.bg_1",
     "voxygen.background.bg_2",
     "voxygen.background.bg_3",
@@ -71,12 +71,12 @@ const BG_IMGS: [&str; 10] = [
     "voxygen.background.bg_6",
     "voxygen.background.bg_7",
     "voxygen.background.bg_8",
-    //"voxygen.background.bg_9",
+    "voxygen.background.bg_9",
     "voxygen.background.bg_10",
     //"voxygen.background.bg_11",
     "voxygen.background.bg_12",
     "voxygen.background.bg_13",
-    //"voxygen.background.bg_14",
+    "voxygen.background.bg_14",
     //"voxygen.background.bg_15",
     //"voxygen.background.bg_16",
 ];