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
dea5813f
Commit
dea5813f
authored
Mar 15, 2020
by
nanahira
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
move to mr5 for everything
parent
baeaa6e3
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
8 deletions
+8
-8
ygopro-server.coffee
ygopro-server.coffee
+4
-4
ygopro-server.js
ygopro-server.js
+4
-4
No files found.
ygopro-server.coffee
View file @
dea5813f
...
@@ -212,7 +212,7 @@ if settings.hostinfo.enable_priority or settings.hostinfo.enable_priority == fal
...
@@ -212,7 +212,7 @@ if settings.hostinfo.enable_priority or settings.hostinfo.enable_priority == fal
if
settings
.
hostinfo
.
enable_priority
if
settings
.
hostinfo
.
enable_priority
settings
.
hostinfo
.
duel_rule
=
3
settings
.
hostinfo
.
duel_rule
=
3
else
else
settings
.
hostinfo
.
duel_rule
=
4
settings
.
hostinfo
.
duel_rule
=
5
delete
settings
.
hostinfo
.
enable_priority
delete
settings
.
hostinfo
.
enable_priority
imported
=
true
imported
=
true
#import the old Challonge api key option
#import the old Challonge api key option
...
@@ -1091,7 +1091,7 @@ class Room
...
@@ -1091,7 +1091,7 @@ class Room
@
hostinfo
.
no_shuffle_deck
=
true
@
hostinfo
.
no_shuffle_deck
=
true
if
(
rule
.
match
/(^|,|,)(IGPRIORITY|PR)(,|,|$)/
)
# deprecated
if
(
rule
.
match
/(^|,|,)(IGPRIORITY|PR)(,|,|$)/
)
# deprecated
@
hostinfo
.
duel_rule
=
3
@
hostinfo
.
duel_rule
=
4
if
(
param
=
rule
.
match
/(^|,|,)(DUELRULE|MR)(\d+)(,|,|$)/
)
if
(
param
=
rule
.
match
/(^|,|,)(DUELRULE|MR)(\d+)(,|,|$)/
)
duel_rule
=
parseInt
(
param
[
3
])
duel_rule
=
parseInt
(
param
[
3
])
...
@@ -1333,7 +1333,7 @@ class Room
...
@@ -1333,7 +1333,7 @@ class Room
get_old_hostinfo
:
()
->
# Just for supporting websocket roomlist in old MyCard client....
get_old_hostinfo
:
()
->
# Just for supporting websocket roomlist in old MyCard client....
ret
=
_
.
clone
(
@
hostinfo
)
ret
=
_
.
clone
(
@
hostinfo
)
ret
.
enable_priority
=
(
@
hostinfo
.
duel_rule
!=
4
)
ret
.
enable_priority
=
(
@
hostinfo
.
duel_rule
!=
5
)
return
ret
return
ret
send_replays
:
()
->
send_replays
:
()
->
...
@@ -1945,7 +1945,7 @@ ygopro.ctos_follow 'JOIN_GAME', false, (buffer, info, client, server, datas)->
...
@@ -1945,7 +1945,7 @@ ygopro.ctos_follow 'JOIN_GAME', false, (buffer, info, client, server, datas)->
time_limit
:
180
time_limit
:
180
rule
:
(
opt1
>>
5
)
&
3
rule
:
(
opt1
>>
5
)
&
3
mode
:
(
opt1
>>
3
)
&
3
mode
:
(
opt1
>>
3
)
&
3
duel_rule
:
(
if
!!
((
opt1
>>
2
)
&
1
)
then
3
else
4
)
duel_rule
:
(
if
!!
((
opt1
>>
2
)
&
1
)
then
4
else
5
)
no_check_deck
:
!!
((
opt1
>>
1
)
&
1
)
no_check_deck
:
!!
((
opt1
>>
1
)
&
1
)
no_shuffle_deck
:
!!
(
opt1
&
1
)
no_shuffle_deck
:
!!
(
opt1
&
1
)
start_lp
:
opt2
start_lp
:
opt2
...
...
ygopro-server.js
View file @
dea5813f
...
@@ -227,7 +227,7 @@
...
@@ -227,7 +227,7 @@
if
(
settings
.
hostinfo
.
enable_priority
)
{
if
(
settings
.
hostinfo
.
enable_priority
)
{
settings
.
hostinfo
.
duel_rule
=
3
;
settings
.
hostinfo
.
duel_rule
=
3
;
}
else
{
}
else
{
settings
.
hostinfo
.
duel_rule
=
4
;
settings
.
hostinfo
.
duel_rule
=
5
;
}
}
delete
settings
.
hostinfo
.
enable_priority
;
delete
settings
.
hostinfo
.
enable_priority
;
imported
=
true
;
imported
=
true
;
...
@@ -1389,7 +1389,7 @@
...
@@ -1389,7 +1389,7 @@
this
.
hostinfo
.
no_shuffle_deck
=
true
;
this
.
hostinfo
.
no_shuffle_deck
=
true
;
}
}
if
(
rule
.
match
(
/
(
^|,|,
)(
IGPRIORITY|PR
)(
,|,|$
)
/
))
{
if
(
rule
.
match
(
/
(
^|,|,
)(
IGPRIORITY|PR
)(
,|,|$
)
/
))
{
this
.
hostinfo
.
duel_rule
=
3
;
this
.
hostinfo
.
duel_rule
=
4
;
}
}
if
((
param
=
rule
.
match
(
/
(
^|,|,
)(
DUELRULE|MR
)(\d
+
)(
,|,|$
)
/
)))
{
if
((
param
=
rule
.
match
(
/
(
^|,|,
)(
DUELRULE|MR
)(\d
+
)(
,|,|$
)
/
)))
{
duel_rule
=
parseInt
(
param
[
3
]);
duel_rule
=
parseInt
(
param
[
3
]);
...
@@ -1724,7 +1724,7 @@
...
@@ -1724,7 +1724,7 @@
Room
.
prototype
.
get_old_hostinfo
=
function
()
{
Room
.
prototype
.
get_old_hostinfo
=
function
()
{
var
ret
;
var
ret
;
ret
=
_
.
clone
(
this
.
hostinfo
);
ret
=
_
.
clone
(
this
.
hostinfo
);
ret
.
enable_priority
=
this
.
hostinfo
.
duel_rule
!==
4
;
ret
.
enable_priority
=
this
.
hostinfo
.
duel_rule
!==
5
;
return
ret
;
return
ret
;
};
};
...
@@ -2451,7 +2451,7 @@
...
@@ -2451,7 +2451,7 @@
time_limit
:
180
,
time_limit
:
180
,
rule
:
(
opt1
>>
5
)
&
3
,
rule
:
(
opt1
>>
5
)
&
3
,
mode
:
(
opt1
>>
3
)
&
3
,
mode
:
(
opt1
>>
3
)
&
3
,
duel_rule
:
(
!!
((
opt1
>>
2
)
&
1
)
?
3
:
4
),
duel_rule
:
(
!!
((
opt1
>>
2
)
&
1
)
?
4
:
5
),
no_check_deck
:
!!
((
opt1
>>
1
)
&
1
),
no_check_deck
:
!!
((
opt1
>>
1
)
&
1
),
no_shuffle_deck
:
!!
(
opt1
&
1
),
no_shuffle_deck
:
!!
(
opt1
&
1
),
start_lp
:
opt2
,
start_lp
:
opt2
,
...
...
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