Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

easier to get minor potions

Browse Source 
increase cost of a minor potion to 4 apples
This commit is contained in:
Monty Marz 2020-11-04 23:17:24 +01:00 committed by Snowram
parent eb79820c25
commit ca932f6c15
5 changed files with 39 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
assets/common/recipe_book.ron
View File

@ -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)]),

22
assets/voxygen/voxel/sprite_manifest.ron
View File

@ -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,
)),
)

2
common/src/comp/inventory/item/mod.rs
View File

@ -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,
}))
}

6
common/src/terrain/sprite.rs
View File

@ -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
)
}
}

9
world/src/site/settlement/building/archetype/house.rs
View File

@ -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,
};