diff --git a/project/events.js b/project/events.js index e6d4a9c..2619f74 100644 --- a/project/events.js +++ b/project/events.js @@ -195,6 +195,24 @@ var events_c12a15a8_c380_4b28_8144_256cba95f760 = } ] } + ], + "34door": [ + { + "type": "function", + "function": "function(){\ncore.replaceBlock(540, 378, core.floorIds);\n}" + }, + { + "type": "function", + "function": "function(){\ncore.replaceBlock(539, 540, core.floorIds);\n}" + }, + { + "type": "function", + "function": "function(){\ncore.replaceBlock(538, 539, core.floorIds);\n}" + }, + { + "type": "function", + "function": "function(){\ncore.replaceBlock(378, 538, core.floorIds);\n}" + } ] } } \ No newline at end of file diff --git a/project/floors/CETAI.js b/project/floors/CETAI.js index 5afbdec..f2521c3 100644 --- a/project/floors/CETAI.js +++ b/project/floors/CETAI.js @@ -87,229 +87,255 @@ main.floors.CETAI= "condition": "(flag:cetaiJack != 1)", "true": [ { - "type": "choices", - "text": "是否跳过剧情", - "choices": [ + "type": "if", + "condition": "(core.isReplaying()||flag:SkipThePlot)", + "true": [ { - "text": "是", - "action": [] + "type": "setValue", + "name": "flag:SkipThePlot", + "value": "false" }, { - "text": "否", - "action": [ - { - "type": "showImage2", - "code": 1, - "image": "jiekezixin.png", - "sloc": [ - 0, - 0, - null - ], - "loc": [ - 350, - 75, - "289.6", - "376.8" - ], - "opacity": 1, - "time": 0 - }, - "\t[杰克].........................", - { - "type": "showImage2", - "code": 2, - "image": "shaohuzixin.png", - "sloc": [ - 0, - 0, - null - ], - "loc": [ - 80, - 50, - "291.2", - "466.4" - ], - "opacity": 1, - "time": 0 - }, - "\t[邵虎]杰克，你怎么跑这里来了？", - { - "type": "showImage2", - "code": 1, - "image": "jiekeyilv.png", - "sloc": [ - 0, - 0, - null - ], - "loc": [ - 350, - 75, - "289.6", - "376.8" - ], - "opacity": 1, - "time": 0 - }, - { - "type": "sleep", - "time": 500 - }, - "\t[杰克].......老大？", - "\t[邵虎]怎么了？", - { - "type": "showImage2", - "code": 1, - "image": "jiekezixin.png", - "sloc": [ - 0, - 0, - null - ], - "loc": [ - 350, - 75, - "289.6", - "376.8" - ], - "opacity": 1, - "time": 0 - }, - "\t[杰克]没事，刚才在想一些事情........对了，老大的毒......？", - { - "type": "if", - "condition": "core.getFlag(\"poison\",0)", - "true": [ - "\t[邵虎]..........还没有解，不过已经找到了解毒药，很快就能解掉了。" - ], - "false": [ - "\t[邵虎]已经解过了，我找到了解毒药，现在感觉探索方便多了。" - ] - }, - "\t[杰克]这样啊......不过老大看上去气色还是不对啊。", - "\t[邵虎]..........你也看出来了？我也不知道怎么回事，感觉全身上下使不上力气。", - "\t[杰克]........你是不是被腐翼咬到了？", - "\t[邵虎]..........嗯。是这个缘故吗？", - "\t[杰克]没错，腐翼的毒牙拥有衰弱的能力。在衰弱状态下老大的能力将会减半。", - "\t[杰克]要想解除，恐怕老大要拿到【解衰药水】才行。", - "\t[邵虎]【解衰药水】......好吧。我会留意的。", - { - "type": "hideImage", - "code": 1, - "time": 0 - }, - { - "type": "hideImage", - "code": 2, - "time": 0 - }, - { - "type": "animate", - "name": "shenglvehao", - "loc": [ - 11, - 3 - ] - }, - { - "type": "sleep", - "time": 1000 - }, - { - "type": "showImage2", - "code": 1, - "image": "jiekezixin.png", - "sloc": [ - 0, - 0, - null - ], - "loc": [ - 350, - 75, - "289.6", - "376.8" - ], - "opacity": 1, - "time": 0 - }, - "\t[杰克]那个.........老大。", - { - "type": "showImage2", - "code": 2, - "image": "shaohuyilv.png", - "sloc": [ - 0, - 0, - null - ], - "loc": [ - 80, - 50, - "291.2", - "466.4" - ], - "opacity": 1, - "time": 0 - }, - "\t[邵虎]怎么了？", - "\t[杰克]我想在这里多呆一会。你帮我留意一下我父亲的行踪好吗？", - { - "type": "showImage2", - "code": 2, - "image": "shaohuzixin.png", - "sloc": [ - 0, - 0, - null - ], - "loc": [ - 80, - 50, - "291.2", - "466.4" - ], - "opacity": 1, - "time": 0 - }, - "\t[邵虎]这不是一开始就说好了的吗？我一定留心。你自己小心。", - "\t[杰克]知道了。", - "\t[杰克]那这把红钥匙给老大用吧。老大也....小心点。", - { - "type": "hideImage", - "code": 1, - "time": 0 - }, - { - "type": "hideImage", - "code": 2, - "time": 0 - } + "type": "setBlock", + "number": "23", + "loc": [ + [ + 9, + 3 + ] ] + }, + { + "type": "setValue", + "name": "flag:juqing", + "value": "flag:juqing+1" + }, + { + "type": "setValue", + "name": "flag:cetaiJack", + "value": "1" + } + ], + "false": [ + { + "type": "function", + "function": "function(){\ncore.Confirmskip_On();\n}" + }, + { + "type": "showImage2", + "code": 1, + "image": "jiekezixin.png", + "sloc": [ + 0, + 0, + null + ], + "loc": [ + 350, + 75, + "289.6", + "376.8" + ], + "opacity": 1, + "time": 0 + }, + "\t[杰克].........................", + { + "type": "showImage2", + "code": 2, + "image": "shaohuzixin.png", + "sloc": [ + 0, + 0, + null + ], + "loc": [ + 80, + 50, + "291.2", + "466.4" + ], + "opacity": 1, + "time": 0 + }, + "\t[邵虎]杰克，你怎么跑这里来了？", + { + "type": "showImage2", + "code": 1, + "image": "jiekeyilv.png", + "sloc": [ + 0, + 0, + null + ], + "loc": [ + 350, + 75, + "289.6", + "376.8" + ], + "opacity": 1, + "time": 0 + }, + { + "type": "sleep", + "time": 500 + }, + "\t[杰克].......老大？", + "\t[邵虎]怎么了？", + { + "type": "showImage2", + "code": 1, + "image": "jiekezixin.png", + "sloc": [ + 0, + 0, + null + ], + "loc": [ + 350, + 75, + "289.6", + "376.8" + ], + "opacity": 1, + "time": 0 + }, + "\t[杰克]没事，刚才在想一些事情........对了，老大的毒......？", + { + "type": "if", + "condition": "core.getFlag(\"poison\",0)", + "true": [ + "\t[邵虎]..........还没有解，不过已经找到了解毒药，很快就能解掉了。" + ], + "false": [ + "\t[邵虎]已经解过了，我找到了解毒药，现在感觉探索方便多了。" + ] + }, + "\t[杰克]这样啊......不过老大看上去气色还是不对啊。", + "\t[邵虎]..........你也看出来了？我也不知道怎么回事，感觉全身上下使不上力气。", + "\t[杰克]........你是不是被腐翼咬到了？", + "\t[邵虎]..........嗯。是这个缘故吗？", + "\t[杰克]没错，腐翼的毒牙拥有衰弱的能力。\r[#fb928b]在衰弱状态下老大的能力将会减半。", + "\t[杰克]要想解除，恐怕老大要拿到【解衰药水】才行。", + "\t[邵虎]【解衰药水】......好吧。我会留意的。", + { + "type": "hideImage", + "code": 1, + "time": 0 + }, + { + "type": "hideImage", + "code": 2, + "time": 0 + }, + { + "type": "animate", + "name": "shenglvehao", + "loc": [ + 11, + 3 + ] + }, + { + "type": "sleep", + "time": 1000 + }, + { + "type": "showImage2", + "code": 1, + "image": "jiekezixin.png", + "sloc": [ + 0, + 0, + null + ], + "loc": [ + 350, + 75, + "289.6", + "376.8" + ], + "opacity": 1, + "time": 0 + }, + "\t[杰克]那个.........老大。", + { + "type": "showImage2", + "code": 2, + "image": "shaohuyilv.png", + "sloc": [ + 0, + 0, + null + ], + "loc": [ + 80, + 50, + "291.2", + "466.4" + ], + "opacity": 1, + "time": 0 + }, + "\t[邵虎]怎么了？", + "\t[杰克]我想在这里多呆一会。你帮我留意一下我父亲的行踪好吗？", + { + "type": "showImage2", + "code": 2, + "image": "shaohuzixin.png", + "sloc": [ + 0, + 0, + null + ], + "loc": [ + 80, + 50, + "291.2", + "466.4" + ], + "opacity": 1, + "time": 0 + }, + "\t[邵虎]这不是一开始就说好了的吗？我一定留心。你自己小心。", + "\t[杰克]知道了。", + "\t[杰克]那这把红钥匙给老大用吧。老大也....小心点。", + { + "type": "function", + "function": "function(){\ncore.Confirmskip_Off();\n}" + }, + { + "type": "hideImage", + "code": 1, + "time": 0 + }, + { + "type": "hideImage", + "code": 2, + "time": 0 + }, + { + "type": "setBlock", + "number": "23", + "loc": [ + [ + 9, + 3 + ] + ] + }, + { + "type": "setValue", + "name": "flag:juqing", + "value": "flag:juqing+1" + }, + { + "type": "setValue", + "name": "flag:cetaiJack", + "value": "1" } ] - }, - { - "type": "setBlock", - "number": "23", - "loc": [ - [ - 9, - 3 - ] - ] - }, - { - "type": "setValue", - "name": "flag:juqing", - "value": "flag:juqing+1" - }, - { - "type": "setValue", - "name": "flag:cetaiJack", - "value": "1" } ], "false": [ diff --git a/project/floors/MT33.js b/project/floors/MT33.js index 8a8540f..2201d2d 100644 --- a/project/floors/MT33.js +++ b/project/floors/MT33.js @@ -42,6 +42,7 @@ main.floors.MT33= "time": 0 }, "\t[老人]34层的门阵，想通过必须记住：\n黄门开过变成蓝门。\n蓝门开过变成红门。\n红门开过变成黄门。", + "\t[老人]记住，所有的门都是三次一循环。", { "type": "hideImage", "code": 1, diff --git a/project/floors/MT34.js b/project/floors/MT34.js index 0b309cc..4db1475 100644 --- a/project/floors/MT34.js +++ b/project/floors/MT34.js @@ -18,7 +18,7 @@ main.floors.MT34= [ 0,348, 4, 2,540, 2,539, 2,538, 2,540, 2, 4,352, 0], [ 0,348, 4, 2, 21,538, 21,539, 22,540, 21, 2, 4,352, 0], [ 0,348, 4, 2,539, 2,540, 2,539, 2,539, 2, 4,352, 0], - [ 0,348, 4, 2, 21,538, 22,538, 22,539, 23, 2, 4,352, 0], + [ 0,348, 4, 2, 21,538, 22,538, 22,540, 23, 2, 4,352, 0], [ 0,348, 4, 2,539, 2,539, 2,539, 2,539, 2, 4,352, 0], [ 0,348, 4, 2, 23,540, 21,538, 22,539, 22, 2, 4,352, 0], [ 0,348, 4, 2, 2, 2, 2, 2, 2, 2, 2, 2, 4,352, 0], diff --git a/project/floors/MT39.js b/project/floors/MT39.js index f5b70dd..0060e6e 100644 --- a/project/floors/MT39.js +++ b/project/floors/MT39.js @@ -332,7 +332,7 @@ main.floors.MT39= { "type": "jump", "from": [ - 2, + 3, 4 ], "dxy": [ diff --git a/project/floors/MT40.js b/project/floors/MT40.js index eba8265..ac4e646 100644 --- a/project/floors/MT40.js +++ b/project/floors/MT40.js @@ -367,7 +367,7 @@ main.floors.MT40= "time": 0 }, "\t[杰克]好。给你一瓶吧。要算是借的话，老大可没有机会还我呢。", - "\t[杰克]就当是为老大的命运之役推波助澜吧。", + "\t[杰克]就当是为老大的\r[#fb928b]命运之役\r推波助澜吧。", { "type": "hideImage", "code": 33, @@ -1470,20 +1470,6 @@ main.floors.MT40= } ] }, - { - "type": "choices", - "text": "是否跳过剧情", - "choices": [ - { - "text": "是", - "action": [] - }, - { - "text": "否", - "action": [] - } - ] - }, { "type": "setValue", "name": "flag:119", diff --git a/project/plugins.js b/project/plugins.js index a02dc86..ee204a4 100644 --- a/project/plugins.js +++ b/project/plugins.js @@ -1536,6 +1536,15 @@ var plugins_bb40132b_638b_4a9f_b028_d3fe47acc8d1 = } } + ////// 某个点是否存在楼梯 ////// + maps.prototype.stairExists = function (x, y, floorId) { + var blockId = this.getBlockId(x, y, floorId); + if (blockId == null) return false; + var ids = ['upFloor', 'downFloor']; + ids = ids.concat(['leftPortal', 'rightPortal', 'upPortal', 'downPortal']); ///密室入口不为楼梯，不可楼传portal + return ids.indexOf(blockId) >= 0; + } + }, "drawLight": function () {