Merge branch 'master' into tcg_random

docs/install_centos_6.sh

@@ -33,7 +33,7 @@ sudo cp -rf src/redis-server /usr/bin/
 cd ..
 pm2 start redis-server
 
-wget -O - https://github.com/premake/premake-core/releases/download/v5.0.0-alpha12/premake-5.0.0-alpha12-linux.tar.gz | tar zfx -
+wget -O - https://github.com/premake/premake-core/releases/download/v5.0.0-alpha13/premake-5.0.0-alpha13-linux.tar.gz | tar zfx -
 cp -rf premake5 ~
 
 wget 'https://github.com/libevent/libevent/releases/download/release-2.0.22-stable/libevent-2.0.22-stable.tar.gz' -O libevent-2.0.22-stable.tar.gz --no-check-certificate

docs/install_centos_7.sh

@@ -33,7 +33,7 @@ sudo cp -rf src/redis-server /usr/bin/
 cd ..
 pm2 start redis-server
 
-wget -O - https://github.com/premake/premake-core/releases/download/v5.0.0-alpha12/premake-5.0.0-alpha12-linux.tar.gz | tar zfx -
+wget -O - https://github.com/premake/premake-core/releases/download/v5.0.0-alpha13/premake-5.0.0-alpha13-linux.tar.gz | tar zfx -
 cp -rf premake5 ~
 
 wget 'https://github.com/libevent/libevent/releases/download/release-2.0.22-stable/libevent-2.0.22-stable.tar.gz' -O libevent-2.0.22-stable.tar.gz --no-check-certificate

docs/install_ubuntu_14.sh

@@ -33,7 +33,7 @@ sudo cp -rf src/redis-server /usr/bin/
 cd ..
 pm2 start redis-server
 
-wget -O - https://github.com/premake/premake-core/releases/download/v5.0.0-alpha12/premake-5.0.0-alpha12-linux.tar.gz | tar zfx -
+wget -O - https://github.com/premake/premake-core/releases/download/v5.0.0-alpha13/premake-5.0.0-alpha13-linux.tar.gz | tar zfx -
 cp -rf premake5 ~
 
 wget 'https://github.com/libevent/libevent/releases/download/release-2.0.22-stable/libevent-2.0.22-stable.tar.gz' -O libevent-2.0.22-stable.tar.gz --no-check-certificate

docs/install_ubuntu_16.sh

@@ -33,7 +33,7 @@ sudo cp -rf src/redis-server /usr/bin/
 cd ..
 pm2 start redis-server
 
-wget -O - https://github.com/premake/premake-core/releases/download/v5.0.0-alpha12/premake-5.0.0-alpha12-linux.tar.gz | tar zfx -
+wget -O - https://github.com/premake/premake-core/releases/download/v5.0.0-alpha13/premake-5.0.0-alpha13-linux.tar.gz | tar zfx -
 cp -rf premake5 ~
 
 wget 'https://github.com/libevent/libevent/releases/download/release-2.0.22-stable/libevent-2.0.22-stable.tar.gz' -O libevent-2.0.22-stable.tar.gz --no-check-certificate

docs/install_ubuntu_18.sh

@@ -32,7 +32,7 @@ sudo cp -rf src/redis-server /usr/bin/
 cd ..
 pm2 start redis-server
 
-wget -O - https://github.com/premake/premake-core/releases/download/v5.0.0-alpha12/premake-5.0.0-alpha12-linux.tar.gz | tar zfx -
+wget -O - https://github.com/premake/premake-core/releases/download/v5.0.0-alpha13/premake-5.0.0-alpha13-linux.tar.gz | tar zfx -
 cp -rf premake5 ~
 
 wget 'https://github.com/libevent/libevent/releases/download/release-2.0.22-stable/libevent-2.0.22-stable.tar.gz' -O libevent-2.0.22-stable.tar.gz --no-check-certificate

docs/update.sh

@@ -13,7 +13,7 @@ git pull origin server
 git reset --hard FETCH_HEAD
 git submodule foreach git pull origin master
 git submodule foreach git reset --hard FETCH_HEAD
-premake5 gmake
+~/premake5 gmake
 cd build
 make config=release
 cd ../

ygopro-server.coffee

@@ -621,7 +621,7 @@ ROOM_unwelcome = (room, bad_player, reason)->
 CLIENT_kick = (client) ->
   client.system_kicked = true
   if settings.modules.reconnect.enabled and client.closed
-    CLIENT_reconnect_unregister(client, false, true)
+    client.server.destroy()
   else
     client.destroy()
   return
