From 803c7d81dc334c43bbcca898afa2b43a0334fb21 Mon Sep 17 00:00:00 2001 From: Sam Date: Mon, 1 Mar 2021 00:58:43 -0500 Subject: [PATCH] Fix a few asset paths for armors. --- assets/common/loot_tables/loot_table_cave_large.ron | 4 ++-- common/src/comp/inventory/loadout_builder.rs | 2 +- common/src/comp/inventory/test.rs | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/assets/common/loot_tables/loot_table_cave_large.ron b/assets/common/loot_tables/loot_table_cave_large.ron index 11077acb9c..cdda48b38b 100644 --- a/assets/common/loot_tables/loot_table_cave_large.ron +++ b/assets/common/loot_tables/loot_table_cave_large.ron @@ -1,13 +1,13 @@ [ // Misc - (0.25, "common.items.armor.neck.neck_1"), + (0.25, "common.items.armor.misc.neck.plain_1"), (2.0, "common.items.crafting_ing.cloth_scraps"), (1.0, "common.items.crafting_ing.empty_vial"), (0.1, "common.items.glider.glider_blue"), (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.ring.ring_gold_0"), + (0.05, "common.items.armor.misc.ring.gold"), // swords (0.03, "common.items.weapons.sword.steel-0"), (0.03, "common.items.weapons.sword.steel-1"), diff --git a/common/src/comp/inventory/loadout_builder.rs b/common/src/comp/inventory/loadout_builder.rs index 0abb9f4562..fb603fd8cc 100644 --- a/common/src/comp/inventory/loadout_builder.rs +++ b/common/src/comp/inventory/loadout_builder.rs @@ -515,7 +515,7 @@ impl LoadoutBuilder { "common.items.armor.cloth_purple.hand", ))) .pants(Some(Item::new_from_asset_expect( - "common.items.armor.pacloth_purplents.pants", + "common.items.armor.cloth_purple.pants", ))) .feet(Some(Item::new_from_asset_expect( "common.items.armor.cloth_purple.foot", diff --git a/common/src/comp/inventory/test.rs b/common/src/comp/inventory/test.rs index d35aefadea..3b15c8dfee 100644 --- a/common/src/comp/inventory/test.rs +++ b/common/src/comp/inventory/test.rs @@ -203,7 +203,7 @@ fn equip_replace_already_equipped_item() { let boots = Item::new_from_asset_expect("common.items.testing.test_boots"); let starting_sandles = Some(Item::new_from_asset_expect( - "common.items.armor.foot.sandals_0", + "common.items.armor.misc.foot.sandals", )); let mut inv = Inventory::new_empty();