Merge pull request #1 from rpgtkoolmv/master

本体からマージ（rebase）

Author: Sigureya

.gitignore

@@ -55,3 +55,4 @@ game/**/*
 todo.md
 corescript/**/*
 corescript.zip
+package-lock.json

CONTRIBUTORS.md

@@ -2,10 +2,15 @@
 - [@iyokan_nico](https://twitter.com/iyokan_nico)
 - [@krmbn0576](https://twitter.com/krmbn0576)
 - [@liply](https://twitter.com/liplynet) [master@liply.net](mailto:master@liply.net)
+- [@Sigureya](https://twitter.com/Sigureya)
 
 # Contributors
 - ivanpopelyshev
 - wilfrem
 - rutan
 - niokasgami
 - triacontane
+- bungcip
+- white-mns
+- rev2nym
+- seea17

js/rpg_core/Graphics.js

@@ -360,6 +360,11 @@ Graphics.printLoadingError = function(url) {
     if (this._errorPrinter && !this._errorShowed) {
         this._updateErrorPrinter();
         this._errorPrinter.innerHTML = this._makeErrorHtml('Loading Error', 'Failed to load: ' + url);
+        this._errorPrinter.style.userSelect       = 'text';
+        this._errorPrinter.style.webkitUserSelect = 'text';
+        this._errorPrinter.style.msUserSelect     = 'text';
+        this._errorPrinter.style.mozUserSelect    = 'text';
+        this._errorPrinter.oncontextmenu = null;    // enable context menu
         var button = document.createElement('button');
         button.innerHTML = 'Retry';
         button.style.fontSize = '24px';
@@ -385,6 +390,11 @@ Graphics.printLoadingError = function(url) {
 Graphics.eraseLoadingError = function() {
     if (this._errorPrinter && !this._errorShowed) {
         this._errorPrinter.innerHTML = '';
+        this._errorPrinter.style.userSelect       = 'none';
+        this._errorPrinter.style.webkitUserSelect = 'none';
+        this._errorPrinter.style.msUserSelect     = 'none';
+        this._errorPrinter.style.mozUserSelect    = 'none';
+        this._errorPrinter.oncontextmenu = function() { return false; };
         this.startLoading();
     }
 };
@@ -405,27 +415,32 @@ Graphics.printError = function(name, message) {
     if (this._errorPrinter) {
         this._updateErrorPrinter();
         this._errorPrinter.innerHTML = this._makeErrorHtml(name, message);
-        this._makeErrorMessage();
+        this._errorPrinter.style.userSelect       = 'text';
+        this._errorPrinter.style.webkitUserSelect = 'text';
+        this._errorPrinter.style.msUserSelect     = 'text';
+        this._errorPrinter.style.mozUserSelect    = 'text';
+        this._errorPrinter.oncontextmenu = null;    // enable context menu
+        if (this._errorMessage) {
+            this._makeErrorMessage();
+        }
     }
     this._applyCanvasFilter();
     this._clearUpperCanvas();
 };
 
 /**
- * Shows the stacktrace of error.
+ * Shows the detail of error.
  *
  * @static
- * @method printStackTrace
+ * @method printErrorDetail
  */
-Graphics.printStackTrace = function(stack) {
-    if (this._errorPrinter) {
-        stack = (stack || '')
-            .replace(/file:.*js\//g, '')
-            .replace(/http:.*js\//g, '')
-            .replace(/https:.*js\//g, '')
-            .replace(/chrome-extension:.*js\//g, '')
-            .replace(/\n/g, '<br>');
-        this._makeStackTrace(decodeURIComponent(stack));
+Graphics.printErrorDetail = function(error) {
+    if (this._errorPrinter && this._showErrorDetail) {
+        var eventInfo = this._formatEventInfo(error);
+        var eventCommandInfo = this._formatEventCommandInfo(error);
+        var info = eventCommandInfo ? eventInfo + ", " + eventCommandInfo : eventInfo;
+        var stack = this._formatStackTrace(error);
+        this._makeErrorDetail(info, stack);
     }
 };
 
@@ -439,6 +454,16 @@ Graphics.setErrorMessage = function(message) {
     this._errorMessage = message;
 };
 
+/**
+ * Sets whether shows the detail of error.
+ *
+ * @static
+ * @method setShowErrorDetail
+ */
+Graphics.setShowErrorDetail = function(showErrorDetail) {
+    this._showErrorDetail = showErrorDetail;
+};
+
 /**
  * Shows the FPSMeter element.
  *
@@ -759,6 +784,7 @@ Graphics._updateAllElements = function() {
     this._updateUpperCanvas();
     this._updateRenderer();
     this._paintUpperCanvas();
+    this._updateProgress();
 };
 
 /**
@@ -862,16 +888,17 @@ Graphics._createErrorPrinter = function() {
  */
 Graphics._updateErrorPrinter = function() {
     this._errorPrinter.width = this._width * 0.9;
-    this._errorPrinter.height = this._errorShowed ? this._height * 0.9 : 40;
+    if (this._errorShowed && this._showErrorDetail) {
+        this._errorPrinter.height = this._height * 0.9;
+    } else if (this._errorShowed && this._errorMessage) {
+        this._errorPrinter.height = 100;
+    } else {
+        this._errorPrinter.height = 40;
+    }
     this._errorPrinter.style.textAlign = 'center';
     this._errorPrinter.style.textShadow = '1px 1px 3px #000';
     this._errorPrinter.style.fontSize = '20px';
     this._errorPrinter.style.zIndex = 99;
-    this._errorPrinter.style.userSelect       = 'text';
-    this._errorPrinter.style.webkitUserSelect = 'text';
-    this._errorPrinter.style.msUserSelect     = 'text';
-    this._errorPrinter.style.mozUserSelect    = 'text';
-    this._errorPrinter.oncontextmenu = null;    // enable context menu
     this._centerElement(this._errorPrinter);
 };
 
@@ -886,23 +913,82 @@ Graphics._makeErrorMessage = function() {
     style.color           = 'white';
     style.textAlign       = 'left';
     style.fontSize        = '18px';
-    mainMessage.innerHTML = '<hr>' + (this._errorMessage || '');
+    mainMessage.innerHTML = '<hr>' + this._errorMessage;
     this._errorPrinter.appendChild(mainMessage);
 };
 
 /**
  * @static
- * @method _makeStackTrace
+ * @method _makeErrorDetail
  * @private
  */
-Graphics._makeStackTrace = function(stack) {
-    var stackTrace         = document.createElement('div');
-    var style              = stackTrace.style;
+Graphics._makeErrorDetail = function(info, stack) {
+    var detail             = document.createElement('div');
+    var style              = detail.style;
     style.color            = 'white';
     style.textAlign        = 'left';
     style.fontSize         = '18px';
-    stackTrace.innerHTML   = '<br><hr>' + stack + '<hr>';
-    this._errorPrinter.appendChild(stackTrace);
+    detail.innerHTML       = '<br><hr>' + info + '<br><br>' + stack;
+    this._errorPrinter.appendChild(detail);
+};
+
+/**
+ * @static
+ * @method _formatEventInfo
+ * @private
+ */
+Graphics._formatEventInfo = function(error) {
+    switch (String(error.eventType)) {
+    case "map_event":
+        return "MapID: %1, MapEventID: %2, page: %3, line: %4".format(error.mapId, error.mapEventId, error.page, error.line);
+    case "common_event":
+        return "CommonEventID: %1, line: %2".format(error.commonEventId, error.line);
+    case "battle_event":
+        return "TroopID: %1, page: %2, line: %3".format(error.troopId, error.page, error.line);
+    case "test_event":
+        return "TestEvent, line: %1".format(error.line);
+    default:
+        return "No information";
+    }
+};
+
+/**
+ * @static
+ * @method _formatEventCommandInfo
+ * @private
+ */
+Graphics._formatEventCommandInfo = function(error) {
+    switch (String(error.eventCommand)) {
+    case "plugin_command":
+        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 "◆If: Script: " + error.content;
+    case "set_route_script":
+        return "◆Set Movement Route: ◇Script: " + error.content;
+    case "auto_route_script":
+        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>'));
 };
 
 /**

js/rpg_core/Utils.js

@@ -28,7 +28,7 @@ Utils.RPGMAKER_NAME = 'MV';
  */
 Utils.RPGMAKER_VERSION = "1.6.1";
 
-Utils.RPGMAKER_ENGINE = "community-1.3";
+Utils.RPGMAKER_ENGINE = "community-1.3b";
 
 /**
  * Checks whether the option is in the query string.