v1.9.55.2

character/sp.js

@@ -8430,7 +8430,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 					if(get.damageEffect(trigger.player,player,player)<=0){
 						nono=true;
 					}
-					var next=player.chooseToDiscard(get.prompt('xiaoguo',trigger.player),{type:'basic'});
+					var next=player.chooseToDiscard('弃置一张装备牌并令'+get.translation(player)+'摸一张牌，或受到一点伤害',get.prompt('xiaoguo',trigger.player),{type:'basic'});
 					next.set('ai',function(card){
 						if(_status.event.nono) return 0;
 						return 8-get.useful(card);

game/game.js

@@ -9545,16 +9545,17 @@
 					event.choice=[];
 					event.num=0;
 					var filter=function(i){
-						if(list[i][1]==list[0][1]&&list[i][1].hasStockSkill(list[i][0],true,true,true)){
+						if(list[i][1]==list[0][1]&&list[i][1].hasSkill(list[i][0],true)){
-							if(get.info(list[i][0]).forced){
+							var info=get.info(list[i][0]);
+							if(info.forced||info.popup===false){
 								return false;
 							}
 							return true;
 						}
 						return false;
 					}
-					var filter2=function(i){
+					var filter2=function(info){
-						return lib.filter.filterTrigger(event.source,list[i][1],event.triggername,list[i][0]);
+						return lib.filter.filterTrigger(trigger,info[1],event.triggername,info[0]);
 					}
 					if(filter(0)){
 						event.choice.push(list[0]);
@@ -9566,7 +9567,7 @@
 					}
 					if(event.choice.length>1){
 						for(var i=0;i<event.choice.length;i++){
-							if(!filter2(i)){
+							if(!filter2(event.choice[i])){
 								event.choice.splice(i--,1);
 								if(event.choice.length<=1) break;
 							}
@@ -9594,7 +9595,7 @@
 					var info=event.list[event.num];
 					if(info){
 						event.list.splice(event.num,1);
-						game.createTrigger(event.triggername,info[0],info[1],event.source);
+						game.createTrigger(event.triggername,info[0],info[1],trigger);
 					}
 					event.goto(0);
 				},
@@ -18617,11 +18618,11 @@
 				distanceFrom:function(target,method){
 					return get.distance(target,this,method);
 				},
-				hasSkill:function(skill){
+				hasSkill:function(skill,arg2,arg3,arg4){
-					return game.expandSkills(this.getSkills()).contains(skill);
+					return game.expandSkills(this.getSkills(arg2,arg3,arg4)).contains(skill);
 				},
 				hasStockSkill:function(skill,arg1,arg2,arg3){
-					return this.getStockSkills(arg1,arg2,arg3).contains(skill);
+					return game.expandSkills(this.getStockSkills(arg1,arg2,arg3)).contains(skill);
 				},
 				hasZhuSkill:function(skill,player){
 					if(!this.hasSkill(skill)) return false;
@@ -21148,19 +21149,12 @@
 						return b[2]-a[2];
 					});
 					if(list.length){
-						if(game.arrangeTrigger){
 						var next=game.createEvent('arrangeTrigger',false,event);
 						next.setContent('arrangeTrigger');
 						next.list=list;
-							next.source=event;
+						next._trigger=event;
 						next.triggername=name;
 					}
-						else{
-							for(var i=0;i<list.length;i++){
-								game.createTrigger(name,list[i][0],list[i][1],event);
-							}
-						}
-					}
 				},
 				untrigger:function(all,player){
 					if(all){
@@ -21515,7 +21509,7 @@
 					for(var i=0;i<player._hookTrigger.length;i++){
 						var info=lib.skill[player._hookTrigger[i]].hookTrigger;
 						if(info){
-							if(info.block&&info.block(event,player,name)){
+							if(info.block&&info.block(event,player,name,skill)){
 								return false;
 							}
 						}
@@ -26398,7 +26392,7 @@
 		},
 		createTrigger:function(name,skill,player,event){
 			if(player.isOut()||player.isDead()||player.removed) return;
-			var next=game.createEvent('trigger',false,event);
+			var next=game.createEvent('trigger',false);
 			next.skill=skill;
 			next.player=player;
 			next.triggername=name;

game/update.js

@@ -1,5 +1,5 @@
 window.noname_update={
-	version:'1.9.55.1',
+	version:'1.9.55.2',
 	update:'1.9.54.1',
 	changeLog:[
 		'势备篇卡牌',

mode/guozhan.js

@@ -26,9 +26,6 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
 					}
 				}
 			}
-			if(get.config('onlyguozhan')&&!playback){
-				game.arrangeTrigger=true;
-			}
 			lib.card.sha.complexTarget=true;
 		},
 		onreinit:function(){
@@ -342,6 +339,9 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
 				intro:{
 					content:'cards'
 				},
+				ai:{
+					threaten:1.8
+				},
 				subSkill:{
 					add:{
 						trigger:{global:'damageEnd'},
@@ -1511,10 +1511,11 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
 					},
 					disallow:{
 						hookTrigger:{
-							block:function(event,player,name){
+							block:function(event,player,name,skill){
 								for(var i=0;i<player.storage.gzhuashen_trigger.length;i++){
 									var info=player.storage.gzhuashen_trigger[i];
-									if(info[0]==event&&info[1]==name){
+									if(info[0]==event&&info[1]==name&&
+									lib.skill.gzhuashen.getSkillSources(player,skill).length>0){
 										return true;
 									}
 								}
@@ -3055,7 +3056,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
 					"step 1"
 					if(result.bool){
 						var nono=(get.damageEffect(trigger.player,player,trigger.player)>=0);
-						trigger.player.chooseToDiscard('he',{type:'equip'}).set('ai',function(card){
+						trigger.player.chooseToDiscard('弃置一张装备牌，或受到一点伤害','he',{type:'equip'}).set('ai',function(card){
 							if(_status.event.nono){
 								return 0;
 							}