From c0b1fd8745b180b09710a35925f2fa2ca04a8c47 Mon Sep 17 00:00:00 2001
From: mengxinzxz <2223529500@qq.com>
Date: Fri, 1 Dec 2023 23:30:45 +0800
Subject: [PATCH] =?UTF-8?q?OL=E7=95=8C=E7=AE=80=E9=9B=8D(unseen)+OL?=
 =?UTF-8?q?=E7=95=8C=E7=AE=80=E9=9B=8DOL=E7=95=8C=E5=87=8C=E7=BB=9Fcharact?=
 =?UTF-8?q?erReplace?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 character/refresh.js | 31 +++++++++++++++++++++++++++++++
 character/yijiang.js |  7 ++++---
 2 files changed, 35 insertions(+), 3 deletions(-)

diff --git a/character/refresh.js b/character/refresh.js
index 1727b10e3..68a9bbb90 100755
--- a/character/refresh.js
+++ b/character/refresh.js
@@ -20,6 +20,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 		},
 		connect:true,
 		character:{
+			ol_jianyong:['male','shu',3,['olqiaoshui','jyzongshi'],['unseen']],
 			ol_lingtong:['male','wu',4,['olxuanfeng'],['die_audio:re_lingtong','unseen']],
 			re_xushu:['male','shu',4,['zhuhai','qianxin']],
 			re_lidian:['male','wei',3,['xunxun','xinwangxi']],
@@ -170,6 +171,32 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 			re_guohuai:['xiahouyuan','zhanghe'],
 		},
 		skill:{
+			//界简雍
+			olqiaoshui:{
+				audio:2,
+				inherit:'reqiaoshui',
+				filter:function(event,player){
+					return player.countCards('h')>0&&!player.hasSkill('olqiaoshui_used');
+				},
+				content:function(){
+					'step 0'
+					player.chooseToCompare(target);
+					'step 1'
+					if(result.bool) player.addTempSkill('qiaoshui3',{player:'phaseUseAfter'});
+					else{
+						player.addTempSkill('qiaoshui2');
+						player.addTempSkill('olqiaoshui_used');
+					}
+				},
+				subSkill:{
+					used:{
+						charlotte:true,
+						mark:true,
+						marktext:'<span style="text-decoration: line-through;">说</span>',
+						intro:{content:'被迫闭嘴'},
+					},
+				},
+			},
 			//界凌统
 			olxuanfeng:{
 				audio:'xuanfeng',
@@ -15612,6 +15639,10 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 			re_lidian_prefix:'界',
 			re_xushu:'界徐庶',
 			re_xushu_prefix:'界',
+			ol_jianyong:'OL界简雍',
+			ol_jianyong_prefix:'OL界',
+			olqiaoshui:'巧说',
+			olqiaoshui_info:'出牌阶段，你可与一名其他角色拼点。若你赢，你使用的下一张基本牌或普通锦囊牌可以额外指定任意一名其他角色为目标或减少指定一个目标；若你没赢，此技能于本回合失效且本回合你不能使用锦囊牌。',
 			
 			refresh_standard:'界限突破·标',
 			refresh_feng:'界限突破·风',
diff --git a/character/yijiang.js b/character/yijiang.js
index 9d7841886..e890f60a6 100755
--- a/character/yijiang.js
+++ b/character/yijiang.js
@@ -5114,7 +5114,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 			},
 			jyzongshi:{
 				audio:2,
-				audioname:['re_jianyong'],
+				audioname:['re_jianyong','ol_jianyong'],
 				trigger:{player:['chooseToCompareAfter','compareMultipleAfter'],target:['chooseToCompareAfter','compareMultipleAfter']},
 				filter:function(event,player){
 					if(event.preserve) return false;
@@ -10272,6 +10272,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 				audioname2:{
 					re_jianyong:'reqiaoshui',
 					xin_jianyong:'xinqiaoshui',
+					ol_jianyong:'olqiaoshui',
 				},
 				trigger:{player:'useCard2'},
 				filter:function(event,player){
@@ -13910,7 +13911,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 			masu:['xin_masu','re_masu','masu'],
 			xusheng:['xusheng','xin_xusheng','re_xusheng','old_xusheng'],
 			wuguotai:['wuguotai','xin_wuguotai','re_wuguotai'],
-			lingtong:['lingtong','xin_lingtong','re_lingtong','old_lingtong'],
+			lingtong:['lingtong','xin_lingtong','ol_lingtong','re_lingtong','old_lingtong'],
 			gaoshun:['gaoshun','xin_gaoshun','re_gaoshun','old_gaoshun'],
 			zhonghui:['zhonghui','xin_zhonghui','re_zhonghui','old_zhonghui','pe_zhonghui'],
 			wangyi:['wangyi','re_wangyi','old_wangyi'],
@@ -13925,7 +13926,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 			manchong:['manchong','re_manchong'],
 			caochong:['caochong','re_caochong','old_caochong'],
 			guohuai:['guohuai','re_guohuai','xin_guohuai','tw_guohuai','ol_guohuai'],
-			jianyong:['jianyong','re_jianyong','xin_jianyong'],
+			jianyong:['jianyong','ol_jianyong','re_jianyong','xin_jianyong'],
 			panzhangmazhong:['panzhangmazhong','re_panzhangmazhong','xin_panzhangmazhong'],
 			yufan:['yufan','xin_yufan','re_yufan'],
 			zhuran:['zhuran','re_zhuran','xin_zhuran','old_zhuran'],