From e9cbac387eac1cfe9c95ad19daac347535c9aee3 Mon Sep 17 00:00:00 2001 From: Monty Marz Date: Tue, 16 Mar 2021 23:23:24 +0000 Subject: [PATCH] new loading bg, staff models item images fix paths loot tables, adjustments Update main.ron --- .../armor/misc/chest/worker_purple_0.ron | 4 +- .../armor/misc/chest/worker_purple_brown.ron | 13 +++++ .../items/armor/misc/pants/worker_blue.ron | 4 +- .../items/armor/misc/pants/worker_brown.ron | 13 +++++ assets/common/items/lantern/geode_purp.ron | 14 +++++ .../items/weapons/staff/amethyst_staff.ron | 2 +- assets/common/items/weapons/staff/aurora.ron | 18 +++++++ .../common/items/weapons/staff/bent_fuse.ron | 18 +++++++ .../common/items/weapons/staff/bone_staff.ron | 2 +- .../items/weapons/staff/cultist_staff.ron | 2 +- .../items/weapons/staff/fiery_wishing_rod.ron | 18 +++++++ .../items/weapons/staff/flamethrower_0.ron | 18 +++++++ .../common/items/weapons/staff/heated_arm.ron | 18 +++++++ .../items/weapons/staff/infused_tower.ron | 18 +++++++ .../common/items/weapons/staff/lava_rod.ron | 18 +++++++ .../common/items/weapons/staff/ley_seeker.ron | 18 +++++++ .../common/items/weapons/staff/orc_iron.ron | 18 +++++++ assets/common/items/weapons/staff/phoenix.ron | 18 +++++++ .../common/items/weapons/sword/caladbolg.ron | 2 +- .../loot_tables/loot_table_cave_large.ron | 14 +++-- .../loot_tables/loot_table_cultists.ron | 11 +++- .../loot_tables/loot_table_weapon_rare.ron | 4 ++ .../loot_table_weapon_uncommon.ron | 2 + assets/voxygen/background/bg_13.png | 4 +- assets/voxygen/background/bg_14.png | 3 ++ assets/voxygen/background/bg_9.png | 3 ++ assets/voxygen/background/bg_main.png | 4 +- assets/voxygen/i18n/en/main.ron | 2 +- assets/voxygen/item_image_manifest.ron | 52 +++++++++++++++++++ assets/voxygen/voxel/armor/misc/belt/none.vox | 2 +- .../voxel/armor/misc/chest/worker_green.vox | 2 +- .../armor/misc/chest/worker_purp_brown.vox | 3 ++ .../voxel/armor/misc/pants/worker_brown.vox | 3 ++ .../voxygen/voxel/biped_weapon_manifest.ron | 40 ++++++++++++++ assets/voxygen/voxel/figure/beard/orc/2.vox | 2 +- .../voxel/figure/hair/dwarf/female-3.vox | 2 +- .../voxel/humanoid_armor_chest_manifest.ron | 4 ++ .../voxel/humanoid_armor_pants_manifest.ron | 4 ++ .../voxel/humanoid_lantern_manifest.ron | 4 ++ .../voxel/humanoid_main_weapon_manifest.ron | 44 ++++++++++++++++ assets/voxygen/voxel/lantern/geode_purp.vox | 3 ++ .../voxygen/voxel/weapon/staff/Bone_staff.vox | 3 ++ assets/voxygen/voxel/weapon/staff/aurora.vox | 3 ++ .../voxygen/voxel/weapon/staff/bent_fuse.vox | 3 ++ .../voxel/weapon/staff/fiery_wishing_rod.vox | 3 ++ .../voxygen/voxel/weapon/staff/heated_arm.vox | 3 ++ .../voxel/weapon/staff/infused_tower.vox | 3 ++ .../voxygen/voxel/weapon/staff/lava_rod.vox | 3 ++ .../voxygen/voxel/weapon/staff/ley_seeker.vox | 3 ++ .../weapon/staff/orcish_branding_iron.vox | 3 ++ assets/voxygen/voxel/weapon/staff/phoenix.vox | 3 ++ .../voxel/weapon/staff/unstable_thrower.vox | 3 ++ .../voxygen/voxel/weapon/tool/shovel_gold.vox | 2 +- common/src/comp/inventory/loadout_builder.rs | 4 +- voxygen/src/hud/util.rs | 5 +- voxygen/src/menu/main/ui/mod.rs | 6 +-- 56 files changed, 466 insertions(+), 32 deletions(-) create mode 100644 assets/common/items/armor/misc/chest/worker_purple_brown.ron create mode 100644 assets/common/items/armor/misc/pants/worker_brown.ron create mode 100644 assets/common/items/lantern/geode_purp.ron create mode 100644 assets/common/items/weapons/staff/aurora.ron create mode 100644 assets/common/items/weapons/staff/bent_fuse.ron create mode 100644 assets/common/items/weapons/staff/fiery_wishing_rod.ron create mode 100644 assets/common/items/weapons/staff/flamethrower_0.ron create mode 100644 assets/common/items/weapons/staff/heated_arm.ron create mode 100644 assets/common/items/weapons/staff/infused_tower.ron create mode 100644 assets/common/items/weapons/staff/lava_rod.ron create mode 100644 assets/common/items/weapons/staff/ley_seeker.ron create mode 100644 assets/common/items/weapons/staff/orc_iron.ron create mode 100644 assets/common/items/weapons/staff/phoenix.ron create mode 100644 assets/voxygen/background/bg_14.png create mode 100644 assets/voxygen/background/bg_9.png create mode 100644 assets/voxygen/voxel/armor/misc/chest/worker_purp_brown.vox create mode 100644 assets/voxygen/voxel/armor/misc/pants/worker_brown.vox create mode 100644 assets/voxygen/voxel/lantern/geode_purp.vox create mode 100644 assets/voxygen/voxel/weapon/staff/Bone_staff.vox create mode 100644 assets/voxygen/voxel/weapon/staff/aurora.vox create mode 100644 assets/voxygen/voxel/weapon/staff/bent_fuse.vox create mode 100644 assets/voxygen/voxel/weapon/staff/fiery_wishing_rod.vox create mode 100644 assets/voxygen/voxel/weapon/staff/heated_arm.vox create mode 100644 assets/voxygen/voxel/weapon/staff/infused_tower.vox create mode 100644 assets/voxygen/voxel/weapon/staff/lava_rod.vox create mode 100644 assets/voxygen/voxel/weapon/staff/ley_seeker.vox create mode 100644 assets/voxygen/voxel/weapon/staff/orcish_branding_iron.vox create mode 100644 assets/voxygen/voxel/weapon/staff/phoenix.vox create mode 100644 assets/voxygen/voxel/weapon/staff/unstable_thrower.vox diff --git a/assets/common/items/armor/misc/chest/worker_purple_0.ron b/assets/common/items/armor/misc/chest/worker_purple_0.ron index e13413135f..b1d751d491 100644 --- a/assets/common/items/armor/misc/chest/worker_purple_0.ron +++ b/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), ), )), diff --git a/assets/common/items/armor/misc/chest/worker_purple_brown.ron b/assets/common/items/armor/misc/chest/worker_purple_brown.ron new file mode 100644 index 0000000000..3a27853c09 --- /dev/null +++ b/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], +) \ No newline at end of file diff --git a/assets/common/items/armor/misc/pants/worker_blue.ron b/assets/common/items/armor/misc/pants/worker_blue.ron index b24428bf78..15b555ab2a 100644 --- a/assets/common/items/armor/misc/pants/worker_blue.ron +++ b/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), ), )), diff --git a/assets/common/items/armor/misc/pants/worker_brown.ron b/assets/common/items/armor/misc/pants/worker_brown.ron new file mode 100644 index 0000000000..c11762da0e --- /dev/null +++ b/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], +) \ No newline at end of file diff --git a/assets/common/items/lantern/geode_purp.ron b/assets/common/items/lantern/geode_purp.ron new file mode 100644 index 0000000000..cd46922c13 --- /dev/null +++ b/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: [], +) diff --git a/assets/common/items/weapons/staff/amethyst_staff.ron b/assets/common/items/weapons/staff/amethyst_staff.ron index 0520597f2a..e42b6c997e 100644 --- a/assets/common/items/weapons/staff/amethyst_staff.ron +++ b/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, diff --git a/assets/common/items/weapons/staff/aurora.ron b/assets/common/items/weapons/staff/aurora.ron new file mode 100644 index 0000000000..1d6be7db9f --- /dev/null +++ b/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: [], +) \ No newline at end of file diff --git a/assets/common/items/weapons/staff/bent_fuse.ron b/assets/common/items/weapons/staff/bent_fuse.ron new file mode 100644 index 0000000000..5ea0391ccb --- /dev/null +++ b/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: [], +) \ No newline at end of file diff --git a/assets/common/items/weapons/staff/bone_staff.ron b/assets/common/items/weapons/staff/bone_staff.ron index 909951120f..26a20cc4ad 100644 --- a/assets/common/items/weapons/staff/bone_staff.ron +++ b/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, diff --git a/assets/common/items/weapons/staff/cultist_staff.ron b/assets/common/items/weapons/staff/cultist_staff.ron index 68813eb63c..6a75d645dc 100644 --- a/assets/common/items/weapons/staff/cultist_staff.ron +++ b/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, diff --git a/assets/common/items/weapons/staff/fiery_wishing_rod.ron b/assets/common/items/weapons/staff/fiery_wishing_rod.ron new file mode 100644 index 0000000000..f390f98f9e --- /dev/null +++ b/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: [], +) \ No newline at end of file diff --git a/assets/common/items/weapons/staff/flamethrower_0.ron b/assets/common/items/weapons/staff/flamethrower_0.ron new file mode 100644 index 0000000000..77d92c2951 --- /dev/null +++ b/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: [], +) \ No newline at end of file diff --git a/assets/common/items/weapons/staff/heated_arm.ron b/assets/common/items/weapons/staff/heated_arm.ron new file mode 100644 index 0000000000..21c061996b --- /dev/null +++ b/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: [], +) \ No newline at end of file diff --git a/assets/common/items/weapons/staff/infused_tower.ron b/assets/common/items/weapons/staff/infused_tower.ron new file mode 100644 index 0000000000..217ec3dfe5 --- /dev/null +++ b/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: [], +) \ No newline at end of file diff --git a/assets/common/items/weapons/staff/lava_rod.ron b/assets/common/items/weapons/staff/lava_rod.ron new file mode 100644 index 0000000000..d84459eb79 --- /dev/null +++ b/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: [], +) \ No newline at end of file diff --git a/assets/common/items/weapons/staff/ley_seeker.ron b/assets/common/items/weapons/staff/ley_seeker.ron new file mode 100644 index 0000000000..f77d1c4ede --- /dev/null +++ b/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: [], +) \ No newline at end of file diff --git a/assets/common/items/weapons/staff/orc_iron.ron b/assets/common/items/weapons/staff/orc_iron.ron new file mode 100644 index 0000000000..855908ae85 --- /dev/null +++ b/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: [], +) \ No newline at end of file diff --git a/assets/common/items/weapons/staff/phoenix.ron b/assets/common/items/weapons/staff/phoenix.ron new file mode 100644 index 0000000000..efaa30e77d --- /dev/null +++ b/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: [], +) \ No newline at end of file diff --git a/assets/common/items/weapons/sword/caladbolg.ron b/assets/common/items/weapons/sword/caladbolg.ron index 9d8850f0bf..398be9caaf 100644 --- a/assets/common/items/weapons/sword/caladbolg.ron +++ b/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, diff --git a/assets/common/loot_tables/loot_table_cave_large.ron b/assets/common/loot_tables/loot_table_cave_large.ron index cdda48b38b..01abac9402 100644 --- a/assets/common/loot_tables/loot_table_cave_large.ron +++ b/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"), diff --git a/assets/common/loot_tables/loot_table_cultists.ron b/assets/common/loot_tables/loot_table_cultists.ron index 35714b9212..c838693584 100644 --- a/assets/common/loot_tables/loot_table_cultists.ron +++ b/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"), diff --git a/assets/common/loot_tables/loot_table_weapon_rare.ron b/assets/common/loot_tables/loot_table_weapon_rare.ron index ee6d4db03e..89dc263dd1 100644 --- a/assets/common/loot_tables/loot_table_weapon_rare.ron +++ b/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"), diff --git a/assets/common/loot_tables/loot_table_weapon_uncommon.ron b/assets/common/loot_tables/loot_table_weapon_uncommon.ron index 4ede12e596..3af9b46df3 100644 --- a/assets/common/loot_tables/loot_table_weapon_uncommon.ron +++ b/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"), diff --git a/assets/voxygen/background/bg_13.png b/assets/voxygen/background/bg_13.png index eb3ebc819e..e5d2d13b54 100644 --- a/assets/voxygen/background/bg_13.png +++ b/assets/voxygen/background/bg_13.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c973583c530fcad6d8ffc98b0a0dfa2462f59527deff1360eff8a24f5bc9a330 -size 446761 +oid sha256:2d1a72735e0fad46410db7c517a80d95ddddf0b76ed798f3bcfc1098bda125c7 +size 1314819 diff --git a/assets/voxygen/background/bg_14.png b/assets/voxygen/background/bg_14.png new file mode 100644 index 0000000000..466e35655c --- /dev/null +++ b/assets/voxygen/background/bg_14.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:62a1fb6b416664dc346015492f4ed010eed55a4d59da25ea14837165ea5a8020 +size 2878018 diff --git a/assets/voxygen/background/bg_9.png b/assets/voxygen/background/bg_9.png new file mode 100644 index 0000000000..1bac40b2c7 --- /dev/null +++ b/assets/voxygen/background/bg_9.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7ae41c4fac3190e13d1bfdafe6905ede9eeb2f8bdc6b5708d28b82a499aaa5ab +size 2079829 diff --git a/assets/voxygen/background/bg_main.png b/assets/voxygen/background/bg_main.png index 466e35655c..e4bee3831b 100644 --- a/assets/voxygen/background/bg_main.png +++ b/assets/voxygen/background/bg_main.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:62a1fb6b416664dc346015492f4ed010eed55a4d59da25ea14837165ea5a8020 -size 2878018 +oid sha256:9343b6be6caf0099edeac7260bf65103b7d1ec33211629988068b2f1412945d6 +size 3256584 diff --git a/assets/voxygen/i18n/en/main.ron b/assets/voxygen/i18n/en/main.ron index 8d64635e76..ac9adf55ab 100644 --- a/assets/voxygen/i18n/en/main.ron +++ b/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 diff --git a/assets/voxygen/item_image_manifest.ron b/assets/voxygen/item_image_manifest.ron index 63b08fcda2..eae84a9d61 100644 --- a/assets/voxygen/item_image_manifest.ron +++ b/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", diff --git a/assets/voxygen/voxel/armor/misc/belt/none.vox b/assets/voxygen/voxel/armor/misc/belt/none.vox index aa27c2a7cb..c97eee8017 100644 --- a/assets/voxygen/voxel/armor/misc/belt/none.vox +++ b/assets/voxygen/voxel/armor/misc/belt/none.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2be744a5ee964b6f325875424a32a121386a87f88c53cf61553b171c6ff9dad7 +oid sha256:d0e1531ff7d533567cfb303bb117af6c092dcad834a655e2bfa31b8fa6d69c4a size 1472 diff --git a/assets/voxygen/voxel/armor/misc/chest/worker_green.vox b/assets/voxygen/voxel/armor/misc/chest/worker_green.vox index 33c8855660..b7e4e6a2ed 100644 --- a/assets/voxygen/voxel/armor/misc/chest/worker_green.vox +++ b/assets/voxygen/voxel/armor/misc/chest/worker_green.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:18ef4546a55ec987b988197120690d7f81a6b23706c65aef709d8434f1ae8820 +oid sha256:154d2c805c21d8865853967958a4000533aa24895d2a71836a5b4ec0fa249dd1 size 2696 diff --git a/assets/voxygen/voxel/armor/misc/chest/worker_purp_brown.vox b/assets/voxygen/voxel/armor/misc/chest/worker_purp_brown.vox new file mode 100644 index 0000000000..84c0d40413 --- /dev/null +++ b/assets/voxygen/voxel/armor/misc/chest/worker_purp_brown.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:776a93babd4e222abdd07babefc064d12a04f7ca672ad808864671117c03e407 +size 2696 diff --git a/assets/voxygen/voxel/armor/misc/pants/worker_brown.vox b/assets/voxygen/voxel/armor/misc/pants/worker_brown.vox new file mode 100644 index 0000000000..81e8177745 --- /dev/null +++ b/assets/voxygen/voxel/armor/misc/pants/worker_brown.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7dcc661f947d1ae5d521ceddb2d20b1d98c4c3e8f2a250429ce22e973ba824ee +size 1912 diff --git a/assets/voxygen/voxel/biped_weapon_manifest.ron b/assets/voxygen/voxel/biped_weapon_manifest.ron index 7bfd156e52..ef56474850 100644 --- a/assets/voxygen/voxel/biped_weapon_manifest.ron +++ b/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)), diff --git a/assets/voxygen/voxel/figure/beard/orc/2.vox b/assets/voxygen/voxel/figure/beard/orc/2.vox index 4c9b6affcc..c4dce05aed 100644 --- a/assets/voxygen/voxel/figure/beard/orc/2.vox +++ b/assets/voxygen/voxel/figure/beard/orc/2.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bf134a351e647345d55255633c2837e8ea6628496416ded1ada46cfb62d29138 +oid sha256:0d79e62c4013ebc4d756babfae1a963ef7b7779fee8bb78865db3a500ea824a4 size 1540 diff --git a/assets/voxygen/voxel/figure/hair/dwarf/female-3.vox b/assets/voxygen/voxel/figure/hair/dwarf/female-3.vox index 3ea2051bd5..434e3189e9 100644 --- a/assets/voxygen/voxel/figure/hair/dwarf/female-3.vox +++ b/assets/voxygen/voxel/figure/hair/dwarf/female-3.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:57511c54c2450856f0f2eea91b4cf4933ebfc50aa4ea91d7a4f9153571ea814d +oid sha256:6e66db107ba7dcb1c73defdef7a23e9e2355e0a1f2b233c7e40611719dc484b5 size 2924 diff --git a/assets/voxygen/voxel/humanoid_armor_chest_manifest.ron b/assets/voxygen/voxel/humanoid_armor_chest_manifest.ron index 12e8be4961..e06b45db3f 100644 --- a/assets/voxygen/voxel/humanoid_armor_chest_manifest.ron +++ b/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)), diff --git a/assets/voxygen/voxel/humanoid_armor_pants_manifest.ron b/assets/voxygen/voxel/humanoid_armor_pants_manifest.ron index e5239b2e04..d3ce20aa93 100644 --- a/assets/voxygen/voxel/humanoid_armor_pants_manifest.ron +++ b/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)) diff --git a/assets/voxygen/voxel/humanoid_lantern_manifest.ron b/assets/voxygen/voxel/humanoid_lantern_manifest.ron index 599a711559..6b600a9cd3 100644 --- a/assets/voxygen/voxel/humanoid_lantern_manifest.ron +++ b/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 + ), }, )) diff --git a/assets/voxygen/voxel/humanoid_main_weapon_manifest.ron b/assets/voxygen/voxel/humanoid_main_weapon_manifest.ron index b1667c6a2a..d8db7f5f12 100644 --- a/assets/voxygen/voxel/humanoid_main_weapon_manifest.ron +++ b/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)), diff --git a/assets/voxygen/voxel/lantern/geode_purp.vox b/assets/voxygen/voxel/lantern/geode_purp.vox new file mode 100644 index 0000000000..b2c7fc7e71 --- /dev/null +++ b/assets/voxygen/voxel/lantern/geode_purp.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:09a0300e03192fc8b5fe95f504ac896341f317456b28f6e0ee2c3541a16c8c78 +size 1500 diff --git a/assets/voxygen/voxel/weapon/staff/Bone_staff.vox b/assets/voxygen/voxel/weapon/staff/Bone_staff.vox new file mode 100644 index 0000000000..7a333c14a9 --- /dev/null +++ b/assets/voxygen/voxel/weapon/staff/Bone_staff.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a3c23d24347d41186fb7933e1004aec1e31f8222ba723a2ef1cf14e68f4740c6 +size 1368 diff --git a/assets/voxygen/voxel/weapon/staff/aurora.vox b/assets/voxygen/voxel/weapon/staff/aurora.vox new file mode 100644 index 0000000000..e51d6e2535 --- /dev/null +++ b/assets/voxygen/voxel/weapon/staff/aurora.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dec1d557e5ad457df66e8f5ffff0f81a63303aedcc4f115f61807e517cafb26f +size 1780 diff --git a/assets/voxygen/voxel/weapon/staff/bent_fuse.vox b/assets/voxygen/voxel/weapon/staff/bent_fuse.vox new file mode 100644 index 0000000000..e1e66ac507 --- /dev/null +++ b/assets/voxygen/voxel/weapon/staff/bent_fuse.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:40a4e20f9242aa577595a91ec184e09d21f898028645d87c3032332a14f782fd +size 1588 diff --git a/assets/voxygen/voxel/weapon/staff/fiery_wishing_rod.vox b/assets/voxygen/voxel/weapon/staff/fiery_wishing_rod.vox new file mode 100644 index 0000000000..9a24a3e71e --- /dev/null +++ b/assets/voxygen/voxel/weapon/staff/fiery_wishing_rod.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4bed8e6ba03d4d9fb8e7a86f9e382ce619e6cf721225c720a594a1e65c7b5ca0 +size 1304 diff --git a/assets/voxygen/voxel/weapon/staff/heated_arm.vox b/assets/voxygen/voxel/weapon/staff/heated_arm.vox new file mode 100644 index 0000000000..90cb0d9aca --- /dev/null +++ b/assets/voxygen/voxel/weapon/staff/heated_arm.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:639408e2eed77b44bdd5f8862c235b56f898f9a68d9d040811921f87fd50442d +size 1420 diff --git a/assets/voxygen/voxel/weapon/staff/infused_tower.vox b/assets/voxygen/voxel/weapon/staff/infused_tower.vox new file mode 100644 index 0000000000..b41fa28d9e --- /dev/null +++ b/assets/voxygen/voxel/weapon/staff/infused_tower.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7f4c58a33b5dd75721b77715f770c5ad872ad6aac8e5249d7d0edc3daf081fe4 +size 1764 diff --git a/assets/voxygen/voxel/weapon/staff/lava_rod.vox b/assets/voxygen/voxel/weapon/staff/lava_rod.vox new file mode 100644 index 0000000000..0ef5721b7f --- /dev/null +++ b/assets/voxygen/voxel/weapon/staff/lava_rod.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:18ceff4c0974900a69b490753789fc52584f7345e35ec3d5466b3fb5b966d382 +size 1516 diff --git a/assets/voxygen/voxel/weapon/staff/ley_seeker.vox b/assets/voxygen/voxel/weapon/staff/ley_seeker.vox new file mode 100644 index 0000000000..e90e8943cc --- /dev/null +++ b/assets/voxygen/voxel/weapon/staff/ley_seeker.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:be545f1b3ed11834f81a44e4c04ff750bdefa4565ac05b1dfe9c78806d54c868 +size 1324 diff --git a/assets/voxygen/voxel/weapon/staff/orcish_branding_iron.vox b/assets/voxygen/voxel/weapon/staff/orcish_branding_iron.vox new file mode 100644 index 0000000000..e5fca3ce7a --- /dev/null +++ b/assets/voxygen/voxel/weapon/staff/orcish_branding_iron.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9533ce2be4f406f1592116be45fb326ee61359fcc0d76711c24f3bcb09d40362 +size 1692 diff --git a/assets/voxygen/voxel/weapon/staff/phoenix.vox b/assets/voxygen/voxel/weapon/staff/phoenix.vox new file mode 100644 index 0000000000..0339d5ec1b --- /dev/null +++ b/assets/voxygen/voxel/weapon/staff/phoenix.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f3d8d88fe482c9e4fe1940533129ec04f1b3289c868105d8e47358cf1489051a +size 1396 diff --git a/assets/voxygen/voxel/weapon/staff/unstable_thrower.vox b/assets/voxygen/voxel/weapon/staff/unstable_thrower.vox new file mode 100644 index 0000000000..ce97217c18 --- /dev/null +++ b/assets/voxygen/voxel/weapon/staff/unstable_thrower.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d7690b3e1b9c5ae6aee78bbe804493d5f27095a812f564a2dd5d5283c3cfcdc0 +size 1420 diff --git a/assets/voxygen/voxel/weapon/tool/shovel_gold.vox b/assets/voxygen/voxel/weapon/tool/shovel_gold.vox index ed5f298caa..34a2f0282f 100644 --- a/assets/voxygen/voxel/weapon/tool/shovel_gold.vox +++ b/assets/voxygen/voxel/weapon/tool/shovel_gold.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:877621fec38c6a11972f267a5905fbc73cf226eaab62c05b8c27b847c77bf932 +oid sha256:f697e4d8dddd203461c99f42d1a480c1c04a01e2df6197ed39e84a6963b2490a size 1376 diff --git a/common/src/comp/inventory/loadout_builder.rs b/common/src/comp/inventory/loadout_builder.rs index 6f89b197f0..72e7f90a3e 100644 --- a/common/src/comp/inventory/loadout_builder.rs +++ b/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", diff --git a/voxygen/src/hud/util.rs b/voxygen/src/hud/util.rs index 2ae0578539..e963016ad2 100644 --- a/voxygen/src/hud/util.rs +++ b/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", diff --git a/voxygen/src/menu/main/ui/mod.rs b/voxygen/src/menu/main/ui/mod.rs index 7e8a6e9357..08e1bdb84d 100644 --- a/voxygen/src/menu/main/ui/mod.rs +++ b/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", ];