增加咸鱼道具圣杯；圣骑士打龙也会获得金币；计分点改成GM1；删除确认要跳过剧情吗

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 += 100 }\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}"
+				"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 += 100 }\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('I421')) { core.status.hero.mana += Math.min(10000, (core.getEnemyInfo('', null, x, y).hp || 0) / 5000) }\nif (core.hasItem('I421')) { core.status.hero.hp += core.status.hero.hpmax / 100 }\n\nif (core.hasItem('coin')) core.status.hero.money += 12;\nflags.lhjnb = (flags.lhjnb || 0) + (core.getEnemyInfo('', null, x, y).money || 0)\n}"
 			}
 		]
 	}

project/floors/BN10.js

@@ -14,35 +14,20 @@ main.floors.BN10=
     "defaultGround": "X10003",
     "bgm": "ending.mp3",
     "firstArrive": [
+        "\t[北纳逸,E1012]\b[this,6,5]你来啦",
         {
-            "type": "confirm",
+            "type": "moveHero",
-            "text": "确认要跳过剧情吗?",
+            "time": 500,
-            "yes": [
+            "steps": [
-                {
+                "up:5"
-                    "type": "moveHero",
-                    "time": 500,
-                    "steps": [
-                        "up:5"
-                    ]
-                }
-            ],
-            "no": [
-                "\t[北纳逸,E1012]\b[this,6,5]你来啦",
-                {
-                    "type": "moveHero",
-                    "time": 500,
-                    "steps": [
-                        "up:5"
-                    ]
-                },
-                "\t[莫析辉,hero]\b[hero]见过北纳叔叔",
-                "\t[北纳逸,E1012]\b[this,6,5]你是光明神殿未来的少主，用不着与我行礼。",
-                "\t[莫析辉,hero]\b[hero]光明神殿的光明圣女是您的女儿，与我同级，无论如何，叔叔都比我大上一点。",
-                "\t[北纳逸,E1012]\b[this,6,5]莫析家族的少主这张嘴真是越来越伶俐了",
-                "\t[莫析辉,hero]\b[hero]您知道我来找您是做什么的",
-                "\t[北纳逸,E1012]\b[this,6,5]当然知道。既然如此，那还等什么？出手吧！"
             ]
-        }
+        },
+        "\t[莫析辉,hero]\b[hero]见过北纳叔叔",
+        "\t[北纳逸,E1012]\b[this,6,5]你是光明神殿未来的少主，用不着与我行礼。",
+        "\t[莫析辉,hero]\b[hero]光明神殿的光明圣女是您的女儿，与我同级，无论如何，叔叔都比我大上一点。",
+        "\t[北纳逸,E1012]\b[this,6,5]莫析家族的少主这张嘴真是越来越伶俐了",
+        "\t[莫析辉,hero]\b[hero]您知道我来找您是做什么的",
+        "\t[北纳逸,E1012]\b[this,6,5]当然知道。既然如此，那还等什么？出手吧！"
     ],
     "eachArrive": [],
     "parallelDo": "",

project/floors/GM1.js

@@ -327,6 +327,72 @@ main.floors.GM1=
                 "type": "turnBlock",
                 "direction": "up"
             }
