ip

card/swd.js

@@ -3310,7 +3310,7 @@ card.swd={
 				result.links[0].storage.lianyao_hujia=player;
 				game.swapPlayer(result.links[0]);
 				result.links[0].addSkill('lianyao_hujia2');
-				result.links[0].phase();
+				result.links[0].insertPhase();
 				result.links[0].setIdentity();
 				result.links[0].identityShown=true;
 				player.out(true);

character/extra.js

@@ -115,7 +115,7 @@ character.extra={
 			priority:-50,
 			content:function(){
 				player.removeSkill('lianpo2');
-				player.phase();
+				player.insertPhase();
 			}
 		},
 		baonu:{

character/hearth.js

@@ -4982,7 +4982,7 @@ character.hearth={
 		jihuo:{
 			trigger:{player:'phaseAfter'},
 			filter:function(event,player){
-				return !player.storage.jihuo&&player.countCards('h')>0;
+				return player.countCards('h')>0&&event.skill!='jihuo';
 			},
 			direct:true,
 			priority:-50,
@@ -4993,15 +4993,8 @@ character.hearth={
 				next.logSkill='jihuo';
 				"step 1"
 				if(result.bool){
-					player.storage.jihuo=true;
+					player.insertPhase();
 				}
-				else{
-					event.finish();
-				}
-				"step 2"
-				player.phase();
-				"step 3"
-				player.storage.jihuo=false;
 			},
 			ai:{
 				threaten:1.2

character/shenhua.js

@@ -708,7 +708,7 @@ character.shenhua={
 				"step 1"
 				var target=player.storage.fangquan;
 				target.markSkillCharacter('fangquan',player,'放权','进行一个额外回合');
-				target.phase();
+				target.insertPhase();
 				target.addSkill('fangquan3');
 				player.removeSkill('fangquan2');
 				delete player.storage.fangquan;

character/swd.js

@@ -4144,73 +4144,6 @@ character.swd={
 				player.draw();
 			},
 		},
-		fushen:{
-			trigger:{player:'phaseBefore'},
-			direct:true,
-			filter:function(event,player){
-				return !player.phaseSkipped;
-			},
-			content:function(){
-				"step 0"
-				player.chooseTarget(function(card,player,target){
-					if(player==target) return false;
-					return true;
-				},get.prompt('fushen')).ai=function(){
-					return -1;//1+Math.random();
-				}
-				"step 1"
-				if(result.bool){
-					var target=result.targets[0];
-					event.target=target;
-					target.storage.fushen=player;
-					game.swapPlayer(target);
-					// player.out();
-					// player.lockOut=true;
-					// trigger.untrigger();
-					// trigger.finish();
-					// target.phase();
-					// target.addSkill('fushen2');
-					trigger.untrigger();
-					trigger.finish();
-				}
-				else{
-					event.finish();
-				}
-				"step 2"
-				player.out();
-				player.lockOut=true;
-				if(player.ai.shown<0.5){
-					player.ai.shown=0.5;
-				}
-				// trigger.untrigger();
-				// trigger.finish();
-				// target.phase();
-				event.target.addSkill('fushen2');
-				event.target.storage.fushen2=event.target.ai.shown;
-				event.target.phase();
-			},
-			ai:{
-				threaten:1.5,
-			}
-		},
-		fushen2:{
-			trigger:{player:'phaseAfter'},
-			forced:true,
-			popup:false,
-			content:function(){
-				var source=player.storage.fushen;
-				player.ai.shown=player.storage.fushen2;
-				delete player.storage.fushen;
-				delete player.storage.fushen2;
-				if(source){
-				source.lockOut=false;
-				source.out();
-				game.swapPlayer(source);
-				source.loseHp();
-				player.removeSkill('fushen2');}
-				// source.skip('phase');
-			}
-		},
 		anlianying:{
 			trigger:{player:'loseEnd'},
 			frequent:true,
@@ -5508,10 +5441,10 @@ character.swd={
 			trigger:{player:'phaseAfter'},
 			frequent:true,
 			filter:function(event,player){
-				return get.cardCount(true,player)>=player.hp&&event.parent.name!='lingwu';
+				return get.cardCount(true,player)>=player.hp&&event.skill!='lingwu';
 			},
 			content:function(){
-				player.phase();
+				player.insertPhase();
 			},
 			ai:{
 				order:-10,

game/game.js

@@ -13063,17 +13063,17 @@
 					}
 					this.node.identity.dataset.color=identity;
 				},
-				insertPhase:function(){
+				insertPhase:function(skill){
 					var evt=_status.event.getParent('phase');
 					var next;
 					if(evt&&evt.parent&&evt.parent.next){
 						next=game.createEvent('phase',null,evt.parent);
-						console.log(evt.parent);
 					}
 					else{
 						next=game.createEvent('phase');
 					}
 					next.player=this;
+					next.skill=skill||_status.event.name;
                     next.setContent('phase');
 					return next;
 				},