diff --git a/game/game.js b/game/game.js index 08b4fc8e9..49c042157 100755 --- a/game/game.js +++ b/game/game.js @@ -6060,14 +6060,16 @@ player.changeHp(-num,false); if(event.animate!==false){ player.$damage(source); - if(lib.config.animation&&!lib.config.low_performance){ - if(event.nature=='fire'){ - player.$fire(); - } - else if(event.nature=='thunder'){ - player.$thunder(); - } - } + game.broadcastAll(function(nature,player){ + if(lib.config.animation&&!lib.config.low_performance){ + if(nature=='fire'){ + player.$fire(); + } + else if(nature=='thunder'){ + player.$thunder(); + } + } + },event.nature,player); player.$damagepop(-num,event.nature); } // if(source){ @@ -6754,7 +6756,7 @@ lib.chatHistory.push(info); if(_status.addChatEntry){ if(_status.addChatEntry._origin.parentNode){ - _status.addChatEntry(info); + _status.addChatEntry(info,false); } else{ delete _status.addChatEntry; @@ -9715,25 +9717,22 @@ this.playerfocus(1500); var that=this; setTimeout(function(){ - if(lib.config.animation&&!lib.config.low_performance){ - if(lib.config.mode=='chess'){ - that['$'+type+'2'](1200); - } - else{ - that['$'+type](1200); - } - } - if(name){ - that.$fullscreenpop(name,color); - } + game.broadcastAll(function(that,type,name){ + if(lib.config.animation&&!lib.config.low_performance){ + if(lib.config.mode=='chess'){ + that['$'+type+'2'](1200); + } + else{ + that['$'+type](1200); + } + } + if(name){ + that.$fullscreenpop(name,color); + } + },that,type,name); },300); }, $fire:function(){ - game.broadcast(function(player){ - if(!lib.config.low_performance){ - player.$fire(); - } - },this); game.addVideo('flame',this,'fire'); var left,top; if(lib.config.mode=='chess'){ @@ -9749,11 +9748,6 @@ top+this.offsetHeight-20,700,'fire'); }, $thunder:function(){ - game.broadcast(function(player){ - if(!lib.config.low_performance){ - player.$thunder(); - } - },this); game.addVideo('flame',this,'thunder'); var left,top; if(lib.config.mode=='chess'){ @@ -11591,7 +11585,7 @@ for(var i in state.players){ var info=state.players[i]; var player=ui.create.player(ui.arena).animate('start'); - player.dataset.position=info.position