+        ],
+        "0,9": [
+            "这里可以计分。\n本塔的计分方式是攻击+防御+护盾/6+血限/300。如果买了额外的装备孔则分数+5000。\n圣骑士路线拿到火焰纹章后可以将分数乘以1.2。\n这里可以把神之血和琼浆玉露卖掉，然后在商店加点换取分数。\n钥匙也可以按照商店的原价卖掉。",
+            "圣骑士结局：\n和圣骑士亲密度>=100\n黑暗圣子结局：\n融合黑暗圣子，和圣骑士亲密度在-1~99之间，和准圣子及圣女亲密度均<5\n光明圣子或光明圣女结局：\n不融合黑暗圣子，和圣骑士亲密度在-1~99之间，准圣子或圣女亲密度>5\n黑暗圣子+光明圣子或光明圣女结局：\n融合黑暗圣子，和圣骑士亲密度在-1~99之间，准圣子或圣女亲密度>5\n孤胆英雄结局：\n不融合黑暗圣子，和圣骑士亲密度在-1~99之间，和准圣子及圣女亲密度均<5\n天命主角结局：\n和圣骑士亲密度<=-2",
+            "这里由于部分内容还没实装，因此这里圣骑士结局需要圣骑士的亲密度需求为90，且火焰纹章不可能拿到，且准圣子或圣女亲密度视为>5。",
+            {
+                "type": "openShop",
+                "id": "itemShop",
+                "open": true
+            },
+            {
+                "type": "setValue",
+                "name": "status:money",
+                "operator": "+=",
+                "value": "item:I710*100+item:I711*200+item:I712*300+item:I713*400+item:I714*500+item:I415*1000+item:I416*2000+item:yellowKey*40+item:blueKey*120+item:redKey*300"
+            },
+            {
+                "type": "openShop",
+                "id": "shop1",
+                "open": true
+            },
+            {
+                "type": "unloadEquip",
+                "pos": 0
+            },
+            {
+                "type": "unloadEquip",
+                "pos": 1
+            },
+            {
+                "type": "unloadEquip",
+                "pos": 2
+            },
+            {
+                "type": "unloadEquip",
+                "pos": 3
+            },
+            {
+                "type": "setValue",
+                "name": "status:hp",
+                "value": "status:atk+status:def+status:mdef/6+status:hpmax/300+(flag:shop3)*5000-item:I421*100000"
+            },
+            {
+                "type": "if",
+                "condition": "(flag:shengqishi>=90)",
+                "true": [
+                    {
+                        "type": "win",
+                        "reason": "paladin"
+                    }
+                ]
+            },
+            {
+                "type": "if",
+                "condition": "flag:heianshengzi",
+                "true": [
+                    {
+                        "type": "win",
+                        "reason": "the son of darkness"
+                    }
+                ]
+            },
+            {
+                "type": "win",
+                "reason": "saint"
+            }
         ]
     },
     "changeFloor": {
@@ -418,7 +484,7 @@ main.floors.GM1=
     [ 92,30204,  0,  0,  0,30360,30361,30362,  0,  0,  0,30204, 94],
     [50049,443,  0,  0,578,  0,  0,582,  0,  0,  0,443,50049],
     [50049,  0,  0,  0,  0,566,550,  0,  0,  0,  0,  0,50049],
-    [ 92,30204,  0,  0,  0,  0,549,  0,  0,  0,  0,30204, 94],
+    [104,30204,  0,  0,  0,  0,549,  0,  0,  0,  0,30204, 94],
     [50049,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,50049],
     [50049,  0,442,30204,441,442,30204,441,442,30204,441,  0,50049],
     [50049,50049,50049, 93,50049,50049, 93,50049,50049, 93,50049,50049,50049]

project/floors/HA11.js

@@ -270,8 +270,8 @@ main.floors.HA11=
     [140166,140166,140166,140166,140166,140166,140166, 81,140166,140166,140166,140166,140166],
     [140166,688,  0,  0, 81,  0,  0,  0,1022,  0,  0,688,140166],
     [140166,140166,907,140166,140166,140166, 81,140166,140166,140166,851,140166,140166],
-    [140166,  0,  0,  0,140166,  0,737,  0,140166,  0,687,  0,140166],
+    [140166,  0,  0,  0,140166,  0,737,  0,140166,  0,  0,  0,140166],
-    [140166,  0,  0,  0,140166,348,  0, 21,140166, 21,  0,  0,140166],
+    [140166,  0,  0,  0,140166,348,  0, 21,140166, 21,  0,687,140166],
     [140166,  0, 93,  0,140166,140166,140166,140166,140166,140166,140166,140166,140166]
 ],
     "bgmap": [

project/floors/LZ10.js

@@ -965,6 +965,16 @@ main.floors.LZ10=
                     ],
                     "floorId": "GM1",
                     "remove": true
