From 9d4d6a066a98ac0996d5fea61e0670c35a1d7425 Mon Sep 17 00:00:00 2001 From: Snowram Date: Fri, 7 May 2021 17:03:45 +0000 Subject: [PATCH] Snowram/craft mats --- assets/common/items/crafting_ing/bamboo.ron | 9 +++++ assets/common/items/crafting_ing/basalt.ron | 9 +++++ .../items/crafting_ing/dragon_scale.ron | 9 +++++ .../common/items/crafting_ing/gold_ingot.ron | 9 +++++ assets/common/items/crafting_ing/gold_ore.ron | 9 +++++ assets/common/items/crafting_ing/granite.ron | 9 +++++ .../items/crafting_ing/ironwood_logs.ron | 9 +++++ assets/common/items/crafting_ing/leather.ron | 9 +++++ assets/common/items/crafting_ing/lifecoth.ron | 9 +++++ assets/common/items/crafting_ing/linen.ron | 9 +++++ .../common/items/crafting_ing/moonweave.ron | 9 +++++ assets/common/items/crafting_ing/obsidian.ron | 9 +++++ .../items/crafting_ing/orichalcum_ingot.ron | 9 +++++ .../crafting_ing/{plates.ron => plate.ron} | 4 +- assets/common/items/crafting_ing/rawhide.ron | 9 +++++ assets/common/items/crafting_ing/rock.ron | 9 +++++ assets/common/items/crafting_ing/scales.ron | 2 +- assets/common/items/crafting_ing/silk.ron | 9 +++++ .../items/crafting_ing/silver_ingot.ron | 9 +++++ .../common/items/crafting_ing/silver_ore.ron | 9 +++++ assets/common/items/crafting_ing/sunsilk.ron | 9 +++++ assets/voxygen/item_image_manifest.ron | 36 ++++++++++++++++++ assets/voxygen/voxel/object/gold_ore.vox | Bin 0 -> 1948 bytes assets/voxygen/voxel/object/silver_ore.vox | Bin 0 -> 1964 bytes assets/voxygen/voxel/object_manifest.ron | 20 ++++++++++ .../sprite/crafting_ing/dragon_scale.vox | Bin 0 -> 1484 bytes .../voxel/sprite/crafting_ing/gold_ingot.vox | Bin 0 -> 1256 bytes .../sprite/crafting_ing/gold_ore_drop.vox | Bin 0 -> 1228 bytes .../voxel/sprite/crafting_ing/leather.vox | Bin 0 -> 1312 bytes .../sprite/crafting_ing/orichalcum_ingot.vox | Bin 0 -> 1368 bytes .../voxel/sprite/crafting_ing/plate.vox | Bin 0 -> 1600 bytes .../voxel/sprite/crafting_ing/scale.vox | Bin 0 -> 1304 bytes .../sprite/crafting_ing/silver_ingot.vox | Bin 0 -> 1248 bytes .../sprite/crafting_ing/silver_ore_drop.vox | Bin 0 -> 1312 bytes common/src/comp/body/object.rs | 10 ++++- 35 files changed, 239 insertions(+), 4 deletions(-) create mode 100644 assets/common/items/crafting_ing/bamboo.ron create mode 100644 assets/common/items/crafting_ing/basalt.ron create mode 100644 assets/common/items/crafting_ing/dragon_scale.ron create mode 100644 assets/common/items/crafting_ing/gold_ingot.ron create mode 100644 assets/common/items/crafting_ing/gold_ore.ron create mode 100644 assets/common/items/crafting_ing/granite.ron create mode 100644 assets/common/items/crafting_ing/ironwood_logs.ron create mode 100644 assets/common/items/crafting_ing/leather.ron create mode 100644 assets/common/items/crafting_ing/lifecoth.ron create mode 100644 assets/common/items/crafting_ing/linen.ron create mode 100644 assets/common/items/crafting_ing/moonweave.ron create mode 100644 assets/common/items/crafting_ing/obsidian.ron create mode 100644 assets/common/items/crafting_ing/orichalcum_ingot.ron rename assets/common/items/crafting_ing/{plates.ron => plate.ron} (73%) create mode 100644 assets/common/items/crafting_ing/rawhide.ron create mode 100644 assets/common/items/crafting_ing/rock.ron create mode 100644 assets/common/items/crafting_ing/silk.ron create mode 100644 assets/common/items/crafting_ing/silver_ingot.ron create mode 100644 assets/common/items/crafting_ing/silver_ore.ron create mode 100644 assets/common/items/crafting_ing/sunsilk.ron create mode 100644 assets/voxygen/voxel/object/gold_ore.vox create mode 100644 assets/voxygen/voxel/object/silver_ore.vox create mode 100644 assets/voxygen/voxel/sprite/crafting_ing/dragon_scale.vox create mode 100644 assets/voxygen/voxel/sprite/crafting_ing/gold_ingot.vox create mode 100644 assets/voxygen/voxel/sprite/crafting_ing/gold_ore_drop.vox create mode 100644 assets/voxygen/voxel/sprite/crafting_ing/leather.vox create mode 100644 assets/voxygen/voxel/sprite/crafting_ing/orichalcum_ingot.vox create mode 100644 assets/voxygen/voxel/sprite/crafting_ing/plate.vox create mode 100644 assets/voxygen/voxel/sprite/crafting_ing/scale.vox create mode 100644 assets/voxygen/voxel/sprite/crafting_ing/silver_ingot.vox create mode 100644 assets/voxygen/voxel/sprite/crafting_ing/silver_ore_drop.vox diff --git a/assets/common/items/crafting_ing/bamboo.ron b/assets/common/items/crafting_ing/bamboo.ron new file mode 100644 index 0000000000..f87c3d03a7 --- /dev/null +++ b/assets/common/items/crafting_ing/bamboo.ron @@ -0,0 +1,9 @@ +ItemDef( + name: "Bamboo", + description: "A giant woody grass.", + kind: Ingredient( + kind: "Bamboo", + ), + quality: Common, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/crafting_ing/basalt.ron b/assets/common/items/crafting_ing/basalt.ron new file mode 100644 index 0000000000..a6e6890922 --- /dev/null +++ b/assets/common/items/crafting_ing/basalt.ron @@ -0,0 +1,9 @@ +ItemDef( + name: "Basalt", + description: "A dark volcanic rock.", + kind: Ingredient( + kind: "Basalt", + ), + quality: High, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/crafting_ing/dragon_scale.ron b/assets/common/items/crafting_ing/dragon_scale.ron new file mode 100644 index 0000000000..c951ab4a96 --- /dev/null +++ b/assets/common/items/crafting_ing/dragon_scale.ron @@ -0,0 +1,9 @@ +ItemDef( + name: "Dragon Scale", + description: "Tough scale from a legendary beast.", + kind: Ingredient( + kind: "DragonScale", + ), + quality: Legendary, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/crafting_ing/gold_ingot.ron b/assets/common/items/crafting_ing/gold_ingot.ron new file mode 100644 index 0000000000..6f4b138fb8 --- /dev/null +++ b/assets/common/items/crafting_ing/gold_ingot.ron @@ -0,0 +1,9 @@ +ItemDef( + name: "Gold Ingot", + description: "An ingot made of refined metallic gold.", + kind: Ingredient( + kind: "GoldIngot", + ), + quality: Epic, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/crafting_ing/gold_ore.ron b/assets/common/items/crafting_ing/gold_ore.ron new file mode 100644 index 0000000000..c02774463d --- /dev/null +++ b/assets/common/items/crafting_ing/gold_ore.ron @@ -0,0 +1,9 @@ +ItemDef( + name: "Gold Ore", + description: "A precious yellow metal.", + kind: Ingredient( + kind: "GoldOre", + ), + quality: Epic, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/crafting_ing/granite.ron b/assets/common/items/crafting_ing/granite.ron new file mode 100644 index 0000000000..75891e2b36 --- /dev/null +++ b/assets/common/items/crafting_ing/granite.ron @@ -0,0 +1,9 @@ +ItemDef( + name: "Granite", + description: "A light-colored igneous rock.", + kind: Ingredient( + kind: "Granite", + ), + quality: Common, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/crafting_ing/ironwood_logs.ron b/assets/common/items/crafting_ing/ironwood_logs.ron new file mode 100644 index 0000000000..4f6c5fbc1d --- /dev/null +++ b/assets/common/items/crafting_ing/ironwood_logs.ron @@ -0,0 +1,9 @@ +ItemDef( + name: "Ironwood Logs", + description: "A particularly sturdy wood.", + kind: Ingredient( + kind: "IronwoodLogs", + ), + quality: High, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/crafting_ing/leather.ron b/assets/common/items/crafting_ing/leather.ron new file mode 100644 index 0000000000..f4ab458650 --- /dev/null +++ b/assets/common/items/crafting_ing/leather.ron @@ -0,0 +1,9 @@ +ItemDef( + name: "Leather", + description: "A fabric made from animal hides or skins.", + kind: Ingredient( + kind: "Leather", + ), + quality: Common, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/crafting_ing/lifecoth.ron b/assets/common/items/crafting_ing/lifecoth.ron new file mode 100644 index 0000000000..f697021012 --- /dev/null +++ b/assets/common/items/crafting_ing/lifecoth.ron @@ -0,0 +1,9 @@ +ItemDef( + name: "Lifecloth", + description: "A fabric imbued with special properties.", + kind: Ingredient( + kind: "Lifecloth", + ), + quality: High, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/crafting_ing/linen.ron b/assets/common/items/crafting_ing/linen.ron new file mode 100644 index 0000000000..60373574c7 --- /dev/null +++ b/assets/common/items/crafting_ing/linen.ron @@ -0,0 +1,9 @@ +ItemDef( + name: "Linen", + description: "A textile made from the fibers of a plant.", + kind: Ingredient( + kind: "Linen", + ), + quality: Low, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/crafting_ing/moonweave.ron b/assets/common/items/crafting_ing/moonweave.ron new file mode 100644 index 0000000000..8e0d07334a --- /dev/null +++ b/assets/common/items/crafting_ing/moonweave.ron @@ -0,0 +1,9 @@ +ItemDef( + name: "Moonweave", + description: "A light yet very sturdy textile.", + kind: Ingredient( + kind: "Moonweave", + ), + quality: Epic, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/crafting_ing/obsidian.ron b/assets/common/items/crafting_ing/obsidian.ron new file mode 100644 index 0000000000..46423b0afd --- /dev/null +++ b/assets/common/items/crafting_ing/obsidian.ron @@ -0,0 +1,9 @@ +ItemDef( + name: "Obsidian", + description: "An igneous rock that comes from melted rock.", + kind: Ingredient( + kind: "Obsidian", + ), + quality: Epic, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/crafting_ing/orichalcum_ingot.ron b/assets/common/items/crafting_ing/orichalcum_ingot.ron new file mode 100644 index 0000000000..cbf39356ec --- /dev/null +++ b/assets/common/items/crafting_ing/orichalcum_ingot.ron @@ -0,0 +1,9 @@ +ItemDef( + name: "Orichalcum Ingot", + description: "An ingot made of refined orichalcum.", + kind: Ingredient( + kind: "OrichalcumIngot", + ), + quality: Epic, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/crafting_ing/plates.ron b/assets/common/items/crafting_ing/plate.ron similarity index 73% rename from assets/common/items/crafting_ing/plates.ron rename to assets/common/items/crafting_ing/plate.ron index 462c5e6218..291da9d76c 100644 --- a/assets/common/items/crafting_ing/plates.ron +++ b/assets/common/items/crafting_ing/plate.ron @@ -1,9 +1,9 @@ ItemDef( - name: "Durable Plate", + name: "Plate", description: "Durable plate from an armored animal.", kind: Ingredient( kind: "Plate", ), - quality: Common, + quality: Epic, tags: [], ) \ No newline at end of file diff --git a/assets/common/items/crafting_ing/rawhide.ron b/assets/common/items/crafting_ing/rawhide.ron new file mode 100644 index 0000000000..ce406dbf45 --- /dev/null +++ b/assets/common/items/crafting_ing/rawhide.ron @@ -0,0 +1,9 @@ +ItemDef( + name: "Rawhide", + description: "A hide that has not been exposed to tanning.", + kind: Ingredient( + kind: "Rawhide", + ), + quality: Low, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/crafting_ing/rock.ron b/assets/common/items/crafting_ing/rock.ron new file mode 100644 index 0000000000..143f3fe9c4 --- /dev/null +++ b/assets/common/items/crafting_ing/rock.ron @@ -0,0 +1,9 @@ +ItemDef( + name: "Rock", + description: "A solid made up of a bunch of different minerals.", + kind: Ingredient( + kind: "Rock", + ), + quality: Low, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/crafting_ing/scales.ron b/assets/common/items/crafting_ing/scales.ron index de1cc1963a..c6cfe1b49b 100644 --- a/assets/common/items/crafting_ing/scales.ron +++ b/assets/common/items/crafting_ing/scales.ron @@ -4,6 +4,6 @@ ItemDef( kind: Ingredient( kind: "Scale", ), - quality: Common, + quality: Moderate, tags: [], ) \ No newline at end of file diff --git a/assets/common/items/crafting_ing/silk.ron b/assets/common/items/crafting_ing/silk.ron new file mode 100644 index 0000000000..b5708cacb9 --- /dev/null +++ b/assets/common/items/crafting_ing/silk.ron @@ -0,0 +1,9 @@ +ItemDef( + name: "Silk", + description: "A fine and strong fibre produced by silkworms.", + kind: Ingredient( + kind: "Silk", + ), + quality: Moderate, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/crafting_ing/silver_ingot.ron b/assets/common/items/crafting_ing/silver_ingot.ron new file mode 100644 index 0000000000..4993010da9 --- /dev/null +++ b/assets/common/items/crafting_ing/silver_ingot.ron @@ -0,0 +1,9 @@ +ItemDef( + name: "Silver Ingot", + description: "An ingot made of refined metallic silver.", + kind: Ingredient( + kind: "SilverIngot", + ), + quality: Epic, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/crafting_ing/silver_ore.ron b/assets/common/items/crafting_ing/silver_ore.ron new file mode 100644 index 0000000000..1f7be426e9 --- /dev/null +++ b/assets/common/items/crafting_ing/silver_ore.ron @@ -0,0 +1,9 @@ +ItemDef( + name: "Silver Ore", + description: "A precious shiny greyish-white metal.", + kind: Ingredient( + kind: "SilverOre", + ), + quality: Epic, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/crafting_ing/sunsilk.ron b/assets/common/items/crafting_ing/sunsilk.ron new file mode 100644 index 0000000000..9422b96370 --- /dev/null +++ b/assets/common/items/crafting_ing/sunsilk.ron @@ -0,0 +1,9 @@ +ItemDef( + name: "Sunsilk", + description: "A supernaturally strong texile.", + kind: Ingredient( + kind: "Sunsilk", + ), + quality: Legendary, + tags: [], +) \ No newline at end of file diff --git a/assets/voxygen/item_image_manifest.ron b/assets/voxygen/item_image_manifest.ron index ec18da9f45..34ce0dce67 100644 --- a/assets/voxygen/item_image_manifest.ron +++ b/assets/voxygen/item_image_manifest.ron @@ -1954,6 +1954,42 @@ "voxel.sprite.crafting_ing.claw", (0.0, 0.0, 0.0), (-20.0, 10.0, 20.0), 0.9, ), + Ingredient("Plate"): VoxTrans( + "voxel.sprite.crafting_ing.plate", + (0.0, 0.0, 0.0), (-20.0, 10.0, 20.0), 1.0, + ), + Ingredient("Leather"): VoxTrans( + "voxel.sprite.crafting_ing.leather", + (0.0, 0.0, 0.0), (-20.0, 10.0, 20.0), 0.9, + ), + Ingredient("DragonScale"): VoxTrans( + "voxel.sprite.crafting_ing.dragon_scale", + (0.0, 0.0, 0.0), (-20.0, 10.0, 20.0), 0.9, + ), + Ingredient("SilverIngot"): VoxTrans( + "voxel.sprite.crafting_ing.silver_ingot", + (0.0, 0.0, 0.0), (-20.0, 10.0, 20.0), 0.9, + ), + Ingredient("GoldIngot"): VoxTrans( + "voxel.sprite.crafting_ing.gold_ingot", + (0.0, 0.0, 0.0), (-20.0, 10.0, 20.0), 0.9, + ), + Ingredient("GoldOre"): VoxTrans( + "voxel.sprite.crafting_ing.gold_ore_drop", + (0.0, 0.0, 0.0), (-20.0, 10.0, 20.0), 0.9, + ), + Ingredient("SilverOre"): VoxTrans( + "voxel.sprite.crafting_ing.silver_ore_drop", + (0.0, 0.0, 0.0), (-20.0, 10.0, 20.0), 0.8, + ), + Ingredient("OrichalcumIngot"): VoxTrans( + "voxel.sprite.crafting_ing.orichalcum_ingot", + (0.0, 0.0, 0.0), (-20.0, 10.0, 20.0), 0.9, + ), + Ingredient("Scale"): VoxTrans( + "voxel.sprite.crafting_ing.scale", + (0.0, 0.0, 0.0), (-20.0, 10.0, 20.0), 0.9, + ), Ingredient("Honey"): Png( "element.items.item_honey", ), diff --git a/assets/voxygen/voxel/object/gold_ore.vox b/assets/voxygen/voxel/object/gold_ore.vox new file mode 100644 index 0000000000000000000000000000000000000000..9e3a3531a666dd7928796c7f59a216e714768327 GIT binary patch literal 1948 zcmXAov5q7)5J2s!vfYbF<`2;37g-`dvH2Z{PeGLiq9H>n9%JQbPFU_4D^%dxz@@zJdgAzkYsw zQyN_V0?oxjST)LQYD>;`O4(-1ak0odvxV=Lq&6q9lbWq*(m5AB*(9q8?_yXpV++sZ z{lfdKOLCs#Y8sYIJR5x|K89FHx@1WHoLE1xrZLXnL7HT-5|>hBoxJbwAVodpBCI2f z)p^RaRoB8ZJEErqM!PV60yE~C;+lv}$-VJN{+{uW{HZc$-X--pg#FU?yhNUi%~QlF zGGAPaMZTjC#`vQ2A%XdRB=SAuN?bF0NMQJy>Y|Z$jO&znPo8s( z`cq;YWb%{!y{{oS(@#(Ip-j|Z@|@8p?}k_LvGk`xU5cGbA%DqM%f_6v>8E6ik{9)O z;XC%3h#O3qdBGr2_v}v)YOOKMQNk+JQXx_w0fj)mBM7LsJ>SeP)I>#RF`Je1B+7Xb z+T>m!n#@u4B&xp&`B(C)vj(jpRT;9r7d)P3OqI1=Jx&!rIE7lrzmg z04{iedfWE`>TsSV%Pj0$9nOhnJhIM84waflY9QoXL8z626g;V`PWVw{g`a=;?jt$a zuWi2u_YMszgl+TC;5LX4;)D1g?!!9qPNNg=#5-~Sv=MK_8=XeH5%=jT@k+cBuLLS_ z{VXW%pN+4b-l_zZjoJ_Da!8J~gAz-Qny z@Y%P4&%kHkGw>Ps_|^tK1D}D-TTB zfBybNn>aolpFLIhbbLBK9iNWRA0Phvl0tksJ{_NqkEgWb)A8x}bbLBKdz$ymxQ+iR z5ckyM)9`8dG<+I9dpVG8h&3b{K8?xu67f-EK%>*}Y544ABR>tFhEKz%;p3%j_%wVP zJ`JCS&tBfWN}d_F@gH$7IX)GiiciI-;Lfl|aRZKOl}z#i!y^@gWR;V!TS88Moo*M-88VPrxVO6Y$}4AdXMKC*TwCVM-v5 zPrxVO6YyafAdXMKC*Tv1VQC=Fgn^F(10MwMaDyvc;0#B2foC{Cc)%TQaD@w;;RrAA z3m$! z%kN5q&le!J29Yf~zXT1dPhr*+mXO>U9PdI{8NRB9#d$Z!5H_83@mZHJ`7L*4Zar)p&ASP+2{3ALxU#F~nTd)q~n|V*kjVfpPW@bnP9+{d66-<$rS9IIkf?QZvScq?qLvXd^+^z6BHtMjL~C2VSwB&e=ygdUERp+^ zG|Vm$Blih%@Jm*mlj?7Y{73Q{$yef;sdWyG5_5m~@%y*j!SUJ0r}N*SLIK%#3w8cF@lL!G@5F6bBi?8<;*EGCZc{7q zO1#pk#4B-It`IN83-Lmr5a+iGaUm|mg}BJqZTatP)LFE%Kxgn!;jiP<@#*+z*$Bx$V>G*VfIzAmA?1o9>zv0vHY50s3 z;L{LjY}Qz~v52MRpD+LJe}Dc&n>aoVpOGqj8a@r5hEK!ikMI8bnnHXUJ`JCSkEOKX z)9`8dG<+I9Bh4c-W@Fz1#4YvsRD3Ev6`zXFCvg|eF8ld>-cP5~ R{`&g5ACJfVa5yklGrl`A!up$GI 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 A^8f$< literal 0 HcmV?d00001 diff --git a/assets/voxygen/voxel/sprite/crafting_ing/orichalcum_ingot.vox b/assets/voxygen/voxel/sprite/crafting_ing/orichalcum_ingot.vox new file mode 100644 index 0000000000000000000000000000000000000000..e998abeece50b70bd4555900fd68c8885c16757e GIT binary patch literal 1368 zcmXBUy>1gh6o%n*X1u1MiNpn<^r@z$2{J+{010H2q(+BJ2o)7bDX5W7LrLK~KyK3@ zosx#aU20!I_Gfr!u=Cm8&oeuZXIFXu=JM%x5qWif@tQZ;3?lC?u3tQE2Rt5;70KlC z>iXh|@`1;OFm&O&MI=q@EX!J@u9GZ-(kGpn^f1t`RF|A&PNH*GnOB+cJ}`DAx`@iS z;`>Z5Nk&l}S#M5l4&zdmDXDTy=v8%EWt}zYl(J6iq;;)Yhs?Q>jv_k28Mt81ap5+bn-KyXv=z~7!gT4)Odgp`FJH6AlsYY+~#(~ireLG#DFZ6}J zP!xLps?ZC)&~DR}y=fv4apcnXlhqWyN^WQB=^L4~5=;g8VcDR>H=f`^*4 zJEmQwwlht`6OZ5#Jc38?2p*;rdOU(h@CY7GN$Bwi9>F7cSccH!5j=uNz_2u-=Y+y! zVc?PSK=x!uZpjVV68xA;+i-dVl-byffT{#ft-erBx5KavHn761SM literal 0 HcmV?d00001 diff --git a/assets/voxygen/voxel/sprite/crafting_ing/plate.vox b/assets/voxygen/voxel/sprite/crafting_ing/plate.vox new file mode 100644 index 0000000000000000000000000000000000000000..90c7f83c2b21c9198a8471406ea10cc3cfd33169 GIT binary patch literal 1600 zcmW-h3vA727{>qC(+UgCvWSq*iki}rR$IJ-_O5f(+sOr4R`%b&>VAqWtdg6TOkQeUYO$a+s;u_)F6Q?UgaicMs;09COD zYKqOY2o#BRITwy1HC<}b$Epi2&{V93)D3?ungCsK1sIAmKvSHWr%HEipvzfA8nW})z7u4;z<=xs(4bxlPaDhHdL9XT1|n)Fyb^_b*g@jCb4i#L$@2EHAG{Yn$6U7 zyQylT)9n^Rc2lzk7@E~0b&DpuoCWxIQx%V@_*b2}Zp7)jZr235u30r*6AzkA*96i- z(N&u&xh6VIa>GAIc!uPLKUZajraDcTW0%bpL+N6?#~k9M7?)%{(dh z@nKpL`wQ~8mf+x^&C0DyT{NU5uw=p*E|0U~cEqr4;#i(-SxracXgX^uc~((KO}dpw zqu$`wG&dcy(y2~~VbAPjzMN*IG$oSfGe=UC@HX3Bqq&qnfg^M5ylnDPnmUH|#o64c zTg-2>2k=W-8du9QIWaSq0sZmABrbBgr85>Qsy4cQC|#A zrKvpJV&n44aCUeH;dPJXN&8}Mb=I-UW94L>n@?MOtn);1zBUw&_2=v6P`dYqbEP?o zf6gUw_w;hkG)D61WHQe$IH)Y1$oE%TdGYOfZXa~;*B5TM6v(e#gSmQm4x5&S(Y|*T z>)tPBeWjbFh2z-0F_z-I!K^KdCO>BckFTfm{B}AoA7*g-dIN`dIq1G=WADxk&R&S8 zxG0>>O)gf~hI6caIdkWZVbYW^a`PjYoH3U5jSFdLpG4!~MRZ)<$-JWJtk@mT+VdXL za^i60g_GeOPh1lC~w-gwt%&*TT!;J zqQ~46-pq@nx4gTvv>4^Y2P`;xh|r`sJZDZ3x~`gpTsNa;WKnkE60r+Q*n96sd`;W& zY}-ZE+1vw)McsHtw?DTBf ztGb9E9z%9mJhS6mlooi&A2yAWh+NJ`*3p()PF6%LKiF%@iygf*qG1Ju;i;Pd%#yWJ!v PCK3`7LQqf;{vW`9hIfzg literal 0 HcmV?d00001 diff --git a/assets/voxygen/voxel/sprite/crafting_ing/scale.vox b/assets/voxygen/voxel/sprite/crafting_ing/scale.vox new file mode 100644 index 0000000000000000000000000000000000000000..46f1d06d2754cebbb0f6109adf453704ece4a251 GIT binary patch literal 1304 zcmXYw3ry8@6vzLMd(EazS!=D)s7P5Mpt~U8mFMM+7Xk6|R$h8Z9ydYUMT8|N2&g=g zu3Thr#Xvxvq8Ak?4WuzKn>m-6qG@gEEYen4>iYD*TW9<1{Lb(9J?HGVvy&X3`nE+7 zgt*X{)ru2TYC%YfNspNC2o!tieiIzy-L_CDkwUeBnmcB z61!xzXqDB1RZ=TwmDnYzM4O}%Y_fu+Rx}EdBw9t4k}E5@4n##K30BcjLlkYYQd^~< zR$^IF`p80;TIs2h9f)0OS+uHU!KzmJsU*>+Qr;w4?3p8pow6kMh_d2Eu~VfII^{WH zk4i1}NOQzawMx+_I$5bB3qqGlC3dcf(uE2t$L|CI#cp@oxmUQCrsc8xeenu^92sGQ zZvcN<1{sdY;6X(TSJO@0iYw;dyZ7j-sNm{CJ>AQ-Ty~CNc3^-D`9|uZf*G>x=TU{3 zPhuk&$jjz(h>oKxwcMB-qa`|oEn)sl1!*zpe6dEZ;7Qv~hQoarsjuQmWj^(KEf1Ex z#*MWGhS%w-jrQg6`Y66ytEDtr!_&;A6okA-M}iNNxnZ2h3gEfLL}`pa_L3BCHI?vq z{hRz+9?Nuj5~nl$NDlVm$5s=~=>a?*sKb`Oit$ZKp4CWOMKOo-eEGR8o2n!arfL&t z&vNHp-!^J9G`#4JgV9|)+~dx}!yhnI9*!l?i|Gmv!hD?hh9#Ud`(i1L;eOjn zrgnI8(DW`Q!%`mEOSm!8M2%6)nI;3Db(`63^k%%#4ThZgrrnL1UQaHyd-KnQ2yUO- z#%QaC2WO&qI-#SgD3b3l_3`Z625uhJ@z<9In4HURV~dzRp2fa0ckI12?Ea{ThAIPP z`9bvT^`j_z5q0Iu$xZX%;T1hkZ|Zq|KarbPS~z}4$IP{r^x6_RKM_n(fhYSd3G8h2 zWXQgaoE(2vt#&6P*NeEs6*ROK(qdml>+#JDPuti~kjnO+VCu$=#HIzJ%l0JE6iTao zKRcQ$ajp(x-LYzXlLK%miKPF#5ejye;!>k0Qkm)Njd|4d9YE-);pLoY-pbanK$&}d zX%WKdkJ)tc7;X`P7)Q_Iw!4;)3;d< zmE;_Rh9h|Am$5i04VU_Ul8d&GQrSrAsoN~c+KRUMEMA!=gxp-$Hl;&>WggN(80l$2^tH}Q=spp z**r{AU$(o3rjj&|JU;ZUCPkluy?Tt`CBCG%2eUpffzmt^ zx$m!~*eio^O%wew6(oE4@k2l(*?vL1c=o%prO)~Ni&0wJyD6{Q&gRN8Hs)_6DJ_Zk z_-NLI1>zUrk5=Qx?CdNvGc$~hjWIYlNPT@hX0sWC!9aL;IIga)I5|1t*#G|kf4q=; literal 0 HcmV?d00001 diff --git a/assets/voxygen/voxel/sprite/crafting_ing/silver_ingot.vox b/assets/voxygen/voxel/sprite/crafting_ing/silver_ingot.vox new file mode 100644 index 0000000000000000000000000000000000000000..a08b4120bdc679c1d685a942e3f7cfbd8e7fbead GIT binary patch literal 1248 zcmXBSF>Vt<7zWUP*ETdXz5z->mugy?pdge2kU&NuHJU5r0w8<>!~i{#IfAb+5-kO$ zqBa#(>@05vufJXU^X%;N?7n(_dH+L1JUzR3<`8ur@$%y8@xAuN>#nF`l*`vw7hfFP z>wzpHZvA$9r)3t0JA>mG$Hfqb`8XUF!*ILM&xheS8{=j+lOb;Aj&oxctqbGF;W%%f zjWeyW!y$|rb))fP`|P(-&v6{|gYyUdpda*u9`YviFP=O)>u8fr{Z;LYWJ#iKRkf@7 zs;~O0Z^Med_)zpkU-a$Ntk3%FOV($7n=a{-KIxMp>Ak1Whd%V7$I(dJieyQm_d~U- zJe8;NRG!Y`sXUdZ@>HHq=BYfDr}9*u{x^6kPvxmRm8bo+%2RnNPvxmRbX`*H3s2!G zJbejx3P5qOV&Y`Ug!JpHy=pUjha zGEe4dw=(l&p3IYZGEcv~{VuhYX_~g_c@j_JNj!-s@$|=lC-Een#FKdXqrsDS5>En2 zF4`X#lO-o6gOVcgc#EDV@g$zaqn7r>w7b++rfF)%0||5Eh{;f6In{^WhYzN$Xc#tCFgP?ONqVg zWGfq4%eAcJTux*;?f3g>x7$tI?RMI1Hq&~&p5A}_G=2X1ZTkM>=k)8(-)XsA8XNHs D<8_dQ literal 0 HcmV?d00001 diff --git a/assets/voxygen/voxel/sprite/crafting_ing/silver_ore_drop.vox b/assets/voxygen/voxel/sprite/crafting_ing/silver_ore_drop.vox new file mode 100644 index 0000000000000000000000000000000000000000..82c11655c898ebd60efb2d1c0de48a6dc60b43b2 GIT binary patch literal 1312 zcmXBSG0r137zW_a_RwvU8=&-5mgpD#2yFpKpyXfn0B-*>Cs-*bKyt$Yasp5)dLIBJ z(oyFGiH66+B=02i&e-$BljDyczx*{KzJLGW2Osh7i-?~;eERm?Jg_<3viSV?%cl?j z%+mI?q@0hD<56TO>5+3emRw$!9M4kXk>-z3X*LQu_ z&!J7<^vyxjH~pNh>Z`u$tD@??*U*PP^r6Sm$b5BaQbq5?up2ysXYdT3jmI;12G8Ib zJR6y3@C=^8GkCV2!83RU&)^w6^QR4-!83RU&)}ikB;CIAbe_($Edfsl=x)|c+)Xl< z<gGG@i!Oc(%s@+rSz`<7p<}9+5%K1o2YHdb q?AH7JzTR%P^?JRom&;{6pU>;*bXpIG!}|92w(j@)b+_BOHsU`pTaz6C literal 0 HcmV?d00001 diff --git a/common/src/comp/body/object.rs b/common/src/comp/body/object.rs index ccdf3bc3bb..ae4103adf8 100644 --- a/common/src/comp/body/object.rs +++ b/common/src/comp/body/object.rs @@ -79,6 +79,8 @@ make_case_elim!( Crossbow = 64, ArrowTurret = 65, Coins = 66, + GoldOre = 67, + SilverOre = 68, } ); @@ -89,7 +91,7 @@ impl Body { } } -pub const ALL_OBJECTS: [Body; 67] = [ +pub const ALL_OBJECTS: [Body; 69] = [ Body::Arrow, Body::Bomb, Body::Scarecrow, @@ -157,6 +159,8 @@ pub const ALL_OBJECTS: [Body; 67] = [ Body::Crossbow, Body::ArrowTurret, Body::Coins, + Body::SilverOre, + Body::GoldOre, ]; impl From for super::Body { @@ -233,6 +237,8 @@ impl Body { Body::Crossbow => "crossbow", Body::ArrowTurret => "arrow_turret", Body::Coins => "coins", + Body::SilverOre => "silver_ore", + Body::GoldOre => "gold_ore", } } @@ -320,6 +326,8 @@ impl Body { Body::Tent => 50.0, Body::TrainingDummy => 60.0, Body::WindowSpooky => 10.0, + Body::SilverOre => 1000.0, + Body::GoldOre => 1000.0, }; Mass(m)