@@ -2711,7 +2711,7 @@ ygopro.ctos_follow 'SURRENDER', true, (buffer, info, client, server)->
   if room.hostinfo.mode == 2
     if !settings.modules.tag_duel_surrender
       return true
-    else if !client.surrend_confirm and !CLIENT_get_partner(client).closed
+    else if !client.surrend_confirm and !CLIENT_get_partner(client).closed and !CLIENT_get_partner(client).is_local
       sur_player = CLIENT_get_partner(client)
       ygopro.stoc_send_chat(sur_player, "${surrender_confirm_tag}", ygopro.constants.COLORS.BABYBLUE)
       ygopro.stoc_send_chat(client, "${surrender_confirm_sent}", ygopro.constants.COLORS.BABYBLUE)
@@ -2751,14 +2751,14 @@ ygopro.ctos_follow 'CHAT', true, (buffer, info, client, server)->
     when '/投降', '/surrender'
       if !room.started or (room.hostinfo.mode==2 and !settings.modules.tag_duel_surrender)
         return cancel
-      if room.random_type and room.turn < 3
+      if room.random_type and room.turn < 3 and !client.flee_free
         ygopro.stoc_send_chat(client, "${surrender_denied}", ygopro.constants.COLORS.BABYBLUE)
         return cancel
       if client.surrend_confirm
         ygopro.ctos_send(client.server, 'SURRENDER')
       else
         sur_player = CLIENT_get_partner(client)
-        if sur_player.closed
+        if sur_player.closed or sur_player.is_local
           sur_player = client
         if room.hostinfo.mode==2 and sur_player != client
           ygopro.stoc_send_chat(sur_player, "${surrender_confirm_tag}", ygopro.constants.COLORS.BABYBLUE)
@@ -3231,7 +3231,7 @@ ygopro.stoc_follow 'CHANGE_SIDE', false, (buffer, info, client, server)->
       if client.side_tcount == 1
         ygopro.stoc_send_chat_to_room(room, client.name + "${side_overtime_room}", ygopro.constants.COLORS.BABYBLUE)
         ygopro.stoc_send_chat(client, "${side_overtime}", ygopro.constants.COLORS.RED)
-        room.scores[client.name] = -9
+        #room.scores[client.name] = -9
         CLIENT_kick(client)
         clearInterval sinterval
       else

ygopro-server.js

@@ -795,7 +795,7 @@
   CLIENT_kick = function(client) {
     client.system_kicked = true;
     if (settings.modules.reconnect.enabled && client.closed) {
-      CLIENT_reconnect_unregister(client, false, true);
+      client.server.destroy();
     } else {
       client.destroy();
     }
@@ -3415,7 +3415,7 @@
     if (room.hostinfo.mode === 2) {
       if (!settings.modules.tag_duel_surrender) {
         return true;
-      } else if (!client.surrend_confirm && !CLIENT_get_partner(client).closed) {
+      } else if (!client.surrend_confirm && !CLIENT_get_partner(client).closed && !CLIENT_get_partner(client).is_local) {
         sur_player = CLIENT_get_partner(client);
         ygopro.stoc_send_chat(sur_player, "${surrender_confirm_tag}", ygopro.constants.COLORS.BABYBLUE);
         ygopro.stoc_send_chat(client, "${surrender_confirm_sent}", ygopro.constants.COLORS.BABYBLUE);
@@ -3470,7 +3470,7 @@
         if (!room.started || (room.hostinfo.mode === 2 && !settings.modules.tag_duel_surrender)) {
           return cancel;
         }
-        if (room.random_type && room.turn < 3) {
+        if (room.random_type && room.turn < 3 && !client.flee_free) {
           ygopro.stoc_send_chat(client, "${surrender_denied}", ygopro.constants.COLORS.BABYBLUE);
           return cancel;
         }
@@ -3478,7 +3478,7 @@
           ygopro.ctos_send(client.server, 'SURRENDER');
         } else {
           sur_player = CLIENT_get_partner(client);
-          if (sur_player.closed) {
+          if (sur_player.closed || sur_player.is_local) {
             sur_player = client;
           }
           if (room.hostinfo.mode === 2 && sur_player !== client) {
@@ -4121,7 +4121,6 @@
         if (client.side_tcount === 1) {
           ygopro.stoc_send_chat_to_room(room, client.name + "${side_overtime_room}", ygopro.constants.COLORS.BABYBLUE);
           ygopro.stoc_send_chat(client, "${side_overtime}", ygopro.constants.COLORS.RED);
-          room.scores[client.name] = -9;
           CLIENT_kick(client);
           return clearInterval(sinterval);
         } else {