+                },
+                {
+                    "type": "setValue",
+                    "name": "status:money",
+                    "operator": "+=",
+                    "value": "5000"
+                },
+                {
+                    "type": "insert",
+                    "name": "回收钥匙商店"
                 }
             ],
             "false": [

project/floors/MJ2.js

@@ -19,12 +19,18 @@ main.floors.MJ2=
     "events": {},
     "changeFloor": {
         "12,0": {
-            "floorId": ":before",
+            "floorId": "MJ1",
-            "stair": "upFloor"
+            "loc": [
+                12,
+                1
+            ]
         },
         "0,6": {
-            "floorId": ":next",
+            "floorId": "MJ3",
-            "stair": "downFloor"
+            "loc": [
+                0,
+                6
+            ]
         }
     },
     "beforeBattle": {

project/floors/MJ3.js

@@ -19,12 +19,18 @@ main.floors.MJ3=
     "events": {},
     "changeFloor": {
         "0,6": {
-            "floorId": ":before",
+            "floorId": "MJ2",
-            "stair": "upFloor"
+            "loc": [
+                0,
+                6
+            ]
         },
         "0,12": {
-            "floorId": ":next",
+            "floorId": "MJ4",
-            "stair": "downFloor"
+            "loc": [
+                0,
+                12
+            ]
         }
     },
     "beforeBattle": {},

project/floors/MJ4.js

@@ -19,12 +19,18 @@ main.floors.MJ4=
     "events": {},
     "changeFloor": {
         "0,12": {
-            "floorId": ":before",
+            "floorId": "MJ3",
-            "stair": "upFloor"
+            "loc": [
+                0,
+                12
+            ]
         },
         "6,12": {
-            "floorId": ":next",
+            "floorId": "MJ5",
-            "stair": "downFloor"
+            "loc": [
+                6,
+                12
+            ]
         }
     },
     "beforeBattle": {},

project/floors/MJ5.js

@@ -52,82 +52,22 @@ main.floors.MJ5=
                     ]
                 }
             ]
-        },
+        }
-        "10,8": [
-            "这里可以计分。\n本塔的计分方式是攻击+防御+护盾/6+血限/300。如果买了额外的装备孔则分数+5000。\n圣骑士路线拿到火焰纹章后可以将分数乘以1.2。\n这里可以把神之血和琼浆玉露卖掉，然后在商店加点换取分数。\n钥匙也可以按照商店的原价卖掉。",
-            "圣骑士结局：\n和圣骑士亲密度>=100\n黑暗圣子结局：\n融合黑暗圣子，和圣骑士亲密度在-1~99之间，和准圣子及圣女亲密度均<5\n光明圣子或光明圣女结局：\n不融合黑暗圣子，和圣骑士亲密度在-1~99之间，准圣子或圣女亲密度>5\n黑暗圣子+光明圣子或光明圣女结局：\n融合黑暗圣子，和圣骑士亲密度在-1~99之间，准圣子或圣女亲密度>5\n孤胆英雄结局：\n不融合黑暗圣子，和圣骑士亲密度在-1~99之间，和准圣子及圣女亲密度均<5\n天命主角结局：\n和圣骑士亲密度<=-2",
-            "这里由于部分内容还没实装，因此这里圣骑士结局需要圣骑士的亲密度需求为90，且火焰纹章不可能拿到，且准圣子或圣女亲密度视为>5。",
-            {
-                "type": "openShop",
-                "id": "itemShop",
-                "open": true
-            },
-            {
-                "type": "setValue",
-                "name": "status:money",
-                "operator": "+=",
-                "value": "item:I710*100+item:I711*200+item:I712*300+item:I713*400+item:I714*500+item:I415*1000+item:I416*2000+item:yellowKey*40+item:blueKey*120+item:redKey*300"
-            },
-            {
-                "type": "openShop",
-                "id": "shop1",
-                "open": true
-            },
-            {
-                "type": "unloadEquip",
-                "pos": 0
-            },
-            {
-                "type": "unloadEquip",
-                "pos": 1
-            },
-            {
-                "type": "unloadEquip",
-                "pos": 2
-            },
-            {
-                "type": "unloadEquip",
-                "pos": 3
-            },
-            {
-                "type": "setValue",
-                "name": "status:hp",
-                "value": "status:atk+status:def+status:mdef/6+status:hpmax/300+(flag:shop3)*5000"
-            },
-            {
-                "type": "if",
-                "condition": "(flag:shengqishi>=90)",
-                "true": [
-                    {
-                        "type": "win",
-                        "reason": "paladin"
-                    }
-                ]
-            },
-            {
-                "type": "if",
-                "condition": "flag:heianshengzi",
-                "true": [
-                    {
-                        "type": "win",
-                        "reason": "the son of darkness"
-                    }
-                ]
-            },
-            {
-                "type": "win",
-                "reason": "saint"
-            }
-        ]
     },
     "changeFloor": {
         "6,12": {
-            "floorId": ":before",
+            "floorId": "MJ4",
-            "stair": "upFloor"
+            "loc": [
+                6,
+                12
+            ]
         },
         "11,12": {
-            "floorId": ":next",
+            "floorId": "MJ6",
-            "stair": "downFloor"
+            "loc": [
+                11,
+                12
+            ]
         }
     },
     "beforeBattle": {},
