fix 40c

Lamby777 · Jun 17, 2024 · 87e447d · 87e447d
1 parent e6f4864
commit 87e447d
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 3 deletions.
diff --git a/pets-gd/scenes/rooms/cv-outdoors.tscn b/pets-gd/scenes/rooms/cv-outdoors.tscn
@@ -24,6 +24,10 @@ scale = Vector2(3, -2)
 
 [node name="DebugItem" parent="." index="3" instance=ExtResource("4_vwc65")]
 function_name = "debug_skill"
+prompt_location = NodePath("Node2D")
+position = Vector2(-192, 64)
+
+[node name="Node2D" type="Node2D" parent="DebugItem" index="1"]
 position = Vector2(-192, 64)
 
 [node name="House" parent="." index="4" instance=ExtResource("4_vwc65")]

diff --git a/pets-lib/src/world/interaction/manager.rs b/pets-lib/src/world/interaction/manager.rs
@@ -64,6 +64,19 @@ impl InteractionManager {
             .get_node_as::<RichTextLabel>("%Action")
             .set_text(tr(key));
     }
+
+    fn move_prompt_to_zone(&mut self, zone: Gd<InteractionZone>) {
+        let custom_path = zone.bind().get_prompt_location();
+
+        let pos = if custom_path.is_empty() {
+            zone.get_global_position()
+        } else {
+            zone.get_node_as::<Node2D>(custom_path)
+                .get_global_position()
+        };
+
+        self.prompt.set_global_position(pos);
+    }
 }
 
 #[godot_api]
@@ -78,10 +91,10 @@ impl INode for InteractionManager {
         };
 
         // move the prompt to the zone
-        let prompt_tr_key = zone.bind().prompt_translation_key.clone();
+        let prompt_tr_key = zone.bind().get_prompt_translation_key();
         self.set_prompt_text(prompt_tr_key);
         self.prompt.show();
-        self.prompt.set_global_position(zone.get_global_position());
+        self.move_prompt_to_zone(zone);
     }
 
     fn unhandled_input(&mut self, event: Gd<InputEvent>) {

diff --git a/pets-lib/src/world/interaction/zone.rs b/pets-lib/src/world/interaction/zone.rs
@@ -35,7 +35,10 @@ pub struct InteractionZone {
 
     #[export]
     #[init(default = "INTERACT".into())]
-    pub prompt_translation_key: GString,
+    prompt_translation_key: GString,
+
+    #[export]
+    prompt_location: NodePath,
 }
 
 #[godot_api]