diff --git a/libs/events.js b/libs/events.js index 9575ea35..990a9cc4 100644 --- a/libs/events.js +++ b/libs/events.js @@ -2139,7 +2139,7 @@ events.prototype._action_wait = function (data, x, y, prefix) { if (code.indexOf("input:") == 0) { if (code == "input:none") { core.status.route.push("input:none"); - core.removeFlag("type"); + core.setFlag("type", -1); } else { var value = parseInt(code.substring(6)); core.status.route.push("input:" + value); diff --git a/libs/utils.js b/libs/utils.js index ed37a2bc..83a1b8ee 100644 --- a/libs/utils.js +++ b/libs/utils.js @@ -515,6 +515,8 @@ utils.prototype._encodeRoute_encodeOne = function (t) { return "e" + this._encodeRoute_id2number(t.substring(6)) + ":"; else if (t.indexOf('fly:') == 0) return "F" + t.substring(4) + ":"; + else if (t == 'choices:none') + return "c"; else if (t.indexOf('choices:') == 0) return "C" + t.substring(8); else if (t.indexOf('shop:') == 0) @@ -525,6 +527,8 @@ utils.prototype._encodeRoute_encodeOne = function (t) { return "t" + t.substring(5).substring(0, 1).toUpperCase() + ":"; else if (t == 'getNext') return 'G'; + else if (t == 'input:none') + return 'p'; else if (t.indexOf('input:') == 0) return "P" + t.substring(6); else if (t.indexOf('input2:') == 0) @@ -621,6 +625,9 @@ utils.prototype._decodeRoute_decodeOne = function (decodeObj, c) { case "F": decodeObj.ans.push("fly:" + nxt); break; + case 'c': + decodeObj.ans.push('choices:none'); + break; case "C": decodeObj.ans.push("choices:" + nxt); break; @@ -649,6 +656,9 @@ utils.prototype._decodeRoute_decodeOne = function (decodeObj, c) { case "G": decodeObj.ans.push("getNext"); break; + case "p": + decodeObj.ans.push("input:none"); + break; case "P": decodeObj.ans.push("input:" + nxt); break;