diff --git a/assets/voxygen/voxel/sprite/furniture/bed_mesa.vox b/assets/voxygen/voxel/sprite/furniture/bed_mesa.vox new file mode 100644 index 0000000000..dcf23e22d1 --- /dev/null +++ b/assets/voxygen/voxel/sprite/furniture/bed_mesa.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1e7b23136b65468f014c78a4e3846b36e5db8c70a4985596cf028bf43a1e3838 +size 13744 diff --git a/assets/voxygen/voxel/sprite/furniture/cliff_decor_block-0.vox b/assets/voxygen/voxel/sprite/furniture/cliff_decor_block-0.vox new file mode 100644 index 0000000000..f530b84a02 --- /dev/null +++ b/assets/voxygen/voxel/sprite/furniture/cliff_decor_block-0.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:aa6144a2d805146a222f9e951da20575ae809669af126d0118aea257d08becf0 +size 6420 diff --git a/assets/voxygen/voxel/sprite/furniture/cliff_decor_block-1.vox b/assets/voxygen/voxel/sprite/furniture/cliff_decor_block-1.vox new file mode 100644 index 0000000000..bd5f295140 --- /dev/null +++ b/assets/voxygen/voxel/sprite/furniture/cliff_decor_block-1.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d5f2777a80c5e6e8c7078fc88b1883ed2d18626f41376c6dfeedd60de391cbec +size 6420 diff --git a/assets/voxygen/voxel/sprite/furniture/cliff_decor_block-10.vox b/assets/voxygen/voxel/sprite/furniture/cliff_decor_block-10.vox new file mode 100644 index 0000000000..5c7c62f5e4 --- /dev/null +++ b/assets/voxygen/voxel/sprite/furniture/cliff_decor_block-10.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b81d0c352a01dbec02f5d31d42e7c90e5885c757c40463879c97f761c015e6f0 +size 6420 diff --git a/assets/voxygen/voxel/sprite/furniture/cliff_decor_block-11.vox b/assets/voxygen/voxel/sprite/furniture/cliff_decor_block-11.vox new file mode 100644 index 0000000000..66f467bbf6 --- /dev/null +++ b/assets/voxygen/voxel/sprite/furniture/cliff_decor_block-11.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3ce88f9da73b2977acd63a313988f0aa58616db95b86522144a03e3c38541360 +size 6420 diff --git a/assets/voxygen/voxel/sprite/furniture/cliff_decor_block-2.vox b/assets/voxygen/voxel/sprite/furniture/cliff_decor_block-2.vox new file mode 100644 index 0000000000..032b183be5 --- /dev/null +++ b/assets/voxygen/voxel/sprite/furniture/cliff_decor_block-2.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6eb807632f52c7d0af7ea53d492a2f947a283806ac6d1bbb342222ab8adf610c +size 6420 diff --git a/assets/voxygen/voxel/sprite/furniture/cliff_decor_block-3.vox b/assets/voxygen/voxel/sprite/furniture/cliff_decor_block-3.vox new file mode 100644 index 0000000000..9b6d6efe61 --- /dev/null +++ b/assets/voxygen/voxel/sprite/furniture/cliff_decor_block-3.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4330e1fa807b9d8736a3d1c8e47c227e36d1d1dfc29187f7a47ab605a7036441 +size 6420 diff --git a/assets/voxygen/voxel/sprite/furniture/cliff_decor_block-4.vox b/assets/voxygen/voxel/sprite/furniture/cliff_decor_block-4.vox new file mode 100644 index 0000000000..b15fa4741f --- /dev/null +++ b/assets/voxygen/voxel/sprite/furniture/cliff_decor_block-4.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e454a75b7b3b187f421d1ad61cd07b8047a2ee6dc6601ac864a2fcdccd7a9a1f +size 6420 diff --git a/assets/voxygen/voxel/sprite/furniture/cliff_decor_block-5.vox b/assets/voxygen/voxel/sprite/furniture/cliff_decor_block-5.vox new file mode 100644 index 0000000000..60c11aa6a7 --- /dev/null +++ b/assets/voxygen/voxel/sprite/furniture/cliff_decor_block-5.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c884792c8a6933d8a8f9c48770034f8430409660b63a6da9c325241aebb87630 +size 6420 diff --git a/assets/voxygen/voxel/sprite/furniture/cliff_decor_block-6.vox b/assets/voxygen/voxel/sprite/furniture/cliff_decor_block-6.vox new file mode 100644 index 0000000000..9febb0f579 --- /dev/null +++ b/assets/voxygen/voxel/sprite/furniture/cliff_decor_block-6.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:08e0f80e6d47993696b249d767d8533060c0b76cf240b3bddf67e05eed9aa0ca +size 6420 diff --git a/assets/voxygen/voxel/sprite/furniture/cliff_decor_block-7.vox b/assets/voxygen/voxel/sprite/furniture/cliff_decor_block-7.vox new file mode 100644 index 0000000000..8bb777345c --- /dev/null +++ b/assets/voxygen/voxel/sprite/furniture/cliff_decor_block-7.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0ad55da0dc3326c5f68fee955f2b07944e72ab68ede545ec9e9b0ea8e458fe12 +size 6420 diff --git a/assets/voxygen/voxel/sprite/furniture/cliff_decor_block-8.vox b/assets/voxygen/voxel/sprite/furniture/cliff_decor_block-8.vox new file mode 100644 index 0000000000..d3e6ca9f62 --- /dev/null +++ b/assets/voxygen/voxel/sprite/furniture/cliff_decor_block-8.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:255058ba3693a9a4238615e3274bf64ea58ece8c2b022cb2254c5d40c9f2c6d5 +size 6420 diff --git a/assets/voxygen/voxel/sprite/furniture/cliff_decor_block-9.vox b/assets/voxygen/voxel/sprite/furniture/cliff_decor_block-9.vox new file mode 100644 index 0000000000..cf3d5dcd85 --- /dev/null +++ b/assets/voxygen/voxel/sprite/furniture/cliff_decor_block-9.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a8ffbe46a642e77d7fd0a7cb8e27ca7c4201bad79493d199eca8225e79f79b4e +size 6420 diff --git a/assets/voxygen/voxel/sprite/furniture/cliff_decor_block.vox b/assets/voxygen/voxel/sprite/furniture/cliff_decor_block_.vox similarity index 100% rename from assets/voxygen/voxel/sprite/furniture/cliff_decor_block.vox rename to assets/voxygen/voxel/sprite/furniture/cliff_decor_block_.vox diff --git a/assets/voxygen/voxel/sprite/furniture/cupboard_mesa.vox b/assets/voxygen/voxel/sprite/furniture/cupboard_mesa.vox new file mode 100644 index 0000000000..7ff276889d --- /dev/null +++ b/assets/voxygen/voxel/sprite/furniture/cupboard_mesa.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b594dde1339ac3ece7165e78d8fc5e6953e11e78d75a2cb59220c128197f1810 +size 6300 diff --git a/assets/voxygen/voxel/sprite/furniture/melon.vox b/assets/voxygen/voxel/sprite/furniture/melon.vox new file mode 100644 index 0000000000..4d5d9db44b --- /dev/null +++ b/assets/voxygen/voxel/sprite/furniture/melon.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4521f0a60b8ee0bc3ce5045516e57b17dfeed96e4deeeb4522fafb894c227591 +size 2980 diff --git a/assets/voxygen/voxel/sprite/furniture/melon_cut.vox b/assets/voxygen/voxel/sprite/furniture/melon_cut.vox index dbd7f4fc5b..f36698e559 100644 --- a/assets/voxygen/voxel/sprite/furniture/melon_cut.vox +++ b/assets/voxygen/voxel/sprite/furniture/melon_cut.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cdcde7c122e3c7f64c21d775d9d2fb22afdb66c6c149b53424eeac6520801683 -size 3784 +oid sha256:691e51029b43de6288947277ea938a7bf3fe0189c940194a2a6f12dddeb0ea1d +size 1900 diff --git a/assets/voxygen/voxel/sprite/furniture/mirror_mesa.vox b/assets/voxygen/voxel/sprite/furniture/mirror_mesa.vox new file mode 100644 index 0000000000..68912f66d0 --- /dev/null +++ b/assets/voxygen/voxel/sprite/furniture/mirror_mesa.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:20533cb1e1a4b4bcaca65f8c3e0eeac52ab862887407f60bf8895cae516d1e2e +size 2920 diff --git a/assets/voxygen/voxel/sprite/furniture/wall_lamp_mesa.vox b/assets/voxygen/voxel/sprite/furniture/wall_lamp_mesa.vox new file mode 100644 index 0000000000..0e5c1033a1 --- /dev/null +++ b/assets/voxygen/voxel/sprite/furniture/wall_lamp_mesa.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6cfedcdcd93eb5a3846d8cf636b03bf2a11786a211c27f610b862399808e1a25 +size 1556 diff --git a/assets/voxygen/voxel/sprite/furniture/wall_table_mesa.vox b/assets/voxygen/voxel/sprite/furniture/wall_table_mesa.vox new file mode 100644 index 0000000000..7664d2573f --- /dev/null +++ b/assets/voxygen/voxel/sprite/furniture/wall_table_mesa.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:07071d415eab5c828055746f9be86da1f5088150d019beeb71536e3e85f2ec47 +size 2980 diff --git a/assets/voxygen/voxel/sprite/furniture/wardrobe_double_mesa-0.vox b/assets/voxygen/voxel/sprite/furniture/wardrobe_double_mesa-0.vox new file mode 100644 index 0000000000..4651130f99 --- /dev/null +++ b/assets/voxygen/voxel/sprite/furniture/wardrobe_double_mesa-0.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:02fbe11be1aa17e8890922d2f1e805ac11192dd3e7608383dce1034ce9e73c89 +size 17840 diff --git a/assets/voxygen/voxel/sprite/furniture/wardrobe_double_mesa-1.vox b/assets/voxygen/voxel/sprite/furniture/wardrobe_double_mesa-1.vox new file mode 100644 index 0000000000..6df349874b --- /dev/null +++ b/assets/voxygen/voxel/sprite/furniture/wardrobe_double_mesa-1.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:677ef079e8564d3e7ec3c7137f61fc2b0229eca069b54d56a3879de34a641b09 +size 20052 diff --git a/assets/voxygen/voxel/sprite/furniture/wardrobe_double_mesa-2.vox b/assets/voxygen/voxel/sprite/furniture/wardrobe_double_mesa-2.vox new file mode 100644 index 0000000000..1960f4dfe4 --- /dev/null +++ b/assets/voxygen/voxel/sprite/furniture/wardrobe_double_mesa-2.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5154f1ad51315a30bf3df8a89869b8d01e452e89f2b1bcff907bfecace417e14 +size 11804 diff --git a/assets/voxygen/voxel/sprite/furniture/wardrobe_single_mesa-0.vox b/assets/voxygen/voxel/sprite/furniture/wardrobe_single_mesa-0.vox new file mode 100644 index 0000000000..3a6e6dc8fb --- /dev/null +++ b/assets/voxygen/voxel/sprite/furniture/wardrobe_single_mesa-0.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b53269070f8c636c94003b655a9534c55148ac8b3ea4577ede3a4b15cff3ff1d +size 13164 diff --git a/assets/voxygen/voxel/sprite/furniture/wardrobe_single_mesa-1.vox b/assets/voxygen/voxel/sprite/furniture/wardrobe_single_mesa-1.vox new file mode 100644 index 0000000000..809b2793c4 --- /dev/null +++ b/assets/voxygen/voxel/sprite/furniture/wardrobe_single_mesa-1.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:78858eeae19c0147291c34c63d675d94d99c3da13e709d610cd83797561e3f69 +size 6772 diff --git a/assets/voxygen/voxel/sprite/lantern/lantern_mesa.vox b/assets/voxygen/voxel/sprite/lantern/lantern_mesa.vox new file mode 100644 index 0000000000..d79b976bb1 --- /dev/null +++ b/assets/voxygen/voxel/sprite/lantern/lantern_mesa.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e263207c496e49da2e2734410030c65a87fb8cf81e5a49ac27fcaf54ea351f33 +size 1960 diff --git a/assets/voxygen/voxel/sprite_manifest.ron b/assets/voxygen/voxel/sprite_manifest.ron index 1ed8b4d9da..56d9ee887a 100644 --- a/assets/voxygen/voxel/sprite_manifest.ron +++ b/assets/voxygen/voxel/sprite_manifest.ron @@ -2731,7 +2731,7 @@ variations: [ ( model: "voxygen.voxel.sprite.furniture.lamp_wall-2", - offset: (-5.5, -5.5, 0.0), + offset: (-5.5, 0.5, 0.0), lod_axes: (1.0, 1.0, 1.0), ), ], @@ -4134,7 +4134,7 @@ variations: [ ( model: "voxygen.voxel.sprite.furniture.bookshelf_arabic", - offset: (-22.0, -5.5, -6.0), + offset: (-24.5, -5.5, -6.0), lod_axes: (0.0, 0.0, 0.0), ), ], @@ -4240,11 +4240,16 @@ ], wind_sway: 0.0, ), -(MelonCut, ()): ( +(Melon, ()): ( variations: [ ( model: "voxygen.voxel.sprite.furniture.melon_cut", - offset: (-15.0, -7.5, 0.0), + offset: (-4.5, -4.5, -0.0), + lod_axes: (0.0, 0.0, 0.0), + ), + ( + model: "voxygen.voxel.sprite.furniture.melon", + offset: (-5.5, -4.5, -0.0), lod_axes: (0.0, 0.0, 0.0), ), ], @@ -4290,12 +4295,163 @@ ], wind_sway: 0.0, ), +// CliffTown Sprites (CliffDecorBlock, ()): ( variations: [ ( - model: "voxygen.voxel.sprite.furniture.cliff_decor_block", + model: "voxygen.voxel.sprite.furniture.cliff_decor_block-0", offset: (-5.5, -5.5, 0.0), lod_axes: (0.0, 0.0, 0.0), + ), + ( + model: "voxygen.voxel.sprite.furniture.cliff_decor_block-1", + offset: (-5.5, -5.5, 0.0), + lod_axes: (0.0, 0.0, 0.0), + ), + ( + model: "voxygen.voxel.sprite.furniture.cliff_decor_block-2", + offset: (-5.5, -5.5, 0.0), + lod_axes: (0.0, 0.0, 0.0), + ), + ( + model: "voxygen.voxel.sprite.furniture.cliff_decor_block-3", + offset: (-5.5, -5.5, 0.0), + lod_axes: (0.0, 0.0, 0.0), + ), + ( + model: "voxygen.voxel.sprite.furniture.cliff_decor_block-4", + offset: (-5.5, -5.5, 0.0), + lod_axes: (0.0, 0.0, 0.0), + ), + ( + model: "voxygen.voxel.sprite.furniture.cliff_decor_block-5", + offset: (-5.5, -5.5, 0.0), + lod_axes: (0.0, 0.0, 0.0), + ), + ( + model: "voxygen.voxel.sprite.furniture.cliff_decor_block-6", + offset: (-5.5, -5.5, 0.0), + lod_axes: (0.0, 0.0, 0.0), + ), + ( + model: "voxygen.voxel.sprite.furniture.cliff_decor_block-7", + offset: (-5.5, -5.5, 0.0), + lod_axes: (0.0, 0.0, 0.0), + ), + ( + model: "voxygen.voxel.sprite.furniture.cliff_decor_block-8", + offset: (-5.5, -5.5, 0.0), + lod_axes: (0.0, 0.0, 0.0), + ), + ( + model: "voxygen.voxel.sprite.furniture.cliff_decor_block-9", + offset: (-5.5, -5.5, 0.0), + lod_axes: (0.0, 0.0, 0.0), + ), + ( + model: "voxygen.voxel.sprite.furniture.cliff_decor_block-10", + offset: (-5.5, -5.5, 0.0), + lod_axes: (0.0, 0.0, 0.0), + ), + ( + model: "voxygen.voxel.sprite.furniture.cliff_decor_block-11", + offset: (-5.5, -5.5, 0.0), + lod_axes: (0.0, 0.0, 0.0), + ), + ], + wind_sway: 0.0, +), +(BedMesa, ()): ( + variations: [ + ( + model: "voxygen.voxel.sprite.furniture.bed_mesa", + offset: (-9.0, -16.5, 0.0), + lod_axes: (1.0, 1.0, 1.0), + ), + ], + wind_sway: 0.0, +), +(CupboardMesa, ()): ( + variations: [ + ( + model: "voxygen.voxel.sprite.furniture.cupboard_mesa", + offset: (-8.5, -5.5, 0.0), + lod_axes: (1.0, 1.0, 1.0), + ), + ], + wind_sway: 0.0, +), +(WallLampMesa, ()): ( + variations: [ + ( + model: "voxygen.voxel.sprite.furniture.wall_lamp_mesa", + offset: (-4.5, 0.5, 0.0), + lod_axes: (1.0, 1.0, 1.0), + ), + ], + wind_sway: 0.0, +), +(MesaLantern, ()): ( + variations: [ + ( + model: "voxygen.voxel.sprite.lantern.lantern_mesa", + offset: (-3.5, -3.5, 0.0), + lod_axes: (0.5, 0.5, 0.2), + ), + ], + wind_sway: 0.0, +), +(MirrorMesa, ()): ( + variations: [ + ( + model: "voxygen.voxel.sprite.furniture.mirror_mesa", + offset: (-10.5, -2.0, 0.0), + lod_axes: (1.0, 1.0, 1.0), + ), + ], + wind_sway: 0.0, +), +(WallTableMesa, ()): ( + variations: [ + ( + model: "voxygen.voxel.sprite.furniture.wall_table_mesa", + offset: (-7.5, -5.5, 3.0), + lod_axes: (0.0, 0.0, 0.0), + ), + ], + wind_sway: 0.0, +), +(WardrobeDoubleMesa, ()): ( + variations: [ + ( + model: "voxygen.voxel.sprite.furniture.wardrobe_double_mesa-0", + offset: (-17.0, -6.5, 0.0), + lod_axes: (1.0, 1.0, 1.0), + ), + ( + model: "voxygen.voxel.sprite.furniture.wardrobe_double_mesa-1", + offset: (-12.5, -6.0, 0.0), + lod_axes: (1.0, 1.0, 1.0), + ), + ( + model: "voxygen.voxel.sprite.furniture.wardrobe_double_mesa-2", + offset: (-10.5, -6.0, 0.0), + lod_axes: (1.0, 1.0, 1.0), + ), + ], + wind_sway: 0.0, +), +(WardrobeSingleMesa, ()): ( + variations: [ + ( + model: "voxygen.voxel.sprite.furniture.wardrobe_single-0", + offset: (-7.0, -6.5, 0.0), + lod_axes: (1.0, 1.0, 1.0), + ), + ( + model: "voxygen.voxel.sprite.furniture.wardrobe_single-1", + offset: (-7.0, -6.5, 0.0), + lod_axes: (1.0, 1.0, 1.0), ), ], wind_sway: 0.0, diff --git a/common/src/terrain/block.rs b/common/src/terrain/block.rs index 2ae3594fef..b08da52275 100644 --- a/common/src/terrain/block.rs +++ b/common/src/terrain/block.rs @@ -388,8 +388,11 @@ impl Block { SpriteKind::Ember | SpriteKind::FireBlock => 20, SpriteKind::WallLamp | SpriteKind::WallLampSmall + | SpriteKind::WallLampWizard + | SpriteKind::WallLampMesa | SpriteKind::WallSconce | SpriteKind::FireBowlGround + | SpriteKind::MesaLantern | SpriteKind::ChristmasOrnament | SpriteKind::CliffDecorBlock | SpriteKind::Orb diff --git a/common/src/terrain/sprite.rs b/common/src/terrain/sprite.rs index d75c710054..20c2a9feca 100644 --- a/common/src/terrain/sprite.rs +++ b/common/src/terrain/sprite.rs @@ -76,30 +76,36 @@ sprites! { // TODO: Remove sizes and variants, represent with attributes Furniture = 2 has Ori { // Indoor - CoatRack = 0x00, - Bed = 0x01, - Bench = 0x02, - ChairSingle = 0x03, - ChairDouble = 0x04, - DrawerLarge = 0x05, - DrawerMedium = 0x06, - DrawerSmall = 0x07, - TableSide = 0x08, - TableDining = 0x09, - TableDouble = 0x0A, - WardrobeSingle = 0x0B, - WardrobeDouble = 0x0C, - BookshelfArabic = 0x0D, - WallTableArabic = 0x0E, - TableArabicLarge = 0x0F, - TableArabicSmall = 0x10, - CupboardArabic = 0x11, - OvenArabic = 0x12, - CushionArabic = 0x13, - CanapeArabic = 0x14, - Shelf = 0x15, - Planter = 0x16, - Pot = 0x17, + CoatRack = 0x00, + Bed = 0x01, + Bench = 0x02, + ChairSingle = 0x03, + ChairDouble = 0x04, + DrawerLarge = 0x05, + DrawerMedium = 0x06, + DrawerSmall = 0x07, + TableSide = 0x08, + TableDining = 0x09, + TableDouble = 0x0A, + WardrobeSingle = 0x0B, + WardrobeDouble = 0x0C, + BookshelfArabic = 0x0D, + WallTableArabic = 0x0E, + TableArabicLarge = 0x0F, + TableArabicSmall = 0x10, + CupboardArabic = 0x11, + OvenArabic = 0x12, + CushionArabic = 0x13, + CanapeArabic = 0x14, + Shelf = 0x15, + Planter = 0x16, + Pot = 0x17, + BedMesa = 0x18, + WallTableMesa = 0x19, + MirrorMesa = 0x1A, + WardrobeSingleMesa = 0x1B, + WardrobeDoubleMesa = 0x1C, + CupboardMesa = 0x1D, // Crafting CraftingBench = 0x20, Forge = 0x21, @@ -137,6 +143,7 @@ sprites! { WallLampSmall = 0x56, WallSconce = 0x57, DungeonWallDecor = 0x58, + WallLampMesa = 0x59, // Outdoor Tent = 0x60, Bedroll = 0x61, @@ -352,7 +359,7 @@ sprites! { // Artificial Grave = 0x10, Gravestone = 0x11, - MelonCut = 0x12, + Melon = 0x12, ForgeTools = 0x13, JugAndBowlArabic = 0x14, JugArabic = 0x15, @@ -374,6 +381,7 @@ sprites! { StreetLampTall = 2, SeashellLantern = 3, FireBowlGround = 4, + MesaLantern = 5, }, } @@ -439,12 +447,14 @@ impl SpriteKind { SpriteKind::SeaDecorWindowVer => 1.09, SpriteKind::SeaDecorPillar => 2.55, SpriteKind::SeashellLantern => 2.09, + SpriteKind::MesaLantern => 1.3, SpriteKind::Rope => 1.09, SpriteKind::StreetLamp => 2.65, SpriteKind::Carrot => 0.18, SpriteKind::Radish => 0.18, SpriteKind::FireBowlGround => 0.55, SpriteKind::Bed => 0.72, + SpriteKind::BedMesa => 0.82, SpriteKind::Bench => 0.5, SpriteKind::ChairSingle => 0.5, SpriteKind::ChairDouble => 0.5, @@ -460,6 +470,9 @@ impl SpriteKind { SpriteKind::TableDouble => 1.45, SpriteKind::WardrobeSingle => 3.0, SpriteKind::WardrobeDouble => 3.0, + SpriteKind::WardrobeSingleMesa => 2.0, + SpriteKind::WardrobeDoubleMesa => 2.0, + SpriteKind::MirrorMesa => 2.0, SpriteKind::Pot => 0.90, SpriteKind::Mud => 0.36, SpriteKind::ChestBuried => 0.91, @@ -539,7 +552,7 @@ impl SpriteKind { SpriteKind::CupboardArabic => 4.5, SpriteKind::WallTableArabic => 2.3, SpriteKind::JugAndBowlArabic => 1.4, - SpriteKind::MelonCut => 0.7, + SpriteKind::Melon => 0.7, SpriteKind::OvenArabic => 3.2, SpriteKind::FountainArabic => 2.4, SpriteKind::Hearth => 2.3, @@ -720,6 +733,7 @@ impl SpriteKind { }, SpriteKind::Helm => Some((Vec3::new(0.0, -1.0, 0.0), Vec3::unit_y())), SpriteKind::Bed => Some((Vec3::new(0.0, 0.0, 0.6), -Vec3::unit_y())), + SpriteKind::BedMesa => Some((Vec3::new(0.0, 0.0, 0.6), -Vec3::unit_y())), SpriteKind::BedrollSnow | SpriteKind::BedrollPirate => { Some((Vec3::new(0.0, 0.0, 0.1), -Vec3::unit_x())) }, diff --git a/world/src/site2/plot/cliff_tower.rs b/world/src/site2/plot/cliff_tower.rs index 1046dc3c61..24237ae4bd 100644 --- a/world/src/site2/plot/cliff_tower.rs +++ b/world/src/site2/plot/cliff_tower.rs @@ -223,14 +223,13 @@ impl Structure for CliffTower { painter.sprite( sprite_pos.with_z(floor_level + 1), match (RandomField::new(0).get(sprite_pos.with_z(floor_level + 1))) - % 10 + % 8 { - 0 => SpriteKind::FireBowlGround, - 1 => SpriteKind::Bowl, - 3 => SpriteKind::VialEmpty, - 4 => SpriteKind::Crate, - 5 => SpriteKind::Pot, - _ => SpriteKind::Lantern, + 0 => SpriteKind::Bowl, + 1 => SpriteKind::VialEmpty, + 2 => SpriteKind::Crate, + 3 => SpriteKind::Pot, + _ => SpriteKind::MesaLantern, }, ); } @@ -508,21 +507,21 @@ impl Structure for CliffTower { painter.sprite( pos.with_z(floor_level + 1), match (RandomField::new(0).get(pos.with_z(floor_level))) - % 8 + % 9 { - 0 => SpriteKind::DrawerSmall, + 0 => SpriteKind::WardrobeSingleMesa, 1 => SpriteKind::CoatRack, - 2 => SpriteKind::TableArabicSmall, + 2 => SpriteKind::MirrorMesa, 3 => SpriteKind::CushionArabic, 4 => SpriteKind::JugArabic, 5 => SpriteKind::SepareArabic, 6 => SpriteKind::Crate, 7 => SpriteKind::Bowl, - _ => SpriteKind::Lantern, + _ => SpriteKind::MesaLantern, }, ); } - // canapes + // beds & wardrobes for d in 0..2 { let pos = Vec2::new( plot_center.x - length + 6 + (d * ((2 * length) - 12)), @@ -544,7 +543,13 @@ impl Structure for CliffTower { .clear(); painter.rotated_sprite( pos.with_z(floor_level + 1), - SpriteKind::CanapeArabic, + match (RandomField::new(0) + .get(pos.with_z(floor_level - d))) + % 3 + { + 0 => SpriteKind::WardrobeDoubleMesa, + _ => SpriteKind::BedMesa, + }, (4 * d) as u8, ); } @@ -597,18 +602,17 @@ impl Structure for CliffTower { ); painter.rotated_sprite( pos.with_z(floor_level + 3), - SpriteKind::WallTableArabic, + SpriteKind::WallTableMesa, (4 * d) as u8, ); painter.rotated_sprite( pos.with_z(floor_level + 4), match (RandomField::new(0).get(pos.with_z(floor_level))) - % 4 + % 3 { 0 => SpriteKind::Bowl, 1 => SpriteKind::VialEmpty, - 2 => SpriteKind::JugArabic, - _ => SpriteKind::JugAndBowlArabic, + _ => SpriteKind::JugArabic, }, (4 * d) as u8, ); @@ -619,20 +623,19 @@ impl Structure for CliffTower { painter.sprite( pos.with_z(floor_level + 1), match (RandomField::new(0).get(pos.with_z(floor_level))) - % 14 + % 12 { 0 => SpriteKind::DrawerSmall, 1 => SpriteKind::CoatRack, 2 => SpriteKind::TableArabicSmall, 3 => SpriteKind::CushionArabic, 4 => SpriteKind::JugArabic, - 5 => SpriteKind::DrawerSmall, + 5 => SpriteKind::WardrobeSingleMesa, 6 => SpriteKind::Crate, 7 => SpriteKind::DecorSetArabic, 8 => SpriteKind::VialEmpty, 9 => SpriteKind::SepareArabic, - 10 => SpriteKind::TableArabicSmall, - 11 => SpriteKind::Lantern, + 10 => SpriteKind::MesaLantern, _ => SpriteKind::FountainArabic, }, ); @@ -647,8 +650,8 @@ impl Structure for CliffTower { plot_center.y - length + (d * ((2 * length) - 1)), ); painter.rotated_sprite( - pos.with_z(floor_level + 2), - SpriteKind::CupboardArabic, + pos.with_z(floor_level + 3), + SpriteKind::CupboardMesa, (4 * d) as u8, ); } @@ -660,18 +663,17 @@ impl Structure for CliffTower { ); painter.rotated_sprite( pos.with_z(floor_level + 2), - SpriteKind::WallTableArabic, + SpriteKind::WallTableMesa, (4 * d) as u8, ); painter.rotated_sprite( pos.with_z(floor_level + 3), match (RandomField::new(0).get(pos.with_z(floor_level))) - % 5 + % 4 { - 0 => SpriteKind::MelonCut, - 1 => SpriteKind::JugAndBowlArabic, - 2 => SpriteKind::Bowl, - 3 => SpriteKind::JugArabic, + 0 => SpriteKind::Melon, + 1 => SpriteKind::Bowl, + 2 => SpriteKind::JugArabic, _ => SpriteKind::VialEmpty, }, (4 * d) as u8, @@ -683,19 +685,19 @@ impl Structure for CliffTower { painter.sprite( pos.with_z(floor_level + 1), match (RandomField::new(0).get(pos.with_z(floor_level))) - % 12 + % 11 { - 0 => SpriteKind::DrawerSmall, + 0 => SpriteKind::WardrobeSingleMesa, 1 => SpriteKind::Cauldron, 2 => SpriteKind::TableArabicSmall, 3 => SpriteKind::CushionArabic, 4 => SpriteKind::JugArabic, - 5 => SpriteKind::DrawerSmall, - 6 => SpriteKind::Crate, - 7 => SpriteKind::Bowl, - 8 => SpriteKind::VialEmpty, - 9 => SpriteKind::CookingPot, - 10 => SpriteKind::Lantern, + 5 => SpriteKind::Crate, + 6 => SpriteKind::Bowl, + 7 => SpriteKind::VialEmpty, + 8 => SpriteKind::CookingPot, + 9 => SpriteKind::MesaLantern, + 10 => SpriteKind::JugAndBowlArabic, _ => SpriteKind::OvenArabic, }, ); @@ -703,6 +705,32 @@ impl Structure for CliffTower { }, } } + // wall lamps + + let corner_pos_1 = Vec2::new(plot_center.x - length, plot_center.y - 5); + let corner_pos_2 = Vec2::new(plot_center.x - 5, plot_center.y - length); + for dir in SQUARE_4 { + let lamp_pos_1 = Vec2::new( + corner_pos_1.x + (dir.x * ((2 * length) - 1)), + corner_pos_1.y + (dir.y * 10), + ) + .with_z(floor_level + 7); + painter.rotated_sprite( + lamp_pos_1, + SpriteKind::WallLampMesa, + (2 + (4 * dir.x)) as u8, + ); + let lamp_pos_2 = Vec2::new( + corner_pos_2.x + (dir.x * 10), + corner_pos_2.y + (dir.y * ((2 * length) - 1)), + ) + .with_z(floor_level + 7); + painter.rotated_sprite( + lamp_pos_2, + SpriteKind::WallLampMesa, + (4 - (4 * dir.y)) as u8, + ); + } } // stairs if floor_level > (base + 8) { diff --git a/world/src/site2/plot/desert_city_multiplot.rs b/world/src/site2/plot/desert_city_multiplot.rs index 524ada4063..4fcbd5282e 100644 --- a/world/src/site2/plot/desert_city_multiplot.rs +++ b/world/src/site2/plot/desert_city_multiplot.rs @@ -1228,7 +1228,7 @@ impl Structure for DesertCityMultiPlot { .get(c_pos.with_z(floor_level))) % 5 { - 0 => SpriteKind::MelonCut, + 0 => SpriteKind::Melon, 1 => SpriteKind::JugAndBowlArabic, 2 => SpriteKind::Bowl, 3 => SpriteKind::JugArabic,