fix

Author: krmbn0576

js/rpg_core/Graphics.js

@@ -439,13 +439,8 @@ Graphics.printErrorDetail = function(error) {
         var eventInfo = this._formatEventInfo(error);
         var eventCommandInfo = this._formatEventCommandInfo(error);
         var info = eventCommandInfo ? eventInfo + ", " + eventCommandInfo : eventInfo;
-        var stack = (error.stack || '')
-            .replace(/file:.*js\//g, '')
-            .replace(/http:.*js\//g, '')
-            .replace(/https:.*js\//g, '')
-            .replace(/chrome-extension:.*js\//g, '')
-            .replace(/\n/g, '<br>');
-        this._makeErrorDetail(info, decodeURIComponent(stack));
+        var stack = this._formatStackTrace(error);
+        this._makeErrorDetail(info, stack);
     }
 };
 
@@ -967,18 +962,34 @@ Graphics._formatEventCommandInfo = function(error) {
         return "◆Plugin Command: " + error.content;
     case "script":
         return "◆Script: " + error.content;
+    case "control_variables":
+        return "◆Control Variables: Script: " + error.content;
     case "conditional_branch_script":
-        return "◆Conditional Branch(Script): " + error.content;
+        return "◆If: Script: " + error.content;
     case "set_route_script":
-        return "◆Set Movement Route(Script): " + error.content;
+        return "◆Set Movement Route: ◇Script: " + error.content;
     case "auto_route_script":
-        return "Autonomous Movement Custom Route(Script): " + error.content;
+        return "Autonomous Movement Custom Route: ◇Script: " + error.content;
     case "other":
     default:
         return "";
     }
 };
 
+/**
+ * @static
+ * @method _formatStackTrace
+ * @private
+ */
+Graphics._formatStackTrace = function(error) {
+    return decodeURIComponent((error.stack || '')
+        .replace(/file:.*js\//g, '')
+        .replace(/http:.*js\//g, '')
+        .replace(/https:.*js\//g, '')
+        .replace(/chrome-extension:.*js\//g, '')
+        .replace(/\n/g, '<br>'));
+};
+
 /**
  * @static
  * @method _createCanvas

js/rpg_objects/Game_Interpreter.js

@@ -702,7 +702,13 @@ Game_Interpreter.prototype.command122 = function() {
             value = this.gameDataOperand(this._params[4], this._params[5], this._params[6]);
             break;
         case 4: // Script
-            value = eval(this._params[4]);
+            try {
+                value = eval(this._params[4]);
+            } catch (error) {
+                error.eventCommand = "control_variables";
+                error.content = this._params[4];
+                throw error;
+            }
             break;
     }
     for (var i = this._params[0]; i <= this._params[1]; i++) {
@@ -1757,7 +1763,6 @@ Game_Interpreter.prototype.command354 = function() {
 // Script
 Game_Interpreter.prototype.command355 = function() {
     var startLine = this._index + 1;
-    var postfix = this.nextEventCode() === 655 ? "..." : "";
     var script = this.currentCommand().parameters[0] + '\n';
     while (this.nextEventCode() === 655) {
         this._index++;
@@ -1769,7 +1774,7 @@ Game_Interpreter.prototype.command355 = function() {
     } catch (error) {
         error.line = startLine + "-" + endLine;
         error.eventCommand = "script";
-        error.content = this._params[0] + postfix;
+        error.content = script;
         throw error;
     }
     return true;

plugins/Community_Basic.js

@@ -155,7 +155,7 @@
  * @param showErrorDetail
  * @type boolean
  * @text エラー詳細表示
- * @desc ONにすると、エラー時にどこでエラーが発生したか及びスタックトレースを表示します
+ * @desc ONにすると、エラー時にエラーを発生させたイベントの情報とスタックトレースを表示します
  * @default true
  *
  * @param enableProgressBar