Skip to content

Commit

Permalink
Update connect mode deck tracker.
Browse files Browse the repository at this point in the history
 Fix connect mode deck tracker when enabling DecadeUI.
  • Loading branch information
adeFuLoDgu committed Nov 2, 2024
1 parent 5691fc1 commit cf88aae
Show file tree
Hide file tree
Showing 2 changed files with 40 additions and 8 deletions.
38 changes: 33 additions & 5 deletions noname/library/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -9797,8 +9797,12 @@ export class Library {
if (game.sandbox) security.exitSandbox();
}
} catch (e) {
console.log(e);
console.log("invalid message: " + messageevent.data);
if (message[1] == "cardPile") {
console.log("Request cardPile data from server.");
} else {
console.log(e);
console.log("invalid message: " + messageevent.data);
}
return;
}
lib.message.client[message.shift()].apply(null, message);
Expand Down Expand Up @@ -12302,13 +12306,37 @@ export class Library {
message = {
server: {
cardPile() {
let draw_pile_array = Array.from(ui.cardPile.children);
let send_draw_pile_array = [];
let discard_pile_array =Array.from(ui.discardPile.children);
let send_discard_pile_array = [];
for (let i = 0; i < draw_pile_array.length; i++) {
let card = {};
card.name = draw_pile_array[i].name;
card.number = draw_pile_array[i].number;
card.suit = draw_pile_array[i].suit;
send_draw_pile_array.add(card);
}
for (let i = 0; i < discard_pile_array.length; i++) {
let card = {};
card.name = discard_pile_array[i].name;
card.number = discard_pile_array[i].number;
card.suit = discard_pile_array[i].suit;
send_discard_pile_array.add(card);
}
send_draw_pile_array.sort(function (a, b) {
return a.number - b.number;
});
send_discard_pile_array.sort(function (a, b) {
return a.number - b.number;
});
this.send(JSON.stringify({
type: "cardPile",
data: {
drawPile: Array.from(ui.cardPile.children),
discardPile: Array.from(ui.discardPile.children)
drawPile: send_draw_pile_array,
discardPile: send_discard_pile_array
}
}));
}), "cardPile");
},
/**
* @this {import("./element/client.js").Client}
Expand Down
10 changes: 7 additions & 3 deletions noname/ui/create/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -2363,9 +2363,13 @@ export class Create {
try {
game.ws.send(JSON.stringify(['cardPile']));
game.ws.addEventListener('message', function (e) {
let data = JSON.parse(JSON.parse(e.data)[0]);
if (data.type == 'cardPile') {
resolve(data.data);
let received_data = JSON.parse(e.data)[0];
let received_message_data_type = JSON.parse(e.data)[1];
if (received_message_data_type == "cardPile") {
let data = JSON.parse(received_data);
if (data.type == "cardPile") {
resolve(data.data);
}
}
}, { once: true });

Expand Down

0 comments on commit cf88aae

Please sign in to comment.