From bc33bbd106f67b9d5aa263e392c57ebc1926d86a Mon Sep 17 00:00:00 2001
From: libccy <operawidget@163.com>
Date: Mon, 1 May 2017 13:54:29 +0800
Subject: [PATCH] s

---
 card/swd.js          |  2 +-
 character/hearth.js  |  6 +++++-
 character/shenhua.js |  2 ++
 game/game.js         |  6 +++---
 game/update.js       | 11 ++++-------
 5 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/card/swd.js b/card/swd.js
index a9e741624..41d29bb54 100644
--- a/card/swd.js
+++ b/card/swd.js
@@ -4640,7 +4640,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){
 				check:function(event,player){
 					var att=get.attitude(player,event.target);
 					if(player.hasSkill('jiu')) return att>0;
-					if(event.target.hasSkillTag('maixie_hp')){
+					if(event.target.hasSkillTag('maixie_hp')||event.target.hasSkillTag('maixie_fake')){
 						return att<=0;
 					}
 					if(player.hasSkill('tianxianjiu')) return false;
diff --git a/character/hearth.js b/character/hearth.js
index d0fdd47b1..b8d90ef77 100644
--- a/character/hearth.js
+++ b/character/hearth.js
@@ -7200,8 +7200,12 @@ game.import('character',function(lib,game,ui,get,ai,_status){
             hs_zhihuanhua:'致幻花',
             hs_shirencao:'食人草',
 
+            zhaochao:'招潮',
+            zhaochao_info:'锁定技，结束阶段，你视为对一名随机敌人使用一张杀；若此杀被闪避，你视为对另一名随机敌人使用一张杀',
+            hllingxi:'灵息',
+            hllingxi_info:'出牌阶段，你可以令一名已受伤角色弃置两张牌并回复一点体力（一回合内不能对相同角色发动两次）',
             xiyong:'汐涌',
-            xiyong_info:'锁定技，结束阶段，你摸X张牌，X为你手牌中包含的卡牌类型数且不超过3',
+            xiyong_info:'锁定技，结束阶段，你摸一张牌并可以使用之，若此使用了此牌，你再摸一张牌',
             hsjixie:'机械',
             hsjixie_zhadan:'炸弹机器人',
             hsjixie_zhadan_info:'出牌阶段对自己使用，对一名随机敌人造成一点火属性伤害',
diff --git a/character/shenhua.js b/character/shenhua.js
index d5036afa4..dcc4bf27e 100644
--- a/character/shenhua.js
+++ b/character/shenhua.js
@@ -3551,6 +3551,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
     				trigger.trigger('damageBefore');
     			},
     			ai:{
+                    maixie_fake:true,
     				effect:{
     					target:function(card,player,target){
     						if(player.hasSkillTag('jueqing')) return;
@@ -3644,6 +3645,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
     				trigger.trigger('damageBefore');
     			},
     			ai:{
+                    maixie_fake:true,
     				effect:{
     					target:function(card,player,target){
     						if(player.hasSkillTag('jueqing')) return;
diff --git a/game/game.js b/game/game.js
index 16d030e64..361ff3e93 100644
--- a/game/game.js
+++ b/game/game.js
@@ -11985,9 +11985,6 @@
 					event.trigger('changeHp');
 				},
 				changeHujia:function(){
-					if(typeof num!='number'){
-						num=1;
-					}
 					player.hujia+=num;
 					if(num>0){
 						game.log(player,'获得了'+get.cnNumber(num)+'点护甲');
@@ -14764,6 +14761,9 @@
 
 				changeHujia:function(num,type){
 					var next=game.createEvent('changeHujia');
+					if(typeof num!='number'){
+						num=1;
+					}
 					next.num=num;
 					next.player=this;
 					if(type) next.type=type;
diff --git a/game/update.js b/game/update.js
index 8954ed3ce..23d90b178 100644
--- a/game/update.js
+++ b/game/update.js
@@ -12,13 +12,10 @@ window.noname_update={
         // 'game/pressure.js',
         // 'game/asset.js',
         // 'card/*',
-        // 'card/sp.js',
-        // 'card/yunchou.js',
-        // 'character/*',
-        'character/refresh.js',
-        'character/ow.js',
-        'character/hearth.js',
-        'character/rank.js',
+        'card/swd.js',
+        // 'card/standard.js',
+        'character/*',
+        // 'character/rank.js',
         // 'mode/boss.js',
         // 'mode/versus.js',
         // 'mode/guozhan.js',