From 55b77af5cd1140907df4cb114214034e51e64ae7 Mon Sep 17 00:00:00 2001
From: libccy <libccy@gmail.com>
Date: Mon, 11 May 2015 11:43:37 +0800
Subject: [PATCH] x

---
 .jshintrc              | 18 ++++++++++++++++++
 character/mountain.js  |  2 +-
 character/sp.js        |  3 ++-
 game/config.js         |  2 +-
 game/game.js           | 12 +++++++-----
 layout/mode/boss.css   |  0
 mode/archive/mowang.js |  4 ++--
 mode/boss.js           |  7 ++++++-
 8 files changed, 37 insertions(+), 11 deletions(-)
 create mode 100644 .jshintrc
 create mode 100644 layout/mode/boss.css

diff --git a/.jshintrc b/.jshintrc
new file mode 100644
index 000000000..3c0151299
--- /dev/null
+++ b/.jshintrc
@@ -0,0 +1,18 @@
+{
+  "camelcase": true,
+  "eqeqeq": true,
+  "globalstrict": true,
+  "esnext": true,
+  "strict": true,
+  "newcap": false,
+  "browser": true,
+  "unused": true,
+  "loopfunc": true,
+  "noyield": true,
+  "quotmark": "single",
+  "devel": true,
+  "node":true,
+  "globals": {
+	  
+  }
+}
diff --git a/character/mountain.js b/character/mountain.js
index 53aa8115d..801c00d65 100644
--- a/character/mountain.js
+++ b/character/mountain.js
@@ -418,7 +418,7 @@ character.mountain={
 				player.judge(function(card){
 					if(get.suit(card)=='heart') return -1;
 					return 1;
-				});
+				},ui.special);
 				"step 1"
 				if(result.bool){
 					result.card.goto(ui.special);
diff --git a/character/sp.js b/character/sp.js
index ada185185..6b4c47963 100644
--- a/character/sp.js
+++ b/character/sp.js
@@ -43,9 +43,10 @@ character.sp={
 			},
 			content:function(){
 				"step 0"
-				trigger.source.judge();
+				trigger.source.judge(ui.special);
 				"step 1"
 				if(result.color=='black'){
+					result.card.goto(ui.discardPile);
 					trigger.num++;
 				}
 				else{
diff --git a/game/config.js b/game/config.js
index 2f1f03c6b..2bb1906d3 100644
--- a/game/config.js
+++ b/game/config.js
@@ -6,7 +6,7 @@ window.config={
 	'xiahouyuan','huangzhong','weiyan','dianwei','gongsunzan'],
 	forbidversus:['swd_kangnalishi'],
 	forbidstone:['zhugedan','pal_xuanxiao'],
-	forbidchess:['hetaihou'],
+	forbidchess:['hetaihou','swd_kangnalishi'],
 	forbiddouble:['zhugedan','swd_kangnalishi','swd_nicole','dongzhuo','jg_simayi'],
 	all:{
 		mode:['identity','guozhan','versus','boss','chess','stone'],
diff --git a/game/game.js b/game/game.js
index 5de0d2fd3..04ca89d5b 100644
--- a/game/game.js
+++ b/game/game.js
@@ -1828,7 +1828,7 @@ window.play={};
 					game.dead.push(player);
 					if(player.dieAfter) player.dieAfter(source);
 					if(lib.config.background_speak){
-						if(lib.character[player.name]&&lib.character[player.name][4]&&
+						if(lib.character[player.name]&&
 						lib.character[player.name][4].contains('die_audio')){
 							game.playAudio('die',player.name);
 						}
@@ -1988,7 +1988,7 @@ window.play={};
 					var info=lib.character[character];
 					var skills=info[3];
 					this.skills.length=0;
-					if(!game.minskin&&lib.config.layout=='newlayout'&&info[4]&&info[4].contains('fullskin')){
+					if(!game.minskin&&lib.config.layout=='newlayout'&&info[4].contains('fullskin')){
 						this.classList.remove('minskin');
 						this.classList.add('fullskin');
 						this.node.avatar.style.backgroundImage='url("image/character/fullskin/'+character+'.jpg")';
@@ -1997,7 +1997,7 @@ window.play={};
 					else{
 						this.node.avatar.setBackground(character,'character');
 						this.classList.remove('fullskin');
-						if(info[4]&&info[4].contains('minskin')){
+						if(info[4].contains('minskin')){
 							this.classList.add('minskin');
 						}
 						else if(game.minskin){
@@ -6577,7 +6577,7 @@ window.play={};
 				}
 				else{
 					for(var i in lib.character){
-						if(lib.character[i][4]&&lib.character[i][4].contains('minskin')) continue;
+						if(lib.character[i][4].contains('minskin')) continue;
 						if(filter&&filter(i)) continue;
 						list.push(i);
 						if(namecapt.indexOf(getCapt(i))==-1){
@@ -11535,8 +11535,10 @@ window.play={};
 					if(j=='character'&&!lib.config.characters.contains(i)) continue;
 					for(k in character[i][j]){
 						if(j=='character'){
+							if(!character[i][j][k][4]){
+								character[i][j][k][4]=[];
+							}
 							if(lib.config.only_fullskin&&lib.config.layout=='newlayout'&&lib.config.mode!='chess'){
-								if(!character[i][j][k][4]) continue;
 								if(!character[i][j][k][4].contains('fullskin')&&!character[i][j][k][4].contains('minskin')){
 									continue;
 								}
diff --git a/layout/mode/boss.css b/layout/mode/boss.css
new file mode 100644
index 000000000..e69de29bb
diff --git a/mode/archive/mowang.js b/mode/archive/mowang.js
index 8b12c83a4..b25160a34 100644
--- a/mode/archive/mowang.js
+++ b/mode/archive/mowang.js
@@ -27,7 +27,7 @@ mode.mowang={
 			inherit:'biyue'
 		},
 		baonu:{
-			trigger:{player:'damageEnd'},
+			trigger:{player:'changeHp'},
 			forced:true,
 			filter:function(event,player){
 				return player.hp<=4
@@ -535,4 +535,4 @@ mode.mowang={
 			versus:6,
 		},
 	],
-}
\ No newline at end of file
+}
diff --git a/mode/boss.js b/mode/boss.js
index 271eee9ac..080562fe7 100644
--- a/mode/boss.js
+++ b/mode/boss.js
@@ -5,6 +5,7 @@ mode.boss={
 			var next=game.createEvent('game',false);
 			next.content=function(){
 				"step 0"
+				lib.init.css('layout/mode','boss')
 				ui.create.arena();
 				var dialog=ui.create.dialog('还没完工~');
 				dialog.style.height='52px';
@@ -17,5 +18,9 @@ mode.boss={
 				console.log(1);
 			}
 		}
-	}
+	},
+	character:{
+		boss_zuiqiangshenhua:['male','qun',8,['mashu','wushuang','baonu'],['boss']],
+		boss_baonuzhanshen:['male','qun',4,['mashu','wushuang','xiuluo','shenwei','shenji'],['boss']],
+	},
 }