From 87d3a17faa26fc5bbe9ec39533c8f3f6685773a9 Mon Sep 17 00:00:00 2001
From: libccy <widget@widgetdeMacBook-Pro.local>
Date: Wed, 22 Mar 2017 15:27:29 +0800
Subject: [PATCH] r

---
 character/ow.js   | 3 ++-
 character/rank.js | 1 +
 character/sp.js   | 1 +
 game/update.js    | 3 +++
 4 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/character/ow.js b/character/ow.js
index c1cbccb81..f851137b5 100644
--- a/character/ow.js
+++ b/character/ow.js
@@ -152,7 +152,6 @@ character.ow={
                 effect:{
                     target:function(card,player,target){
                         if(_status.woliu2_temp) return;
-                        if(target.hp==1&&!target.hasShan()) return;
                         if(card.name=='sha'&&target.storage.woliu2){
                             _status.woliu2_temp=true;
                             var num=game.countPlayer(function(current){
@@ -164,6 +163,7 @@ character.ow={
                             if(target.hasSkill('qianggu2')&&ai.get.attitude(player,target)>0){
                                 return [0,num];
                             }
+                            if(target.hp==1&&!target.hasShan()) return;
                             return [1,num];
                         }
                     }
@@ -231,6 +231,7 @@ character.ow={
 					target:function(card,player,target,current){
 						if(card.name=='sha'){
 							if(_status.event.name=='qianggu2') return;
+                            if(ai.get.attitude(player,target)>0) return;
 							var bs=player.get('h',{type:'basic'});
 							if(bs.length<2) return 0;
 							if(player.hasSkill('jiu')||player.hasSkill('tianxianjiu')) return;
diff --git a/character/rank.js b/character/rank.js
index e92916d48..b22788153 100644
--- a/character/rank.js
+++ b/character/rank.js
@@ -151,6 +151,7 @@ window.characterRank={
         'hs_jaina',
     ],
     am:[
+        'ow_orisa',
         'ow_baolei',
         'ow_wensidun',
         'gw_gaier',
diff --git a/character/sp.js b/character/sp.js
index 5eee96499..46bcacb83 100644
--- a/character/sp.js
+++ b/character/sp.js
@@ -2622,6 +2622,7 @@ character.sp={
 				if(!event.targets) return false;
 				if(event.player==player) return false;
 				if(event.targets.contains(player)) return false;
+				if(get.info(event.card).multitarget) return false;
 				var type=get.type(event.card);
 				if(type!='basic'&&type!='trick') return false;
 				if(lib.filter.targetEnabled2(event.card,event.player,player)){
diff --git a/game/update.js b/game/update.js
index 7047b0ee5..35bdded2e 100644
--- a/game/update.js
+++ b/game/update.js
@@ -10,12 +10,15 @@ window.noname_update={
         // 'game/config.js',
         // 'game/source.js',
         'game/asset.js',
+        // 'card/*',
         // 'card/standard.js',
         // 'character/*',
         'character/ow.js',
         'character/old.js',
         'character/yijiang.js',
         'character/refresh.js',
+        'character/sp.js',
+        'character/rank.js',
         // 'mode/boss.js',
         // 'mode/chess.js',
         // 'mode/versus.js',