improving sprite base checks

jjppof · Apr 15, 2024 · 060f0cc · 060f0cc
1 parent 7f989ca
commit 060f0cc
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/base/ControllableChar.ts b/base/ControllableChar.ts
@@ -773,7 +773,9 @@ export abstract class ControllableChar {
         }
         const animation_key = this.sprite_info.getAnimationKey(action, animation);
         if (!this.sprite.animations.getAnimation(animation_key)) {
-            this.sprite_info.setAnimation(this.sprite, action);
+            if (!this.sprite_info.setAnimation(this.sprite, action)) {
+                return null;
+            }
         }
         const animation_obj = this.sprite.animations.getAnimation(animation_key);
         if (!animation_obj) {

diff --git a/base/SpriteBase.ts b/base/SpriteBase.ts
@@ -125,7 +125,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
                 );
             }
@@ -162,10 +162,18 @@ export class SpriteBase {
                     Array.isArray(loop) ? loop[i] : loop,
                     false
                 );
+                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
+                    );
+                    return false;
+                }
             }
         } else {
             this.data.logger.log_message(`Action '${action}' not available for '${this.key_name}'.`);
         }
+        return true;
     }
 
     generateAllFrames() {

diff --git a/static/phaser.js b/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;
         }