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

Cheaper terrain sprites

Browse Source
This commit is contained in:
Joshua Barretto 2020-09-03 18:21:15 +01:00
parent 70f52d876a
commit 798e9d7cd7
2 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -37,7 +37,7 @@ pub fn apply_scatter_to<'a>(
)) * col.tree_density
* MUSH_FACT
* 256.0,
Some((256.0, 0.25)),
Some((512.0, 0.25)),
)
}),
(PinkFlower, false, |c, col| {
@ -46,7 +46,7 @@ pub fn apply_scatter_to<'a>(
* col.tree_density
* MUSH_FACT
* 350.0,
Some((64.0, 0.2)),
Some((128.0, 0.1)),
)
}),
(PurpleFlower, false, |c, col| {
@ -58,7 +58,7 @@ pub fn apply_scatter_to<'a>(
)) * col.tree_density
* MUSH_FACT
* 350.0,
Some((64.0, 0.2)),
Some((128.0, 0.1)),
)
}),
(RedFlower, false, |c, col| {
@ -70,7 +70,7 @@ pub fn apply_scatter_to<'a>(
)) * col.tree_density
* MUSH_FACT
* 350.0,
Some((64.0, 0.1)),
Some((128.0, 0.05)),
)
}),
(WhiteFlower, false, |c, col| {
@ -79,7 +79,7 @@ pub fn apply_scatter_to<'a>(
* col.tree_density
* MUSH_FACT
* 350.0,
Some((64.0, 0.2)),
Some((128.0, 0.1)),
)
}),
(YellowFlower, false, |c, col| {
@ -88,7 +88,7 @@ pub fn apply_scatter_to<'a>(
* col.tree_density
* MUSH_FACT
* 350.0,
Some((64.0, 0.2)),
Some((128.0, 0.1)),
)
}),
(Sunflower, false, |c, col| {
@ -97,7 +97,7 @@ pub fn apply_scatter_to<'a>(
* col.tree_density
* MUSH_FACT
* 350.0,
Some((300.0, 0.2)),
Some((512.0, 0.15)),
)
}),
// Herbs and Spices
@ -121,8 +121,8 @@ pub fn apply_scatter_to<'a>(
(
close(c.temp, 0.3, 0.4).min(close(c.humidity, CONFIG.forest_hum, 0.5))
* MUSH_FACT
* 0.5,
Some((48.0, 0.3)),
* 0.25,
Some((64.0, 0.2)),
)
}),
(Blueberry, false, |c, _| {
@ -154,20 +154,20 @@ pub fn apply_scatter_to<'a>(
// Grass
(ShortGrass, false, |c, _| {
(
close(c.temp, 0.2, 0.65).min(close(c.humidity, CONFIG.jungle_hum, 0.4)) * 0.03,
close(c.temp, 0.2, 0.65).min(close(c.humidity, CONFIG.jungle_hum, 0.4)) * 0.015,
None,
)
}),
(MediumGrass, false, |c, _| {
(
close(c.temp, 0.2, 0.6).min(close(c.humidity, CONFIG.jungle_hum, 0.4)) * 0.02,
close(c.temp, 0.2, 0.6).min(close(c.humidity, CONFIG.jungle_hum, 0.4)) * 0.012,
None,
)
}),
(LongGrass, false, |c, _| {
(
close(c.temp, 0.3, 0.35).min(close(c.humidity, CONFIG.jungle_hum, 0.3)) * 0.15,
Some((48.0, 0.3)),
Some((48.0, 0.2)),
)
}),
// Jungle Sprites

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

@ -421,9 +421,7 @@ impl Floor {
let offs = Vec2::new(rng.gen_range(-1.0, 1.0), rng.gen_range(-1.0, 1.0))
.try_normalized()
.unwrap_or_else(Vec2::unit_y)
* FLOOR_SIZE.x as f32
/ 2.0
- 8.0;
* (TILE_SIZE as f32 / 2.0 - 4.0);
if !self.final_level {
supplement.add_entity(
EntityInfo::at((origin + stair_rcenter).map(|e| e as f32) + Vec3::from(offs))