Commit 0367dd27 authored by nanahira's avatar nanahira

death when tp

parent e348285d
...@@ -2045,7 +2045,7 @@ if settings.modules.http ...@@ -2045,7 +2045,7 @@ if settings.modules.http
death_room_found = false death_room_found = false
for room in ROOM_all when room and room.established and room.started and !room.death and (u.query.death == "all" or u.query.death == room.port.toString()) for room in ROOM_all when room and room.established and room.started and !room.death and (u.query.death == "all" or u.query.death == room.port.toString())
death_room_found = true death_room_found = true
if !room.changing_side if !room.changing_side and (!room.duel_count or room.turn)
room.death = (if room.turn then room.turn + 4 else 5) room.death = (if room.turn then room.turn + 4 else 5)
ygopro.stoc_send_chat_to_room(room, "${death_start}", ygopro.constants.COLORS.BABYBLUE) ygopro.stoc_send_chat_to_room(room, "${death_start}", ygopro.constants.COLORS.BABYBLUE)
else else
......
...@@ -2582,7 +2582,7 @@ ...@@ -2582,7 +2582,7 @@
continue; continue;
} }
death_room_found = true; death_room_found = true;
if (!room.changing_side) { if (!room.changing_side && (!room.duel_count || room.turn)) {
room.death = (room.turn ? room.turn + 4 : 5); room.death = (room.turn ? room.turn + 4 : 5);
ygopro.stoc_send_chat_to_room(room, "${death_start}", ygopro.constants.COLORS.BABYBLUE); ygopro.stoc_send_chat_to_room(room, "${death_start}", ygopro.constants.COLORS.BABYBLUE);
} else { } else {
......
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