dist

card/guozhan.js

@@ -291,6 +291,7 @@ card.guozhan={
 			filterTarget:function(card,player,target){
 				if(get.mode()=='guozhan'){
 					var next=player.getNext();
+					if(!next) return false;
 					return target==next||target.inline(next);
 				}
 				if(player==target) return false;
@@ -492,8 +493,11 @@ card.guozhan={
 						return 1;
 					},
 				},
+				tag:{
+					loseCard:1,
+					discard:1
+				}
 			},
-			// mode:['guozhan'],
 		},
 		wuliu:{
 			fullskin:true,

card/hearth.js

@@ -636,8 +636,6 @@ card.hearth={
 					},
 				},
 				tag:{
-					respond:1,
-					respondSha:1,
 					damage:1,
 					natureDamage:1,
 					thunderDamage:1,

card/standard.js

@@ -1007,6 +1007,7 @@ card.standard={
 				},
 				tag:{
 					loseCard:1,
+					discard:1
 				}
 			}
 		},

card/zhenfa.js

@@ -129,7 +129,7 @@ card.zhenfa={
 			chongzhu:true,
 			enable:true,
 			filterTarget:function(card,player,target){
-				return target.sieging();
+				return target.siege();
 			},
 			selectTarget:-1,
 			content:function(){

character/sp.js

@@ -5881,8 +5881,15 @@ character.sp={
 				}
 			},
 			ai:{
-				threaten:0.9,
-				expose:0.1
+				expose:0.1,
+				effect:{
+					target:function(card,player,target,current){
+						if(target.hasFriend()&&get.tag(card,'discard')){
+							if(current<0) return 0;
+							return [1,1];
+						}
+					}
+				}
 			}
 		},
 		moukui:{

game/game.js

@@ -10745,6 +10745,7 @@
 					}
 				},
                 getNext:function(){
+					if(this.hasSkill('undist')) return null;
                     var target=this;
                     for(var i=0;i<game.players.length-1;i++){
                         target=target.next;
@@ -10755,6 +10756,7 @@
                     return null;
                 },
                 getPrevious:function(){
+					if(this.hasSkill('undist')) return null;
                     var target=this;
                     for(var i=0;i<game.players.length-1;i++){
                         target=target.previous;

game/update.js

@@ -1,9 +1,9 @@
 window.noname_update={
-    version:'1.9.9.7',
-    update:'1.9.9.6',
+    version:'1.9.9.8',
+    // update:'1.9.9.6',
     changeLog:[
         'bug修复',
-        // '国战武将',
+        '国战武将',
     ],
     files:[
         'game/game.js',

mode/guozhan.js

@@ -2095,37 +2095,55 @@ mode.guozhan={
 				return false;
 			},
 			siege:function(player){
-				if(game.players.length==2) return false;
-				if(this.identity=='unknown'||this.identity=='ye') return false;
-				if(player.identity=='unknown') return false;
-				if(player.identity==this.identity) return false;
-				if(player==this.next&&this.next.next.identity==this.identity) return true;
-				if(player==this.previous&&this.previous.previous.identity==this.identity) return true;
-				return false;
+				if(this.identity=='unknown'||this.identity=='ye'||this.hasSkill('undist')) return false;
+				if(!player){
+					var next=this.getNext();
+					if(next&&next.sieged()) return true;
+					var previous=this.getPrevious();
+					if(previous&&previous.sieged()) return true;
+					return false;
+				}
+				else{
+					return player.sieged()&&(player.getNext()==this||player.getPrevious()==this);
+				}
 			},
 			sieged:function(){
-				return this.next.siege(this)||this.previous.siege(this);
-			},
-			sieging:function(){
-				return this.siege(this.next)||this.siege(this.previous);
+				if(this.identity=='unknown') return false;
+				var next=this.getNext();
+				var previous=this.getPrevious();
+				if(next&&previous&&next!=previous){
+					if(next.identity=='unknown'||next.identity=='ye'||next.identity==this.identity) return false;
+					return next.identity==previous.identity;
+				}
+				return false;
 			},
 			inline:function(){
-				if(this.identity=='unknown'||this.identity=='ye') return false;
-				if(this.next.identity!=this.identity&&this.previous.identity!=this.identity) return false;
-				var pointer;
+				if(this.identity=='unknown'||this.identity=='ye'||this.hasSkill('undist')) return false;
+				var next=this,previous=this;
+				var list=[];
+				for(var i=0;next||previous;i++){
+					if(next){
+						next=next.getNext();
+						if(next.identity!=this.identity||next==this){
+							next=null;
+						}
+						else{
+							list.add(next);
+						}
+					}
+					if(previous){
+						previous=previous.getPrevious();
+						if(previous.identity!=this.identity||previous==this){
+							previous=null;
+						}
+						else{
+							list.add(previous);
+						}
+					}
+				}
+				if(!list.length) return false;
 				for(var i=0;i<arguments.length;i++){
-					if(arguments[i].identity!=this.identity) return false;
-					pointer=this.next;
-					while(pointer!=arguments[i]&&pointer.identity==this.identity){
-						pointer=pointer.next;
-					}
-					if(pointer==arguments[i]) continue;
-					pointer=this.previous;
-					while(pointer!=arguments[i]&&pointer.identity==this.identity){
-						pointer=pointer.previous;
-					}
-					if(pointer==arguments[i]) continue;
-					return false;
+					if(!list.contains(arguments[i])) return false;
 				}
 				return true;
 			},