From 70448dccf3626174ddedaf6df15ddde76435b0c5 Mon Sep 17 00:00:00 2001
From: Tipx-L <138244655+Tipx-L@users.noreply.github.com>
Date: Wed, 27 Sep 2023 07:20:59 -0700
Subject: [PATCH] Change group_unknown.png.
---
game/game.js | 87 ++++++++++++++++++++++-------------
image/card/group_unknown.png | Bin 6035 -> 1883 bytes
2 files changed, 54 insertions(+), 33 deletions(-)
diff --git a/game/game.js b/game/game.js
index 68586be25..1efbb45f4 100644
--- a/game/game.js
+++ b/game/game.js
@@ -8219,7 +8219,7 @@
var natures=get.natureList(this,player);
if(!nature) return natures.length>0;
if(nature=='linked') return natures.some(n=>lib.linked.includes(n));
- return get.is.sameNature(natures,nature,true);
+ return get.is.sameNature(natures,nature);
}
});
if (!('includes' in Array.prototype)) {
@@ -24448,7 +24448,7 @@
if(!nature) return Boolean(this.nature&&this.nature.length>0);
let natures=get.natureList(nature),naturesx=get.natureList(this.nature);
if(nature=='linked') return naturesx.some(n=>lib.linked.includes(n));
- return get.is.sameNature(natures,naturesx,true);
+ return get.is.sameNature(natures,naturesx);
};
if(next.hasNature('poison')) delete next._triggered;
next.setContent('damage');
@@ -28804,7 +28804,7 @@
var natures=get.natureList(this,player);
if(!nature) return natures.length>0;
if(nature=='linked') return natures.some(n=>lib.linked.includes(n));
- return get.is.sameNature(natures,nature,true);
+ return get.is.sameNature(natures,nature);
},
//只针对【杀】起效果
addNature:function(nature){
@@ -45614,7 +45614,7 @@
fakeme.appendChild(input);
fakeme.imagenode=ui.create.div('.image',fakeme);
- ui.create.div('.name','选
择
背
景',fakeme);
+ ui.create.div('.name','选择背景',fakeme);
ui.create.div('.indent','名称：',newCard).style.paddingTop='8px';
ui.create.div('.indent','描述：',newCard).style.paddingTop='6px';
@@ -55407,41 +55407,62 @@
/**
* 判断传入的参数的属性是否相同（参数可以为卡牌、卡牌信息、属性等）
* @param ...infos 要判断的属性列表
- * @param partly {boolean} 是否判断每一个传入的属性是否存在部分相同而不是完全相同
+ * @param every {boolean} 是否判断每一个传入的属性是否完全相同而不是存在部分相同
*/
sameNature:function(){
- var _args=Array.from(arguments);
- var args=[],partly=false;
- for(const arg of _args){
- if(typeof arg=='boolean') partly=arg;
- else{
- if(arg) args.push(arg);
- }
+ let processedArguments=[],every=false;
+ Array.from(arguments).forEach(argument=>{
+ if(typeof argument=='boolean') every=argument;
+ else if(argument) processedArguments.push(argument);
+ });
+ if(!processedArguments.length) return true;
+ if(processedArguments.length==1){
+ const argument=processedArguments[0];
+ if(!Array.isArray(argument)||argument.length==1) return false;
+ processedArguments=argument;
}
- if(!args.length) return true;
- if(args.length==1){
- if(Array.isArray(args[0])) args=args[0];
- else return false;
+ const naturesList=processedArguments.map(card=>{
+ if(typeof card=='string') return card.split(lib.natureSeparator);
+ else if(Array.isArray(card)) return card;
+ return get.natureList(card||{});
+ });
+ if(naturesList.some(natures=>natures.length)) for(const nature of new Set(naturesList.flat())){
+ if(!nature) continue;
+ const lengths=Array.from(new Set(naturesList.map(natures=>natures.filter(n=>n===nature).length)));
+ if(!every&&lengths.length==1) return true;
+ if(every&&lengths.length!=1) return false;
}
- var naturesList=[];
- const getN=(cardx)=>{
- if(typeof cardx=='string') return cardx.split(lib.natureSeparator);
- else if(Array.isArray(cardx)) return cardx;
- return get.natureList(cardx||{});
+ return !every;
+ },
+ /**
+ * 判断传入的参数的属性是否不同（参数可以为卡牌、卡牌信息、属性等）
+ * @param ...infos 要判断的属性列表
+ * @param every {boolean} 是否判断每一个传入的属性是否完全不同而不是存在部分不同
+ */
+ differentNature:function(){
+ let processedArguments=[],every=false;
+ Array.from(arguments).forEach(argument=>{
+ if(typeof argument=='boolean') every=argument;
+ else if(argument) processedArguments.push(argument);
+ });
+ if(!processedArguments.length) return false;
+ if(processedArguments.length==1){
+ const argument=processedArguments[0];
+ if(!Array.isArray(argument)||argument.length==1) return true;
+ processedArguments=argument;
}
- naturesList=args.map(getN);
- if(naturesList.length==1) return false;
- if(naturesList.some(natures=>Array.isArray(natures)&&natures.length)){
- var uniqueNatures=new Set(naturesList.flat());
- for(var nature of uniqueNatures){
- if(!nature) continue;
- var lens=naturesList.map(natures=>natures.filter(n=>n===nature).length);
- var lensx=Array.from(new Set(lens));
- if(partly&&lensx.length==1) return true;
- if(!partly&&lensx.length!=1) return false;
- }
+ const naturesList=processedArguments.map(card=>{
+ if(typeof card=='string') return card.split(lib.natureSeparator);
+ else if(Array.isArray(card)) return card;
+ return get.natureList(card||{});
+ });
+ if(naturesList.some(natures=>natures.length)) for(const nature of new Set(naturesList.flat())){
+ if(!nature) continue;
+ const lengths=Array.from(new Set(naturesList.map(natures=>natures.filter(n=>n!==nature).length)));
+ if(!every&&lengths.length==2) return true;
+ if(every&&lengths.length!=2) return false;
}
- return !Boolean(partly);
+ return !every;
},
//判断一张牌是否为明置手牌
shownCard:function(card){
diff --git a/image/card/group_unknown.png b/image/card/group_unknown.png
index 845bac1f5bded3a77c60966f0c4fe22df30cc6ae..6fb4bafb2167174abfff2fe0da09b0a49580e346 100644
GIT binary patch
literal 1883
zcmV-h2c-CkP)QPJnUN5<<=`>?wf#Xu_jDJ49j=
zUnxXvaeYKwY2)|cz*7W(5|<%}ou}L&0LBv2Gfkw>;Rf-M2gpPSTfwD^)v~DAmkuze
z*gO>9VOu0CZM=_?$Gyq>$aTHgytWz_o_8hf5Ap&O#?=tmqiP(>-7lRy{G~u7l+_Kv
zOB+^!6V0w<{Q!JHa+ht2FyX@1fFK?(^3-{r5tb=GmRQu}XiH|#xwz$i{%`-QcJ5MGDU;;ISE
z4ohz@)cu|#1h%`H5NIwXAs5_I~DVkIuQ-@`RMlIYojgVWyP1w<95
zJ)aY%Ik+UmHUJFeqNiDf0+g0^!xs14-w(QVMY)JjnlBhvi+(3D-J3Fs+&67oU#L-W?4G#XG*GhTfA!4d?(U0kwcQKM?fuE%cdb
zwD?P37rK)YK$KOnWqdjES5A1oQw>6|s&Fj_*B+)wKUqO;t~WqQwRn~!7qiJW8g5DH
z0>Uc?XizFGN>Z|t=e+?*XT-IVkDP(Q(hD;Im#EvpE)l;bO^3<*7DL%?lep!Y#Pfto>e
z=%kaM5i!cbD$ZJ2`E!CoKHb}O6H}s;*ye&j<AyoH_j9Rl!zSPk+A*#~1LQEX>dTqTFxq9ujAf#i(H84iw^dJEz$HGt>xCaDkB
zl+E8|V-ufPT>u@jvI@s>CZPZ}`0xHZ#p6a3MaN*g9^*4Z^A-ch<6c3y7w0q8IMoN>
zf~muWPU0*E`Smn9W|e=_qm2&dt;2XBK8W834x=-MszURut|Ys60U+`n>hYTMx(`!6
zw-^-H+$Gc{gh%qWl}y}9aHZMT4H(V0DT5@gPrfB)jLDq>C3dYV822?zi)Nx`9lbT_
zfJHCA-h&gqAe@1TFH6&l&$O2mD{iA`vAR#cw^JdR(^a9`W_RLR&)Cg(z@)mi22am2
z>lGIRyYQkcdc~o1T1>kkL~Tl1bfC|lqF@4Sa8_vU64)7c(MSe8ghORT`Rau$Ao-tr
z=R&8Zzp$R3sfKcTnnsK2lIZ9OFXth(Ao;b7(Ya)HsOGeGYL=?LV%|YW=B5YYe}Kqa
zPUz$3r&NigNmVi7ujH|*S)Z^9AfCA)T)Uxn$$NJRD|dkISm;FgD}DZZ{BYtpDJuXO?ZXE5>;IP+;apW$l_Z7IORcBl(~yo=rbgNMUU0z(MlgaAj9~B({{o@-
VAhE?%qLTms002ovPDHLkV1fgIgR1}l
literal 6035
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
N002ovPDHLkV1g*KbX))c