From 92ab8dab9ac8f9463efc131c827aac2c51df14cc Mon Sep 17 00:00:00 2001
From: Maxicarlos08 <maxicarlos08@gmail.com>
Date: Tue, 1 Aug 2023 20:56:55 +0200
Subject: [PATCH] require interaction to start teleportation

---
 assets/voxygen/i18n/en/hud/misc.ftl      |  1 +
 client/src/lib.rs                        |  6 ++++
 common/src/comp/controller.rs            |  1 +
 common/src/comp/teleport.rs              |  1 -
 common/src/event.rs                      |  4 +++
 common/systems/src/controller.rs         |  8 +++++
 server/src/events/entity_manipulation.rs | 39 ++++++++++++++++++----
 server/src/events/mod.rs                 |  7 ++--
 server/src/sys/teleporter.rs             | 21 ++++--------
 voxygen/src/hud/mod.rs                   |  2 +-
 voxygen/src/session/mod.rs               | 41 +++++++++++++-----------
 11 files changed, 87 insertions(+), 44 deletions(-)

diff --git a/assets/voxygen/i18n/en/hud/misc.ftl b/assets/voxygen/i18n/en/hud/misc.ftl
index b8644d3436..cc99b03fe2 100644
--- a/assets/voxygen/i18n/en/hud/misc.ftl
+++ b/assets/voxygen/i18n/en/hud/misc.ftl
@@ -39,6 +39,7 @@ hud-auto_walk_indicator = Auto walk/swim active
 hud-zoom_lock_indicator-remind = Zoom locked
 hud-zoom_lock_indicator-enable = Camera zoom locked
 hud-zoom_lock_indicator-disable = Camera zoom unlocked
+hud-activate = Activate
 hud-collect = Collect
 hud-pick_up = Pick up
 hud-open = Open
diff --git a/client/src/lib.rs b/client/src/lib.rs
index cd07e42870..122ec37837 100644
--- a/client/src/lib.rs
+++ b/client/src/lib.rs
@@ -1625,6 +1625,12 @@ impl Client {
         }
     }
 
+    pub fn activate_portal(&mut self, portal: Uid) {
+        self.send_msg(ClientGeneral::ControlEvent(ControlEvent::ActivatePortal(
+            portal,
+        )));
+    }
+
     fn control_action(&mut self, control_action: ControlAction) {
         if let Some(controller) = self
             .state
diff --git a/common/src/comp/controller.rs b/common/src/comp/controller.rs
index c0e1e82159..fe84c1f642 100644
--- a/common/src/comp/controller.rs
+++ b/common/src/comp/controller.rs
@@ -158,6 +158,7 @@ pub enum ControlEvent {
         auxiliary_key: ability::AuxiliaryKey,
         new_ability: ability::AuxiliaryAbility,
     },
+    ActivatePortal(Uid),
 }
 
 #[derive(Clone, Copy, Debug, PartialEq, Serialize, Deserialize)]
diff --git a/common/src/comp/teleport.rs b/common/src/comp/teleport.rs
index 63fbd4c2aa..816aabb1e1 100644
--- a/common/src/comp/teleport.rs
+++ b/common/src/comp/teleport.rs
@@ -17,7 +17,6 @@ impl Component for Teleporter {
 
 #[derive(Copy, Clone, Debug, PartialEq)]
 pub struct Teleporting {
-    pub teleport_start: Time,
     pub portal: Entity,
     pub end_time: Time,
 }
diff --git a/common/src/event.rs b/common/src/event.rs
index 7b23bcc33e..0090f7d9a8 100644
--- a/common/src/event.rs
+++ b/common/src/event.rs
@@ -336,6 +336,10 @@ pub enum ServerEvent {
         entity: EcsEntity,
         position: Vec3<f32>,
     },
+    StartTeleporting {
+        entity: EcsEntity,
+        portal: EcsEntity,
+    }
 }
 
 pub struct EventBus<E> {
diff --git a/common/systems/src/controller.rs b/common/systems/src/controller.rs
index 9da0652d13..7d713ca4cc 100644
--- a/common/systems/src/controller.rs
+++ b/common/systems/src/controller.rs
@@ -138,6 +138,14 @@ impl<'a> System<'a> for Sys {
                             stance: Stance::None,
                         });
                     },
