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

add models: bone_door, bone_keyhole, bone_key

Browse Source
This commit is contained in:
flo666 2023-04-08 20:57:51 +02:00 committed by Sam
parent 8cbfb28da5
commit 38a6cc67f9
5 changed files with 30 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
assets/voxygen/voxel/object/key_bone.vox (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/voxel/sprite/furniture/bone_door_block.vox (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/voxel/sprite/furniture/bone_keyhole_block.vox (Stored with Git LFS)
View File

Binary file not shown.

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

@ -656,6 +656,8 @@ impl SpriteKind {
| SpriteKind::MagicalBarrier | SpriteKind::MagicalBarrier
| SpriteKind::Helm | SpriteKind::Helm
| SpriteKind::DoorWide, | SpriteKind::DoorWide,
| SpriteKind::BoneKeyhole
| SpriteKind::BoneKeyDoor
) )
} }
} }

34
world/src/site2/plot/adlet.rs
View File

@ -1357,7 +1357,7 @@ impl Structure for AdletStronghold {
painter painter
.cubic_bezier( .cubic_bezier(
(yetipit_entrance_pos + door_dir * 10).with_z(alt as i32 + 2), (yetipit_entrance_pos + door_dir * 10).with_z(alt as i32 + 2),
(yetipit_entrance_pos - door_dir * 20).with_z(alt as i32 - 10), (yetipit_entrance_pos - door_dir * 16).with_z(alt as i32 - 10),
(yetipit_entrance_pos + door_dir * 20).with_z((alt as i32) - 30), (yetipit_entrance_pos + door_dir * 20).with_z((alt as i32) - 30),
self.cavern_center.with_z((alt as i32) - 50), self.cavern_center.with_z((alt as i32) - 50),
4.0, 4.0,
@ -1365,20 +1365,30 @@ impl Structure for AdletStronghold {
.clear(); .clear();
// bone door // bone door
painter painter
.sphere_with_radius( .cylinder(Aabb {
(yetipit_entrance_pos + door_dir).with_z(alt as i32 - 4), min: Vec2::new(yetipit_entrance_pos.x - 7, yetipit_entrance_pos.y - 7)
4.0, .with_z(alt as i32 - 8),
) max: Vec2::new(yetipit_entrance_pos.x + 7, yetipit_entrance_pos.y + 7)
.with_z((alt as i32) - 7),
})
.fill(snow_ice_fill.clone());
painter
.cylinder(Aabb {
min: Vec2::new(yetipit_entrance_pos.x - 3, yetipit_entrance_pos.y - 3)
.with_z(alt as i32 - 8),
max: Vec2::new(yetipit_entrance_pos.x + 3, yetipit_entrance_pos.y + 3)
.with_z((alt as i32) - 7),
})
.fill(Fill::Block(Block::air(SpriteKind::BoneKeyDoor))); .fill(Fill::Block(Block::air(SpriteKind::BoneKeyDoor)));
painter painter
.sphere_with_radius( .aabb(Aabb {
(yetipit_entrance_pos + door_dir * 2).with_z(alt as i32 - 2), min: Vec2::new(yetipit_entrance_pos.x - 1, yetipit_entrance_pos.y)
1.0, .with_z(alt as i32 - 8),
) max: Vec2::new(yetipit_entrance_pos.x, yetipit_entrance_pos.y + 1)
.with_z((alt as i32) - 7),
})
.fill(Fill::Block(Block::air(SpriteKind::BoneKeyhole))); .fill(Fill::Block(Block::air(SpriteKind::BoneKeyhole)));
painter
.sphere_with_radius(yetipit_entrance_pos.with_z(alt as i32 - 4), 4.0)
.clear();
}, },
AdletStructure::Tannery => { AdletStructure::Tannery => {
// shattered bone pieces // shattered bone pieces