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
b2f27e6e
Commit
b2f27e6e
authored
Apr 28, 2023
by
nanahira
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix otp same lp handle
parent
f91fac8b
Pipeline
#21406
passed with stages
in 9 minutes and 28 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
4 deletions
+13
-4
ygopro-server.coffee
ygopro-server.coffee
+6
-2
ygopro-server.js
ygopro-server.js
+7
-2
No files found.
ygopro-server.coffee
View file @
b2f27e6e
...
...
@@ -1824,7 +1824,11 @@ class Room
if
@
duel_stage
==
ygopro
.
constants
.
DUEL_STAGE
.
DUELING
switch
settings
.
modules
.
http
.
quick_death_rule
when
4
# instant death
win_pos
=
if
@
dueling_players
[
0
].
lp
>
@
dueling_players
[
oppo_pos
].
lp
then
0
else
oppo_pos
win_pos
=
0
if
@
dueling_players
[
0
].
lp
==
@
dueling_players
[
oppo_pos
].
lp
win_pos
=
if
@
dueling_players
[
oppo_pos
].
is_first
then
0
else
oppo_pos
else
win_pos
=
if
@
dueling_players
[
0
].
lp
>
@
dueling_players
[
oppo_pos
].
lp
then
0
else
oppo_pos
ygopro
.
stoc_send_chat_to_room
(
this
,
"${death_finish_part1}"
+
@
dueling_players
[
win_pos
].
name
+
"${death_finish_part2}"
,
ygopro
.
constants
.
COLORS
.
BABYBLUE
)
ygopro
.
ctos_send
(
@
dueling_players
[
oppo_pos
-
win_pos
].
server
,
'SURRENDER'
)
when
3
...
...
@@ -1856,7 +1860,7 @@ class Room
when
1
@
death
=
-
1
ygopro
.
stoc_send_chat_to_room
(
this
,
"${death_start_quick}"
,
ygopro
.
constants
.
COLORS
.
BABYBLUE
)
else
when
0
@
death
=
5
ygopro
.
stoc_send_chat_to_room
(
this
,
"${death_start_siding}"
,
ygopro
.
constants
.
COLORS
.
BABYBLUE
)
return
true
...
...
ygopro-server.js
View file @
b2f27e6e
...
...
@@ -2422,7 +2422,12 @@
if
(
this
.
duel_stage
===
ygopro
.
constants
.
DUEL_STAGE
.
DUELING
)
{
switch
(
settings
.
modules
.
http
.
quick_death_rule
)
{
case
4
:
// instant death
win_pos
=
this
.
dueling_players
[
0
].
lp
>
this
.
dueling_players
[
oppo_pos
].
lp
?
0
:
oppo_pos
;
win_pos
=
0
;
if
(
this
.
dueling_players
[
0
].
lp
===
this
.
dueling_players
[
oppo_pos
].
lp
)
{
win_pos
=
this
.
dueling_players
[
oppo_pos
].
is_first
?
0
:
oppo_pos
;
}
else
{
win_pos
=
this
.
dueling_players
[
0
].
lp
>
this
.
dueling_players
[
oppo_pos
].
lp
?
0
:
oppo_pos
;
}
ygopro
.
stoc_send_chat_to_room
(
this
,
"
${death_finish_part1}
"
+
this
.
dueling_players
[
win_pos
].
name
+
"
${death_finish_part2}
"
,
ygopro
.
constants
.
COLORS
.
BABYBLUE
);
ygopro
.
ctos_send
(
this
.
dueling_players
[
oppo_pos
-
win_pos
].
server
,
'
SURRENDER
'
);
break
;
...
...
@@ -2468,7 +2473,7 @@
this
.
death
=
-
1
;
ygopro
.
stoc_send_chat_to_room
(
this
,
"
${death_start_quick}
"
,
ygopro
.
constants
.
COLORS
.
BABYBLUE
);
break
;
default
:
case
0
:
this
.
death
=
5
;
ygopro
.
stoc_send_chat_to_room
(
this
,
"
${death_start_siding}
"
,
ygopro
.
constants
.
COLORS
.
BABYBLUE
);
}
...
...
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