3

card/standard.js

@@ -289,7 +289,7 @@ card.standard={
 			subtype:'equip2',
 			ai:{
 				basic:{
-					equipValue:8
+					equipValue:7.5
 				}
 			},
 			skills:['bagua_skill']
@@ -670,7 +670,7 @@ card.standard={
 				},
 				result:{
 					target:function(player,target){
-						if(player.hasUnknown(2)) return 0;
+						if(player.hasUnknown(2)&&get.mode()!='guozhan') return 0;
 						var nh=target.num('h');
 						if(get.mode()=='identity'){
 							if(target.isZhu&&nh<=2&&target.hp<=1) return -100;
@@ -728,7 +728,7 @@ card.standard={
 				},
 				result:{
 					target:function(player,target){
-						if(player.hasUnknown(2)) return 0;
+						if(player.hasUnknown(2)&&get.mode()!='guozhan') return 0;
 						var nh=target.num('h');
 						if(get.mode()=='identity'){
 							if(target.isZhu&&nh<=2&&target.hp<=1) return -100;
@@ -1295,7 +1295,7 @@ card.standard={
 			skills:['renwang_skill'],
 			ai:{
 				basic:{
-					equipValue:8
+					equipValue:7.5
 				},
 			},
 		},

character/sp.js

@@ -6124,13 +6124,14 @@ character.sp={
 							return -att;
 						}
 						else{
-							return att/Math.sqrt(1+target.num('h'));
+							if(att>2) return att/Math.sqrt(1+target.num('h'));
+							return att/Math.sqrt(1+target.num('h'))/5;
 						}
 					}).set('enemy',ai.get.value(event.togive[0])<0);
 				}
 				else{
 					for(var i=0;i<event.cards.length;i++){
-						ui.discardPile(event.cards[i]);
+						ui.discardPile.appendChild(event.cards[i]);
 					}
 					event.finish();
 				}
@@ -6146,7 +6147,7 @@ character.sp={
 				}
 				else{
 					for(var i=0;i<event.cards.length;i++){
-						ui.discardPile(event.cards[i]);
+						ui.discardPile.appendChild(event.cards[i]);
 					}
 					event.finish();
 				}

game/game.js

@@ -13042,6 +13042,10 @@
                     if(typeof skills=='string'){
                         if(!this.disabledSkills[skills]){
                             this.disabledSkills[skills]=[];
+							var info=get.info(skills);
+							if(info.ondisable&&info.onremove){
+								info.onremove(this);
+							}
                         }
                         this.disabledSkills[skills].add(skill);
 						var group=lib.skill[skills].group;

layout/default/layout.css

@@ -1622,7 +1622,8 @@ div:not(.handcards)>.card>.info>span,
 .player>.avatar2.hidden {
 	pointer-events: none !important;
 }
-.player>.avatar.disabled{
+.player>.avatar.disabled,
+.player>.avatar2.disabled{
 	-webkit-filter: grayscale(1);
 	opacity: 0.8;
 }

mode/guozhan.js

@@ -814,20 +814,21 @@ mode.guozhan={
 		ziliang:{
 			trigger:{global:'damageEnd'},
 			filter:function(event,player){
-				return event.player.isFriendOf(player)&&player.storage.tuntian&&player.storage.tuntian.length;
+				return event.player.isIn()&&event.player.isFriendOf(player)&&player.storage.tuntian&&player.storage.tuntian.length;
 			},
 			init:function(player){
 				player.checkViceSkill('ziliang');
 			},
-			logTarget:'player',
+			direct:true,
 			content:function(){
 				'step 0'
-				player.chooseCardButton('将一张“田”交给'+get.translation(trigger.player),player.storage.tuntian).set('ai',function(button){
+				player.chooseCardButton(get.prompt('ziliang',trigger.player),player.storage.tuntian).set('ai',function(button){
 					return ai.get.value(button.link);
 				});
 				'step 1'
 				if(result.bool){
 					var card=result.links[0];
+					player.logSkill('ziliang',trigger.player);
 					player.storage.tuntian.remove(card);
 					player.syncStorage('tuntian');
 					if(!player.storage.tuntian.length){
@@ -838,7 +839,7 @@ mode.guozhan={
 					}
 					trigger.player.gain(card);
 					if(trigger.player==player){
-						player.$draw(card);
+						player.$draw(card,true);
 					}
 					else{
 						player.$give(card,trigger.player);