diff --git a/project/data.js b/project/data.js index 096c919..f68625a 100644 --- a/project/data.js +++ b/project/data.js @@ -658,7 +658,7 @@ var data_a1e2fb4a_e986_4524_b0da_9b7ba7c0874d = "lv": 1, "hpmax": 1000, "hp": 1000, - "manamax": -1, + "manamax": 602214, "mana": 100, "atk": 10, "def": 10, @@ -1225,7 +1225,7 @@ var data_a1e2fb4a_e986_4524_b0da_9b7ba7c0874d = 44, 1 ], - "condition": "flag:shop1>200&&flag:shop1<292", + "condition": "flag:shop1>200&&flag:shop1<392", "action": [ { "type": "comment", @@ -1260,7 +1260,7 @@ var data_a1e2fb4a_e986_4524_b0da_9b7ba7c0874d = 44, 1 ], - "condition": "flag:shop1>=292", + "condition": "flag:shop1>=392", "action": [ { "type": "comment", @@ -1394,7 +1394,7 @@ var data_a1e2fb4a_e986_4524_b0da_9b7ba7c0874d = 246, 1 ], - "condition": "flag:shop1>200&&flag:shop1<292", + "condition": "flag:shop1>200&&flag:shop1<392", "action": [ { "type": "comment", @@ -1429,7 +1429,7 @@ var data_a1e2fb4a_e986_4524_b0da_9b7ba7c0874d = 246, 1 ], - "condition": "flag:shop1>=292", + "condition": "flag:shop1>=392", "action": [ { "type": "comment", @@ -1657,7 +1657,7 @@ var data_a1e2fb4a_e986_4524_b0da_9b7ba7c0874d = 149, 1 ], - "condition": "flag:shop1>200&&flag:shop1<292", + "condition": "flag:shop1>200&&flag:shop1<392", "action": [ { "type": "comment", @@ -1698,7 +1698,7 @@ var data_a1e2fb4a_e986_4524_b0da_9b7ba7c0874d = 149, 1 ], - "condition": "flag:shop1>=292", + "condition": "flag:shop1>=392", "action": [ { "type": "comment", diff --git a/project/enemys.js b/project/enemys.js index 5213c57..b7fc77d 100644 --- a/project/enemys.js +++ b/project/enemys.js @@ -512,7 +512,7 @@ var enemys_fcae963b_31c9_42b4_b48c_bb48d09f3f80 = "E1168": {"name":"火蝙蝠","hp":60000000,"atk":405000,"def":98000,"money":300,"exp":0,"point":0,"special":[35]}, "E1169": {"name":"幽冥魔君","hp":10000000,"atk":940000,"def":465000,"money":1000,"exp":0,"point":0,"special":[30],"level":"八阶无上","value30_1":10000,"value30_2":50,"displayIdInBook":null}, "E1170": {"name":"新敌人","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":[]}, - "E1171": {"name":"美面魔帝","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":[],"level":"九阶无上"}, + "E1171": {"name":"美面魔帝","hp":100000000,"atk":3200000,"def":0,"money":0,"exp":0,"point":0,"special":[30],"level":"九阶无上","value30_1":602214,"value30_2":200}, "E1172": {"name":"新敌人","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":[]}, "E1173": {"name":"新敌人","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":[]}, "E1174": {"name":"火焰史莱姆王","hp":8000000,"atk":68000,"def":16040,"money":192,"exp":0,"point":0,"special":[21,35,39],"Mdefvalue":null,"mdefValue":100,"Atkvalue":35,"Defvalue":35}, @@ -521,7 +521,7 @@ var enemys_fcae963b_31c9_42b4_b48c_bb48d09f3f80 = "E1177": {"name":"新敌人","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":[]}, "E1178": {"name":"新敌人","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":[]}, "E1179": {"name":"冰骨蝙蝠","hp":480000000000,"atk":60000000,"def":24500000,"money":30000,"exp":0,"point":0,"special":[42]}, - "E1180": {"name":"新敌人","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":[],"bigImage":"dragonknight_1.png"}, + "E1180": {"name":"新敌人","hp":36000000,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":[10,17],"bigImage":"dragonknight_1.png"}, "E1246": {"name":"混沌魔君(阵法削弱状态)","hp":5000000000000,"atk":100000000,"def":20000000,"money":100000,"exp":0,"point":0,"special":[2],"description":"灵兽榜上第二名，混沌属性最强灵兽","notBomb":true}, "E827": {"name":"新敌人","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":[]}, "E988": {"name":"新敌人","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":[]}, @@ -620,7 +620,7 @@ var enemys_fcae963b_31c9_42b4_b48c_bb48d09f3f80 = "E1136": {"name":"深渊巨龙","hp":20000000,"atk":1000000,"def":350000,"money":5000,"exp":0,"point":0,"special":[30,35],"level":"九阶无上","value30_1":10000,"value30_2":60}, "E1159": {"name":"新敌人","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":[]}, "E1160": {"name":"棒锥","hp":10000000,"atk":940000,"def":465000,"money":1000,"exp":0,"point":0,"special":[30],"level":"八阶无上","value30_1":10000,"value30_2":50}, - "E1181": {"name":"新敌人","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":[],"bigImage":"dragon1_compress_0.png"}, - "E1182": {"name":"新敌人","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":[],"bigImage":"dragon1_compress_1.png"}, - "E1183": {"name":"新敌人","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":[],"bigImage":"octopus_1.png"} + "E1181": {"name":"新敌人","hp":10000,"atk":5000,"def":0,"money":0,"exp":0,"point":0,"special":[2,3,9],"bigImage":"dragon1_compress_0.png","purify":-9}, + "E1182": {"name":"新敌人","hp":25,"atk":2000000,"def":0,"money":0,"exp":0,"point":0,"special":[3],"bigImage":"dragon1_compress_1.png"}, + "E1183": {"name":"新敌人","hp":1000000000,"atk":40000,"def":0,"money":0,"exp":0,"point":0,"special":[2],"bigImage":"octopus_1.png"} } \ No newline at end of file diff --git a/project/events.js b/project/events.js index 59d9a1f..e296e39 100644 --- a/project/events.js +++ b/project/events.js @@ -48,7 +48,7 @@ var events_c12a15a8_c380_4b28_8144_256cba95f760 = "回收钥匙商店": [ { "type": "function", - "function": "function(){\nif (core.hasEquip('I409')) { core.status.hero.mana += 1 }\nif (core.hasEquip('I410')) { core.status.hero.mana += 3 }\nif (core.hasEquip('I411')) { core.status.hero.mana += 5 }\nif (core.hasEquip('I412')) { core.status.hero.mana += 7 }\nif (core.hasEquip('I413')) { core.status.hero.mana += 9 }\nif (core.hasEquip('I595')) { core.status.hero.mana += 20 }\nif (core.hasEquip('I1115')) { core.status.hero.mana += 10 }\nif (core.hasEquip('I1116')) { core.status.hero.mana += 10 }\nif (core.hasItem('I722')) { core.status.hero.mana += (core.getEnemyInfo('', null, x, y).hp || 0) / 2500 }\nif (core.hasEquip('I723')) { core.status.hero.hp += core.status.hero.hpmax / 200 }\nif (core.hasItem('coin')) core.status.hero.money += 12;\nflags.lhjnb = (flags.lhjnb || 0) + (core.getEnemyInfo('', null, x, y).money || 0)\n}" + "function": "function(){\nif (core.hasEquip('I409')) { core.status.hero.mana += 1 }\nif (core.hasEquip('I410')) { core.status.hero.mana += 3 }\nif (core.hasEquip('I411')) { core.status.hero.mana += 5 }\nif (core.hasEquip('I412')) { core.status.hero.mana += 7 }\nif (core.hasEquip('I413')) { core.status.hero.mana += 9 }\nif (core.hasEquip('I595')) { core.status.hero.mana += 20 }\nif (core.hasEquip('I1115')) { core.status.hero.mana += 10 }\nif (core.hasEquip('I1116')) { core.status.hero.mana += 10 }\nif (core.hasItem('I722')) { core.status.hero.mana += Math.min(50, Math.sqrt((core.getEnemyInfo('', null, x, y).hp || 0) / 500)) }\nif (core.hasEquip('I723')) { core.status.hero.hp += core.status.hero.hpmax / 200 }\nif (core.hasItem('coin')) core.status.hero.money += 12;\nflags.lhjnb = (flags.lhjnb || 0) + (core.getEnemyInfo('', null, x, y).money || 0)\n}" } ] } diff --git a/project/floors/GM1.js b/project/floors/GM1.js index b91633b..59972a2 100644 --- a/project/floors/GM1.js +++ b/project/floors/GM1.js @@ -92,7 +92,8 @@ main.floors.GM1= ] ], "remove": true - } + }, + "\t[莫析辉,hero]\b[hero]\\c[30]本塔存在幸运金币，和打怪回魔力的法杖，且越到后面获得的法杖回魔力效果越强，因此建议留怪。" ], "eachArrive": [], "parallelDo": "", diff --git a/project/floors/LZ1.js b/project/floors/LZ1.js index da9edd2..d72baff 100644 --- a/project/floors/LZ1.js +++ b/project/floors/LZ1.js @@ -15,7 +15,8 @@ main.floors.LZ1= "bgm": "bgm.mp3", "firstArrive": [ "龙族剧情按照与圣骑士亲密度极好情况进行（亲密度不够依旧按照亲密度达到进行），玩法还是按照实际亲密度进行（亲密度不够不会额外获得帮助）。", - "因圣骑士唐佳成的感应，光明圣子莫析辉与圣骑士二人来到了龙族，这块神秘的，远离光明神殿的岛屿……" + "因圣骑士唐佳成的感应，光明圣子莫析辉与圣骑士二人来到了龙族，这块神秘的，远离光明神殿的岛屿……", + "本区和魔界区为并行，魔界区请到隐世学院10开传送门。" ], "eachArrive": [], "parallelDo": "", diff --git a/project/floors/MJ1.js b/project/floors/MJ1.js index b4b6a1d..a03884d 100644 --- a/project/floors/MJ1.js +++ b/project/floors/MJ1.js @@ -28,8 +28,11 @@ main.floors.MJ1= "events": {}, "changeFloor": { "12,1": { - "floorId": ":next", - "stair": "downFloor" + "floorId": "MJ2", + "loc": [ + 12, + 0 + ] }, "6,11": { "floorId": "YS10", diff --git a/project/floors/MJ5.js b/project/floors/MJ5.js index f690886..3f6c2e7 100644 --- a/project/floors/MJ5.js +++ b/project/floors/MJ5.js @@ -27,7 +27,7 @@ main.floors.MJ5= "11,11": [ { "type": "if", - "condition": "(flag:shengqishi>=72)", + "condition": "(flag:shengqishi>=99)", "true": [ { "type": "hide", @@ -35,7 +35,7 @@ main.floors.MJ5= } ], "false": [ - "与圣骑士亲密度没有达到72，不允许通行" + "与圣骑士亲密度没有达到99，不允许通行" ] } ] @@ -76,6 +76,86 @@ main.floors.MJ5= "name": "flag:door_MJ5_6_2", "operator": "+=", "value": "1" + }, + { + "type": "hide", + "loc": [ + [ + 5, + 5 + ] + ], + "remove": true + }, + { + "type": "hide", + "loc": [ + [ + 5, + 6 + ] + ], + "remove": true + }, + { + "type": "hide", + "loc": [ + [ + 5, + 7 + ] + ], + "remove": true + }, + { + "type": "hide", + "loc": [ + [ + 6, + 5 + ] + ], + "remove": true + }, + { + "type": "hide", + "loc": [ + [ + 6, + 6 + ] + ], + "remove": true + }, + { + "type": "hide", + "loc": [ + [ + 7, + 5 + ] + ], + "remove": true + }, + { + "type": "hide", + "loc": [ + [ + 7, + 6 + ] + ], + "remove": true + }, + { + "type": "hide", + "loc": [ + [ + 7, + 7 + ] + ], + "remove": true } ] }, diff --git a/project/floors/ZH1.js b/project/floors/ZH1.js index cce4fb4..183c094 100644 --- a/project/floors/ZH1.js +++ b/project/floors/ZH1.js @@ -131,7 +131,7 @@ main.floors.ZH1= "你已经购买了此物" ], "false": [ - "魔力卷轴，购买价格5000金币，效果：击败敌人后额外获得敌人生命值2‱魔力值。", + "魔力卷轴，购买价格5000金币，效果：击败敌人后额外获得敌人生命值20‱再开根号的魔力值，最多50点。", { "type": "choices", "text": "\t[魔力卷轴,I722]选择", @@ -320,6 +320,16 @@ main.floors.ZH1= "type": "if", "condition": "switch:A", "true": [ + { + "type": "if", + "condition": "((item:I1115 && core.hasEquip('I1116'))||(item:I1116 && core.hasEquip('I1115')))", + "true": [ + { + "type": "unloadEquip", + "pos": 0 + } + ] + }, { "type": "if", "condition": "((item:I1115===1)&&(item:I1116===1))", @@ -353,7 +363,9 @@ main.floors.ZH1= "value": "1" } ], - "false": [] + "false": [ + "\t[涂歆,N558]\b[this]生命卷轴和魔力卷轴为咸鱼卷轴，MAX玩家不建议购买" + ] } ], "false": [ @@ -364,7 +376,8 @@ main.floors.ZH1= "type": "setValue", "name": "switch:A", "value": "true" - } + }, + "\t[涂歆,N558]\b[this]生命卷轴和魔力卷轴为咸鱼卷轴，MAX玩家不建议购买" ] } ] diff --git a/project/functions.js b/project/functions.js index d59399f..480b099 100644 --- a/project/functions.js +++ b/project/functions.js @@ -417,11 +417,11 @@ var functions_d6ad677b_427a_4623_b50f_a445a3b0ef8a = if (core.hasEquip('I411')) { core.status.hero.mana += 5 } if (core.hasEquip('I412')) { core.status.hero.mana += 7 } if (core.hasEquip('I413')) { core.status.hero.mana += 9 } - if (core.hasEquip('I595')) { core.status.hero.mana += 20 } + if (core.hasEquip('I595')) { core.status.hero.mana += 100 } if (core.hasEquip('I1115')) { core.status.hero.mana += 10 } if (core.hasEquip('I1116')) (core.status.hero.mana += 10) - if (core.hasItem('I722')) { core.status.hero.mana += damageInfo.mon_hp / 5000 } + if (core.hasItem('I722')) { core.status.hero.mana += Math.min(Math.sqrt(damageInfo.mon_hp / 500), 50) } //回复生命值 // 事件的处理 var todo = []; diff --git a/project/items.js b/project/items.js index e4995df..fba5601 100644 --- a/project/items.js +++ b/project/items.js @@ -1222,7 +1222,7 @@ var items_296f5d02_12fd_4166_a7c1_b5e830c9ee3a = "cls": "equips", "name": "七彩圣杖", "canUseItemEffect": "true", - "text": "全属性提升25%，击败怪物后获得20点魔力值", + "text": "全属性提升25%，击败怪物后获得100点魔力值", "equip": { "type": "法杖", "value": {}, @@ -2793,7 +2793,7 @@ var items_296f5d02_12fd_4166_a7c1_b5e830c9ee3a = "cls": "constants", "name": "魔力卷轴", "canUseItemEffect": "true", - "text": "战后恢复敌人生命万分之二魔力值", + "text": "战后恢复敌人生命千分之二再开根号的魔力值，最多50点", "equip": { "type": "卷轴", "value": {}, diff --git a/project/plugins.js b/project/plugins.js index a21db55..4d1e4e7 100644 --- a/project/plugins.js +++ b/project/plugins.js @@ -2826,7 +2826,7 @@ var plugins_bb40132b_638b_4a9f_b028_d3fe47acc8d1 = if (hero[name] < 0) num = '-'.concat(num) } - if (name === 'atk' || name === 'def' || name === 'mdef') num = core.getRealStatus(name).toString() + if (name === 'atk' || name === 'def' || name === 'mdef' || name === 'hpmax') num = core.getRealStatus(name).toString() for (var i in num) { core.drawIcon(ctx, 'X' + (10304), x + 5 + 10 * Number(i), y, 16, 16) if (num[i] === '.') @@ -3144,7 +3144,7 @@ var plugins_bb40132b_638b_4a9f_b028_d3fe47acc8d1 = var text = [ //['等级', hero.lv + ' ' + leveltext[hero.lv - 1][0]], //['经验', hero.exp + '/' + need], - ['血限', (hero.hpmax < 0 ? '\r[red]' : '') + hero.hpmax + '\r'], + ['血限', (hero.hpmax < 0 ? '\r[red]' : '') + core.getRealStatus('hpmax') + '\r'], ['生命', (hero.mdef < 0 ? '\r[red]' : '') + hero.hp + '\r'], ['攻击', (hero.atk < 0 ? '\r[red]' : '') + hero.atk + '\r'], ['防御', (hero.def < 0 ? '\r[red]' : '') + hero.def + '\r'], @@ -3255,7 +3255,7 @@ var plugins_bb40132b_638b_4a9f_b028_d3fe47acc8d1 = core.mystatusNumber(ctx, 'hp', null, 80 + 12, 122, 250); } var need = core.firstData.levelUp[core.status.hero.lv].need; - core.drawImage(ctx, 'manaLt.png', 0, 0, 128 * hero.hp / hero.hpmax, 32, 60 - 16 + 4, 142, 128 * hero.hp / hero.hpmax, 32) + core.drawImage(ctx, 'manaLt.png', 0, 0, 128 * hero.hp / core.getRealStatus('hpmax'), 32, 60 - 16 + 4, 142, 128 * hero.hp / core.getRealStatus('hpmax'), 32) core.drawImage(ctx, 'manaL.png', 0, 0, 128, 32, 60 - 16 + 4, 142, 128, 32) //状态 var heroStatus = ['atk', 'mdef', 'key1']