From 1a298f2d63e06e18c3da7722999683ada366ae05 Mon Sep 17 00:00:00 2001
From: Spmario233 <Spmario233@163.com>
Date: Sun, 3 Mar 2024 13:23:05 +0800
Subject: [PATCH] =?UTF-8?q?=E7=8A=B6=E6=80=81=E7=B1=BB=E6=8A=80=E8=83=BD?=
 =?UTF-8?q?=E5=88=9D=E6=AD=A5=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 character/ddd.js     |  6 +++---
 character/diy.js     | 14 ++++++++------
 character/extra.js   | 29 ++++++++++++++++++++++-------
 character/huicui.js  | 10 ++++++----
 character/jsrg.js    |  9 ++++++---
 character/mobile.js  |  6 +++---
 character/offline.js | 10 ++++++++--
 character/refresh.js |  5 ++++-
 character/sp.js      | 10 ++++++++--
 character/sp2.js     | 12 ++++++++----
 character/tw.js      |  5 ++++-
 character/yijiang.js |  4 ++--
 12 files changed, 82 insertions(+), 38 deletions(-)

diff --git a/character/ddd.js b/character/ddd.js
index 29aa69783..515e2ee68 100644
--- a/character/ddd.js
+++ b/character/ddd.js
@@ -4815,17 +4815,17 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 							cardEnabled(card,player){
 								if(!player.storage['dddlianer_ceiling']) return;
 								var num=get.number(card);
-								if(typeof num!='number'||player.storage['dddlianer_ceiling']<=num) return false;
+								if(num!='unsure'&&(typeof num!='number'||player.storage['dddlianer_ceiling']<=num)) return false;
 							},
 							cardRespondable(card,player){
 								if(!player.storage['dddlianer_ceiling']) return;
 								var num=get.number(card);
-								if(typeof num!='number'||player.storage['dddlianer_ceiling']<=num) return false;
+								if(num!='unsure'&&(typeof num!='number'||player.storage['dddlianer_ceiling']<=num)) return false;
 							},
 							cardSavable(card,player){
 								if(!player.storage['dddlianer_ceiling']) return;
 								var num=get.number(card);
-								if(typeof num!='number'||player.storage['dddlianer_ceiling']<=num) return false;
+								if(num!='unsure'&&(typeof num!='number'||player.storage['dddlianer_ceiling']<=num)) return false;
 							},
 						}
 					}
diff --git a/character/diy.js b/character/diy.js
index 6454b6ff0..030c252e3 100755
--- a/character/diy.js
+++ b/character/diy.js
@@ -8203,15 +8203,17 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 				locked:false,
 				mod:{
 					targetInRange(card,player){
-						var list=player.getExpansions('ao_diegui');
-						for(var i=0;i<list.length;i++){
-							if(get.suit(list[i],false)==get.suit(card,false)) return true;
+						const cardSuit = get.suit(card,false);
+						const list = player.getExpansions('ao_diegui');
+						for(let i = 0; i < list.length; i++){
+							if(cardSuit==='unsure'||get.suit(list[i],false)===cardSuit) return true;
 						}
 					},
 					cardUsable(card,player){
-						var list=player.getExpansions('ao_diegui');
-						for(var i=0;i<list.length;i++){
-							if(get.suit(list[i],false)==get.suit(card,false)) return Infinity;
+						const cardSuit = get.suit(card,false);
+						const list = player.getExpansions('ao_diegui');
+						for(let i = 0; i < list.length; i++){
+							if(cardSuit==='unsure'||get.suit(list[i],false)===cardSuit) return Infinity;
 						}
 					},
 					maxHandcard(player,num){
diff --git a/character/extra.js b/character/extra.js
index 66d69ef0a..0e38c614e 100755
--- a/character/extra.js
+++ b/character/extra.js
@@ -1875,7 +1875,8 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 			twgongxin2:{
 				mod:{
 					cardEnabled2(card,player){
-						if(player.getStorage('twgongxin2').includes(get.color(card))) return false;
+						const color = get.color(card);
+						if(color!='unsure' && player.getStorage('twgongxin2').includes(color)) return false;
 					},
 				},
 				charlotte:true,
@@ -2266,10 +2267,12 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 						if(lib.skill.xunshi.isXunshi(card)) return 'none';
 					},
 					targetInRange(card){
-						if(get.color(card)=='none') return true;
+						const suit = get.color(card);
+						if (suit=='none' || suit=='unsure') return true;
 					},
 					cardUsable(card){
-						if(get.color(card)=='none') return Infinity;
+						const suit = get.color(card);
+						if (suit=='none' || suit=='unsure') return Infinity;
 					},
 				},
 				isXunshi(card){
@@ -2343,10 +2346,16 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 						if(get.suit(card)=='heart') return false;
 					},
 					targetInRange(card){
-						if(get.suit(card)=='heart') return true;
+						if(card.name === 'sha'){
+							const suit = get.suit(card);
+							if (suit === 'heart' || suit === 'unsure') return true;
+						}
 					},
 					cardUsable(card){
-						if(card.name=='sha'&&get.suit(card)=='heart') return Infinity;
+						if(card.name === 'sha'){
+							const suit = get.suit(card);
+							if (suit === 'heart' || suit === 'unsure') return Infinity;
+						}
 					}
 				},
 				audio:'wushen',
@@ -6164,10 +6173,16 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 						if(get.suit(card)=='heart') return false;
 					},
 					targetInRange(card){
-						if(get.suit(card)=='heart') return true;
+						if(card.name === 'sha'){
+							const suit = get.suit(card);
+							if (suit === 'heart' || suit === 'unsure') return true;
+						}
 					},
 					cardUsable(card){
-						if(card.name=='sha'&&get.suit(card)=='heart') return Infinity;
+						if(card.name === 'sha'){
+							const suit = get.suit(card);
+							if (suit === 'heart' || suit === 'unsure') return Infinity;
+						}
 					}
 				},
 				audio:2,