+                    ControlEvent::ActivatePortal(portal_uid) => {
+                        if let Some(portal) = read_data.id_maps.uid_entity(portal_uid) {
+                            server_emitter.emit(ServerEvent::StartTeleporting {
+                                entity,
+                                portal,
+                            });
+                        }
+                    }
                 }
             }
         }
diff --git a/server/src/events/entity_manipulation.rs b/server/src/events/entity_manipulation.rs
index 533d0b0d86..3d6672135e 100644
--- a/server/src/events/entity_manipulation.rs
+++ b/server/src/events/entity_manipulation.rs
@@ -8,7 +8,7 @@ use crate::{
         BuffKind, BuffSource, PhysicsState,
     },
     rtsim,
-    sys::terrain::SAFE_ZONE_RADIUS,
+    sys::{teleporter::TELEPORT_RADIUS, terrain::SAFE_ZONE_RADIUS},
     Server, SpawnPoint, StateExt,
 };
 use authc::Uuid;
@@ -1657,11 +1657,7 @@ pub fn handle_remove_light_emitter(server: &mut Server, entity: EcsEntity) {
         .remove(entity);
 }
 
-pub fn handle_teleport_to_position_event(
-    server: &mut Server,
-    entity: EcsEntity,
-    position: Vec3<f32>,
-) {
+pub fn handle_teleport_to_position(server: &mut Server, entity: EcsEntity, position: Vec3<f32>) {
     let ecs = server.state.ecs();
 
     ecs.write_storage::<comp::Pos>()
@@ -1673,3 +1669,34 @@ pub fn handle_teleport_to_position_event(
         .get_mut(entity)
         .map(|forced_update| forced_update.update());
 }
+
+pub fn handle_start_teleporting(server: &mut Server, entity: EcsEntity, portal: EcsEntity) {
+    let ecs = server.state.ecs();
+    let positions = ecs.read_storage::<comp::Pos>();
+    let mut teleportings = ecs.write_storage::<comp::Teleporting>();
+    let now = ecs.read_resource::<Time>().0;
+
+    if let Some(end_time) = (!teleportings.contains(entity))
+        .then(|| positions.get(entity))
+        .flatten()
+        .zip(positions.get(portal))
+        .filter(|(entity_pos, portal_pos)| {
+            entity_pos.0.distance_squared(portal_pos.0) <= TELEPORT_RADIUS.powi(2)
+        })
+        .and_then(|(_, _)| {
+            Some(
+                now + ecs
+                    .read_storage::<comp::Teleporter>()
+                    .get(portal)?
+                    .buildup_time
+                    .0,
+            )
+        })
+    {
+        let _ = teleportings
+            .insert(entity, comp::Teleporting {
+                portal,
+                end_time: Time(end_time),
+            });
+    }
+}
diff --git a/server/src/events/mod.rs b/server/src/events/mod.rs
index 260b59fadb..a72bbf2fb5 100644
--- a/server/src/events/mod.rs
+++ b/server/src/events/mod.rs
@@ -1,7 +1,7 @@
 use crate::{
     events::{
         entity_creation::handle_create_teleporter,
-        entity_manipulation::handle_teleport_to_position_event,
+        entity_manipulation::{handle_start_teleporting, handle_teleport_to_position},
         interaction::{handle_mount_volume, handle_tame_pet},
     },
     persistence::PersistedComponents,
@@ -301,7 +301,10 @@ impl Server {
                     handle_remove_light_emitter(self, entity)
                 },
                 ServerEvent::TeleportToPosition { entity, position } => {
-                    handle_teleport_to_position_event(self, entity, position)
+                    handle_teleport_to_position(self, entity, position)
+                },
+                ServerEvent::StartTeleporting { entity, portal } => {
+                    handle_start_teleporting(self, entity, portal)
                 },
             }
         }
diff --git a/server/src/sys/teleporter.rs b/server/src/sys/teleporter.rs
index 441f75ec49..5cbab22e24 100644
--- a/server/src/sys/teleporter.rs
+++ b/server/src/sys/teleporter.rs
@@ -8,7 +8,7 @@ use common_ecs::{Origin, Phase, System};
 use specs::{Entities, Entity, Join, Read, ReadStorage, WriteStorage};
 use vek::Vec3;
 
-const TELEPORT_RADIUS: f32 = 3.;
+pub const TELEPORT_RADIUS: f32 = 3.;
 const MAX_AGGRO_DIST: f32 = 200.; // If an entity further than this is aggroed at a player, the portal will still work
 
 #[derive(Default)]
@@ -88,8 +88,10 @@ impl<'a> System<'a> for Sys {
                         .filter(|(_, pos, _, _)| in_portal_range(pos.0, teleporter_pos.0))
                 })
             {
-                if !matches!(character_state, CharacterState::Dance)
-                    || (teleporter.requires_no_aggro && check_aggro(entity, pos.0))
+                if !matches!(
+                    character_state,
+                    CharacterState::Idle(_) | CharacterState::Wielding(_)
+                ) || (teleporter.requires_no_aggro && check_aggro(entity, pos.0))
                 {
                     if teleporting.is_some() {
                         teleporting_updates.push((entity, None));
@@ -98,18 +100,7 @@ impl<'a> System<'a> for Sys {
                     continue;
                 }
 
-                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;
+                is_active |= teleporting.is_some();
             }
 
             if (*body == Body::Object(object::Body::PortalActive)) != is_active {
diff --git a/voxygen/src/hud/mod.rs b/voxygen/src/hud/mod.rs
index 2b2086e4fd..041d6cf338 100755
--- a/voxygen/src/hud/mod.rs
+++ b/voxygen/src/hud/mod.rs
@@ -2250,7 +2250,7 @@ impl Hud {
                         &global_state.window.key_layout,
                         vec![(
                             Some(GameInput::Interact),
-                            i18n.get_msg(if is_campfire { "hud-sit" } else { "gameinput-dance" }).to_string(),
+                            i18n.get_msg(if is_campfire { "hud-sit" } else { "hud-activate" }).to_string(),
                         )],
                     )
                     .x_y(0.0, 100.0)
diff --git a/voxygen/src/session/mod.rs b/voxygen/src/session/mod.rs
index 3b13acf367..bff2648e58 100644
--- a/voxygen/src/session/mod.rs
+++ b/voxygen/src/session/mod.rs
@@ -1027,6 +1027,13 @@ impl PlayState for SessionState {
                                                 }
                                             },
                                             Interactable::Entity(entity) => {
+                                                let body = client
+                                                    .state()
+                                                    .ecs()
+                                                    .read_storage::<comp::Body>()
+                                                    .get(*entity)
+                                                    .map(ToOwned::to_owned);
+
                                                 if client
                                                     .state()
                                                     .ecs()
@@ -1035,25 +1042,21 @@ impl PlayState for SessionState {
                                                     .is_some()
                                                 {
                                                     client.pick_up(*entity);
-                                                } else if let Some(is_campfire) = {
-                                                    let bodies = client
-                                                        .state()
-                                                        .ecs()
-                                                        .read_storage::<comp::Body>();
-
-                                                    bodies
-                                                        .get(*entity)
-                                                        .filter(|body| {
-                                                            body.is_campfire() || body.is_portal()
-                                                        })
-                                                        .map(|body| body.is_campfire())
-                                                } {
-                                                    if is_campfire {
-                                                        // TODO: maybe start crafting instead?
-                                                        client.toggle_sit();
-                                                    } else {
-                                                        client.toggle_dance();
-                                                    }
+                                                } else if body
+                                                    .map_or(false, |body| body.is_campfire())
+                                                {
+                                                    client.toggle_sit();
+                                                } else if let Some(portal_uid) = body
+                                                    .map_or(false, |body| body.is_portal())
+                                                    .then(|| {
+                                                        client
+                                                            .state()
+                                                            .ecs()
+                                                            .uid_from_entity(*entity)
+                                                    })
+                                                    .flatten()
+                                                {
+                                                    client.activate_portal(portal_uid);
                                                 } else {
                                                     client.npc_interact(*entity, Subject::Regular);
                                                 }