m

card/gwent.js

@@ -2105,6 +2105,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){
 				filter:function(event,player){
 					if(_status.connectMode) return false;
 					if(!lib.config.cards.contains('gwent')) return false;
+					if(player.isMin()) return false;
 					if(game.fixedPile) return false;
 					return event.num>0&&event.parent.name=='phaseDraw';
 				},
@@ -2128,12 +2129,16 @@ game.import('card',function(lib,game,ui,get,ai,_status){
 								});
 								if(get.mode()=='stone'){
 									list.remove('gw_aerdeyin');
+									list.remove('gw_niuquzhijing');
 								}
 							}
 							else{
 								list=get.libCard(function(info){
 									return info.subtype=='spell_silver';
 								});
+								if(get.mode()=='stone'){
+									list.remove('gw_butianshu');
+								}
 							}
 							if(list&&list.length){
 								ui.cardPile.insertBefore(game.createCard(list.randomGet()),ui.cardPile.firstChild);

character/mtg.js

@@ -72,7 +72,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 						trigger:{global:'dieAfter'},
 						forced:true,
 						filter:function(event,player){
-							return ![player.name,player.name1,player.name2].contains(event.player.name);
+							return !event.player.isMin()&&![player.name,player.name1,player.name2].contains(event.player.name);
 						},
 						content:function(){
 							var skills=lib.character[trigger.player.name][3].slice(0);

game/config.js

@@ -8,7 +8,8 @@ window.config={
 		'gjqt_bailitusu','yuanshao','swd_anka','swd_nicole','daqiao','re_daqiao','hs_xuanzhuanjijia',
 		'zhuran','huatuo','swd_tuwei','hs_guldan','wangyi','caoang','swd_guyue','swd_rongshuang',
 		'swd_jiangziya','guojia','re_guojia','shen_caocao','swd_qiner','caopi','hs_yngvar','guansuo',
-		'gjqt_aruan','swd_hanluo','hs_anduin','swd_huanglei','yxs_yujix','yxs_luzhishen','swd_muyun','ow_tianshi'
+		'gjqt_aruan','swd_hanluo','hs_anduin','swd_huanglei','yxs_yujix','yxs_luzhishen','swd_muyun','ow_tianshi',
+		'pal_yuejinzhao','hs_antonidas'
 	],
 	replacecharacter:{
 		zhangjiao:'sp_zhangjiao',

game/game.js

@@ -5592,11 +5592,19 @@
 			'游戏名词':'<ul><li>护甲：和体力类似，每点护甲可抵挡一点伤害，但不影响手牌上限'+
 			'<li>随从：通过技能获得，拥有独立的技能、手牌区和装备区（共享判定区），出场时替代主武将的位置；随从死亡时自动切换回主武将'
 		},
-		setIntro:function(node,func){
+		setIntro:function(node,func,left){
 			if(lib.config.touchscreen){
-				lib.setLongPress(node,ui.click.intro);
+				if(left){
+					node.listen(ui.click.touchintro);
 				}
 				else{
+					lib.setLongPress(node,ui.click.intro);
+				}
+			}
+			else{
+				if(left){
+					node.listen(ui.click.intro);
+				}
 				if(lib.config.hover_all){
 					lib.setHover(node,ui.click.hoverplayer);
 				}
@@ -5604,7 +5612,9 @@
 					node.oncontextmenu=ui.click.rightplayer;
 				}
 			}
+			if(!left){
 				lib.setPressure(node,ui.click.rightpressure);
+			}
 			if(func){
 				node._customintro=func;
 			}
@@ -19837,6 +19847,7 @@
                         this.classList.remove('epic');
 						this.classList.remove('legend');
                         this.classList.remove('unique');
+						this.style.background='';
                         var subtype=get.subtype(this);
                         if(subtype){
                             this.classList.remove(subtype);
@@ -41091,6 +41102,15 @@
 				}
 				game.check();
 			},
+			touchintro:function(){
+				var rect=this.getBoundingClientRect();
+				ui.click.touchpop();
+				ui.click.intro.call(this,{
+					clientX:rect.left+18,
+					clientY:rect.top+12
+				});
+				_status.clicked=false;
+			},
 			card:function(){
 				delete this._waitingfordrag;
 				if(_status.dragged) return;
@@ -42616,7 +42636,7 @@
 					}
 				}
 				else{
-					if((!ui.dialog.buttons||!ui.dialog.buttons.length)&&!ui.dialog.forcebutton&&ui.dialog.classList.contains('fullheight')==false){
+					if((!ui.dialog.buttons||!ui.dialog.buttons.length)&&!ui.dialog.forcebutton&&ui.dialog.classList.contains('fullheight')==false&&get.mode()!='stone'){
 						ui.dialog.classList.add('nobutton');
 						if(ui.dialog.content.offsetHeight<240){
 							if(!ui.dialog._heightset){
@@ -44042,7 +44062,7 @@
 				if(method=='raw'||method=='pure'||method=='absolute') return n;
 			}
 			else if(to.isMin(true)||from.isMin(true)){
-				if(method=='raw'||method=='pure'||method=='absolute') return 1;
+				if(method=='raw'||method=='pure'||method=='absolute') return n;
 			}
 			else{
 				var length=game.players.length;

mode/stone.js

@@ -455,8 +455,8 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
     				_status.friendRage=0;
     				_status.enemyRage=0;
 
-    				lib.setIntro(ui.friendBar);
+    				lib.setIntro(ui.friendBar,null,true);
-    				lib.setIntro(ui.enemyBar);
+    				lib.setIntro(ui.enemyBar,null,true);
     			}
     		}
     		_status.friendCount=ui.create.system('',null,true);
@@ -1721,7 +1721,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
     			if(!player.node.career){
     				player.node.career=ui.create.div('.menubutton.round.identity',player);
     				player.node.career.dataset.career=career;
-    				lib.setIntro(player.node.career);
+    				lib.setIntro(player.node.career,null,true);
     			}
     			if(!player.deckCards) player.deckCards=[];
     			for(var i=0;i<deck.length;i++){
@@ -5604,7 +5604,21 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
     				threaten:1.6
     			}
     		},
-
+            shaman_fali:{
+                trigger:{global:'damageBegin'},
+                forced:true,
+                filter:function(event,player){
+                    return event.source&&event.source!=player&&
+                    event.source==player.getLeader()&&event.notLink()&&
+                    event.card&&get.type(event.card)=='stonecard';
+                },
+                content:function(){
+                    trigger.num++;
+                },
+                ai:{
+                    threaten:1.3
+                }
+            },
     		stone_zhiyin:{
     			trigger:{global:'useCard'},
     			forced:true,
@@ -6374,10 +6388,10 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
     			forced:true,
     			unique:true,
     			filter:function(event,player){
-    				return event.player.side!=player.side&&!player.hasSkill('stone_qianxing');
+    				return event.player.side!=player.side&&!player.hasSkill('qianxing');
     			},
     			content:function(){
-    				player.addSkill('stone_qianxing');
+    				player.addTempSkill('qianxing',{player:'phaseBegin'});
     			}
     		},
 
@@ -6723,7 +6737,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
     					player.maxHp++;
     					player.hp++;
     					player.update();
-    					player.addSkill('stone_qianxing');
+    					player.addTempSkill('qianxing',{player:'phaseBegin'});
     				}
     				else{
     					player.draw();
@@ -8488,7 +8502,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
     				threaten:2
     			}
     		},
-    		shaman_fali:{
+    		shaman_fali_old:{
     			trigger:{global:'phaseEnd'},
     			forced:true,
     			direct:true,
@@ -8712,16 +8726,11 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
     			}
     		},
     		stone_qianxing:{
-    			trigger:{player:'phaseBegin'},
+    			trigger:{source:'fellow'},
-    			forced:true,
+    			silent:true,
                 unique:true,
     			content:function(){
-    				player.removeSkill('stone_qianxing');
+    				player.addTempSkill('qianxing',{player:'phaseBegin'});
-    			},
-    			mod:{
-    				targetEnabled:function(){
-    					return false;
-    				}
     			}
     		},
     		stone_kutongsiseng1:{
@@ -10038,7 +10047,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
     		shaman_tuteng:'图腾',
     		shaman_tuteng_info:'你跳过摸牌阶段',
     		shaman_fali:'空气',
-    		shaman_fali_info:'已方主将的结束阶段，令所有手牌数不大于1的友方随从摸一张牌',
+    		shaman_fali_info:'已方主将使用的法术牌伤害+1',
     		shaman_zhiliao:'治疗',
     		shaman_zhiliao_info:'在你的结束阶段，令所有友方随从回复一点体力',
     		shaman_zhuore:'灼热',
@@ -10126,7 +10135,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
     		stone_wuyi:'巫医',
     		stone_langren:'狼人',
     		stone_qianxing:'潜行',
-    		stone_qianxing_info:'在你的回合开始前，不能成为任何卡牌的目标',
+    		stone_qianxing_info:'你出场时，获得潜行直到下一回合开始',
 
     		stone_mingguangjisi:'明光祭司',
     		stone_nianqingjisi:'年轻祭司',