diff --git a/character/huicui.js b/character/huicui.js
index 913c11d26..307c9dae0 100644
--- a/character/huicui.js
+++ b/character/huicui.js
@@ -11057,11 +11057,13 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 			},
 			zhente2:{
 				mod:{
-					cardEnabled:function(card,player){
-						if(player.getStorage('zhente2').includes(get.color(card))) return false;
+					cardEnabled(card, player) {
+						const color = get.color(card);
+						if (color != 'unsure' && player.getStorage('zhente2').includes(color)) return false;
 					},
-					cardSavable:function(card,player){
-						if(player.getStorage('zhente2').includes(get.color(card))) return false;
+					cardSavable(card,player) {
+						const color = get.color(card);
+						if (color != 'unsure' && player.getStorage('zhente2').includes(color)) return false;
 					},
 				},
 				charlotte:true,
diff --git a/character/jsrg.js b/character/jsrg.js
index ded002170..4b0b2bf72 100644
--- a/character/jsrg.js
+++ b/character/jsrg.js
@@ -508,13 +508,16 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 						onremove:true,
 						mod:{
 							cardEnabled:function(card,player){
-								if(player.getStorage('jsrgfumou_forbid').includes(get.color(card))) return false;
+								const color = get.color(card);
+								if (color != 'unsure' && player.getStorage('jsrgfumou_forbid').includes(color)) return false;
 							},
 							cardRespondable:function(card,player){
-								if(player.getStorage('jsrgfumou_forbid').includes(get.color(card))) return false;
+								const color = get.color(card);
+								if (color != 'unsure' && player.getStorage('jsrgfumou_forbid').includes(color)) return false;
 							},
 							cardSavable:function(card,player){
-								if(player.getStorage('jsrgfumou_forbid').includes(get.color(card))) return false;
+								const color = get.color(card);
+								if (color != 'unsure' && player.getStorage('jsrgfumou_forbid').includes(color)) return false;
 							},
 						},
 						mark:true,
diff --git a/character/mobile.js b/character/mobile.js
index d1ba65986..53a3a3fce 100644
--- a/character/mobile.js
+++ b/character/mobile.js
@@ -3108,7 +3108,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 							cardEnabled:function(card,player){
 								if(!player.storage.scschihe_blocker) return;
 								var suit=get.suit(card);
-								if(suit=='none') return;
+								if(suit=='none'||suit=='unsure') return;
 								var evt=_status.event;
 								if(evt.name!='chooseToUse') evt=evt.getParent('chooseToUse');
 								if(!evt||!evt.respondTo||evt.respondTo[1].name!='sha') return;
@@ -5625,7 +5625,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 							var evt=lib.skill.dcjianying.getLastUsed(player);
 							if(!evt||!evt.card) return;
 							var num1=get.number(card),num2=get.number(evt.card);
-							if(typeof num1=='number'&&typeof num2=='number'&&num1%num2==0) return Infinity;
+							if(num1==='unsure'||typeof num1=='number'&&typeof num2=='number'&&num1%num2==0) return Infinity;
 						}
 					},
 					aiOrder:function(player,card,num){
@@ -5633,7 +5633,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 							var evt=lib.skill.dcjianying.getLastUsed(player);
 							if(!evt||!evt.card) return;
 							var num1=get.number(card),num2=num2=get.number(evt.card);
-							if(typeof num1=='number'&&typeof num2=='number'&&num2%num1==0) return num+5;
+							if(num1==='unsure'||typeof num1=='number'&&typeof num2=='number'&&num2%num1==0) return num+5;
 						}
 					},
 				},
