From a97ead40f0dad6186c3042e76f82001921ee6df1 Mon Sep 17 00:00:00 2001
From: libccy <widget@widgetdeMacBook-Pro.local>
Date: Thu, 16 Mar 2017 00:43:04 +0800
Subject: [PATCH] 1.9.10.7

---
 character/gwent.js |  4 ++--
 character/ow.js    |  2 +-
 character/sp.js    | 16 +++++++++++++---
 game/asset.js      |  2 +-
 game/update.js     |  4 +++-
 5 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/character/gwent.js b/character/gwent.js
index 67c762d1f..16310526c 100644
--- a/character/gwent.js
+++ b/character/gwent.js
@@ -38,13 +38,13 @@ character.gwent={
 		gw_jieluote:'如果要付出这种代价才能拯救世界，那最好还是让世界消逝吧。',
 		gw_xili:'我想去哪，就去哪。',
 		gw_luoqi:'是个爱国者…还是个货真价实的王八蛋。',
-		gw_yioufeisi:'国王还是乞丐，两者有何区别，人类少一个是一个',
+		gw_yioufeisi:'国王还是乞丐，两者有何区别，人类少一个算一个',
 	},
 	skill:{
 		kuanglie:{
 			trigger:{player:'useCardToBegin'},
 			filter:function(event,player){
-				return event.target!=player&&event.target.num('he')&&get.color(event.card)=='black';
+				return event.target&&event.target!=player&&event.target.num('he')&&get.color(event.card)=='black';
 			},
 			init:function(player){
 				player.storage.kuanglie=0;
diff --git a/character/ow.js b/character/ow.js
index 733bb7b1f..705e0682f 100644
--- a/character/ow.js
+++ b/character/ow.js
@@ -595,7 +595,7 @@ character.ow={
 			trigger:{player:'useCardToBegin'},
 			forced:true,
 			filter:function(event,player){
-				return get.suit(event.card)==get.suit(player.storage.shoujia)&&event.target!=player;
+				return get.suit(event.card)==get.suit(player.storage.shoujia)&&event.target&&event.target!=player;
 			},
 			content:function(){
 				'step 0'
diff --git a/character/sp.js b/character/sp.js
index b46405222..e0909612e 100644
--- a/character/sp.js
+++ b/character/sp.js
@@ -6102,12 +6102,22 @@ character.sp={
 				}
 				"step 1"
 				if(event.cards.length){
+					var goon=false;
+					for(var i=0;i<event.cards.length;i++){
+						if(event.cards[i].name=='du'){
+							goon=true;break;
+						}
+					}
+					if(!goon){
+						goon=game.hasPlayer(function(current){
+							return player!=current&&ai.get.attitude(player,current)>1;
+						});
+					}
 					player.chooseCardButton(get.prompt('lirang'),event.cards,[1,event.cards.length]).set('ai',function(button){
 						if(!_status.event.goon||ui.selected.buttons.length) return 0;
+						if(button.link.name=='du') return 2;
 						return 1;
-					}).set('goon',game.hasPlayer(function(current){
-						return Math.abs(ai.get.attitude(player,current))>1;
-					}));
+					}).set('goon',goon);
 				}
 				else{
 					event.finish();
diff --git a/game/asset.js b/game/asset.js
index de0d0d671..24713a92d 100644
--- a/game/asset.js
+++ b/game/asset.js
@@ -1,5 +1,5 @@
 window.noname_asset_list=[
-    '1.9.10.3',
+    '1.9.10.7',
     'image/background/huangtian_bg.jpg',
     'image/background/september_bg.jpg',
     'image/background/shengshi_bg.jpg',
diff --git a/game/update.js b/game/update.js
index d96fa74e9..1b19613c2 100644
--- a/game/update.js
+++ b/game/update.js
@@ -1,5 +1,5 @@
 window.noname_update={
-    version:'1.9.10.6',
+    version:'1.9.10.7',
     update:'1.9.10.4',
     changeLog:[
         'bug修复',
@@ -13,9 +13,11 @@ window.noname_update={
         'card/swd.js',
         'character/rank.js',
         'character/gwent.js',
+        'character/ow.js',
         'character/swd.js',
         'character/diy.js',
         'character/extra.js',
+        'character/sp.js',
         // 'mode/boss.js',
         // 'mode/chess.js',
         // 'mode/versus.js',