Skip to content

S
srvpro
Commit a3cd3513 authored by nanahira's avatar nanahira
Browse files
Options

Merge branch 'mc'

parents 0a7c4682 4e7c605e
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 8 deletions
ygopro-server.coffee
View file @ a3cd3513
...@@ -1414,7 +1414,7 @@ ygopro.stoc_follow 'GAME_MSG', true, (buffer, info, client, server)-> ...@@ -1414,7 +1414,7 @@ ygopro.stoc_follow 'GAME_MSG', true, (buffer, info, client, server)->
if room.hostinfo.mode == 2 if room.hostinfo.mode == 2
ygopro.stoc_send(room.dueling_players[oppo_pos - win_pos], 'DUEL_END') ygopro.stoc_send(room.dueling_players[oppo_pos - win_pos], 'DUEL_END')
ygopro.stoc_send(room.dueling_players[oppo_pos - win_pos + 1], 'DUEL_END') ygopro.stoc_send(room.dueling_players[oppo_pos - win_pos + 1], 'DUEL_END')
room.scores[room.dueling_players[oppo_pos - win_pos].name] = 0 room.scores[room.dueling_players[oppo_pos - win_pos].name] = -1
room.dueling_players[oppo_pos - win_pos].destroy() room.dueling_players[oppo_pos - win_pos].destroy()
room.dueling_players[oppo_pos - win_pos + 1].destroy() room.dueling_players[oppo_pos - win_pos + 1].destroy()
else else
...@@ -1437,7 +1437,7 @@ ygopro.stoc_follow 'GAME_MSG', true, (buffer, info, client, server)-> ...@@ -1437,7 +1437,7 @@ ygopro.stoc_follow 'GAME_MSG', true, (buffer, info, client, server)->
if room.hostinfo.mode == 2 if room.hostinfo.mode == 2
ygopro.stoc_send(room.dueling_players[oppo_pos - win_pos], 'DUEL_END') ygopro.stoc_send(room.dueling_players[oppo_pos - win_pos], 'DUEL_END')
ygopro.stoc_send(room.dueling_players[oppo_pos - win_pos + 1], 'DUEL_END') ygopro.stoc_send(room.dueling_players[oppo_pos - win_pos + 1], 'DUEL_END')
room.scores[room.dueling_players[oppo_pos - win_pos].name] = 0 room.scores[room.dueling_players[oppo_pos - win_pos].name] = -1
room.dueling_players[oppo_pos - win_pos].destroy() room.dueling_players[oppo_pos - win_pos].destroy()
room.dueling_players[oppo_pos - win_pos + 1].destroy() room.dueling_players[oppo_pos - win_pos + 1].destroy()
else else
...@@ -1929,7 +1929,7 @@ ygopro.ctos_follow 'UPDATE_DECK', true, (buffer, info, client, server)-> ...@@ -1929,7 +1929,7 @@ ygopro.ctos_follow 'UPDATE_DECK', true, (buffer, info, client, server)->
ygopro.stoc_send_chat_to_room(room, "${death2_finish_part1}" + room.dueling_players[win_pos].name + "${death2_finish_part2}", ygopro.constants.COLORS.BABYBLUE) ygopro.stoc_send_chat_to_room(room, "${death2_finish_part1}" + room.dueling_players[win_pos].name + "${death2_finish_part2}", ygopro.constants.COLORS.BABYBLUE)
ygopro.stoc_send(room.dueling_players[oppo_pos - win_pos], 'DUEL_END') ygopro.stoc_send(room.dueling_players[oppo_pos - win_pos], 'DUEL_END')
ygopro.stoc_send(room.dueling_players[oppo_pos - win_pos + 1], 'DUEL_END') if room.hostinfo.mode == 2 ygopro.stoc_send(room.dueling_players[oppo_pos - win_pos + 1], 'DUEL_END') if room.hostinfo.mode == 2
room.scores[room.dueling_players[oppo_pos - win_pos].name] = 0 room.scores[room.dueling_players[oppo_pos - win_pos].name] = -1
room.dueling_players[oppo_pos - win_pos].destroy() room.dueling_players[oppo_pos - win_pos].destroy()
room.dueling_players[oppo_pos - win_pos + 1].destroy() if room.hostinfo.mode == 2 room.dueling_players[oppo_pos - win_pos + 1].destroy() if room.hostinfo.mode == 2
return true return true
...@@ -2057,6 +2057,7 @@ ygopro.stoc_follow 'CHANGE_SIDE', false, (buffer, info, client, server)-> ...@@ -2057,6 +2057,7 @@ ygopro.stoc_follow 'CHANGE_SIDE', false, (buffer, info, client, server)->
if client.side_tcount == 1 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_to_room(room, client.name + "${side_overtime_room}", ygopro.constants.COLORS.BABYBLUE)
ygopro.stoc_send_chat(client, "${side_overtime}", ygopro.constants.COLORS.RED) ygopro.stoc_send_chat(client, "${side_overtime}", ygopro.constants.COLORS.RED)
room.scores[client.name] = -9
client.destroy() client.destroy()
clearInterval sinterval clearInterval sinterval
else else
...@@ -2360,7 +2361,7 @@ if settings.modules.http ...@@ -2360,7 +2361,7 @@ if settings.modules.http
ygopro.stoc_send_chat_to_room(room, "${death2_finish_part1}" + room.dueling_players[win_pos].name + "${death2_finish_part2}", ygopro.constants.COLORS.BABYBLUE) ygopro.stoc_send_chat_to_room(room, "${death2_finish_part1}" + room.dueling_players[win_pos].name + "${death2_finish_part2}", ygopro.constants.COLORS.BABYBLUE)
ygopro.stoc_send(room.dueling_players[oppo_pos - win_pos], 'DUEL_END') ygopro.stoc_send(room.dueling_players[oppo_pos - win_pos], 'DUEL_END')
ygopro.stoc_send(room.dueling_players[oppo_pos - win_pos + 1], 'DUEL_END') if room.hostinfo.mode == 2 ygopro.stoc_send(room.dueling_players[oppo_pos - win_pos + 1], 'DUEL_END') if room.hostinfo.mode == 2
room.scores[room.dueling_players[oppo_pos - win_pos].name] = 0 room.scores[room.dueling_players[oppo_pos - win_pos].name] = -1
room.dueling_players[oppo_pos - win_pos].destroy() room.dueling_players[oppo_pos - win_pos].destroy()
room.dueling_players[oppo_pos - win_pos + 1].destroy() if room.hostinfo.mode == 2 room.dueling_players[oppo_pos - win_pos + 1].destroy() if room.hostinfo.mode == 2
when 1 when 1
......
ygopro-server.js
View file @ a3cd3513
...@@ -1777,7 +1777,7 @@ ...@@ -1777,7 +1777,7 @@
if (room.hostinfo.mode === 2) { if (room.hostinfo.mode === 2) {
ygopro.stoc_send(room.dueling_players[oppo_pos - win_pos], 'DUEL_END'); ygopro.stoc_send(room.dueling_players[oppo_pos - win_pos], 'DUEL_END');
ygopro.stoc_send(room.dueling_players[oppo_pos - win_pos + 1], 'DUEL_END'); ygopro.stoc_send(room.dueling_players[oppo_pos - win_pos + 1], 'DUEL_END');
room.scores[room.dueling_players[oppo_pos - win_pos].name] = 0; room.scores[room.dueling_players[oppo_pos - win_pos].name] = -1;
room.dueling_players[oppo_pos - win_pos].destroy(); room.dueling_players[oppo_pos - win_pos].destroy();
room.dueling_players[oppo_pos - win_pos + 1].destroy(); room.dueling_players[oppo_pos - win_pos + 1].destroy();
} else { } else {
...@@ -1806,7 +1806,7 @@ ...@@ -1806,7 +1806,7 @@
if (room.hostinfo.mode === 2) { if (room.hostinfo.mode === 2) {
ygopro.stoc_send(room.dueling_players[oppo_pos - win_pos], 'DUEL_END'); ygopro.stoc_send(room.dueling_players[oppo_pos - win_pos], 'DUEL_END');
ygopro.stoc_send(room.dueling_players[oppo_pos - win_pos + 1], 'DUEL_END'); ygopro.stoc_send(room.dueling_players[oppo_pos - win_pos + 1], 'DUEL_END');
room.scores[room.dueling_players[oppo_pos - win_pos].name] = 0; room.scores[room.dueling_players[oppo_pos - win_pos].name] = -1;
room.dueling_players[oppo_pos - win_pos].destroy(); room.dueling_players[oppo_pos - win_pos].destroy();
room.dueling_players[oppo_pos - win_pos + 1].destroy(); room.dueling_players[oppo_pos - win_pos + 1].destroy();
} else { } else {
...@@ -2600,7 +2600,7 @@ ...@@ -2600,7 +2600,7 @@
if (room.hostinfo.mode === 2) { if (room.hostinfo.mode === 2) {
ygopro.stoc_send(room.dueling_players[oppo_pos - win_pos + 1], 'DUEL_END'); ygopro.stoc_send(room.dueling_players[oppo_pos - win_pos + 1], 'DUEL_END');
} }
room.scores[room.dueling_players[oppo_pos - win_pos].name] = 0; room.scores[room.dueling_players[oppo_pos - win_pos].name] = -1;
room.dueling_players[oppo_pos - win_pos].destroy(); room.dueling_players[oppo_pos - win_pos].destroy();
if (room.hostinfo.mode === 2) { if (room.hostinfo.mode === 2) {
room.dueling_players[oppo_pos - win_pos + 1].destroy(); room.dueling_players[oppo_pos - win_pos + 1].destroy();
...@@ -2779,6 +2779,7 @@ ...@@ -2779,6 +2779,7 @@
if (client.side_tcount === 1) { 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_to_room(room, client.name + "${side_overtime_room}", ygopro.constants.COLORS.BABYBLUE);
ygopro.stoc_send_chat(client, "${side_overtime}", ygopro.constants.COLORS.RED); ygopro.stoc_send_chat(client, "${side_overtime}", ygopro.constants.COLORS.RED);
room.scores[client.name] = -9;
client.destroy(); client.destroy();
return clearInterval(sinterval); return clearInterval(sinterval);
} else { } else {
...@@ -3212,7 +3213,7 @@ ...@@ -3212,7 +3213,7 @@
if (room.hostinfo.mode === 2) { if (room.hostinfo.mode === 2) {
ygopro.stoc_send(room.dueling_players[oppo_pos - win_pos + 1], 'DUEL_END'); ygopro.stoc_send(room.dueling_players[oppo_pos - win_pos + 1], 'DUEL_END');
} }
room.scores[room.dueling_players[oppo_pos - win_pos].name] = 0; room.scores[room.dueling_players[oppo_pos - win_pos].name] = -1;
room.dueling_players[oppo_pos - win_pos].destroy(); room.dueling_players[oppo_pos - win_pos].destroy();
if (room.hostinfo.mode === 2) { if (room.hostinfo.mode === 2) {
room.dueling_players[oppo_pos - win_pos + 1].destroy(); room.dueling_players[oppo_pos - win_pos + 1].destroy();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment