From 70d6368191b196f2ddcbe4a9606891aaa356e0c1 Mon Sep 17 00:00:00 2001
From: libccy <libccy@gmail.com>
Date: Wed, 6 Apr 2016 14:51:59 +0800
Subject: [PATCH] 1.8.3

---
 character/shenhua.js |  3 ++-
 game/game.js         | 22 ++++++++++++++++++++++
 game/update.js       |  6 +++---
 mode/identity.js     |  9 +++++----
 4 files changed, 32 insertions(+), 8 deletions(-)

diff --git a/character/shenhua.js b/character/shenhua.js
index 2851da479..9aa698f38 100644
--- a/character/shenhua.js
+++ b/character/shenhua.js
@@ -1070,7 +1070,8 @@ character.shenhua={
 								}
 								mark.setBackground(currentname,'character');
 							}
-
+							player.addSkill(link);
+							player.skills.remove(link);
 							player.additionalSkills.huashen=link;
 							player.logSkill('huashen2');
 							game.log(player,'获得技能','【'+get.translation(link)+'】');
diff --git a/game/game.js b/game/game.js
index e4332cd1d..4acea7635 100755
--- a/game/game.js
+++ b/game/game.js
@@ -2723,6 +2723,25 @@
                             game.saveConfig('connect_avatar',item,'connect');
                         }
                     },
+                    connect_start:{
+                        name:'启动服务器',
+                        clear:true,
+                        frequent:true,
+                        onclick:function(){
+                            game.saveConfig('connectMode',true);
+                            game.saveConfig('mode','identity');
+                            localStorage.setItem(lib.configprefix+'directstart',true);
+                            game.reload();
+                        }
+                    },
+                    update:function(config,map){
+                        if(lib.node){
+                            map.connect_start.show();
+                        }
+                        else{
+                            map.connect_start.hide();
+                        }
+                    }
                 }
             }
 		},
@@ -14229,6 +14248,9 @@
     				ui.tempnowuxie.close();
     				delete ui.tempnowuxie;
     			}
+                for(var i=0;i<game.players.length;i++){
+                    game.players[i].setIdentity();
+                }
                 return;
             }
 			if(lib.config.background_audio){
diff --git a/game/update.js b/game/update.js
index 9ab0c60e7..d9edb5826 100644
--- a/game/update.js
+++ b/game/update.js
@@ -1,7 +1,7 @@
 window.noname_update={
-    version:'1.8.2.9',
+    version:'1.8.3',
     changeLog:[
-        '联机死亡后可退出',
-        'bug修复：换肤、濒死出酒、无懈、自定义模式、木马'
+        '风火林山联机',
+        'bug修复'
     ]
 }
diff --git a/mode/identity.js b/mode/identity.js
index 81a1353d7..077edbda8 100755
--- a/mode/identity.js
+++ b/mode/identity.js
@@ -1043,10 +1043,11 @@ mode.identity={
 							num=3;
 						}
 						else{
-							switch(game.players[i].identity){
-								case 'zhong':num=4;break;
-								case 'nei':num=5;break;
-								default:num=3;break;
+							if(game.players[i].identity=='nei'){
+								num=7;
+							}
+							else{
+								num=5;
 							}
 						}
 						list.push([game.players[i],['选择角色',[event.list.randomRemove(num),'character']],selectButton,true]);