From 32bbdffc3893836583bb2747d5b6cd15911a84d2 Mon Sep 17 00:00:00 2001 From: Scott Williams Date: Sun, 24 Jan 2021 14:00:49 +0000 Subject: [PATCH] Added 6 gems, removed shiny gem from cave, replaced with diamond. --- assets/common/cave_scatter.ron | 7 +- assets/voxygen/item_image_manifest.ron | 25 ++++ .../voxygen/voxel/sprite/gem/amethyst-0.vox | 3 + .../voxygen/voxel/sprite/gem/amethyst_S-0.vox | 3 + assets/voxygen/voxel/sprite/gem/diamond-0.vox | 3 + .../voxygen/voxel/sprite/gem/diamond_S-0.vox | 3 + assets/voxygen/voxel/sprite/gem/emerald-0.vox | 3 + .../voxygen/voxel/sprite/gem/emerald_S-0.vox | 3 + assets/voxygen/voxel/sprite/gem/ruby-0.vox | 3 + assets/voxygen/voxel/sprite/gem/ruby_S-0.vox | 3 + .../voxygen/voxel/sprite/gem/sapphire-0.vox | 3 + .../voxygen/voxel/sprite/gem/sapphire_S-0.vox | 3 + assets/voxygen/voxel/sprite/gem/topaz-0.vox | 3 + assets/voxygen/voxel/sprite/gem/topaz_S-0.vox | 3 + assets/voxygen/voxel/sprite_manifest.ron | 132 ++++++++++++++++++ common/src/comp/inventory/item/mod.rs | 12 ++ common/src/terrain/block.rs | 12 ++ common/src/terrain/sprite.rs | 24 ++++ 18 files changed, 247 insertions(+), 1 deletion(-) create mode 100644 assets/voxygen/voxel/sprite/gem/amethyst-0.vox create mode 100644 assets/voxygen/voxel/sprite/gem/amethyst_S-0.vox create mode 100644 assets/voxygen/voxel/sprite/gem/diamond-0.vox create mode 100644 assets/voxygen/voxel/sprite/gem/diamond_S-0.vox create mode 100644 assets/voxygen/voxel/sprite/gem/emerald-0.vox create mode 100644 assets/voxygen/voxel/sprite/gem/emerald_S-0.vox create mode 100644 assets/voxygen/voxel/sprite/gem/ruby-0.vox create mode 100644 assets/voxygen/voxel/sprite/gem/ruby_S-0.vox create mode 100644 assets/voxygen/voxel/sprite/gem/sapphire-0.vox create mode 100644 assets/voxygen/voxel/sprite/gem/sapphire_S-0.vox create mode 100644 assets/voxygen/voxel/sprite/gem/topaz-0.vox create mode 100644 assets/voxygen/voxel/sprite/gem/topaz_S-0.vox diff --git a/assets/common/cave_scatter.ron b/assets/common/cave_scatter.ron index 13e3ccf291..2176f1d68d 100644 --- a/assets/common/cave_scatter.ron +++ b/assets/common/cave_scatter.ron @@ -4,7 +4,12 @@ (110, Stones), (150, ShortGrass), (120, CaveMushroom), - (4, ShinyGem), + (30, AmethystSmall), + (30, TopazSmall), + (16, SapphireSmall), + (12, EmeraldSmall), + (8, RubySmall), + (4, DiamondSmall), (5, Chest), (15, Crate), ] diff --git a/assets/voxygen/item_image_manifest.ron b/assets/voxygen/item_image_manifest.ron index 5d91be5503..7459a9b640 100644 --- a/assets/voxygen/item_image_manifest.ron +++ b/assets/voxygen/item_image_manifest.ron @@ -1668,4 +1668,29 @@ "voxel.weapon.tool.broom_belzeshrub_purple", (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.1, ), + // Gems + Ingredient("Amethyst"): VoxTrans( + "voxel.sprite.gem.amethyst-0", + (0.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 0.8, + ), + Ingredient("Topaz"): VoxTrans( + "voxel.sprite.gem.topaz-0", + (0.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 0.7, + ), + Ingredient("Sapphire"): VoxTrans( + "voxel.sprite.gem.sapphire-0", + (0.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 0.8, + ), + Ingredient("Emerald"): VoxTrans( + "voxel.sprite.gem.emerald-0", + (0.0, 0.0, 0.0), (-120.0, -160.0, 20.0), 0.8, + ), + Ingredient("Ruby"): VoxTrans( + "voxel.sprite.gem.ruby-0", + (0.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 0.8, + ), + Ingredient("Diamond"): VoxTrans( + "voxel.sprite.gem.diamond-0", + (0.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 0.8, + ), }) diff --git a/assets/voxygen/voxel/sprite/gem/amethyst-0.vox b/assets/voxygen/voxel/sprite/gem/amethyst-0.vox new file mode 100644 index 0000000000..0f67625298 --- /dev/null +++ b/assets/voxygen/voxel/sprite/gem/amethyst-0.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a71e251d0a56d6bbb99100474c57688e53c689f94450c0952162c11a77419185 +size 29597 diff --git a/assets/voxygen/voxel/sprite/gem/amethyst_S-0.vox b/assets/voxygen/voxel/sprite/gem/amethyst_S-0.vox new file mode 100644 index 0000000000..cd9a33e252 --- /dev/null +++ b/assets/voxygen/voxel/sprite/gem/amethyst_S-0.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:857d4afef91541ab2db61f5b6dee72367aaacf93c8e4b45af1ff4177e2cfa286 +size 27456 diff --git a/assets/voxygen/voxel/sprite/gem/diamond-0.vox b/assets/voxygen/voxel/sprite/gem/diamond-0.vox new file mode 100644 index 0000000000..d98ebe8253 --- /dev/null +++ b/assets/voxygen/voxel/sprite/gem/diamond-0.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4ed3aeb3318ba029cf461ca2638617b9378f9bfad4f720dda263861e1fa566e8 +size 28300 diff --git a/assets/voxygen/voxel/sprite/gem/diamond_S-0.vox b/assets/voxygen/voxel/sprite/gem/diamond_S-0.vox new file mode 100644 index 0000000000..b61eeb216d --- /dev/null +++ b/assets/voxygen/voxel/sprite/gem/diamond_S-0.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cd44a2050af332dbe5b0e27edee8c39b49639e716ddd2d47ca86e48e6f9af49f +size 27277 diff --git a/assets/voxygen/voxel/sprite/gem/emerald-0.vox b/assets/voxygen/voxel/sprite/gem/emerald-0.vox new file mode 100644 index 0000000000..cda25112b6 --- /dev/null +++ b/assets/voxygen/voxel/sprite/gem/emerald-0.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7949ddbef6bf8c5a3c33e17e811be07fdd137e356121ba976cf37abe623ff34e +size 28213 diff --git a/assets/voxygen/voxel/sprite/gem/emerald_S-0.vox b/assets/voxygen/voxel/sprite/gem/emerald_S-0.vox new file mode 100644 index 0000000000..003fba3b86 --- /dev/null +++ b/assets/voxygen/voxel/sprite/gem/emerald_S-0.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4762ddae846b11c23d873aaf339407edfbe8daf7dca85537a4d07c4f397f0b53 +size 27257 diff --git a/assets/voxygen/voxel/sprite/gem/ruby-0.vox b/assets/voxygen/voxel/sprite/gem/ruby-0.vox new file mode 100644 index 0000000000..90c81a4804 --- /dev/null +++ b/assets/voxygen/voxel/sprite/gem/ruby-0.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b60b78fa0bc3f58db4a4e72e57383dae8985946a3b6ceb8fd9e9dc9c8c78c18b +size 28065 diff --git a/assets/voxygen/voxel/sprite/gem/ruby_S-0.vox b/assets/voxygen/voxel/sprite/gem/ruby_S-0.vox new file mode 100644 index 0000000000..50864f2517 --- /dev/null +++ b/assets/voxygen/voxel/sprite/gem/ruby_S-0.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fa87a0a75f40094c2745292a8e112a4dc228dd3849dc82e0379732161b916d3f +size 27289 diff --git a/assets/voxygen/voxel/sprite/gem/sapphire-0.vox b/assets/voxygen/voxel/sprite/gem/sapphire-0.vox new file mode 100644 index 0000000000..ac4fb43f67 --- /dev/null +++ b/assets/voxygen/voxel/sprite/gem/sapphire-0.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:36f60807a7efb02bf01f9a2736759c6c9a97e6500c9e998cbfe0f2300620e4cd +size 28249 diff --git a/assets/voxygen/voxel/sprite/gem/sapphire_S-0.vox b/assets/voxygen/voxel/sprite/gem/sapphire_S-0.vox new file mode 100644 index 0000000000..79cd5cd0bf --- /dev/null +++ b/assets/voxygen/voxel/sprite/gem/sapphire_S-0.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0075c7315a6ed4008f2ce3c629719183c95a34f48550f2746615d52328e07e66 +size 27293 diff --git a/assets/voxygen/voxel/sprite/gem/topaz-0.vox b/assets/voxygen/voxel/sprite/gem/topaz-0.vox new file mode 100644 index 0000000000..07fcd89129 --- /dev/null +++ b/assets/voxygen/voxel/sprite/gem/topaz-0.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bc49de3d05cb7a3f868c05c2a8bc49401f19cbbf805b515efaf37ca0f5e389d1 +size 29142 diff --git a/assets/voxygen/voxel/sprite/gem/topaz_S-0.vox b/assets/voxygen/voxel/sprite/gem/topaz_S-0.vox new file mode 100644 index 0000000000..b57cdc3bc8 --- /dev/null +++ b/assets/voxygen/voxel/sprite/gem/topaz_S-0.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c2729c2360308a270f6cabd44146a445543998a60419c9221334642e74095bc8 +size 27352 diff --git a/assets/voxygen/voxel/sprite_manifest.ron b/assets/voxygen/voxel/sprite_manifest.ron index 18eac918a5..29079d3264 100644 --- a/assets/voxygen/voxel/sprite_manifest.ron +++ b/assets/voxygen/voxel/sprite_manifest.ron @@ -2224,4 +2224,136 @@ Mud: Some(( ], wind_sway: 0.0, )), +// Amethyst Ore +Amethyst: Some(( + variations: [ + ( + model: "voxygen.voxel.sprite.gem.amethyst-0", + offset: (-5.5, -5.5, 0.0), + lod_axes: (0.0, 0.0, 0.0), + ), + ], + wind_sway: 0.0, +)), +// Ruby Ore +Ruby: Some(( + variations: [ + ( + model: "voxygen.voxel.sprite.gem.ruby-0", + offset: (-5.5, -5.5, 0.0), + lod_axes: (0.0, 0.0, 0.0), + ), + ], + wind_sway: 0.0, +)), +// Diamond Ore +Diamond: Some(( + variations: [ + ( + model: "voxygen.voxel.sprite.gem.diamond-0", + offset: (-5.5, -5.5, 0.0), + lod_axes: (0.0, 0.0, 0.0), + ), + ], + wind_sway: 0.0, +)), +// Sapphire Ore +Sapphire: Some(( + variations: [ + ( + model: "voxygen.voxel.sprite.gem.sapphire-0", + offset: (-5.5, -5.5, 0.0), + lod_axes: (0.0, 0.0, 0.0), + ), + ], + wind_sway: 0.0, +)), +// Emerald Ore +Emerald: Some(( + variations: [ + ( + model: "voxygen.voxel.sprite.gem.emerald-0", + offset: (-5.5, -5.5, 0.0), + lod_axes: (0.0, 0.0, 0.0), + ), + ], + wind_sway: 0.0, +)), +// Topaz Ore +Topaz: Some(( + variations: [ + ( + model: "voxygen.voxel.sprite.gem.topaz-0", + offset: (-5.5, -5.5, 0.0), + lod_axes: (0.0, 0.0, 0.0), + ), + ], + wind_sway: 0.0, +)), +// Small Amethyst Ore +AmethystSmall: Some(( + variations: [ + ( + model: "voxygen.voxel.sprite.gem.amethyst_S-0", + offset: (-3.5, -3.5, 0.0), + lod_axes: (0.0, 0.0, 0.0), + ), + ], + wind_sway: 0.0, +)), +// Small Topaz Ore +TopazSmall: Some(( + variations: [ + ( + model: "voxygen.voxel.sprite.gem.topaz_S-0", + offset: (-3.5, -3.5, 0.0), + lod_axes: (0.0, 0.0, 0.0), + ), + ], + wind_sway: 0.0, +)), +// Small Ruby Ore +RubySmall: Some(( + variations: [ + ( + model: "voxygen.voxel.sprite.gem.ruby_S-0", + offset: (-3.5, -3.5, 0.0), + lod_axes: (0.0, 0.0, 0.0), + ), + ], + wind_sway: 0.0, +)), +// Small Emerald Ore +EmeraldSmall: Some(( + variations: [ + ( + model: "voxygen.voxel.sprite.gem.emerald_S-0", + offset: (-5.5, -5.5, 0.0), + lod_axes: (0.0, 0.0, 0.0), + ), + ], + wind_sway: 0.0, +)), +// Small Diamond Ore +DiamondSmall: Some(( + variations: [ + ( + model: "voxygen.voxel.sprite.gem.diamond_S-0", + offset: (-3.5, -3.5, 0.0), + lod_axes: (0.0, 0.0, 0.0), + ), + ], + wind_sway: 0.0, +)), +// Small Sapphire Ore +SapphireSmall: Some(( + variations: [ + ( + model: "voxygen.voxel.sprite.gem.sapphire_S-0", + offset: (-3.5, -3.5, 0.0), + lod_axes: (0.0, 0.0, 0.0), + ), + ], + wind_sway: 0.0, +)), ) diff --git a/common/src/comp/inventory/item/mod.rs b/common/src/comp/inventory/item/mod.rs index f8ef9636fc..36bc0b2de5 100644 --- a/common/src/comp/inventory/item/mod.rs +++ b/common/src/comp/inventory/item/mod.rs @@ -539,6 +539,18 @@ impl Item { SpriteKind::VialEmpty => "common.items.crafting_ing.empty_vial", SpriteKind::Bowl => "common.items.crafting_ing.bowl", SpriteKind::PotionMinor => "common.items.consumable.potion_minor", + SpriteKind::Amethyst => "common.items.crafting_ing.amethyst", + SpriteKind::Ruby => "common.items.crafting_ing.ruby", + SpriteKind::Diamond => "common.items.crafting_ing.diamond", + SpriteKind::Sapphire => "common.items.crafting_ing.sapphire", + SpriteKind::Topaz => "common.items.crafting_ing.topaz", + SpriteKind::Emerald => "common.items.crafting_ing.emerald", + SpriteKind::AmethystSmall => "common.items.crafting_ing.amethyst", + SpriteKind::TopazSmall => "common.items.crafting_ing.topaz", + SpriteKind::DiamondSmall => "common.items.crafting_ing.diamond", + SpriteKind::RubySmall => "common.items.crafting_ing.ruby", + SpriteKind::EmeraldSmall => "common.items.crafting_ing.emerald", + SpriteKind::SapphireSmall => "common.items.crafting_ing.sapphire", _ => return None, })) } diff --git a/common/src/terrain/block.rs b/common/src/terrain/block.rs index 804765da2b..5b2fd5e78d 100644 --- a/common/src/terrain/block.rs +++ b/common/src/terrain/block.rs @@ -175,6 +175,18 @@ impl Block { SpriteKind::FireBowlGround => Some(16), SpriteKind::Velorite | SpriteKind::VeloriteFrag => Some(6), SpriteKind::CaveMushroom => Some(12), + SpriteKind::Amethyst + | SpriteKind::Ruby + | SpriteKind::Sapphire + | SpriteKind::Diamond + | SpriteKind::Emerald + | SpriteKind::Topaz + | SpriteKind::AmethystSmall + | SpriteKind::TopazSmall + | SpriteKind::DiamondSmall + | SpriteKind::RubySmall + | SpriteKind::EmeraldSmall + | SpriteKind::SapphireSmall => Some(3), _ => None, } } diff --git a/common/src/terrain/sprite.rs b/common/src/terrain/sprite.rs index 57610f0557..d524b61365 100644 --- a/common/src/terrain/sprite.rs +++ b/common/src/terrain/sprite.rs @@ -115,6 +115,18 @@ make_case_elim!( TallSavannaGrass = 0x58, RedSavannaGrass = 0x59, SavannaBush = 0x5A, + Amethyst = 0x5B, + Ruby = 0x5C, + Sapphire = 0x5D, + Emerald = 0x5E, + Topaz = 0x5F, + Diamond = 0x60, + AmethystSmall = 0x61, + TopazSmall = 0x62, + DiamondSmall = 0x63, + RubySmall = 0x64, + EmeraldSmall = 0x65, + SapphireSmall = 0x66, } ); @@ -206,6 +218,18 @@ impl SpriteKind { SpriteKind::Bowl => true, SpriteKind::ChestBurried => true, SpriteKind::Mud => true, + SpriteKind::Amethyst => true, + SpriteKind::Ruby => true, + SpriteKind::Diamond => true, + SpriteKind::Sapphire => true, + SpriteKind::Emerald => true, + SpriteKind::Topaz => true, + SpriteKind::AmethystSmall => true, + SpriteKind::TopazSmall => true, + SpriteKind::DiamondSmall => true, + SpriteKind::RubySmall => true, + SpriteKind::EmeraldSmall => true, + SpriteKind::SapphireSmall => true, _ => false, } }