From ba5f45134eb184514039d0046e01a519741f87ea Mon Sep 17 00:00:00 2001 From: Sarra Date: Sun, 27 Dec 2020 14:11:02 -0500 Subject: [PATCH] adding skulls and bones that spawn in dungeons. Bones can be picked up for Thick Bone crafting item, made Bone Staff craftable. Also added assets for wall grotesques, but these do not spawn in dungeons yet --- assets/common/items/crafting_ing/bone.ron | 2 +- assets/common/recipe_book.ron | 1 + assets/voxygen/element/icons/item_bone.png | 3 + assets/voxygen/element/icons/item_bone.png~ | Bin 0 -> 657 bytes assets/voxygen/item_image_manifest.ron | 3 + assets/voxygen/voxel/sprite/bones/femur-1.vox | 3 + assets/voxygen/voxel/sprite/bones/femur-2.vox | 3 + assets/voxygen/voxel/sprite/bones/femur-3.vox | 3 + assets/voxygen/voxel/sprite/bones/ribs-1.vox | 3 + assets/voxygen/voxel/sprite/bones/ribs-2.vox | 3 + assets/voxygen/voxel/sprite/bones/skull-1.vox | 3 + assets/voxygen/voxel/sprite/bones/skull-2.vox | 3 + assets/voxygen/voxel/sprite/bones/skull-3.vox | 3 + assets/voxygen/voxel/sprite/bones/spine-1.vox | 3 + assets/voxygen/voxel/sprite/bones/spine-2.vox | 3 + .../voxel/sprite/furniture/grotesque1.vox | 3 + .../voxel/sprite/furniture/grotesque2.vox | 3 + .../voxel/sprite/furniture/grotesque3.vox | 3 + .../voxel/sprite/furniture/grotesque4.vox | 3 + .../voxel/sprite/furniture/grotesque5.vox | 3 + .../voxel/sprite/furniture/grotesque6.vox | 3 + .../voxel/sprite/furniture/grotesque7.vox | 3 + assets/voxygen/voxel/sprite_manifest.ron | 62 ++++++++++++++++++ common/src/comp/inventory/item/mod.rs | 1 + common/src/terrain/sprite.rs | 5 ++ world/src/site/dungeon/mod.rs | 2 + 26 files changed, 129 insertions(+), 1 deletion(-) create mode 100644 assets/voxygen/element/icons/item_bone.png create mode 100644 assets/voxygen/element/icons/item_bone.png~ create mode 100644 assets/voxygen/voxel/sprite/bones/femur-1.vox create mode 100644 assets/voxygen/voxel/sprite/bones/femur-2.vox create mode 100644 assets/voxygen/voxel/sprite/bones/femur-3.vox create mode 100644 assets/voxygen/voxel/sprite/bones/ribs-1.vox create mode 100644 assets/voxygen/voxel/sprite/bones/ribs-2.vox create mode 100644 assets/voxygen/voxel/sprite/bones/skull-1.vox create mode 100644 assets/voxygen/voxel/sprite/bones/skull-2.vox create mode 100644 assets/voxygen/voxel/sprite/bones/skull-3.vox create mode 100644 assets/voxygen/voxel/sprite/bones/spine-1.vox create mode 100644 assets/voxygen/voxel/sprite/bones/spine-2.vox create mode 100644 assets/voxygen/voxel/sprite/furniture/grotesque1.vox create mode 100644 assets/voxygen/voxel/sprite/furniture/grotesque2.vox create mode 100644 assets/voxygen/voxel/sprite/furniture/grotesque3.vox create mode 100644 assets/voxygen/voxel/sprite/furniture/grotesque4.vox create mode 100644 assets/voxygen/voxel/sprite/furniture/grotesque5.vox create mode 100644 assets/voxygen/voxel/sprite/furniture/grotesque6.vox create mode 100644 assets/voxygen/voxel/sprite/furniture/grotesque7.vox diff --git a/assets/common/items/crafting_ing/bone.ron b/assets/common/items/crafting_ing/bone.ron index 31fd51a4f2..7a2567730f 100644 --- a/assets/common/items/crafting_ing/bone.ron +++ b/assets/common/items/crafting_ing/bone.ron @@ -5,4 +5,4 @@ ItemDef( kind: "Bone", ), quality: Common, -) \ No newline at end of file +) diff --git a/assets/common/recipe_book.ron b/assets/common/recipe_book.ron index 5fb252b86b..dac956f633 100644 --- a/assets/common/recipe_book.ron +++ b/assets/common/recipe_book.ron @@ -39,4 +39,5 @@ "adventure hands": (("common.items.armor.hand.leather_adventurer", 1),[("common.items.crafting_ing.leather_scraps", 4)]), "adventure pants": (("common.items.armor.pants.leather_adventurer", 1),[("common.items.crafting_ing.leather_scraps", 8)]), "adventure shoulder": (("common.items.armor.shoulder.leather_adventurer", 1),[("common.items.crafting_ing.leather_scraps", 12)]), + "bone staff": (("common.items.weapons.staff.bone_staff", 1),[("common.items.crafting_ing.twigs", 8),("common.items.crafting_ing.bone", 5),("common.items.crafting_ing.leather_scraps", 1),("common.items.ore.veloritefrag", 6)]), } diff --git a/assets/voxygen/element/icons/item_bone.png b/assets/voxygen/element/icons/item_bone.png new file mode 100644 index 0000000000..0196e1347e --- /dev/null +++ b/assets/voxygen/element/icons/item_bone.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c8ab48051f90b1421496b114a36375542993455d3ca0be8fe0e7dbf490d6aef4 +size 647 diff --git a/assets/voxygen/element/icons/item_bone.png~ b/assets/voxygen/element/icons/item_bone.png~ new file mode 100644 index 0000000000000000000000000000000000000000..b72bb7cf2b31e45ee2499922ff2580699353d9a5 GIT binary patch literal 657 zcmV;C0&e|@P)28SuqT-Ex~FU}f`8A{GrVE-i-x zZv+Y9r;nke?%GqcvvC@Z?+2Pxy&qA%8th$D_P8SxH_T9B?OsfOq&`Amu` z_y2ji#@J}NdoT(uFP`@?0D(RD-Sxbm6VLlS1^+W#Wvl+2FVklj@O};*OVD)(Z7b!hD(jp*!u+N@(JdSt!l3N$T>S(0NoWQ( zlgU>A000SaNLh0L04^f{04^f|c%?sf0002UNklN4u!sc1kFP%&zJ7nt zVDA^hfDN44z4bp#9IB3y5vxixL6AlvDM_&CMtRMu`Dr z5Xg3dHiK;C6BcCn_2V1ZjJI!IfN7xj@H-n>BeEu#OK{qZt`TGtx)-r(CPpL3APmjK zY6NL!Ms^A;E*Y8rg98SeQ<2qUL=`AxiO~pmHq1tl#^+D&5wsCzI}0#*{^#Ik2lGkM r2v1?KI3y*t!PSCn2Vt@_ldA~;wux~PG%T(D00000NkvXXu0mjfL2noy literal 0 HcmV?d00001 diff --git a/assets/voxygen/item_image_manifest.ron b/assets/voxygen/item_image_manifest.ron index 7249245ea2..c1236da822 100644 --- a/assets/voxygen/item_image_manifest.ron +++ b/assets/voxygen/item_image_manifest.ron @@ -1459,6 +1459,9 @@ Ingredient("EmptyVial"): VoxTrans( "voxel.object.potion_empty", (0.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 0.8, + ), + Ingredient("Bone"): Png( + "element.icons.item_bone", ), // Gliders Glider("Starter"): VoxTrans( diff --git a/assets/voxygen/voxel/sprite/bones/femur-1.vox b/assets/voxygen/voxel/sprite/bones/femur-1.vox new file mode 100644 index 0000000000..7f278d76ed --- /dev/null +++ b/assets/voxygen/voxel/sprite/bones/femur-1.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:54e56c7db720f753ae9cb410a397091ee19cd446f129b75299ebaaf27957f2f9 +size 26799 diff --git a/assets/voxygen/voxel/sprite/bones/femur-2.vox b/assets/voxygen/voxel/sprite/bones/femur-2.vox new file mode 100644 index 0000000000..108c0c4a4b --- /dev/null +++ b/assets/voxygen/voxel/sprite/bones/femur-2.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ea5b0a1f8c39fa46be07bb3af44dd08decf8497dd808138b5ab2d229190ad9d4 +size 26839 diff --git a/assets/voxygen/voxel/sprite/bones/femur-3.vox b/assets/voxygen/voxel/sprite/bones/femur-3.vox new file mode 100644 index 0000000000..017ed6fb76 --- /dev/null +++ b/assets/voxygen/voxel/sprite/bones/femur-3.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f0be9d8be64e1c35acbe368e7331d2d9c74325a56b74b544ffedc9b91f16d087 +size 1216 diff --git a/assets/voxygen/voxel/sprite/bones/ribs-1.vox b/assets/voxygen/voxel/sprite/bones/ribs-1.vox new file mode 100644 index 0000000000..d34dde4c8f --- /dev/null +++ b/assets/voxygen/voxel/sprite/bones/ribs-1.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:886cfefada035d1be7440e9de5471caed6103ae34c4b9dd26e2c8f8cd23980b2 +size 1488 diff --git a/assets/voxygen/voxel/sprite/bones/ribs-2.vox b/assets/voxygen/voxel/sprite/bones/ribs-2.vox new file mode 100644 index 0000000000..370c9e9980 --- /dev/null +++ b/assets/voxygen/voxel/sprite/bones/ribs-2.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:40173e68d98cbc79271fd383e90108b2e45331a1f2437b93b433d37d7ab10367 +size 1412 diff --git a/assets/voxygen/voxel/sprite/bones/skull-1.vox b/assets/voxygen/voxel/sprite/bones/skull-1.vox new file mode 100644 index 0000000000..f2c494ee27 --- /dev/null +++ b/assets/voxygen/voxel/sprite/bones/skull-1.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ec68242a5b4dbf50abfd2c8ee26729b1d45f81fbf904edf8625bd06f195c6b4d +size 2712 diff --git a/assets/voxygen/voxel/sprite/bones/skull-2.vox b/assets/voxygen/voxel/sprite/bones/skull-2.vox new file mode 100644 index 0000000000..ad05e7e503 --- /dev/null +++ b/assets/voxygen/voxel/sprite/bones/skull-2.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bd5899aae483bab8f9432886443d4202c4e54472216c4d77ba0343f4dd22ff26 +size 3164 diff --git a/assets/voxygen/voxel/sprite/bones/skull-3.vox b/assets/voxygen/voxel/sprite/bones/skull-3.vox new file mode 100644 index 0000000000..c48ab89c6c --- /dev/null +++ b/assets/voxygen/voxel/sprite/bones/skull-3.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4dd378cd1777a80101bae2e9724cf53445fb0b3aa0f9b9b6f1a95294bbb29efb +size 2904 diff --git a/assets/voxygen/voxel/sprite/bones/spine-1.vox b/assets/voxygen/voxel/sprite/bones/spine-1.vox new file mode 100644 index 0000000000..12d460f1d6 --- /dev/null +++ b/assets/voxygen/voxel/sprite/bones/spine-1.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:eaf912f3653cdcf842523a392f4a41c99a167b200bcbfa64ce88bb2cea7ea57a +size 1200 diff --git a/assets/voxygen/voxel/sprite/bones/spine-2.vox b/assets/voxygen/voxel/sprite/bones/spine-2.vox new file mode 100644 index 0000000000..5d404e4432 --- /dev/null +++ b/assets/voxygen/voxel/sprite/bones/spine-2.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d5a67a514d05e553ecb13198411027de753bc57c3fa1b40c189301f602edbb0b +size 1200 diff --git a/assets/voxygen/voxel/sprite/furniture/grotesque1.vox b/assets/voxygen/voxel/sprite/furniture/grotesque1.vox new file mode 100644 index 0000000000..ca8d075f8f --- /dev/null +++ b/assets/voxygen/voxel/sprite/furniture/grotesque1.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3ec3f400040348604f606bacf65aa42b3964ff308aaad14200aec4b2c73fa932 +size 2276 diff --git a/assets/voxygen/voxel/sprite/furniture/grotesque2.vox b/assets/voxygen/voxel/sprite/furniture/grotesque2.vox new file mode 100644 index 0000000000..c01cdc7245 --- /dev/null +++ b/assets/voxygen/voxel/sprite/furniture/grotesque2.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e74a7b6ccdcbe37ba8b8c9f867f49ee5a4af923431526639836135077fdc9da3 +size 2336 diff --git a/assets/voxygen/voxel/sprite/furniture/grotesque3.vox b/assets/voxygen/voxel/sprite/furniture/grotesque3.vox new file mode 100644 index 0000000000..731a725495 --- /dev/null +++ b/assets/voxygen/voxel/sprite/furniture/grotesque3.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:17bc6bdcc398bdd53f58884b908fd1e9f50775d32fbb0c974d8a4051ed84dd13 +size 28026 diff --git a/assets/voxygen/voxel/sprite/furniture/grotesque4.vox b/assets/voxygen/voxel/sprite/furniture/grotesque4.vox new file mode 100644 index 0000000000..b87d633623 --- /dev/null +++ b/assets/voxygen/voxel/sprite/furniture/grotesque4.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:557376e3cb76a54b2f80e0882ec7d9a3477a76767bf19958448691a95a8efb8f +size 27890 diff --git a/assets/voxygen/voxel/sprite/furniture/grotesque5.vox b/assets/voxygen/voxel/sprite/furniture/grotesque5.vox new file mode 100644 index 0000000000..87f61900c3 --- /dev/null +++ b/assets/voxygen/voxel/sprite/furniture/grotesque5.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c4ac12f71b94c825beb6880b3997b8c079012a52f4511d768fa95e2fcee3d287 +size 2488 diff --git a/assets/voxygen/voxel/sprite/furniture/grotesque6.vox b/assets/voxygen/voxel/sprite/furniture/grotesque6.vox new file mode 100644 index 0000000000..ddfbbbfe7b --- /dev/null +++ b/assets/voxygen/voxel/sprite/furniture/grotesque6.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6b52aaec438b6a68b69a06a867d5ace14841d8bce91541320ec0dc4ce5cb2634 +size 2188 diff --git a/assets/voxygen/voxel/sprite/furniture/grotesque7.vox b/assets/voxygen/voxel/sprite/furniture/grotesque7.vox new file mode 100644 index 0000000000..919aa5495a --- /dev/null +++ b/assets/voxygen/voxel/sprite/furniture/grotesque7.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:36334513361fb5bd570239eb10ed4fb6df17ae9ed649db70abdd857f52610808 +size 2460 diff --git a/assets/voxygen/voxel/sprite_manifest.ron b/assets/voxygen/voxel/sprite_manifest.ron index f1ce3fa57a..c9852c39e1 100644 --- a/assets/voxygen/voxel/sprite_manifest.ron +++ b/assets/voxygen/voxel/sprite_manifest.ron @@ -2023,6 +2023,68 @@ FireBowlGround: Some(( ], wind_sway: 0.0, )), +// Skulls +Skulls: Some(( + variations: [ + ( + model: "voxygen.voxel.sprite.bones.skull-1", + offset: (-5.5, -5.5, 0.0), + lod_axes: (1.0, 1.0, 1.0), + ), + ( + model: "voxygen.voxel.sprite.bones.skull-2", + offset: (-5.5, -5.5, 0.0), + lod_axes: (1.0, 1.0, 1.0), + ), + ( + model: "voxygen.voxel.sprite.bones.skull-3", + offset: (-5.5, -5.5, 0.0), + lod_axes: (1.0, 1.0, 1.0), + ), + ], + wind_sway: 0.0, +)), +// Bones +Bones: Some(( + variations: [ + ( + model: "voxygen.voxel.sprite.bones.spine-1", + offset: (-3.5, -3.5, 0.0), + lod_axes: (1.0, 1.0, 1.0), + ), + ( + model: "voxygen.voxel.sprite.bones.spine-2", + offset: (-3.5, -3.5, 0.0), + lod_axes: (1.0, 1.0, 1.0), + ), + ( + model: "voxygen.voxel.sprite.bones.ribs-1", + offset: (-3.5, -3.5, 0.0), + lod_axes: (1.0, 1.0, 1.0), + ), + ( + model: "voxygen.voxel.sprite.bones.ribs-2", + offset: (-3.5, -3.5, 0.0), + lod_axes: (1.0, 1.0, 1.0), + ), + ( + model: "voxygen.voxel.sprite.bones.femur-1", + offset: (-3.5, -3.5, 0.0), + lod_axes: (1.0, 1.0, 1.0), + ), + ( + model: "voxygen.voxel.sprite.bones.femur-2", + offset: (-3.5, -3.5, 0.0), + lod_axes: (1.0, 1.0, 1.0), + ), + ( + model: "voxygen.voxel.sprite.bones.femur-3", + offset: (-3.5, -3.5, 0.0), + lod_axes: (1.0, 1.0, 1.0), + ), + ], + wind_sway: 0.0, +)), // Underwater Grass GrassBlue: Some(( variations: [ diff --git a/common/src/comp/inventory/item/mod.rs b/common/src/comp/inventory/item/mod.rs index ec232344df..c198116e41 100644 --- a/common/src/comp/inventory/item/mod.rs +++ b/common/src/comp/inventory/item/mod.rs @@ -358,6 +358,7 @@ impl Item { SpriteKind::MediumGrass => "common.items.grasses.medium", SpriteKind::ShortGrass => "common.items.grasses.short", SpriteKind::Coconut => "common.items.food.coconut", + SpriteKind::Bones => "common.items.crafting_ing.bone", SpriteKind::Chest => { chosen = Lottery::::load_expect(match rng.gen_range(0, 7) { 0 => "common.loot_tables.loot_table_weapon_uncommon", diff --git a/common/src/terrain/sprite.rs b/common/src/terrain/sprite.rs index 2f91924b28..b76ecd4332 100644 --- a/common/src/terrain/sprite.rs +++ b/common/src/terrain/sprite.rs @@ -110,6 +110,8 @@ make_case_elim!( Mud = 0x53, FireBowlGround = 0x54, CaveMushroom = 0x55, + Skulls = 0x56, + Bones = 0x57, } ); @@ -129,6 +131,7 @@ impl SpriteKind { SpriteKind::Carrot => 0.18, SpriteKind::Radish => 0.18, SpriteKind::FireBowlGround => 0.55, + SpriteKind::Skulls => 0.65, // TODO: Uncomment this when we have a way to open doors // SpriteKind::Door => 3.0, SpriteKind::Bed => 1.54, @@ -200,6 +203,7 @@ impl SpriteKind { SpriteKind::PotionMinor => true, SpriteKind::ChestBurried => true, SpriteKind::Mud => true, + SpriteKind::Bones => true, _ => false, } } @@ -240,6 +244,7 @@ impl SpriteKind { | SpriteKind::PotionMinor | SpriteKind::VialEmpty | SpriteKind::FireBowlGround + | SpriteKind::Skulls ) } } diff --git a/world/src/site/dungeon/mod.rs b/world/src/site/dungeon/mod.rs index 9f4d550d1d..dfbecc2122 100644 --- a/world/src/site/dungeon/mod.rs +++ b/world/src/site/dungeon/mod.rs @@ -1139,6 +1139,8 @@ impl Floor { 2 => SpriteKind::Velorite, 3..=8 => SpriteKind::Mushroom, 9..=15 => SpriteKind::FireBowlGround, + 16..=19 => SpriteKind::Skulls, + 20..=24 => SpriteKind::Bones, _ => SpriteKind::ShortGrass, }, ),