npc custom move finish

Author: jjppof

assets/dbs/storage_db.json

@@ -27,6 +27,6 @@
     },
     "forest_pillar_collision_layer": 0,
     "forest_pillar_animation": "pillar",
-    "play_introduction": false,
+    "play_introduction": true,
     "avimander_battle": true
 }

assets/init.json

@@ -2,13 +2,13 @@
     "hero_key_name": "isaac",
     "initial_action": "idle",
     "initial_direction": "down",
-    "map_key_name": "madra_side",
-    "initial_scale_factor": 4,
-    "x_tile_position": 14,
+    "map_key_name": "madra",
+    "initial_scale_factor": 2,
+    "x_tile_position": 30,
     "y_tile_position": 13,
-    "collision_layer": 0,
+    "collision_layer": 1,
     "coins": 10000,
-    "skip_start_menu": true,
+    "skip_start_menu": false,
     "ignore_system_scaling": true,
     "start_battle_tester_on_init": false,
     "verbose_game_event_fire": false,

base/Map.ts

@@ -1188,7 +1188,8 @@ export class Map {
                 property_info.after_psynergy_cast_events,
                 property_info.force_char_stop_in_event,
                 property_info.force_idle_action_in_event,
-                property_info.custom_movement,
+                property_info.custom_movements,
+                property_info.loop_custom_move
             );
             this.npcs.push(npc);
             if (npc.label) {

base/NPC.ts

@@ -8,6 +8,8 @@ import {
     range_360,
     engine_filters,
     directions,
+    get_centered_pos_in_px,
+    promised_wait,
 } from "./utils";
 import {ControllableChar} from "./ControllableChar";
 import {interaction_patterns} from "./game_events/GameEventManager";
@@ -90,23 +92,30 @@ export class NPC extends ControllableChar {
     private _after_psynergy_cast_events: {
         [psynergy_key: string]: GameEvent[];
     };
-    private _custom_movement: {
+    private _custom_movements: {
         position?: {
-            x: number,
-            y: number,
-            is_px?: boolean,
-            incremental?: boolean
-        }
-        dashing?: boolean,
-        look_direction?: directions,
-        wait?: number,
+            x: number;
+            y: number;
+            is_px?: boolean;
+            incremental?: boolean;
+            dashing?: boolean;
+            extra_speed?: number;
+        };
+        look_direction?: string;
+        wait?: number;
         animation?: {
-            animation: string,
-            action: string,
-            frame_rate: number,
-            reset_before_start?: boolean
-        }
+            animation: string;
+            action: string;
+            frame_rate: number;
+            reset_before_start?: boolean;
+            stop_char_on_finish?: boolean;
+        };
     }[];
+    private _next_custom_move_available: boolean;
+    private _custom_move_index: number;
+    private _custom_move_moving: boolean;
+    private _loop_custom_move: boolean;
+    private _custom_move_destination: {x: number; y: number};
 
     /** If true, this NPC will move freely while a game event is happening. */
     public move_freely_in_event: boolean;
@@ -164,7 +173,8 @@ export class NPC extends ControllableChar {
         after_psynergy_cast_events,
         force_char_stop_in_event,
         force_idle_action_in_event,
-        custom_movement
+        custom_movement,
+        loop_custom_move
     ) {
         super(
             game,
@@ -189,6 +199,10 @@ export class NPC extends ControllableChar {
             movement_type = this.data.storage.get(this.storage_keys.movement_type);
         }
         this.movement_type = movement_type ?? npc_movement_types.IDLE;
+        this._custom_movements = custom_movement ?? [];
+        if (this.movement_type === npc_movement_types.CUSTOM && !this._custom_movements.length) {
+            this.movement_type = npc_movement_types.IDLE;
+        }
         if (this.storage_keys.move_freely_in_event !== undefined) {
             move_freely_in_event = this.data.storage.get(this.storage_keys.move_freely_in_event);
         }
@@ -240,7 +254,11 @@ export class NPC extends ControllableChar {
         this._step_max_variation = step_max_variation;
         this._map_index = map_index;
         this._allow_interaction_when_inactive = allow_interaction_when_inactive ?? false;
-        this._custom_movement = custom_movement ?? [];
+        this._next_custom_move_available = true;
+        this._custom_move_index = 0;
+        this._custom_move_moving = false;
+        this._custom_move_destination = {x: 0, y: 0};
+        this._loop_custom_move = loop_custom_move ?? true;
     }
 
     /** The list of GameEvents related to this NPC. */
@@ -518,9 +536,101 @@ export class NPC extends ControllableChar {
 
     /**
      * Do all the necessary steps to execute a list of custom moves.
+     * Types of custom moves: move to position, face direction, wait and animation.
      */
     private execute_custom_moves() {
-
+        if (!this._next_custom_move_available) {
+            if (this._custom_move_moving) {
+                if (!this.set_speed_factors()) {
+                    this.stop_char(true);
+                } else {
+                    this.choose_direction_by_speed();
+                    this.set_direction();
+                    this.choose_action_based_on_char_state();
+                    this.calculate_speed();
+                    this.apply_speed();
+                    this.play_current_action(true);
+                    if (
+                        get_sqr_distance(
+                            this.x,
+                            this._custom_move_destination.x,
+                            this.y,
+                            this._custom_move_destination.y
+                        ) < NPC.STOP_MINIMAL_DISTANCE_SQR
+                    ) {
+                        this.stop_char(true);
+                        this.increase_extra_speed(
+                            -this._custom_movements[this._custom_move_index].position.extra_speed ?? 0
+                        );
+                        this._next_custom_move_available = true;
+                        ++this._custom_move_index;
+                        this._custom_move_moving = false;
+                    }
+                }
+            }
+            return;
+        }
+        if (this._custom_move_index === this._custom_movements.length) {
+            if (!this._loop_custom_move) {
+                return;
+            }
+            this._custom_move_index = 0;
+        }
+        this._next_custom_move_available = false;
+        const move = this._custom_movements[this._custom_move_index];
+        if (move.position) {
+            let x = move.position.is_px
+                ? move.position.x
+                : get_centered_pos_in_px(move.position.x, this.data.map.tile_width);
+            if (move.position.incremental) {
+                x += this.x;
+            }
+            let y = move.position.is_px
+                ? move.position.y
+                : get_centered_pos_in_px(move.position.y, this.data.map.tile_height);
+            if (move.position.incremental) {
+                y += this.y;
+            }
+            this._custom_move_destination.x = x;
+            this._custom_move_destination.y = y;
+            const speed_vector = new Phaser.Point(x - this.x, y - this.y).normalize();
+            this.force_diagonal_speed.x = speed_vector.x;
+            this.force_diagonal_speed.y = speed_vector.y;
+            this._angle_direction = Math.atan2(speed_vector.y, speed_vector.x);
+            this._custom_move_moving = true;
+            this.dashing = move.position.dashing ?? false;
+            this.increase_extra_speed(move.position.extra_speed ?? 0);
+        } else if (move.look_direction) {
+            const direction = directions[move.look_direction];
+            this.face_direction(direction).then(() => {
+                this._next_custom_move_available = true;
+                ++this._custom_move_index;
+            });
+        } else if (move.animation) {
+            if (move.animation.animation in directions) {
+                this.set_direction(directions[move.animation.animation]);
+            }
+            const anim = this.play(
+                move.animation.action,
+                move.animation.animation,
+                true,
+                move.animation.frame_rate,
+                false,
+                move.animation.reset_before_start
+            );
+            anim.onComplete.addOnce(() => {
+                if (move.animation.stop_char_on_finish) {
+                    this.stop_char(true);
+                }
+                this._next_custom_move_available = true;
+                ++this._custom_move_index;
+            });
+        } else if (move.wait) {
+            promised_wait(this.game, move.wait, () => {
+                this._next_custom_move_available = true;
+                ++this._custom_move_index;
+            });
+        }
     }
 
     /**
@@ -560,6 +670,7 @@ export class NPC extends ControllableChar {
 
     /**
      * Sets the x-y speed values that this NPC is going to be using to move.
+     * It's important to have NPC._angle_direction set for correct checking.
      * @returns Returns true if the speed values were set. Going towards a collision direction is not acceptable, then returns false.
      */
     private set_speed_factors() {