From 282a504269e59084fcfc7b6774f043b018148e79 Mon Sep 17 00:00:00 2001
From: libccy <widget@widgetdeMacBook-Pro.local>
Date: Fri, 23 Sep 2016 11:26:32 +0800
Subject: [PATCH] d

---
 card/swd.js     | 87 ++++++++++++++++++++-----------------------------
 game/game.js    | 40 +++++++++++++++--------
 game/package.js |  2 +-
 game/update.js  |  3 ++
 4 files changed, 66 insertions(+), 66 deletions(-)

diff --git a/card/swd.js b/card/swd.js
index 979e80e98..b3f69dd95 100644
--- a/card/swd.js
+++ b/card/swd.js
@@ -644,7 +644,7 @@ card.swd={
 				target.discard(target.get('he').randomGet());
 			},
 			ai:{
-				order:6.5,
+				order:9,
 				result:{
 					target:-1,
 				},
@@ -722,7 +722,7 @@ card.swd={
 				}
 			},
 			ai:{
-				order:1,
+				order:9,
 				result:{
 					target:function(player,target){
 						if(target.num('h')<target.hp) return 1;
@@ -778,7 +778,7 @@ card.swd={
 				target.turnOver();
 			},
 			ai:{
-				order:2,
+				order:9,
 				result:{
 					target:-1,
 				},
@@ -3156,7 +3156,11 @@ card.swd={
 					}
 					return 0;
 				}
-				return 1+ai.get.value(card);
+				var num=1+ai.get.value(card);
+				if(get.position(card)=='e'){
+					num+=0.1;
+				}
+				return num;
 			},
 			filterCard:function(card){
 				var type=get.type(card);
@@ -3173,17 +3177,6 @@ card.swd={
 				else{
 					return type=='equip'||type=='hslingjian'||type=='jiqi';
 				}
-				// if(type=='equip'&&!lib.inpile.contains(card.name)) return false;
-				// for(var i=0;i<ui.selected.cards.length;i++){
-				// 	if(get.type(ui.selected.cards[i])=='equip') return type=='hslingjian'||type=='jiqi';
-				// }
-				// if(_status.event.player.hasSkill('jiguanyaoshu_skill')){
-				// 	if(ui.selected.cards.length==2) return type=='equip';
-				// }
-				// else{
-				// 	if(ui.selected.cards.length==1) return type=='equip';
-				// }
-				// return type=='equip'||type=='hslingjian';
 			},
 			process:function(cards){
 				var equip;
@@ -3204,28 +3197,9 @@ card.swd={
 					name+='_'+cards[0].name;
 				}
 				if(lib.card[name]) return name;
-				lib.card[name]={};
-				lib.card[name].cardimage=equip.name;
+				lib.card[name]=get.copy(lib.card[equip.name]);
+				lib.card[name].cardimage=lib.card[name].cardimage||equip.name;
 				lib.card[name].vanish=true;
-				for(var i in lib.card[equip.name]){
-					if(i=='ai'){
-						lib.card[name][i]={};
-						for(var j in lib.card[equip.name][i]){
-							if(j=='basic'){
-								lib.card[name][i][j]={};
-								for(var k in lib.card[equip.name][i][j]){
-									lib.card[name][i][j][k]=lib.card[equip.name][i][j][k];
-								}
-							}
-							else{
-								lib.card[name][i][j]=lib.card[equip.name][i][j];
-							}
-						}
-					}
-					else{
-						lib.card[name][i]=lib.card[equip.name][i];
-					}
-				}
 				if(type=='jiqi'){
 					lib.card[name].legend=true;
 				}
@@ -3270,11 +3244,11 @@ card.swd={
 				else{
 					lib.card[name].skills=[];
 				}
-				lib.card[name].filterTarget=function(card,player,target){
-					return !target.isMin();
-				};
-				lib.card[name].selectTarget=1;
-				lib.card[name].range={global:1};
+				// lib.card[name].filterTarget=function(card,player,target){
+				// 	return !target.isMin();
+				// };
+				// lib.card[name].selectTarget=1;
+				// lib.card[name].range={global:1};
 				var str=lib.translate[cards[0].name+'_duanzao'];
 				var str2=get.translation(equip.name,'skill');
 				lib.translate[name]=str+str2;
@@ -3307,15 +3281,6 @@ card.swd={
 				return name;
 			},
 			selectCard:2,
-			// selectCard:function(){
-			// 	if(ui.selected.cards.length==2&&
-			// 		get.type(ui.selected.cards[0])=='hslingjian'&&
-			// 		get.type(ui.selected.cards[1])=='hslingjian'){
-			// 		return [3,3];
-			// 	}
-			// 	if(_status.event.player.hasSkill('jiguanyaoshu_skill')) return [2,3];
-			// 	return 2;
-			// },
 			filter:function(event,player){
 				if(!player.num('h',{type:['hslingjian','jiqi']})) return false;
 				var es=player.get('he',{type:'equip'});
@@ -3328,11 +3293,29 @@ card.swd={
 				player.$throw(cards);
 			},
 			content:function(){
+				'step 0'
 				for(var i=0;i<cards.length;i++){
 					ui.discardPile.appendChild(cards[i]);
 				}
 				var name=lib.skill._lingjianduanzao.process(cards);
-				player.gain(game.createCard(name),'gain2');
+				var card=game.createCard(name);
+				player.chooseTarget(function(card,player,target){
+					return !target.isMin()&&get.distance(player,target)<=1;
+				},'选择一个目标装备'+get.translation(card.name)).ai=function(target){
+					return ai.get.effect(target,card,player,player);
+				}
+				event.card=card;
+				'step 1'
+				if(result.bool){
+					var target=result.targets[0];
+					player.line(target,'green');
+					target.equip(event.card);
+					target.$gain2(event.card);
+					game.delay();
+				}
+				else{
+					player.gain(event.card,'gain2');
+				}
 			},
 			ai:{
 				order:function(card,player){
@@ -4041,7 +4024,7 @@ card.swd={
 		hslingjian_shijianhuisu_equip4_info:'当你的装备区内没有其他牌时，你的进攻距离+1',
 		hslingjian_shijianhuisu_equip5_info:'出牌阶段限一次，你可以弃置一张牌，然后令一名其他角色将其装备区内的牌收回手牌',
 		_lingjianduanzao:'煅造',
-		_lingjianduanzao_info:'出牌阶段，你可以将一张装备牌和一张可煅造的牌合成为一件强化装备；强化装备可以装备给距离1以内的角色',
+		_lingjianduanzao_info:'出牌阶段，你可以将一张装备牌和一张可煅造的牌合成为一件强化装备，并可装备给距离1以内的一名角色',
 		jiguanshu:'机关鼠',
 		jiguanshu_info:'出牌阶段对一名角色使用，用随机零件强化目标装备区内的装备',
 		lingjiandai:'零件袋',
diff --git a/game/game.js b/game/game.js
index e0bf7d2d1..b99ad0c1a 100644
--- a/game/game.js
+++ b/game/game.js
@@ -11173,16 +11173,26 @@
 					}
 					return this;
 				},
-                clearEquipTrigger:function(){
-                    var es=this.get('e');
-                    for(var i=0;i<es.length;i++){
-                        var info=get.info(es[i]);
+                clearEquipTrigger:function(card){
+                    if(card){
+                        var info=get.info(card);
                         if(info.skills){
                             for(var j=0;j<info.skills.length;j++){
                                 this.removeSkillTrigger(info.skills[j]);
                             }
                         }
                     }
+                    else{
+                        var es=this.get('e');
+                        for(var i=0;i<es.length;i++){
+                            var info=get.info(es[i]);
+                            if(info.skills){
+                                for(var j=0;j<info.skills.length;j++){
+                                    this.removeSkillTrigger(info.skills[j]);
+                                }
+                            }
+                        }
+                    }
                 },
                 removeSkillTrigger:function(skill,triggeronly){
                     var info=lib.skill[skill];
@@ -19594,15 +19604,19 @@
 						if(typeof equipValue=='function') return equipValue(card,player)-value;
 						return equipValue-value;
 					}
-					card.ai.result.target=function(player,target){
-						var card=get.card();
-						if(card==undefined) return 0;
-						var value1=ai.get.value(card,target);
-						var value2=0;
-						if(target[get.subtype(card)]&&target[get.subtype(card)]!=card)
-							value2=ai.get.value(target[get.subtype(card)],target);
-                        return Math.max(0,value1-value2);
-					};
+					card.ai.result.target=(function(name){
+                        return (function(player,target){
+    						var card=get.card();
+    						if(card==undefined){
+                                card={name:name};
+                            }
+    						var value1=ai.get.value(card,target);
+    						var value2=0;
+    						if(target[get.subtype(card)]&&target[get.subtype(card)]!=card)
+    							value2=ai.get.value(target[get.subtype(card)],target);
+                            return Math.max(0,value1-value2);
+    					});
+                    }(i));
 				}
 				else if(card.type=='delay'){
 					if(card.enable==undefined) card.enable=true;
diff --git a/game/package.js b/game/package.js
index 8b493689e..b5af7ce50 100644
--- a/game/package.js
+++ b/game/package.js
@@ -14,7 +14,7 @@ character.pack={
     gujian:'古剑奇谭',
     xianjian:'仙剑',
     xiake:'侠客',
-    boss:'BOSS'
+    // boss:'BOSS'
 };
 card.pack={
     standard:'标准',
diff --git a/game/update.js b/game/update.js
index abe7e741e..e66d58783 100644
--- a/game/update.js
+++ b/game/update.js
@@ -18,3 +18,6 @@ window.noname_update={
         '1.9.1.1':[]
     }
 }
+
+// 'card/swd.js',
+// 'game/package.js',