fix bugs

extension.js

@@ -2358,7 +2358,7 @@ game.import("extension", function (lib, game, ui, get, ai, _status) {
 					"zioy_xixuegui": ["male", "qun", 4, ["zioy_xixue"], []],
 					"zioy_yilong": ["female", "qun", "2/2/2", ["zioy_shiyi"], []],
 					"zioy_shuijinxiezi": ["male", "qun", 3, ["zioy_jinjia", "zioy_jinsui"], []],
-					"zioy_dreamaker": ["female", "jin", 3, ["zioy_chenmeng", "zioy_xiaoxiang"], []],
+					"zioy_dreamaker": ["female", "jin", 4, ["zioy_chenmeng", "zioy_xiaoxiang"], []],
 					"zioy_drugdoctor": ["male", "qun", 4, ["zioy_heiyi"], []],
 					"zioy_zhigaotian": ["female", "shen", 3, ["zioy_eye", "zioy_damie"], ["hiddenSkill"]],
 					"zioy_huajian": ["female", "jin", "3/7/4", ["zioy_huashou", "zioy_longyue"], []],
@@ -2367,7 +2367,7 @@ game.import("extension", function (lib, game, ui, get, ai, _status) {
 					"zioy_yinlong": ["male", "wu", 4, ["zioy_qianlong", "zioy_jianlong", "zioy_kanglong2"], ["des:新春特典"]],
 					"zioy_peiki": ["male", "shu", 3, ["zioy_yixiang", "zioy_chuixing", "zioy_yuyan"], ["des:新春特典"]],
 					"zioy_xielingyun": ["female", "daqin", "3/5", ["zioy_zhijin", "zioy_xuanzhuan"], []],
-					"zioy_heibai": ["male", "qun", 4, ["zioy_leiye1", "zioy_mosha", "zioy_shuangsha", "zioy_lieying"], ["des:新春特典"]],
+					"zioy_chuxi": ["male", "qun", 5, ["zioy_leiye1", "zioy_mosha", "zioy_shuangsha", "zioy_lieying"], ["des:新春特典"]],
 					"zioy_sose": ["male", "wei", "1/1/7", ["zioy_wrjzc", "zioy_zsyhj"], ["des:新春特典"]],
 					"zioy_pqsj": ["none", "qun", 1, ["zioy_weixiang"], []],
 					"zioy_nianshou": ["none", "shu", 1, ["zioy_fansheng", "zioy_nianxi"], ["des:新春特典"]],
@@ -2383,7 +2383,7 @@ game.import("extension", function (lib, game, ui, get, ai, _status) {
 					"zioy_xukongchong": ["female", "jin", 5, ["zioy_longzi", "zioy_yingyuan"], ["hiddenSkill"]],
 					"zioy_muxi": ["female", "jin", "-3/3", ["zioy_shuohui"], []],
 					"zioy_kailuer": ["female", "qun", 4, ["zioy_hey", "zioy_ya", "zioy_ha"], []],
-					"zioy_nike": ["none", "shen", 5, ["zioy_cuiyi", "zioy_shihong", "zioy_huangyi", "zioy_shulin"], []],
+					"zioy_nike": ["none", "shen", 6, ["zioy_cuiyi", "zioy_shihong", "zioy_huangyi", "zioy_shulin"], []],
 					"zioy_bailu": ["female", "shen", 2, ["zioy_hexuchongxiang", "zioy_yuezhuiyunwei"], ["forbidai"]],
 					test: ["male", "", 3, ["zioy_t"], []],
 					"zioy_lanchesite": ["none", "shu", "4/4/1", ["zioy_yujin", "zioy_xumie"], []],
@@ -2413,7 +2413,7 @@ game.import("extension", function (lib, game, ui, get, ai, _status) {
 					"zioy_yinlong": "胤龙",
 					"zioy_peiki": "派琦",
 					"zioy_xielingyun": "谢灵运",
-					"zioy_heibai": "除夕",
+					"zioy_chuxi": "除夕",
 					"zioy_sose": "SO-SE",
 					"zioy_pqsj": "皮丘什金",
 					"zioy_nianshou": "年",
@@ -2623,6 +2623,7 @@ target.storage.jss.changeHujia(1);
 						filter: function (event, player) {
 							return event.source == player.storage.chenmengsource;
 						},
+						forced: true,
 						content: function () {
 							player.gainMaxHp();
 							player.storage.chenmengsource.loseMaxHp();
@@ -4402,13 +4403,15 @@ if(get.type(card)=='basic' && get.type(card)=='trick')   flag=  true;
 							var target = player.next;
 							player.awakenSkill(event.name);
 							while (target != player) {
-								player.storage.cmnum--;
-								target.removeSkill("zioy_chenmeng1");
-								target.removeMark("zioy_chenmeng");
-								target.turnOver();
-								//player.gainMaxHp();
-								player.recover();
-								player.update();
+								if(target.hasSkill("zioy_chenmeng1")){
+									player.storage.cmnum--;
+									target.removeSkill("zioy_chenmeng1");
+									target.removeMark("zioy_chenmeng");
+									target.turnOver();
+									//player.gainMaxHp();
+									player.recover();
+									player.update();
+								}
 								target = target.next;
 							}
 						},
@@ -5572,6 +5575,7 @@ if(get.type(card)=='basic' && get.type(card)=='trick')   flag=  true;
 								var p1 = p;
 								do {
 									if (p1.countMark("zioy_cuiyi") > 0) {
+										p1.recover()
 										c = ["strike", "attack", "defend", "miss", "hit"];
 										p1.changeEnhancement(c[(2 * game.roundNumber - 1) % 5], c[(2 * game.roundNumber) % 5], 1);
 									}
@@ -5640,7 +5644,7 @@ if(get.type(card)=='basic' && get.type(card)=='trick')   flag=  true;
 						trigger: {
 							source: "damageBegin1"
 						},
-						priority: -70582141,
+						priority: -70582140451,
 						forced: true,
 						locked: true,
 						filter: function (card, player, target) {
@@ -9049,14 +9053,14 @@ if(get.type(card)=='basic' && get.type(card)=='trick')   flag=  true;
 						"锁定技<br>①防止你在已损失体力时死亡，你在未损失体力时进入濒死状态。<br>②你不以此法失去体力与受到伤害均改为回复体力，不以此法回复体力均改为失去体力。<br>③除开始阶段与结束阶段，你的回合阶段执行顺序与正常顺序相反。<br>④你的手牌上限等于你已损失体力。",
 					"zioy_hexuchongxiang": "鹤墟重香",
 					"zioy_hexuchongxiang_info":
-						"清香更何用，犹发去年枝。<br>①将你即将受到伤害/流失体力时伤害/流失值超过X-N点的部分转化为“蜃气”，触发此效果超过X+1次后令X加1并重置计数（获得此技能时令X=0，N为本回合满足〖鹤墟重香①〗的时机次数-1且不超过X）<br>②当你死亡时，若你体力值大于0则改为失去所有体力，否则：若你体力上限不为场上唯一最多或于体力值不大于0时发动〖鹤墟重香①〗次数小于2，你复活，获得N+1点体力上限，回复所有体力，移去所有“蜃气”并获得等量护盾，摸等量的牌，令X等于N-1，重置①效果计数，令你本局游戏摸牌阶段摸牌数，造成/受到伤害，失去体力的数值永久增加80%（向下取整）（N为〖鹤墟重香②〗发动的次数）<br>③你的“蜃气”数量不会超过你体力上限，获得“蜃气”时根据你是否受伤将多余的“蜃气”转换为体力值或“海市蜃楼”天气回合数。",
+						"清香更何用，犹发去年枝。<br>①将你即将受到伤害/流失体力时伤害/流失值超过X-N点的部分转化为“蜃气”，触发此效果超过X+1次后令X加1并重置计数（获得此技能时令X=0，N为本回合满足〖鹤墟重香①〗的时机次数-1且不超过X）<br>②当你死亡时，若你体力值大于0则改为失去所有体力，否则：若你体力上限不为场上唯一最多或发动〖鹤墟重香②〗的次数小于2，你复活，获得N+1点体力上限，回复所有体力，移去所有“蜃气”并获得等量护盾，摸等量的牌，令X等于N-1，重置①效果计数，令你本局游戏摸牌阶段摸牌数，造成/受到伤害，失去体力的数值永久增加80%（向下取整）（N为〖鹤墟重香②〗发动的次数）<br>③你的“蜃气”数量不会超过你体力上限，获得“蜃气”时根据你是否受伤将多余的“蜃气”转换为体力值或“海市蜃楼”天气回合数。",
 					"zioy_hexuchongxiang_mark": "鹤墟重香③",
 					"zioy_hexuchongxiang_revive": "鹤墟重香②",
 					"zioy_yuezhuiyunwei": "月坠云微",
 					"zioy_yuezhuiyunwei_info":
 						"梦回芳草思依依，天远雁声稀。<br>①根据当前“蜃气”的数量执行下列效果：<br>不大于50%体力上限：一名角色的回合开始阶段你失去1级防御，攻击强化，你的判定区视为被废除，你免疫任何异常状态，你的武将牌始终正面向上。<br>大于25%体力上限：当你成为其他角色使用牌的目标时，其弃置一张与此牌同名的手牌（没有则不弃）<br>大于6：当你造成超过1点伤害后，你失去1点体力上限并令其获得1点体力上限，令你本局游戏摸牌阶段摸牌数，造成/受到伤害，失去体力的数值永久增加20%（与〖鹤墟重香〗同乘区）。<br>等于体力上限：每局游戏限一次，发动〖鹤墟重香②〗或〖月坠云微②〗时重置计数。当你使用牌对指定一名角色为唯一目标时，你与其交换体力与体力上限。以此法交换的体力和体力上限不超过X点（X为你发动〖鹤墟重香③〗的次数）<br>②每回合限1次，出牌阶段，若你有“蜃气”，你可以主动发动此技能：你失去所有“蜃气”，倒置负面强化并清除所有异常状态，召唤等量回合的“海市蜃楼”天气，令一名角色获得等量护盾，令一名角色回复等量体力，令一名角色摸等量牌（X=你的体力上限/2且向下取整）<br>③你永久免疫“睡眠”异常，永久免疫“海市蜃楼”的任何效果。",
 					"zioy_zhumingxiangan": "烛明香暗",
-					"zioy_zhumingxiangan_info": "凭阑半日独无言，依旧竹声新月似当年。<br>①若你",
+					"zioy_zhumingxiangan_info": "凭阑半日独无言，依旧竹声新月似当年。<br>转换技：①若你",
 					"zioy_hanbosuliu": "寒波泝流",
 					"zioy_hanbosuliu_info": "琼窗春断双蛾皱，回首边头。",
 					"zioy_pianhongxiusao": "片红休埽",
@@ -9153,7 +9157,7 @@ if(get.type(card)=='basic' && get.type(card)=='trick')   flag=  true;
 				"zioy_zhigaotian.jpg",
 				"zioy_renturtle.jpg",
 				"zioy_yinlong.jpg",
-				"zioy_heibai.jpg",
+				"zioy_chuxi.jpg",
 				"zioy_senjianmeng.jpg",
 				"zioy_xuanhu.jpg",
 				"zioy_yilong.jpg",