乘算法抗

_server/MotaAction.g4

@@ -4624,8 +4624,8 @@ IdString
     ;
 
 FixedId_List
-    :   '生命'|'生命上限'|'攻击'|'防御'|'法强'|'魔攻比例'|'护盾比例'|'黄钥匙'|'蓝钥匙'|'红钥匙'|'金币'|'经验'|'魔力'|'魔力上限'|'当前横坐标'|'当前纵坐标'|'当前朝向'|'攻击增益'|'防御增益'|'护盾增益'
+    :   '生命'|'生命上限'|'攻击'|'防御'|'法强'|'魔攻比例'|'护盾比例'|'法抗比例'|'黄钥匙'|'蓝钥匙'|'红钥匙'|'金币'|'经验'|'魔力'|'魔力上限'|'当前横坐标'|'当前纵坐标'|'当前朝向'|'攻击增益'|'防御增益'|'法强增益'|'魔攻增益'|'法抗增益'|'护盾增益'
-    /*FixedId_List ['status:hp','status:hpmax','status:atk','status:def','status:spell','status:matk','status:mdef','item:yellowKey','item:blueKey','item:redKey','status:money','status:exp','status:mana','status:manamax','status:x','status:y','status:direction','buff:atk','buff:def','buff:mdef']*/;
+    /*FixedId_List ['status:hp','status:hpmax','status:atk','status:def','status:spell','status:matk','status:mhp','status:mdef','item:yellowKey','item:blueKey','item:redKey','status:money','status:exp','status:mana','status:manamax','status:x','status:y','status:direction','buff:atk','buff:def','buff:spell','buff:matk','buff:mdef','buff:mhp']*/;
 
 Id_List
     :   '变量' | '状态' | '物品' | '增益' | '独立开关' | '临时变量' |'全局存储'
@@ -4640,8 +4640,8 @@ EnemyPoint_List
     /*EnemyPoint_List ['hp','atk','def','money','exp','point','name']*/;
 
 Equip_List
-    :   '生命'|'生命上限'|'攻击'|'防御'|'法强'|'魔攻比例'|'护盾比例'|'魔力'|'魔力上限'|'速度'
+    :   '生命'|'生命上限'|'攻击'|'防御'|'法强'|'魔攻比例'|'护盾比例'|'法抗百分比'|'魔力'|'魔力上限'|'速度'
-    /*Equip_List ['hp','hpmax','atk','def','spell','matk','mdef','mana','manamax','speed']*/;
+    /*Equip_List ['hp','hpmax','atk','def','spell','matk','mhp','mdef','mana','manamax','speed']*/;
 
 Key_List
     :   '黄钥匙'|'蓝钥匙'|'红钥匙'|'绿钥匙'|'铁门钥匙'

project/data.js

@@ -1118,7 +1118,7 @@ var data_a1e2fb4a_e986_4524_b0da_9b7ba7c0874d =
 			"mana": 0,
 			"atk": 100,
 			"def": 100,
-			"mdef": 0,
+			"mdef": 100,
 			"speed": 10,
 			"money": 0,
 			"exp": 0,
@@ -1135,7 +1135,8 @@ var data_a1e2fb4a_e986_4524_b0da_9b7ba7c0874d =
 			},
 			"flags": {
 				"itemDetail": true,
-				"useBetweenLight": true
+				"useBetweenLight": true,
+				"__mdef_buff__": 0
 			},
 			"followers": [],
 			"steps": 0,
