Commit 5f586497 authored by nanahira's avatar nanahira

send deck to arena api

parent 2d71750c
...@@ -812,6 +812,7 @@ class Room ...@@ -812,6 +812,7 @@ class Room
@random_type = '' @random_type = ''
@welcome = '' @welcome = ''
@scores = {} @scores = {}
@decks = {}
@duel_count = 0 @duel_count = 0
@death = 0 @death = 0
@turn = 0 @turn = 0
...@@ -961,7 +962,10 @@ class Room ...@@ -961,7 +962,10 @@ class Room
#log.info 'room-delete', this.name, ROOM_all.length #log.info 'room-delete', this.name, ROOM_all.length
score_array=[] score_array=[]
for name, score of @scores for name, score of @scores
score_array.push { name: name, score: score } score_form = { name: name, score: score, deck: null }
if @decks[name]
score_form.deck = @decks[name]
score_array.push score_form
if settings.modules.arena_mode.enabled and @arena if settings.modules.arena_mode.enabled and @arena
#log.info 'SCORE', score_array, @start_time #log.info 'SCORE', score_array, @start_time
end_time = moment().format() end_time = moment().format()
...@@ -969,9 +973,9 @@ class Room ...@@ -969,9 +973,9 @@ class Room
@start_time = end_time @start_time = end_time
if score_array.length != 2 if score_array.length != 2
if !score_array[0] if !score_array[0]
score_array[0] = { name: null, score: -5 } score_array[0] = { name: null, score: -5, deck: null }
if !score_array[1] if !score_array[1]
score_array[1] = { name: null, score: -5 } score_array[1] = { name: null, score: -5, deck: null }
score_array[0].score = -5 score_array[0].score = -5
score_array[1].score = -5 score_array[1].score = -5
request.post { url : settings.modules.arena_mode.post_score , form : { request.post { url : settings.modules.arena_mode.post_score , form : {
...@@ -980,6 +984,8 @@ class Room ...@@ -980,6 +984,8 @@ class Room
usernameB: score_array[1].name, usernameB: score_array[1].name,
userscoreA: score_array[0].score, userscoreA: score_array[0].score,
userscoreB: score_array[1].score, userscoreB: score_array[1].score,
userdeckA: score_array[0].deck,
userdeckB: score_array[1].deck,
start: @start_time, start: @start_time,
end: end_time, end: end_time,
arena: @arena arena: @arena
...@@ -2408,8 +2414,11 @@ ygopro.stoc_follow 'DUEL_START', false, (buffer, info, client, server)-> ...@@ -2408,8 +2414,11 @@ ygopro.stoc_follow 'DUEL_START', false, (buffer, info, client, server)->
ROOM_players_oppentlist[player.ip] = null ROOM_players_oppentlist[player.ip] = null
if settings.modules.tips.enabled if settings.modules.tips.enabled
ygopro.stoc_send_random_tip(client) ygopro.stoc_send_random_tip(client)
if settings.modules.deck_log.enabled and client.main and client.main.length and not client.deck_saved and not room.windbot deck_text = null
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
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
deck_arena = deck_arena + room.arena deck_arena = deck_arena + room.arena
......
...@@ -1022,6 +1022,7 @@ ...@@ -1022,6 +1022,7 @@
this.random_type = ''; this.random_type = '';
this.welcome = ''; this.welcome = '';
this.scores = {}; this.scores = {};
this.decks = {};
this.duel_count = 0; this.duel_count = 0;
this.death = 0; this.death = 0;
this.turn = 0; this.turn = 0;
...@@ -1207,7 +1208,7 @@ ...@@ -1207,7 +1208,7 @@
} }
Room.prototype["delete"] = function() { Room.prototype["delete"] = function() {
var end_time, index, log_rep_id, name, player_ips, player_names, recorder_buffer, ref2, replay_id, score, score_array; var end_time, index, log_rep_id, name, player_ips, player_names, recorder_buffer, ref2, replay_id, score, score_array, score_form;
if (this.deleted) { if (this.deleted) {
return; return;
} }
...@@ -1215,10 +1216,15 @@ ...@@ -1215,10 +1216,15 @@
ref2 = this.scores; ref2 = this.scores;
for (name in ref2) { for (name in ref2) {
score = ref2[name]; score = ref2[name];
score_array.push({ score_form = {
name: name, name: name,
score: score score: score,
}); deck: null
};
if (this.decks[name]) {
score_form.deck = this.decks[name];
}
score_array.push(score_form);
} }
if (settings.modules.arena_mode.enabled && this.arena) { if (settings.modules.arena_mode.enabled && this.arena) {
end_time = moment().format(); end_time = moment().format();
...@@ -1229,13 +1235,15 @@ ...@@ -1229,13 +1235,15 @@
if (!score_array[0]) { if (!score_array[0]) {
score_array[0] = { score_array[0] = {
name: null, name: null,
score: -5 score: -5,
deck: null
}; };
} }
if (!score_array[1]) { if (!score_array[1]) {
score_array[1] = { score_array[1] = {
name: null, name: null,
score: -5 score: -5,
deck: null
}; };
} }
score_array[0].score = -5; score_array[0].score = -5;
...@@ -1249,6 +1257,8 @@ ...@@ -1249,6 +1257,8 @@
usernameB: score_array[1].name, usernameB: score_array[1].name,
userscoreA: score_array[0].score, userscoreA: score_array[0].score,
userscoreB: score_array[1].score, userscoreB: score_array[1].score,
userdeckA: score_array[0].deck,
userdeckB: score_array[1].deck,
start: this.start_time, start: this.start_time,
end: end_time, end: end_time,
arena: this.arena arena: this.arena
...@@ -2976,8 +2986,12 @@ ...@@ -2976,8 +2986,12 @@
if (settings.modules.tips.enabled) { if (settings.modules.tips.enabled) {
ygopro.stoc_send_random_tip(client); ygopro.stoc_send_random_tip(client);
} }
if (settings.modules.deck_log.enabled && client.main && client.main.length && !client.deck_saved && !room.windbot) { deck_text = null;
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 (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 + '-';
if (room.arena) { if (room.arena) {
deck_arena = deck_arena + room.arena; deck_arena = deck_arena + room.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