diff --git a/public/libs/utils.js b/public/libs/utils.js index 4edd6e5..6ade42c 100644 --- a/public/libs/utils.js +++ b/public/libs/utils.js @@ -132,11 +132,11 @@ utils.prototype.replaceValue = function (value) { /temp:([a-zA-Z0-9_]+)/g, "core.getFlag('@temp@$1', 0)" ); - if (value.indexOf('switch:') >= 0) - value = value.replace( - /switch:([a-zA-Z0-9_]+)/g, - "core.getFlag('" + (prefix || ':f@x@y') + "@$1', 0)" - ); + // if (value.indexOf('switch:') >= 0) + // value = value.replace( + // /switch:([a-zA-Z0-9_]+)/g, + // "core.getFlag('" + (prefix || ':f@x@y') + "@$1', 0)" + // ); } return value; }; diff --git a/public/project/floors/MT56.js b/public/project/floors/MT56.js index c7c1aa0..433668e 100644 --- a/public/project/floors/MT56.js +++ b/public/project/floors/MT56.js @@ -63,7 +63,7 @@ main.floors.MT56= [648, 0, 33, 27, 0,563, 0,657,484, 28,648,378, 0,482,648], [648,648,648,648,220,648,494,648,648,648,648,596,648,648,648], [648, 0,482, 0, 0,648, 27, 0,648, 0,648, 0, 0, 0,648], - [ 92, 0,648,648,657,706,484, 29,596,103,539,482, 0,482, 94], + [ 92, 0,648,648,657,648,484, 29,596,103,539,482, 0,482, 94], [648, 0,648,660,484,648, 28, 0,648, 27,648,648,648,492,648], [648,578,648,648,648,648,648,648,648, 0,648, 28,243, 0,648], [648, 0,381,482, 28, 0,492,482,648, 33,648, 0,648,381,648], @@ -73,21 +73,7 @@ main.floors.MT56= [648,648,648,648,648,648,648, 93,648,648,648,648,648,648,648] ], "bgmap": [ - [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], - [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], - [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], - [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], - [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], - [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], - [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], - [ 0, 0, 0, 0, 0,648, 0, 0, 0, 0, 0, 0, 0, 0, 0], - [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], - [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], - [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], - [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], - [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], - [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], - [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0] + ], "fgmap": [ diff --git a/public/project/floors/MT57.js b/public/project/floors/MT57.js index 3172cde..f93cb27 100644 --- a/public/project/floors/MT57.js +++ b/public/project/floors/MT57.js @@ -23,7 +23,7 @@ main.floors.MT57= "7,1": [ { "type": "if", - "condition": "(!switch:A)", + "condition": "(!flag:palace1)", "true": [ { "type": "openDoor", @@ -59,7 +59,7 @@ main.floors.MT57= }, { "type": "setValue", - "name": "switch:A", + "name": "flag:palace1", "value": "true" } ]