Revert "Revert "1.10.8""

This reverts commit 641e8c5.

.gitignore

@@ -1,15 +0,0 @@
-._*
-.DS_Store
-.DS_Store?
-.idea
-.Spotlight-V100
-.Trashes
-.vscode
-app
-app.html
-ehthumbs.db
-jsconfig.json
-localStorage.json
-noname.ico
-package-lock.json
-Thumbs.db

README.md

@@ -75,7 +75,7 @@
 
 #### 下载途径
 
-下载途径1：项目的Releases（一步到位懒人包）
+下载途径1：项目的[Releases](https://github.com/lieren2023/noname-for-dummies/releases)（一步到位懒人包）
 
 - 手机版：noname-for-dummies-Android.apk
 - 电脑版：noname-for-dummies-Windows.zip
@@ -114,7 +114,7 @@
 贡献代码：
 
 - 请前往无名杀原版/懒人包开源地址提Pull requests
-- 本懒人包提交Pull requests时请推送到“update-Branch”分支
+- 本懒人包提交Pull requests时请推送到“[update-Branch](https://github.com/lieren2023/noname-for-dummies/tree/update-branch)”分支（另：玩家可通过此分支体验最新内测版无名杀懒人包）
 
 bug反馈：
 

card/swd.js

@@ -3413,11 +3413,11 @@ game.import('card',function(lib,game,ui,get,ai,_status){
 						};
 						if(trigger.result.judge>0){
 							trigger.result.bool=true;
-							trigger.player.popup('洗具');
+							trigger.player.popup('判定生效');
 						}
 						if(trigger.result.judge<0){
 							trigger.result.bool=false;
-							trigger.player.popup('杯具');
+							trigger.player.popup('判定失效');
 						}
 						game.log(trigger.player,'的判定结果为',card);
 						trigger.direct=true;

card/yongjian.js

@@ -486,7 +486,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){
 						}
 						return event.card2.name=='du';
 					}
-					if(event.name!='equip'&&event.name!='addJudge'&&!event.visible) return false;
+					if(event.name!='equip'&&!event.visible) return false;
 					var evt=event.getl(player);
 					if(!evt||!evt.hs||!evt.hs.filter(function(i){
 						return get.name(i,player)=='du';

card/yunchou.js

@@ -712,6 +712,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){
 				type:'delay',
 				cardcolor:'red',
 				cardnature:'fire',
+				toself:true,
 				modTarget:function(card,player,target){
 					return lib.filter.judge(card,player,target);
 				},
@@ -724,7 +725,11 @@ game.import('card',function(lib,game,ui,get,ai,_status){
 				selectTarget:[-1,-1],
 				judge:function(card){
 					if(get.suit(card)=='heart'&&get.number(card)>1&&get.number(card)<10) return -6;
-					return 0;
+					return 1;
+				},
+				judge2:function(result){
+					if(result.bool==false) return true;
+					return false;
 				},
 				effect:function(){
 					if(result.bool==false){
@@ -764,6 +769,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){
 			},
 			hongshui:{
 				type:'delay',
+				toself:true,
 				enable:function(card,player){
 					return player.canAddJudge(card);
 				},
@@ -776,7 +782,11 @@ game.import('card',function(lib,game,ui,get,ai,_status){
 				selectTarget:[-1,-1],
 				judge:function(card){
 					if(get.suit(card)=='club'&&get.number(card)>1&&get.number(card)<10) return -3;
-					return 0;
+					return 1;
+				},
+				judge2:function(result){
+					if(result.bool==false) return true;
+					return false;
 				},
 				fullskin:true,
 				effect:function(){
@@ -930,9 +940,9 @@ game.import('card',function(lib,game,ui,get,ai,_status){
 			chenhuodajie:'趁火打劫',
 			chenhuodajie_info:'任意一名其他角色受到伤害时对其使用，获得其一张牌。',
 			huoshan:'火山',
-			huoshan_info:'出牌阶段，对自己使用。若判定结果为红桃2~9，则目标角色受到2点火焰伤害，距离目标1以内的其他角色受到1点火焰伤害。若判定不为红桃2~9，将之移动到下家的判定区里。',
+			huoshan_info:'出牌阶段，对自己使用。若判定结果为红桃2~9，则目标角色受到2点火焰伤害，距离目标1以内的其他角色受到1点火焰伤害。若判定结果不为红桃2~9，将之移动到下家的判定区里。',
 			hongshui:'洪水',
-			hongshui_info:'出牌阶段，对自己使用。若判定结果为梅花2~9，该角色随机弃置三张牌，距离该角色为X的角色随机弃置3-X张牌，若没有牌则失去1点体力。',
+			hongshui_info:'出牌阶段，对自己使用。若判定结果为梅花2~9，该角色随机弃置三张牌，距离该角色为X的角色随机弃置3-X张牌，若没有牌则失去1点体力。若判定结果不为梅花2~9，将之移动到下家的判定区里。',
 		},
 		list:[
 			['heart',6,'huoshan','fire'],

character/clan.js

@@ -33,6 +33,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 				clan_zhong:['clan_zhongyan','clan_zhonghui','clan_zhongyu'],
 			},
 		},
+		/** @type { importCharacterConfig['skill'] } */
 		skill:{
 			//族吴乔
 			clanqiajue:{
@@ -42,7 +43,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 					return player.countCards('he',card=>{
 						if(_status.connectMode&&get.position(card)=='h') return true;
 						return get.color(card,player)=='black'&&lib.filter.cardDiscardable(card,player);
-					});
+					})>0;
 				},
 				direct:true,
 				async content(event,trigger,player){
@@ -440,9 +441,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 					else event.goto(2);
 					'step 1'
 					if(result.bool){
-						player.removeSkill('clanbaozu');
-						player.popup('保族');
-						game.log(player,'失去了技能','#g【保族】');
+						player.removeSkills('clanbaozu');
 					}
 					else player.loseHp();
 					'step 2'
@@ -1058,7 +1057,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 										var owner=_status.event.getParent().owner;
 										if(owner) owner.$throw(card.cards);
 									});
-									if(card.name!=cardx.name||!get.is.sameNature(card,cardx)) next.viewAs=true;
+									if(card.name===cardx.name&&get.is.sameNature(card,cardx,true)) next.viewAs=false;
 									var owner=get.owner(card);
 									if(owner!=player&&get.position(card)=='h'){
 										next.throw=false;
@@ -1541,7 +1540,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 							return player.getStorage('clanfangzhen_remove').includes(game.roundNumber);
 						},
 						content(){
-							player.removeSkill('clanfangzhen');
+							player.removeSkills('clanfangzhen');
 						}
 					}
 				}
@@ -1811,9 +1810,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 						event.finish();
 					}
 					'step 6'
-					player.removeSkill(result.control);
-					player.popup(result.control);
-					game.log(player,'失去了技能','#g【'+get.translation(result.control)+'】');
+					player.removeSkills(result.control);
 				},
 				ai:{
 					expose:0.1,
@@ -2391,9 +2388,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 					});
 					'step 1'
 					if(result.control!='cancel2'){
-						player.removeSkill(result.control);
-						player.popup(result.control);
-						game.log(player,'失去了技能','#g【'+get.translation(result.control)+'】');
+						player.removeSkills(result.control);
 					}
 					else{
 						player.loseHp();

character/collab.js

@@ -44,6 +44,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 				collab_remake:['dc_caocao','dc_liubei','dc_sunquan','nezha','dc_sunce','dc_zhaoyun'],
 			},
 		},
+		/** @type { importCharacterConfig['skill'] } */
 		skill:{
 			//新InitFilter测试高达一号
 			//打赢复活赛的牢达[哭]
@@ -52,7 +53,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 				enable:['chooseToUse','chooseToRespond'],
 				prompt:'将♦牌当做火【杀】，♥牌当做【桃】，♣牌当做【闪】，♠牌当做【无懈可击】使用或打出',
 				viewAs(cards,player){
-					var name=false;
+					var name;
 					var nature=null;
 					switch(get.suit(cards[0],player)){
 						case 'club':name='shan';break;
@@ -617,7 +618,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 						player.addMark('dcbianzhuang',1,false);
 						if(player.countMark('dcbianzhuang')>2){
 							player.storage.dcbianzhuang_inited=true;
-							player.reinit('zhutiexiong','wu_zhutiexiong');
+							player.reinitCharacter('zhutiexiong','wu_zhutiexiong');
 						}
 					}
 				},

character/ddd.js

@@ -25,7 +25,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 			ddd_liuhong:['male','qun',4,['dddshixing','ddddanggu','dddfuzong'],['zhu']],
 			ddd_xiahouxuan:['male','wei',3,['dddlanghuai','dddxuanlun']],
 			ddd_zhangkai:['male','qun','3/4',['dddjiexing','dddbailei']],
-			ddd_liangxi:['male','wei',3,['dddtongyu']],
+			ddd_liangxi:['male','wei',4,['dddtongyu']],
 			ddd_wangkanglvkai:['male','shu',4,['dddbingjian']],
 			// ddd_sunliang:['male','wu',3,['ddddiedang','dddanliu','dddguiying'],['zhu']],
 			ddd_lie:['female','wu',3,['dddyeshen','dddqiaoduan']],
@@ -2812,8 +2812,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 								});
 							}
 							else{
-								game.log(player,'失去了技能','#g【齐策】');
-								player.removeSkill('dddqice');
+								player.removeSkills('dddqice');
 								event.finish();
 							}
 							'step 1'
@@ -3165,8 +3164,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 					else{
 						if(!targets.includes(player)) player.loseMaxHp();
 						if(targets.length==1){
-							player.removeSkill('dddxiaheng');
-							game.log(player,'失去了技能','#g【侠横】');
+							player.removeSkills('dddxiaheng');
 						}
 					}
 					'step 5'
@@ -3272,8 +3270,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 					}).setContent('gaincardMultiple');
 					if(!lose) event.finish();
 					'step 5'
