From 8b32f584c0c73101b6f58dab58274f242f3390f6 Mon Sep 17 00:00:00 2001
From: libccy <operawidget@163.com>
Date: Sat, 1 Apr 2017 15:12:56 +0800
Subject: [PATCH] t

---
 character/hearth.js |  6 +++---
 character/ow.js     | 36 ++++++++++++++++++++----------------
 character/swd.js    | 37 +++++++++++++++++++------------------
 3 files changed, 42 insertions(+), 37 deletions(-)

diff --git a/character/hearth.js b/character/hearth.js
index d8e11ac50..49a6b5904 100644
--- a/character/hearth.js
+++ b/character/hearth.js
@@ -4246,10 +4246,10 @@ character.hearth={
 			selectTarget:function(){
 				return [1,_status.event.player.hujia];
 			},
+			contentBefore:function(){
+				player.changeHujia(-player.hujia);
+			},
 			content:function(){
-				if(target==targets[0]){
-					player.changeHujia(-player.hujia);
-				}
 				target.damage();
 			},
 			ai:{
diff --git a/character/ow.js b/character/ow.js
index 4311273bc..e1c7c98b3 100644
--- a/character/ow.js
+++ b/character/ow.js
@@ -1273,25 +1273,29 @@ character.ow={
                 return [1,_status.event.player.countCards('he',{color:'black'})];
             },
             alter:true,
+            delay:false,
+            contentBefore:function(){
+                'step 0'
+                game.delayx();
+                'step 1'
+                player.storage.baoxue=true;
+                player.awakenSkill('baoxue');
+                player.showHandcards();
+                player.discard(player.getCards('he',{color:'black'}));
+            },
             content:function(){
                 'step 0'
-                if(target==targets[0]){
-                    player.storage.baoxue=true;
-                    player.awakenSkill('baoxue');
-                    player.showHandcards();
-                    player.discard(player.getCards('he',{color:'black'}));
-                }
-                'step 1'
                 if(!get.is.altered('baoxue')){
                     var he=target.getCards('he');
                     if(he.length){
                         target.discard(he.randomGet());
                     }
                 }
-                'step 2'
+                'step 1'
                 target.turnOver(true);
-                'step 3'
-                if(get.is.altered('baoxue')&&target==targets[targets.length-1]){
+            },
+            contentAfter:function(){
+                if(get.is.altered('baoxue')){
                     player.turnOver(true);
                 }
             },
@@ -2660,13 +2664,13 @@ character.ow={
                 return target.isDamaged();
             },
             selectTarget:[1,Infinity],
+            contentBefore:function(){
+                player.turnOver();
+                player.addSkill('sheng2');
+                player.awakenSkill('sheng');
+                player.storage.sheng=true;
+            },
 			content:function(){
-                if(target==targets[0]){
-                    player.turnOver();
-                    player.addSkill('sheng2');
-                    player.awakenSkill('sheng');
-    				player.storage.sheng=true;
-                }
 				target.recover();
 			},
 			ai:{
diff --git a/character/swd.js b/character/swd.js
index 832e6c41d..ce0d7685a 100644
--- a/character/swd.js
+++ b/character/swd.js
@@ -1259,11 +1259,11 @@ character.swd={
 			},
             filterTarget:true,
             selectTarget:[1,Infinity],
+			contentBefore:function(){
+				player.awakenSkill('jinlin');
+				player.storage.jinlin=true;
+			},
 			content:function(){
-                if(target==targets[0]){
-                    player.awakenSkill('jinlin');
-    				player.storage.jinlin=true;
-                }
 				target.changeHujia(3);
 				target.addSkill('jinlin2');
 				target.storage.jinlin2=3;
@@ -4488,21 +4488,23 @@ character.swd={
 				return player!=target;
 			},
 			selectTarget:-1,
-			content:function(){
-				"step 0"
-				if(target==targets[0]){
-					var cards=player.getCards('hej');
-					for(var i=0;i<cards.length;i++){
-						if(get.color(cards[i])!='black'){
-							cards.splice(i,1);i--;
-						}
+			delay:false,
+			contentBefore:function(){
+				'step 0'
+				game.delayx();
+				'step 1'
+				var cards=player.getCards('hej');
+				for(var i=0;i<cards.length;i++){
+					if(get.color(cards[i])!='black'){
+						cards.splice(i,1);i--;
 					}
-					cards.sort(lib.sort.random);
-					player.discard(cards);
-					player.storage.miejing=true;
-					player.unmarkSkill('miejing');
 				}
-				"step 1"
+				cards.sort(lib.sort.random);
+				player.discard(cards);
+				player.storage.miejing=true;
+				player.unmarkSkill('miejing');
+			},
+			content:function(){
 				target.damage('thunder');
 			}
 		},
@@ -7146,7 +7148,6 @@ character.swd={
 						}
 					}
 				});
-				console.log(num);
 				next.ai=function(card){
 					if(trigger.player.hasSkillTag('nofire')) return 0;
 					if(num>0){