diff --git a/public/libs/control.js b/public/libs/control.js index 5d86005..220c240 100644 --- a/public/libs/control.js +++ b/public/libs/control.js @@ -3127,11 +3127,6 @@ control.prototype.getBuff = function (name) { return core.getFlag('__' + name + '_buff__', 1); }; -////// 获得或移除毒衰咒效果 ////// -control.prototype.triggerDebuff = function (action, type) { - return this.controldata.triggerDebuff(action, type); -}; - ////// 设置勇士的位置 ////// control.prototype.setHeroLoc = function (name, value, noGather) { if (!core.status.hero) return; diff --git a/public/project/floors/MT43.js b/public/project/floors/MT43.js index cfd7525..f2bc3e4 100644 --- a/public/project/floors/MT43.js +++ b/public/project/floors/MT43.js @@ -36,7 +36,7 @@ main.floors.MT43= [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 94], [70030, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,584], [70030,584,584,584,584,584, 0, 0, 0, 0, 0, 0, 0, 0,584], - [70030, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,584], + [70030, 0, 0, 0, 0, 0, 0, 0, 0, 0,584,584,584, 0,584], [70030, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,584], [584,584,584,584,584, 0, 0, 0, 0, 0,584,584,584,584,584], [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], diff --git a/public/project/functions.js b/public/project/functions.js index 3df24e5..da8c784 100644 --- a/public/project/functions.js +++ b/public/project/functions.js @@ -1415,12 +1415,6 @@ var functions_d6ad677b_427a_4623_b50f_a445a3b0ef8a = { }[name] || name ); }, - triggerDebuff: function (action, type) { - // 毒衰咒效果的获得与解除 - // action:获得还是解除;'get'表示获得,'remove'表示解除 - // type:一个数组表示获得了哪些毒衰咒效果;poison, weak,curse - if (!(type instanceof Array)) type = [type]; - }, updateStatusBar: function () { // 更新状态栏 diff --git a/public/project/items.js b/public/project/items.js index c1a0433..5b208c9 100644 --- a/public/project/items.js +++ b/public/project/items.js @@ -439,28 +439,28 @@ var items_296f5d02_12fd_4166_a7c1_b5e830c9ee3a = "cls": "tools", "name": "解毒药水", "text": "可以解除中毒状态", - "useItemEffect": "core.triggerDebuff('remove', 'poison');", + "useItemEffect": "", "canUseItemEffect": "core.hasFlag('poison');" }, "weakWine": { "cls": "tools", "name": "解衰药水", "text": "可以解除衰弱状态", - "useItemEffect": "core.triggerDebuff('remove', 'weak');", + "useItemEffect": "", "canUseItemEffect": "core.hasFlag('weak');" }, "curseWine": { "cls": "tools", "name": "解咒药水", "text": "可以解除诅咒状态", - "useItemEffect": "core.triggerDebuff('remove', 'curse');", + "useItemEffect": "", "canUseItemEffect": "core.hasFlag('curse');" }, "superWine": { "cls": "tools", "name": "万能药水", "text": "可以解除所有不良状态", - "useItemEffect": "core.triggerDebuff('remove', ['poison', 'weak', 'curse']);", + "useItemEffect": "", "canUseItemEffect": "(function() {\n\treturn core.hasFlag('poison') || core.hasFlag('weak') || core.hasFlag('curse');\n})();" }, "hammer": { diff --git a/public/project/maps.js b/public/project/maps.js index e08cc1d..406c0a2 100644 --- a/public/project/maps.js +++ b/public/project/maps.js @@ -11,9 +11,9 @@ var maps_90f36752_8815_4be8_b32b_d7fad1d0542e = "9": {"cls":"terrains","id":"pinkShopLeft"}, "10": {"cls":"terrains","id":"pinkShopRight"}, "11": {"cls":"animates","id":"lavaNet","canPass":true,"trigger":"null","script":"(function () {\n\t// 血网的伤害效果移动到 checkBlock 中处理\n\n\t// 如果要做一次性血网,可直接注释掉下面这句话:\n\t// core.removeBlock(core.getHeroLoc('x'), core.getHeroLoc('y'));\n})();","name":"血网"}, - "12": {"cls":"animates","id":"poisonNet","canPass":true,"trigger":"null","script":"(function () {\n\tif (!core.hasItem('amulet')) {\n\t\tcore.triggerDebuff('get', 'poison');\n\t\tcore.updateStatusBar();\n\t}\n\n\t// 如果要做一次性毒网,可直接注释掉下面这句话:\n\t// core.removeBlock(core.getHeroLoc('x'), core.getHeroLoc('y'));\n})()","name":"毒网"}, - "13": {"cls":"animates","id":"weakNet","canPass":true,"trigger":"null","script":"(function () {\n\tif (!core.hasItem('amulet')) {\n\t\tcore.triggerDebuff('get', 'weak');\n\t\tcore.updateStatusBar();\n\t}\n\n\t// 如果要做一次性衰网,可直接注释掉下面这句话:\n\t// core.removeBlock(core.getHeroLoc('x'), core.getHeroLoc('y'));\n})()","name":"衰网"}, - "14": {"cls":"animates","id":"curseNet","canPass":true,"trigger":"null","script":"(function () {\n\tif (!core.hasItem('amulet')) {\n\t\tcore.triggerDebuff('get', 'curse');\n\t\tcore.updateStatusBar();\n\t}\n\n\t// 如果要做一次性咒网,可直接注释掉下面这句话:\n\t// core.removeBlock(core.getHeroLoc('x'), core.getHeroLoc('y'));\n})()","name":"咒网"}, + "12": {"cls":"animates","id":"poisonNet","canPass":true,"trigger":"null","script":"","name":"毒网"}, + "13": {"cls":"animates","id":"weakNet","canPass":true,"trigger":"null","script":"","name":"衰网"}, + "14": {"cls":"animates","id":"curseNet","canPass":true,"trigger":"null","script":"","name":"咒网"}, "15": {"cls":"animates","id":"blueWater"}, "16": {"cls":"animates","id":"water"}, "20": {"cls":"autotile","id":"autotile"}, diff --git a/src/types/control.d.ts b/src/types/control.d.ts index 321b45a..4055caf 100644 --- a/src/types/control.d.ts +++ b/src/types/control.d.ts @@ -734,13 +734,6 @@ interface Control { */ getBuff(name: keyof NumbericHeroStatus): number; - /** - * 变更勇士的debuff - * @param action 触发的类型,get表示获得debuff,remove表示移除debuff - * @param type 获取的debuff列表 - */ - triggerDebuff(action: string, type: string | string[]): void; - /** * 设置勇士位置 * 值得注意的是,这句话虽然会使勇士改变位置,但并不会使界面重新绘制; diff --git a/src/types/function.d.ts b/src/types/function.d.ts index da25f9b..507c077 100644 --- a/src/types/function.d.ts +++ b/src/types/function.d.ts @@ -26,13 +26,6 @@ interface ControlData { */ getStatusLabel(name: string): string; - /** - * 变更勇士的debuff - * @param action 触发的类型,get表示获得debuff,remove表示移除debuff - * @param type 获取的debuff列表 - */ - triggerDebuff(action: 'get' | 'remove', type: string | string[]): void; - /** * 立即仅更新状态栏 */