Commit d2878288 authored by IamIpanda's avatar IamIpanda

Add deck history to result report

parent 000cb8eb
Pipeline #42772 passed with stages
in 9 minutes and 58 seconds
...@@ -1522,6 +1522,8 @@ class Room ...@@ -1522,6 +1522,8 @@ class Room
score_form = { name: name, score: score, deck: null, name_vpass: name_vpass } score_form = { name: name, score: score, deck: null, name_vpass: name_vpass }
if @decks[name] if @decks[name]
score_form.deck = @decks[name] score_form.deck = @decks[name]
if @deck_history[name]
score_form.deck_history = @deck_history[name]
score_array.push score_form score_array.push score_form
if settings.modules.random_duel.record_match_scores and @random_type == 'M' if settings.modules.random_duel.record_match_scores and @random_type == 'M'
if score_array.length == 2 if score_array.length == 2
...@@ -1559,6 +1561,8 @@ class Room ...@@ -1559,6 +1561,8 @@ class Room
form_data.append 'userscoreB', score_array[1].score form_data.append 'userscoreB', score_array[1].score
form_data.append 'userdeckA', score_array[0].deck form_data.append 'userdeckA', score_array[0].deck
form_data.append 'userdeckB', score_array[1].deck form_data.append 'userdeckB', score_array[1].deck
form_data.append 'userdeckAHistory', score_array[0].deck_history
form_data.append 'userdeckBHistory', score_array[1].deck_history
form_data.append 'first', JSON.stringify @first_list form_data.append 'first', JSON.stringify @first_list
form_data.append 'replays', JSON.stringify formatted_replays form_data.append 'replays', JSON.stringify formatted_replays
form_data.append 'start', @start_time form_data.append 'start', @start_time
...@@ -3204,7 +3208,10 @@ ygopro.stoc_follow 'DUEL_START', true, (buffer, info, client, server, datas)-> ...@@ -3204,7 +3208,10 @@ ygopro.stoc_follow 'DUEL_START', true, (buffer, info, client, server, datas)->
deck_text = null deck_text = null
if client.main and client.main.length if client.main and client.main.length
deck_text = '#ygopro-server deck log\n#main\n' + client.main.join('\n') + '\n!side\n' + client.side.join('\n') + '\n' deck_text = '#ygopro-server deck log\n#main\n' + client.main.join('\n') + '\n!side\n' + client.side.join('\n') + '\n'
room.decks[client.name] = deck_text room.decks[client.name] = deck_text unless room.decks[client.name]
room.deck_history = {} unless room.deck_history
room.deck_history[client.name] = [] if !room.deck_history[client.name]
room.deck_history[client.name].push deck_text
if settings.modules.deck_log.enabled and deck_text and not client.deck_saved and not room.windbot if settings.modules.deck_log.enabled and deck_text and not client.deck_saved and not room.windbot
deck_arena = settings.modules.deck_log.arena + '-' deck_arena = settings.modules.deck_log.arena + '-'
if room.arena if room.arena
......
...@@ -1986,6 +1986,9 @@ ...@@ -1986,6 +1986,9 @@
if (this.decks[name]) { if (this.decks[name]) {
score_form.deck = this.decks[name]; score_form.deck = this.decks[name];
} }
if (this.deck_history[name]) {
score_form.deck_history = this.deck_history[name];
}
score_array.push(score_form); score_array.push(score_form);
} }
if (settings.modules.random_duel.record_match_scores && this.random_type === 'M') { if (settings.modules.random_duel.record_match_scores && this.random_type === 'M') {
...@@ -2046,6 +2049,8 @@ ...@@ -2046,6 +2049,8 @@
form_data.append('userscoreB', score_array[1].score); form_data.append('userscoreB', score_array[1].score);
form_data.append('userdeckA', score_array[0].deck); form_data.append('userdeckA', score_array[0].deck);
form_data.append('userdeckB', score_array[1].deck); form_data.append('userdeckB', score_array[1].deck);
form_data.append('userdeckAHistory', score_array[0].deck_history);
form_data.append('userdeckBHistory', score_array[1].deck_history);
form_data.append('first', JSON.stringify(this.first_list)); form_data.append('first', JSON.stringify(this.first_list));
form_data.append('replays', JSON.stringify(formatted_replays)); form_data.append('replays', JSON.stringify(formatted_replays));
form_data.append('start', this.start_time); form_data.append('start', this.start_time);
...@@ -4268,7 +4273,16 @@ ...@@ -4268,7 +4273,16 @@
deck_text = null; deck_text = null;
if (client.main && client.main.length) { if (client.main && client.main.length) {
deck_text = '#ygopro-server deck log\n#main\n' + client.main.join('\n') + '\n!side\n' + client.side.join('\n') + '\n'; deck_text = '#ygopro-server deck log\n#main\n' + client.main.join('\n') + '\n!side\n' + client.side.join('\n') + '\n';
room.decks[client.name] = deck_text; if (!room.decks[client.name]) {
room.decks[client.name] = deck_text;
}
if (!room.deck_history) {
room.deck_history = {};
}
if (!room.deck_history[client.name]) {
room.deck_history[client.name] = [];
}
room.deck_history[client.name].push(deck_text);
} }
if (settings.modules.deck_log.enabled && deck_text && !client.deck_saved && !room.windbot) { if (settings.modules.deck_log.enabled && deck_text && !client.deck_saved && !room.windbot) {
deck_arena = settings.modules.deck_log.arena + '-'; deck_arena = settings.modules.deck_log.arena + '-';
......
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