diff --git a/assets/common/recipe_book.ron b/assets/common/recipe_book.ron index 171716fe70..80ad9b5e4d 100644 --- a/assets/common/recipe_book.ron +++ b/assets/common/recipe_book.ron @@ -6,7 +6,7 @@ // Ore and more "velorite_frag": (("common.items.ore.veloritefrag", 2), [("common.items.ore.velorite", 1), ("common.items.crafting_tools.craftsman_hammer", 0)]), //Potions - "potion_s": (("common.items.consumable.potion_minor", 1), [("common.items.crafting_ing.empty_vial", 1), ("common.items.ore.veloritefrag", 2)]), + "potion_s": (("common.items.consumable.potion_minor", 1), [("common.items.crafting_ing.empty_vial", 1), ("common.items.food.apple", 4), ("common.items.crafting_ing.honey", 1)]), "potion_m": (("common.items.consumable.potion_med", 1), [("common.items.consumable.potion_minor", 2), ("common.items.ore.veloritefrag", 4)]), "collar_basic": (("common.items.utility.collar", 1), [("common.items.crafting_ing.leather_scraps", 5), ("common.items.crafting_ing.shiny_gem", 1)]), "bomb_coconut": (("common.items.utility.bomb", 1), [("common.items.crafting_ing.stones", 10), ("common.items.food.coconut", 2), ("common.items.ore.veloritefrag", 2), ("common.items.crafting_tools.mortar_pestle", 0)]), diff --git a/assets/voxygen/voxel/sprite_manifest.ron b/assets/voxygen/voxel/sprite_manifest.ron index d3a876a2bd..0e7d3b07c4 100644 --- a/assets/voxygen/voxel/sprite_manifest.ron +++ b/assets/voxygen/voxel/sprite_manifest.ron @@ -1983,4 +1983,26 @@ Beehive: Some(( ], wind_sway: 0.1, )), +// Empty Flask +VialEmpty: Some(( + variations: [ + ( + model: "voxygen.voxel.object.potion_empty", + offset: (-5.0, -5.0, 0.0), + lod_axes: (1.0, 1.0, 1.0), + ), + ], + wind_sway: 0.0, +)), +// Minor Potion +PotionMinor: Some(( + variations: [ + ( + model: "voxygen.voxel.object.potion_red", + offset: (-5.0, -5.0, 0.0), + lod_axes: (1.0, 1.0, 1.0), + ), + ], + wind_sway: 0.0, +)), ) diff --git a/common/src/comp/inventory/item/mod.rs b/common/src/comp/inventory/item/mod.rs index 585c21b39a..9e06a15b27 100644 --- a/common/src/comp/inventory/item/mod.rs +++ b/common/src/comp/inventory/item/mod.rs @@ -337,6 +337,8 @@ impl Item { SpriteKind::Stones => "common.items.crafting_ing.stones", SpriteKind::Twigs => "common.items.crafting_ing.twigs", SpriteKind::ShinyGem => "common.items.crafting_ing.shiny_gem", + SpriteKind::VialEmpty => "common.items.crafting_ing.empty_vial", + SpriteKind::PotionMinor => "common.items.consumable.potion_minor", _ => return None, })) } diff --git a/common/src/terrain/sprite.rs b/common/src/terrain/sprite.rs index 40349525f9..53cb5a2ff8 100644 --- a/common/src/terrain/sprite.rs +++ b/common/src/terrain/sprite.rs @@ -102,6 +102,8 @@ make_case_elim!( Reed = 0x4C, Beehive = 0x4D, LargeCactus = 0x4E, + VialEmpty = 0x4F, + PotionMinor = 0x50, } ); @@ -184,6 +186,8 @@ impl SpriteKind { SpriteKind::ShinyGem => true, SpriteKind::Crate => true, SpriteKind::Beehive => true, + SpriteKind::VialEmpty => true, + SpriteKind::PotionMinor => true, _ => false, } } @@ -221,6 +225,8 @@ impl SpriteKind { | SpriteKind::DropGateBottom | SpriteKind::Door | SpriteKind::Beehive + | SpriteKind::PotionMinor + | SpriteKind::VialEmpty ) } } diff --git a/world/src/site/settlement/building/archetype/house.rs b/world/src/site/settlement/building/archetype/house.rs index 3c679cc973..8f81b8eec4 100644 --- a/world/src/site/settlement/building/archetype/house.rs +++ b/world/src/site/settlement/building/archetype/house.rs @@ -537,7 +537,7 @@ impl Archetype for House { center_offset.x, center_offset.y, z + 100, - )) % 11 + )) % 12 { 0 => SpriteKind::Planter, 1 => SpriteKind::ChairSingle, @@ -554,6 +554,13 @@ impl Archetype for House { 7 => SpriteKind::DrawerSmall, 8 => SpriteKind::TableSide, 9 => SpriteKind::WardrobeSingle, + 10 => { + if dynamic_rng.gen_range(0, 10) == 0 { + SpriteKind::PotionMinor + } else { + SpriteKind::VialEmpty + } + }, _ => SpriteKind::Pot, };