From 5954309986004fefdbb89b209f33367cfe1f072c Mon Sep 17 00:00:00 2001
From: libccy <widget@widgetdeMacBook-Pro.local>
Date: Tue, 21 Jun 2016 00:09:42 +0800
Subject: [PATCH] 1

---
 character/hearth.js | 134 ++++++++++++++++++++++++++++++++++++++++----
 game/update.js      |   1 +
 mode/identity.js    |  51 +++++++++++++----
 3 files changed, 164 insertions(+), 22 deletions(-)

diff --git a/character/hearth.js b/character/hearth.js
index 6544b6249..8cb025e88 100755
--- a/character/hearth.js
+++ b/character/hearth.js
@@ -68,8 +68,8 @@ character.hearth={
 		hs_lafamu:['male','shu',4,['xieneng']],
 		hs_yelise:['female','wei',3,['xunbao','zhuizong']],
 
-		// hs_fandral:['male','shu',4,['nuyan']],
-		// hs_hallazeal:['male','shu',4,['nuyan']],
+		hs_fandral:['male','shu',4,['nuyan','chouhuo']],
+		hs_hallazeal:['male','wei',3,['shengteng','yuansu']],
 		// hs_nzoth:['male','shu',4,['nuyan']],
 		// hs_walian:['male','shu',4,['zhanyi']],
 		// hs_pengpeng:['male','qun',4,['zhadan']],
@@ -81,6 +81,116 @@ character.hearth={
 		hs_malfurion:['hs_malorne'],
 	},
 	skill:{
+		chouhuo:{
+			unique:true,
+			trigger:{player:'phaseBegin'},
+			forced:true,
+			skillAnimation:true,
+			animationColor:'fire',
+			filter:function(event,player){
+				if(player.storage.nuyan&&player.storage.nuyan.length){
+					var num=0;
+					for(var i=0;i<lib.inpile.length;i++){
+						if(get.tag({name:lib.inpile[i]},'damage')){
+							num++;
+						}
+					}
+					return num<=player.storage.nuyan.length;
+				}
+				return false;
+			},
+			content:function(){
+				player.loseMaxHp();
+				player.changeHujia(2);
+				player.removeSkill('nuyan');
+				player.addSkill('nuyan2');
+			}
+		},
+		nuyan2:{
+			enable:'phaseUse',
+			usable:3,
+			chooseButton:{
+				dialog:function(event,player){
+					var list=[];
+					for(var i=0;i<lib.inpile.length;i++){
+						if(get.tag({name:lib.inpile[i]},'damage')){
+							list.push([get.type(lib.inpile[i]),'',lib.inpile[i]]);
+						}
+					}
+					return ui.create.dialog([list,'vcard']);
+				},
+				filter:function(button,player){
+					return lib.filter.filterCard({name:button.link[2]},player,_status.event.getParent());
+				},
+				check:function(button){
+					var player=_status.event.player;
+					var recover=0,lose=1;
+					for(var i=0;i<game.players.length;i++){
+						if(!game.players[i].isOut()){
+							if(game.players[i].hp<game.players[i].maxHp){
+								if(ai.get.attitude(player,game.players[i])>0){
+									if(game.players[i].hp<2){
+										lose--;
+										recover+=0.5;
+									}
+									lose--;
+									recover++;
+								}
+								else if(ai.get.attitude(player,game.players[i])<0){
+									if(game.players[i].hp<2){
+										lose++;
+										recover-=0.5;
+									}
+									lose++;
+									recover--;
+								}
+							}
+							else{
+								if(ai.get.attitude(player,game.players[i])>0){
+									lose--;
+								}
+								else if(ai.get.attitude(player,game.players[i])<0){
+									lose++;
+								}
+							}
+						}
+					}
+					if(button.link[2]=='nanman'||button.link[2]=='nanman'||button.link[2]=='yuansuhuimie'||
+					button.link[2]=='chiyuxi'||button.link[2]=='jingleishan'){
+						if(lose>recover&&lose>0){
+							return 2;
+						}
+						else{
+							return 0;
+						}
+					}
+					return 1;
+				},
+				backup:function(links,player){
+					return {
+						filterCard:function(){return false},
+						selectCard:-1,
+						popname:true,
+						viewAs:{name:links[0][2]},
+						onuse:function(result,player){
+							player.loseHp();
+						}
+					}
+				},
+				prompt:function(links,player){
+					return '失去一点体力，视为使用一张'+get.translation(links[0][2]);
+				}
+			},
+			ai:{
+				order:6,
+				result:{
+					player:function(player){
+						if(player.hp>1) return 1;
+						return 0;
+					}
+				},
+			}
+		},
 		nuyan:{
 			enable:'phaseUse',
 			usable:1,
@@ -174,7 +284,6 @@ character.hearth={
 				},
 			}
 		},
-		hsshenqi_forbid:{},
 		duxin:{
 			trigger:{player:['phaseBegin','phaseEnd']},
 			frequent:true,
@@ -4082,7 +4191,7 @@ character.hearth={
 			fullimage:true,
 			vanish:true,
 			enable:function(card,player){
-				return !player.hasSkill('hsshenqi_forbid');
+				return !player.isTurnedOver();
 			},
 			derivation:'hs_lafamu',
 			filterTarget:true,
@@ -4095,7 +4204,6 @@ character.hearth={
 				if(!player.isTurnedOver()){
 					player.turnOver();
 				}
-				player.addTempSkill('hsshenqi_forbid','phaseAfter');
 			},
 			ai:{
 				order:5,
@@ -4115,7 +4223,7 @@ character.hearth={
 			fullimage:true,
 			vanish:true,
 			enable:function(card,player){
-				return !player.hasSkill('hsshenqi_forbid');
+				return !player.isTurnedOver();
 			},
 			derivation:'hs_lafamu',
 			filterTarget:function(card,player,target){
@@ -4129,7 +4237,6 @@ character.hearth={
 				if(!player.isTurnedOver()){
 					player.turnOver();
 				}
-				player.addTempSkill('hsshenqi_forbid','phaseAfter');
 			},
 			ai:{
 				order:9,
@@ -4150,7 +4257,7 @@ character.hearth={
 			fullimage:true,
 			vanish:true,
 			enable:function(card,player){
-				return !player.hasSkill('hsshenqi_forbid');
+				return !player.isTurnedOver();
 			},
 			derivation:'hs_lafamu',
 			filterTarget:function(card,player,target){
@@ -4164,7 +4271,6 @@ character.hearth={
 				if(!player.isTurnedOver()){
 					player.turnOver();
 				}
-				player.addTempSkill('hsshenqi_forbid','phaseAfter');
 			},
 			ai:{
 				order:9.5,
@@ -4436,6 +4542,10 @@ character.hearth={
 		hs_yogg:'尤格萨隆',
 		hs_xialikeer:'夏克里尔',
 
+		shengteng:'升腾',
+		shengteng_info:'锁定技，每当你使用锦囊牌造成伤害，你增加一点体力上限并回复一点体力',
+		yuansu:'元素',
+		yuansu_info:'出牌阶段限一次，若你已损失的体力值不少于存活角色数，你可以将体力上限降至与体力值相同，视为使用一张元素毁灭',
 		nuyan:'怒焰',
 		nuyan2:'怒焰',
 		nuyan_backup:'怒焰',
@@ -4498,11 +4608,11 @@ character.hearth={
 		bingyan_info:'出牌阶段限一次，你可以将一张红色牌当作炽羽袭，或将一张黑色牌当作惊雷闪使用',
 		hsshenqi:'神器',
 		hsshenqi_morijingxiang:'末日镜像',
-		hsshenqi_morijingxiang_info:'从所有其他角色的区域内各获得1~2张牌；使用后将武将牌翻至背面且本回合内无法继续使用神器牌',
+		hsshenqi_morijingxiang_info:'限武将牌正面朝上时使用，从所有其他角色的区域内各获得1~2张牌；使用后将武将牌翻至背面',
 		hsshenqi_kongbusangzhong:'恐怖丧钟',
-		hsshenqi_kongbusangzhong_info:'对所有其他角色各造成1~2点伤害；使用后将武将牌翻至背面且本回合内无法继续使用神器牌',
+		hsshenqi_kongbusangzhong_info:'限武将牌正面朝上时使用，对所有其他角色各造成1~2点伤害；使用后将武将牌翻至背面',
 		hsshenqi_nengliangzhiguang:'能量之光',
-		hsshenqi_nengliangzhiguang_info:'令一名角色增加一点体力上限，回复一点体力，并摸四张牌；使用后将武将牌翻至背面且本回合内无法继续使用神器牌',
+		hsshenqi_nengliangzhiguang_info:'限武将牌正面朝上时使用，令一名角色增加一点体力上限，回复一点体力，并摸四张牌；使用后将武将牌翻至背面',
 		hsbaowu:'宝物',
 		hsbaowu_huangjinyuanhou:'黄金猿猴',
 		hsbaowu_huangjinyuanhou_info:'回复全部体力，弃置所有手牌，并获得等量的无中生有；直到下个回合开始，防上即将受到的一切伤害',
diff --git a/game/update.js b/game/update.js
index a837870bb..32ea8d8e1 100644
--- a/game/update.js
+++ b/game/update.js
@@ -10,6 +10,7 @@ window.noname_update={
             'character/hearth.js',
             'character/yijiang.js',
             'mode/chess.js',
+            'mode/identity.js',
             'game/game.js',
             'game/asset.js',
         ],
diff --git a/mode/identity.js b/mode/identity.js
index 0eaaa1559..be32ff3d6 100755
--- a/mode/identity.js
+++ b/mode/identity.js
@@ -579,24 +579,24 @@ mode.identity={
 					table.style.maxWidth='400px';
 					var tr=document.createElement('tr');
 					table.appendChild(tr);
-					var list;
+					var listi;
 					if(event.zhongmode){
-						list=['random','zhu','mingzhong','zhong','nei','fan'];
+						listi=['random','zhu','mingzhong','zhong','nei','fan'];
 					}
 					else{
-						list=['random','zhu','zhong','nei','fan'];
+						listi=['random','zhu','zhong','nei','fan'];
 					}
 
-					for(var i=0;i<list.length;i++){
+					for(var i=0;i<listi.length;i++){
 						var td=document.createElement('td');
 						tr.appendChild(td);
-						td.link=list[i];
+						td.link=listi[i];
 						td.style.fontSize='25px';
 						td.style.fontFamily='xinwei';
 						if(td.link===game.me.identity){
 							td.classList.add('thundertext');
 						}
-						td.innerHTML=get.translation(list[i]+'2');
+						td.innerHTML=get.translation(listi[i]+'2');
 						td.addEventListener(lib.config.touchscreen?'touchend':'click',function(){
 							if(_status.dragged) return;
 							if(_status.justdragged) return;
@@ -609,7 +609,31 @@ mode.identity={
 								delete game.zhu.isZhu;
 								delete game.zhu.identityShown;
 							}
-							dialog.close();
+
+							if(this.link!='zhu'&&game.me.identity!='zhu'){
+								var current=this.parentNode.querySelector('.thundertext');
+								if(current){
+									current.classList.remove('thundertext');
+								}
+								this.classList.add('thundertext');
+								event.list=event.list.concat(list);
+								event.list.randomSort();
+								num=get.config('choice_'+this.link);
+								list=event.list.splice(0,num);
+								var buttons=ui.create.div('.buttons');
+								var node=_status.event.dialog.buttons[0].parentNode;
+								_status.event.dialog.buttons=ui.create.buttons(list,'character',buttons);
+								_status.event.dialog.content.insertBefore(buttons,node);
+								buttons.animate('start');
+								node.remove();
+								game.uncheck();
+								game.check();
+								_status.event.parent.swapnodialog=true;
+							}
+							else{
+								_status.event.parent.swapnodialog=false;
+								dialog.close();
+							}
 							_status.event=_status.event.parent;
 							_status.event.step=0;
 							if(this.link!='random'){
@@ -741,10 +765,17 @@ mode.identity={
 						list=list2.concat(list3.slice(0,num));
 					}
 				}
-				var dialog=ui.create.dialog('选择角色','hidden',[list,'character']);
-				if(get.config('change_identity')){
-					addSetting(dialog);
+				var dialog;
+				if(event.swapnodialog){
+					dialog=ui.dialog;
 				}
+				else{
+					dialog=ui.create.dialog('选择角色','hidden',[list,'character']);
+					if(get.config('change_identity')){
+						addSetting(dialog);
+					}
+				}
+
 				if(!event.chosen.length){
 					game.me.chooseButton(dialog,true).selectButton=function(){
 						return get.config('double_character')?2:1