diy

card/extra.js

@@ -62,9 +62,11 @@ card.extra={
 						if(player.num('h','sha')>1){
 							if(player.num('e','zhuge')) return 0;
 							if(player.skills.contains('paoxiao')) return 0;
-							if(player.skills.contains('tanlnin3')) return 0;
-							if(player.skills.contains('zhaxiang2')) return 0;
 							if(player.skills.contains('fengnu')) return 0;
+							if(!player.getStat().card.sha){
+								if(player.skills.contains('tanlnin3')) return 0;
+								if(player.skills.contains('zhaxiang2')) return 0;
+							}
 						}
 						if(shas.length){
 							for(var i=0;i<shas.length;i++){
@@ -77,7 +79,8 @@ card.extra={
 							var card=target.get('h','sha',0);
 							for(var i=0;i<game.players.length;i++){
 								if(ai.get.attitude(target,game.players[i])<0&&
-									target.canUse(card,game.players[i],true,true)){
+									target.canUse(card,game.players[i],true,true)&&
+									!game.players[i].num('e','baiyin')){
 									if(ai.get.effect(game.players[i],card,target)>0) return 1;
 								}
 							}

card/standard.js

@@ -115,7 +115,12 @@ card.standard={
 				},
 				order:3,
 				result:{
-					target:-1.5,
+					target:function(player,target){
+						if(player.skills.contains('jiu')&&!target.num('e','baiyin')){
+							return -3;
+						}
+						return -1.5;
+					},
 				},
 				tag:{
 					respond:1,
@@ -212,7 +217,7 @@ card.standard={
 						if(nh<=target.hp){
 							keep=true;
 						}
-						else if(nh==target.hp+1&&target.hp>=3&&target.num('h','tao')<=1){
+						else if(nh==target.hp+1&&target.hp>=2&&target.num('h','tao')<=1){
 							keep=true;
 						}
 						if(target.hp>=2&&keep&&target.hasFriend()){
@@ -582,6 +587,12 @@ card.standard={
 							if(game.players[i].ai.shown==0) num++;
 						}
 						if(num>1) return 0;
+						var nh=target.num('h');
+						if(lib.config.mode=='identity'){
+							if(target.isZhu&&nh<=2&&target.hp<=1) return -100;
+						}
+						if(nh==0) return -2;
+						if(nh==1) return -1.7
 						return -1.5;
 					},
 				},
@@ -635,6 +646,12 @@ card.standard={
 							if(game.players[i].ai.shown==0) num++;
 						}
 						if(num>1) return 0;
+						var nh=target.num('h');
+						if(lib.config.mode=='identity'){
+							if(target.isZhu&&nh<=2&&target.hp<=1) return -100;
+						}
+						if(nh==0) return -2;
+						if(nh==1) return -1.7
 						return -1.5;
 					},
 				},
@@ -855,6 +872,13 @@ card.standard={
 				},
 				result:{
 					target:function(player,target){
+						var es=target.get('e');
+						var nh=target.num('h');
+						var noe=(es.length==0);
+						var noe2=(es.length==1&&es[0].name=='baiyin'&&target.hp<target.maxHp);
+						var noh=(nh==0||target.hasSkillTag('noh'));
+						if(noh&&noe) return 0;
+						if(noh&&noe2) return 0.01;
 						if(ai.get.attitude(player,target)<=0) return (target.num('he'))?-1.5:1.5;
 						var js=target.get('j');
 						if(js.length){
@@ -963,12 +987,12 @@ card.standard={
 				result:{
 					target:function(player,target){
 						var num=target.hp-target.num('h')-2;
-						if(num>-1) return -1;
+						if(num>-1) return -0.01;
 						if(target.hp<3) num--;
-						if(target.hp<2) num--;
-						if(target.hp<1) num--;
 						if(target.isTurnedOver()) num/=2;
-						return num;
+						var dist=get.distance(player,target,'absolute');
+						if(dist<1) dist=1;
+						return num/Math.sqrt(dist);
 					}
 				},
 				tag:{
@@ -1440,6 +1464,14 @@ card.standard={
 							if(typeof aiii=='number') return aiii;
 						}
 						if(Math.abs(ai.get.attitude(_status.event.player,trigger.player))<3) return 0;
+						if(trigger.player.skills.contains('guanxing')) return 0;
+						if(trigger.card.name!='lebu'&&trigger.card.name!='bingliang'){
+							if(trigger.player!=_status.event.player){
+								return 0;
+							}
+						}
+						var eff=ai.get.effect(trigger.player,trigger.card,trigger.player,player);
+						if(eff>=0) return 0;
 						return state*ai.get.attitude(_status.event.player,trigger.player);
 					},
 					source:trigger.player

card/swd.js

@@ -448,6 +448,12 @@ card.swd={
 							if(game.players[i].ai.shown==0) num++;
 						}
 						if(num>1) return 0;
+						var nh=target.num('h');
+						if(lib.config.mode=='identity'){
+							if(target.isZhu&&nh<=2&&target.hp<=1) return -100;
+						}
+						if(nh==0) return -2;
+						if(nh==1) return -1.7
 						return -1.5;
 					},
 				},
@@ -503,6 +509,12 @@ card.swd={
 							if(game.players[i].ai.shown==0) num++;
 						}
 						if(num>1) return 0;
+						var nh=target.num('h');
+						if(lib.config.mode=='identity'){
+							if(target.isZhu&&nh<=2&&target.hp<=1) return -100;
+						}
+						if(nh==0) return -2;
+						if(nh==1) return -1.7
 						return -1.5;
 					},
 				},

character/boss.js

@@ -51,6 +51,9 @@ character.boss={
 				trigger.untrigger();
 				trigger.finish();
 			},
+			ai:{
+				noh:true,
+			},
 			group:'boss_juejing2'
 		},
 		boss_juejing2:{
@@ -77,7 +80,7 @@ character.boss={
 				};
 				"step 1"
 				if(result.bool){
-					player.logSkill('diyleiji',result.targets,'thunder');
+					player.logSkill('boss_leiji',result.targets,'thunder');
 					event.target=result.targets[0];
 					event.target.judge(function(card){
 						// var suit=get.suit(card);
@@ -132,6 +135,7 @@ character.boss={
 			}
 		},
 		wuqin:{
+			audio:2,
 			trigger:{player:'phaseEnd'},
 			filter:function(event,player){
 				return player.num('h')==0;
@@ -141,9 +145,11 @@ character.boss={
 			}
 		},
 		boss_baolin:{
+			audio:true,
 			inherit:'juece',
 		},
 		boss_qiangzheng:{
+			audio:2,
 			trigger:{player:'phaseEnd'},
             forced:true,
 			unique:true,
@@ -171,6 +177,7 @@ character.boss={
             }
 		},
 		guizhen:{
+			audio:2,
 			trigger:{player:'loseEnd'},
 			frequent:true,
 			filter:function(event,player){
@@ -248,6 +255,7 @@ character.boss={
 			inherit:'guiji'
 		},
 		fengwu:{
+			audio:2,
 			unique:true,
 			enable:'phaseUse',
 			usable:1,
@@ -292,6 +300,7 @@ character.boss={
 			}
 		},
 		huanhua:{
+			audio:2,
 			trigger:{global:'gameDrawAfter'},
 			forced:true,
 			unique:true,
@@ -356,6 +365,7 @@ character.boss={
 			}
 		},
 		jidian:{
+			audio:2,
 			trigger:{source:'damageAfter'},
 			direct:true,
 			unique:true,
@@ -385,9 +395,11 @@ character.boss={
 			}
 		},
 		tinqin:{
+			audio:false,
 			inherit:'manjuan'
 		},
 		boss_hujia:{
+			audio:2,
 			trigger:{player:'phaseEnd'},
 			direct:true,
 			unique:true,
@@ -431,6 +443,7 @@ character.boss={
 			}
 		},
 		boss_guihan:{
+			audio:2,
 			unique:true,
 			enable:'chooseToUse',
 			mark:true,
@@ -565,6 +578,7 @@ character.boss={
 			}
 		},
 		boss_shengshou:{
+			audio:true,
 			trigger:{player:'useCard'},
 			frequent:true,
 			unique:true,
@@ -583,6 +597,7 @@ character.boss={
 			},
 		},
 		boss_honglian:{
+			audio:2,
 			trigger:{player:'phaseEnd'},
 			forced:true,
 			unique:true,
@@ -612,9 +627,11 @@ character.boss={
 			}
 		},
 		boss_tianyu:{
+			audio:true,
 			inherit:'suoling'
 		},
 		boss_jizhi:{
+			audio:2,
 			trigger:{player:'useCard'},
 			frequent:true,
 			unique:true,
@@ -686,6 +703,7 @@ character.boss={
 			}
 		},
 		tashui:{
+			audio:2,
 			trigger:{player:['useCard','respondAfter']},
 			direct:true,
 			unique:true,
@@ -721,6 +739,7 @@ character.boss={
 			trigger:{player:['loseEnd','changeHp']},
 			forced:true,
 			unique:true,
+			audio:2,
 			filter:function(event,player){
 				return player.num('h')<4;
 			},
@@ -739,7 +758,8 @@ character.boss={
 							return [0,1];
 						}
 					}
-				}
+				},
+				noh:true,
 			}
 		},
 		shangshix2:{
@@ -762,9 +782,11 @@ character.boss={
 		},
 		wuxin:{
 			inherit:'miles_xueyi',
-			group:'swd_wuxie'
+			group:'swd_wuxie',
+			audio:2,
 		},
 		shenwei:{
+			audio:2,
 			unique:true,
 			trigger:{player:'phaseDrawBegin'},
 			forced:true,
@@ -791,6 +813,7 @@ character.boss={
 			trigger:{player:'changeHp'},
 			forced:true,
 			priority:100,
+			audio:2,
 			filter:function(event,player){
 				return player.hp<=4
 			},

character/diy.js

@@ -659,10 +659,10 @@ character.diy={
 	translate:{
 		diy_caocao:'曹操',
 		diy_menghuo:'孟获',
-		diy_huangzhong:'黄忠',
-		diy_xuhuang:'徐晃',
-		diy_dianwei:'典韦',
-		diy_weiyan:'魏延',
+		diy_huangzhong:'黄汉升',
+		diy_xuhuang:'徐公明',
+		diy_dianwei:'新典韦',
+		diy_weiyan:'魏文长',
 		xicai:'惜才',
 		diyjianxiong:'奸雄',
 		diy_feishi:'费诗',
@@ -675,7 +675,7 @@ character.diy={
 		diy_zhouyu:'周公瑾',
 		diy_lukang:'陆抗',
 		diy_caiwenji:'蔡昭姬',
-		diy_zhenji:'甄姬',
+		diy_zhenji:'甄宓',
 		siji:'伺机',
 		ciqiu:'刺酋',
 		ciqiu2:'刺酋',

character/extra.js

@@ -170,13 +170,11 @@ character.extra={
 					},
 					player:function(card,player){
 						if(_status.currentPhase!=player) return;
-						if(card.name=='wuzhong'||card.name=='yiyi'||
-							card.name=='yuanjiao'||card.name=='shunshou') return;
+						if(get.type(card)=='basic'||get.type(card,'trick')=='trick') return;
 						if(player.hp<=2) return;
 						if(!player.skills.contains('jilue')||player.storage.renjie==0){
 							return [0,0,0,0];
 						}
-
 					}
 				}
 			}

character/gujian.js

@@ -924,6 +924,7 @@ character.gujian={
 				content:'time'
 			},
 			ai:{
+				noh:true,
 				threaten:0.8,
 				effect:{
 					target:function(card,player,target){

character/jiange.js

@@ -456,6 +456,7 @@ character.jiange={
             }
         },
         qiwu:{
+            audio:true,
             trigger:{player:'useCard'},
             forced:true,
             filter:function(event,player){

character/mountain.js

@@ -806,7 +806,7 @@ character.mountain={
 			}
 		},
 		beige:{
-			audio:6,
+			audio:4,
 			trigger:{global:'damageEnd'},
 			filter:function(event,player){
 				return (event.card&&event.card.name=='sha'&&event.source&&

character/refresh.js

@@ -32,7 +32,7 @@ character.refresh={
 			},
 			content:function(){
 				'step 0'
-				trigger.player.chooseTarget(function(card,player,target){
+				trigger.player.chooseTarget(function(card,playerx,target){
 					return player.canUse({name:'juedou'},target)&&target!=trigger.player;
 				},'是否发动【利奴】？').ai=function(target){
 					return ai.get.effect(target,{name:'juedou'},player,trigger.player)-2;
@@ -487,7 +487,8 @@ character.refresh={
 					target:function(card){
 						if(card.name=='guohe'||card.name=='liuxinghuoyu') return 0.5;
 					}
-				}
+				},
+				noh:true,
 			}
 		},
 		retishen:{
@@ -1227,28 +1228,28 @@ character.refresh={
 		}
 	},
 	translate:{
-		re_zhangliao:'张辽',
-		re_huangyueying:'黄月英',
-		re_simayi:'司马懿',
-		re_xuzhu:'许褚',
-		re_xiahoudun:'夏侯惇',
-		re_lvmeng:'吕蒙',
-		re_zhouyu:'周瑜',
-		re_luxun:'陆逊',
-		re_zhaoyun:'赵云',
-		re_guanyu:'关羽',
-		re_zhangfei:'张飞',
-		re_machao:'马超',
-		re_caocao:'曹操',
-		re_guojia:'郭嘉',
-		re_lvbu:'吕布',
-		re_xushu:'徐庶',
-		re_huanggai:'黄盖',
-		re_gongsunzan:'公孙瓒',
-		re_daqiao:'大乔',
-		re_ganning:'甘宁',
-		re_huatuo:'华佗',
-		re_lidian:'李典',
+		re_zhangliao:'界张辽',
+		re_huangyueying:'新黄月英',
+		re_simayi:'界司马懿',
+		re_xuzhu:'界许褚',
+		re_xiahoudun:'界夏侯惇',
+		re_lvmeng:'界吕蒙',
+		re_zhouyu:'界周瑜',
+		re_luxun:'界陆逊',
+		re_zhaoyun:'界赵云',
+		re_guanyu:'界关羽',
+		re_zhangfei:'界张飞',
+		re_machao:'界马超',
+		re_caocao:'界曹操',
+		re_guojia:'界郭嘉',
+		re_lvbu:'界吕布',
+		re_xushu:'界徐庶',
+		re_huanggai:'界黄盖',
+		re_gongsunzan:'界公孙瓒',
+		re_daqiao:'界大乔',
+		re_ganning:'界甘宁',
+		re_huatuo:'界华佗',
+		re_lidian:'界李典',
 		qinxue:'勤学',
 		retuxi:'突袭·新',
 		reluoyi:'裸衣·新',

character/sp.js

@@ -895,7 +895,7 @@ character.sp={
 					next.ai=function(card){
 						return maxval-ai.get.value(card);
 					};
-					next.logSkill='manjuan';
+					next.logSkill=event.name;
 					event.cards=cards;
 				}
 				"step 2"
@@ -3308,12 +3308,12 @@ character.sp={
 	translate:{
 		chenlin:'陈琳',
 		yuanshu:'袁术',
-		re_yuanshu:'袁术',
+		re_yuanshu:'新袁术',
 		gongsunzan:'公孙瓒',
-		sp_diaochan:'貂蝉',
+		sp_diaochan:'sp貂蝉',
 		yangxiu:'杨修',
-		sp_zhaoyun:'赵云',
-		jsp_zhaoyun:'赵云',
+		sp_zhaoyun:'sp赵云',
+		jsp_zhaoyun:'界sp赵云',
 		caohong:'曹洪',
 		liuxie:'刘协',
 		xiahouba:'夏侯霸',
@@ -3328,10 +3328,10 @@ character.sp={
 		tianfeng:'田丰',
 		sp_pangtong:'庞统',
 		maliang:'马良',
-		sp_caoren:'曹仁',
+		sp_caoren:'sp曹仁',
 		yuejin:'乐进',
 		mifuren:'糜夫人',
-		sp_dongzhuo:'董卓',
+		sp_dongzhuo:'sp董卓',
 		chendong:'陈武董袭',
 		jiangfei:'蒋琬费祎',
 		jiangqing:'蒋钦',
@@ -3344,7 +3344,7 @@ character.sp={
 		sp_pangde:'庞德',
 		sp_sunshangxiang:'孙尚香',
 		zhugedan:'诸葛诞',
-		sp_machao:'马超',
+		sp_machao:'sp马超',
 		sp_jiangwei:'姜维',
 		zhangbao:'张宝',
 		yangxiou:'杨修',
@@ -3353,7 +3353,7 @@ character.sp={
 		zhanglu:'张鲁',
 		wutugu:'兀突骨',
 		mateng:'马腾',
-		sp_caiwenji:'蔡文姬',
+		sp_caiwenji:'sp蔡文姬',
 		zhugeguo:'诸葛果',
 
 		yuhua:'羽化',

character/standard.js

@@ -806,6 +806,12 @@ character.standard={
 			},
 			content:function(){}
 		},
+		test:{
+			subSkills:{
+				t1:{},
+				t2:{}
+			}
+		},
 		longdan:{
 			group:['longdan1','longdan2']
 		},
@@ -1194,6 +1200,12 @@ character.standard={
 					target:function(card){
 						if(card.name=='guohe'||card.name=='liuxinghuoyu') return 0.5;
 					}
+				},
+				noh:true,
+				skillTagFilter:function(player,tag){
+					if(tag=='noh'){
+						if(player.num('h')!=1) return false;
+					}
 				}
 			}
 		},

character/swd.js

@@ -726,7 +726,7 @@ character.swd={
 				}
 				"step 1"
 				if(result.bool){
-					trigger.player.chooseToDiscard({type:'basic'},'入梦：弃置一张基本牌或路过出牌及弃牌阶段').ai=function(card){
+					trigger.player.chooseToDiscard({type:'basic'},'入梦：弃置一张基本牌或跳过出牌及弃牌阶段').ai=function(card){
 						return 5-ai.get.value(card);
 					}
 				}
@@ -2586,6 +2586,7 @@ character.swd={
 			}
 		},
 		lianji:{
+			audio:true,
 			enable:'phaseUse',
 			usable:1,
 			filterTarget:function(card,player,target){
@@ -3063,6 +3064,7 @@ character.swd={
 			}
 		},
 		tiandao:{
+			audio:true,
 			trigger:{global:'judge'},
 			direct:true,
 			filter:function(event,player){
@@ -6459,6 +6461,7 @@ character.swd={
 			}
 		},
 		swd_xiuluo:{
+			audio:2,
 			trigger:{player:'phaseBegin'},
 			direct:true,
 			filter:function(event,player){
@@ -7568,6 +7571,7 @@ character.swd={
 			}
 		},
 		mazui:{
+			audio:true,
 			enable:'phaseUse',
 			usable:1,
 			filterCard:{color:'black'},

character/woods.js

@@ -216,6 +216,7 @@ character.woods={
 					target:function(card,player,target){
 						if(get.tag(card,'damage')){
 							if(player.skills.contains('jueqing')) return [1,-2];
+							if(target.hp<=1) return;
 							var hastarget=false;
 							var hasfriend=false;
 							var turnfriend=false;
@@ -607,7 +608,7 @@ character.woods={
 			global:'baonue2'
 		},
 		baonue2:{
-			audio:4,
+			audio:2,
 			forceaudio:true,
 			trigger:{source:'damageEnd'},
 			filter:function(event,player){
@@ -671,6 +672,9 @@ character.woods={
 				order:1,
 				result:{
 					player:function(player){
+						if(lib.config.mode=='identity'&&game.zhu.isZhu&&player.identity=='fan'){
+							if(game.zhu.hp==1&&game.zhu.num('h')<=2) return 1;
+						}
 						var num=0;
 						for(var i=0;i<game.players.length;i++){
 							var att=ai.get.attitude(player,game.players[i]);

character/yijiang.js

@@ -1010,13 +1010,19 @@ character.yijiang={
 				}
 				'step 4'
 				if(result&&result.cards){
+					event.card=result.cards[0];
 					event.current.lose(result.cards,ui.special);
+					event.current.$throw(ui.create.card(),1000);
+				}
+				else{
+					event.card=null;
 				}
 				'step 5'
 				if(event.current==game.me) game.delay(0.5);
 				'step 6'
-				if(result&&result.cards){
-					ui.cardPile.insertBefore(result.cards[0],ui.cardPile.firstChild);
+				if(event.card){
+					event.card.fix();
+					ui.cardPile.insertBefore(event.card,ui.cardPile.firstChild);
 				}
 				event.goto(2);
 			}
@@ -3824,7 +3830,7 @@ character.yijiang={
 			trigger:{source:'damageBefore'},
 			forced:true,
 			audio:2,
-			priority:10,
+			priority:16,
 			check:function(){return false;},
 			content:function(){
 				trigger.untrigger();
@@ -3848,6 +3854,14 @@ character.yijiang={
 			content:function(){
 				player.draw(Math.min(3,player.maxHp-player.hp)-player.num('h'));
 			},
+			ai:{
+				noh:true,
+				skillTagFilter:function(player,tag){
+					if(tag=='noh'&&player.maxHp-player.hp<player.num('h')){
+						return false;
+					}
+				}
+			}
 		},
 		luoying:{
 			unique:true,
@@ -3906,7 +3920,9 @@ character.yijiang={
 			enable:'chooseToUse',
 			filter:function(event,player){
 				if(player.classList.contains('turnedover')) return false;
-				if(event.parent.name=='phaseUse') return true;
+				if(event.parent.name=='phaseUse'){
+					return lib.filter.filterCard({name:'jiu'},player,event);
+				}
 				if(event.type!='dying') return false;
 				if(player!=_status.dying) return false;
 				if(player.storage.niepan) return false;
@@ -4897,7 +4913,7 @@ character.yijiang={
 			content:function(){
 				"step 0"
 				player.chooseTarget('是否发动陷嗣？',[1,2],function(card,player,target){
-					return target.num('he')>0&&player!=target;
+					return target.num('he')>0;
 				},
 					function(target){
 					return -ai.get.attitude(_status.event.player,target);

character/zhuogui.js

@@ -218,6 +218,7 @@ character.zhuogui={
             }
         },
         qiangzheng:{
+            audio:2,
             trigger:{player:'phaseEnd'},
             direct:true,
             forced:true,

game/background.js

@@ -56,6 +56,7 @@
         }
     }
     window.resetGameTimeout=setTimeout(function(){
+        if(window.inSplash) return;
         if(confirm('游戏似乎未正常载入，是否重置游戏？')){
             localStorage.clear();
             window.location.reload();

game/config.js

@@ -210,6 +210,9 @@ window.config={
 	glow_phase:'yellow',
 
 	skin:{},
+	hiddenModePack:[],
+	hiddenCharacterPack:[],
+	hiddenCardPack:[],
 
 	theme:'woodden',
 	layout:'mobile',
@@ -262,6 +265,8 @@ window.config={
 	bannedcards:[],
 	bannedpile:{},
 	addedpile:{},
+	customCharacterPack:{},
+	customCardPack:{},
 
 	mode:'identity',
 	mode_config:{