Merge branch 'master' of https://github.com/jjppof/goldensun_html5

Author: jjppof

base/ControllableChar.ts

@@ -796,7 +796,7 @@ export abstract class ControllableChar {
     /**
      * Returns if this char is enough close to a target char.
      * @param target_char The target char.
-     * @returns Returns whether it's close or not.
+     * @returns If it's close enough, returns the distance, else returns null.
      */
     is_close(target_char: NPC) {
         const reference_angle = (8 - this.transition_direction) * numbers.degree45;
@@ -816,10 +816,9 @@ export abstract class ControllableChar {
         upper_limit += angle_shift;
         const target_angle = range_360(-Math.atan2(relative_point.y, relative_point.x) + angle_shift);
         const angle_condition = target_angle >= lower_limit && target_angle <= upper_limit;
-        const distance_condition =
-            get_sqr_distance(0, relative_point.x, 0, relative_point.y) <=
-            target_char.talk_range * target_char.talk_range;
-        return angle_condition && distance_condition;
+        const relative_dist = get_sqr_distance(0, relative_point.x, 0, relative_point.y);
+        const distance_condition = relative_dist <= target_char.talk_range * target_char.talk_range;
+        return angle_condition && distance_condition ? relative_dist : null;
     }
 
     /**

base/SpriteBase.ts

@@ -20,11 +20,15 @@ export class SpriteBase {
             frame_names?: {[animation: string]: string[]};
         };
     };
+    private action_aliases: {
+        [alias: string]: string;
+    };
 
     constructor(data, key_name, actions) {
         this.data = data;
         this.key_name = key_name;
         this.actions = {};
+        this.action_aliases = {};
         for (let i = 0; i < actions.length; ++i) {
             this.actions[actions[i]] = {};
         }
@@ -35,10 +39,21 @@ export class SpriteBase {
     }
 
     setActionAnimations(action, animations, frame_counts) {
+        if (!this.actions.hasOwnProperty(action)) {
+            this.data.logger.log_message(`Sprite '${this.key_name}' has no action '${action}'.`, msg_types.ERROR);
+            return;
+        }
         this.actions[action].animations = new Array(animations.length);
         this.actions[action].frame_counts = new Array(animations.length);
         this.actions[action].frame_names = {};
         const frame_count_is_array = Array.isArray(frame_counts);
+        if (frame_count_is_array && frame_counts.length !== animations.length) {
+            this.data.logger.log_message(
+                `Frames count and animations size must match. Issue on sprite '${this.key_name}' for action action '${action}'.`,
+                msg_types.ERROR
+            );
+            return;
+        }
         for (let i = 0; i < animations.length; ++i) {
             const frame_count = frame_count_is_array ? frame_counts[i] : frame_counts;
             this.actions[action].animations[i] = animations[i];
@@ -47,6 +62,17 @@ export class SpriteBase {
     }
 
     setActionFrameRate(action, frame_rate) {
+        if (!this.actions.hasOwnProperty(action)) {
+            this.data.logger.log_message(`Sprite '${this.key_name}' has no action '${action}'.`, msg_types.ERROR);
+            return;
+        }
+        if (!Array.isArray(frame_rate) && !(typeof frame_rate === "number")) {
+            this.data.logger.log_message(
+                `Invalid frame rate set for action '${action}' for sprite '${this.key_name}'.`,
+                msg_types.ERROR
+            );
+            return;
+        }
         this.actions[action].frame_rate = {};
         for (let i = 0; i < this.actions[action].animations.length; ++i) {
             const animation = this.actions[action].animations[i];
@@ -60,6 +86,13 @@ export class SpriteBase {
             } else {
                 this_frame_rate = frame_rate;
             }
+            if (this_frame_rate === undefined) {
+                this.data.logger.log_message(
+                    `Invalid frame rate set for action '${action}' for sprite '${this.key_name}'.`,
+                    msg_types.ERROR
+                );
+                continue;
+            }
             this.actions[action].frame_rate[animation] = this_frame_rate;
         }
     }
@@ -79,9 +112,17 @@ export class SpriteBase {
         if (reference_action in this.actions) {
             this.actions[alias] = this.actions[reference_action];
             game.cache.setCacheAlias(this.getSpriteKey(alias), this.getSpriteKey(reference_action), Phaser.Cache.IMAGE);
+            this.action_aliases[alias] = reference_action;
         }
     }
 
+    getActionRefFromAlias(alias) {
+        if (alias in this.action_aliases) {
+            return this.action_aliases[alias];
+        }
+        return null;
+    }
+
     hasAction(action: string) {
         return action in this.actions;
     }
@@ -96,7 +137,7 @@ export class SpriteBase {
             const action_key = this.getSpriteKey(action);
             if (game.cache.checkImageKey(action_key)) {
                 this.data.logger.log_message(
-                    `Sprite key '<key_name>/<action>' '${action_key} is already registered in the engine. Please consider renaming it.'`,
+                    `Sprite key '<key_name>/<action>' '${action_key}' is already registered in the engine. Please consider renaming it.`,
                     msg_types.ERROR
                 );
             }
@@ -125,14 +166,24 @@ export class SpriteBase {
             for (let i = 0; i < animations.length; ++i) {
                 const animation = animations[i];
                 const frame_rate = this.actions[action].frame_rate[animation];
-                const anim_key = this.getAnimationKey(action, animation);
+                let anim_key = this.getAnimationKey(action, animation);
                 sprite.animations.add(
                     anim_key,
                     this.actions[action].frame_names[animation],
                     frame_rate,
                     Array.isArray(loop) ? loop[i] : loop,
                     false
                 );
+                const ref_action = this.getActionRefFromAlias(action);
+                if (ref_action) {
+                    anim_key = this.getAnimationKey(ref_action, animation);
+                }
+                if (!sprite.animations.frameData.getFrameByName(`${anim_key}${SpriteBase.ACTION_ANIM_SEPARATOR}00`)) {
+                    this.data.logger.log_message(
+                        `Animation '${anim_key}' is not valid for action '${action}' for sprite '${this.key_name}'.`,
+                        msg_types.ERROR
+                    );
+                }
             }
         } else {
             this.data.logger.log_message(`Action '${action}' not available for '${this.key_name}'.`);

base/game_events/GameEventManager.ts

@@ -161,6 +161,10 @@ export class GameEventManager {
      * Look for valid npcs in the nearby.
      */
     private search_for_npc() {
+        const close_npcs: {
+            npc: NPC;
+            distance: number;
+        }[] = [];
         for (let i = 0; i < this.data.map.npcs.length; ++i) {
             const npc = this.data.map.npcs[i];
             if (
@@ -170,8 +174,17 @@ export class GameEventManager {
             ) {
                 continue;
             }
-            const is_close_check = this.data.hero.is_close(npc);
-            if (is_close_check) {
+            const npc_distance = this.data.hero.is_close(npc);
+            if (npc_distance) {
+                close_npcs.push({
+                    npc: npc,
+                    distance: npc_distance,
+                });
+            }
+        }
+        if (close_npcs.length) {
+            for (let close_npc_data of _.sortBy(close_npcs, close_npc_data => close_npc_data.distance)) {
+                const npc = close_npc_data.npc;
                 if (
                     npc.allow_only_front_interaction &&
                     (npc.tile_pos.y + 1 !== this.data.hero.tile_pos.y || npc.tile_pos.x !== this.data.hero.tile_pos.x)

static/phaser.js

@@ -73458,7 +73458,7 @@ Phaser.FrameData.prototype = {
      */
     checkFrameName: function (name)
     {
-        if (this._frameNames[name] == null)
+        if (this._frameNames[name] == null || this._frameNames[name] === undefined)
         {
             return false;
         }