新卡

CHANGELOG.MD

@@ -2,3 +2,5 @@
 火攻bug
 铁索结算问题
 酒杀AI
+新卡
+牌堆修正

card/extra.js

@@ -513,7 +513,7 @@ card.extra={
 		["club",1,"baiyin"],
 		["spade",2,"tengjia",'fire'],
 		["club",2,"tengjia",'fire'],
-		["spade",2,"guding"],
+		["spade",1,"guding"],
 		["diamond",2,"zhuque",'fire'],
 
 		["heart",2,"huogong","fire"],

card/hearth.js

@@ -2,16 +2,150 @@
 card.hearth={
 	card:{
 		shenenshu:{
-
-        }
+			enable:true,
+			usable:1,
+			filterTarget:function(card,player,target){
+				return target!=player;
+			},
+			type:'trick',
+			content:function(){
+				var num=player.num('h')-target.num('h');
+				if(num<1) num=1;
+				if(num>5) num=5;
+				target.draw(num);
+			},
+			ai:{
+				order:10,
+				value:7,
+				useful:2,
+				result:{
+					target:function(player,target){
+						var nh=player.num('h')-target.num('h');
+						if(!player.skills.contains('jizhi')){
+							nh--;
+						}
+						return Math.max(1,nh);
+					}
+				},
+				expose:0.2
+			}
+        },
+		zhiliaobo:{
+			enable:true,
+			usable:1,
+			filterTarget:function(card,player,target){
+				return target.hp<target.maxHp;
+			},
+			type:'trick',
+			content:function(){
+				'step 0'
+				target.recover();
+				'step 1'
+				if(target.hp<target.maxHp){
+					target.judge(function(card){
+						return get.color(card)=='red'?1:-1;
+					});
+				}
+				else{
+					event.finish();
+				}
+				'step 2'
+				if(result.bool){
+					target.recover();
+				}
+			},
+			ai:{
+				order:4,
+				value:[6,3],
+				useful:[6,3],
+				result:{
+					target:function(player,target){
+						var num=target.maxHp-target.hp;
+						if(num<1) return 0;
+						if(num==1) return 1;
+						if(target.hp==2) return 2.5;
+						return 2;
+					}
+				}
+			}
+		},
+		yuansuhuimie:{
+			type:'trick',
+			enable:true,
+			selectTarget:-1,
+			filterTarget:function(card,player,target){
+				return target.num('he')>0;
+			},
+			content:function(){
+				"step 0"
+				target.chooseToDiscard([1,2],'he').ai=function(card){
+					if(ai.get.damageEffect(target,player,target,'thunder')>=0) return 0;
+					if(target.hasSkillTag('maixie')&&target.hp>1&&ui.selected.cards.length){
+						return 0;
+					}
+					if(card.name=='tao') return 0;
+					if(target.hp==1&&card.name=='jiu') return 0;
+					if(get.type(card)!='basic'){
+						return 10-ai.get.value(card);
+					}
+					return 8-ai.get.value(card);
+				};
+				"step 1"
+				if(!result.bool||result.cards.length<2){
+					if(result.bool) target.damage(2-result.cards.length,'thunder');
+					else target.damage(2,'thunder');
+				}
+			},
+			ai:{
+				basic:{
+					order:7,
+					useful:[5,1]
+				},
+				result:{
+					target:function(player,target){
+						if(target.hasSkillTag('nothunder')) return 0;
+						var num=0;
+						for(var i=0;i<game.players.length;i++){
+							if(game.players[i].ai.shown==0) num++;
+						}
+						if(num>1) return 0;
+						var nh=target.num('he');
+						if(target==player) nh--;
+						if(nh==2) return -2.5;
+						if(nh==1) return -3;
+						return -2;
+					},
+				},
+				tag:{
+					respond:1,
+					respondSha:1,
+					damage:1,
+					natureDamage:1,
+					thunderDamage:1,
+					multitarget:1,
+					multineg:1,
+					discard:2,
+					loseCard:2,
+				}
+			}
+		}
 	},
 	skill:{
 
 	},
 	translate:{
-
+		shenenshu:'神恩术',
+		shenenshu_info:'对一名其他角色使用，令其摸X张牌，直到手牌数与你相等（X不小于1且不大于5）',
+		zhiliaobo:'治疗波',
+		zhiliaobo_info:'对一名受伤角色使用，令其回复一点体力，若其仍处于受伤状态，则进行一次判定，若结果为红色则再回复一点体力',
+		yuansuhuimie:'元素毁灭',
+		yuansuhuimie_info:'对所有有手牌的角色使用，令目标弃置1~2张牌，并受到2-X点雷电伤害，X为其弃置的手牌数',
 	},
 	list:[
-		
+		['heart',2,'shenenshu'],
+		['diamond',12,'shenenshu'],
+		['club',7,'zhiliaobo'],
+		['spade',1,'zhiliaobo'],
+		['spade',13,'yuansuhuimie'],
 	],
 }

card/swd.js

