1

card/swd.js

@@ -1324,6 +1324,10 @@ card.swd={
 			enable:'phaseUse',
 			usable:1,
 			filterCard:true,
+			selectCard:2,
+			check:function(card){
+				return 5-ai.get.value(card);
+			},
 			position:'he',
 			filterTarget:true,
 			content:function(){
@@ -1333,6 +1337,17 @@ card.swd={
 				else{
 					target.addSkill('hslingjian_chaofeng');
 				}
+			},
+			ai:{
+				order:2,
+				result:{
+					target:function(player,target){
+						if(target.hasSkill('hslingjian_chaofeng')){
+							return -Math.sqrt(target.hp+target.num('h'));
+						}
+						return 0;
+					}
+				}
 			}
 		},
 		hslingjian_shijianhuisu_equip1:{
@@ -2198,7 +2213,7 @@ card.swd={
 		hslingjian_shengxiuhaojiao_equip2_info:'有嘲讽的角色不能对你使用杀',
 		hslingjian_shengxiuhaojiao_equip3_info:'若你的手牌数大于你的体力值，你的防御距离+1',
 		hslingjian_shengxiuhaojiao_equip4_info:'若你的手牌数大于你的体力值，你的进攻距离+1',
-		hslingjian_shengxiuhaojiao_equip5_info:'出牌阶段限一次，你可以弃置一张牌，然后令一名角色获得或解除嘲讽',
+		hslingjian_shengxiuhaojiao_equip5_info:'出牌阶段限一次，你可以弃置两张牌，然后令一名角色获得或解除嘲讽',
 		hslingjian_shijianhuisu_duanzao:'回溯',
 		hslingjian_shijianhuisu_duanzao2:'溯',
 		hslingjian_shijianhuisu_equip1_info:'当你失去此牌时，你可以弃置一名角色的一张牌',

character/hearth.js

@@ -15,6 +15,7 @@ character.hearth={
 		hs_alleria:['male','wu',3,['fengxing','qiaodong','liegong']],
 		hs_magni:['male','shu',4,['zhongjia','dunji']],
 		hs_liadrin:['female','shu',4,['xueren']],
+		hs_morgl:['male','wu',3,['s_tuteng']],
 
 		hs_neptulon:['male','wu',4,['liechao','qingliu']],
 		hs_wvelen:['male','qun',3,['shengyan','xianzhi']],
@@ -54,8 +55,9 @@ character.hearth={
 		hs_aedwin:['male','wu',3,['lianzhan']],
 		hs_mijiaojisi:['female','wu',3,['kuixin']],
 		hs_huzhixiannv:['female','wu',3,['jingmeng','qingliu']],
-		hs_tgolem:['male','wu',4,['xinwuyan','guozai']],
-		hs_totemic:['male','wu',3,['s_tuteng']],
+		// hs_tgolem:['male','wu',4,['xinwuyan','guozai']],
+		hs_totemic:['male','wu',3,['peiyu']],
+		// hs_wujiyuansu:['male','wu',3,['s_tuteng']],
 		hs_xsylvanas:['female','qun',3,['busi','xshixin','xmojian']],
 		hs_siwangzhiyi:['male','qun',12,['mieshi']],
 		hs_bilanyoulong:['male','wei',4,['lingzhou']],
@@ -81,6 +83,154 @@ character.hearth={
 		hs_malfurion:['hs_malorne'],
 	},
 	skill:{
+		peiyu:{
+			enable:'phaseUse',
+			filterCard:true,
+			position:'he',
+			filterTarget:true,
+			check:function(card){
+				return 6-ai.get.value(card);
+			},
+			content:function(){
+				'step 0'
+				var rand=['tuteng1','tuteng2','tuteng3','tuteng4',
+					'tuteng5','tuteng6','tuteng7','tuteng8'];
+				var rand2=[];
+				for(var i=0;i<target.skills.length;i++){
+					if(rand.contains(target.skills[i])){
+						rand.remove(target.skills[i]);
+						rand2.push(target.skills[i]);
+					}
+				}
+				if(!rand.length){
+					event.finish();
+					return;
+				}
+				if(!target.storage.peiyu){
+					target.storage.peiyu={};
+				}
+				for(var i in target.storage.peiyu){
+					if(target.storage.peiyu[i]==player){
+						delete target.storage.peiyu[i];
+					}
+				}
+				if(rand2.length){
+					var randx=[];
+					var rand2x=[];
+					if(target.isUnderControl(true)){
+						var dialog=ui.create.dialog();
+						for(var i=0;i<rand.length;i++){
+							randx[i]=['','',rand[i]];
+						}
+						for(var i=0;i<rand2.length;i++){
+							rand2x[i]=['','',rand2[i]];
+						}
+						dialog.add('选择一个图腾');
+						dialog.add([randx,'vcard']);
+						dialog.add('替换一个已有图腾');
+						dialog.add([rand2x,'vcard']);
+						target.chooseButton(dialog,2,true).filterButton=function(button){
+							if(ui.selected.buttons.length){
+								var current=ui.selected.buttons[0].name;
+								if(rand.contains(current)){
+									return rand2.contains(button.name);
+								}
+								else{
+									return rand.contains(button.name);
+								}
+							}
+							return true;
+						};
+						for(var i=0;i<dialog.buttons.length;i++){
+							var item=dialog.buttons[i]
+							if(i==4){
+								item.parentNode.insertBefore(document.createElement('br'),item);
+							}
+							item.style.zoom=0.7;
+						}
+					}
+					else{
+						var gain;
+						if(target.hp<target.maxHp){
+							if(rand.contains('tuteng1')){
+								gain='tuteng1';
+							}
+							else if(rand.contains('tuteng3')){
+								gain='tuteng3';
+							}
+							else{
+								gain=rand.randomGet();
+							}
+							target.removeSkill(rand2.randomGet())
+						}
+						else{
+							if(rand2.contains('tuteng1')){
+								gain=rand.randomGet();
+								target.removeSkill('tuteng1');
+							}
+							else{
+								if(rand.length>1){
+									rand.remove('tuteng1');
+								}
+								gain=rand.randomGet();
+								target.removeSkill(rand2.randomGet())
+							}
+						}
+						target.addSkill(gain);
+						target.storage.peiyu[gain]=player;
+						game.delay();
+						event.finish();
+					}
+				}
+				else{
+					var gain=rand.randomGet();
+					target.addSkill(gain);
+					target.storage.peiyu[gain]=player;
+					game.delay();
+					event.finish();
+				}
+				'step 1'
+				var skill1=result.buttons[0].name;
+				var skill2=result.buttons[1].name;
+				if(target.skills.contains(skill1)){
+					target.removeSkill(skill1);
+					target.addSkill(skill2);
+					target.storage.peiyu[skill2]=player;
+				}
+				else{
+					target.removeSkill(skill2);
+					target.addSkill(skill1);
+					target.storage.peiyu[skill1]=player;
+				}
+			},
+			ai:{
+				expose:0.2,
+				order:5,
+				result:{
+					target:function(player,target){
+						for(var i=1;i<=8;i++){
+							if(target.hasSkill('tuteng'+i)) return 0;
+						}
+						return 1;
+					}
+				}
+			},
+			group:'peiyu2'
+		},
+		peiyu2:{
+			trigger:{player:'dieBegin'},
+			forced:true,
+			popup:false,
+			content:function(){
+				for(var i=0;i<game.players.length;i++){
+					for(var j in game.players[i].storage.peiyu){
+						if(game.players[i].storage.peiyu[j]==player){
+							game.players[i].removeSkill(j);
+						}
+					}
+				}
+			}
+		},
 		wzhanyi:{
 			trigger:{player:'phaseUseBefore'},
 			check:function(event,player){
@@ -3416,7 +3566,6 @@ character.hearth={
 			content:function(){
 				var rand=['tuteng2','tuteng4','tuteng5','tuteng6','tuteng7','tuteng8'];
 				if(player.storage.s_tuteng){
-
 					var rand2=player.storage.s_tuteng;
 					for(var i=0;i<3;i++){
 						rand.remove(rand2[i]);
@@ -3542,7 +3691,6 @@ character.hearth={
 					event.finish();
 				}
 				'step 1'
-				game.stopCountChoose();
 				if(result.buttons.length==1){
 					player.addSkill(result.buttons[0].name);
 				}
@@ -3558,7 +3706,6 @@ character.hearth={
 						player.addSkill(skill1);
 					}
 				}
-				player.addSkill(event.choice);
 			},
 			ai:{
 				order:11,
@@ -4297,6 +4444,7 @@ character.hearth={
 		hs_sthrall:'萨尔',
 		hs_waleera:'瓦莉拉',
 		hs_liadrin:'莉亚德琳',
+		hs_morgl:'摩戈尔',
 
 		hs_neptulon:'耐普图隆',
 		hs_wvelen:'维纶',
@@ -4355,6 +4503,8 @@ character.hearth={
 		hs_yogg:'尤格萨隆',
 		hs_xialikeer:'夏克里尔',
 
+		peiyu:'培育',
+		peiyu_info:'出牌阶段，你可以弃置一张牌令一名没有图腾的角色获得一个随机图腾，或令一名有图腾的角色替换一个图腾；你死亡时，其他角色失去以此法获得的图腾',
 		wzhanyi:'战意',
 		wzhanyi_info:'你可以跳过出牌阶段，改为摸三张牌并展示之，将摸到的装备牌置于装备区，然后可以使用手牌中的杀',
 		shengteng:'升腾',
@@ -4512,7 +4662,7 @@ character.hearth={
 		chongsheng:'重生',
 		chongsheng_bg:'生',
 		chongsheng_info:'濒死阶段，你可弃置所有牌，将体力回复至2-X，并摸X张牌，X为你本局发动此技能的次数。每局最多发动2次',
-		s_tuteng:'滋养',
+		s_tuteng:'神谕',
 		s_tuteng_info:'在你首个回合开始时，你获得三个随机图腾；在此后的每个回合开始阶段，你随机替换其中的一个图腾',
 		guozai:'过载',
 		guozai2:'过载',

character/ow.js

@@ -2,7 +2,6 @@
 character.ow={
     character:{
         ow_liekong:['female','shu',3,['shanxian','shanhui']],
-        // ow_heibaihe:['female','shu',3,[]],
         ow_sishen:['male','shu',3,['xiandan','yihun','shouge']],
         ow_tianshi:['female','qun',3,['shouhu','ziyu','feiying']],
         ow_falaozhiying:['female','shu',3,['feidan','huoyu','feiying']],
@@ -10,9 +9,21 @@ character.ow={
         ow_luxiao:['male','wu',3,['yuedong','kuoyin','huhuan']],
         ow_shibing:['male','shu',4,['tuji','mujing']],
         ow_yuanshi:['male','qun',3,['feiren','lianpo','zhanlong']],
+        ow_chanyata:['male','qun',3,['xie','luan','sheng']],
+
+        // ow_heibaihe:['female','shu',3,[]],
         // ow_mei:['female','shu',3,[]],
         // ow_baolei:['female','shu',3,[]],
-        ow_chanyata:['male','qun',3,['xie','luan','sheng']],
+        // ow_ana:['female','shu',4,[]],
+        // ow_dva:['female','shu',4,[]],
+        // ow_maikelei:['male','shu',4,[]],
+        // ow_banzang:['male','shu',4,[]],
+        // ow_kuangshu:['male','shu',4,[]],
+        // ow_tuobiang:['male','shu',4,[]],
+        // ow_laiyinhate:['male','shu',4,[]],
+        // ow_luba:['male','shu',4,[]],
+        // ow_wensidun:['male','shu',4,[]],
+        // ow_zhaliya:['female','shu',4,[]],
     },
     skill:{
         xiandan:{
@@ -281,6 +292,7 @@ character.ow={
                 return event.player==player.storage.xie2;
             },
             content:function(){
+                game.log(player,'解除了','【谐】');
                 player.removeSkill('xie2');
             }
         },
@@ -305,7 +317,7 @@ character.ow={
                     current.removeSkill('luan2');
                 }
                 target.addSkill('luan2');
-                target.storage.luan='now';
+                // target.storage.luan='now';
                 target.storage.luan2=player;
             },
             ai:{
@@ -320,12 +332,36 @@ character.ow={
                         if(current){
                             return 0;
                         }
-                        return -Math.sqrt(3+target.hp);
+                        return -1;
                     }
                 }
             }
         },
         luan2:{
+            mark:true,
+            intro:{
+                content:'受到的伤害+1，直到首次进入濒死状态'
+            },
+            trigger:{player:'damageBegin'},
+            forced:true,
+            content:function(){
+                trigger.num++;
+            },
+            ai:{
+                threaten:1.2
+            },
+            group:['luan3','luan4']
+        },
+        luan3:{
+            trigger:{player:'dyingAfter'},
+            forced:true,
+            popup:false,
+            content:function(){
+                game.log(player,'解除了','【乱】');
+                player.removeSkill('luan2');
+            }
+        },
+        luan2_old:{
             mark:true,
             trigger:{global:'phaseEnd'},
             forced:true,
@@ -364,7 +400,7 @@ character.ow={
             },
             group:['luan3','luan4']
         },
-        luan3:{
+        luan3_old:{
             trigger:{global:'phaseBegin'},
             forced:true,
             popup:false,
@@ -386,6 +422,7 @@ character.ow={
                 return event.player==player.storage.luan2;
             },
             content:function(){
+                game.log(player,'解除了','【乱】');
                 player.removeSkill('luan2');
             }
         },
@@ -1132,7 +1169,8 @@ character.ow={
         xie_info:'出牌阶段，你可以弃置一张红桃手牌并指定一名角色，该角色自其下一回合开始每隔六回合回复一点体力，直到你死亡。同一时间只能对一人发动',
         luan:'乱',
         luan2:'乱',
-        luan_info:'出牌阶段，你可以弃置一张黑桃手牌并指定一名角色，该角色自其下一回合开始每隔六回合失去一点体力，直到你死亡。同一时间只能对一人发动',
+        luan_old_info:'出牌阶段，你可以弃置一张黑桃手牌并指定一名角色，该角色自其下一回合开始每隔六回合失去一点体力，直到你死亡。同一时间只能对一人发动',
+        luan_info:'出牌阶段，你可以弃置一张黑桃手牌并指定一名角色，该角色受到的伤害+1，直到你死亡或其首次进入濒死状态。同一时间只能对一人发动',
         sheng:'圣',
         sheng_info:'限定技，出牌阶段，你可以将你的武将牌翻面，然后令任意名角色回复一点体力，若如此做，你不能成为其他角色的卡牌目标直到下一回合开始',
         xiandan:'霰弹',

character/yijiang.js

@@ -5643,7 +5643,14 @@ character.yijiang={
 				}
 				return false;
 			},
-			frequent:true,
+			check:function(event,player){
+				for(var i=0;i<event.cards.length;i++){
+					if(get.suit(event.cards[i])=='club'&&get.position(event.cards[i])=='d'){
+						if(event.cards[i].name=='du') return false;
+					}
+				}
+				return true;
+			},
 			content:function(){
 				"step 0"
 				if(trigger.delay==false) game.delay();
@@ -5664,7 +5671,14 @@ character.yijiang={
 		luoying2:{
 			audio:2,
 			trigger:{global:'judgeAfter'},
-			frequent:true,
+			check:function(event,player){
+				for(var i=0;i<event.cards.length;i++){
+					if(get.suit(event.cards[i])=='club'&&get.position(event.cards[i])=='d'){
+						if(event.cards[i].name=='du') return false;
+					}
+				}
+				return true;
+			},
 			filter:function(event,player){
 				if(event.player==player) return false;
 				if(event.result.card.parentNode.id!='discardPile') return false;

game/asset.js

@@ -1,5 +1,5 @@
 window.noname_asset_list=[
-    '1.8.12',
+    '1.8.13',
     'image/background/huangtian_bg.jpg',
     'image/background/shengshi_bg.jpg',
     'image/background/xueji_bg.jpg',
@@ -476,6 +476,7 @@ window.noname_asset_list=[
     'image/character/hs_malygos.jpg',
     'image/character/hs_medivh.jpg',
     'image/character/hs_mijiaojisi.jpg',
+    'image/character/hs_morgl.jpg',
     'image/character/hs_nate.jpg',
     'image/character/hs_neptulon.jpg',
     'image/character/hs_nozdormu.jpg',
@@ -576,6 +577,19 @@ window.noname_asset_list=[
     'image/character/ow_luxiao.jpg',
     'image/character/ow_shibing.jpg',
     'image/character/ow_tianshi.jpg',
+    'image/character/ow_maikelei.jpg',
+    'image/character/ow_baolei.jpg',
+    'image/character/ow_mei.jpg',
+    'image/character/ow_heibaihe.jpg',
+    'image/character/ow_banzang.jpg',
+    'image/character/ow_kuangshu.jpg',
+    'image/character/ow_tuobiang.jpg',
+    'image/character/ow_dva.jpg',
+    'image/character/ow_laiyinhate.jpg',
+    'image/character/ow_luba.jpg',
+    'image/character/ow_wensidun.jpg',
+    'image/character/ow_zhaliya.jpg',
+    'image/character/ow_ana.jpg',
     'image/character/pal_changqing.jpg',
     'image/character/pal_hanlingsha.jpg',
     'image/character/pal_jingtian.jpg',

game/game.js

@@ -9084,7 +9084,7 @@
 					next.content=lib.element.playerproto.changeHp;
 				},
 				dying:function(reason){
-					var next=game.createEvent('dying',false);
+					var next=game.createEvent('dying');
 					next.player=this;
 					next.reason=reason;
 					next.source=reason.source;

game/update.js

@@ -1,24 +1,16 @@
 window.noname_update={
-    version:'1.8.17.5',
+    version:'1.8.17.6',
     changeLog:[
         '修bug',
     ],
     files:{
         global:[
             'game/game.js',
-            'card/sp.js',
+            'game/asset.js',
             'card/swd.js',
-            'character/yijiang.js',
-            'character/shenhua.js',
-            'mode/connect.js',
-            'extension/coin/extension.js',
-            'layout/phone/layout.css',
-            'layout/default/menu.css',
+            'character/ow.js',
+            'character/hearth.js',
         ],
-        '1.8.17':[],
-        '1.8.17.1':[],
-        '1.8.17.2':[],
-        '1.8.17.3':[],
-        '1.8.17.4':[],
+        '1.8.17.5':[],
     }
 }