@@ -1499,7 +1500,7 @@ var data_a1e2fb4a_e986_4524_b0da_9b7ba7c0874d =
 		"startText": [
 			{
 				"type": "function",
-				"function": "function(){\ncore.getItem('book',1);core.getItem('fly',1)\n}"
+				"function": "function(){\ncore.getItem('book', 1);\ncore.getItem('fly', 1);\n}"
 			},
 			{
 				"type": "insert",

project/floors/yiqu1.js

@@ -48,8 +48,8 @@ main.floors.yiqu1=
     [140142,  0,120015,120028,201037,  0,201029,  0,  0,  0,  0,  0,110197],
     [140150,  0,  0,120019,  0,  0,201029,  0,110189,140,110191,  0,110205],
     [ 92,  0,  0,120019,201037,201037,201037,  0,110197,140,110199, 81,110224],
-    [  0,  0,  0,120027,  0,  0,  0,  0,110197,140,110199,  0,110232],
+    [  0,  0,  0,120027, 37, 37,  0,  0,110197,140,110199,  0,110232],
-    [110191,  0,  0,  0,  0,  0,110189,140,140,140,110199,  0, 94],
+    [110191,  0,  0,  0, 36, 35,110189,140,140,140,110199,  0, 94],
     [110199,140,140,110191,  0,  0,110197,140,140,110204,110207,  0,  0],
     [140,140,140,110199,90684,90684,110197,140,140,110199,110234,  0,  0],
     [140,140,140,110199,100307,100308,110197,140,140,110199,  0,  0,  0]

project/functions.js

@@ -1454,8 +1454,7 @@ var functions_d6ad677b_427a_4623_b50f_a445a3b0ef8a =
 	// 请注意此项仅影响 libs/ 下的内容（如绘制怪物手册、数据统计等）
 	// 自行定义的（比如获得道具效果）中用到的“攻击+3”等需要自己去对应地方修改
 
-      return (
+	return ({
-        {
 		name: "名称",
 		lv: "等级",
 		hpmax: "生命上限",
@@ -1466,15 +1465,15 @@ var functions_d6ad677b_427a_4623_b50f_a445a3b0ef8a =
 		def: "防御",
 		spell: "法强",
 		matk: "魔攻比例",
-          mdef: "护盾比例",
+		mhp: "护盾比例",
+		mdef: "法抗",
 		speed: "速度",
 		money: "金币",
 		exp: "经验",
 		point: "加点",
 		steps: "步数",
-        }[name] || name
+	} [name] || name);
-      );
+},
-    },
         "triggerDebuff": function (action, type) {
       // 毒衰咒效果的获得与解除
       // action：获得还是解除；'get'表示获得，'remove'表示解除
@@ -1539,7 +1538,7 @@ var functions_d6ad677b_427a_4623_b50f_a445a3b0ef8a =
 	core.updateCheckBlock();
 	// 更新全地图显伤
 	core.updateDamage();
-    },
+},
         "updateCheckBlock": function (floorId) {
       // 领域、夹击、阻击等的伤害值计算
       floorId = floorId || core.status.floorId;

project/items.js

@@ -150,10 +150,10 @@ var items_296f5d02_12fd_4166_a7c1_b5e830c9ee3a =
 		"equip": {
 			"type": 0,
 			"animate": "sword",
-			"value": {
+			"value": {},
-				"atk": 10
+			"percentage": {
-			},
+				"mdef": 10
-			"percentage": {}
+			}
 		},
 		"itemEffect": "core.status.hero.atk += 10",
 		"itemEffectTip": "，攻击+10",
@@ -166,10 +166,10 @@ var items_296f5d02_12fd_4166_a7c1_b5e830c9ee3a =
 		"equip": {
 			"type": "武器",
 			"animate": "sword",
-			"value": {
+			"value": {},
-				"atk": 20
+			"percentage": {
-			},
+				"mdef": 20
-			"percentage": {}
+			}
 		},
 		"itemEffect": "core.status.hero.atk += 20",
 		"itemEffectTip": "，攻击+20",
@@ -247,10 +247,10 @@ var items_296f5d02_12fd_4166_a7c1_b5e830c9ee3a =
 		"text": "一个很普通的铁盾",
 		"equip": {
 			"type": 1,
-			"value": {
+			"value": {},
-				"def": 10
+			"percentage": {
-			},
+				"mdef": 10
-			"percentage": {}
+			}
 		},
 		"itemEffect": "core.status.hero.def += 10",
 		"itemEffectTip": "，防御+10",

project/plugins.js

@@ -3789,7 +3789,7 @@ var plugins_bb40132b_638b_4a9f_b028_d3fe47acc8d1 =
 		};
 		return loc;
 	};
