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

Fixed crop crash issues

Browse Source
This commit is contained in:
Joshua Barretto
2020-04-14 01:50:58 +01:00
parent a4872c4e8d
commit f999edffaa
4 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
assets/common/items/coconut.ron
View File

@ -1,5 +1,5 @@
Item( Item(
name: "Mushroom", name: "Coconut",
description: "Reliable Source of water and fat. description: "Reliable Source of water and fat.
Restores 20 Health.", Restores 20 Health.",

1
common/src/terrain/block.rs
View File

@ -130,6 +130,7 @@ impl BlockKind {
BlockKind::Velorite => false, BlockKind::Velorite => false,
BlockKind::VeloriteFrag => false, BlockKind::VeloriteFrag => false,
BlockKind::Chest => false, BlockKind::Chest => false,
BlockKind::Pumpkin => false,
BlockKind::Welwitch => false, BlockKind::Welwitch => false,
BlockKind::LingonBerry => false, BlockKind::LingonBerry => false,
BlockKind::LeafyPlant => false, BlockKind::LeafyPlant => false,

26
voxygen/src/scene/terrain.rs
View File

@ -1212,90 +1212,90 @@ impl<V: RectRasterableVol> Terrain<V> {
( (
(BlockKind::WheatGreen, 0), (BlockKind::WheatGreen, 0),
make_model( make_model(
"voxygen.voxel.sprite.wheat_yellow.wheat-0", "voxygen.voxel.sprite.wheat_green.wheat-0",
Vec3::new(-6.0, -6.0, 0.0), Vec3::new(-6.0, -6.0, 0.0),
), ),
), ),
( (
(BlockKind::WheatGreen, 1), (BlockKind::WheatGreen, 1),
make_model( make_model(
"voxygen.voxel.sprite.wheat_yellow.wheat-1", "voxygen.voxel.sprite.wheat_green.wheat-1",
Vec3::new(-6.0, -6.0, 0.0), Vec3::new(-6.0, -6.0, 0.0),
), ),
), ),
( (
(BlockKind::WheatGreen, 2), (BlockKind::WheatGreen, 2),
make_model( make_model(
"voxygen.voxel.sprite.wheat_yellow.wheat-2", "voxygen.voxel.sprite.wheat_green.wheat-2",
Vec3::new(-6.0, -6.0, 0.0), Vec3::new(-6.0, -6.0, 0.0),
), ),
), ),
( (
(BlockKind::WheatGreen, 3), (BlockKind::WheatGreen, 3),
make_model( make_model(
"voxygen.voxel.sprite.wheat_yellow.wheat-3", "voxygen.voxel.sprite.wheat_green.wheat-3",
Vec3::new(-6.0, -6.0, 0.0), Vec3::new(-6.0, -6.0, 0.0),
), ),
), ),
( (
(BlockKind::WheatGreen, 4), (BlockKind::WheatGreen, 4),
make_model( make_model(
"voxygen.voxel.sprite.wheat_yellow.wheat-4", "voxygen.voxel.sprite.wheat_green.wheat-4",
Vec3::new(-6.0, -6.0, 0.0), Vec3::new(-6.0, -6.0, 0.0),
), ),
), ),
( (
(BlockKind::WheatGreen, 5), (BlockKind::WheatGreen, 5),
make_model( make_model(
"voxygen.voxel.sprite.wheat_yellow.wheat-5", "voxygen.voxel.sprite.wheat_green.wheat-5",
Vec3::new(-6.0, -6.0, 0.0), Vec3::new(-6.0, -6.0, 0.0),
), ),
), ),
( (
(BlockKind::WheatGreen, 6), (BlockKind::WheatGreen, 6),
make_model( make_model(
"voxygen.voxel.sprite.wheat_yellow.wheat-6", "voxygen.voxel.sprite.wheat_green.wheat-6",
Vec3::new(-6.0, -6.0, 0.0), Vec3::new(-6.0, -6.0, 0.0),
), ),
), ),
( (
(BlockKind::WheatGreen, 7), (BlockKind::WheatGreen, 7),
make_model( make_model(
"voxygen.voxel.sprite.wheat_yellow.wheat-7", "voxygen.voxel.sprite.wheat_green.wheat-7",
Vec3::new(-6.0, -6.0, 0.0), Vec3::new(-6.0, -6.0, 0.0),
), ),
), ),
( (
(BlockKind::WheatGreen, 8), (BlockKind::WheatGreen, 8),
make_model( make_model(
"voxygen.voxel.sprite.wheat_yellow.wheat-8", "voxygen.voxel.sprite.wheat_green.wheat-8",
Vec3::new(-6.0, -6.0, 0.0), Vec3::new(-6.0, -6.0, 0.0),
), ),
), ),
( (
(BlockKind::WheatGreen, 9), (BlockKind::WheatGreen, 9),
make_model( make_model(
"voxygen.voxel.sprite.wheat_yellow.wheat-9", "voxygen.voxel.sprite.wheat_green.wheat-9",
Vec3::new(-6.0, -6.0, 0.0), Vec3::new(-6.0, -6.0, 0.0),
), ),
), ),
// Cabbage // Cabbage
( (
(BlockKind::WheatGreen, 0), (BlockKind::Cabbage, 0),
make_model( make_model(
"voxygen.voxel.sprite.cabbage.cabbage-0", "voxygen.voxel.sprite.cabbage.cabbage-0",
Vec3::new(-6.0, -6.0, 0.0), Vec3::new(-6.0, -6.0, 0.0),
), ),
), ),
( (
(BlockKind::WheatGreen, 1), (BlockKind::Cabbage, 1),
make_model( make_model(
"voxygen.voxel.sprite.cabbage.cabbage-1", "voxygen.voxel.sprite.cabbage.cabbage-1",
Vec3::new(-6.0, -6.0, 0.0), Vec3::new(-6.0, -6.0, 0.0),
), ),
), ),
( (
(BlockKind::WheatGreen, 2), (BlockKind::Cabbage, 2),
make_model( make_model(
"voxygen.voxel.sprite.cabbage.cabbage-2", "voxygen.voxel.sprite.cabbage.cabbage-2",
Vec3::new(-6.0, -6.0, 0.0), Vec3::new(-6.0, -6.0, 0.0),

4
world/src/site/settlement/mod.rs
View File

@ -550,8 +550,8 @@ impl Settlement {
Crop::Corn => Some(BlockKind::Corn), Crop::Corn => Some(BlockKind::Corn),
Crop::Wheat if roll(1, 2) == 0 => Some(BlockKind::WheatYellow), Crop::Wheat if roll(1, 2) == 0 => Some(BlockKind::WheatYellow),
Crop::Wheat => Some(BlockKind::WheatGreen), Crop::Wheat => Some(BlockKind::WheatGreen),
Crop::Cabbage => Some(BlockKind::Cabbage), Crop::Cabbage if roll(2, 2) == 0 => Some(BlockKind::Cabbage),
Crop::Pumpkin if roll(2, 3) == 0 => Some(BlockKind::Pumpkin), Crop::Pumpkin if roll(3, 2) == 0 => Some(BlockKind::Pumpkin),
Crop::Sunflower => Some(BlockKind::Sunflower), Crop::Sunflower => Some(BlockKind::Sunflower),
_ => None, _ => None,
} }