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
1
Issues
1
List
Boards
Labels
Service Desk
Milestones
Merge Requests
3
Merge Requests
3
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Packages
Packages
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
MyCard
srvpro
Commits
70290bf9
Commit
70290bf9
authored
May 10, 2020
by
nanahira
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix recover
parent
bad8e126
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
18 additions
and
4 deletions
+18
-4
ygopro-server.coffee
ygopro-server.coffee
+9
-2
ygopro-server.js
ygopro-server.js
+9
-2
No files found.
ygopro-server.coffee
View file @
70290bf9
...
@@ -1178,7 +1178,7 @@ class Room
...
@@ -1178,7 +1178,7 @@ class Room
@
recover_from_turn
=
parseInt
(
param
[
4
])
@
recover_from_turn
=
parseInt
(
param
[
4
])
duel_log_id
=
parseInt
(
param
[
3
])
duel_log_id
=
parseInt
(
param
[
3
])
@
recover_duel_log
=
_
.
find
(
duel_log
.
duel_log
,
(
duel
)
->
@
recover_duel_log
=
_
.
find
(
duel_log
.
duel_log
,
(
duel
)
->
return
duel
.
id
==
duel_log_id
and
duel
.
roommode
!=
2
return
duel
.
id
==
duel_log_id
and
duel
.
roommode
!=
2
and
duel
.
players
[
0
].
deck
)
)
if
!
@
recover_duel_log
||
!
fs
.
existsSync
(
settings
.
modules
.
tournament_mode
.
replay_path
+
@
recover_duel_log
.
replay_filename
)
if
!
@
recover_duel_log
||
!
fs
.
existsSync
(
settings
.
modules
.
tournament_mode
.
replay_path
+
@
recover_duel_log
.
replay_filename
)
@
error
=
"${cloud_replay_no}"
@
error
=
"${cloud_replay_no}"
...
@@ -1968,7 +1968,7 @@ ygopro.ctos_follow 'JOIN_GAME', false, (buffer, info, client, server, datas)->
...
@@ -1968,7 +1968,7 @@ ygopro.ctos_follow 'JOIN_GAME', false, (buffer, info, client, server, datas)->
else
if
info
.
pass
.
toUpperCase
()
==
"RC"
and
settings
.
modules
.
tournament_mode
.
enable_recover
else
if
info
.
pass
.
toUpperCase
()
==
"RC"
and
settings
.
modules
.
tournament_mode
.
enable_recover
ygopro
.
stoc_send_chat
(
client
,
"${recover_replay_hint}"
,
ygopro
.
constants
.
COLORS
.
BABYBLUE
)
ygopro
.
stoc_send_chat
(
client
,
"${recover_replay_hint}"
,
ygopro
.
constants
.
COLORS
.
BABYBLUE
)
available_logs
=
duel_log
.
duel_log
.
filter
((
duel
)
->
available_logs
=
duel_log
.
duel_log
.
filter
((
duel
)
->
return
duel
.
roommode
!=
2
and
_
.
any
(
duel
.
players
,
(
player
)
->
return
duel
.
id
and
duel
.
players
[
0
].
deck
and
duel
.
roommode
!=
2
and
_
.
any
(
duel
.
players
,
(
player
)
->
return
player
.
real_name
==
client
.
name_vpass
return
player
.
real_name
==
client
.
name_vpass
)
)
).
slice
(
0
,
8
)
).
slice
(
0
,
8
)
...
@@ -3321,6 +3321,9 @@ ygopro.ctos_follow 'UPDATE_DECK', true, (buffer, info, client, server, datas)->
...
@@ -3321,6 +3321,9 @@ ygopro.ctos_follow 'UPDATE_DECK', true, (buffer, info, client, server, datas)->
return
player
.
real_name
==
client
.
name_vpass
and
_
.
isEqual
(
buffer
,
Buffer
.
from
(
player
.
deckbuf
,
"base64"
))
return
player
.
real_name
==
client
.
name_vpass
and
_
.
isEqual
(
buffer
,
Buffer
.
from
(
player
.
deckbuf
,
"base64"
))
)
)
if
recover_player_data
if
recover_player_data
struct
.
set
(
"mainc"
,
recover_player_data
.
deck
.
main
.
length
)
struct
.
set
(
"sidec"
,
recover_player_data
.
deck
.
side
.
length
)
struct
.
set
(
"deckbuf"
,
recover_player_data
.
deck
.
main
.
concat
(
recover_player_data
.
deck
.
side
))
if
recover_player_data
.
is_first
if
recover_player_data
.
is_first
room
.
determine_firstgo
=
client
room
.
determine_firstgo
=
client
else
else
...
@@ -3595,6 +3598,10 @@ ygopro.stoc_follow 'REPLAY', true, (buffer, info, client, server, datas)->
...
@@ -3595,6 +3598,10 @@ ygopro.stoc_follow 'REPLAY', true, (buffer, info, client, server, datas)->
players
:
(
for
player
in
room
.
dueling_players
players
:
(
for
player
in
room
.
dueling_players
real_name
:
player
.
name_vpass
,
real_name
:
player
.
name_vpass
,
deckbuf
:
player
.
start_deckbuf
.
toString
(
"base64"
),
deckbuf
:
player
.
start_deckbuf
.
toString
(
"base64"
),
deck
:
{
main
:
player
.
main
,
side
:
player
.
side
}
pos
:
player
.
pos
pos
:
player
.
pos
is_first
:
player
.
is_first
is_first
:
player
.
is_first
name
:
player
.
name
+
(
if
settings
.
modules
.
tournament_mode
.
show_ip
and
!
player
.
is_local
then
(
" (IP: "
+
player
.
ip
.
slice
(
7
)
+
")"
)
else
""
)
+
(
if
settings
.
modules
.
tournament_mode
.
show_info
and
not
(
room
.
hostinfo
.
mode
==
2
and
player
.
pos
%
2
>
0
)
then
(
" (Score:"
+
room
.
scores
[
player
.
name_vpass
]
+
" LP:"
+
(
if
player
.
lp
?
then
player
.
lp
else
room
.
hostinfo
.
start_lp
)
+
(
if
room
.
hostinfo
.
mode
!=
2
then
(
" Cards:"
+
(
if
player
.
card_count
?
then
player
.
card_count
else
room
.
hostinfo
.
start_hand
))
else
""
)
+
")"
)
else
""
),
name
:
player
.
name
+
(
if
settings
.
modules
.
tournament_mode
.
show_ip
and
!
player
.
is_local
then
(
" (IP: "
+
player
.
ip
.
slice
(
7
)
+
")"
)
else
""
)
+
(
if
settings
.
modules
.
tournament_mode
.
show_info
and
not
(
room
.
hostinfo
.
mode
==
2
and
player
.
pos
%
2
>
0
)
then
(
" (Score:"
+
room
.
scores
[
player
.
name_vpass
]
+
" LP:"
+
(
if
player
.
lp
?
then
player
.
lp
else
room
.
hostinfo
.
start_lp
)
+
(
if
room
.
hostinfo
.
mode
!=
2
then
(
" Cards:"
+
(
if
player
.
card_count
?
then
player
.
card_count
else
room
.
hostinfo
.
start_hand
))
else
""
)
+
")"
)
else
""
),
...
...
ygopro-server.js
View file @
70290bf9
...
@@ -1560,7 +1560,7 @@
...
@@ -1560,7 +1560,7 @@
this
.
recover_from_turn
=
parseInt
(
param
[
4
]);
this
.
recover_from_turn
=
parseInt
(
param
[
4
]);
duel_log_id
=
parseInt
(
param
[
3
]);
duel_log_id
=
parseInt
(
param
[
3
]);
this
.
recover_duel_log
=
_
.
find
(
duel_log
.
duel_log
,
function
(
duel
)
{
this
.
recover_duel_log
=
_
.
find
(
duel_log
.
duel_log
,
function
(
duel
)
{
return
duel
.
id
===
duel_log_id
&&
duel
.
roommode
!==
2
;
return
duel
.
id
===
duel_log_id
&&
duel
.
roommode
!==
2
&&
duel
.
players
[
0
].
deck
;
});
});
if
(
!
this
.
recover_duel_log
||
!
fs
.
existsSync
(
settings
.
modules
.
tournament_mode
.
replay_path
+
this
.
recover_duel_log
.
replay_filename
))
{
if
(
!
this
.
recover_duel_log
||
!
fs
.
existsSync
(
settings
.
modules
.
tournament_mode
.
replay_path
+
this
.
recover_duel_log
.
replay_filename
))
{
this
.
error
=
"
${cloud_replay_no}
"
;
this
.
error
=
"
${cloud_replay_no}
"
;
...
@@ -2629,7 +2629,7 @@
...
@@ -2629,7 +2629,7 @@
}
else
if
(
info
.
pass
.
toUpperCase
()
===
"
RC
"
&&
settings
.
modules
.
tournament_mode
.
enable_recover
)
{
}
else
if
(
info
.
pass
.
toUpperCase
()
===
"
RC
"
&&
settings
.
modules
.
tournament_mode
.
enable_recover
)
{
ygopro
.
stoc_send_chat
(
client
,
"
${recover_replay_hint}
"
,
ygopro
.
constants
.
COLORS
.
BABYBLUE
);
ygopro
.
stoc_send_chat
(
client
,
"
${recover_replay_hint}
"
,
ygopro
.
constants
.
COLORS
.
BABYBLUE
);
available_logs
=
duel_log
.
duel_log
.
filter
(
function
(
duel
)
{
available_logs
=
duel_log
.
duel_log
.
filter
(
function
(
duel
)
{
return
duel
.
roommode
!==
2
&&
_
.
any
(
duel
.
players
,
function
(
player
)
{
return
duel
.
id
&&
duel
.
players
[
0
].
deck
&&
duel
.
roommode
!==
2
&&
_
.
any
(
duel
.
players
,
function
(
player
)
{
return
player
.
real_name
===
client
.
name_vpass
;
return
player
.
real_name
===
client
.
name_vpass
;
});
});
}).
slice
(
0
,
8
);
}).
slice
(
0
,
8
);
...
@@ -4421,6 +4421,9 @@
...
@@ -4421,6 +4421,9 @@
return
player
.
real_name
===
client
.
name_vpass
&&
_
.
isEqual
(
buffer
,
Buffer
.
from
(
player
.
deckbuf
,
"
base64
"
));
return
player
.
real_name
===
client
.
name_vpass
&&
_
.
isEqual
(
buffer
,
Buffer
.
from
(
player
.
deckbuf
,
"
base64
"
));
});
});
if
(
recover_player_data
)
{
if
(
recover_player_data
)
{
struct
.
set
(
"
mainc
"
,
recover_player_data
.
deck
.
main
.
length
);
struct
.
set
(
"
sidec
"
,
recover_player_data
.
deck
.
side
.
length
);
struct
.
set
(
"
deckbuf
"
,
recover_player_data
.
deck
.
main
.
concat
(
recover_player_data
.
deck
.
side
));
if
(
recover_player_data
.
is_first
)
{
if
(
recover_player_data
.
is_first
)
{
room
.
determine_firstgo
=
client
;
room
.
determine_firstgo
=
client
;
}
}
...
@@ -4810,6 +4813,10 @@
...
@@ -4810,6 +4813,10 @@
results
.
push
({
results
.
push
({
real_name
:
player
.
name_vpass
,
real_name
:
player
.
name_vpass
,
deckbuf
:
player
.
start_deckbuf
.
toString
(
"
base64
"
),
deckbuf
:
player
.
start_deckbuf
.
toString
(
"
base64
"
),
deck
:
{
main
:
player
.
main
,
side
:
player
.
side
},
pos
:
player
.
pos
,
pos
:
player
.
pos
,
is_first
:
player
.
is_first
,
is_first
:
player
.
is_first
,
name
:
player
.
name
+
(
settings
.
modules
.
tournament_mode
.
show_ip
&&
!
player
.
is_local
?
"
(IP:
"
+
player
.
ip
.
slice
(
7
)
+
"
)
"
:
""
)
+
(
settings
.
modules
.
tournament_mode
.
show_info
&&
!
(
room
.
hostinfo
.
mode
===
2
&&
player
.
pos
%
2
>
0
)
?
"
(Score:
"
+
room
.
scores
[
player
.
name_vpass
]
+
"
LP:
"
+
(
player
.
lp
!=
null
?
player
.
lp
:
room
.
hostinfo
.
start_lp
)
+
(
room
.
hostinfo
.
mode
!==
2
?
"
Cards:
"
+
(
player
.
card_count
!=
null
?
player
.
card_count
:
room
.
hostinfo
.
start_hand
)
:
""
)
+
"
)
"
:
""
),
name
:
player
.
name
+
(
settings
.
modules
.
tournament_mode
.
show_ip
&&
!
player
.
is_local
?
"
(IP:
"
+
player
.
ip
.
slice
(
7
)
+
"
)
"
:
""
)
+
(
settings
.
modules
.
tournament_mode
.
show_info
&&
!
(
room
.
hostinfo
.
mode
===
2
&&
player
.
pos
%
2
>
0
)
?
"
(Score:
"
+
room
.
scores
[
player
.
name_vpass
]
+
"
LP:
"
+
(
player
.
lp
!=
null
?
player
.
lp
:
room
.
hostinfo
.
start_lp
)
+
(
room
.
hostinfo
.
mode
!==
2
?
"
Cards:
"
+
(
player
.
card_count
!=
null
?
player
.
card_count
:
room
.
hostinfo
.
start_hand
)
:
""
)
+
"
)
"
:
""
),
...
...
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