Commit f67de5fb authored by nanahira's avatar nanahira

customizable waiting time

parent 0cefc4cb
...@@ -64,6 +64,7 @@ ...@@ -64,6 +64,7 @@
"random_duel": { "random_duel": {
"enabled": false, "enabled": false,
"no_rematch_check": false, "no_rematch_check": false,
"ready_time": 20,
"hang_timeout": 90 "hang_timeout": 90
}, },
"cloud_replay": { "cloud_replay": {
...@@ -132,6 +133,7 @@ ...@@ -132,6 +133,7 @@
"mode": "entertain", "mode": "entertain",
"comment": "mode: athletic / entertain", "comment": "mode: athletic / entertain",
"accesskey": "233", "accesskey": "233",
"ready_time": 30,
"post_score": false, "post_score": false,
"get_score": false "get_score": false
}, },
......
...@@ -2291,12 +2291,12 @@ ygopro.stoc_follow 'HS_PLAYER_CHANGE', false, (buffer, info, client, server)-> ...@@ -2291,12 +2291,12 @@ ygopro.stoc_follow 'HS_PLAYER_CHANGE', false, (buffer, info, client, server)->
room.waiting_for_player = p2 room.waiting_for_player = p2
if room.waiting_for_player != room.waiting_for_player2 if room.waiting_for_player != room.waiting_for_player2
room.waiting_for_player2 = room.waiting_for_player room.waiting_for_player2 = room.waiting_for_player
room.waiting_for_player_time = 20 room.waiting_for_player_time = settings.modules.arena_mode.ready_time
room.waiting_for_player_interval = setInterval (()-> wait_room_start_arena(ROOM_all[client.rid]);return), 1000 room.waiting_for_player_interval = setInterval (()-> wait_room_start_arena(ROOM_all[client.rid]);return), 1000
else if !room.waiting_for_player and room.waiting_for_player_interval else if !room.waiting_for_player and room.waiting_for_player_interval
clearInterval room.waiting_for_player_interval clearInterval room.waiting_for_player_interval
room.waiting_for_player_interval = null room.waiting_for_player_interval = null
room.waiting_for_player_time = 20 room.waiting_for_player_time = settings.modules.arena_mode.ready_time
else else
room.ready_player_count_without_host = 0 room.ready_player_count_without_host = 0
for player in room.players for player in room.players
...@@ -2306,7 +2306,7 @@ ygopro.stoc_follow 'HS_PLAYER_CHANGE', false, (buffer, info, client, server)-> ...@@ -2306,7 +2306,7 @@ ygopro.stoc_follow 'HS_PLAYER_CHANGE', false, (buffer, info, client, server)->
room.ready_player_count_without_host += player.is_ready room.ready_player_count_without_host += player.is_ready
if room.ready_player_count_without_host >= room.max_player - 1 if room.ready_player_count_without_host >= room.max_player - 1
#log.info "all ready" #log.info "all ready"
setTimeout (()-> wait_room_start(ROOM_all[client.rid], 20);return), 1000 setTimeout (()-> wait_room_start(ROOM_all[client.rid], settings.modules.random_duel.ready_time);return), 1000
return return
ygopro.ctos_follow 'REQUEST_FIELD', true, (buffer, info, client, server)-> ygopro.ctos_follow 'REQUEST_FIELD', true, (buffer, info, client, server)->
......
...@@ -2795,14 +2795,14 @@ ...@@ -2795,14 +2795,14 @@
} }
if (room.waiting_for_player !== room.waiting_for_player2) { if (room.waiting_for_player !== room.waiting_for_player2) {
room.waiting_for_player2 = room.waiting_for_player; room.waiting_for_player2 = room.waiting_for_player;
room.waiting_for_player_time = 20; room.waiting_for_player_time = settings.modules.arena_mode.ready_time;
room.waiting_for_player_interval = setInterval((function() { room.waiting_for_player_interval = setInterval((function() {
wait_room_start_arena(ROOM_all[client.rid]); wait_room_start_arena(ROOM_all[client.rid]);
}), 1000); }), 1000);
} else if (!room.waiting_for_player && room.waiting_for_player_interval) { } else if (!room.waiting_for_player && room.waiting_for_player_interval) {
clearInterval(room.waiting_for_player_interval); clearInterval(room.waiting_for_player_interval);
room.waiting_for_player_interval = null; room.waiting_for_player_interval = null;
room.waiting_for_player_time = 20; room.waiting_for_player_time = settings.modules.arena_mode.ready_time;
} }
} else { } else {
room.ready_player_count_without_host = 0; room.ready_player_count_without_host = 0;
...@@ -2818,7 +2818,7 @@ ...@@ -2818,7 +2818,7 @@
} }
if (room.ready_player_count_without_host >= room.max_player - 1) { if (room.ready_player_count_without_host >= room.max_player - 1) {
setTimeout((function() { setTimeout((function() {
wait_room_start(ROOM_all[client.rid], 20); wait_room_start(ROOM_all[client.rid], settings.modules.random_duel.ready_time);
}), 1000); }), 1000);
} }
} }
......
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