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

made the trees maples instead. renamed the ForestKind to match.

Browse Source
This commit is contained in:
BigKhan 2024-01-28 14:34:11 +00:00
parent 9d36a1446d
commit 69f549deab
5 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
assets/world/style/colors.ron
View File

@ -19,7 +19,7 @@
// Leaves all actually get interpolated.
TemperateLeaves: [
(start: (20, 100, 40), end: (60, 120, 0)),
// TODO: Uncomment when we add autumnal trees. Hannibal is in charge now.
// TODO: Uncomment when we add autumnal trees. Hannibal is in charge now. NVM he is doing Mapletrees instead
//(start: (178, 216, 0), end: (255, 185, 63)),
//(start: (142, 164, 0), end: (142, 164, 0)),
//(start: (168, 81, 0), end: (54, 150, 31)),
@ -33,7 +33,7 @@
Mangrove: [(start: (20, 60, 0), end: (40, 90, 30))],
Chestnut: [(start: (30, 80, 0), end: (50, 120, 0))],
Baobab: [(start: (50, 100, 40), end: (50, 90, 0))],
AutumnLeaves: [(start: (168, 188, 38), end: (193, 138, 0)), (start: (196, 136, 33), end: (214, 91, 30)), (start: (147, 23, 23), end: (136, 17, 13))],
MapleLeaves: [(start: (103, 32, 21), end: (131, 24, 26)), (start: (96, 30, 44), end: (92, 9, 46))],
)
// Water blocks ignore color now so this isn't used, but just in case this color was worth

2
common/src/terrain/structure.rs
View File

@ -48,7 +48,7 @@ make_case_elim!(
Sign(content: Content, ori: u8) = 28,
KeyholeBars(consumes: String) = 29,
HaniwaKeyhole(consumes: String) = 30,
AutumnLeaves = 31,
MapleLeaves = 31,
}
);

10
world/src/all.rs
View File

@ -19,7 +19,7 @@ pub enum ForestKind {
Swamp,
Frostpine,
Dead,
Autumntree,
Mapletree,
}
pub struct Environment {
@ -44,7 +44,7 @@ impl ForestKind {
ForestKind::Mangrove => 0.5..1.3,
ForestKind::Swamp => 0.5..1.1,
ForestKind::Dead => 0.0..1.5,
ForestKind::Autumntree => 0.55..1.5,
ForestKind::Mapletree => 0.55..1.25,
_ => 0.0..0.0,
}
}
@ -64,7 +64,7 @@ impl ForestKind {
ForestKind::Mangrove => 0.35..1.6,
ForestKind::Swamp => -0.6..0.8,
ForestKind::Dead => -1.5..1.0,
ForestKind::Autumntree => -0.15..0.45,
ForestKind::Mapletree => -0.15..0.25,
_ => 0.0..0.0,
}
}
@ -93,7 +93,7 @@ impl ForestKind {
ForestKind::Mangrove => 2.0,
ForestKind::Swamp => 1.0,
ForestKind::Dead => 0.01,
ForestKind::Autumntree => 0.65,
ForestKind::Mapletree => 0.65,
_ => 0.0,
}
}
@ -111,7 +111,7 @@ impl ForestKind {
ForestKind::Birch => 0.65,
ForestKind::Mangrove => 1.0,
ForestKind::Swamp => 0.4,
ForestKind::Autumntree => 0.4,
ForestKind::Mapletree => 0.4,
_ => 1.0,
}
}

2
world/src/block/mod.rs
View File

@ -281,7 +281,7 @@ pub fn block_from_structure(
| StructureBlock::Mangrove
| StructureBlock::Chestnut
| StructureBlock::Baobab
| StructureBlock::AutumnLeaves => {
| StructureBlock::MapleLeaves => {
let ranges = sblock
.elim_case_pure(&index.colors.block.structure_blocks)
.as_ref()

4
world/src/layer/tree.rs
View File

@ -224,7 +224,7 @@ pub fn apply_trees_to(
StructureBlock::TemperateLeaves,
);
},
ForestKind::Autumntree => {
ForestKind::Mapletree => {
break 'model TreeModel::Procedural(
ProceduralTree::generate(
TreeConfig::oak(
@ -233,7 +233,7 @@ pub fn apply_trees_to(
),
&mut RandomPerm::new(seed),
),
StructureBlock::AutumnLeaves,
StructureBlock::MapleLeaves,
);
},
};