From c7b6c7c3b423d72f64552ca3c03bde6efe852ed3 Mon Sep 17 00:00:00 2001 From: Monty Marz Date: Sun, 10 Oct 2021 22:27:41 +0200 Subject: [PATCH] bench --- assets/voxygen/i18n/en/hud/crafting.ron | 1 + assets/voxygen/item_image_manifest.ron | 4 ++++ .../salvaging_station/salvaging_station-0.vox | Bin 0 -> 5168 bytes assets/voxygen/voxel/sprite_manifest.ron | 11 +++++++++++ common/src/terrain/block.rs | 1 + common/src/terrain/sprite.rs | 3 +++ voxygen/src/hud/crafting.rs | 3 +++ voxygen/src/hud/mod.rs | 1 + voxygen/src/scene/terrain/watcher.rs | 4 ++++ .../site/settlement/building/archetype/house.rs | 3 ++- 10 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 assets/voxygen/voxel/sprite/salvaging_station/salvaging_station-0.vox diff --git a/assets/voxygen/i18n/en/hud/crafting.ron b/assets/voxygen/i18n/en/hud/crafting.ron index f702b1540f..5db166ea1f 100644 --- a/assets/voxygen/i18n/en/hud/crafting.ron +++ b/assets/voxygen/i18n/en/hud/crafting.ron @@ -18,6 +18,7 @@ "hud.crafting.loom": "Loom", "hud.crafting.spinning_wheel": "Spinning Wheel", "hud.crafting.tanning_rack": "Tanning Rack", + "hud.crafting.salvaging_station": "Salvaging Bench", // Tabs "hud.crafting.tabs.all": "All", "hud.crafting.tabs.armor": "Armor", diff --git a/assets/voxygen/item_image_manifest.ron b/assets/voxygen/item_image_manifest.ron index c372bdc3b9..57c18023ac 100644 --- a/assets/voxygen/item_image_manifest.ron +++ b/assets/voxygen/item_image_manifest.ron @@ -35,6 +35,10 @@ "voxel.object.tanning_rack", (0.0, 0.0, 0.0), (-90.0, 20.0, 0.0), 1.0, ), + Tool("SalvagingBench"): VoxTrans( + "voxel.sprite.salvaging_station.salvaging_station-0", + (0.0, 0.0, 0.0), (-90.0, 20.0, 0.0), 1.0, + ), // Weapons // Diary Example Images Tool("example_utility"): VoxTrans( diff --git a/assets/voxygen/voxel/sprite/salvaging_station/salvaging_station-0.vox b/assets/voxygen/voxel/sprite/salvaging_station/salvaging_station-0.vox new file mode 100644 index 0000000000000000000000000000000000000000..c2fa637b22d24a974e66513e57a6a3ec87262fb9 GIT binary patch literal 5168 zcmciFTdZA08Nl(GwdOvv)@-C)S`cahX^R4-NQliQX79AuU3vY?ol2?IOIKb&P$y4Q>e`iSR+Om*f5)Ky)Acv3S^3dagTGH&rF5&t z8uYCi)>e%xqsFvRW(<|~fVL{ERoE-BB^p>bcm(<*F%dHgI@*2Vc^J^v9nb98 zZ^ydi+UO09(W4#}+G;+B9%`q@tJ7oJ6Fo8LVGVj*N5&)LiFTqtYxb)rdQ@^`#x|qKA&?X$SI%M4ss@#E#e(o=uH54SQ)uEz!WjnP#I$AdieCWb%TJ{+@OvYTJxg zXxEHYXiwWWoH^}4j6~?vj5n#7=us2x%)Cr2&8R8O#XEqiG>Ln5?q$Ev3tXa{0!$C}tq^r+-I(GQ)8neozYY)U(7 zOFM2#%U)Xc(sG9FFqC#Ik|$y&7Gj6K@N8wG3>?gJ`H;@+&9Bs%+S*gv?F;!CNJp7`(k*XJlj~##d0o| zz1R)fTF%9?7b3K`V~w{HJu0~lmODm&WIWPN#6-;WXZnj}FP3*?c}JGLSoUH$7t3BO zcgwOD%emNLp|2zMg=a$>$6g%g;x<;IwvKagW7@f~#<__e)w!Yej(g+Ab#Uy3@koSD zMCeS+^cTl{ah!|eTpah@@jZ0x#qo|D_rdUh=h!S z4m~P#Lk(IOICum^BxDqH=ux3tKhdCtfrW!dKtw`DL5Ci-rPg@PjAt5ZVd3Br5Rs5k z(4l93rA}KvY%I@(frW!dKtw`DL5CjIdcMP+cS0=;EF3%nA`&tRI`pX2Y0q;#wJ@-7 z@Cb-V$SCO0qk3uswSig~SU7kDL?mPsbm&n7wUIqXYGGjE;1Lj!kWtW~M~$Al<@rsb z76uj$9sv;v83i4B)WmZ$wV7HNSU7kDL?mPsbm&ntwT1UvJl`kJ_sR1+Ls6OJYm4rLP#7j%YtRQd+gE6W--9BOPBv@kY|TR324n@Zr$SCO0(_e`L>Xl~=&py!l zaKsQToDYXR?cl@FNIN0ZF7$Ww_2iYl0re`dMqrJ=K8OZ3grhF726-Sx#u723prgM> zrGG%ZimVa&ERlW0aMZ+b*uv50X$NAYosh{3u_N}V7*MYgYou_vK??($!Vw2g9unt~ zI1gkL`aAl2VkHi!SD7_3`#_udEU<92Juzg?gFGRV7h*^38LPwr^{TK&2}c{Wg)=Rz zLGFkip>Q5ZjAhz|*r8`m#bBzw3lj}m7+5%X1Vkic6m;lOp;a6;Xknmq99eh-L?mPs zbm&o`8fu$(ux;X`C3mP$E&XkrY}5sWE4~=6Zzebd!1n%$;3U`#NEZj^%Vog zm5tne_6BR?Zb$SsE)R(0$x?%2t&6)G7Y8kji+in$dmOxr%K{?f ziFPIyV#mB5m3%AjE}o5oR1fK1Vkj}Wcmv_=JlwaHKp95Zky(T25y&Is zi9DlZ)?i+bNoicmzZwWR${ZVP22Q+`&|R7rFD)!;o8|gGWF_ zLPkM{9(Ag&=f1VyDTQ za*qIA=r8ockn4_iM;nIRxx(|x$on!1aDhCO4FQqdMcR=z;#8iPhifjqcq#w4|MYL+ z!iBPV^Je*AyOPVEeqBzRc2xd0ZJNCL>S~$#dw%79xnkA1a_dctWbCt8PTr>EOD`!2 zLnYl7CCAb}{y8P*ug-G$-2++k;IZ=PfzQkG%}TD`q2#s~l-&0=wO7xOQ`XLs(>KqR z3-&FMlh#d>S&z?FU|C^N#am^S2hr&byY$t3UjwzGokicV2s1_C0l@y!wkV z$vMl3#~vdyXU>#)b7si}XMa(?dfpt__VCH_!p~>PAAdJj-h1mTd5UN5dq&Bd2bKKg z_ewUcoh?spnJ=$Dzf3;<)3vhhv4K4P%W3kfx2MZ{a_ax(^I!GlGe7q9bq%XE2Tw~}|iqvW~Svt`blIda!&Bl*T%}wVz?$i@owNGv`A^N8TI+^u-;{NC ziQM8&;epYpcJJtWdZ5PSIcP{yK L{Im6+X{)~jn&Xc{ literal 0 HcmV?d00001 diff --git a/assets/voxygen/voxel/sprite_manifest.ron b/assets/voxygen/voxel/sprite_manifest.ron index 7672a1b9a5..c3807ec7ba 100644 --- a/assets/voxygen/voxel/sprite_manifest.ron +++ b/assets/voxygen/voxel/sprite_manifest.ron @@ -3216,6 +3216,17 @@ Loom: Some(( ], wind_sway: 0.0, )), +// SalvagingBench +SalvagingBench: Some(( + variations: [ + ( + model: "voxygen.voxel.sprite.salvaging_station.salvaging_station-0", + offset: (-8.5, -7.5, 0.0), + lod_axes: (0.0, 0.0, 0.0), + ), + ], + wind_sway: 0.0, +)), SpinningWheel: Some(( variations: [ ( diff --git a/common/src/terrain/block.rs b/common/src/terrain/block.rs index 8665c20ed2..302a24b815 100644 --- a/common/src/terrain/block.rs +++ b/common/src/terrain/block.rs @@ -261,6 +261,7 @@ impl Block { | SpriteKind::Forge | SpriteKind::Loom | SpriteKind::SpinningWheel + | SpriteKind::SalvagingBench | SpriteKind::TanningRack => None, SpriteKind::EnsnaringVines => Some(0.1), _ => Some(0.25), diff --git a/common/src/terrain/sprite.rs b/common/src/terrain/sprite.rs index f4b4269de4..bff6f3274a 100644 --- a/common/src/terrain/sprite.rs +++ b/common/src/terrain/sprite.rs @@ -182,6 +182,7 @@ make_case_elim!( CavernGrassBlueLong = 0x9B, CavernLillypadBlue = 0x9C, CavernMycelBlue = 0x9D, + SalvagingBench = 0x9E, } ); @@ -238,6 +239,7 @@ impl SpriteKind { SpriteKind::Loom => 1.27, SpriteKind::Anvil => 1.1, SpriteKind::CookingPot => 1.36, + SpriteKind::SalvagingBench => 1.18, // TODO: Find suitable heights. SpriteKind::BarrelCactus | SpriteKind::RoundCactus @@ -440,6 +442,7 @@ impl SpriteKind { | SpriteKind::SpinningWheel | SpriteKind::TanningRack | SpriteKind::Loom + | SpriteKind::SalvagingBench ) } } diff --git a/voxygen/src/hud/crafting.rs b/voxygen/src/hud/crafting.rs index 0d00119459..9d9e531f79 100644 --- a/voxygen/src/hud/crafting.rs +++ b/voxygen/src/hud/crafting.rs @@ -617,6 +617,7 @@ impl<'a> Widget for Crafting<'a> { Some(SpriteKind::Loom) => Some("Loom"), Some(SpriteKind::SpinningWheel) => Some("SpinningWheel"), Some(SpriteKind::TanningRack) => Some("TanningRack"), + Some(SpriteKind::SalvagingBench) => Some("SalvagingBench"), _ => None, }; @@ -792,6 +793,7 @@ impl<'a> Widget for Crafting<'a> { Some(SpriteKind::Loom) => "Loom", Some(SpriteKind::SpinningWheel) => "SpinningWheel", Some(SpriteKind::TanningRack) => "TanningRack", + Some(SpriteKind::SalvagingBench) => "SalvagingBench", None => "CraftsmanHammer", _ => "CraftsmanHammer", }; @@ -815,6 +817,7 @@ impl<'a> Widget for Crafting<'a> { Some(SpriteKind::Loom) => "hud.crafting.loom", Some(SpriteKind::SpinningWheel) => "hud.crafting.spinning_wheel", Some(SpriteKind::TanningRack) => "hud.crafting.tanning_rack", + Some(SpriteKind::SalvagingBench) => "hud.crafting.salvaging_station", _ => "", }; Text::new(self.localized_strings.get(station_name)) diff --git a/voxygen/src/hud/mod.rs b/voxygen/src/hud/mod.rs index 0ba05f0f61..4c7c2410fe 100644 --- a/voxygen/src/hud/mod.rs +++ b/voxygen/src/hud/mod.rs @@ -4078,6 +4078,7 @@ pub fn get_sprite_desc(sprite: SpriteKind, localized_strings: &Localization) -> SpriteKind::Loom => "hud.crafting.loom", SpriteKind::SpinningWheel => "hud.crafting.spinning_wheel", SpriteKind::TanningRack => "hud.crafting.tanning_rack", + SpriteKind::SalvagingBench => "hud.crafting.salvaging_station", sprite => return Some(Cow::Owned(format!("{:?}", sprite))), }; Some(Cow::Borrowed(localized_strings.get(i18n_key))) diff --git a/voxygen/src/scene/terrain/watcher.rs b/voxygen/src/scene/terrain/watcher.rs index bcf3a952ff..f05714656c 100644 --- a/voxygen/src/scene/terrain/watcher.rs +++ b/voxygen/src/scene/terrain/watcher.rs @@ -136,6 +136,10 @@ impl BlocksOfInterest { fires.push(pos); interactables.push((pos, Interaction::Craft(CraftingTab::Food))) }, + Some(SpriteKind::SalvagingBench) => { + fires.push(pos); + interactables.push((pos, Interaction::Craft(CraftingTab::Dismantle))) + }, _ => {}, }, } diff --git a/world/src/site/settlement/building/archetype/house.rs b/world/src/site/settlement/building/archetype/house.rs index fb9b1f15c6..c9437113c7 100644 --- a/world/src/site/settlement/building/archetype/house.rs +++ b/world/src/site/settlement/building/archetype/house.rs @@ -526,7 +526,7 @@ impl Archetype for House { center_offset.x, center_offset.y, z + 100, - )) % 12 + )) % 13 { 0..=1 => SpriteKind::Crate, 2 => SpriteKind::Bench, @@ -539,6 +539,7 @@ impl Archetype for House { 9 => SpriteKind::Loom, 10 => SpriteKind::SpinningWheel, 11 => SpriteKind::TanningRack, + 12 => SpriteKind::SalvagingBench, _ => unreachable!(), };