diff --git a/character/offline.js b/character/offline.js
index 6d1a36b16..74a84574e 100644
--- a/character/offline.js
+++ b/character/offline.js
@@ -6095,10 +6095,16 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 				},
 				mod:{
 					cardRespondable:function(card,player){
-						if(card.name=='shan'&&get.suit(card)!='heart') return false;
+						if(card.name=='shan'){
+							const suit=get.suit(card);
+							if(suit!='heart'&&suit!='unsure') return false;
+						}
 					},
 					cardEnabled:function(card,player){
-						if(card.name=='shan'&&get.suit(card)!='heart') return false;
+						if(card.name=='shan'){
+							const suit=get.suit(card);
+							if(suit!='heart'&&suit!='unsure') return false;
+						}
 					},
 				}
 			},
diff --git a/character/refresh.js b/character/refresh.js
index 6a2b079fa..ed07c2251 100755
--- a/character/refresh.js
+++ b/character/refresh.js
@@ -6758,7 +6758,10 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 						return Infinity;
 					},
 					cardUsable:function(card,player){
-						if(card.name=='sha'&&player.storage.xingongji2.includes(get.suit(card))) return Infinity;
+						if(card.name=='sha'){
+							const suit = get.suit(card);
+							return suit === 'unsure' || player.storage.xingongji2.includes(suit);
+						}
 					},
 					aiOrder:function(player,card,num){
 						if(get.name(card)=='sha'&&!player.storage.xingongji2.includes(get.suit(card))) return num+1;
diff --git a/character/sp.js b/character/sp.js
index 5626929e2..1e6a88331 100755
--- a/character/sp.js
+++ b/character/sp.js
@@ -22865,10 +22865,16 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 			qiangwu3:{
 				mod:{
 					targetInRange:function(card,player){
-						if(_status.currentPhase==player&&card.name=='sha'&&get.number(card)<player.storage.qiangwu) return true;
+						if (card.name == 'sha') {
+							const num = get.number(card);
+							if (num == 'unsure' || num < player.storage.qiangwu) return true;
+						}
 					},
 					cardUsable:function(card,player){
-						if(_status.currentPhase==player&&card.name=='sha'&&get.number(card)>player.storage.qiangwu) return Infinity;
+						if (card.name == 'sha') {
+							const num = get.number(card);
+							if (num == 'unsure' || num > player.storage.qiangwu) return true;
+						}
 					}
 				},
 				trigger:{player:'useCard1'},
diff --git a/character/sp2.js b/character/sp2.js
index 6d6fac567..fe6fdc3bc 100644
--- a/character/sp2.js
+++ b/character/sp2.js
@@ -1566,10 +1566,12 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 				},
 				mod:{
 					targetInRange:function(card,player){
-						if(get.color(card)=='none') return true;
+						const color = get.color(card);
+						if (color === 'none' || color === 'unsure') return true;
 					},
 					cardUsable:function(card){
-						if(get.color(card)=='none') return Infinity;
+						const color = get.color(card);
+						if (color === 'none' || color === 'unsure') return Infinity;
 					},
 				}
 			},
@@ -6400,10 +6402,12 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 						}
 					},
 					targetInRange:function(card){
-						if(get.color(card)=='black') return true;
+						const color = get.color(card);
+						if (color === 'black' || color === 'unsure') return true;
 					},
 					cardUsable:function(card){
-						if(get.color(card)=='black') return Infinity;
+						const color = get.color(card);
+						if (color === 'black' || color === 'unsure') return Infinity;
 					},
 				},
 			},
diff --git a/character/tw.js b/character/tw.js
index 20a7465ca..72611083c 100644
--- a/character/tw.js
+++ b/character/tw.js
@@ -6258,7 +6258,10 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 				},
 				mod:{
 					cardUsable:function(card,player){
-						if(card.name=='sha'&&player.getStorage('twgongji2').includes(get.suit(card))) return Infinity;
+						if(card.name=='sha'){
+							const suit = get.suit(card);
+							return suit === 'unsure' || player.getStorage('twgongji2').includes(suit);
+						}
 					},
 					aiOrder:function(player,card,num){
 						if(get.name(card)=='sha'&&!player.getStorage('twgongji2').includes(get.suit(card))) return num+1;
diff --git a/character/yijiang.js b/character/yijiang.js
index b415f28ed..ec53d0cb3 100755
--- a/character/yijiang.js
+++ b/character/yijiang.js
@@ -1505,8 +1505,8 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 					unlimit:{
 						mod:{
 							cardUsable:function(card,player){
-								var list=lib.skill.lkbushi.getBushi(player);
-								if(list[0]==get.suit(card)) return Infinity;
+								const list = lib.skill.lkbushi.getBushi(player), suit = get.suit(card);
+								if (suit === 'unsure' || list[0] === suit) return Infinity;
 							},
 						},
 						trigger:{player:'useCard1'},