From f6e462688732f4719cf7272cb6ace287ebefe390 Mon Sep 17 00:00:00 2001 From: Sam Date: Sun, 28 Mar 2021 21:19:01 -0400 Subject: [PATCH] Fix emerald sceptre. Remove duplicate asset. --- assets/common/loot_tables/loot_table_cultists.ron | 2 +- assets/voxygen/voxel/weapon/staff/emerald.vox | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) delete mode 100644 assets/voxygen/voxel/weapon/staff/emerald.vox diff --git a/assets/common/loot_tables/loot_table_cultists.ron b/assets/common/loot_tables/loot_table_cultists.ron index 7257b576e6..b2357169b9 100644 --- a/assets/common/loot_tables/loot_table_cultists.ron +++ b/assets/common/loot_tables/loot_table_cultists.ron @@ -210,7 +210,7 @@ (0.10, "common.items.weapons.staff.dragon_tongue"), (0.10, "common.items.weapons.staff.flamethrower_0"), (0.04, "common.items.weapons.staff.bent_fuse"), - (0.04, "common.items.weapons.staff.emerald"), + (0.04, "common.items.weapons.sceptre.emerald"), (0.04, "common.items.weapons.staff.orc_iron"), // hammers (0.01, "common.items.weapons.hammer.cobalt_hammer-0"), diff --git a/assets/voxygen/voxel/weapon/staff/emerald.vox b/assets/voxygen/voxel/weapon/staff/emerald.vox deleted file mode 100644 index 4901862ae8..0000000000 --- a/assets/voxygen/voxel/weapon/staff/emerald.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1b28bb7dbe3c6e574c665ec52c54d53853cac0180105bd320b2328feecb0416b -size 1660