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

Chest sprite interact kind changed to only check that sprite is a container rather than matching on every 'chest-like' sprite.

Browse Source
This commit is contained in:
Sam 2021-08-31 13:57:17 -04:00
parent 5dbc05730d
commit 156820cd5c
2 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
common/src/states/sprite_interact.rs
View File

@ -150,16 +150,11 @@ impl From<SpriteKind> for Option<SpriteInteractKind> {
| SpriteKind::Bowl | SpriteKind::Bowl
| SpriteKind::PotionMinor | SpriteKind::PotionMinor
| SpriteKind::Seashells => Some(SpriteInteractKind::Collectible), | SpriteKind::Seashells => Some(SpriteInteractKind::Collectible),
SpriteKind::DungeonChest0 // Collectible checked in addition to container for case that sprite requires a tool to
| SpriteKind::DungeonChest1 // collect and cannot be collected by hand, yet still meets the container check
| SpriteKind::DungeonChest2 _ if sprite_kind.is_container() && sprite_kind.is_collectible() => {
| SpriteKind::DungeonChest3 Some(SpriteInteractKind::Chest)
| SpriteKind::DungeonChest4 },
| SpriteKind::DungeonChest5
| SpriteKind::Chest
| SpriteKind::ChestBuried
| SpriteKind::Mud
| SpriteKind::Crate => Some(SpriteInteractKind::Chest),
_ if sprite_kind.is_collectible() => Some(SpriteInteractKind::Fallback), _ if sprite_kind.is_collectible() => Some(SpriteInteractKind::Fallback),
_ => None, _ => None,
} }

4
server/src/events/mod.rs
View File

@ -7,8 +7,8 @@ use entity_creation::{
}; };
use entity_manipulation::{ use entity_manipulation::{
handle_aura, handle_bonk, handle_buff, handle_combo_change, handle_damage, handle_delete, handle_aura, handle_bonk, handle_buff, handle_combo_change, handle_damage, handle_delete,
handle_destroy, handle_energy_change, handle_entity_attacked_hook, handle_explosion, handle_knockback, handle_destroy, handle_energy_change, handle_entity_attacked_hook, handle_explosion,
handle_land_on_ground, handle_poise, handle_respawn, handle_teleport_to, handle_knockback, handle_land_on_ground, handle_poise, handle_respawn, handle_teleport_to,
}; };
use group_manip::handle_group; use group_manip::handle_group;
use information::handle_site_info; use information::handle_site_info;