mirror of
https://gitlab.com/veloren/veloren.git
synced 2024-08-30 18:12:32 +00:00
Merge branch 'swilliams/gems' into 'master'
Adds 6 different gems and removes shiny gem. See merge request veloren/veloren!1729
This commit is contained in:
commit
ad6cdcab71
@ -25,6 +25,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
|
||||
- Added /dropall admin command (drops all inventory items on the ground)
|
||||
- Skill trees
|
||||
- Lactose tolerant golems
|
||||
- 6 different gems. (Topaz, Amethyst, Sapphire, Enerald, Ruby and Diamond)
|
||||
|
||||
### Changed
|
||||
|
||||
@ -37,12 +38,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
|
||||
- Fixed AI behavior so only humanoids will attempt to roll
|
||||
- Footstep SFX is now dependant on distance moved, not time since last play
|
||||
- Adjusted most NPCs hitboxes to better fit their models.
|
||||
- Changed crafting recipes involving shiny gems to use diamonds instead.
|
||||
- Cave scatter now includes all 6 gems.
|
||||
|
||||
### Removed
|
||||
|
||||
- SSAAx4 option
|
||||
- The Stats button and associated screen were removed
|
||||
- Levels
|
||||
- Shiny Gems (replaced with diamonds)
|
||||
|
||||
### Fixed
|
||||
|
||||
|
@ -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),
|
||||
]
|
||||
|
@ -1,8 +0,0 @@
|
||||
ItemDef(
|
||||
name: "Shiny Gem",
|
||||
description: "It's so shiny!",
|
||||
kind: Ingredient(
|
||||
kind: "ShinyGem",
|
||||
),
|
||||
quality: High,
|
||||
)
|
@ -3,6 +3,11 @@
|
||||
(2, "common.items.crafting_ing.leather_scraps"),
|
||||
(4, "common.items.crafting_ing.cloth_scraps"),
|
||||
(1, "common.items.crafting_ing.empty_vial"),
|
||||
(0.10, "common.items.crafting_ing.shiny_gem"),
|
||||
(0.5, "common.items.crafting_ing.amethyst"),
|
||||
(0.5, "common.items.crafting_ing.topaz"),
|
||||
(0.4, "common.items.crafting_ing.sapphire"),
|
||||
(0.35, "common.items.crafting_ing.emerald"),
|
||||
(0.25, "common.items.crafting_ing.ruby"),
|
||||
(0.10, "common.items.crafting_ing.diamond"),
|
||||
|
||||
]
|
||||
|
@ -1,7 +1,7 @@
|
||||
[
|
||||
// Crafting Ingredients
|
||||
(2, "common.items.crafting_ing.empty_vial"),
|
||||
(0.10, "common.items.crafting_ing.shiny_gem"),
|
||||
(0.10, "common.items.crafting_ing.diamond"),
|
||||
(4, "common.items.crafting_ing.cloth_scraps"),
|
||||
// Consumables
|
||||
(0.2, "common.items.consumable.potion_minor"),
|
||||
|
@ -1,6 +1,6 @@
|
||||
[
|
||||
(1, "common.items.crafting_ing.stones"),
|
||||
(0.05, "common.items.crafting_ing.shiny_gem"),
|
||||
(0.05, "common.items.crafting_ing.diamond"),
|
||||
(0.10, "common.items.ore.velorite"),
|
||||
(0.20, "common.items.ore.veloritefrag"),
|
||||
]
|
||||
|
@ -1,6 +1,6 @@
|
||||
[
|
||||
(2, "common.items.crafting_ing.empty_vial"),
|
||||
(0.01, "common.items.crafting_ing.shiny_gem"),
|
||||
(0.01, "common.items.crafting_ing.diamond"),
|
||||
(3, "common.items.crafting_ing.cloth_scraps"),
|
||||
(2, "common.items.crafting_ing.leather_scraps"),
|
||||
// Consumables
|
||||
|
@ -2,7 +2,7 @@
|
||||
// Crafting Ingredients
|
||||
(2, "common.items.crafting_ing.bowl"),
|
||||
(1, "common.items.crafting_ing.empty_vial"),
|
||||
(0.10, "common.items.crafting_ing.shiny_gem"),
|
||||
(0.10, "common.items.crafting_ing.diamond"),
|
||||
(1, "common.items.crafting_ing.cloth_scraps"),
|
||||
// Consumables
|
||||
(0.2, "common.items.consumable.potion_minor"),
|
||||
|
@ -48,7 +48,7 @@
|
||||
("common.items.utility.collar", 1),
|
||||
[
|
||||
("common.items.crafting_ing.leather_scraps", 5),
|
||||
("common.items.crafting_ing.shiny_gem", 1),
|
||||
("common.items.crafting_ing.ruby", 1),
|
||||
],
|
||||
),
|
||||
"bomb_coconut": (
|
||||
@ -160,7 +160,7 @@
|
||||
("common.items.crafting_ing.twigs", 5),
|
||||
("common.items.crafting_ing.leather_scraps", 5),
|
||||
("common.items.crafting_ing.cloth_scraps", 5),
|
||||
("common.items.crafting_ing.shiny_gem", 1),
|
||||
("common.items.crafting_ing.emerald", 1),
|
||||
("common.items.crafting_tools.craftsman_hammer", 0),
|
||||
("common.items.crafting_tools.sewing_set", 0),
|
||||
],
|
||||
@ -172,7 +172,7 @@
|
||||
("common.items.crafting_ing.twigs", 5),
|
||||
("common.items.crafting_ing.leather_scraps", 5),
|
||||
("common.items.crafting_ing.cloth_scraps", 5),
|
||||
("common.items.crafting_ing.shiny_gem", 1),
|
||||
("common.items.crafting_ing.ruby", 1),
|
||||
("common.items.crafting_tools.craftsman_hammer", 0),
|
||||
("common.items.crafting_tools.sewing_set", 0),
|
||||
],
|
||||
@ -185,7 +185,7 @@
|
||||
("common.items.crafting_ing.leather_scraps", 5),
|
||||
("common.items.crafting_ing.cloth_scraps", 5),
|
||||
("common.items.crafting_ing.icy_fang", 1),
|
||||
("common.items.crafting_ing.shiny_gem", 1),
|
||||
("common.items.crafting_ing.ruby", 1),
|
||||
("common.items.crafting_tools.craftsman_hammer", 0),
|
||||
("common.items.crafting_tools.sewing_set", 0),
|
||||
],
|
||||
@ -197,7 +197,7 @@
|
||||
("common.items.crafting_ing.twigs", 15),
|
||||
("common.items.crafting_ing.leather_scraps", 5),
|
||||
("common.items.crafting_ing.cloth_scraps", 5),
|
||||
("common.items.crafting_ing.shiny_gem", 1),
|
||||
("common.items.crafting_ing.ruby", 1),
|
||||
("common.items.crafting_tools.craftsman_hammer", 0),
|
||||
("common.items.crafting_tools.sewing_set", 0),
|
||||
],
|
||||
@ -207,7 +207,7 @@
|
||||
[
|
||||
("common.items.crafting_ing.twigs", 20),
|
||||
("common.items.ore.veloritefrag", 8),
|
||||
("common.items.crafting_ing.shiny_gem", 4),
|
||||
("common.items.crafting_ing.ruby", 4),
|
||||
("common.items.crafting_tools.craftsman_hammer", 0),
|
||||
],
|
||||
),
|
||||
@ -297,7 +297,7 @@
|
||||
"traveler backpack": (
|
||||
("common.items.armor.back.backpack_0", 1),
|
||||
[
|
||||
("common.items.crafting_ing.shiny_gem", 2),
|
||||
("common.items.crafting_ing.diamond", 2),
|
||||
("common.items.crafting_ing.twigs", 2),
|
||||
("common.items.crafting_ing.cloth_scraps", 3),
|
||||
("common.items.crafting_ing.leather_scraps", 3),
|
||||
@ -308,7 +308,7 @@
|
||||
"sturdy red backpack": (
|
||||
("common.items.armor.bag.sturdy_red_backpack", 1),
|
||||
[
|
||||
("common.items.crafting_ing.shiny_gem", 2),
|
||||
("common.items.crafting_ing.diamond", 2),
|
||||
("common.items.crafting_ing.cloth_scraps_red", 3),
|
||||
("common.items.armor.bag.woven_red_bag", 1),
|
||||
("common.items.crafting_tools.sewing_set", 0),
|
||||
@ -319,7 +319,7 @@
|
||||
[
|
||||
("common.items.crafting_ing.leather_troll", 10),
|
||||
("common.items.crafting_ing.leather_scraps", 10),
|
||||
("common.items.crafting_ing.shiny_gem", 1),
|
||||
("common.items.crafting_ing.diamond", 1),
|
||||
("common.items.crafting_tools.sewing_set", 0),
|
||||
],
|
||||
),
|
||||
@ -328,7 +328,7 @@
|
||||
[
|
||||
("common.items.crafting_ing.mindflayer_bag_damaged", 1),
|
||||
("common.items.crafting_ing.leather_scraps", 10),
|
||||
("common.items.crafting_ing.shiny_gem", 4),
|
||||
("common.items.crafting_ing.diamond", 4),
|
||||
("common.items.ore.veloritefrag", 10),
|
||||
("common.items.crafting_tools.sewing_set", 0),
|
||||
],
|
||||
|
@ -491,7 +491,7 @@
|
||||
],
|
||||
threshold: 0.3,
|
||||
),
|
||||
Inventory(CollectedItem("ShinyGem")): (
|
||||
Inventory(CollectedItem("Diamond")): (
|
||||
files: [
|
||||
"voxygen.audio.sfx.weapon.staff_out",
|
||||
],
|
||||
|
@ -1600,9 +1600,6 @@
|
||||
Ingredient("ClothScrapsRed"): Png(
|
||||
"element.icons.item_cloth_red",
|
||||
),
|
||||
Ingredient("ShinyGem"): Png(
|
||||
"element.icons.gem",
|
||||
),
|
||||
Ingredient("MortarPestle"): Png(
|
||||
"element.icons.item_mortarpestlecoco",
|
||||
),
|
||||
@ -1668,4 +1665,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.amethystgem",
|
||||
(0.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 0.7,
|
||||
),
|
||||
Ingredient("Topaz"): VoxTrans(
|
||||
"voxel.sprite.gem.topazgem",
|
||||
(0.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 0.7,
|
||||
),
|
||||
Ingredient("Sapphire"): VoxTrans(
|
||||
"voxel.sprite.gem.sapphiregem",
|
||||
(0.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 0.6,
|
||||
),
|
||||
Ingredient("Emerald"): VoxTrans(
|
||||
"voxel.sprite.gem.emeraldgem",
|
||||
(0.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 0.7,
|
||||
),
|
||||
Ingredient("Ruby"): VoxTrans(
|
||||
"voxel.sprite.gem.rubygem",
|
||||
(0.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 0.7,
|
||||
),
|
||||
Ingredient("Diamond"): VoxTrans(
|
||||
"voxel.sprite.gem.diamondgem",
|
||||
(0.0, 0.0, 0.0), (-55.0, 30.0, 20.0), 0.6,
|
||||
),
|
||||
})
|
||||
|
BIN
assets/voxygen/voxel/sprite/gem/amethyst-0.vox
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/voxel/sprite/gem/amethyst-0.vox
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/voxel/sprite/gem/amethyst_S-0.vox
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/voxel/sprite/gem/amethyst_S-0.vox
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/voxel/sprite/gem/amethystgem.vox
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/voxel/sprite/gem/amethystgem.vox
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/voxel/sprite/gem/diamond-0.vox
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/voxel/sprite/gem/diamond-0.vox
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/voxel/sprite/gem/diamond_S-0.vox
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/voxel/sprite/gem/diamond_S-0.vox
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/voxel/sprite/gem/diamondgem.vox
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/voxel/sprite/gem/diamondgem.vox
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/voxel/sprite/gem/emerald-0.vox
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/voxel/sprite/gem/emerald-0.vox
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/voxel/sprite/gem/emerald_S-0.vox
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/voxel/sprite/gem/emerald_S-0.vox
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/voxel/sprite/gem/emeraldgem.vox
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/voxel/sprite/gem/emeraldgem.vox
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/voxel/sprite/gem/ruby-0.vox
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/voxel/sprite/gem/ruby-0.vox
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/voxel/sprite/gem/ruby_S-0.vox
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/voxel/sprite/gem/ruby_S-0.vox
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/voxel/sprite/gem/rubygem.vox
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/voxel/sprite/gem/rubygem.vox
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/voxel/sprite/gem/sapphire-0.vox
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/voxel/sprite/gem/sapphire-0.vox
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/voxel/sprite/gem/sapphire_S-0.vox
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/voxel/sprite/gem/sapphire_S-0.vox
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/voxel/sprite/gem/sapphiregem.vox
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/voxel/sprite/gem/sapphiregem.vox
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/voxel/sprite/gem/topaz-0.vox
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/voxel/sprite/gem/topaz-0.vox
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/voxel/sprite/gem/topaz_S-0.vox
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/voxel/sprite/gem/topaz_S-0.vox
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/voxel/sprite/gem/topazgem.vox
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/voxel/sprite/gem/topazgem.vox
(Stored with Git LFS)
Normal file
Binary file not shown.
@ -1988,28 +1988,6 @@ Twigs: Some((
|
||||
wind_sway: 0.0,
|
||||
)),
|
||||
|
||||
// Shiny Gems
|
||||
ShinyGem: Some((
|
||||
variations: [
|
||||
(
|
||||
model: "voxygen.voxel.sprite.gem.gem_blue",
|
||||
offset: (-2.0, -3.0, 0.0),
|
||||
lod_axes: (1.0, 1.0, 1.0),
|
||||
),
|
||||
(
|
||||
model: "voxygen.voxel.sprite.gem.gem_green",
|
||||
offset: (-2.0, -3.0, 0.0),
|
||||
lod_axes: (1.0, 1.0, 1.0),
|
||||
),
|
||||
(
|
||||
model: "voxygen.voxel.sprite.gem.gem_red",
|
||||
offset: (-3.0, -2.0, -2.0),
|
||||
lod_axes: (1.0, 1.0, 1.0),
|
||||
),
|
||||
],
|
||||
wind_sway: 0.0,
|
||||
)),
|
||||
|
||||
// Drop Gate Parts
|
||||
DropGate: Some((
|
||||
variations: [
|
||||
@ -2224,4 +2202,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,
|
||||
)),
|
||||
)
|
||||
|
@ -535,10 +535,21 @@ impl Item {
|
||||
SpriteKind::Beehive => "common.items.crafting_ing.honey",
|
||||
SpriteKind::Stones => "common.items.crafting_ing.stones",
|
||||
SpriteKind::Twigs => "common.items.crafting_ing.twigs",
|
||||
SpriteKind::ShinyGem => "common.items.crafting_ing.shiny_gem",
|
||||
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,
|
||||
}))
|
||||
}
|
||||
|
@ -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,
|
||||
}
|
||||
}
|
||||
|
@ -96,25 +96,36 @@ make_case_elim!(
|
||||
Pot = 0x45,
|
||||
Stones = 0x46,
|
||||
Twigs = 0x47,
|
||||
ShinyGem = 0x48,
|
||||
DropGate = 0x49,
|
||||
DropGateBottom = 0x4A,
|
||||
GrassSnow = 0x4B,
|
||||
Reed = 0x4C,
|
||||
Beehive = 0x4D,
|
||||
LargeCactus = 0x4E,
|
||||
VialEmpty = 0x4F,
|
||||
PotionMinor = 0x50,
|
||||
GrassBlue = 0x51,
|
||||
ChestBurried = 0x52,
|
||||
Mud = 0x53,
|
||||
FireBowlGround = 0x54,
|
||||
CaveMushroom = 0x55,
|
||||
Bowl = 0x56,
|
||||
SavannaGrass = 0x57,
|
||||
TallSavannaGrass = 0x58,
|
||||
RedSavannaGrass = 0x59,
|
||||
SavannaBush = 0x5A,
|
||||
DropGate = 0x48,
|
||||
DropGateBottom = 0x49,
|
||||
GrassSnow = 0x4A,
|
||||
Reed = 0x4B,
|
||||
Beehive = 0x4C,
|
||||
LargeCactus = 0x4D,
|
||||
VialEmpty = 0x4E,
|
||||
PotionMinor = 0x4F,
|
||||
GrassBlue = 0x50,
|
||||
ChestBurried = 0x51,
|
||||
Mud = 0x52,
|
||||
FireBowlGround = 0x53,
|
||||
CaveMushroom = 0x54,
|
||||
Bowl = 0x55,
|
||||
SavannaGrass = 0x56,
|
||||
TallSavannaGrass = 0x57,
|
||||
RedSavannaGrass = 0x58,
|
||||
SavannaBush = 0x59,
|
||||
Amethyst = 0x5A,
|
||||
Ruby = 0x5B,
|
||||
Sapphire = 0x5C,
|
||||
Emerald = 0x5D,
|
||||
Topaz = 0x5E,
|
||||
Diamond = 0x5F,
|
||||
AmethystSmall = 0x60,
|
||||
TopazSmall = 0x61,
|
||||
DiamondSmall = 0x62,
|
||||
RubySmall = 0x63,
|
||||
EmeraldSmall = 0x64,
|
||||
SapphireSmall = 0x65,
|
||||
}
|
||||
);
|
||||
|
||||
@ -198,7 +209,6 @@ impl SpriteKind {
|
||||
SpriteKind::Coconut => true,
|
||||
SpriteKind::Stones => true,
|
||||
SpriteKind::Twigs => true,
|
||||
SpriteKind::ShinyGem => true,
|
||||
SpriteKind::Crate => true,
|
||||
SpriteKind::Beehive => true,
|
||||
SpriteKind::VialEmpty => true,
|
||||
@ -206,6 +216,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,
|
||||
}
|
||||
}
|
||||
|
@ -0,0 +1,2 @@
|
||||
UPDATE item
|
||||
SET item_definition_id = 'common.items.weapons.crafting.shiny_gem' WHERE item_definition_id = 'common.items.crafting_ing.diamond';
|
@ -0,0 +1,2 @@
|
||||
UPDATE item
|
||||
SET item_definition_id = 'common.items.crafting_ing.diamond' WHERE item_definition_id = 'common.items.crafting_ing.shiny_gem';
|
@ -192,7 +192,7 @@ impl From<&InventoryUpdateEvent> for SfxEvent {
|
||||
SfxEvent::Inventory(SfxInventoryEvent::CollectedTool(tool.kind))
|
||||
},
|
||||
ItemKind::Ingredient { kind } => match &kind[..] {
|
||||
"ShinyGem" => {
|
||||
"Diamond" => {
|
||||
SfxEvent::Inventory(SfxInventoryEvent::CollectedItem(kind.clone()))
|
||||
},
|
||||
_ => SfxEvent::Inventory(SfxInventoryEvent::Collected),
|
||||
|
Loading…
Reference in New Issue
Block a user