From 14f0d75b6c88cc69e62a6ab4afcc32fa2f66b59d Mon Sep 17 00:00:00 2001
From: libccy <widget@widgetdeMacBook-Pro.local>
Date: Fri, 12 Aug 2016 20:54:55 +0800
Subject: [PATCH] 4

---
 character/shenhua.js |   1 +
 character/sp.js      |   4 +-
 game/game.js         | 112 ++++++++++++++++++++++++++++++-------------
 game/update.js       |   5 +-
 4 files changed, 83 insertions(+), 39 deletions(-)

diff --git a/character/shenhua.js b/character/shenhua.js
index 0a3468b9e..70093871f 100644
--- a/character/shenhua.js
+++ b/character/shenhua.js
@@ -685,6 +685,7 @@ character.shenhua={
 				player.loseMaxHp();
 				if(player.hp>player.maxHp) player.loseHp();
 				player.addSkill('reyingzi');
+				player.addSkill('yinghun');
 				delete player.tempSkills.yinghun;
 				player.removeSkill('hunzi');
 				player.storage.hunzi=true;
diff --git a/character/sp.js b/character/sp.js
index ec8b6845a..f18d882cd 100755
--- a/character/sp.js
+++ b/character/sp.js
@@ -4085,9 +4085,7 @@ character.sp={
 			filter:function(event,player){
 				return event.player!=player&&!player.storage.wangzun;
 			},
-			prompt:function(event,player){
-				return '是否对'+get.translation(event.player)+'发动【妄尊】？';
-			},
+			logTarget:'player',
 			content:function(){
 				player.draw();
 				player.markSkill('wangzun');
diff --git a/game/game.js b/game/game.js
index ea865f956..efcebe9d3 100755
--- a/game/game.js
+++ b/game/game.js
@@ -12073,38 +12073,83 @@
 				notLink:function(){
 					return this.getParent().name!='_lianhuan'&&this.getParent().name!='_lianhuan2';
 				},
-                // triggerx:function(name){
-                //     if(_status.video) return;
-                //     if(name=='gameStart'){
-                //         _status.gameStarted=true;
-                //     }
-                //     for(i=0;i<game.players.length;i++){
-				// 		for(j in game.players[i].tempSkills){
-				// 			var expire=game.players[i].tempSkills[j];
-				// 			if(expire==name||
-				// 				(get.objtype(expire)=='array'&&expire.contains(name))||
-				// 				(typeof expire=='function'&&expire(event,game.players[i],name))){
-				// 				delete game.players[i].tempSkills[j];
-				// 				game.players[i].removeSkill(j);
-				// 			}
-				// 			else if(typeof expire=='object'){
-				// 				if(expire.player==name&&event.player==game.players[i]||
-				// 					expire.target==name&&event.target==game.players[i]||
-				// 					expire.source==name&&event.source==game.players[i]){
-				// 					delete game.players[i].tempSkills[j];
-				// 					game.players[i].removeSkill(j);
-				// 				}
-				// 			}
-				// 		}
-				// 	}
-                //     var event=this;
-                //     var start=event.player||game.me||game.players[0];
-                //     if(!game.players.contains(start)){
-				// 		start=game.findNext(start);
-				// 	}
-                //     var list=[];
-                //
-                // },
+                triggerx:function(name){
+                    if(_status.video) return;
+                    if(name=='gameStart'){
+                        _status.gameStarted=true;
+                    }
+                    for(var i=0;i<game.players.length;i++){
+						for(var j in game.players[i].tempSkills){
+							var expire=game.players[i].tempSkills[j];
+							if(expire==name||
+								(get.objtype(expire)=='array'&&expire.contains(name))||
+								(typeof expire=='function'&&expire(event,game.players[i],name))){
+								delete game.players[i].tempSkills[j];
+								game.players[i].removeSkill(j);
+							}
+							else if(typeof expire=='object'){
+								if(expire.player==name&&event.player==game.players[i]||
+									expire.target==name&&event.target==game.players[i]||
+									expire.source==name&&event.source==game.players[i]){
+									delete game.players[i].tempSkills[j];
+									game.players[i].removeSkill(j);
+								}
+							}
+						}
+					}
+                    var event=this;
+                    var start=event.player||game.me||game.players[0];
+                    if(!game.players.contains(start)){
+						start=game.findNext(start);
+					}
+                    var list=[];
+                    var roles=['player','source','target'];
+                    for(var i=0;i<roles.length;i++){
+                        if(event[roles[i]]){
+                            var triggername=event[roles[i]].playerid+'_'+roles[i]+'_'+name;
+                            if(lib.hook[triggername]){
+                                for(var j=0;j<lib.hook[triggername].length;j++){
+                                    list.push([lib.hook[triggername][j],event[roles[i]]]);
+                                }
+                            }
+                            triggername=roles[i]+'_'+name;
+                            if(lib.hook.globalskill[triggername]){
+                                for(var j=0;j<lib.hook.globalskill[triggername].length;j++){
+                                    list.push([lib.hook.globalskill[triggername][j],event[roles[i]]]);
+                                }
+                            }
+                        }
+                    }
+                    var triggername='global_'+name;
+                    if(lib.hook.globalskill[triggername]){
+                        for(var i=0;i<game.players.length;i++){
+                            for(var j=0;j<lib.hook.globalskill[triggername].length;j++){
+                                list.push([lib.hook.globalskill[triggername][j],game.players[i]]);
+                            }
+                        }
+                    }
+                    var map=_status.connectMode?lib.playerOL:game.playerMap;
+                    for(var i in lib.hook.globaltrigger[name]){
+                        if(map[i]&&map[i].isAlive()){
+                            for(var j=0;j<lib.hook.globaltrigger[name][i].length;j++){
+                                list.push([lib.hook.globaltrigger[name][i][j],map[i]]);
+                            }
+                        }
+                    }
+                    list.sort(function(a,b){
+                        var priority=lib.sort.priority(a,b);
+                        if(priority) return priority;
+                        if(start){
+                            return get.distance(start,a[1],'absolute')-get.distance(start,b[1],'absolute');
+                        }
+                        return 0;
+                    });
+                    if(list.length){
+						for(i=0;i<list.length;i++){
+							game.createTrigger(name,list[i][0],list[i][1],event);
+						}
+					}
+                },
 				trigger:function(name){
 					if(_status.video) return;
                     if(name=='gameStart'){
@@ -28605,15 +28650,16 @@
 				if(this.classList.contains('selectable')==false) return;
 				if(this.classList.contains('selected')){
 					ui.selected.buttons.remove(this);
+    				this.classList.remove('selected');
 					if(_status.multitarget||_status.event.complexSelect){
 						game.uncheck();
 						game.check();
 					}
 				}
 				else{
+    				this.classList.add('selected');
 					ui.selected.buttons.add(this);
 				}
-				this.classList.toggle('selected');
 				if(custom.add.button){
 					custom.add.button();
 				}
diff --git a/game/update.js b/game/update.js
index 1f1939ee3..5785c31ce 100644
--- a/game/update.js
+++ b/game/update.js
@@ -1,12 +1,11 @@
 window.noname_update={
-    version:'1.8.20.3',
+    version:'1.8.20.4',
     changeLog:[
-        '修bug'
+        '无'
     ],
     files:{
         global:[
             // 'game/game.js',
-            'character/standard.js',
         ],
     }
 }