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

Fix items not dropping when no exp is given.

Browse Source
This commit is contained in:
Isse 2023-04-25 11:33:44 +02:00
parent 4d79c89a0c
commit 3d3a6eab2b
1 changed files with 29 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
server/src/events/entity_manipulation.rs
View File

@ -452,8 +452,7 @@ pub fn handle_destroy(server: &mut Server, entity: EcsEntity, last_change: Healt
.get(entity) .get(entity)
.and_then(|body| { .and_then(|body| {
// Only humanoids are awarded loot ownership - if the winner // Only humanoids are awarded loot ownership - if the winner
// was a // was a non-humanoid NPC the loot will be free-for-all
// non-humanoid NPC the loot will be free-for-all
if matches!(body, Body::Humanoid(_)) { if matches!(body, Body::Humanoid(_)) {
Some(state.ecs().read_storage::<Uid>().get(entity).cloned()) Some(state.ecs().read_storage::<Uid>().get(entity).cloned())
} else { } else {
@ -469,11 +468,34 @@ pub fn handle_destroy(server: &mut Server, entity: EcsEntity, last_change: Healt
} }
} }
if !item_receivers.is_empty() { let mut item_offset_spiral =
Spiral2d::new().map(|offset| offset.as_::<f32>() * 0.5);
let mut spawn_item = |item, loot_owner| {
let offset = item_offset_spiral.next().unwrap_or_default();
let item_drop_entity = state
.create_item_drop(Pos(pos.0 + Vec3::unit_z() * 0.25 + offset), item)
.maybe_with(vel)
.build();
if let Some(loot_owner) = loot_owner {
debug!("Assigned UID {loot_owner:?} as the winner for the loot drop");
if let Err(err) = state
.ecs()
.write_storage::<LootOwner>()
.insert(item_drop_entity, LootOwner::new(loot_owner))
{
error!("Failed to set loot owner on item drop: {err}");
};
}
};
let msm = &MaterialStatManifest::load().read(); let msm = &MaterialStatManifest::load().read();
let ability_map = &AbilityMap::load().read(); let ability_map = &AbilityMap::load().read();
let mut item_offset_spiral = Spiral2d::new(); if item_receivers.is_empty() {
for item in flatten_counted_items(&items, ability_map, msm) {
spawn_item(item, None)
}
} else {
let mut rng = rand::thread_rng(); let mut rng = rand::thread_rng();
distribute_many( distribute_many(
item_receivers item_receivers
@ -484,30 +506,7 @@ pub fn handle_destroy(server: &mut Server, entity: EcsEntity, last_change: Healt
|(amount, _)| *amount, |(amount, _)| *amount,
|(_, item), loot_owner, count| { |(_, item), loot_owner, count| {
for item in item.stacked_duplicates(ability_map, msm, count) { for item in item.stacked_duplicates(ability_map, msm, count) {
let offset = item_offset_spiral spawn_item(item, loot_owner)
.next()
.map(|offset| offset.as_::<f32>() * 0.25)
.unwrap_or_default();
let item_drop_entity = state
.create_item_drop(
Pos(pos.0 + Vec3::unit_z() * 0.25 + offset),
item,
)
.maybe_with(vel)
.build();
if let Some(loot_owner) = loot_owner {
debug!(
"Assigned UID {loot_owner:?} as the winner for the loot \
drop"
);
if let Err(err) = state
.ecs()
.write_storage::<LootOwner>()
.insert(item_drop_entity, LootOwner::new(loot_owner))
{
error!("Failed to set loot owner on item drop: {err}");
};
}
} }
}, },
); );