Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
S
srvpro
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Packages
Packages
List
Container Registry
Analytics
Analytics
CI / CD
Code Review
Insights
Issues
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nanahira
srvpro
Commits
abb442a3
Commit
abb442a3
authored
Dec 30, 2018
by
nanahira
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
replay delay
parent
2a4e0b13
Changes
4
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
104 additions
and
9 deletions
+104
-9
data/default_config.json
data/default_config.json
+1
-0
data/i18n.json
data/i18n.json
+4
-0
ygopro-server.coffee
ygopro-server.coffee
+37
-4
ygopro-server.js
ygopro-server.js
+62
-5
No files found.
data/default_config.json
View file @
abb442a3
...
...
@@ -20,6 +20,7 @@
"update"
:
"请更新游戏版本"
,
"stop"
:
false
,
"side_timeout"
:
false
,
"replay_delay"
:
false
,
"i18n"
:
{
"auto_pick"
:
false
,
"default"
:
"zh-cn"
,
...
...
data/i18n.json
View file @
abb442a3
...
...
@@ -153,6 +153,8 @@
"challonge_match_already_finished"
:
"Your current match was already finished. Please call the judge for any help."
,
"challonge_match_created"
:
"A room for match only is created. Your opponent will join in automatically."
,
"challonge_player_already_in"
:
"Please do not enter the room you are already in."
,
"replay_hint_part1"
:
"Sending the replay of the duel number "
,
"replay_hint_part2"
:
"."
,
"athletic_arena_tip"
:
"During an athletic match, a game quit behavior is regarded as a surrender."
},
"es-es"
:
{
...
...
@@ -453,6 +455,8 @@
"challonge_match_already_finished"
:
"你在当前轮次的比赛已经结束,如需重赛,请联系裁判。"
,
"challonge_match_created"
:
"已建立比赛专用房间,将会自动匹配你的对手。"
,
"challonge_player_already_in"
:
"请不要重复加入比赛房间。"
,
"replay_hint_part1"
:
"正在发送第"
,
"replay_hint_part2"
:
"局决斗的录像。"
,
"athletic_arena_tip"
:
"在竞技匹配中,比赛开始前退出游戏也会视为投降。"
},
"ko-kr"
:
{
...
...
ygopro-server.coffee
View file @
abb442a3
...
...
@@ -855,6 +855,15 @@ CLIENT_heartbeat_register = (client, send) ->
CLIENT_is_banned_by_mc
=
(
client
)
->
return
client
.
ban_mc
and
client
.
ban_mc
.
banned
and
moment
().
isBefore
(
client
.
ban_mc
.
until
)
CLIENT_send_replays
=
(
client
,
room
)
->
return
false
unless
settings
.
modules
.
replay_delay
and
room
.
replays
.
length
and
room
.
hostinfo
.
mode
==
1
i
=
0
for
buffer
in
room
.
replays
++
i
ygopro
.
stoc_send_chat
(
client
,
"${replay_hint_part1}"
+
i
+
"${replay_hint_part2}"
,
ygopro
.
constants
.
COLORS
.
BABYBLUE
)
ygopro
.
stoc_send
(
client
,
"REPLAY"
,
buffer
)
return
true
class
Room
constructor
:
(
name
,
@
hostinfo
)
->
@
name
=
name
...
...
@@ -875,6 +884,8 @@ class Room
@
duel_count
=
0
@
death
=
0
@
turn
=
0
if
settings
.
modules
.
replay_delay
@
replays
=
[]
ROOM_all
.
push
this
@
hostinfo
||=
JSON
.
parse
(
JSON
.
stringify
(
settings
.
hostinfo
))
...
...
@@ -884,7 +895,6 @@ class Room
@
hostinfo
.
lflist
=
_
.
findIndex
lflists
,
(
list
)
->
list
.
tcg
else
@
hostinfo
.
lflist
=
-
1
@
hostinfo
.
replay_mode
=
if
settings
.
modules
.
tournament_mode
.
enabled
and
settings
.
modules
.
tournament_mode
.
replay_safe
then
1
else
0
if
name
[
0
...
2
]
==
'M#'
@
hostinfo
.
mode
=
1
...
...
@@ -973,6 +983,8 @@ class Room
if
(
rule
.
match
/(^|,|,)(NOWATCH|NW)(,|,|$)/
)
@
no_watch
=
true
@
hostinfo
.
replay_mode
=
if
settings
.
modules
.
tournament_mode
.
enabled
and
settings
.
modules
.
tournament_mode
.
replay_safe
or
@
hostinfo
.
mode
==
1
and
settings
.
modules
.
replay_delay
then
1
else
0
param
=
[
0
,
@
hostinfo
.
lflist
,
@
hostinfo
.
rule
,
@
hostinfo
.
mode
,
(
if
@
hostinfo
.
enable_priority
then
'T'
else
'F'
),
(
if
@
hostinfo
.
no_check_deck
then
'T'
else
'F'
),
(
if
@
hostinfo
.
no_shuffle_deck
then
'T'
else
'F'
),
@
hostinfo
.
start_lp
,
@
hostinfo
.
start_hand
,
@
hostinfo
.
draw_count
,
@
hostinfo
.
time_limit
,
@
hostinfo
.
replay_mode
]
...
...
@@ -1182,6 +1194,14 @@ class Room
challonge_duel_log
.
scoresCsv
=
"0-0"
return
challonge_duel_log
send_replays
:
()
->
return
false
unless
settings
.
modules
.
replay_delay
and
@
replays
.
length
and
@
hostinfo
.
mode
==
1
for
player
in
@
players
CLIENT_send_replays
(
player
,
this
)
for
player
in
@
watchers
CLIENT_send_replays
(
player
,
this
)
return
true
add_windbot
:
(
botdata
)
->
@
windbot
=
botdata
request
...
...
@@ -1326,6 +1346,8 @@ net.createServer (client) ->
return
unless
server
.
client
.
closed
ygopro
.
stoc_send_chat
(
server
.
client
,
"${server_closed}"
,
ygopro
.
constants
.
COLORS
.
RED
)
if
room
and
settings
.
modules
.
replay_delay
room
.
send_replays
()
CLIENT_kick
(
server
.
client
)
SERVER_clear_disconnect
(
server
)
return
...
...
@@ -1340,6 +1362,8 @@ net.createServer (client) ->
return
unless
server
.
client
.
closed
ygopro
.
stoc_send_chat
(
server
.
client
,
"${server_error}:
#{
error
}
"
,
ygopro
.
constants
.
COLORS
.
RED
)
if
room
and
settings
.
modules
.
replay_delay
room
.
send_replays
()
CLIENT_kick
(
server
.
client
)
SERVER_clear_disconnect
(
server
)
return
...
...
@@ -2060,6 +2084,7 @@ ygopro.stoc_follow 'GAME_MSG', true, (buffer, info, client, server)->
if
settings
.
modules
.
retry_handle
.
max_retry_count
and
client
.
retry_count
>=
settings
.
modules
.
retry_handle
.
max_retry_count
ygopro
.
stoc_send_chat_to_room
(
room
,
client
.
name
+
"${retry_too_much_room_part1}"
+
settings
.
modules
.
retry_handle
.
max_retry_count
+
"${retry_too_much_room_part2}"
,
ygopro
.
constants
.
COLORS
.
BABYBLUE
)
ygopro
.
stoc_send_chat
(
client
,
"${retry_too_much_part1}"
+
settings
.
modules
.
retry_handle
.
max_retry_count
+
"${retry_too_much_part2}"
,
ygopro
.
constants
.
COLORS
.
RED
)
CLIENT_send_replays
(
client
,
room
)
CLIENT_kick
(
client
)
return
true
if
client
.
last_game_msg
...
...
@@ -2663,6 +2688,7 @@ ygopro.ctos_follow 'CHAT', true, (buffer, info, client, server)->
ygopro
.
stoc_send_chat
(
client
,
"${banned_duel_tip}"
,
ygopro
.
constants
.
COLORS
.
RED
)
ROOM_ban_player
(
client
.
name
,
client
.
ip
,
"${random_ban_reason_abuse}"
)
ROOM_ban_player
(
client
.
name
,
client
.
ip
,
"${random_ban_reason_abuse}"
,
3
)
CLIENT_send_replays
(
client
,
room
)
CLIENT_kick
(
client
)
return
true
else
...
...
@@ -2757,6 +2783,7 @@ ygopro.ctos_follow 'UPDATE_DECK', true, (buffer, info, client, server)->
win_pos
=
if
room
.
scores
[
room
.
dueling_players
[
0
].
name_vpass
]
>
room
.
scores
[
room
.
dueling_players
[
oppo_pos
].
name_vpass
]
then
0
else
oppo_pos
room
.
finished_by_death
=
true
ygopro
.
stoc_send_chat_to_room
(
room
,
"${death2_finish_part1}"
+
room
.
dueling_players
[
win_pos
].
name
+
"${death2_finish_part2}"
,
ygopro
.
constants
.
COLORS
.
BABYBLUE
)
CLIENT_send_replays
(
room
.
dueling_players
[
oppo_pos
-
win_pos
],
room
)
if
room
.
hostinfo
.
mode
==
1
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
room
.
scores
[
room
.
dueling_players
[
oppo_pos
-
win_pos
].
name_vpass
]
=
-
1
...
...
@@ -2955,6 +2982,7 @@ ygopro.stoc_follow 'CHANGE_SIDE', false, (buffer, info, client, server)->
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_vpass] = -9
CLIENT_send_replays
(
client
,
room
)
CLIENT_kick
(
client
)
clearInterval
sinterval
else
...
...
@@ -2986,9 +3014,11 @@ ygopro.stoc_follow 'CHANGE_SIDE', false, (buffer, info, client, server)->
ygopro
.
stoc_follow
'REPLAY'
,
true
,
(
buffer
,
info
,
client
,
server
)
->
room
=
ROOM_all
[
client
.
rid
]
return
settings
.
modules
.
tournament_mode
.
enabled
and
settings
.
modules
.
tournament_mode
.
replay_safe
and
settings
.
modules
.
tournament_mode
.
block_replay_to_player
unless
room
return
settings
.
modules
.
tournament_mode
.
enabled
and
settings
.
modules
.
tournament_mode
.
replay_safe
and
settings
.
modules
.
tournament_mode
.
block_replay_to_player
or
settings
.
modules
.
replay_delay
and
room
.
hostinfo
.
mode
==
1
unless
room
if
settings
.
modules
.
cloud_replay
.
enabled
and
room
.
random_type
Cloud_replay_ids
.
push
room
.
cloud_replay_id
if
settings
.
modules
.
replay_delay
and
room
.
hostinfo
.
mode
==
1
and
client
.
pos
==
0
and
not
(
settings
.
modules
.
tournament_mode
.
enabled
and
settings
.
modules
.
tournament_mode
.
replay_safe
and
settings
.
modules
.
tournament_mode
.
block_replay_to_player
)
room
.
replays
.
push
(
buffer
)
if
settings
.
modules
.
tournament_mode
.
enabled
and
settings
.
modules
.
tournament_mode
.
replay_safe
if
client
.
pos
==
0
dueltime
=
moment
().
format
(
'YYYY-MM-DD HH-mm-ss'
)
...
...
@@ -3019,9 +3049,9 @@ ygopro.stoc_follow 'REPLAY', true, (buffer, info, client, server)->
)
if
settings
.
modules
.
cloud_replay
.
enabled
ygopro
.
stoc_send_chat
(
client
,
"${cloud_replay_delay_part1}R#
#{
room
.
cloud_replay_id
}
${cloud_replay_delay_part2}"
,
ygopro
.
constants
.
COLORS
.
BABYBLUE
)
return
settings
.
modules
.
tournament_mode
.
block_replay_to_player
return
settings
.
modules
.
tournament_mode
.
block_replay_to_player
or
settings
.
modules
.
replay_delay
and
room
.
hostinfo
.
mode
==
1
else
return
false
return
settings
.
modules
.
replay_delay
and
room
.
hostinfo
.
mode
==
1
if
settings
.
modules
.
random_duel
.
enabled
setInterval
()
->
...
...
@@ -3034,6 +3064,7 @@ if settings.modules.random_duel.enabled
room
.
scores
[
room
.
waiting_for_player
.
name_vpass
]
=
-
9
#log.info room.waiting_for_player.name, room.scores[room.waiting_for_player.name_vpass]
ygopro
.
stoc_send_chat_to_room
(
room
,
"
#{
room
.
waiting_for_player
.
name
}
${kicked_by_system}"
,
ygopro
.
constants
.
COLORS
.
RED
)
CLIENT_send_replays
(
room
.
waiting_for_player
,
room
)
CLIENT_kick
(
room
.
waiting_for_player
)
else
if
time_passed
>=
(
settings
.
modules
.
random_duel
.
hang_timeout
-
20
)
and
not
(
time_passed
%
10
)
ygopro
.
stoc_send_chat_to_room
(
room
,
"
#{
room
.
waiting_for_player
.
name
}
${afk_warn_part1}
#{
settings
.
modules
.
random_duel
.
hang_timeout
-
time_passed
}
${afk_warn_part2}"
,
ygopro
.
constants
.
COLORS
.
RED
)
...
...
@@ -3051,6 +3082,7 @@ if settings.modules.mycard.enabled
ygopro
.
stoc_send_chat_to_room
(
room
,
"
#{
room
.
waiting_for_player
.
name
}
${kicked_by_system}"
,
ygopro
.
constants
.
COLORS
.
RED
)
room
.
scores
[
room
.
waiting_for_player
.
name_vpass
]
=
-
9
#log.info room.waiting_for_player.name, room.scores[room.waiting_for_player.name_vpass]
CLIENT_send_replays
(
room
.
waiting_for_player
,
room
)
CLIENT_kick
(
room
.
waiting_for_player
)
else
if
time_passed
>=
(
settings
.
modules
.
random_duel
.
hang_timeout
-
20
)
and
not
(
time_passed
%
10
)
ygopro
.
stoc_send_chat_to_room
(
room
,
"
#{
room
.
waiting_for_player
.
name
}
${afk_warn_part1}
#{
settings
.
modules
.
random_duel
.
hang_timeout
-
time_passed
}
${afk_warn_part2}"
,
ygopro
.
constants
.
COLORS
.
RED
)
...
...
@@ -3314,6 +3346,7 @@ if settings.modules.http
win_pos
=
if
room
.
scores
[
room
.
dueling_players
[
0
].
name_vpass
]
>
room
.
scores
[
room
.
dueling_players
[
oppo_pos
].
name_vpass
]
then
0
else
oppo_pos
room
.
finished_by_death
=
true
ygopro
.
stoc_send_chat_to_room
(
room
,
"${death2_finish_part1}"
+
room
.
dueling_players
[
win_pos
].
name
+
"${death2_finish_part2}"
,
ygopro
.
constants
.
COLORS
.
BABYBLUE
)
CLIENT_send_replays
(
room
.
dueling_players
[
oppo_pos
-
win_pos
],
room
)
if
room
.
hostinfo
.
mode
==
1
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
room
.
scores
[
room
.
dueling_players
[
oppo_pos
-
win_pos
].
name_vpass
]
=
-
1
...
...
ygopro-server.js
View file @
abb442a3
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment