4

card/gwent.js

@@ -1676,9 +1676,160 @@ game.import('card',function(lib,game,ui,get,ai,_status){
 						player:1,
 					}
 				}
+			},
+			gw_kunenfayin:{
+				fullborder:'bronze',
+				type:'spell',
+				subtype:'spell_bronze',
+				enable:true,
+				filterTarget:function(card,player,target){
+					return !target.hasSkill('gw_kunenfayin');
+				},
+				content:function(){
+					target.addSkill('gw_kunenfayin');
+				},
+				ai:{
+					basic:{
+						order:2,
+						value:[5,1],
+						useful:[4,1],
+					},
+					result:{
+						target:function(player,target){
+							return get.threaten(target,player);
+						}
+					},
+				}
+			},
+			gw_yanziyaoshui:{
+				fullborder:'bronze',
+				type:'spell',
+				subtype:'spell_bronze',
+				enable:true,
+				filterTarget:true,
+				content:function(){
+					if(target.isMinHandcard()){
+						target.draw(2);
+					}
+					else{
+						target.draw();
+					}
+				},
+				ai:{
+					basic:{
+						order:6,
+						value:[6,1],
+						useful:[4,1],
+					},
+					result:{
+						target:function(player,target){
+							if(target.isMinHandcard()) return 2;
+							return 1;
+						}
+					},
+				}
+			},
+			gw_wenyi:{
+				fullborder:'bronze',
+				type:'spell',
+				subtype:'spell_bronze',
+				enable:true,
+				filterTarget:function(card,player,target){
+					return target.isMinHp();
+				},
+				selectTarget:-1,
+				content:function(){
+					target.randomDiscard();
+				},
+				ai:{
+					basic:{
+						order:6,
+						value:[6,1],
+						useful:[4,1],
+					},
+					result:{
+						target:-1
+					},
+					tag:{
+						multitarget:1,
+						multineg:1
+					}
+				}
+			},
+			gw_shanbengshu:{
+				fullborder:'bronze',
+				type:'spell',
+				subtype:'spell_bronze',
+				enable:function(event,player){
+					var list=player.getEnemies();
+					for(var i=0;i<list.length;i++){
+						if(list[i].countCards('e')){
+							return true;
+						}
+					}
+					return false;
+				},
+				filterTarget:function(card,player,target){
+					return target==player;
+				},
+				selectTarget:-1,
+				content:function(){
+					var list=target.getEnemies();
+					for(var i=0;i<list.length;i++){
+						if(!list[i].countCards('e')){
+							list.splice(i--,1);
+						}
+					}
+					var target=list.randomGet();
+					player.line(target);
+					target.randomDiscard('e',2);
+				},
+				ai:{
+					basic:{
+						order:9,
+						value:[6,1],
+						useful:[4,1],
+					},
+					result:{
+						target:1
+					},
+					tag:{
+						multitarget:1,
+						multineg:1
+					}
+				}
 			}
 		},
 		skill:{
+			gw_kunenfayin:{
+				mark:true,
+				intro:{
+					content:'不能成为其他角色的锦囊牌目标（剩余#回合）'
+				},
+				mod:{
+    				targetEnabled:function(card,player,target,now){
+    					if(player!=target){
+    						if(get.type(card,'trick')=='trick') return false;
+    					}
+    				}
+    			},
+				init:function(player){
+					player.storage.gw_kunenfayin=3;
+				},
+				trigger:{player:'phaseEnd'},
+				forced:true,
+				popup:false,
+				content:function(){
+					player.storage.gw_kunenfayin--;
+					if(player.storage.gw_kunenfayin>0){
+						player.updateMarks();
+					}
+					else{
+						player.removeSkill('gw_kunenfayin');
+					}
+				},
+				onremove:true
+			},
 			gw_baobaoshu:{
 				mark:true,
 				nopop:true,
@@ -2031,7 +2182,9 @@ game.import('card',function(lib,game,ui,get,ai,_status){
 			gw_yanziyaoshui:'燕子药水',
 			gw_yanziyaoshui_info:'令一名角色摸一张牌，若其手牌数为全场最少或之一，改为摸两张',
 			gw_shanbengshu:'山崩术',
-			gw_shanbengshu_info:'所有角色随机弃置一张牌',
+			gw_shanbengshu_info:'出牌阶段对自己使用，令一名随机敌方角色随机弃置两件装备',
+			gw_kunenfayin:'昆恩法印',
+			gw_kunenfayin_info:'出牌阶段对一名角色使用，目标不能成为其他角色的锦囊牌目标，持续3轮',
 		},
 		cardType:{
 			spell:0.5,

character/hearth.js

@@ -7778,7 +7778,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
     		ronghuo_info:'锁定技，你的普通杀均视为火杀',
     		luoshi:'落石',
     		luoshi_info:'锁定技，每当你受到一次伤害，你与伤害来源各随机弃置一张牌',
-    		moyao:'魔耀',
+    		moyao:'魔曜',
     		moyao_info:'锁定技，你不能成为其他角色的普通锦囊牌的目标',
     		jiaohui:'教诲',
     		jiaohui_info:'结束阶段，若你没有于本回合内造成伤害，你可以令一名角色摸一张牌或回复一点体力',

game/asset.js

@@ -55,22 +55,34 @@ window.noname_asset_list=[
     'image/card/gw_ansha.jpg',
     'image/card/gw_aozuzhilei.jpg',
     'image/card/gw_aerdeyin.jpg',
+    'image/card/gw_baishuang.jpg',
+    'image/card/gw_baobaoshu.jpg',
     'image/card/gw_baoxueyaoshui.jpg',
     'image/card/gw_birinongwu.jpg',
     'image/card/gw_butianshu.jpg',
+    'image/card/gw_chongci.jpg',
     'image/card/gw_ciguhanshuang.jpg',
     'image/card/gw_dieyi.png',
     'image/card/gw_dudayuanshuai1.jpg',
     'image/card/gw_dudayuanshuai2.jpg',
     'image/card/gw_fuyuan.jpg',
+    'image/card/gw_ganhan.jpg',
+    'image/card/gw_guaiwuchaoxue.jpg',
+    'image/card/gw_huangjiashenpan.jpg',
     'image/card/gw_hudiewu.jpg',
+    'image/card/gw_kunenfayin.jpg',
     'image/card/gw_leizhoushu.jpg',
     'image/card/gw_niuquzhijing.jpg',
+    'image/card/gw_nuhaifengbao.jpg',
     'image/card/gw_poxiao.jpg',
     'image/card/gw_qinpendayu.jpg',
+    'image/card/gw_shanbengshu.jpg',
     'image/card/gw_shizizhaohuan.jpg',
     'image/card/gw_tongdi.jpg',
+    'image/card/gw_tunshi.jpg',
+    'image/card/gw_wenyi.jpg',
     'image/card/gw_xinsheng.jpg',
+    'image/card/gw_yanziyaoshui.jpg',
     'image/card/gw_yigeniyin.jpg',
     'image/card/gw_youer.jpg',
     'image/card/gw_zhihuanjun.jpg',

game/game.js

@@ -15055,7 +15055,7 @@
 						if(typeof arguments[i]=='number'){
 							num=arguments[i];
 						}
-						else if(get.itemtype(arguments[i])=='select'){
+						else if(get.itemtype(arguments[i])=='position'){
 							position=arguments[i];
 						}
 						else if(typeof arguments[i]=='boolean'){