diff --git a/assets/common/material_stats_manifest.ron b/assets/common/material_stats_manifest.ron index 0dd89bfefa..92b2c7b0d3 100644 --- a/assets/common/material_stats_manifest.ron +++ b/assets/common/material_stats_manifest.ron @@ -1,15 +1,6 @@ // Keep in mind that material stats are multiplied by the form stats, not added (e.g. equip_time_secs is most sensitive to this) ({ - "common.items.mineral.ingot.bloodsteel": ( - equip_time_secs: 1.0, - power: 1.75, - effect_power: 1.0, - speed: 1.0, - crit_chance: 1.0, - range: 1.0, - energy_efficiency: 1.0, - buff_strength: 1.0, - ), + // Metals "common.items.mineral.ingot.bronze": ( equip_time_secs: 1.0, power: 0.75, @@ -20,26 +11,6 @@ energy_efficiency: 1.0, buff_strength: 1.0, ), - "common.items.mineral.ingot.cobalt": ( - equip_time_secs: 1.0, - power: 1.5, - effect_power: 1.0, - speed: 1.0, - crit_chance: 1.0, - range: 1.0, - energy_efficiency: 1.0, - buff_strength: 1.0, - ), - "common.items.mineral.ingot.copper": ( - equip_time_secs: 1.0, - power: 0.5, - effect_power: 1.0, - speed: 1.0, - crit_chance: 1.0, - range: 1.0, - energy_efficiency: 1.0, - buff_strength: 1.0, - ), "common.items.mineral.ingot.iron": ( equip_time_secs: 1.0, power: 1.0, @@ -60,9 +31,90 @@ energy_efficiency: 1.0, buff_strength: 1.0, ), - "common.items.mineral.ingot.tin": ( + "common.items.mineral.ingot.cobalt": ( equip_time_secs: 1.0, - power: 0.5, + power: 1.5, + effect_power: 1.0, + speed: 1.0, + crit_chance: 1.0, + range: 1.0, + energy_efficiency: 1.0, + buff_strength: 1.0, + ), + "common.items.mineral.ingot.bloodsteel": ( + equip_time_secs: 1.0, + power: 1.75, + effect_power: 1.0, + speed: 1.0, + crit_chance: 1.0, + range: 1.0, + energy_efficiency: 1.0, + buff_strength: 1.0, + ), + "common.items.mineral.ingot.orichalcum": ( + equip_time_secs: 1.0, + power: 2.0, + effect_power: 1.0, + speed: 1.0, + crit_chance: 1.0, + range: 1.0, + energy_efficiency: 1.0, + buff_strength: 1.0, + ), + // Woods + "common.items.log.wood": ( + equip_time_secs: 1.0, + power: 0.75, + effect_power: 1.0, + speed: 1.0, + crit_chance: 1.0, + range: 1.0, + energy_efficiency: 1.0, + buff_strength: 1.0, + ), + "common.items.log.bamboo": ( + equip_time_secs: 1.0, + power: 1.0, + effect_power: 1.0, + speed: 1.0, + crit_chance: 1.0, + range: 1.0, + energy_efficiency: 1.0, + buff_strength: 1.0, + ), + "common.items.log.hardwood": ( + equip_time_secs: 1.0, + power: 1.25, + effect_power: 1.0, + speed: 1.0, + crit_chance: 1.0, + range: 1.0, + energy_efficiency: 1.0, + buff_strength: 1.0, + ), + "common.items.log.ironwood": ( + equip_time_secs: 1.0, + power: 1.5, + effect_power: 1.0, + speed: 1.0, + crit_chance: 1.0, + range: 1.0, + energy_efficiency: 1.0, + buff_strength: 1.0, + ), + "common.items.log.frostwood": ( + equip_time_secs: 1.0, + power: 1.75, + effect_power: 1.0, + speed: 1.0, + crit_chance: 1.0, + range: 1.0, + energy_efficiency: 1.0, + buff_strength: 1.0, + ), + "common.items.log.eldwood": ( + equip_time_secs: 1.0, + power: 2.0, effect_power: 1.0, speed: 1.0, crit_chance: 1.0, diff --git a/assets/voxygen/item_image_manifest.ron b/assets/voxygen/item_image_manifest.ron index 2f09a83701..857e40a290 100644 --- a/assets/voxygen/item_image_manifest.ron +++ b/assets/voxygen/item_image_manifest.ron @@ -2909,6 +2909,30 @@ "voxel.sprite.crafting_ing.animal_misc.phoenix_feather", (0.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 1.2, ), + Ingredient("Bamboo"): VoxTrans( + "voxel.sprite.wood.item.bamboo", + (0.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 0.8, + ), + Ingredient("EldwoodLogs"): VoxTrans( + "voxel.sprite.wood.item.eldwood", + (0.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 0.8, + ), + Ingredient("FrostwoodLogs"): VoxTrans( + "voxel.sprite.wood.item.frostwood", + (0.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 0.8, + ), + Ingredient("HardwoodLogs"): VoxTrans( + "voxel.sprite.wood.item.hardwood", + (0.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 0.8, + ), + Ingredient("IronwoodLogs"): VoxTrans( + "voxel.sprite.wood.item.ironwood", + (0.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 0.8, + ), + Ingredient("WoodLogs"): VoxTrans( + "voxel.sprite.wood.item.wood", + (0.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 0.8, + ), // Gliders Glider("Starter"): VoxTrans( "voxel.glider.starter", diff --git a/assets/voxygen/voxel/sprite/wood/item/bamboo.vox b/assets/voxygen/voxel/sprite/wood/item/bamboo.vox new file mode 100644 index 0000000000..a88f0d1fcb --- /dev/null +++ b/assets/voxygen/voxel/sprite/wood/item/bamboo.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3ac38e4091ac6e34f0a6b68fb13ebebeb1ff9a3b58f457ba157eaecbeb8d9516 +size 1448 diff --git a/assets/voxygen/voxel/sprite/wood/item/eldwood.vox b/assets/voxygen/voxel/sprite/wood/item/eldwood.vox new file mode 100644 index 0000000000..4c4afd8f6d --- /dev/null +++ b/assets/voxygen/voxel/sprite/wood/item/eldwood.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3a7f1fc5403a3f34220765832ecc7a2f255c97f65fb3083e828b9266f2ed595d +size 1708 diff --git a/assets/voxygen/voxel/sprite/wood/item/frostwood.vox b/assets/voxygen/voxel/sprite/wood/item/frostwood.vox new file mode 100644 index 0000000000..fa4cb5e829 --- /dev/null +++ b/assets/voxygen/voxel/sprite/wood/item/frostwood.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e2b716e3c62657729cab4701a471f3535ba6ff42d0c77e9149b37efcd98ddd40 +size 1472 diff --git a/assets/voxygen/voxel/sprite/wood/item/hardwood.vox b/assets/voxygen/voxel/sprite/wood/item/hardwood.vox new file mode 100644 index 0000000000..e1da83391d --- /dev/null +++ b/assets/voxygen/voxel/sprite/wood/item/hardwood.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3b543a04f454723474c741c1a7141bad0f714b06ca67d2e943c24e2d491fdca5 +size 1460 diff --git a/assets/voxygen/voxel/sprite/wood/item/ironwood.vox b/assets/voxygen/voxel/sprite/wood/item/ironwood.vox new file mode 100644 index 0000000000..00570a12e9 --- /dev/null +++ b/assets/voxygen/voxel/sprite/wood/item/ironwood.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:623848ed1941dd1eeb03d5c24eff165fd4410a1c078e935cd4dc149262aee377 +size 1716 diff --git a/assets/voxygen/voxel/sprite/wood/item/wood.vox b/assets/voxygen/voxel/sprite/wood/item/wood.vox new file mode 100644 index 0000000000..542b667852 --- /dev/null +++ b/assets/voxygen/voxel/sprite/wood/item/wood.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f05f8a6b01748718da3054fe470b8d3914c0a6b7a587acbe246c36f7d9a2f3b6 +size 1460 diff --git a/assets/voxygen/voxel/sprite/wood/log/bamboo.vox b/assets/voxygen/voxel/sprite/wood/log/bamboo.vox new file mode 100644 index 0000000000..5df38e673f --- /dev/null +++ b/assets/voxygen/voxel/sprite/wood/log/bamboo.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:744911412e2c805ba1715db241a386d50f34be56ebfa4ca5055f67b7e6d67cec +size 2272 diff --git a/assets/voxygen/voxel/sprite/wood/log/eldwood.vox b/assets/voxygen/voxel/sprite/wood/log/eldwood.vox new file mode 100644 index 0000000000..8dc9bfe98c --- /dev/null +++ b/assets/voxygen/voxel/sprite/wood/log/eldwood.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:669f9e62cdaf07113e70cdf795b2b47d5e16dfa91746d43159ee50c0a571d779 +size 2872 diff --git a/assets/voxygen/voxel/sprite/wood/log/frostwood.vox b/assets/voxygen/voxel/sprite/wood/log/frostwood.vox new file mode 100644 index 0000000000..3279865eb4 --- /dev/null +++ b/assets/voxygen/voxel/sprite/wood/log/frostwood.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:af23e5219f20e240b8ac4d2e619d52ab246f9b28f0249eb9685983bbde31516e +size 2784 diff --git a/assets/voxygen/voxel/sprite/wood/log/hardwood.vox b/assets/voxygen/voxel/sprite/wood/log/hardwood.vox new file mode 100644 index 0000000000..7af6b97e3b --- /dev/null +++ b/assets/voxygen/voxel/sprite/wood/log/hardwood.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:53161fcbb23ad50ca429f9aa44b5d547cb02c83a9015e0462f83350ea6748086 +size 2760 diff --git a/assets/voxygen/voxel/sprite/wood/log/ironwood.vox b/assets/voxygen/voxel/sprite/wood/log/ironwood.vox new file mode 100644 index 0000000000..4a112ce0cf --- /dev/null +++ b/assets/voxygen/voxel/sprite/wood/log/ironwood.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:280591d8ada44228cad3b8ef3acebdc40d2449de84a8b488c92496c18772634f +size 2812 diff --git a/assets/voxygen/voxel/sprite/wood/log/wood.vox b/assets/voxygen/voxel/sprite/wood/log/wood.vox new file mode 100644 index 0000000000..8f4d02a7bf --- /dev/null +++ b/assets/voxygen/voxel/sprite/wood/log/wood.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5000b5a7d5d2271a6086c599924825757db0adf532f73ddb5b7935aedb26e5d5 +size 2764 diff --git a/assets/voxygen/voxel/sprite_manifest.ron b/assets/voxygen/voxel/sprite_manifest.ron index 4a35d97a50..32a0688b2b 100644 --- a/assets/voxygen/voxel/sprite_manifest.ron +++ b/assets/voxygen/voxel/sprite_manifest.ron @@ -3884,4 +3884,65 @@ EnsnaringWeb: Some(( ], wind_sway: 0.0, )), +// WOOOOOOD +Wood: Some(( + variations: [ + ( + model: "voxygen.voxel.sprite.wood.log.wood", + offset: (-5.5, -5.5, 0.0), + lod_axes: (0.0, 0.0, 0.0), + ), + ], + wind_sway: 0.0, +)), +Bamboo: Some(( + variations: [ + ( + model: "voxygen.voxel.sprite.wood.log.bamboo", + offset: (-6.5, -6.5, 0.0), + lod_axes: (0.0, 0.0, 0.0), + ), + ], + wind_sway: 0.0, +)), +Hardwood: Some(( + variations: [ + ( + model: "voxygen.voxel.sprite.wood.log.hardwood", + offset: (-5.5, -5.5, 0.0), + lod_axes: (0.0, 0.0, 0.0), + ), + ], + wind_sway: 0.0, +)), +Ironwood: Some(( + variations: [ + ( + model: "voxygen.voxel.sprite.wood.log.ironwood", + offset: (-6.5, -5.5, 0.0), + lod_axes: (0.0, 0.0, 0.0), + ), + ], + wind_sway: 0.0, +)), +Frostwood: Some(( + variations: [ + ( + model: "voxygen.voxel.sprite.wood.log.frostwood", + offset: (-5.5, -5.5, 0.0), + lod_axes: (0.0, 0.0, 0.0), + ), + ], + wind_sway: 0.0, +)), +Eldwood: Some(( + variations: [ + ( + model: "voxygen.voxel.sprite.wood.log.eldwood", + offset: (-4.5, -5.5, 0.0), + lod_axes: (0.0, 0.0, 0.0), + ), + ], + wind_sway: 0.0, +)), ) diff --git a/common/src/terrain/sprite.rs b/common/src/terrain/sprite.rs index 5bf979c7f2..b778141cc3 100644 --- a/common/src/terrain/sprite.rs +++ b/common/src/terrain/sprite.rs @@ -209,6 +209,12 @@ make_case_elim!( Hearth = 0xB6, ForgeTools = 0xB7, CliffDecorBlock = 0xB8, + Wood = 0xB9, + Bamboo = 0xBA, + Hardwood = 0xBB, + Ironwood = 0xBC, + Frostwood = 0xBD, + Eldwood = 0xBE, } ); @@ -318,6 +324,12 @@ impl SpriteKind { SpriteKind::Hearth => 2.3, SpriteKind::ForgeTools => 2.8, SpriteKind::CliffDecorBlock => 1.0, + SpriteKind::Wood + | SpriteKind::Hardwood + | SpriteKind::Ironwood + | SpriteKind::Frostwood + | SpriteKind::Eldwood => 7.0 / 11.0, + SpriteKind::Bamboo => 9.0 / 11.0, _ => return None, }) } diff --git a/voxygen/src/hud/crafting.rs b/voxygen/src/hud/crafting.rs index 556e5bc854..2bc848b6bb 100644 --- a/voxygen/src/hud/crafting.rs +++ b/voxygen/src/hud/crafting.rs @@ -28,7 +28,7 @@ use conrod_core::{ widget_ids, Color, Colorable, Labelable, Positionable, Sizeable, Widget, WidgetCommon, }; use i18n::Localization; -use std::{borrow::Cow, sync::Arc}; +use std::sync::Arc; use strum::{EnumIter, IntoEnumIterator}; @@ -467,7 +467,7 @@ impl<'a> Widget for Crafting<'a> { }, SearchFilter::Input => recipe.inputs().any(|(input, _, _)| { let input_name = match input { - RecipeInput::Item(def) => Cow::Borrowed(&def.name()), + RecipeInput::Item(def) => def.name(), RecipeInput::Tag(tag) => tag.name(), RecipeInput::TagSameItem(tag, _) => tag.name(), }