From: Geoffrey Allott Date: Mon, 15 Mar 2021 20:24:39 +0000 (+0000) Subject: move card svg into one file for all cards and create manual paths for suit glyphs X-Git-Url: https://git.pointlesshacks.com/?a=commitdiff_plain;h=d3721c5179d6d543b72646cc88b9372bb5f38d7d;p=pokerwave.git move card svg into one file for all cards and create manual paths for suit glyphs --- diff --git a/site/img/card-2c.svg b/site/img/card-2c.svg deleted file mode 100644 index 2afaf55..0000000 --- a/site/img/card-2c.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - 2 - ♣ - - - diff --git a/site/img/card-2d.svg b/site/img/card-2d.svg deleted file mode 100644 index d781c5f..0000000 --- a/site/img/card-2d.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - 2 - ♢ - - - diff --git a/site/img/card-2h.svg b/site/img/card-2h.svg deleted file mode 100644 index 2b5ae9d..0000000 --- a/site/img/card-2h.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - 2 - ♡ - - - diff --git a/site/img/card-2s.svg b/site/img/card-2s.svg deleted file mode 100644 index bf9d374..0000000 --- a/site/img/card-2s.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - 2 - ♠ - - - diff --git a/site/img/card-3c.svg b/site/img/card-3c.svg deleted file mode 100644 index 9cce91c..0000000 --- a/site/img/card-3c.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - 3 - ♣ - - - diff --git a/site/img/card-3d.svg b/site/img/card-3d.svg deleted file mode 100644 index 87692b0..0000000 --- a/site/img/card-3d.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - 3 - ♢ - - - diff --git a/site/img/card-3h.svg b/site/img/card-3h.svg deleted file mode 100644 index 78a125f..0000000 --- a/site/img/card-3h.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - 3 - ♡ - - - diff --git a/site/img/card-3s.svg b/site/img/card-3s.svg deleted file mode 100644 index d80d75e..0000000 --- a/site/img/card-3s.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - 3 - ♠ - - - diff --git a/site/img/card-4c.svg b/site/img/card-4c.svg deleted file mode 100644 index c647371..0000000 --- a/site/img/card-4c.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - 4 - ♣ - - - diff --git a/site/img/card-4d.svg b/site/img/card-4d.svg deleted file mode 100644 index f3d8128..0000000 --- a/site/img/card-4d.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - 4 - ♢ - - - diff --git a/site/img/card-4h.svg b/site/img/card-4h.svg deleted file mode 100644 index cfaa1d0..0000000 --- a/site/img/card-4h.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - 4 - ♡ - - - diff --git a/site/img/card-4s.svg b/site/img/card-4s.svg deleted file mode 100644 index 4c9a7f4..0000000 --- a/site/img/card-4s.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - 4 - ♠ - - - diff --git a/site/img/card-5c.svg b/site/img/card-5c.svg deleted file mode 100644 index d0822b1..0000000 --- a/site/img/card-5c.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - 5 - ♣ - - - diff --git a/site/img/card-5d.svg b/site/img/card-5d.svg deleted file mode 100644 index c7d1d3f..0000000 --- a/site/img/card-5d.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - 5 - ♢ - - - diff --git a/site/img/card-5h.svg b/site/img/card-5h.svg deleted file mode 100644 index 38c8da3..0000000 --- a/site/img/card-5h.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - 5 - ♡ - - - diff --git a/site/img/card-5s.svg b/site/img/card-5s.svg deleted file mode 100644 index 1bae79e..0000000 --- a/site/img/card-5s.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - 5 - ♠ - - - diff --git a/site/img/card-6c.svg b/site/img/card-6c.svg deleted file mode 100644 index 458d98a..0000000 --- a/site/img/card-6c.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - 6 - ♣ - - - diff --git a/site/img/card-6d.svg b/site/img/card-6d.svg deleted file mode 100644 index d61f2fc..0000000 --- a/site/img/card-6d.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - 6 - ♢ - - - diff --git a/site/img/card-6h.svg b/site/img/card-6h.svg deleted file mode 100644 index eb27710..0000000 --- a/site/img/card-6h.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - 6 - ♡ - - - diff --git a/site/img/card-6s.svg b/site/img/card-6s.svg deleted file mode 100644 index b7217ef..0000000 --- a/site/img/card-6s.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - 6 - ♠ - - - diff --git a/site/img/card-7c.svg b/site/img/card-7c.svg deleted file mode 100644 index a384abb..0000000 --- a/site/img/card-7c.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - 7 - ♣ - - - diff --git a/site/img/card-7d.svg b/site/img/card-7d.svg deleted file mode 100644 index fccc289..0000000 --- a/site/img/card-7d.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - 7 - ♢ - - - diff --git a/site/img/card-7h.svg b/site/img/card-7h.svg deleted file mode 100644 index 9218ab4..0000000 --- a/site/img/card-7h.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - 7 - ♡ - - - diff --git a/site/img/card-7s.svg b/site/img/card-7s.svg deleted file mode 100644 index 5771662..0000000 --- a/site/img/card-7s.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - 7 - ♠ - - - diff --git a/site/img/card-8c.svg b/site/img/card-8c.svg deleted file mode 100644 index 0fc2832..0000000 --- a/site/img/card-8c.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - 8 - ♣ - - - diff --git a/site/img/card-8d.svg b/site/img/card-8d.svg deleted file mode 100644 index b91ddcd..0000000 --- a/site/img/card-8d.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - 8 - ♢ - - - diff --git a/site/img/card-8h.svg b/site/img/card-8h.svg deleted file mode 100644 index 44a54b3..0000000 --- a/site/img/card-8h.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - 8 - ♡ - - - diff --git a/site/img/card-8s.svg b/site/img/card-8s.svg deleted file mode 100644 index 2a65b28..0000000 --- a/site/img/card-8s.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - 8 - ♠ - - - diff --git a/site/img/card-9c.svg b/site/img/card-9c.svg deleted file mode 100644 index a7f9706..0000000 --- a/site/img/card-9c.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - 9 - ♣ - - - diff --git a/site/img/card-9d.svg b/site/img/card-9d.svg deleted file mode 100644 index 8c86ba2..0000000 --- a/site/img/card-9d.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - 9 - ♢ - - - diff --git a/site/img/card-9h.svg b/site/img/card-9h.svg deleted file mode 100644 index bd760ad..0000000 --- a/site/img/card-9h.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - 9 - ♡ - - - diff --git a/site/img/card-9s.svg b/site/img/card-9s.svg deleted file mode 100644 index 1ad161e..0000000 --- a/site/img/card-9s.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - 9 - ♠ - - - diff --git a/site/img/card-Ac.svg b/site/img/card-Ac.svg deleted file mode 100644 index 8f8178d..0000000 --- a/site/img/card-Ac.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - A - ♣ - - - diff --git a/site/img/card-Ad.svg b/site/img/card-Ad.svg deleted file mode 100644 index 5547b38..0000000 --- a/site/img/card-Ad.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - A - ♢ - - - diff --git a/site/img/card-Ah.svg b/site/img/card-Ah.svg deleted file mode 100644 index 4251cac..0000000 --- a/site/img/card-Ah.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - A - ♡ - - - diff --git a/site/img/card-As.svg b/site/img/card-As.svg deleted file mode 100644 index e5ab9af..0000000 --- a/site/img/card-As.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - A - ♠ - - - diff --git a/site/img/card-Jc.svg b/site/img/card-Jc.svg deleted file mode 100644 index eb1e194..0000000 --- a/site/img/card-Jc.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - J - ♣ - - - diff --git a/site/img/card-Jd.svg b/site/img/card-Jd.svg deleted file mode 100644 index d6e5271..0000000 --- a/site/img/card-Jd.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - J - ♢ - - - diff --git a/site/img/card-Jh.svg b/site/img/card-Jh.svg deleted file mode 100644 index 609ab30..0000000 --- a/site/img/card-Jh.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - J - ♡ - - - diff --git a/site/img/card-Js.svg b/site/img/card-Js.svg deleted file mode 100644 index d61fda4..0000000 --- a/site/img/card-Js.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - J - ♠ - - - diff --git a/site/img/card-Kc.svg b/site/img/card-Kc.svg deleted file mode 100644 index 13f455c..0000000 --- a/site/img/card-Kc.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - K - ♣ - - - diff --git a/site/img/card-Kd.svg b/site/img/card-Kd.svg deleted file mode 100644 index 1edcfc2..0000000 --- a/site/img/card-Kd.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - K - ♢ - - - diff --git a/site/img/card-Kh.svg b/site/img/card-Kh.svg deleted file mode 100644 index 9c70f65..0000000 --- a/site/img/card-Kh.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - K - ♡ - - - diff --git a/site/img/card-Ks.svg b/site/img/card-Ks.svg deleted file mode 100644 index 03708c6..0000000 --- a/site/img/card-Ks.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - K - ♠ - - - diff --git a/site/img/card-Qc.svg b/site/img/card-Qc.svg deleted file mode 100644 index b08cabd..0000000 --- a/site/img/card-Qc.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - Q - ♣ - - - diff --git a/site/img/card-Qd.svg b/site/img/card-Qd.svg deleted file mode 100644 index f095977..0000000 --- a/site/img/card-Qd.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - Q - ♢ - - - diff --git a/site/img/card-Qh.svg b/site/img/card-Qh.svg deleted file mode 100644 index a57a540..0000000 --- a/site/img/card-Qh.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - Q - ♡ - - - diff --git a/site/img/card-Qs.svg b/site/img/card-Qs.svg deleted file mode 100644 index edc4c07..0000000 --- a/site/img/card-Qs.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - Q - ♠ - - - diff --git a/site/img/card-Tc.svg b/site/img/card-Tc.svg deleted file mode 100644 index 0236727..0000000 --- a/site/img/card-Tc.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - 10 - ♣ - - - diff --git a/site/img/card-Td.svg b/site/img/card-Td.svg deleted file mode 100644 index 7c492b0..0000000 --- a/site/img/card-Td.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - 10 - ♢ - - - diff --git a/site/img/card-Th.svg b/site/img/card-Th.svg deleted file mode 100644 index 3e40f9f..0000000 --- a/site/img/card-Th.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - 10 - ♡ - - - diff --git a/site/img/card-Ts.svg b/site/img/card-Ts.svg deleted file mode 100644 index 0bad8c7..0000000 --- a/site/img/card-Ts.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - 10 - ♠ - - - diff --git a/site/img/cards.svg b/site/img/cards.svg new file mode 100644 index 0000000..53a6b50 --- /dev/null +++ b/site/img/cards.svg @@ -0,0 +1,397 @@ + + + 2 + 2 + 3 + 3 + 4 + 4 + 5 + 5 + 6 + 6 + 7 + 7 + 8 + 8 + 9 + 9 + 10 + 10 + J + J + Q + Q + K + K + A + A + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/site/img/suit-c.svg b/site/img/suit-c.svg deleted file mode 100644 index 07704cb..0000000 --- a/site/img/suit-c.svg +++ /dev/null @@ -1,3 +0,0 @@ - - ♣ - diff --git a/site/img/suit-d.svg b/site/img/suit-d.svg deleted file mode 100644 index ac979d5..0000000 --- a/site/img/suit-d.svg +++ /dev/null @@ -1,3 +0,0 @@ - - ♢ - diff --git a/site/img/suit-h.svg b/site/img/suit-h.svg deleted file mode 100644 index b257083..0000000 --- a/site/img/suit-h.svg +++ /dev/null @@ -1,3 +0,0 @@ - - ♡ - diff --git a/site/img/suit-s.svg b/site/img/suit-s.svg deleted file mode 100644 index 0c2c641..0000000 --- a/site/img/suit-s.svg +++ /dev/null @@ -1,3 +0,0 @@ - - ♠ - diff --git a/site/img/suits.svg b/site/img/suits.svg new file mode 100644 index 0000000..2fa350f --- /dev/null +++ b/site/img/suits.svg @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/site/modules/card.js b/site/modules/card.js index 6fef6b2..4a3771d 100644 --- a/site/modules/card.js +++ b/site/modules/card.js @@ -27,11 +27,11 @@ export function short_suit(suit) { export function card_href(card) { if (card === null) return "img/card-back-blue.svg"; - return "img/card-" + short_rank(card.rank) + short_suit(card.suit) + ".svg"; + return "img/cards.svg#" + short_rank(card.rank) + short_suit(card.suit); } export function suit_href(suit) { - return "img/suit-" + short_suit(suit) + ".svg"; + return "img/suits.svg#" + short_suit(suit); } export const FIFTY_TWO_CARD_DECK = [ diff --git a/site/modules/poker.js b/site/modules/poker.js index b1c6d52..e9f128c 100644 --- a/site/modules/poker.js +++ b/site/modules/poker.js @@ -217,7 +217,7 @@ export class TexasHoldEm { } card_image(username, card) { - const image = document.createElementNS(svgns, "image"); + const image = document.createElementNS(svgns, "use"); image.setAttribute("width", "45"); image.setAttribute("height", "70"); image.setAttribute("href", card_href(card)); diff --git a/site/modules/whist.js b/site/modules/whist.js index 424b56a..4c0ba07 100644 --- a/site/modules/whist.js +++ b/site/modules/whist.js @@ -62,7 +62,7 @@ export class KnockOutWhist { highlight.onclick = () => this.send({type: "TakeAction", action: {action: "ChooseTrumps", suit: suit}}); this.svg.append(highlight); this.glyphs.set(suit, highlight); - const glyph = document.createElementNS(svgns, "image"); + const glyph = document.createElementNS(svgns, "use"); glyph.setAttribute("x", x); glyph.setAttribute("y", "235"); glyph.setAttribute("width", "25"); @@ -161,7 +161,7 @@ export class KnockOutWhist { } card_image(username, card) { - const image = document.createElementNS(svgns, "image"); + const image = document.createElementNS(svgns, "use"); image.setAttribute("width", "45"); image.setAttribute("height", "70"); image.setAttribute("href", card_href(card)); diff --git a/site/modules/winner.js b/site/modules/winner.js index c4e9b30..50bc0fb 100644 --- a/site/modules/winner.js +++ b/site/modules/winner.js @@ -43,7 +43,7 @@ export class CongratulateWinner { } card_image(card) { - const image = document.createElementNS(svgns, "image"); + const image = document.createElementNS(svgns, "use"); image.setAttribute("width", "45"); image.setAttribute("height", "70"); image.setAttribute("x", random_int(500 - 45)); diff --git a/site/test.html b/site/test.html deleted file mode 100644 index aea30b4..0000000 --- a/site/test.html +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - -
- - - - - - - - - -
- -