spaghettification (both pcb and pcharnode have cutscene motions)

Author: Lamby777

pets-gd/quests/intro1.gd

@@ -7,6 +7,10 @@ func _ready():
     for pchar in ["Ethan", "Siva", "Terra", "Mira"]:
         pcb().push_pchar_gd(pchar)
 
+    # pcb().in_cutscene = true
+    # pcb().party[0].move_to_relative(0.0, -200.0)
+    # await pcb().party[0].motion_done
+    # pcb().in_cutscene = false
     pcb().move_to_relative(0.0, -200.0)
     await pcb().motion_done
 

pets-lib/src/world/partycb.rs

@@ -71,8 +71,8 @@ pub struct PartyCB {
     /// Whether or this PCB will apply its movements to all party members' nodes
     /// using `past_positions` and `past_rotations`.
     #[export]
-    #[init(val = true)]
-    pub controls_pchar_nodes: bool,
+    #[init(val = false)]
+    pub in_cutscene: bool,
 
     /// Each party member's scene node
     #[var]
@@ -90,27 +90,25 @@ pub struct PartyCB {
     pub tpbeacon_debounce: bool,
     pub in_water: bool,
 
-    /// if the player is currently being controlled by a script,
-    /// this is the location the player is being moved to
-    pub cutscene_motion: Option<Vector2>,
-
     #[init(val = 1.0)]
     pub water_speed_mod: real,
+
+    pub cutscene_motion: Option<Vector2>,
 }
 
 #[godot_api]
 impl PartyCB {
     #[signal]
     fn teleported(&self, target: Gd<Node2D>);
 
+    #[signal]
+    fn motion_done(&self);
+
     #[func]
     pub fn singleton() -> Gd<Self> {
         World::singleton().get_node_as("%PartyCB")
     }
 
-    #[signal]
-    fn motion_done(&self);
-
     #[func]
     pub fn move_to_absolute(&mut self, x: real, y: real) {
         let end = Vector2::new(x, y);
@@ -159,7 +157,8 @@ impl PartyCB {
             || InventoryNode::singleton().bind().is_open()
             || self.is_in_battle()
             || self.tpbeacon_debounce
-            || self.cutscene_motion.is_some();
+            || self.cutscene_motion.is_some()
+            || self.in_cutscene;
 
         !cant_move
     }
@@ -171,7 +170,7 @@ impl PartyCB {
     /// Set character positions based on past pos/rot
     pub fn move_chars(&mut self, moving: bool) {
         // don't run if disabled or if no previous positions saved
-        if !self.controls_pchar_nodes || self.past_positions.len() == 0 {
+        if self.in_cutscene || self.past_positions.len() == 0 {
             return;
         }
 

pets-lib/src/world/pchar_node.rs

@@ -5,6 +5,9 @@ use godot::classes::{
 use godot::prelude::*;
 
 use crate::common::*;
+use crate::consts::partycb::MAX_SPEED;
+
+use super::partycb::{Inputs, CUTSCENE_MOTION_CLOSE_ENOUGH};
 
 #[derive(GodotClass)]
 #[class(init, base=Node2D)]
@@ -30,13 +33,14 @@ pub struct PCharNode {
     #[init(val = OnReady::manual())]
     anim_state: OnReady<Gd<AnimationNodeStateMachinePlayback>>,
 
-    /// if the player is currently being controlled by a script,
-    /// this is the location the player is being moved to
     pub cutscene_motion: Option<Vector2>,
 }
 
 #[godot_api]
 impl PCharNode {
+    #[signal]
+    fn motion_done(&self);
+
     #[func]
     pub fn anim_move(&mut self, moving: bool, inputs: Vector2) {
         // change the animationtree state machine to the correct mode
@@ -63,6 +67,19 @@ impl PCharNode {
             .iter_shared()
             .any(|area| area.is_in_group("water".into()))
     }
+
+    #[func]
+    pub fn move_to_absolute(&mut self, x: real, y: real) {
+        self.cutscene_motion = Some(Vector2::new(x, y));
+    }
+
+    #[func]
+    pub fn move_to_relative(&mut self, x: real, y: real) {
+        let end = Vector2::new(x, y);
+        let start = self.base().get_global_position();
+        let total = start + end;
+        self.cutscene_motion = Some(total);
+    }
 }
 
 #[godot_api]
@@ -73,7 +90,22 @@ impl INode2D for PCharNode {
         self.anim_state.init(anim_state);
     }
 
-    // fn physics_process(&mut self, delta: f64) {
-    //     if let Some(target) = self.cutscene_motion {}
-    // }
+    fn physics_process(&mut self, delta: f64) {
+        if let Some(target) = self.cutscene_motion {
+            let own_pos = self.base().get_global_position();
+            let input_vector = Inputs::iv_from_to(own_pos, target);
+
+            self.base_mut().set_global_position(
+                own_pos + input_vector * MAX_SPEED * delta as real,
+            );
+
+            self.anim_move(true, input_vector);
+
+            if (target - own_pos).length() < CUTSCENE_MOTION_CLOSE_ENOUGH {
+                self.cutscene_motion = None;
+                self.base_mut().emit_signal("motion_done".into(), &[]);
+                self.base_mut().set_global_position(target);
+            }
+        }
+    }
 }