@@ -369,7 +369,7 @@ card.swd={
 		zhufangshenshi:{
 			fullskin:true,
 			chongzhu:true,
-			type:'trick',
+			type:'basic',
 			enable:function(){
 				return game.players.length>2;
 			},
@@ -1131,7 +1131,7 @@ card.swd={
 		xixueguizhihuan_info:'锁定技，每当你使用杀造成一点伤害，你回复一点体力',
 		xixue:'吸血',
 		xixue_info:'锁定技，每当你使用杀造成一点伤害，你回复一点体力',
-		zhufangshenshi:'土地神符',
+		zhufangshenshi:'祠符',
 		zhufangshenshi_info:'出牌阶段，对一名相邻角色使用，与其交换位置',
 		jingleishan:'惊雷闪',
 		jingleishan_info:'出牌阶段，对所有其他角色使用。每名目标角色需打出一张【杀】，否则受到1点雷电伤害。',
@@ -1158,7 +1158,7 @@ card.swd={
 		//['heart',3,'xiangyuye','poison'],
 
 		['club',4,'caoyao'],
-		//['heart',4,'zhufangshenshi'],
+		['spade',4,'zhufangshenshi'],
 		//['spade',4,'huanpodan'],
 //		['diamond',4,'xiangyuye','poison'],
 

card/yibao.js

@@ -248,6 +248,8 @@ card.yibao={
 					if(target.hasSkillTag('maixie')&&target.hp>1&&ui.selected.cards.length){
 						return 0;
 					}
+					if(card.name=='tao') return 0;
+					if(target.hp==1&&card.name=='jiu') return 0;
 					if(get.type(card)!='basic'){
 						return 10-ai.get.value(card);
 					}
@@ -268,6 +270,10 @@ card.yibao={
 				result:{
 					target:function(player,target){
 						if(target.hasSkillTag('nofire')) return 0;
+						var nh=target.num('he');
+						if(target==player) nh--;
+						if(nh==2) return -2.5;
+						if(nh==1) return -3;
 						return -2;
 					}
 				},

character/hearth.js

@@ -22,7 +22,7 @@ character.hearth={
 		hs_zhouzhuo:['male','qun',3,['jubao','qice'],['fullskin']],
 		hs_yngvar:['male','qun',3,['huanwu'],['fullskin']],
 		hs_bchillmaw:['male','wei',6,['hanshuang','bingshi'],['fullskin']],
-		hs_malorne:['male','wu',3,['shenen','chongsheng'],['fullskin']],
+		hs_malorne:['male','wu',3,['enze','chongsheng'],['fullskin']],
 
 		hs_ronghejuren:['male','shu',8,[],['fullskin']],
 		hs_wujiyuansu:['male','qun',3,['wujiwuji'],['fullskin']],
@@ -38,7 +38,7 @@ character.hearth={
 		hs_malfurion:['hs_malorne'],
 	},
 	skill:{
-		shenen:{
+		enze:{
 			enable:'phaseUse',
 			usable:1,
 			filterTarget:function(card,player,target){
@@ -733,7 +733,7 @@ character.hearth={
 				player.chooseCard('是否发动【变形】？',function(card){
 					if(card.name!=trigger.card.name){
 						return card.name=='caoyao'||card.name=='dujian'||card.name=='sha'||card.name=='jiu'||
-						card.name=='tianxianjiu'||card.name=='tao'||card.name=='xiangyuye';
+						card.name=='tianxianjiu'||card.name=='tao'||card.name=='xiangyuye'||card.name=='zhufangshenshi';
 					}
 					return false;
 				}).ai=function(card){
@@ -1636,9 +1636,10 @@ character.hearth={
 		hs_tgolem:'图腾魔像',
 		hs_totemic:'图腾师',
 
-		shenen:'神恩',
-		shenen_info:'出牌阶段限一次，你可以指定一名角色令其手牌数与你相等',
+		enze:'恩泽',
+		enze_info:'出牌阶段限一次，你可以指定一名角色令其手牌数与你相等',
 		chongsheng:'重生',
+		chongsheng_bg:'生',
 		chongsheng_info:'濒死阶段，你可弃置所有牌，将体力回复至3-X，并摸X张牌，X为你本局发动此技能的次数。每局最多发动3次',
 		s_tuteng:'滋养',
 		s_tuteng_info:'在你首个回合开始时，你获得三个随机图腾；在此后的每个回合开始阶段，你随机替换其中的一个图腾',

character/xswd.js

@@ -10,7 +10,7 @@ character.xswd={
 		swd_linming:['male','qun',3,['shelie','bifa']],
 		swd_philis:['male','qun',4,['yicong','wangxi']],
 		swd_pepin:['male','qun',4,['rejianxiong','quhu']],
-		swd_kangnalishi:['male','qun',1,['busi','xuying','yinguo']],
+		// swd_kangnalishi:['male','qun',1,['busi','xuying','yinguo']],
 			swd_xuanyuanjiantong:['male','qun',3,['chengjian','huanling'],['fullskin']],
 		// swd_huiyan:['male','qun',3,['wendao','xiaozhan','xunzhi']],
 

game/game.js

@@ -11745,11 +11745,14 @@
 			console.log(str);
 			str='杀'+sha+'； '+'黑杀'+heisha+'； '+'红杀'+hongsha+'； '+'闪'+shan+'； '+'桃'+tao+'； '+'酒'+jiu+'； '+'无懈'+wuxie
 			console.log(str);
-			str='';
 			for(var i=1;i<=13;i++){
-				str+=num[i]+' ';
+				if(i<10){
+					console.log(i+' ',num[i]);
+				}
+				else{
+					console.log(i,num[i]);
+				}
 			}
-			console.log(str);
 			return aa+bb+cc+dd;
 		}
 		window.onkeydown=function(e){

game/package.js

@@ -31,8 +31,8 @@ card.pack={
     shenbing:'神兵',
     swd:'轩辕剑',
     shenqi:'上古神器',
-    // hearth:'炉石传说',
-    compensate:'补充卡牌',
+    hearth:'炉石传说',
+    // compensate:'补充卡牌',
 };
 play.pack={
     character:'武将卡牌',