From 2aebe60084a5b0d446abecf47ac1bd3dbba66abd Mon Sep 17 00:00:00 2001
From: libccy <operawidget@163.com>
Date: Sun, 2 Apr 2017 11:11:26 +0800
Subject: [PATCH] r

---
 card/sp.js                                    |  12 ++---
 game/asset.js                                 |   4 +-
 game/game.js                                  |  47 +++++++++++++++---
 .../card/{jinchantuoqiao.png => jinchan.png}  | Bin
 image/card/{qijiayebing.png => qijia.png}     | Bin
 mode/identity.js                              |  34 +++++++++++++
 6 files changed, 81 insertions(+), 16 deletions(-)
 rename image/card/{jinchantuoqiao.png => jinchan.png} (100%)
 rename image/card/{qijiayebing.png => qijia.png} (100%)

diff --git a/card/sp.js b/card/sp.js
index e4b52a774..892dd86f3 100644
--- a/card/sp.js
+++ b/card/sp.js
@@ -2,12 +2,12 @@
 card.sp={
 	connect:true,
 	card:{
-		qijiayebing:{
+		qijia:{
 			fullskin:true,
 			type:'trick',
 			enable:true,
 		},
-		jinchantuoqiao:{
+		jinchan:{
 			fullskin:true,
 			type:'trick',
 			enable:true,
@@ -616,10 +616,10 @@ card.sp={
 		}
 	},
 	translate:{
-		qijiayebing:'弃甲曳兵',
-		qijiayebing_info:'出牌阶段，对一名装备区里有牌的其他角色使用。该角色选择一项：1.弃置手牌区和装备区里所有的武器和-1坐骑；2.弃置手牌区和装备区里所有的防具和+1坐骑。',
-		jinchantuoqiao:'金蝉脱壳',
-		jinchantuoqiao_info:'当你成为其他角色使用牌的目标时，若你的手牌里只有【金蝉脱壳】，使目标锦囊牌或基本牌对你无效，你摸两张牌。当你因弃置而失去【金蝉脱壳】时，你摸一张牌。',
+		qijia:'弃甲曳兵',
+		qijia_info:'出牌阶段，对一名装备区里有牌的其他角色使用。该角色选择一项：1.弃置手牌区和装备区里所有的武器和-1坐骑；2.弃置手牌区和装备区里所有的防具和+1坐骑。',
+		jinchan:'金蝉脱壳',
+		jinchan_info:'当你成为其他角色使用牌的目标时，若你的手牌里只有【金蝉脱壳】，使目标锦囊牌或基本牌对你无效，你摸两张牌。当你因弃置而失去【金蝉脱壳】时，你摸一张牌。',
 		fulei:'浮雷',
 		fulei_info:'出牌阶段，对你使用。将【浮雷】放置于你的判定区里，若判定结果为黑桃，则目标角色受到X点雷电伤害（X为此锦囊判定结果为黑桃的次数）。判定完成后，将此牌移动到下家的判定区里。',
 		qibaodao:'七宝刀',
diff --git a/game/asset.js b/game/asset.js
index d30b69e69..6c3dc414a 100644
--- a/game/asset.js
+++ b/game/asset.js
@@ -100,7 +100,7 @@ window.noname_asset_list=[
     'image/card/jiguanyaoshu.png',
     'image/card/jiguanyuan.png',
     'image/card/jiguantong.png',
-    'image/card/jinchantuoqiao.png',
+    'image/card/jinchan.png',
     'image/card/jingfanma.png',
     'image/card/jingleishan.png',
     'image/card/jinlianzhu.png',
@@ -138,7 +138,7 @@ window.noname_asset_list=[
     'image/card/qiankunbiao.png',
     'image/card/qiankundai.png',
     'image/card/qibaodao.png',
-    'image/card/qijiayebing.png',
+    'image/card/qijia.png',
     'image/card/qilin.png',
     'image/card/qinggang.png',
     'image/card/qinglianxindeng.png',
diff --git a/game/game.js b/game/game.js
index 280e42032..5ee2528e8 100644
--- a/game/game.js
+++ b/game/game.js
@@ -3473,6 +3473,7 @@
 							map.connect_player_number.hide();
 							map.connect_enhance_zhu.hide();
 							map.connect_double_nei.hide();
+							map.connect_zhong_card.show();
 						}
 						else{
 							map.connect_player_number.show();
@@ -3483,6 +3484,7 @@
 							else{
 								map.connect_double_nei.hide();
 							}
+							map.connect_zhong_card.hide();
 						}
 					},
                     connect_identity_mode:{
@@ -3511,6 +3513,12 @@
 		                frequent:true,
 						restart:true,
 		            },
+					connect_zhong_card:{
+						name:'明忠卡牌替换',
+						init:true,
+						frequent:true,
+						restart:true
+					},
 					connect_double_nei:{
 						name:'双内奸',
 						init:false,
@@ -3555,6 +3563,7 @@
                             map.ban_identity.hide();
 							map.ban_identity2.hide();
                             map.ban_identity3.hide();
+							map.zhong_card.show();
 						}
 						else{
 							map.player_number.show();
@@ -3583,6 +3592,13 @@
 							else{
 								map.ban_identity3.show();
 							}
+							map.zhong_card.hide();
+						}
+						if(config.double_character){
+							map.double_hp.show();
+						}
+						else{
+							map.double_hp.hide();
 						}
 					},
 					identity_mode:{
@@ -3624,6 +3640,12 @@
 		                frequent:true,
 		                restart:true,
 		            },
+					zhong_card:{
+						name:'明忠卡牌替换',
+						init:true,
+						frequent:true,
+						restart:true
+					},
 		            double_hp:{
 		                name:'双将体力上限',
 		                init:'pingjun',
@@ -12044,7 +12066,14 @@
 						this.node.avatar2.show();
 						this.name2=character2;
 						var hp1=info[2],hp2=info2[2];
-						switch(get.config('double_hp')){
+						var double_hp;
+						if(_status.connectMode){
+							double_hp='pingjun';
+						}
+						else{
+							double_hp=get.config('double_hp');
+						}
+						switch(double_hp){
 							case 'pingjun':{
 								this.maxHp=Math.floor((hp1+hp2)/2);
 								this.singleHp=((hp1+hp2)%2===1);
@@ -34668,13 +34697,15 @@
 				}
 				for(var i=0;i<lib.card.list.length;i++){
 					if(lib.card[lib.card.list[i][2]]){
-                        if(!_status.connectMode){
-                            if(lib.config.bannedcards.contains(lib.card.list[i][2])) continue;
-                        }
-						else{
-                            if(lib.configOL.bannedcards.contains(lib.card.list[i][2])) continue;
-                        }
-						if(game.bannedcards&&game.bannedcards.contains(lib.card.list[i][2])) continue;
+						if(!lib.card.list[i]._replaced){
+							if(!_status.connectMode){
+	                            if(lib.config.bannedcards.contains(lib.card.list[i][2])) continue;
+	                        }
+							else{
+	                            if(lib.configOL.bannedcards.contains(lib.card.list[i][2])) continue;
+	                        }
+							if(game.bannedcards&&game.bannedcards.contains(lib.card.list[i][2])) continue;
+						}
                         lib.inpile.add(lib.card.list[i][2]);
 						ui.create.card(ui.cardPile).init(lib.card.list[i]);
 					}
diff --git a/image/card/jinchantuoqiao.png b/image/card/jinchan.png
similarity index 100%
rename from image/card/jinchantuoqiao.png
rename to image/card/jinchan.png
diff --git a/image/card/qijiayebing.png b/image/card/qijia.png
similarity index 100%
rename from image/card/qijiayebing.png
rename to image/card/qijia.png
diff --git a/mode/identity.js b/mode/identity.js
index c748dd563..4384d6d7f 100644
--- a/mode/identity.js
+++ b/mode/identity.js
@@ -9,6 +9,31 @@ mode.identity={
 		if(_status.brawl&&_status.brawl.submode){
 			_status.mode=_status.brawl.submode;
 		}
+		event.replacePile=function(){
+			var list=['shengdong','qijia','caomu','jinchan','zengbin','fulei','qibaodao','zhungangshuo','lanyinjia'];
+			var map={
+				shunshou:'shengdong',
+				jiedao:'qijia',
+				bingliang:'caomu',
+				wuxie:'jinchan',
+				wuzhong:'zengbin',
+				wugu:'zengbin',
+				shandian:'fulei',
+				qinggang:'qibaodao',
+				qinglong:'zhungangshuo',
+				bagua:'lanyinjia'
+			};
+			for(var i=0;i<lib.card.list.length;i++){
+				var name=lib.card.list[i][2];
+				if(list.contains(name)){
+					lib.card.list.splice(i--,1);
+				}
+				else if(map[name]){
+					lib.card.list[i][2]=map[name];
+					lib.card.list[i]._replaced=true;
+				}
+			}
+		}
 		"step 1"
 		var playback=localStorage.getItem(lib.configprefix+'playback');
 		if(playback){
@@ -31,6 +56,9 @@ mode.identity={
 		}
 		else if(!_status.connectMode){
 			if(_status.mode=='zhong'){
+				if(get.config('zhong_card')){
+					event.replacePile();
+				}
 				game.prepareArena(8);
 			}
 			else{
@@ -161,6 +189,9 @@ mode.identity={
 			_status.mode=lib.configOL.identity_mode;
 			if(_status.mode=='zhong'){
 				lib.configOL.number=8;
+				if(lib.configOL.zhong_card){
+					event.replacePile();
+				}
 			}
 			if(lib.configOL.number<2){
 				lib.configOL.number=2;
@@ -300,6 +331,9 @@ mode.identity={
 				uiintro.add('<div class="text chat">双内奸：'+(lib.configOL.double_nei?'开启':'关闭'));
 				uiintro.add('<div class="text chat">加强主公：'+(lib.configOL.enhance_zhu?'开启':'关闭'));
 			}
+			else{
+				uiintro.add('<div class="text chat">卡牌替换：'+(lib.configOL.zhong_card?'开启':'关闭'));
+			}
 			uiintro.add('<div class="text chat">出牌时限：'+lib.configOL.choose_timeout+'秒');
 			uiintro.add('<div class="text chat">屏蔽弱将：'+(lib.configOL.ban_weak?'开启':'关闭'));
 			var last=uiintro.add('<div class="text chat">屏蔽强将：'+(lib.configOL.ban_strong?'开启':'关闭'));