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
c23f32f5
Commit
c23f32f5
authored
Dec 12, 2021
by
nanahira
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'mc'
parents
ae4550c4
31e593c7
Pipeline
#7735
passed with stages
in 84 minutes and 46 seconds
Changes
6
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
124 additions
and
82 deletions
+124
-82
athletic-check.js
athletic-check.js
+1
-1
athletic-check.ts
athletic-check.ts
+3
-3
data/default_config.json
data/default_config.json
+1
-0
data/i18n.json
data/i18n.json
+4
-0
ygopro-server.coffee
ygopro-server.coffee
+50
-35
ygopro-server.js
ygopro-server.js
+65
-43
No files found.
athletic-check.js
View file @
c23f32f5
...
...
@@ -45,7 +45,7 @@ class AthleticChecker {
try
{
const
athleticDecks
=
await
this
.
getAthleticDecks
();
const
deckType
=
await
this
.
getDeckType
(
deck
);
const
athletic
=
athleticDecks
.
includes
(
deckType
)
;
const
athletic
=
athleticDecks
.
findIndex
(
d
=>
d
===
deckType
)
+
1
;
return
{
success
:
true
,
athletic
,
message
:
null
};
}
catch
(
e
)
{
...
...
athletic-check.ts
View file @
c23f32f5
...
...
@@ -21,7 +21,7 @@ interface AthleticDecksReturnData {
interface
ReturnMessage
{
success
:
boolean
;
athletic
?:
boolean
;
athletic
?:
number
;
message
:
string
;
}
...
...
@@ -63,8 +63,8 @@ export class AthleticChecker {
try
{
const
athleticDecks
=
await
this
.
getAthleticDecks
();
const
deckType
=
await
this
.
getDeckType
(
deck
);
const
athletic
=
athleticDecks
.
includes
(
deckType
)
;
return
{
success
:
true
,
athletic
,
message
:
null
}
const
athletic
=
athleticDecks
.
findIndex
(
d
=>
d
===
deckType
)
+
1
;
return
{
success
:
true
,
athletic
,
message
:
null
}
;
}
catch
(
e
)
{
return
{
success
:
false
,
message
:
e
.
toString
()
};
}
...
...
data/default_config.json
View file @
c23f32f5
...
...
@@ -220,6 +220,7 @@
"source"
:
"mycard-athletic"
},
"rankCount"
:
10
,
"banCount"
:
0
,
"ttl"
:
600
},
"test_mode"
:
{
...
...
data/i18n.json
View file @
c23f32f5
...
...
@@ -206,6 +206,8 @@
"windbot_disable_random_room"
:
"By adding the AI, this random game won't get any new player unless they enter the room name:"
,
"refresh_success"
:
"Refresh field succeeded."
,
"refresh_failed"
:
"Refresh field failed."
,
"banned_athletic_deck_part1"
:
"Entertainment Mode does not allow top "
,
"banned_athletic_deck_part2"
:
" popular meta decks. Please change your deck."
,
"using_athletic_deck"
:
" is using a competitive deck."
},
"es-es"
:
{
...
...
@@ -561,6 +563,8 @@
"windbot_disable_random_room"
:
"因为添加了AI,本随机对战房间将只能通过房间名加入:"
,
"refresh_success"
:
"刷新场面成功。"
,
"refresh_fail"
:
"刷新场面失败。"
,
"banned_athletic_deck_part1"
:
"娱乐匹配中禁止使用使用数前"
,
"banned_athletic_deck_part2"
:
"的竞技卡组。请更换卡组。"
,
"using_athletic_deck"
:
" 正在使用竞技卡组。"
},
"ko-kr"
:
{
...
...
ygopro-server.coffee
View file @
c23f32f5
...
...
@@ -3629,42 +3629,57 @@ ygopro.ctos_follow 'UPDATE_DECK', true, (buffer, info, client, server, datas)->
struct
.
set
(
"sidec"
,
1
)
struct
.
set
(
"deckbuf"
,
[
4392470
,
4392470
])
ygopro
.
stoc_send_chat
(
client
,
"${deck_incorrect_reconnect}"
,
ygopro
.
constants
.
COLORS
.
RED
)
else
if
room
.
duel_stage
==
ygopro
.
constants
.
DUEL_STAGE
.
BEGIN
and
settings
.
modules
.
tournament_mode
.
enabled
and
settings
.
modules
.
tournament_mode
.
deck_check
decks
=
await
fs
.
promises
.
readdir
(
settings
.
modules
.
tournament_mode
.
deck_path
)
if
decks
.
length
struct
.
set
(
"mainc"
,
1
)
struct
.
set
(
"sidec"
,
1
)
struct
.
set
(
"deckbuf"
,
[
4392470
,
4392470
])
buffer
=
struct
.
buffer
found_deck
=
false
for
deck
in
decks
if
deck_name_match
(
deck
,
client
.
name
)
found_deck
=
deck
if
found_deck
deck_text
=
await
fs
.
promises
.
readFile
(
settings
.
modules
.
tournament_mode
.
deck_path
+
found_deck
,{
encoding
:
"ASCII"
})
deck_array
=
deck_text
.
split
(
"
\n
"
)
deck_main
=
[]
deck_side
=
[]
current_deck
=
deck_main
for
line
in
deck_array
if
line
.
indexOf
(
"!side"
)
>=
0
current_deck
=
deck_side
card
=
parseInt
(
line
)
current_deck
.
push
(
card
)
unless
isNaN
(
card
)
if
_
.
isEqual
(
buff_main
,
deck_main
)
and
_
.
isEqual
(
buff_side
,
deck_side
)
deckbuf
=
deck_main
.
concat
(
deck_side
)
struct
.
set
(
"mainc"
,
deck_main
.
length
)
struct
.
set
(
"sidec"
,
deck_side
.
length
)
struct
.
set
(
"deckbuf"
,
deckbuf
)
buffer
=
struct
.
buffer
#log.info("deck ok: " + client.name)
ygopro
.
stoc_send_chat
(
client
,
"${deck_correct_part1}
#{
found_deck
}
${deck_correct_part2}"
,
ygopro
.
constants
.
COLORS
.
BABYBLUE
)
else
#log.info("bad deck: " + client.name + " / " + buff_main + " / " + buff_side)
ygopro
.
stoc_send_chat
(
client
,
"${deck_incorrect_part1}
#{
found_deck
}
${deck_incorrect_part2}"
,
ygopro
.
constants
.
COLORS
.
RED
)
return
false
else
if
settings
.
modules
.
athletic_check
.
enabled
and
settings
.
modules
.
athletic_check
.
banCount
athleticCheckResult
=
await
athleticChecker
.
checkAthletic
({
main
:
buff_main
,
side
:
buff_side
})
if
athleticCheckResult
.
success
if
athleticCheckResult
.
athletic
and
athleticCheckResult
.
athletic
<=
settings
.
modules
.
athletic_check
.
banCount
struct
.
set
(
"mainc"
,
1
)
struct
.
set
(
"sidec"
,
1
)
struct
.
set
(
"deckbuf"
,
[
4392470
,
4392470
])
ygopro
.
stoc_send_chat
(
client
,
"${banned_athletic_deck_part1}
#{
settings
.
modules
.
athletic_check
.
banCount
}
${banned_athletic_deck_part2}"
,
ygopro
.
constants
.
COLORS
.
RED
)
return
false
else
#log.info("player deck not found: " + client.name)
ygopro
.
stoc_send_chat
(
client
,
"
#{
client
.
name
}
${deck_not_found}"
,
ygopro
.
constants
.
COLORS
.
RED
)
log
.
warn
(
"GET ATHLETIC FAIL"
,
client
.
name
,
athleticCheckResult
.
message
)
if
room
.
duel_stage
==
ygopro
.
constants
.
DUEL_STAGE
.
BEGIN
and
settings
.
modules
.
tournament_mode
.
enabled
and
settings
.
modules
.
tournament_mode
.
deck_check
decks
=
await
fs
.
promises
.
readdir
(
settings
.
modules
.
tournament_mode
.
deck_path
)
if
decks
.
length
struct
.
set
(
"mainc"
,
1
)
struct
.
set
(
"sidec"
,
1
)
struct
.
set
(
"deckbuf"
,
[
4392470
,
4392470
])
buffer
=
struct
.
buffer
found_deck
=
false
for
deck
in
decks
if
deck_name_match
(
deck
,
client
.
name
)
found_deck
=
deck
if
found_deck
deck_text
=
await
fs
.
promises
.
readFile
(
settings
.
modules
.
tournament_mode
.
deck_path
+
found_deck
,{
encoding
:
"ASCII"
})
deck_array
=
deck_text
.
split
(
"
\n
"
)
deck_main
=
[]
deck_side
=
[]
current_deck
=
deck_main
for
line
in
deck_array
if
line
.
indexOf
(
"!side"
)
>=
0
current_deck
=
deck_side
card
=
parseInt
(
line
)
current_deck
.
push
(
card
)
unless
isNaN
(
card
)
if
_
.
isEqual
(
buff_main
,
deck_main
)
and
_
.
isEqual
(
buff_side
,
deck_side
)
deckbuf
=
deck_main
.
concat
(
deck_side
)
struct
.
set
(
"mainc"
,
deck_main
.
length
)
struct
.
set
(
"sidec"
,
deck_side
.
length
)
struct
.
set
(
"deckbuf"
,
deckbuf
)
buffer
=
struct
.
buffer
#log.info("deck ok: " + client.name)
ygopro
.
stoc_send_chat
(
client
,
"${deck_correct_part1}
#{
found_deck
}
${deck_correct_part2}"
,
ygopro
.
constants
.
COLORS
.
BABYBLUE
)
else
#log.info("bad deck: " + client.name + " / " + buff_main + " / " + buff_side)
ygopro
.
stoc_send_chat
(
client
,
"${deck_incorrect_part1}
#{
found_deck
}
${deck_incorrect_part2}"
,
ygopro
.
constants
.
COLORS
.
RED
)
return
false
else
#log.info("player deck not found: " + client.name)
ygopro
.
stoc_send_chat
(
client
,
"
#{
client
.
name
}
${deck_not_found}"
,
ygopro
.
constants
.
COLORS
.
RED
)
return
false
await
return
false
ygopro
.
ctos_follow
'RESPONSE'
,
false
,
(
buffer
,
info
,
client
,
server
,
datas
)
->
...
...
ygopro-server.js
View file @
c23f32f5
...
...
@@ -4752,7 +4752,7 @@
});
ygopro
.
ctos_follow
(
'
UPDATE_DECK
'
,
true
,
async
function
(
buffer
,
info
,
client
,
server
,
datas
)
{
var
buff_main
,
buff_side
,
card
,
current_deck
,
deck
,
deck_array
,
deck_main
,
deck_side
,
deck_text
,
deckbuf
,
decks
,
found_deck
,
i
,
j
,
l
,
len
,
len1
,
line
,
oppo_pos
,
recover_player_data
,
recoveredDeck
,
room
,
struct
,
win_pos
;
var
athleticCheckResult
,
buff_main
,
buff_side
,
card
,
current_deck
,
deck
,
deck_array
,
deck_main
,
deck_side
,
deck_text
,
deckbuf
,
decks
,
found_deck
,
i
,
j
,
l
,
len
,
len1
,
line
,
oppo_pos
,
recover_player_data
,
recoveredDeck
,
room
,
struct
,
win_pos
;
if
(
settings
.
modules
.
reconnect
.
enabled
&&
client
.
pre_reconnecting
)
{
if
(
!
CLIENT_is_able_to_reconnect
(
client
)
&&
!
CLIENT_is_able_to_kick_reconnect
(
client
))
{
ygopro
.
stoc_send_chat
(
client
,
"
${reconnect_failed}
"
,
ygopro
.
constants
.
COLORS
.
RED
);
...
...
@@ -4847,54 +4847,76 @@
struct
.
set
(
"
sidec
"
,
1
);
struct
.
set
(
"
deckbuf
"
,
[
4392470
,
4392470
]);
ygopro
.
stoc_send_chat
(
client
,
"
${deck_incorrect_reconnect}
"
,
ygopro
.
constants
.
COLORS
.
RED
);
return
false
;
}
}
else
if
(
room
.
duel_stage
===
ygopro
.
constants
.
DUEL_STAGE
.
BEGIN
&&
settings
.
modules
.
tournament_mode
.
enabled
&&
settings
.
modules
.
tournament_mode
.
deck_check
)
{
decks
=
(
await
fs
.
promises
.
readdir
(
settings
.
modules
.
tournament_mode
.
deck_path
));
if
(
decks
.
length
)
{
struct
.
set
(
"
mainc
"
,
1
);
struct
.
set
(
"
sidec
"
,
1
);
struct
.
set
(
"
deckbuf
"
,
[
4392470
,
4392470
]);
buffer
=
struct
.
buffer
;
found_deck
=
false
;
for
(
j
=
0
,
len
=
decks
.
length
;
j
<
len
;
j
++
)
{
deck
=
decks
[
j
];
if
(
deck_name_match
(
deck
,
client
.
name
))
{
found_deck
=
deck
;
}
else
{
if
(
settings
.
modules
.
athletic_check
.
enabled
&&
settings
.
modules
.
athletic_check
.
banCount
)
{
athleticCheckResult
=
(
await
athleticChecker
.
checkAthletic
({
main
:
buff_main
,
side
:
buff_side
}));
if
(
athleticCheckResult
.
success
)
{
if
(
athleticCheckResult
.
athletic
&&
athleticCheckResult
.
athletic
<=
settings
.
modules
.
athletic_check
.
banCount
)
{
struct
.
set
(
"
mainc
"
,
1
);
struct
.
set
(
"
sidec
"
,
1
);
struct
.
set
(
"
deckbuf
"
,
[
4392470
,
4392470
]);
ygopro
.
stoc_send_chat
(
client
,
`\${banned_athletic_deck_part1}
${
settings
.
modules
.
athletic_check
.
banCount
}
\${banned_athletic_deck_part2}`
,
ygopro
.
constants
.
COLORS
.
RED
);
return
false
;
}
}
if
(
found_deck
)
{
deck_text
=
(
await
fs
.
promises
.
readFile
(
settings
.
modules
.
tournament_mode
.
deck_path
+
found_deck
,
{
encoding
:
"
ASCII
"
}));
deck_array
=
deck_text
.
split
(
"
\n
"
);
deck_main
=
[];
deck_side
=
[];
current_deck
=
deck_main
;
for
(
l
=
0
,
len1
=
deck_array
.
length
;
l
<
len1
;
l
++
)
{
line
=
deck_array
[
l
];
if
(
line
.
indexOf
(
"
!side
"
)
>=
0
)
{
current_deck
=
deck_side
;
}
card
=
parseInt
(
line
);
if
(
!
isNaN
(
card
))
{
current_deck
.
push
(
card
);
}
else
{
log
.
warn
(
"
GET ATHLETIC FAIL
"
,
client
.
name
,
athleticCheckResult
.
message
);
}
}
if
(
room
.
duel_stage
===
ygopro
.
constants
.
DUEL_STAGE
.
BEGIN
&&
settings
.
modules
.
tournament_mode
.
enabled
&&
settings
.
modules
.
tournament_mode
.
deck_check
)
{
decks
=
(
await
fs
.
promises
.
readdir
(
settings
.
modules
.
tournament_mode
.
deck_path
));
if
(
decks
.
length
)
{
struct
.
set
(
"
mainc
"
,
1
);
struct
.
set
(
"
sidec
"
,
1
);
struct
.
set
(
"
deckbuf
"
,
[
4392470
,
4392470
]);
buffer
=
struct
.
buffer
;
found_deck
=
false
;
for
(
j
=
0
,
len
=
decks
.
length
;
j
<
len
;
j
++
)
{
deck
=
decks
[
j
];
if
(
deck_name_match
(
deck
,
client
.
name
))
{
found_deck
=
deck
;
}
}
if
(
_
.
isEqual
(
buff_main
,
deck_main
)
&&
_
.
isEqual
(
buff_side
,
deck_side
))
{
deckbuf
=
deck_main
.
concat
(
deck_side
);
struct
.
set
(
"
mainc
"
,
deck_main
.
length
);
struct
.
set
(
"
sidec
"
,
deck_side
.
length
);
struct
.
set
(
"
deckbuf
"
,
deckbuf
);
buffer
=
struct
.
buffer
;
//log.info("deck ok: " + client.name)
ygopro
.
stoc_send_chat
(
client
,
`\${deck_correct_part1}
${
found_deck
}
\${deck_correct_part2}`
,
ygopro
.
constants
.
COLORS
.
BABYBLUE
);
if
(
found_deck
)
{
deck_text
=
(
await
fs
.
promises
.
readFile
(
settings
.
modules
.
tournament_mode
.
deck_path
+
found_deck
,
{
encoding
:
"
ASCII
"
}));
deck_array
=
deck_text
.
split
(
"
\n
"
);
deck_main
=
[];
deck_side
=
[];
current_deck
=
deck_main
;
for
(
l
=
0
,
len1
=
deck_array
.
length
;
l
<
len1
;
l
++
)
{
line
=
deck_array
[
l
];
if
(
line
.
indexOf
(
"
!side
"
)
>=
0
)
{
current_deck
=
deck_side
;
}
card
=
parseInt
(
line
);
if
(
!
isNaN
(
card
))
{
current_deck
.
push
(
card
);
}
}
if
(
_
.
isEqual
(
buff_main
,
deck_main
)
&&
_
.
isEqual
(
buff_side
,
deck_side
))
{
deckbuf
=
deck_main
.
concat
(
deck_side
);
struct
.
set
(
"
mainc
"
,
deck_main
.
length
);
struct
.
set
(
"
sidec
"
,
deck_side
.
length
);
struct
.
set
(
"
deckbuf
"
,
deckbuf
);
buffer
=
struct
.
buffer
;
//log.info("deck ok: " + client.name)
ygopro
.
stoc_send_chat
(
client
,
`\${deck_correct_part1}
${
found_deck
}
\${deck_correct_part2}`
,
ygopro
.
constants
.
COLORS
.
BABYBLUE
);
}
else
{
//log.info("bad deck: " + client.name + " / " + buff_main + " / " + buff_side)
ygopro
.
stoc_send_chat
(
client
,
`\${deck_incorrect_part1}
${
found_deck
}
\${deck_incorrect_part2}`
,
ygopro
.
constants
.
COLORS
.
RED
);
return
false
;
}
}
else
{
//log.info("bad deck: " + client.name + " / " + buff_main + " / " + buff_side)
ygopro
.
stoc_send_chat
(
client
,
`\${deck_incorrect_part1}
${
found_deck
}
\${deck_incorrect_part2}`
,
ygopro
.
constants
.
COLORS
.
RED
);
//log.info("player deck not found: " + client.name)
ygopro
.
stoc_send_chat
(
client
,
`
${
client
.
name
}
\${deck_not_found}`
,
ygopro
.
constants
.
COLORS
.
RED
);
return
false
;
}
}
else
{
//log.info("player deck not found: " + client.name)
ygopro
.
stoc_send_chat
(
client
,
`
${
client
.
name
}
\${deck_not_found}`
,
ygopro
.
constants
.
COLORS
.
RED
);
}
}
}
...
...
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