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

change cauldron spawning

Browse Source 
cooking pot height
fmt
fmt, changelog
This commit is contained in:
Monty 2021-04-19 17:56:16 +02:00 committed by Monty Marz
parent 11ba02130c
commit 86445af09c
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@ -36,7 +36,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Players can now opt-in to server-authoritiative physics in gameplay settings. - Players can now opt-in to server-authoritiative physics in gameplay settings.
- Added `/server_physics` admin command. - Added `/server_physics` admin command.
- Sort inventory button - Sort inventory button
- Option to change the master volume when window is unfocused - Option to change the master volume when window is unfocused
- Crafting stations in towns
### Changed ### Changed

4
common/src/comp/controller.rs
View File

@ -21,7 +21,7 @@ pub enum InventoryEvent {
Swap(InvSlotId, InvSlotId), Swap(InvSlotId, InvSlotId),
SplitSwap(InvSlotId, InvSlotId), SplitSwap(InvSlotId, InvSlotId),
Drop(InvSlotId), Drop(InvSlotId),
SplitDrop(InvSlotId), SplitDrop(InvSlotId),
Sort, Sort,
CraftRecipe { CraftRecipe {
recipe: String, recipe: String,
@ -45,7 +45,7 @@ pub enum InventoryManip {
Swap(Slot, Slot), Swap(Slot, Slot),
SplitSwap(Slot, Slot), SplitSwap(Slot, Slot),
Drop(Slot), Drop(Slot),
SplitDrop(Slot), SplitDrop(Slot),
Sort, Sort,
CraftRecipe { CraftRecipe {
recipe: String, recipe: String,

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

@ -193,7 +193,7 @@ impl SpriteKind {
SpriteKind::Forge => 2.7, SpriteKind::Forge => 2.7,
SpriteKind::Cauldron => 1.27, SpriteKind::Cauldron => 1.27,
SpriteKind::Anvil => 1.1, SpriteKind::Anvil => 1.1,
SpriteKind::CookingPot => 1.82, SpriteKind::CookingPot => 1.36,
// TODO: Find suitable heights. // TODO: Find suitable heights.
SpriteKind::BarrelCactus SpriteKind::BarrelCactus
| SpriteKind::RoundCactus | SpriteKind::RoundCactus

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

@ -530,7 +530,7 @@ impl Archetype for House {
center_offset.x, center_offset.x,
center_offset.y, center_offset.y,
z + 100, z + 100,
)) % 7 )) % 8
{ {
0..=1 => SpriteKind::Crate, 0..=1 => SpriteKind::Crate,
2 => SpriteKind::Bench, 2 => SpriteKind::Bench,
@ -538,7 +538,7 @@ impl Archetype for House {
4 => SpriteKind::CookingPot, 4 => SpriteKind::CookingPot,
5 => SpriteKind::CraftingBench, 5 => SpriteKind::CraftingBench,
6 => SpriteKind::FireBowlGround, 6 => SpriteKind::FireBowlGround,
//7 => SpriteKind::Cauldron, 7 => SpriteKind::Cauldron,
//8 => SpriteKind::Forge, //8 => SpriteKind::Forge,
_ => unreachable!(), _ => unreachable!(),
}; };
@ -562,7 +562,7 @@ impl Archetype for House {
center_offset.x, center_offset.x,
center_offset.y, center_offset.y,
z + 100, z + 100,
)) % 13 )) % 12
{ {
0 => SpriteKind::Planter, 0 => SpriteKind::Planter,
1 => SpriteKind::ChairSingle, 1 => SpriteKind::ChairSingle,
@ -586,7 +586,6 @@ impl Archetype for House {
SpriteKind::VialEmpty SpriteKind::VialEmpty
} }
}, },
11 => SpriteKind::Cauldron,
_ => { _ => {
if dynamic_rng.gen_range(0..2) == 0 { if dynamic_rng.gen_range(0..2) == 0 {
SpriteKind::Bowl SpriteKind::Bowl