@@ -341,7 +281,7 @@ main.floors.MJ5=
     [  4,  4,  4,  4,  4,1161,1170,1162,  4,  4,  4,  4,  4],
     [  4,  4,  4,  4,  4,1163,1164,1165,  4,  4,  4,  4,  4],
     [  4,  4,  4,  4,  4,1166,1169,1168, 85,  0,  0,  0,  4],
-    [  4,  4,  4,  4,  4,  4, 83,  4,  4,  4,1135,  0,  4],
+    [  4,  4,  4,  4,  4,  4, 83,  4,  4,  4,  4,  0,  4],
     [  4,  4,  4,  4,  4,  4,510,  4,  4,  4,  4,  0,  4],
     [  4,  4,  4,  4,  4,  4,  0,  4,  4,  4,  4,  0,  4],
     [  4,  4,  4,  4,  4,  4,  0,  4,  4,  4,  4,1095,  4],

project/floors/MJ6.js

@@ -19,12 +19,18 @@ main.floors.MJ6=
     "events": {},
     "changeFloor": {
         "11,12": {
-            "floorId": ":before",
+            "floorId": "MJ5",
-            "stair": "upFloor"
+            "loc": [
+                11,
+                12
+            ]
         },
         "0,0": {
-            "floorId": ":next",
+            "floorId": "MJ7",
-            "stair": "downFloor"
+            "loc": [
+                0,
+                0
+            ]
         }
     },
     "beforeBattle": {},

project/floors/MJ7.js

@@ -19,12 +19,18 @@ main.floors.MJ7=
     "events": {},
     "changeFloor": {
         "0,0": {
-            "floorId": ":before",
+            "floorId": "MJ6",
-            "stair": "upFloor"
+            "loc": [
+                0,
+                0
+            ]
         },
         "10,12": {
-            "floorId": ":next",
+            "floorId": "MJ8",
-            "stair": "downFloor"
+            "loc": [
+                10,
+                12
+            ]
         }
     },
     "beforeBattle": {},

project/floors/MJ8.js

@@ -19,12 +19,18 @@ main.floors.MJ8=
     "events": {},
     "changeFloor": {
         "10,12": {
-            "floorId": ":before",
+            "floorId": "MJ7",
-            "stair": "upFloor"
+            "loc": [
+                10,
+                12
+            ]
         },
         "0,10": {
-            "floorId": ":next",
+            "floorId": "MJ9",
-            "stair": "downFloor"
+            "loc": [
+                0,
+                10
+            ]
         }
     },
     "beforeBattle": {},

project/floors/MJ9.js

