Merge branch 'pillar-removal' into 'master'

Remove pillars from Sahagin and Myrmidon dungeons

See merge request veloren/veloren!4378
This commit is contained in:
Isse 2024-03-18 18:10:26 +00:00
commit f46b8631b5

View File

@ -1331,8 +1331,8 @@ impl Floor {
lights = painter.prim(Primitive::translate(lights, 3 * Vec3::unit_z()));
pillar = painter.prim(Primitive::union(pillar, base));
}
// Specifically don't include pillars in Minotaur arena
if !(room.kind == RoomKind::Boss && self.difficulty == 4) {
// Specifically don't include pillars in Sahagin and Myrmidon dungeons
if !(self.difficulty == 2 || self.difficulty == 4) {
pillars.push((tile_center, pillar, lights));
}
}