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

Make pumpkins more common for Halloween

Browse Source
This commit is contained in:
IsseW 2022-10-09 22:49:17 +02:00 committed by flo666
parent 1d6b7d6a03
commit 9c4736f47b
2 changed files with 26 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
world/src/layer/scatter.rs
View File

@ -1,5 +1,8 @@
use crate::{column::ColumnSample, sim::SimChunk, Canvas, CONFIG};
use common::terrain::{Block, BlockKind, SpriteKind};
use common::{
calendar::{Calendar, CalendarEvent},
terrain::{Block, BlockKind, SpriteKind},
};
use noise::NoiseFn;
use num::traits::Pow;
use rand::prelude::*;
@ -27,7 +30,7 @@ pub fn density_factor_by_altitude(lower_limit: f32, altitude: f32, upper_limit:
const MUSH_FACT: f32 = 1.0e-4; // To balance things around the mushroom spawning rate
const GRASS_FACT: f32 = 1.0e-3; // To balance things around the grass spawning rate
const DEPTH_WATER_NORM: f32 = 15.0; // Water depth at which regular underwater sprites start spawning
pub fn apply_scatter_to(canvas: &mut Canvas, rng: &mut impl Rng) {
pub fn apply_scatter_to(canvas: &mut Canvas, rng: &mut impl Rng, calendar: Option<&Calendar>) {
enum WaterMode {
Underwater,
Floating,
@ -283,17 +286,26 @@ pub fn apply_scatter_to(canvas: &mut Canvas, rng: &mut impl Rng) {
kind: Pumpkin,
water_mode: Ground,
permit: |b| matches!(b, BlockKind::Grass),
f: |_, col| {
(
close(col.temp, CONFIG.temperate_temp, 0.5).min(close(
col.humidity,
CONFIG.forest_hum,
0.5,
)) * MUSH_FACT
* 500.0,
Some((0.0, 512.0, 0.05)),
)
},
f: if calendar.map_or(false, |calendar| calendar.is_event(CalendarEvent::Halloween)) {
|_, _| {
(
0.1,
Some((0.0003, 128.0, 0.1)),
)
}
} else {
|_, col| {
(
close(col.temp, CONFIG.temperate_temp, 0.5).min(close(
col.humidity,
CONFIG.forest_hum,
0.5,
)) * MUSH_FACT
* 500.0,
Some((0.0, 512.0, 0.05)),
)
}
},
},
// Collectable Objects
// Only spawn twigs in temperate forests

2
world/src/lib.rs
View File

@ -375,7 +375,7 @@ impl World {
layer::apply_trees_to(&mut canvas, &mut dynamic_rng, calendar);
}
if index.features.scatter {
layer::apply_scatter_to(&mut canvas, &mut dynamic_rng);
layer::apply_scatter_to(&mut canvas, &mut dynamic_rng, calendar);
}
if index.features.paths {
layer::apply_paths_to(&mut canvas);