f

character/ow.js

@@ -18,15 +18,104 @@ character.ow={
         ow_kuangshu:['male','shu',3,['liudan','shoujia','shihuo']],
 
         ow_tuobiang:['male','shu',3,['paotai','maoding']],
-        // ow_baolei:['female','shu',3,[]],
+        // ow_baolei:['male','qun',4,[]],
         ow_banzang:['male','qun',4,['fengshi','yinbo']],
         ow_laiyinhate:['male','qun',4,['zhongdun','mengji']],
-        // ow_luba:['male','shu',4,[]],
+        ow_luba:['male','shu',4,['liangou','xiyang']],
         // ow_wensidun:['male','shu',4,[]],
         // ow_zhaliya:['female','shu',4,['pingzhang','lichang']],
         ow_heiying:['female','wei',3,['qinru','yinshen','maichong']],
     },
     skill:{
+        liangou:{
+            enable:'phaseUse',
+            usable:1,
+            filterTarget:function(card,player,target){
+                return target!=player&&target.hp>=2;
+            },
+            filterCard:true,
+            position:'he',
+            check:function(card){
+                return 5-ai.get.value(card);
+            },
+            content:function(){
+                'step 0'
+                player.judge(function(card){
+                    return get.color(card)=='black'?1:-1;
+                });
+                'step 1'
+                if(result.bool){
+                    target.addTempSkill('liangou2','phaseAfter');
+                    target.storage.liangou2=player;
+                }
+            },
+            ai:{
+                order:10,
+                expose:0.2,
+                result:{
+                    target:function(player,target){
+                        if(ai.get.damageEffect(target,player,target)<0&&player.num('h',function(card){
+                            return get.tag(card,'damage')?true:false;
+                        })){
+                            return -1;
+                        }
+                        return 0;
+                    }
+                }
+            }
+        },
+        liangou2:{
+            mod:{
+				cardEnabled:function(card,player){
+					return false;
+				},
+				cardUsable:function(card,player){
+					return false;
+				},
+				cardRespondable:function(card,player){
+					return false;
+				},
+				cardSavable:function(card,player){
+					return false;
+				},
+                globalTo:function(from,to){
+                    if(from==to.storage.liangou2) return -Infinity;
+                }
+			},
+            onremove:function(player){
+                delete player.storage.liangou2;
+            },
+            trigger:{player:'damageBegin'},
+            usable:1,
+            forced:true,
+            popup:false,
+            content:function(){
+                trigger.num++;
+            },
+            ai:{
+                effect:{
+                    target:function(card,player,target){
+                        if(get.tag(card,'damage')) return [1,-2];
+                        if(get.tag(card,'respond')) return [1,-1];
+                    }
+                }
+            }
+        },
+        xiyang:{
+            trigger:{player:'phaseEnd'},
+            filter:function(event,player){
+                return !player.isTurnedOver()&&player.isDamaged();
+            },
+            check:function(event,player){
+                return player.hp<=1;
+            },
+            content:function(){
+                'step 0'
+                player.turnOver();
+                'step 1'
+                player.recover(2);
+            }
+        },
         qinru:{
             trigger:{player:'useCardToBegin'},
             filter:function(event,player){
@@ -34,7 +123,7 @@ character.ow={
             },
             logTarget:'target',
             check:function(event,player){
-                return ai.get.attitude(player,event.player)<0;
+                return ai.get.attitude(player,event.target)<0;
             },
             intro:{
                 content:'players'
@@ -2864,7 +2953,10 @@ character.ow={
         }
     },
     translate:{
-        ow_heiying:'黑影',
+        liangou:'链钩',
+        liangou_info:'出牌阶段限一次，你可以弃置一张牌，指定一名体力值不小于2的角色并进行一次判定，若结果为黑色，该角色不能使用或打出卡牌、与你距离为1且受到的首次伤害+1直到回合结束',
+        xiyang:'吸氧',
+        xiyang_info:'回合结束阶段，若你武将牌正面朝上，你可以翻面并回复两点体力',
         qinru:'侵入',
         qinru_info:'每当你使用卡牌指定惟一目标时，你可以令目标进行一次判定，若结果不为红桃，该角色的非锁定技失效直到其下一回合结束',
         yinshen:'隐身',
@@ -3019,5 +3111,6 @@ character.ow={
         ow_luba:'路霸',
         ow_wensidun:'温斯顿',
         ow_zhaliya:'查莉娅',
+        ow_heiying:'黑影',
     }
 };

character/rank.js

@@ -231,6 +231,7 @@ window.characterRank={
         'dianwei',
     ],
     bp:[
+        'ow_luba',
         'pal_leiyuange',
         'dongbai',
         'swd_moye',

character/xianjian.js

@@ -33,7 +33,7 @@ character.xianjian={
 		// pal_xiaoman:['male','wei',4,[]],
 
 		pal_xiahoujinxuan:['male','shu',3,['xuanmo','danqing']],
-		// pal_muchanglan:['male','wei',4,[]],
+		// pal_muchanglan:['female','shu',3,['feixia','lueying']],
 		// pal_xia:['male','wei',4,[]],
 		// pal_jiangcheng:['male','wei',4,[]],
 	},

character/yijiang.js

@@ -140,23 +140,7 @@ character.yijiang={
 			direct:true,
 			filter:function(event,player){
 				if(event.player==player) return false;
-				var hs=player.get('h');
+				return player.num('e')>0;
-				if(!hs.length) return false;
-				var es=player.get('e');
-				if(!es.length) return false;
-				var color=[];
-				for(var i=0;i<es.length;i++){
-					color.add(get.color(es[i]));
-				}
-				if(color.length==2) return true;
-				color=color[0];
-				for(var i=0;i<hs.length;i++){
-					if(get.color(hs[i])==color) return true;
-				}
-				return false;
-			},
-			ai:{
-				threaten:1.5
 			},
 			content:function(){
 				'step 0'
@@ -171,7 +155,8 @@ character.yijiang={
 				}
 				if(color.length==2) color='all';
 				else color=color[0];
-				player.chooseToDiscard(get.prompt('xinsidi',trigger.player),function(card){
+				player.chooseToDiscard(get.prompt('xinsidi',trigger.player),'he',function(card){
+					if(get.type(card)=='basic') return false;
 					if(_status.event.color=='all') return true;
 					return get.color(card)==_status.event.color;
 				}).set('ai',function(card){
@@ -185,7 +170,10 @@ character.yijiang={
 					trigger.player.storage.xinsidi4=player;
 					trigger.player.syncStorage('xinsidi2');
 				}
-			}
+			},
+			ai:{
+				threaten:1.5
+			},
 		},
 		xinsidi2:{
 			mark:true,