@@ -19,8 +19,11 @@ main.floors.MJ9=
     "events": {},
     "changeFloor": {
         "0,10": {
-            "floorId": ":before",
+            "floorId": "MJ8",
-            "stair": "upFloor"
+            "loc": [
+                0,
+                10
+            ]
         },
         "11,10": {
             "floorId": "MJ10",

project/floors/ZH1.js

@@ -128,7 +128,84 @@ main.floors.ZH1=
                 "type": "if",
                 "condition": "switch:A",
                 "true": [
-                    "你已经购买了此物"
+                    {
+                        "type": "if",
+                        "condition": "((!item:I421)&&(item:I723||core.hasEquip('I723')))",
+                        "true": [
+                            {
+                                "type": "confirm",
+                                "text": "确认要合成圣杯吗? （花费5000金币）",
+                                "yes": [
+                                    {
+                                        "type": "if",
+                                        "condition": "(status:money>=5000)",
+                                        "true": [
+                                            {
+                                                "type": "setValue",
+                                                "name": "status:money",
+                                                "operator": "-=",
+                                                "value": "5000"
+                                            },
+                                            {
+                                                "type": "if",
+                                                "condition": "(equip:1=='I723')",
+                                                "true": [
+                                                    {
+                                                        "type": "unloadEquip",
+                                                        "pos": 1
+                                                    }
+                                                ]
+                                            },
+                                            {
+                                                "type": "if",
+                                                "condition": "(equip:3=='I723')",
+                                                "true": [
+                                                    {
+                                                        "type": "unloadEquip",
+                                                        "pos": 3
+                                                    }
+                                                ]
+                                            },
+                                            {
+                                                "type": "setValue",
+                                                "name": "item:I722",
+                                                "operator": "+=",
+                                                "value": "-1"
+                                            },
+                                            {
+                                                "type": "setValue",
+                                                "name": "item:I723",
+                                                "operator": "+=",
+                                                "value": "-1"
+                                            },
+                                            {
+                                                "type": "setValue",
+                                                "name": "item:I421",
+                                                "operator": "+=",
+                                                "value": "1"
+                                            },
+                                            {
+                                                "type": "setValue",
+                                                "name": "status:manamax",
+                                                "value": "-1"
+                                            }
+                                        ],
+                                        "false": [
+                                            {
+                                                "type": "playSound",
+                                                "name": "操作失败"
+                                            },
+                                            "你的金币不足！"
+                                        ]
+                                    }
+                                ],
+                                "no": []
+                            }
+                        ],
+                        "false": [
+                            "你已经购买了此物"
+                        ]
+                    }
                 ],
                 "false": [
                     "魔力卷轴，购买价格5000金币，效果：击败敌人后额外获得敌人生命值20‱再开根号的魔力值，最多50点。",
@@ -189,7 +266,84 @@ main.floors.ZH1=
                 "type": "if",
                 "condition": "switch:A",
                 "true": [
-                    "你已经购买了此物"
+                    {
+                        "type": "if",
+                        "condition": "((!item:I421)&&item:I722)",
+                        "true": [
+                            {
+                                "type": "confirm",
+                                "text": "确认要合成圣杯吗? （花费5000金币）",
+                                "yes": [
+                                    {
+                                        "type": "if",
+                                        "condition": "(status:money>=5000)",
+                                        "true": [
+                                            {
+                                                "type": "setValue",
+                                                "name": "status:money",
+                                                "operator": "-=",
+                                                "value": "5000"
+                                            },
+                                            {
+                                                "type": "if",
+                                                "condition": "(equip:1=='I723')",
+                                                "true": [
+                                                    {
+                                                        "type": "unloadEquip",
+                                                        "pos": 1
+                                                    }
+                                                ]
+                                            },
+                                            {
+                                                "type": "if",
+                                                "condition": "(equip:3=='I723')",
+                                                "true": [
+                                                    {
+                                                        "type": "unloadEquip",
+                                                        "pos": 3
+                                                    }
+                                                ]
+                                            },
+                                            {
+                                                "type": "setValue",
+                                                "name": "item:I722",
+                                                "operator": "+=",
+                                                "value": "-1"
+                                            },
+                                            {
+                                                "type": "setValue",
+                                                "name": "item:I723",
+                                                "operator": "+=",
+                                                "value": "-1"
+                                            },
+                                            {
+                                                "type": "setValue",
+                                                "name": "item:I421",
+                                                "operator": "+=",
+                                                "value": "1"
+                                            },
+                                            {
+                                                "type": "setValue",
+                                                "name": "status:manamax",
+                                                "value": "-1"
+                                            }
+                                        ],
+                                        "false": [
+                                            {
+                                                "type": "playSound",
+                                                "name": "操作失败"
+                                            },
+                                            "你的金币不足！"
+                                        ]
+                                    }
+                                ],
+                                "no": []
+                            }
+                        ],
+                        "false": [
+                            "你已经购买了此物"
+                        ]
+                    }
                 ],
                 "false": [
                     "生命卷轴，购买价格5000金币，效果：击败敌人后额外获得5‰最大生命值的生命。",

project/functions.js

@@ -422,6 +422,7 @@ var functions_d6ad677b_427a_4623_b50f_a445a3b0ef8a =
 	if (core.hasEquip('I1116'))
 		(core.status.hero.mana += 10)
 	if (core.hasItem('I722')) { core.status.hero.mana += Math.min(Math.sqrt(damageInfo.mon_hp / 500), 50) }
+	if (core.hasItem('I421')) { core.status.hero.mana += Math.min(damageInfo.mon_hp / 5000, 10000) }
 	//回复生命值
 	// 事件的处理
 	var todo = [];
@@ -505,7 +506,7 @@ var functions_d6ad677b_427a_4623_b50f_a445a3b0ef8a =
 		core.playSound('宝石')
 	else
 		core.playSound('获得道具');
-	if (core.material.items[itemId].cls == 'equips' || itemId == 'I715') core.plugin.calcEquip();
+	if (core.material.items[itemId].cls == 'equips' || itemId == 'I715' || itemId == 'I421') core.plugin.calcEquip();
 	var todo = [];
 	// 检查该点的获得道具后事件。
 	if (core.status.floorId == null) return;
@@ -915,6 +916,7 @@ var functions_d6ad677b_427a_4623_b50f_a445a3b0ef8a =
 
 	if (core.getFlag('skill', 0) == 3) { damage -= hero_def * 0.5 + hero_mdef * 0.2 + 50 }
 	if (core.hasEquip('I723')) { damage -= core.status.hero.hpmax / 200 }
+	if (core.hasItem('I421')) { damage -= core.status.hero.hpmax / 100 }
 	if (core.hasSpecial(mon_special, 28)) {
 		var vampire_damage = (hero_hp - damage) / -5;
 

project/items.js

@@ -343,7 +343,7 @@ var items_296f5d02_12fd_4166_a7c1_b5e830c9ee3a =
 		"cls": "tools",
 		"name": "炸弹",
 		"text": "可以炸掉勇士面前的怪物",
-		"useItemEffect": "(function () {\n\tvar bombList = []; // 炸掉的怪物坐标列表\n\tvar todo = []; // 炸弹后事件\n\tvar money = 0,\n\t\texp = 0; // 炸弹获得的金币和经验\n\n\tvar canBomb = function (x, y) {\n\t\tvar block = core.getBlock(x, y);\n\t\tif (block == null || block.disable || block.event.cls.indexOf('enemy') != 0) return false;\n\t\tvar enemy = core.material.enemys[block.event.id];\n\t\treturn enemy && !enemy.notBomb;\n\t};\n\n\tvar bomb = function (x, y) {\n\t\tif (!canBomb(x, y)) return;\n\t\tbombList.push([x, y]);\n\t\tvar id = core.getBlockId(x, y),\n\t\t\tenemy = core.material.enemys[id];\n\t\thero.money += core.getEnemyValue(enemy, 'money', x, y) || 0;\n\t\thero.exp += core.getEnemyValue(enemy, 'exp', x, y) || 0;\n\t\tcore.push(todo, core.floors[core.status.floorId].afterBattle[x + \",\" + y]);\n\t\tcore.push(todo, enemy.afterBattle);\n\t\tcore.removeBlock(x, y);\n\t\tcore.insertCommonEvent('回收钥匙商店')\n\t}\n\n\t// 如果要多方向可炸，把这里的false改成true\n\tif (false) {\n\t\tvar scan = core.utils.scan; // 多方向炸时默认四方向，如果要改成八方向炸可以改成 core.utils.scan2\n\t\tfor (var direction in scan) {\n\t\t\tvar delta = scan[direction];\n\t\t\tbomb(core.getHeroLoc('x') + delta.x, core.getHeroLoc('y') + delta.y);\n\t\t}\n\t} else {\n\t\t// 仅炸当前\n\t\tbomb(core.nextX(), core.nextY());\n\t}\n\n\tif (bombList.length == 0) {\n\t\tcore.playSound('操作失败');\n\t\tcore.drawTip('当前无法使用' + core.material.items[itemId].name, itemId);\n\t\tcore.addItem(itemId, 1);\n\t\treturn;\n\t}\n\n\tcore.playSound('炸弹');\n\tcore.drawTip(core.material.items[itemId].name + '使用成功', itemId);\n\n\n\t// 取消这里的注释可以炸弹后获得金币和经验\n\t// core.status.hero.money += money;\n\t// core.status.hero.exp += exp;\n\n\t// 取消这里的注释可以炸弹引发战后事件\n\t// if (todo.length > 0) core.insertAction(todo);\n\n})();",
+		"useItemEffect": "(function () {\n\tvar bombList = []; // 炸掉的怪物坐标列表\n\tvar todo = []; // 炸弹后事件\n\tvar money = 0,\n\t\texp = 0; // 炸弹获得的金币和经验\n\n\tvar canBomb = function (x, y) {\n\t\tvar block = core.getBlock(x, y);\n\t\tif (block == null || block.disable || block.event.cls.indexOf('enemy') != 0) return false;\n\t\tvar enemy = core.material.enemys[block.event.id];\n\t\treturn enemy && !enemy.notBomb;\n\t};\n\n\tvar bomb = function (x, y) {\n\t\tif (!canBomb(x, y)) return;\n\t\tbombList.push([x, y]);\n\t\tvar id = core.getBlockId(x, y),\n\t\t\tenemy = core.material.enemys[id];\n\t\thero.money += core.getEnemyValue(enemy, 'money', x, y) || 0;\n\t\thero.exp += core.getEnemyValue(enemy, 'exp', x, y) || 0;\n\t\tcore.push(todo, core.floors[core.status.floorId].afterBattle[x + \",\" + y]);\n\t\tcore.push(todo, enemy.afterBattle);\n\t\tcore.insertCommonEvent('回收钥匙商店')\n\t\tcore.removeBlock(x, y);\n\t}\n\n\t// 如果要多方向可炸，把这里的false改成true\n\tif (false) {\n\t\tvar scan = core.utils.scan; // 多方向炸时默认四方向，如果要改成八方向炸可以改成 core.utils.scan2\n\t\tfor (var direction in scan) {\n\t\t\tvar delta = scan[direction];\n\t\t\tbomb(core.getHeroLoc('x') + delta.x, core.getHeroLoc('y') + delta.y);\n\t\t}\n\t} else {\n\t\t// 仅炸当前\n\t\tbomb(core.nextX(), core.nextY());\n\t}\n\n\tif (bombList.length == 0) {\n\t\tcore.playSound('操作失败');\n\t\tcore.drawTip('当前无法使用' + core.material.items[itemId].name, itemId);\n\t\tcore.addItem(itemId, 1);\n\t\treturn;\n\t}\n\n\tcore.playSound('炸弹');\n\tcore.drawTip(core.material.items[itemId].name + '使用成功', itemId);\n\n\n\t// 取消这里的注释可以炸弹后获得金币和经验\n\t// core.status.hero.money += money;\n\t// core.status.hero.exp += exp;\n\n\t// 取消这里的注释可以炸弹引发战后事件\n\t// if (todo.length > 0) core.insertAction(todo);\n\n})();",
 		"canUseItemEffect": "true"
 	},
 	"centerFly": {
@@ -1177,9 +1177,10 @@ var items_296f5d02_12fd_4166_a7c1_b5e830c9ee3a =
 		"canUseItemEffect": "true"
 	},
 	"I421": {
-		"cls": "items",
+		"cls": "constants",
-		"name": "新物品",
+		"name": "圣杯",
-		"canUseItemEffect": "true"
+		"canUseItemEffect": "true",
+		"text": "一个非常咸鱼的杯子。持有此杯战斗后回复最大生命值的1%，并在战后回复怪物生命1/5000的魔力，最多回复10000点。持有此杯后计分减少100000。"
 	},
 	"I422": {
 		"cls": "tools",