From 6fd3339b75e834ffbbf37dc831da7db64ad64ee5 Mon Sep 17 00:00:00 2001 From: timokoesters <timo@koesters.xyz> Date: Fri, 27 Mar 2020 17:50:45 +0100 Subject: [PATCH] Make apples great again --- assets/common/items/apple.ron | 4 ++-- world/src/block/mod.rs | 6 +++++- world/src/block/natural.rs | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/assets/common/items/apple.ron b/assets/common/items/apple.ron index 0c44a094ce..7179502e22 100644 --- a/assets/common/items/apple.ron +++ b/assets/common/items/apple.ron @@ -2,11 +2,11 @@ Item( name: "Apple", description: "Red and juicy. -Restores 2 Health.", +Restores 20 Health.", kind: Consumable( kind: Apple, effect: Health(( - amount: 2, + amount: 20, cause: Item, )), ), diff --git a/world/src/block/mod.rs b/world/src/block/mod.rs index 3c61e20936..a994baf712 100644 --- a/world/src/block/mod.rs +++ b/world/src/block/mod.rs @@ -628,7 +628,11 @@ pub fn block_from_structure( ) .map(|e| e as u8), )), - StructureBlock::Fruit => Some(Block::new(BlockKind::Apple, Rgb::new(194, 30, 37))), + StructureBlock::Fruit => Some(if field.get(pos + structure_pos) % 3 > 0 { + Block::empty() + } else { + Block::new(BlockKind::Apple, Rgb::new(194, 30, 37)) + }), StructureBlock::Chest => Some(if structure_seed % 10 < 7 { Block::empty() } else { diff --git a/world/src/block/natural.rs b/world/src/block/natural.rs index 8e472e53e6..c60d593d34 100644 --- a/world/src/block/natural.rs +++ b/world/src/block/natural.rs @@ -56,7 +56,7 @@ pub fn structure_gen<'a>( ForestKind::Palm => &PALMS, ForestKind::Savannah => &ACACIAS, ForestKind::Oak if QUIRKY_RAND.get(st_seed) % 16 == 7 => &OAK_STUMPS, - ForestKind::Oak if QUIRKY_RAND.get(st_seed) % 8 == 7 => &FRUIT_TREES, + ForestKind::Oak if QUIRKY_RAND.get(st_seed) % 19 == 7 => &FRUIT_TREES, ForestKind::Oak if QUIRKY_RAND.get(st_seed) % 14 == 7 => &BIRCHES, ForestKind::Oak => &OAKS, ForestKind::Pine => &PINES,