Skip to content

S
srvpro
Commit b1e4c6e8 authored by nanahira's avatar nanahira
Browse files
Options

Merge branch 'mc'

parents e9e41b49 bfd20499
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 2 deletions
ygopro-server.coffee
View file @ b1e4c6e8
......@@ -2048,10 +2048,11 @@ if settings.modules.http
room.death = (if room.turn then room.turn + 4 else 5)
ygopro.stoc_send_chat_to_room(room, "${death_start}", ygopro.constants.COLORS.BABYBLUE)
else
room.death = -1
if settings.modules.http.quick_death_rule
room.death = -1
ygopro.stoc_send_chat_to_room(room, "${death_start_quick}", ygopro.constants.COLORS.BABYBLUE)
else
room.death = 5
ygopro.stoc_send_chat_to_room(room, "${death_start_siding}", ygopro.constants.COLORS.BABYBLUE)
response.writeHead(200)
if death_room_found
......
ygopro-server.js
View file @ b1e4c6e8
......@@ -2743,10 +2743,11 @@
room.death = (room.turn ? room.turn + 4 : 5);
ygopro.stoc_send_chat_to_room(room, "${death_start}", ygopro.constants.COLORS.BABYBLUE);
} else {
room.death = -1;
if (settings.modules.http.quick_death_rule) {
room.death = -1;
ygopro.stoc_send_chat_to_room(room, "${death_start_quick}", ygopro.constants.COLORS.BABYBLUE);
} else {
room.death = 5;
ygopro.stoc_send_chat_to_room(room, "${death_start_siding}", ygopro.constants.COLORS.BABYBLUE);
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment