From f2f2c41f86511962f2ba098e028694810db5feda Mon Sep 17 00:00:00 2001
From: Sam <samuelkeiffer@gmail.com>
Date: Sun, 28 Mar 2021 21:19:01 -0400
Subject: [PATCH] Fix emerald sceptre. Remove duplicate asset.

---
 .../common/loot_tables/loot_table_cultists.ron   |   2 +-
 assets/voxygen/voxel/weapon/staff/emerald.vox    | Bin 1660 -> 0 bytes
 2 files changed, 1 insertion(+), 1 deletion(-)
 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 5a480e438496388235f94a358199ceffe7e61928..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1660
zcmbW0Z%kEX9LIm>d7g725e4o&_Z}dTKqh}&gcw{z?HZ7xfgwqX#$3Y*V@}89=Dl8M
z$P&#_MhxwR5|#5slZ*k&wMERCYjduV>z#AXwYFZiYQ6jRJ=f|*o3=XJXW!rN`+J_>
zbDr}&r)|gX{BaR!+T7SokuIM|Yh!!EQZM0?@+aBU-Fw;_!^(3-Mu^rXs&$}GYfb#b
zCJqV4wD!HJb;?PtQ>jl-mr&EFOR4D`vy5|>Q!_{=<1A_@thF0f+6`*ux<<RMHg3=u
zH*A!9N-5Tio2_)nQ7YtUVmz2@LnX??3iWF%G+?NfB04l+nNYv7>D%<FHhr7EO<(&$
z{i3N7>i1EV3dWQbj9FBXz;R2QxL8iyvYePjUop3o6BFgc6+OlMD#JY!<0<DE5Bi4V
zZN|1&vpJ4fjBU^N;$+UgHv14mY!Abjy=@P!Ww@qIe0&cd*Yz1<J8|QqPZY6;&=>mR
z3mo@(@cp%N`jmGr#_2OuLseev`N<m3&;(ecDyj(#YvUhQI%`;~%weN5m@j9(jCnfo
zN0s(R4bjRwH`S+Yiz=K?HC}9mwMA7bstr*>mFUhb&u<o!yh0KVhmlAmaDP;=^}-Dl
z27bpcfdCd3n&3TG8fP)<<|fsP|6(>JB^hT#g2>*VkNkl$luXn>8f-|<63Ap0dhYch
zqe&1tBzW?yV9ixQYL6g&NZ@B4{6w&>DGl2WWuSe~kGJMlpgtjJ856uVC5U~?xh*-!
z>n^~mL@BCfBFOCxpkO2irI%Ks;^u0E_6b%EviG=P!@NLV=KAqe$k;N-bO5JUXX5fR
z4(@Es1-3nfF%is>@5v8j?3iHcJ;B0d!8e~Vj|e6k1fTB|+&w60XMU_raJG|vR8UtU
z=m-m<^@8*CTh`^EyP*K_mST(_Sc}B2YK(W)Vd2y(`0-LV$_j(nuy!T3KUa(cZPn=6
zCK!5EFmY5c|Bj$4F9(gKtFW)?Y4q0D;Ppr?&Ub9V$d)3^bd;n0rOoKs-;BhOy*M*)
z5b@59INY%w&0E)F@%ja%rKQ33XCgm89~C79s4C1vU73T14Hek&LJj(NeSj~cU*o6g
z2e^B?4CS3`;A~%kTVDtsd?$!^7vua;C2m})!_W5zk$$usnIna0o~pn#eEh%n|KQ@m
z|Fr+Zt+mPhx0MFby)O6f{a032;@#>Alvhlm_Vfv44`t)#hk`qM1;5tRproV(U4>D+
zxOEyb6o=F6VD8+*GaSg_-O0<t8%1N-R6B~!GbiD8gmC-QBFwdCW0c?QpWojb=k?mt
zdJDZ>K<wOQ41F|%x2Lb;{jV1B?2*&hbYcSAFV3U&>LMbM2<{6YsRX}4FADBmd-#6$
cc)$Lw&c87EpFK*w;-hMw|F~MR@#E*qA4V@|)&Kwi