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

correcting formatting and removing commented out code that wasn't supposed to be there

Browse Source
This commit is contained in:
Sarra 2021-02-25 20:41:57 -05:00
parent f39f5ab5d3
commit 1d4b8d4d99
2 changed files with 181 additions and 217 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
assets/voxygen/item_image_manifest.ron
View File

@ -1524,7 +1524,7 @@
"element.icons.neck-1", "element.icons.neck-1",
), ),
Armor(Neck("NeckShell")): Png( Armor(Neck("NeckShell")): Png(
"element.icons.neck-seashell", "element.icons.neck-seashell",
), ),
// Tabards // Tabards
@ -1716,8 +1716,8 @@
(0.0, 0.0, 0.0), (-50.0, 40.0, 20.0), 0.8, (0.0, 0.0, 0.0), (-50.0, 40.0, 20.0), 0.8,
), ),
Ingredient("Seashells"): VoxTrans( Ingredient("Seashells"): VoxTrans(
"voxel.sprite.seashells.shell-0", "voxel.sprite.seashells.shell-0",
(0.0, 0.0, 0.0), (-50.0, 40.0, 20.0), 0.8, (0.0, 0.0, 0.0), (-50.0, 40.0, 20.0), 0.8,
), ),
Ingredient("IcyShard"): Png( Ingredient("IcyShard"): Png(
"element.icons.item_ice_shard", "element.icons.item_ice_shard",

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

@ -305,220 +305,184 @@ pub fn apply_scatter_to(canvas: &mut Canvas, rng: &mut impl Rng) {
) )
}), }),
// seagrass // seagrass
(Seagrass, true, |c, col| { (Seagrass, true, |c, col| {
( (
close(c.temp, CONFIG.temperate_temp, 0.8) close(c.temp, CONFIG.temperate_temp, 0.8)
* MUSH_FACT * MUSH_FACT
* 300.0 * 300.0
* if col.water_level < CONFIG.sea_level * if col.water_level < CONFIG.sea_level && col.alt < col.water_level - DEPTH_WATER_NORM + 18.0 {
&& col.alt < col.water_level - DEPTH_WATER_NORM + 18.0 1.0
{ } else {
1.0 0.0
} else { },
0.0 Some((150.0, 0.3)),
}, )
Some((150.0, 0.3)), }),
) // seagrass, coastal patches
}), (Seagrass, true, |_, col| {
// seagrass, coastal patches (
(Seagrass, true, |_, col| { MUSH_FACT
( * 300.0
MUSH_FACT * if col.water_level < CONFIG.sea_level && (col.water_level - col.alt) < 3.0 {
* 300.0 1.0
* if col.water_level < CONFIG.sea_level && (col.water_level - col.alt) < 3.0 { } else {
1.0 0.0
} else { },
0.0 Some((90.0, 0.4)),
}, )
Some((90.0, 0.4)), }),
) // scattered seaweed (temperate species)
}), (SeaweedTemperate, true, |c, col| {
// scattered seaweed (temperate species) (
(SeaweedTemperate, true, |c, col| { close(c.temp, CONFIG.temperate_temp, 0.8)
( * MUSH_FACT
close(c.temp, CONFIG.temperate_temp, 0.8) * 50.0
* MUSH_FACT * if col.water_level < CONFIG.sea_level && col.alt < col.water_level - DEPTH_WATER_NORM + 11.0 {
* 50.0 1.0
* if col.water_level < CONFIG.sea_level } else {
&& col.alt < col.water_level - DEPTH_WATER_NORM + 11.0 0.0
{ },
1.0 Some((500.0, 0.75)),
} else { )
0.0 }),
}, // scattered seaweed (tropical species)
Some((500.0, 0.75)), (SeaweedTropical, true, |c, col| {
) (
}), close(c.temp, 1.0, 0.95)
// scattered seaweed (tropical species) * MUSH_FACT
(SeaweedTropical, true, |c, col| { * 50.0
( * if col.water_level < CONFIG.sea_level && col.alt < col.water_level - DEPTH_WATER_NORM + 11.0 {
close(c.temp, 1.0, 0.95) 1.0
* MUSH_FACT } else {
* 50.0 0.0
* if col.water_level < CONFIG.sea_level },
&& col.alt < col.water_level - DEPTH_WATER_NORM + 11.0 Some((500.0, 0.75)),
{ )
1.0 }),
} else { // Caulerpa lentillifera algae patch
0.0 (SeaGrapes, true, |_, col| {
}, (
Some((500.0, 0.75)), MUSH_FACT
) * 250.0
}), * if col.water_level < CONFIG.sea_level && col.alt < col.water_level - DEPTH_WATER_NORM + 10.0 {
// Caulerpa lentillifera algae patch 1.0
(SeaGrapes, true, |_, col| { } else {
( 0.0
MUSH_FACT },
* 250.0 Some((100.0, 0.15)),
* if col.water_level < CONFIG.sea_level )
&& col.alt < col.water_level - DEPTH_WATER_NORM + 10.0 }),
{ // Caulerpa prolifera algae patch
1.0 (WavyAlgae, true, |_, col| {
} else { (
0.0 MUSH_FACT
}, * 250.0
Some((100.0, 0.15)), * if col.water_level < CONFIG.sea_level && col.alt < col.water_level - DEPTH_WATER_NORM + 10.0 {
) 1.0
}), } else {
// Caulerpa prolifera algae patch 0.0
(WavyAlgae, true, |_, col| { },
( Some((100.0, 0.15)),
MUSH_FACT )
* 250.0 }),
* if col.water_level < CONFIG.sea_level // Mermaids' fan algae patch
&& col.alt < col.water_level - DEPTH_WATER_NORM + 10.0 (MermaidsFan, true, |c, col| {
{ (
1.0 close(c.temp, 1.0, 0.95)
} else { * MUSH_FACT
0.0 * 500.0
}, * if col.water_level < CONFIG.sea_level && col.alt < col.water_level - DEPTH_WATER_NORM + 10.0 {
Some((100.0, 0.15)), 1.0
) } else {
}), 0.0
// Mermaids' fan algae patch },
(MermaidsFan, true, |c, col| { Some((50.0, 0.10)),
( )
close(c.temp, 1.0, 0.95) }),
* MUSH_FACT // Sea anemones
* 500.0 (SeaAnemone, true, |c, col| {
* if col.water_level < CONFIG.sea_level (
&& col.alt < col.water_level - DEPTH_WATER_NORM + 10.0 close(c.temp, CONFIG.temperate_temp, 0.8)
{ * MUSH_FACT
1.0 * 125.0
} else { * if col.water_level < CONFIG.sea_level && col.alt < col.water_level - DEPTH_WATER_NORM - 9.0 {
0.0 1.0
}, } else {
Some((50.0, 0.10)), 0.0
) },
}), Some((100.0, 0.3)),
// Sea anemones )
(SeaAnemone, true, |c, col| { }),
( // Giant Kelp
close(c.temp, CONFIG.temperate_temp, 0.8) (GiantKelp, true, |c, col| {
* MUSH_FACT (
* 125.0 close(c.temp, CONFIG.temperate_temp, 0.8)
* if col.water_level < CONFIG.sea_level * MUSH_FACT
&& col.alt < col.water_level - DEPTH_WATER_NORM - 9.0 * 220.0
{ * if col.water_level < CONFIG.sea_level && col.alt < col.water_level - DEPTH_WATER_NORM - 9.0 {
1.0 1.0
} else { } else {
0.0 0.0
}, },
Some((100.0, 0.3)), Some((200.0, 0.4)),
) )
}), }),
// Giant Kelp // Bull Kelp
(GiantKelp, true, |c, col| { (BullKelp, true, |c, col| {
( (
close(c.temp, CONFIG.temperate_temp, 0.8) close(c.temp, CONFIG.temperate_temp, 0.7)
* MUSH_FACT * MUSH_FACT
* 220.0 * 300.0
* if col.water_level < CONFIG.sea_level * if col.water_level < CONFIG.sea_level && col.alt < col.water_level - DEPTH_WATER_NORM + 3.0 {
&& col.alt < col.water_level - DEPTH_WATER_NORM - 9.0 1.0
{ } else {
1.0 0.0
} else { },
0.0 Some((75.0, 0.3)),
}, )
Some((200.0, 0.4)), }),
) // Stony Corals
}), (StonyCoral, true, |c, col| {
// Bull Kelp (
(BullKelp, true, |c, col| { close(c.temp, 1.0, 0.9)
( * MUSH_FACT
close(c.temp, CONFIG.temperate_temp, 0.7) * 160.0
* MUSH_FACT * if col.water_level < CONFIG.sea_level && col.alt < col.water_level - DEPTH_WATER_NORM + 10.0 {
* 300.0 1.0
* if col.water_level < CONFIG.sea_level } else {
&& col.alt < col.water_level - DEPTH_WATER_NORM + 3.0 0.0
{ },
1.0 Some((120.0, 0.4)),
} else { )
0.0 }),
}, // Soft Corals
Some((75.0, 0.3)), (SoftCoral, true, |c, col| {
) (
}), close(c.temp, 1.0, 0.9)
// Stony Corals * MUSH_FACT
(StonyCoral, true, |c, col| { * 120.0
( * if col.water_level < CONFIG.sea_level && col.alt < col.water_level - DEPTH_WATER_NORM + 10.0 {
close(c.temp, 1.0, 0.9) 1.0
* MUSH_FACT } else {
* 160.0 0.0
* if col.water_level < CONFIG.sea_level },
&& col.alt < col.water_level - DEPTH_WATER_NORM + 10.0 Some((120.0, 0.4)),
{ )
1.0 }),
} else { // Seashells
0.0 (Seashells, true, |c, col| {
}, (
Some((120.0, 0.4)), (c.rockiness - 0.5).max(0.0)
) * 1.0e-3
}), * if col.water_level < CONFIG.sea_level && col.alt < col.water_level - DEPTH_WATER_NORM + 20.0 {
// Soft Corals 1.0
(SoftCoral, true, |c, col| { } else {
( 0.0
close(c.temp, 1.0, 0.9) },
* MUSH_FACT None,
* 120.0 )
* if col.water_level < CONFIG.sea_level }),
&& col.alt < col.water_level - DEPTH_WATER_NORM + 10.0
{
1.0
} else {
0.0
},
Some((120.0, 0.4)),
)
}),
// Seashells
(Seashells, true, |c, col| {
(
(c.rockiness - 0.5).max(0.0)
* 1.0e-3
* if col.water_level < CONFIG.sea_level
&& col.alt < col.water_level - DEPTH_WATER_NORM + 20.0
{
1.0
} else {
0.0
},
None,
)
}),
// hydrothermal vent
// (UnderwaterVent, true, |_, col| {
// (
// MUSH_FACT
// * 250.0
// * * if col.water_level < CONFIG.sea_level && col.alt <
// col.water_level - DEPTH_WATER_NORM - 50.0 { 1.0
// } else {
// 0.0
// },
// Some((100.0, 0.15)),
// )
// }),
(Stones, true, |c, col| { (Stones, true, |c, col| {
( (
(c.rockiness - 0.5).max(0.0) (c.rockiness - 0.5).max(0.0)