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 Christmas decoration unconditional for now

Browse Source
This commit is contained in:
Christof Petig 2021-12-13 14:44:33 -06:00 committed by Joshua Barretto
parent 201101c059
commit be1a9050a4
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
world/src/site/settlement/building/archetype/house.rs
View File

@ -261,6 +261,7 @@ impl Archetype for House {
let roof_color = *self.colors.roof.elim_case_pure(&colors.roof); let roof_color = *self.colors.roof.elim_case_pure(&colors.roof);
let wall_color = *self.colors.wall.elim_case_pure(&colors.wall); let wall_color = *self.colors.wall.elim_case_pure(&colors.wall);
let support_color = *self.colors.support.elim_case_pure(&colors.support); let support_color = *self.colors.support.elim_case_pure(&colors.support);
let christmas_theme = true; // calendar.map_or(false, |c| c.is_event(CalendarEvent::Christmas));
let profile = Vec2::new(bound_offset.x, z); let profile = Vec2::new(bound_offset.x, z);
@ -613,7 +614,9 @@ impl Archetype for House {
.chance(Vec3::new(center_offset.x, center_offset.y, z), 0.35) .chance(Vec3::new(center_offset.x, center_offset.y, z), 0.35)
&& attr.storey_fill.has_lower() && attr.storey_fill.has_lower()
{ {
let ornament = let ornament = if christmas_theme {
SpriteKind::ChristmasOrnament
} else {
match self match self
.noise .noise
.get(Vec3::new(center_offset.x, center_offset.y, z + 100)) .get(Vec3::new(center_offset.x, center_offset.y, z + 100))
@ -624,7 +627,8 @@ impl Archetype for House {
4 => SpriteKind::WallSconce, 4 => SpriteKind::WallSconce,
5 => SpriteKind::WallLampSmall, 5 => SpriteKind::WallLampSmall,
_ => SpriteKind::DungeonWallDecor, _ => SpriteKind::DungeonWallDecor,
}; }
};
BlockMask::new( BlockMask::new(
Block::air(ornament).with_ori((edge_ori + 4) % 8).unwrap(), Block::air(ornament).with_ori((edge_ori + 4) % 8).unwrap(),