-    core.ui._drawWindowSelector = function (background, x, y, w, h) {
+	/* core.ui._drawWindowSelector = function (background, x, y, w, h) {
 	   w = Math.round(w) + 48;
 	   h = Math.round(h);
 	   var ctx = core.ui.createCanvas("_selector", x - 24, y, w, h, 165);
@@ -3818,7 +3818,7 @@ var plugins_bb40132b_638b_4a9f_b028_d3fe47acc8d1 =
 	     24,
 	     24
 	   );
-    };
+	 };*/
 
 	enemys.prototype._nextCriticals_useBinarySearch = function (
 		enemy,
@@ -3847,8 +3847,7 @@ var plugins_bb40132b_638b_4a9f_b028_d3fe47acc8d1 =
 				var mid = Math.floor((start + end) / 2);
 				if (mid - start > end - mid) mid--;
 				var nextInfo = core.enemys.getDamageInfo(
-            enemy,
+					enemy, { atk: mid },
-            { atk: mid },
 					x,
 					y,
 					floorId
@@ -3858,17 +3857,15 @@ var plugins_bb40132b_638b_4a9f_b028_d3fe47acc8d1 =
 				else start = mid + 1;
 			}
 			var nextInfo = core.enemys.getDamageInfo(
-          enemy,
+				enemy, { atk: start },
-          { atk: start },
 				x,
 				y,
 				floorId
 			);
 			return nextInfo == null ||
 				typeof nextInfo == "number" ||
-          nextInfo.damage >= pre
+				nextInfo.damage >= pre ?
-          ? null
+				null : [start, nextInfo.damage];
-          : [start, nextInfo.damage];
 		};
 		var currAtk = start_atk;
 		while (true) {
@@ -4320,7 +4317,7 @@ var plugins_bb40132b_638b_4a9f_b028_d3fe47acc8d1 =
 		this.afterBattle(id, x, y);
 		if (callback) callback();
 	};
-  },
+},
     "额外信息": function () {
     /* 宝石血瓶左下角显示数值
      * 注意！！！不要在道具属性中直接操作flags，使用core.status.hero.flags或core.setFlag系列函数代替！
@@ -5285,9 +5282,9 @@ var plugins_bb40132b_638b_4a9f_b028_d3fe47acc8d1 =
 
 		var itembar_right = rightArrow_right;
 		var boxName =
-        core.status.event.id == "toolbox"
+			core.status.event.id == "toolbox" ?
-          ? "\r[yellow]道具栏\r | 装备栏"
+			"\r[yellow]道具栏\r | 装备栏" :
-          : "道具栏 | \r[yellow]装备栏\r";
+			"道具栏 | \r[yellow]装备栏\r";
 		core.drawArrow(
 			ctx,
 			arrow_x + arrow_width,
@@ -5620,6 +5617,8 @@ var plugins_bb40132b_638b_4a9f_b028_d3fe47acc8d1 =
 			var compare2;
 			if (item.equipCls === "双手剑")
 				compare2 = core.compareEquipment(null, core.getEquip(1));
+			if (item.equipCls === "盾牌" && core.material.items[core.getEquip(0)].equipCls === "双手剑")
+				compare2 = core.compareEquipment(null, core.getEquip(0));
 			if (info.select.action == "unload")
 				compare = core.compareEquipment(null, item.id);
 			// --- 变化值...
@@ -5636,10 +5635,27 @@ var plugins_bb40132b_638b_4a9f_b028_d3fe47acc8d1 =
 							(compare2?.percentage[name] || 0))) /
 					100
 				);
+				if (name === "mdef") {
+					var nowValue = core.getRealStatus(name);
+					var newValue = Math.round(
+						(core.getStatus(name) -
+							(compare.value[name] || 0) -
+							(compare2?.value[name] || 0)) *
+						(1 - (1 - core.getBuff(name)) *
+							((compare.percentage[name] || 1)) *
+							((compare2?.percentage[name] || 1)))
+
+					);
+
+				}
 				if (nowValue == newValue) continue;
 				var color = newValue > nowValue ? "#00FF00" : "#FF0000";
 				nowValue = core.formatBigNumber(nowValue);
 				newValue = core.formatBigNumber(newValue);
+				if (name === "mdef") {
+					nowValue += '%';
+					newValue += '%'
+				}
 				statusText +=
 					core.getStatusLabel(name) +
 					" " +
@@ -5660,8 +5676,7 @@ var plugins_bb40132b_638b_4a9f_b028_d3fe47acc8d1 =
 				color: "white",
 				align: "left",
 				fontSize: itemTextFontSize,
-          maxWidth:
+				maxWidth: rightbar_width -
-            rightbar_width -
 					(itemText_x - rightbar_x) * 2 +
 					itemTextFontSize / 2,
 			});
@@ -5673,8 +5688,7 @@ var plugins_bb40132b_638b_4a9f_b028_d3fe47acc8d1 =
 				color: "white",
 				align: "left",
 				fontSize: itemTextFontSize,
-          maxWidth:
+				maxWidth: rightbar_width -
-            rightbar_width -
 					(itemText_x - rightbar_x) * 2 +
 					itemTextFontSize / 2,
 			});
@@ -5785,9 +5799,9 @@ var plugins_bb40132b_638b_4a9f_b028_d3fe47acc8d1 =
 			if (i === 1) name = "副手";
 			var selectBorder = false;
 			if (core.status.thisUIEventInfo.select.type == i) selectBorder = true;
-        var borderStyle = selectBorder
+			var borderStyle = selectBorder ?
-          ? box_selectBorderStyle
+				box_selectBorderStyle :
-          : box_borderStyle;
+				box_borderStyle;
 			core.drawEquipbox_drawOne(
 				ctx,
 				name,
@@ -5877,9 +5891,9 @@ var plugins_bb40132b_638b_4a9f_b028_d3fe47acc8d1 =
 				name = toDrawList[i];
 			var selectBorder = false;
 			if (core.status.thisUIEventInfo.select.type == i) selectBorder = true;
-        var borderStyle = selectBorder
+			var borderStyle = selectBorder ?
-          ? box_selectBorderStyle
+				box_selectBorderStyle :
-          : box_borderStyle;
+				box_borderStyle;
 			core.drawEquipbox_drawOne(
 				ctx,
 				name,
@@ -6210,6 +6224,11 @@ var plugins_bb40132b_638b_4a9f_b028_d3fe47acc8d1 =
 						core.status.route.push("unEquip:" + 1);
 					});
 				}
+				if (equipCls0 === "双手剑" && !(equipClsid === "饰品" || equipClsid === "护具")) {
+					core.unloadEquip(0, function () {
+						core.status.route.push("unEquip:" + 0);
+					});
+				}
 				core.loadEquip(id, function () {
 					core.status.route.push("equip:" + id);
 					info.select.type = type;
@@ -6221,7 +6240,7 @@ var plugins_bb40132b_638b_4a9f_b028_d3fe47acc8d1 =
 				core.unloadEquip(type, function () {
 					core.status.route.push("unEquip:" + type);
 					info.select.type = type;
-            //info.select.action = 'load'
+					info.select.action = 'load'
 					core.setIndexAndSelect("select");
 					core.drawEquipbox();
 				});
@@ -6235,7 +6254,7 @@ var plugins_bb40132b_638b_4a9f_b028_d3fe47acc8d1 =
 		core.setPageItems(info.page);
 		var index = info.index || 1;
 		var items = info.pageItems;
-      if (info.select.type != null) {
+		/*if (info.select.type != null) {
 			var type = info.select.type;
 			id = core.getEquip(type);
 			info.index = null;
@@ -6245,12 +6264,12 @@ var plugins_bb40132b_638b_4a9f_b028_d3fe47acc8d1 =
 				type: type,
 			};
 			return;
-      } else {
+		} else {*/
 		info.select.action = null;
 		info.select.type = null;
 		if (toChange == "index") info.index = items.indexOf(info.select.id) + 1;
 		info.select.id = items[info.index - 1];
-      }
+		//}
 	};
 
 	this.addItemListboxPage = function (num) {
@@ -6614,7 +6633,7 @@ var plugins_bb40132b_638b_4a9f_b028_d3fe47acc8d1 =
 	core.registerReplayAction("item", core.control._replayAction_item);
 	core.registerReplayAction("equip", core.control._replayAction_equip);
 	core.registerReplayAction("unEquip", core.control._replayAction_unEquip);
-  },
+},
     "技能树": function () {
     // 在此增加新插件
     //
@@ -10881,18 +10900,15 @@ var plugins_bb40132b_638b_4a9f_b028_d3fe47acc8d1 =
 			 * @type {{[EvnetName:actionParserJson]}}
 			 */
 			events_c12a15a8_c380_4b28_8144_256cba95f760.CommonEventTemplate = {
-          检测音乐如果没有开启则系统提示开启: [
+				检测音乐如果没有开启则系统提示开启: [{
-            {
 					type: "if",
 					condition: "!core.musicStatus.bgmStatus",
 					true: [
 						"\t[系统提示]你当前音乐处于关闭状态，本塔开音乐游戏效果更佳",
 					],
 					false: [],
-            },
+				}, ],
-          ],
+				仿新新魔塔一次性商人: [{
-          仿新新魔塔一次性商人: [
-            {
 					type: "if",
 					condition: "switch:A",
 					true: [
@@ -10907,16 +10923,13 @@ var plugins_bb40132b_638b_4a9f_b028_d3fe47acc8d1 =
 							time: 250,
 						},
 					],
-              false: [
+					false: [{
-                {
 						type: "confirm",
 						text: "我有3把黄钥匙，\n你出50金币就卖给你。",
-                  yes: [
+						yes: [{
-                    {
 							type: "if",
 							condition: "status:money>=50",
-                      true: [
+							true: [{
-                        {
 									type: "setValue",
 									name: "status:money",
 									operator: "-=",
@@ -10939,22 +10952,17 @@ var plugins_bb40132b_638b_4a9f_b028_d3fe47acc8d1 =
 									value: "true",
 								},
 							],
-                      false: [
+							false: [{
-                        {
 									type: "playSound",
 									name: "操作失败",
 								},
 								"\t[行商,trader]\b[this]你的金币不足！",
 							],
-                    },
+						}, ],
-                  ],
 						no: [],
-                },
+					}, ],
-              ],
+				}, ],
-            },
+				全地图选中一个点: [{
-          ],
-          全地图选中一个点: [
-            {
 						type: "comment",
 						text: "全地图选中一个点，需要用鼠标或触屏操作",
 					},
@@ -10975,8 +10983,7 @@ var plugins_bb40132b_638b_4a9f_b028_d3fe47acc8d1 =
 					{
 						type: "while",
 						condition: "true",
-              data: [
+						data: [{
-                {
 								type: "drawSelector",
 								image: "winskin.webp",
 								code: 1,
@@ -10991,16 +10998,13 @@ var plugins_bb40132b_638b_4a9f_b028_d3fe47acc8d1 =
 							{
 								type: "if",
 								condition: "(flag:type === 1)",
-                  true: [
+								true: [{
-                    {
 										type: "if",
 										condition: "((temp:X===flag:x)&&(temp:Y===flag:y))",
-                      true: [
+										true: [{
-                        {
 											type: "break",
 											n: 1,
-                        },
+										}, ],
-                      ],
 									},
 									{
 										type: "setValue",
@@ -11030,8 +11034,7 @@ var plugins_bb40132b_638b_4a9f_b028_d3fe47acc8d1 =
 						loc: ["temp:X", "temp:Y"],
 					},
 				],
-          多阶段Boss战斗: [
+				多阶段Boss战斗: [{
-            {
 						type: "comment",
 						text: "多阶段boss，请直接作为战后事件使用",
 					},
@@ -11044,11 +11047,9 @@ var plugins_bb40132b_638b_4a9f_b028_d3fe47acc8d1 =
 					{
 						type: "switch",
 						condition: "switch:A",
-              caseList: [
+						caseList: [{
-                {
 								case: "1",
-                  action: [
+								action: [{
-                    {
 										type: "setBlock",
 										number: "redSlime",
 									},
@@ -11057,8 +11058,7 @@ var plugins_bb40132b_638b_4a9f_b028_d3fe47acc8d1 =
 							},
 							{
 								case: "2",
-                  action: [
+								action: [{
-                    {
 										type: "setBlock",
 										number: "blackSlime",
 									},
@@ -11067,8 +11067,7 @@ var plugins_bb40132b_638b_4a9f_b028_d3fe47acc8d1 =
 							},
 							{
 								case: "3",
-                  action: [
+								action: [{
-                    {
 										type: "setBlock",
 										number: "slimelord",
 									},
@@ -11322,8 +11321,7 @@ var plugins_bb40132b_638b_4a9f_b028_d3fe47acc8d1 =
 								],
 								"event"
 							),
-              MotaActionFunctions.actionParser.parse(
+							MotaActionFunctions.actionParser.parse({
-                {
 									condition: "flag:__door__===2",
 									currentFloor: true,
 									priority: 0,
@@ -11335,17 +11333,14 @@ var plugins_bb40132b_638b_4a9f_b028_d3fe47acc8d1 =
 							),
 							MotaActionBlocks["changeFloor_m"].xmlText(),
 							MotaActionFunctions.actionParser.parse(
-                [
+								[{
-                  {
 										id: "shop1",
 										text: "\t[贪婪之神,moneyShop]勇敢的武士啊, 给我${20+2*flag:shop1}金币就可以：",
 										textInList: "1F金币商店",
-                    choices: [
+										choices: [{
-                      {
 											text: "生命+800",
 											need: "status:money>=20+2*flag:shop1",
-                        action: [
+											action: [{
-                          {
 													type: "comment",
 													text: "新版商店中需要手动扣减金币和增加访问次数",
 												},
@@ -11368,8 +11363,7 @@ var plugins_bb40132b_638b_4a9f_b028_d3fe47acc8d1 =
 													value: "800",
 												},
 											],
-                      },
+										}, ],
-                    ],
 									},
 									{
 										id: "itemShop",
@@ -11395,26 +11389,25 @@ var plugins_bb40132b_638b_4a9f_b028_d3fe47acc8d1 =
 							MotaActionBlocks["eachArrive_m"].xmlText(),
 							MotaActionBlocks["level_m"].xmlText(),
 							MotaActionFunctions.actionParser.parse(
-                [["MTx", ""]],
+								[
+									["MTx", ""]
+								],
 								"floorPartition"
 							),
 							MotaActionBlocks["commonEvent_m"].xmlText(),
 							MotaActionBlocks["item_m"].xmlText(),
 							MotaActionFunctions.actionParser.parse(
-                [
+								[{
-                  {
 									title: "简单",
 									name: "Easy",
 									hard: 1,
 									action: [
 										{ type: "comment", text: "在这里写该难度需执行的事件" },
 									],
-                  },
+								}, ],
-                ],
 								"levelChoose"
 							),
-              MotaActionFunctions.actionParser.parse(
+							MotaActionFunctions.actionParser.parse({
-                {
 									type: 0,
 									value: { atk: 10 },
 									percentage: { speed: 10 },
@@ -11422,18 +11415,15 @@ var plugins_bb40132b_638b_4a9f_b028_d3fe47acc8d1 =
 								"equip"
 							),
 							MotaActionFunctions.actionParser.parse(
-                [
+								[{
-                  {
 									name: "bg.webp",
 									x: 0,
 									y: 0,
 									canvas: "bg",
-                  },
+								}, ],
-                ],
 								"floorImage"
 							),
-              MotaActionFunctions.actionParser.parse(
+							MotaActionFunctions.actionParser.parse({
-                {
 									time: 160,
 									openSound: "door.opus",
 									closeSound: "door.opus",
@@ -11443,8 +11433,7 @@ var plugins_bb40132b_638b_4a9f_b028_d3fe47acc8d1 =
 							),
 							MotaActionBlocks["faceIds_m"].xmlText(),
 							MotaActionBlocks["mainStyle_m"].xmlText(),
-              MotaActionFunctions.actionParser.parse(
+							MotaActionFunctions.actionParser.parse({
-                {
 									背景音乐: "bgm.opus",
 									确定: "confirm.opus",
 									攻击: "attack.opus",
@@ -11466,14 +11455,12 @@ var plugins_bb40132b_638b_4a9f_b028_d3fe47acc8d1 =
 								"\t[小妖精,fairy]\f[fairy.webp,0,0]欢迎使用事件编辑器(双击方块可直接预览)"
 							),
 							MotaActionBlocks["over_s"].xmlText(),
-              MotaActionFunctions.actionParser.parseList([
+							MotaActionFunctions.actionParser.parseList([{
-                {
 								type: "overlist",
 								image: "bg_5043.webp",
 								memory: false,
 								hidetime: 30,
-                  list: [
+								list: [{
-                    {
 									text: "",
 									sound: "",
 									time: 50,
@@ -11481,13 +11468,10 @@ var plugins_bb40132b_638b_4a9f_b028_d3fe47acc8d1 =
 									boldColor: "0,0,0,1",
 									font: "bold 48px Verdana",
 									frame: 0,
-                    },
+								}, ],
-                  ],
+							}, ]),
-                },
-              ]),
 							MotaActionBlocks["cgtextList_s"].xmlText(),
-              MotaActionFunctions.actionParser.parseList([
+							MotaActionFunctions.actionParser.parseList([{
-                {
 								type: "cgtext",
 								bg: "bg_5043.webp",
 								memory: false,
@@ -11502,8 +11486,7 @@ var plugins_bb40132b_638b_4a9f_b028_d3fe47acc8d1 =
 								bodyList: [
 									{ name: "tati_050145a.webp", px: 100, filter: false },
 								],
-                },
+							}, ]),
-              ]),
 							MotaActionBlocks["moveTextBox_s"].xmlText(),
 							MotaActionBlocks["clearTextBox_s"].xmlText(),
 							MotaActionBlocks["comment_s"].xmlText(),
@@ -11597,20 +11580,17 @@ var plugins_bb40132b_638b_4a9f_b028_d3fe47acc8d1 =
 							MotaActionFunctions.actionParser.parseList({
 								type: "switch",
 								condition: "判别值",
-                caseList: [
+								caseList: [{
-                  {
 										action: [
 											{ type: "comment", text: "当判别值是值的场合执行此事件" },
 										],
 									},
 									{
 										case: "default",
-                    action: [
+										action: [{
-                      {
 											type: "comment",
 											text: "当没有符合的值的场合执行default事件",
-                      },
+										}, ],
-                    ],
 									},
 								],
 							}),
@@ -11646,37 +11626,30 @@ var plugins_bb40132b_638b_4a9f_b028_d3fe47acc8d1 =
 							MotaActionFunctions.actionParser.parseList({
 								type: "wait",
 								timeout: 0,
-                data: [
+								data: [{
-                  {
 										case: "keyboard",
 										keycode: "13,32",
-                    action: [
+										action: [{
-                      {
 											type: "comment",
 											text: "当按下回车(keycode=13)或空格(keycode=32)时执行此事件\n超时剩余时间会写入flag:timeout",
-                      },
+										}, ],
-                    ],
 									},
 									{
 										case: "mouse",
 										px: [0, 32],
 										py: [0, 32],
-                    action: [
+										action: [{
-                      {
 											type: "comment",
 											text: "当点击地图左上角时执行此事件\n超时剩余时间会写入flag:timeout",
-                      },
+										}, ],
-                    ],
 									},
 									{
 										case: "condition",
 										condition: "flag:type==0\n&&flag:keycode==13",
-                    action: [
+										action: [{
-                      {
 											type: "comment",
 											text: "当满足自定义条件时会执行此事件\n超时剩余时间会写入flag:timeout",
-                      },
+										}, ],
-                    ],
 									},
 									{
 										case: "timeout",
@@ -11893,10 +11866,11 @@ var plugins_bb40132b_638b_4a9f_b028_d3fe47acc8d1 =
 						var list = toolboxObj["入口方块"];
 						var xmlList = [];
 						var eventType =
-              (editor_blockly.isCommonEntry()
+							(editor_blockly.isCommonEntry() ?
-                ? "common"
+								"common" :
-                : editor_blockly.entryType) + "_m";
+								editor_blockly.entryType) + "_m";
-            for (var ii = 0, blockText; (blockText = list[ii]); ii++) {
+						for (var ii = 0, blockText;
+							(blockText = list[ii]); ii++) {
 							if (
 								new RegExp('<block type="' + eventType + '">').exec(blockText)
 							) {
@@ -11951,14 +11925,16 @@ var plugins_bb40132b_638b_4a9f_b028_d3fe47acc8d1 =
 						var mousewheelOffsetValue =
 							(20 / 380) * workspace.scrollbar[hvScroll].handleLength_ * 3;
 						workspace.scrollbar[hvScroll].handlePosition_ +=
-              (e.deltaY || 0) + (e.detail || 0) > 0
+							(e.deltaY || 0) + (e.detail || 0) > 0 ?
-                ? mousewheelOffsetValue
+							mousewheelOffsetValue :
-                : -mousewheelOffsetValue;
+							-mousewheelOffsetValue;
 						workspace.scrollbar[hvScroll].onScroll_();
 						// workspace.setScale(workspace.scale);
 					};
 
-          var doubleClickCheck = [[0, "abc"]];
+					var doubleClickCheck = [
+						[0, "abc"]
+					];
 
 					function omitedcheckUpdateFunction(event) {
 						if (event.type === "create") {
@@ -12042,7 +12018,8 @@ var plugins_bb40132b_638b_4a9f_b028_d3fe47acc8d1 =
 							">"
 						);
 						if (!inputs) inputs = [];
-            for (var ii = 0, inputType; (inputType = rule.argsType[ii]); ii++) {
+						for (var ii = 0, inputType;
+							(inputType = rule.argsType[ii]); ii++) {
 							var input = inputs[ii];
 							var _input = "";
 							var noinput = input === null || input === undefined;
@@ -12106,7 +12083,7 @@ var plugins_bb40132b_638b_4a9f_b028_d3fe47acc8d1 =
 			.split("// start mark sfergsvae")[1]
 			.split("// end mark sfergsvae")[0];
 	}
-  },
+},
     "夹击激光动画": function () {
     function createCanvas(name, zIndex) {
       if (!name) return;
@@ -18345,30 +18322,26 @@ var plugins_bb40132b_638b_4a9f_b028_d3fe47acc8d1 =
 			break;
 		case "fog":
 			if (core.animateFrame.weather.fog) {
-            core.animateFrame.weather.nodes[type] = [
+				core.animateFrame.weather.nodes[type] = [{
-              {
 					level: number,
 					x: 0,
 					y: -core.__PIXELS__ / 2,
 					dx: -Math.random() * 1.5,
 					dy: Math.random(),
 					delta: 0.001,
-              },
+				}, ];
-            ];
 			}
 			break;
 		case "cloud":
 			if (core.animateFrame.weather.cloud) {
-            core.animateFrame.weather.nodes[type] = [
+				core.animateFrame.weather.nodes[type] = [{
-              {
 					level: number,
 					x: 0,
 					y: -core.__PIXELS__ / 2,
 					dx: -Math.random() * 1.5,
 					dy: Math.random(),
 					delta: 0.001,
-              },
+				}, ];
-            ];
 			}
 			break;
 		case "sun":
@@ -18523,7 +18496,7 @@ var plugins_bb40132b_638b_4a9f_b028_d3fe47acc8d1 =
 			"cloud"
 		);
 	};
-  },
+},
     "回合战斗动画": function () {
 	// 在此增加新插件
 	const animateAttack = document.createElement("canvas"); //画布设置
@@ -18581,8 +18554,6 @@ var plugins_bb40132b_638b_4a9f_b028_d3fe47acc8d1 =
 			ctx,
 			"生命  " +
 			core.formatBigNumber(heroInfo.hp, true) +
-          " / " +
-          core.formatBigNumber(heroInfo.hpmax, true),
 			90,
 			205,
 			"#FFFFFF",
@@ -18948,7 +18919,7 @@ var plugins_bb40132b_638b_4a9f_b028_d3fe47acc8d1 =
 			}
 		});
 	};
-  },
+},
     "剧情内容": function () {
     // 在此增加新插件
     // 每项为一个数组，第一项是名字，第二项是对话内容
@@ -19564,5 +19535,56 @@ var plugins_bb40132b_638b_4a9f_b028_d3fe47acc8d1 =
       ["梅尔特", "「我忘记了」"],
       ["吉克", "「骗人」"],
     ];
+  },
+    "勇士法抗乘算叠加": function () {
+	// 在此增加新插件
+	items.prototype.compareEquipment = function (compareEquipId, beComparedEquipId) {
+		var result = { "value": {}, "percentage": {} };
+		var first = core.material.items[compareEquipId],
+			second = core.material.items[beComparedEquipId];
+		for (var one in result) {
+			for (var name in core.status.hero) {
+				if (name === "mdef" && one === 'percentage') {
+					var ans = 1;
+					if (first?.equip?.[one]?.[name]) ans *= (1 - (first.equip[one][name] || 0) / 100);
+
+					if (second?.equip?.[one]?.[name]) ans /= (1 - (second.equip[one][name] || 0) / 100);
+
+					if (ans != 1) result[one][name] = ans;
+				} else if (name === "mdef" && one === 'value') {
+					var ans = 0;
+					if (first) ans -= ((first.equip || {})[one] || {})[name] || 0;
+					if (second) ans += ((second.equip || {})[one] || {})[name] || 0;
+					if (ans != 0) result[one][name] = ans;
+				} else {
+					if (typeof core.status.hero[name] == 'number') {
+						var ans = 0;
+						if (first) ans += ((first.equip || {})[one] || {})[name] || 0;
+						if (second) ans -= ((second.equip || {})[one] || {})[name] || 0;
+						if (ans != 0) result[one][name] = ans;
+					}
+				}
+			}
+		}
+		return result;
+	}
+	let a = 1
+	items.prototype._loadEquipEffect = function (equipId, unloadEquipId) {
+		// 比较能力值
+		var result = core.compareEquipment(equipId, unloadEquipId);
+
+		for (var name in result.percentage) {
+			if (name === "mdef") {
+				a *= result.percentage[name]
+				core.setBuff(name, 1 - a)
+			} else {
+
+				core.addBuff(name, result.percentage[name] / 100);
+			}
+		}
+		for (var name in result.value)
+			core.status.hero[name] += result.value[name];
+
 	}
 }
+}