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

addressed review comments and added hud interaction

Browse Source
This commit is contained in:
Maxicarlos08 2023-07-30 14:50:16 +02:00
parent 26ada89bb9
commit ac68f0af7b
No known key found for this signature in database
5 changed files with 68 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
assets/voxygen/i18n/en/hud/misc.ftl
View File

@ -58,3 +58,4 @@ hud-follow = Follow
hud-stay= Stay
hud-sit = Sit
hud-steer = Steer
hud-portal = Portal

7
common/src/comp/body.rs
View File

@ -261,6 +261,13 @@ impl Body {
pub fn is_campfire(&self) -> bool { matches!(self, Body::Object(object::Body::CampfireLit)) }
pub fn is_portal(&self) -> bool {
matches!(
self,
Body::Object(object::Body::Portal | object::Body::PortalActive)
)
}
pub fn bleeds(&self) -> bool {
!matches!(
self,

91
server/src/sys/teleporter.rs
View File

@ -1,11 +1,11 @@
use common::{
comp::{object, Agent, Body, CharacterState, Player, Pos, Teleporter, Teleporting},
comp::{object, Agent, Body, CharacterState, Pos, Teleporter, Teleporting},
event::{EventBus, ServerEvent},
resources::Time,
CachedSpatialGrid,
};
use common_ecs::{Origin, Phase, System};
use specs::{storage::StorageEntry, Entities, Join, Read, ReadStorage, WriteStorage};
use specs::{Entities, Entity, Join, Read, ReadStorage, WriteStorage};
use vek::Vec3;
const TELEPORT_RADIUS: f32 = 3.;
@ -22,7 +22,6 @@ impl<'a> System<'a> for Sys {
type SystemData = (
Entities<'a>,
ReadStorage<'a, Pos>,
ReadStorage<'a, Player>,
ReadStorage<'a, Teleporter>,
ReadStorage<'a, Agent>,
WriteStorage<'a, Teleporting>,
@ -42,7 +41,6 @@ impl<'a> System<'a> for Sys {
(
entities,
positions,
players,
teleporters,
agent,
mut teleporting,
@ -66,6 +64,8 @@ impl<'a> System<'a> for Sys {
})
};
let mut teleporting_updates = Vec::new();
for (portal_entity, teleporter_pos, body, teleporter) in
(&entities, &positions, &bodies, &teleporters).join()
{
@ -75,42 +75,38 @@ impl<'a> System<'a> for Sys {
let mut is_active = false;
let mut player_data = (
&entities,
&positions,
&players,
&character_states,
teleporting.entries(),
)
.join();
for (entity, pos, _, character_state, teleporting) in
for (entity, pos, character_state, teleporting) in
nearby_entities.filter_map(|entity| {
player_data
(
&entities,
&positions,
&character_states,
teleporting.maybe(),
)
.join()
.get(entity, &entities)
.filter(|(_, player_pos, _, _, _)| {
in_portal_range(player_pos.0, teleporter_pos.0)
})
.filter(|(_, pos, _, _)| in_portal_range(pos.0, teleporter_pos.0))
})
{
if !matches!(
character_state,
CharacterState::Idle(_) | CharacterState::Wielding(_)
) || (teleporter.requires_no_aggro && check_aggro(entity, pos.0))
if !matches!(character_state, CharacterState::Sit)
|| (teleporter.requires_no_aggro && check_aggro(entity, pos.0))
{
if let StorageEntry::Occupied(entry) = teleporting {
entry.remove();
if teleporting.is_some() {
teleporting_updates.push((entity, None));
};
continue;
}
if let StorageEntry::Vacant(entry) = teleporting {
entry.insert(Teleporting {
teleport_start: *time,
portal: portal_entity,
end_time: Time(time.0 + teleporter.buildup_time.0),
});
if teleporting.is_none() {
teleporting_updates.push((
entity,
Some(Teleporting {
teleport_start: *time,
portal: portal_entity,
end_time: Time(time.0 + teleporter.buildup_time.0),
}),
));
}
is_active = true;
@ -128,27 +124,42 @@ impl<'a> System<'a> for Sys {
}
}
for (entity, position, _, teleporting_entry) in
(&entities, &positions, &players, teleporting.entries()).join()
{
let StorageEntry::Occupied(teleporting) = teleporting_entry else { continue };
let portal_pos = positions.get(teleporting.get().portal);
let Some(teleporter) = teleporters.get(teleporting.get().portal) else {
teleporting.remove();
update_teleporting(&mut teleporting_updates, &mut teleporting);
for (entity, position, teleporting) in (&entities, &positions, &teleporting).join() {
let mut remove = || teleporting_updates.push((entity, None));
let portal_pos = positions.get(teleporting.portal);
let Some(teleporter) = teleporters.get(teleporting.portal) else {
remove();
continue
};
if portal_pos.map_or(true, |portal_pos| {
!in_portal_range(position.0, portal_pos.0)
}) {
teleporting.remove();
} else if teleporting.get().end_time.0 <= time.0 {
teleporting.remove();
remove();
} else if teleporting.end_time.0 <= time.0 {
remove();
event_bus.emit_now(ServerEvent::TeleportToPosition {
entity,
position: teleporter.target,
});
}
}
update_teleporting(&mut teleporting_updates, &mut teleporting);
}
}
fn update_teleporting(
updates: &mut Vec<(Entity, Option<Teleporting>)>,
teleporting: &mut WriteStorage<'_, Teleporting>,
) {
for (entity, update) in updates.drain(..) {
if let Some(add) = update {
let _ = teleporting.insert(entity, add);
} else {
let _ = teleporting.remove(entity);
}
}
}

12
voxygen/src/hud/mod.rs
View File

@ -2208,13 +2208,13 @@ impl Hud {
.set(overitem_id, ui_widgets);
}
} else if let Some(Interactable::Entity(entity)) = interactable {
// show hud for campfire
if client
// show hud for campfires and portals
if let Some(body) = client
.state()
.ecs()
.read_storage::<comp::Body>()
.get(*entity)
.map_or(false, |b| b.is_campfire())
.filter(|b| b.is_campfire() || b.is_portal())
{
let overitem_id = overitem_walker.next(
&mut self.ids.overitems,
@ -2234,7 +2234,11 @@ impl Hud {
let over_pos = pos + Vec3::unit_z() * 1.5;
overitem::Overitem::new(
i18n.get_msg("hud-crafting-campfire"),
i18n.get_msg(if body.is_campfire() {
"hud-crafting-campfire"
} else {
"hud-portal"
}),
overitem::TEXT_COLOR,
pos.distance_squared(player_pos),
&self.fonts,

2
voxygen/src/session/interactable.rs
View File

@ -247,7 +247,7 @@ pub(super) fn select_interactable(
// * Are not riding the player
let not_riding_player = is_rider
.map_or(true, |is_rider| Some(&is_rider.mount) != uids.get(viewpoint_entity));
let is_interactable = (b.is_campfire() || has_stats_or_item.is_some()) && not_riding_player;
let is_interactable = (b.is_campfire() || (b.is_portal() && (p.0.distance_squared(player_pos) <= 3f32.powi(2))) || has_stats_or_item.is_some()) && not_riding_player;
if !is_interactable {
return None;
};