1.9.10.6

character/diy.js

@@ -839,15 +839,20 @@ character.diy={
 			}
 		},
 		luweiyan:{
-			enable:'chooseToUse',
+			enable:'phaseUse',
-			filterCard:{type:'equip'},
+			usable:1,
+			filterCard:function(card){
+				return get.type(card)!='basic';
+			},
 			position:'he',
 			filter:function(event,player){
-				return player.num('he',{type:'equip'})>0;
+				return player.num('he',function(card){
+					return get.type(card)!='basic';
+				})>0;
 			},
 			viewAs:{name:'shuiyanqijun'},
-			prompt:'将一张装备牌当水淹七军使用',
+			prompt:'将一张非基本牌当水淹七军使用',
-			check:function(card){return 8-ai.get.equipValue(card)},
+			check:function(card){return 8-ai.get.value(card)},
 			group:'luweiyan2'
 		},
 		luweiyan2:{
@@ -1365,7 +1370,7 @@ character.diy={
 		diyqiangxi_info:'出牌阶段，你可以自减一点体力或弃一张武器牌，然后你对你攻击范围内的一名角色造成一点伤害并弃置其一张牌，每回合限一次。',
 		diyduanliang_info:'出牌阶段限一次，你可以将一张黑色的基本牌当兵粮寸断对一名角色使用，然后摸一张牌。你的兵粮寸断可以指定距离2以内的角色作为目标',
 		guihan_info:'限定技，当你进入濒死状态时，可以指定一名男性角色与其各回复一点体力并摸两张牌',
-		luweiyan_info:'你可以将一张装备牌当作水攻使用；结算后你可以视为对其中一个目标使用一张不计入出杀次数的杀',
+		luweiyan_info:'出牌阶段限一次，你可以将一张非基本牌当作水攻使用；结算后你可以视为对其中一个目标使用一张不计入出杀次数的杀',
 		xiongzi_info:'锁定技，你于摸牌阶段额外摸X+1张牌，X为你装备区牌数的一半，向下取整',
 		honglian_info:'每当你受到来自其他角色的伤害，可以弃置伤害来源的所有红色牌',
 		jieyan_info:'出牌阶段限一次，你可以弃置一张红色手牌令场上所有角色受到一点火焰伤害',

character/extra.js

@@ -926,7 +926,9 @@ character.extra={
 		longhun1:{
 			audio:true,
 			enable:['chooseToUse','chooseToRespond'],
-			prompt:'将一张红桃牌当桃使用',
+			prompt:function(){
+				return '将'+get.cnNumber(Math.max(1,_status.event.player.hp))+'张红桃牌当作桃使用';
+			},
 			position:'he',
 			check:function(card,event){
 				if(_status.event.player.hp>1) return 0;
@@ -936,6 +938,9 @@ character.extra={
 				return Math.max(1,_status.event.player.hp);
 			},
 			viewAs:{name:'tao'},
+			filter:function(event,player){
+				return player.num('he',{suit:'heart'})>=player.hp;
+			},
 			filterCard:function(card){
 				return get.suit(card)=='heart';
 			}
@@ -943,7 +948,9 @@ character.extra={
 		longhun2:{
 			audio:true,
 			enable:['chooseToUse','chooseToRespond'],
-			prompt:'将一张方片牌当火杀使用或打出',
+			prompt:function(){
+				return '将'+get.cnNumber(Math.max(1,_status.event.player.hp))+'张方片当作火杀使用或打出';
+			},
 			position:'he',
 			check:function(card,event){
 				if(_status.event.player.hp>1) return 0;
@@ -953,6 +960,9 @@ character.extra={
 				return Math.max(1,_status.event.player.hp);
 			},
 			viewAs:{name:'sha',nature:'fire'},
+			filter:function(event,player){
+				return player.num('he',{suit:'diamond'})>=player.hp;
+			},
 			filterCard:function(card){
 				return get.suit(card)=='diamond';
 			}
@@ -960,7 +970,9 @@ character.extra={
 		longhun3:{
 			audio:true,
 			enable:['chooseToUse','chooseToRespond'],
-			prompt:'将一张黑桃牌当无懈可击使用',
+			prompt:function(){
+				return '将'+get.cnNumber(Math.max(1,_status.event.player.hp))+'张黑桃牌当作无懈可击使用';
+			},
 			position:'he',
 			check:function(card,event){
 				if(_status.event.player.hp>1) return 0;
@@ -980,7 +992,9 @@ character.extra={
 		longhun4:{
 			audio:true,
 			enable:['chooseToUse','chooseToRespond'],
-			prompt:'将一张梅花牌当闪打出',
+			prompt:function(){
+				return '将'+get.cnNumber(Math.max(1,_status.event.player.hp))+'张梅花牌当作闪打出';
+			},
 			position:'he',
 			check:function(card,event){
 				if(_status.event.player.hp>1) return 0;

character/gwent.js

@@ -9,13 +9,14 @@ character.gwent={
 		gw_falanxisika:['female','wu',3,['shewu']],
 		gw_haluo:['male','qun',4,['nuhou']],
 
-		// gw_gaier:['male','shu',3,['hunmo']],
+		gw_airuiting:['male','wei',4,['kuanglie']],
-		// gw_dagong:['male','qun',3,[]],
+
+		// gw_gaier:['male','shu',3,['gwyinhua']],
+		// gw_dagong:['male','qun',4,[]],
+		// gw_bulanwang:['male','qun',3,[]],
 		// gw_kuite:['male','qun',3,[]],
-		// gw_airuiting:['male','qun',3,[]],
 		// gw_fuertaisite:['male','qun',3,[]],
 		// gw_hengsaite:['male','qun',3,[]],
-		// gw_bulanwang:['male','qun',3,[]],
 		// gw_fulisi:['male','qun',3,[]],
 		// gw_laduoweide:['male','qun',3,[]],
 
@@ -40,6 +41,24 @@ character.gwent={
 		gw_yioufeisi:'国王还是乞丐，两者有何区别，人类少一个是一个',
 	},
 	skill:{
+		kuanglie:{
+			trigger:{player:'useCardToBegin'},
+			filter:function(event,player){
+				return event.target!=player&&event.target.num('he')&&get.color(event.card)=='black';
+			},
+			init:function(player){
+				player.storage.kuanglie=0;
+			},
+			forced:true,
+			content:function(){
+				trigger.target.randomDiscard();
+				player.storage.kuanglie++;
+				if(player.storage.kuanglie%2==0){
+					player.draw();
+				}
+			}
+		},
+		kuanglie2:{},
 		gwjiquan:{
 			enable:'phaseUse',
 			usable:1,
@@ -658,6 +677,8 @@ character.gwent={
 		gw_luoqi:'罗契',
 		gw_yioufeisi:'伊欧菲斯',
 
+		kuanglie:'狂猎',
+		kuanglie_info:'锁定技，当一名其他角色成为你的黑色牌的目标后，该角色随机弃置一张牌；每当你发动两次“狂猎”，你摸一张牌',
 		gwjiquan:'集权',
 		gwjiquan_info:'出牌阶段限一次，你可以从任意名角色处各获得一张牌，每拿一张牌，被拿牌的角色视为对你使用一张杀',
 		nuhou:'怒吼',

character/rank.js

@@ -53,6 +53,7 @@ window.characterRank={
         'hs_tyrande',
     ],
     a:[
+        'gw_airuiting',
         'gw_huoge',
         'gw_xili',
         'gw_yenaifa',
@@ -240,6 +241,7 @@ window.characterRank={
     ],
     bp:[
         'zoushi',
+        'diy_lukang',
         'yxs_meixi',
         'yxs_lanlinwang',
         'jianyong',
@@ -402,7 +404,6 @@ window.characterRank={
         're_xuzhu',
         're_simayi',
         'yxs_mingchenghuanghou',
-        'diy_lukang',
         'diy_tianyu',
         'old_zhuran',
         'old_lingtong',

game/game.js

@@ -30271,13 +30271,16 @@
                 //         return ui.create.characterDialog2.apply(this,arguments);
                 //     }
                 // }
-				var filter,str,noclick,thisiscard,seperate,expandall;
+				var filter,str,noclick,thisiscard,seperate,expandall,onlypack;
 				for(var i=0;i<arguments.length;i++){
 					if(arguments[i]==='thisiscard'){
 						thisiscard=true;
 					}
                     else if(arguments[i]==='expandall'){
                         expandall=true;
+                    }
+					else if(typeof arguments[i]=='string'&&arguments[i].indexOf('onlypack:')==0){
+						onlypack=arguments[i].slice(9);
 					}
 					else if(typeof arguments[i]=='object'&&typeof arguments[i].seperate=='function'){
 						seperate=arguments[i].seperate;
@@ -30413,11 +30416,13 @@
 					else{
                         if(newlined2){
                             newlined2.style.display='none';
+							if(!packsource.onlypack){
 								packsource.classList.remove('thundertext');
 								if(!get.is.phoneLayout()||!lib.config.filternode_button){
 									packsource.innerHTML='武将包';
 								}
 							}
+                        }
                         if(this.classList.contains('thundertext')){
                             dialog.currentcapt2=null;
                             dialog.currentcaptnode2=null;
@@ -30626,9 +30631,17 @@
 						}
 						ui.create.node('br',filternode.firstChild);
 					}
+                    else{
+						if(onlypack){
+							packsource.onlypack=true;
+							packsource.innerHTML=get.translation(onlypack+'_character_config');
+							packsource.style.display='none';
+							packsource.previousSibling.style.display='none';
+						}
 						else{
 							packsource.innerHTML='武将包';
 						}
+					}
 
                     newlined2=document.createElement('div');
                     newlined2.style.marginTop='5px';
@@ -30645,6 +30658,7 @@
                     node.appendChild(newlined2);
 
                     packsource.addEventListener(lib.config.touchscreen?'touchend':'click',function(){
+						if(packsource.onlypack) return;
                         if(_status.dragged) return;
 						if(get.is.phoneLayout()&&lib.config.filternode_button&&filternode){
 							_status.filterCharacter=true;
@@ -30694,7 +30708,7 @@
                         span.link=packlist[i];
                         span.addEventListener(lib.config.touchscreen?'touchend':'click',clickCapt);
                         newlined2.appendChild(span);
-						if(filternode){
+						if(filternode&&!onlypack){
 							span.touchlink=ui.create.div(filternode.firstChild,clickCaptNode,'.menubutton.large',span.innerHTML);
 							span.touchlink.link=span;
 						}
@@ -34508,6 +34522,7 @@
 				}
 				for(var i=0;i<list.length;i++){
 					if(get.info(list[i]).nopop) continue;
+					if(!lib.translate[list[i]]||!lib.translate[list[i]+'_info']) continue;
 					var current=ui.create.div('.menubutton.large',skills,clickSkill,get.translation(list[i]));
 					current.link=list[i];
 					if(i==0){

game/update.js

@@ -1,5 +1,5 @@
 window.noname_update={
-    version:'1.9.10.5',
+    version:'1.9.10.6',
     update:'1.9.10.4',
     changeLog:[
         'bug修复',
@@ -13,10 +13,13 @@ window.noname_update={
         'card/swd.js',
         'character/rank.js',
         'character/gwent.js',
+        'character/swd.js',
+        'character/diy.js',
+        'character/extra.js',
         // 'mode/boss.js',
         // 'mode/chess.js',
         // 'mode/versus.js',
-        // 'mode/guozhan.js',
+        'mode/guozhan.js',
         // 'mode/identity.js',
         // 'mode/stone.js',
         // 'theme/simple/style.css',

mode/guozhan.js

@@ -208,7 +208,7 @@ mode.guozhan={
 			gz_huanggai:['male','wu',4,['kurou']],
 			gz_zhouyu:['male','wu',3,['yingzi','fanjian']],
 			gz_daqiao:['female','wu',3,['guose','liuli']],
-			gz_luxun:['male','wu',3,['qianxun','duoshi']],
+			gz_luxun:['male','wu',3,['gzqianxun','duoshi']],
 			gz_sunshangxiang:['female','wu',3,['jieyin','gzxiaoji']],
 			gz_sunjian:['male','wu',4,['gzyinghun']],
 			gz_xiaoqiao:['female','wu',3,['tianxiang','hongyan']],
@@ -1357,6 +1357,29 @@ mode.guozhan={
 				}
 			}
 		},
+		gzqianxun:{
+			audio:'qianxun',
+			trigger:{target:'useCardToBefore'},
+			forced:true,
+			priority:15,
+			check:function(event,player){
+				return ai.get.effect(event.target,event.card,event.player,player)<0;
+			},
+			filter:function(event,player){
+				return event.card.name=='shunshou'||event.card.name=='lebu';
+			},
+			content:function(){
+				trigger.untrigger();
+				trigger.finish();
+			},
+			ai:{
+				effect:{
+					target:function(card,player,target,current){
+						if(card.name=='shunshou'||card.name=='lebu') return 'zeroplayertarget';
+					},
+				}
+			}
+		},
 		gzkongcheng:{
 			audio:'kongcheng',
 			trigger:{target:'useCardToBefore'},
@@ -2377,7 +2400,7 @@ mode.guozhan={
 								if(get.is.jun(i)) return true;
 							}
 						}
-					},get.config('onlyguozhanexpand')?'expandall':undefined);
+					},get.config('onlyguozhanexpand')?'expandall':undefined,get.config('onlyguozhan')?'onlypack:mode_guozhan':undefined);
 					ui.create.cheat2=function(){
 						ui.cheat2=ui.create.control('自由选将',function(){
 							if(this.dialog==_status.event.dialog){
@@ -2779,6 +2802,8 @@ mode.guozhan={
 		gzduanchang_info:'锁定技，当你死亡时，你令杀死你的角色失去一张武将牌的所有技能',
 		gzweimu:'帷幕',
 		gzweimu_info:'锁定技，当你成为黑色锦囊牌的目标时，则取消之',
+		gzqianxun:'谦逊',
+		gzqianxun_info:'锁定技，当你成为顺手牵羊或乐不思蜀的目标时，则取消之',
 		gzkongcheng:'空城',
 		gzkongcheng_info:'锁定技，当你成为【杀】或【决斗】的目标时，若你没有手牌，则取消之',
 		gzxiaoji:'枭姬',