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

Changelog:

Browse Source 
-Savanna grasses now only spawn in the savanna and no longer bleed into desert and temperate biomes
-Cacti now only spawn in the desert and density of large cacti has decreased
-Dead bushes are largely unchanged and still spawn in both the savanna and desert with some bleed into temperate biomes
This commit is contained in:
Marcel Märtens 2021-03-03 15:05:02 +01:00
parent c9a656908d
commit c681992367
2 changed files with 31 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -61,6 +61,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Added item tooltips to trade window.
- "Quest" given to new players converted to being a short tutorial
- Items can be requested from the counterparty's inventory during trade.
- Savanna grasses restricted to savanna, cacti to desert.
### Removed

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

@ -161,7 +161,7 @@ pub fn apply_scatter_to(canvas: &mut Canvas, rng: &mut impl Rng) {
(LongGrass, false, |c, _| {
(
close(c.temp, 0.3, 0.35).min(close(c.humidity, CONFIG.jungle_hum, 0.3)) * 0.15,
Some((45.0, 0.5)),
Some((48.0, 0.2)),
)
}),
// Jungle Sprites
@ -196,26 +196,42 @@ pub fn apply_scatter_to(canvas: &mut Canvas, rng: &mut impl Rng) {
// Savanna Plants
(SavannaGrass, false, |c, _| {
(
close(c.temp, 1.0, 0.90).min(close(c.humidity, 0.2, 0.25)) * 0.015,
Some((45.0, 0.5)),
{
let savanna = close(c.temp, 1.0, 0.4).min(close(c.humidity, 0.2, 0.25));
let desert = close(c.temp, 1.0, 0.25).min(close(c.humidity, 0.0, 0.1));
(savanna - desert * 5.0).max(0.0)
},
Some((0.5, 0.2)),
)
}),
(TallSavannaGrass, false, |c, _| {
(
close(c.temp, 1.0, 0.90).min(close(c.humidity, 0.2, 0.25)) * 0.15,
Some((45.0, 0.5)),
{
let savanna = close(c.temp, 1.0, 0.4).min(close(c.humidity, 0.2, 0.25));
let desert = close(c.temp, 1.0, 0.25).min(close(c.humidity, 0.0, 0.1));
(savanna - desert * 5.0).max(0.0)
},
Some((12.5, 0.25)),
)
}),
(RedSavannaGrass, false, |c, _| {
(
close(c.temp, 1.0, 0.90).min(close(c.humidity, 0.2, 0.25)) * MUSH_FACT * 7.5,
None,
{
let savanna = close(c.temp, 1.0, 0.4).min(close(c.humidity, 0.2, 0.25));
let desert = close(c.temp, 1.0, 0.25).min(close(c.humidity, 0.0, 0.1));
(savanna - desert * 5.0).max(0.0)
},
Some((0.1, 0.1)),
)
}),
(SavannaBush, false, |c, _| {
(
close(c.temp, 1.0, 0.90).min(close(c.humidity, 0.2, 0.25)) * MUSH_FACT * 7.5,
None,
{
let savanna = close(c.temp, 1.0, 0.4).min(close(c.humidity, 0.2, 0.25));
let desert = close(c.temp, 1.0, 0.25).min(close(c.humidity, 0.0, 0.1));
(savanna - desert * 5.0).max(0.0)
},
Some((0.08, 0.05)),
)
}),
// Desert Plants
@ -227,31 +243,31 @@ pub fn apply_scatter_to(canvas: &mut Canvas, rng: &mut impl Rng) {
}),
(LargeCactus, false, |c, _| {
(
close(c.temp, 1.0, 0.95).min(close(c.humidity, 0.0, 0.3)) * MUSH_FACT * 0.3,
close(c.temp, 1.0, 0.25).min(close(c.humidity, 0.0, 0.1)) * MUSH_FACT * 3.5,
None,
)
}),
(RoundCactus, false, |c, _| {
(
close(c.temp, 1.0, 0.95).min(close(c.humidity, 0.0, 0.3)) * MUSH_FACT * 0.3,
close(c.temp, 1.0, 0.25).min(close(c.humidity, 0.0, 0.1)) * MUSH_FACT * 5.5,
None,
)
}),
(ShortCactus, false, |c, _| {
(
close(c.temp, 1.0, 0.95).min(close(c.humidity, 0.0, 0.3)) * MUSH_FACT * 0.3,
close(c.temp, 1.0, 0.25).min(close(c.humidity, 0.0, 0.1)) * MUSH_FACT * 5.5,
None,
)
}),
(MedFlatCactus, false, |c, _| {
(
close(c.temp, 1.0, 0.95).min(close(c.humidity, 0.0, 0.3)) * MUSH_FACT * 0.3,
close(c.temp, 1.0, 0.25).min(close(c.humidity, 0.0, 0.1)) * MUSH_FACT * 5.5,
None,
)
}),
(ShortFlatCactus, false, |c, _| {
(
close(c.temp, 1.0, 0.95).min(close(c.humidity, 0.0, 0.3)) * MUSH_FACT * 0.3,
close(c.temp, 1.0, 0.25).min(close(c.humidity, 0.0, 0.1)) * MUSH_FACT * 5.5,
None,
)
}),