-					player.removeSkill('dddfengzheng');
-					game.log(player,'失去了技能','#g【丰政】');
+					player.removeSkills('dddfengzheng');
 				},
 				subSkill:{
 					global:{
@@ -4435,8 +4432,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 						// 	return event.source&&event.source.isIn()&&event.source.getEquips(1).length>0;
 						// },
 						content(){
-							player.removeSkill('dddxiaoxing');
-							game.log(player,'失去了技能','#g【枭行】');
+							player.removeSkills('dddxiaoxing');
 						},
 						content_old(){
 							'step 0'
@@ -4448,8 +4444,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 							if(result.bool){
 								trigger.source.logSkill('dddxiaoxing',player);
 								trigger.source.disableEquip(1);
-								player.removeSkill('dddxiaoxing');
-								game.log(player,'失去了技能','#g【枭行】');
+								player.removeSkills('dddxiaoxing');
 							}
 						}
 					}
@@ -4541,8 +4536,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 						player.gain(cards,'log');
 					}
 					'step 5'
-					player.removeSkill('dddlangzhi');
-					game.log(player,'失去了技能','#g【狼志】');
+					player.removeSkills('dddlangzhi');
 					event.finish();
 					'step 6'
 					game.broadcastAll('closeDialog',event.videoId);
@@ -4572,7 +4566,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 					const skills=player.getStockSkills(true,true).filter(skill=>{
 						return !player.hasSkill(skill,null,false,false);
 					});
