diff --git a/project/floors/GM1.js b/project/floors/GM1.js index 9f3e856..893cc51 100644 --- a/project/floors/GM1.js +++ b/project/floors/GM1.js @@ -119,6 +119,24 @@ main.floors.GM1= "type": "changeFloor", "floorId": "GM4" }, + { + "type": "changeFloor", + "floorId": "GM5" + }, + { + "type": "trigger", + "loc": [ + 4, + 9 + ] + }, + { + "type": "trigger", + "loc": [ + 8, + 5 + ] + }, { "type": "changeFloor", "floorId": "BH1" diff --git a/project/floors/GM2.js b/project/floors/GM2.js index bcc8e54..d90ad9a 100644 --- a/project/floors/GM2.js +++ b/project/floors/GM2.js @@ -303,7 +303,7 @@ main.floors.GM2= [50049,50165,60356,442, 0, 0, 0, 0, 0,441,60356,50165,50049], [50049,101, 0, 0, 0,60330,60331,60332, 0, 0, 0,101,50049], [50049,102, 0, 0, 0,60336,465,60337,466, 0, 0,102,50049], - [50049, 92, 0, 0, 0, 0, 0, 0, 0, 0, 0, 94,50049], + [50049, 92, 0, 0, 0, 0, 0, 0, 0, 0,30204, 94,50049], [50049,101, 0, 0,60353,552, 0,547,60354, 0, 0,101,50049], [50049,102, 0, 0, 0, 0, 0, 0, 0, 0, 0,102,50049], [50049, 0, 0,580,60353,568, 0,490,60354,474, 0, 0,50049], diff --git a/project/plugins.js b/project/plugins.js index 069b5df..a6db562 100644 --- a/project/plugins.js +++ b/project/plugins.js @@ -185,16 +185,21 @@ var plugins_bb40132b_638b_4a9f_b028_d3fe47acc8d1 = for (var i of fazhang_) if (core.status.hero.equipment.includes(i) || core.hasItem(i)) fazhang = i; juanzhou = core.clone(juanzhou_).filter(i => core.status.hero.equipment.includes(i) || core.hasItem(i)); + var haveI720 = juanzhou.includes('I720'); flags.saveEquips = [] if (flags.shop3) { while (juanzhou.length < 2) juanzhou.push(null); for (var i = 0; i < juanzhou.length; i++) for (var j = i + 1; j < juanzhou.length; j++) - flags.saveEquips.push([yifu, juanzhou[i], fazhang, juanzhou[j]]); + if (haveI720 && (![juanzhou[i], juanzhou[j]].includes('I720')) && (['I718', 'I719'].includes(juanzhou[i]) || ['I718', 'I719'].includes(juanzhou[j]))); + else + flags.saveEquips.push([yifu, juanzhou[i], fazhang, juanzhou[j]]); } else { while (juanzhou.length < 1) juanzhou.push(null); for (var i = 0; i < juanzhou.length; i++) - flags.saveEquips.push([yifu, juanzhou[i], fazhang]); + if (haveI720 && juanzhou[i] != 'I720' && ['I718', 'I719'].includes(juanzhou[i])); + else + flags.saveEquips.push([yifu, juanzhou[i], fazhang]); }