From bdfb33a3f6b761910c1508fde69b4ba69255cd77 Mon Sep 17 00:00:00 2001
From: libccy <widget@widgetdeMacBook-Pro.local>
Date: Thu, 10 Sep 2015 21:56:57 +0800
Subject: [PATCH] =?UTF-8?q?=E9=93=81=E7=B4=A2=E7=BB=93=E7=AE=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.MD          |  2 ++
 card/extra.js         |  7 +++++++
 card/swd.js           |  2 +-
 character/extra.js    | 12 +++++++++++-
 character/hearth.js   | 13 +++++--------
 character/swd.js      |  4 ++--
 character/xianjian.js |  4 ++--
 game/game.js          | 13 +++++++++++--
 8 files changed, 41 insertions(+), 16 deletions(-)

diff --git a/CHANGELOG.MD b/CHANGELOG.MD
index 033d9c638..6b53dd1f9 100644
--- a/CHANGELOG.MD
+++ b/CHANGELOG.MD
@@ -1,2 +1,4 @@
 1.2.11
 火攻bug
+铁索结算问题
+酒杀AI
diff --git a/card/extra.js b/card/extra.js
index b29998e5c..c4ac6a8d5 100755
--- a/card/extra.js
+++ b/card/extra.js
@@ -35,6 +35,13 @@ card.extra={
 						if(target&&target==_status.dying) return 2;
 						var shas=target.get('h','sha');
 						var ok=false;
+						if(player.num('h','sha')>1){
+							if(player.num('e','zhuge')) return 0;
+							if(player.skills.contains('paoxiao')) return 0;
+							if(player.skills.contains('tanlnin3')) return 0;
+							if(player.skills.contains('zhaxiang2')) return 0;
+							if(player.skills.contains('fengnu')) return 0;
+						}
 						if(shas.length){
 							for(var i=0;i<shas.length;i++){
 								if(lib.filter.filterCard(shas[i],target)){
diff --git a/card/swd.js b/card/swd.js
index 69d978cf3..9d90f3e64 100755
--- a/card/swd.js
+++ b/card/swd.js
@@ -889,7 +889,7 @@ card.swd={
 			trigger:{source:'damageEnd'},
 			forced:true,
 			filter:function(event,player){
-				return event.card&&event.card.name=='sha'
+				return event.card&&event.card.name=='sha'&&player.hp<player.maxHp;
 			},
 			content:function(){
 				player.recover(trigger.num);
diff --git a/character/extra.js b/character/extra.js
index 3aed10651..a44330b62 100755
--- a/character/extra.js
+++ b/character/extra.js
@@ -371,11 +371,12 @@ character.extra={
 		wuhun:{
 			trigger:{player:'dieBegin'},
 			forced:true,
+			popup:false,
 			filter:function(event){
 				return event.source!=undefined;
 			},
 			content:function(){
-				trigger.source.loseHp(trigger.source.hp);
+				trigger.source.addSkill('wuhun2');
 			},
 			ai:{
 				threaten:function(player,target){
@@ -399,6 +400,14 @@ character.extra={
 				}
 			}
 		},
+		wuhun2:{
+			trigger:{global:'dieAfter'},
+			forced:true,
+			content:function(){
+				player.loseHp(player.hp);
+				player.removeSkill('wuhun2');
+			}
+		},
 		guixin:{
 			trigger:{player:'damageEnd'},
 			check:function(event,player){
@@ -1038,6 +1047,7 @@ character.extra={
 		wushen:'武神',
 		wushen_info:'锁定技，你的红桃手牌视为杀；锁定技，你使用红桃杀时无距离限制。',
 		wuhun:'武魂',
+		wuhun2:'武魂',
 		wuhun_info:'锁定技，杀死你的角色立即进入濒死状态',
 		shelie:'涉猎',
 		gongxin:'攻心',
diff --git a/character/hearth.js b/character/hearth.js
index 6918283ce..b61ffc27c 100755
--- a/character/hearth.js
+++ b/character/hearth.js
@@ -20,7 +20,7 @@ character.hearth={
 		hs_antonidas:['male','wei',3,['yanshu','bingshuang'],['fullskin']],
 		hs_alakir:['male','wei',3,['fengnu','shengdun'],['fullskin']],
 		hs_zhouzhuo:['male','qun',3,['jubao','qice'],['fullskin']],
-		hs_yngvar:['male','wei',3,['huanwu'],['fullskin']],
+		hs_yngvar:['male','qun',3,['huanwu'],['fullskin']],
 		hs_bchillmaw:['male','wei',6,['hanshuang','bingshi'],['fullskin']],
 		hs_malorne:['male','wu',3,['shenen','chongsheng'],['fullskin']],
 
@@ -55,8 +55,7 @@ character.hearth={
 			},
 			ai:{
 				threaten:1.8,
-				order:function(item,player){
-					console.log(item,player);
+				order:function(name,player){
 					return 10;
 				},
 				result:{
@@ -127,9 +126,7 @@ character.hearth={
 			ai:{
 				order:1,
 				result:{
-					player:function(player){
-						return (player.num('h')<=1)?1:0;
-					}
+					player:1
 				}
 			}
 		},
@@ -1483,7 +1480,7 @@ character.hearth={
 			trigger:{source:'damageBegin'},
 			forced:true,
 			filter:function(event){
-				return event.card&&get.type(event.card)=='trick';
+				return event.card&&get.type(event.card)=='trick'&&event.parent.name!='_lianhuan'&&event.parent.name!='_lianhuan2';
 			},
 			content:function(){
 				trigger.num++;
@@ -1508,7 +1505,7 @@ character.hearth={
 			trigger:{source:'damageBegin'},
 			forced:true,
 			filter:function(event){
-				return event.card&&event.card.name=='sha';
+				return event.card&&event.card.name=='sha'&&event.parent.name!='_lianhuan'&&event.parent.name!='_lianhuan2';
 			},
 			content:function(){
 				trigger.num++;
diff --git a/character/swd.js b/character/swd.js
index f6b8ea98f..75f3332bc 100755
--- a/character/swd.js
+++ b/character/swd.js
@@ -1065,7 +1065,7 @@ character.swd={
         guaili:{
 			trigger:{source:'damageBegin'},
 			filter:function(event){
-				return event.card&&event.card.name=='sha';
+				return event.card&&event.card.name=='sha'&&event.parent.name!='_lianhuan'&&event.parent.name!='_lianhuan2';
 			},
 			forced:true,
 			content:function(){
@@ -3807,7 +3807,7 @@ character.swd={
 			forced:true,
 			popup:false,
 			filter:function(event,player){
-				return event.card&&event.card.name=='sha'&&player.storage.liaoyuan>0;
+				return event.card&&event.card.name=='sha'&&player.storage.liaoyuan>0&&event.parent.name!='_lianhuan'&&event.parent.name!='_lianhuan2';
 			},
 			content:function(){
 				trigger.num+=player.storage.liaoyuan;
diff --git a/character/xianjian.js b/character/xianjian.js
index be33cf07a..f7fa43f4b 100755
--- a/character/xianjian.js
+++ b/character/xianjian.js
@@ -1319,8 +1319,8 @@ character.xianjian={
 		},
 		tianshe2:{
 			trigger:{source:'damageAfter'},
-			filter:function(event){
-				if(event.nature) return true;
+			filter:function(event,player){
+				if(event.nature&&player.hp<player.maxHp) return true;
 			},
 			forced:true,
 			content:function(){
diff --git a/game/game.js b/game/game.js
index 23bd3dada..02bd29598 100755
--- a/game/game.js
+++ b/game/game.js
@@ -11643,13 +11643,22 @@
 				cheat.z('caopi');
 			},
 			cc:function(){
-				cheat.z('recaocao');
+				cheat.z('re_caocao');
 			},
 			ls:function(){
 				cheat.z('liushan');
 			},
 			zj:function(){
-				cheat.z('spzhangjiao');
+				cheat.z('diy_zhangjiao');
+			},
+			sc:function(){
+				cheat.z('sunce');
+			},
+			lc:function(){
+				cheat.z('liushan');
+			},
+			lb:function(){
+				cheat.z('liubei');
 			}
 		}
 		window.countGroups=function(){