-					return skills.length;
+					return skills.length>0;
 				},
 				filter_old(event,player){
 					var evt=event.getParent();
@@ -4610,7 +4604,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 					else event.finish();
 					'step 2'
 					var skill=result.control;
-					player.addSkillLog(skill);
+					player.addSkills(skill);
 				},
 				content_old(){
 					'step 0'
@@ -4648,14 +4642,11 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 							player.draw(3);
 						}
 						else event.finish();
-						for(var i of skills){
-							player.addSkillLog(i);
-						}
+						player.addSkills(skills);
 					}
 					else event.finish();
 					'step 2'
-					player.removeSkill('dddfuyi');
-					game.log(player,'失去了技能','#g【附义】');
+					player.removeSkills('dddfuyi');
 				},
 				subSkill:{
 					sha:{
@@ -4677,7 +4668,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 				audio:2,
 				trigger:{global:'phaseUseBegin'},
 				filter(event,player){
-					return player.countCards('h')&&event.player!=player;
+					return player.countCards('h')>0&&event.player!=player;
 				},
 				direct:true,
 				content(){
@@ -4791,7 +4782,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 				audio:2,
 				trigger:{player:'useCardAfter'},
 				filter(event,player){
-					return event.cards.filterInD('od').length&&get.color(event.card)=='red';
+					return event.cards.filterInD('od').length>0&&get.color(event.card)=='red';
 				},
 				content(){
 					'step 0'
@@ -5290,8 +5281,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 					else event.finish();
 					'step 3'
 					if(target.isIn()){event.finish(); return};
-					player.removeSkill('dddbailei');
-					game.log(player,'失去了技能','#g【拜泪】');
+					player.removeSkills('dddbailei');
 				},
 				subSkill:{
 					animate:{