diff --git a/.gitea/workflows/build.yml b/.gitea/workflows/build.yml index e3e76c1..f38970a 100644 --- a/.gitea/workflows/build.yml +++ b/.gitea/workflows/build.yml @@ -12,7 +12,7 @@ jobs: runs-on: ubuntu-latest env: - DOCKER_ORG: legonzaur + DOCKER_ORG: heronfief DOCKER_LATEST: nightly ENDPOINT: git.legonzaur.fr diff --git a/assets/shaders/noise.frag b/assets/shaders/noise.frag index 751c7d5..6f89f42 100644 --- a/assets/shaders/noise.frag +++ b/assets/shaders/noise.frag @@ -22,8 +22,8 @@ void main(){ q=q*.5+.5; vec2 r=vec2(0.); - r.x=fbm(st+1.*q+vec2(1.7,9.2)+.0115*u_time); - r.y=fbm(st+1.*q+vec2(8.3,2.8)+.0226*u_time); + r.x=fbm(st+1.*q+vec2(1.7,9.2)+.00515*u_time); + r.y=fbm(st+1.*q+vec2(8.3,2.8)+.0126*u_time); r=r*.5+.5; float f=fbm(st+r); diff --git a/components/GameBoard.vue b/components/GameBoard.vue index b82040c..6730d43 100644 --- a/components/GameBoard.vue +++ b/components/GameBoard.vue @@ -105,6 +105,8 @@ function showWinnerScreen() { #market { grid-area: market; background-image: url("/images/bg-sand.png"); + border-bottom: 3px solid black; + ; } #current_player { diff --git a/components/GlobalOverlay.vue b/components/GlobalOverlay.vue index 7a0f0b9..0db208c 100644 --- a/components/GlobalOverlay.vue +++ b/components/GlobalOverlay.vue @@ -7,7 +7,7 @@ const displayOptions = ref(false) @@ -25,5 +25,7 @@ const displayOptions = ref(false) .settings_button { pointer-events: all; + width: 30px; + padding: 5px; } \ No newline at end of file diff --git a/components/OptionsDialog.vue b/components/OptionsDialog.vue index 82d0f01..2aa4181 100644 --- a/components/OptionsDialog.vue +++ b/components/OptionsDialog.vue @@ -1,5 +1,4 @@ @@ -58,6 +78,8 @@ const switchCardStyle = () => { justify-content: center; align-items: center; z-index: 1000; + display: grid; + } .dialog-box { @@ -70,9 +92,8 @@ const switchCardStyle = () => { color: white; text-align: center; text-shadow: 2px 2px 4px rgba(0, 0, 0, 0.8); - display: flex; - justify-content: center; - flex-direction: column; + display: grid; + grid-template-columns: 33% 33% 33%; } .dialog-box h3 { @@ -93,7 +114,16 @@ const switchCardStyle = () => { padding: 10px 0; } +.dialog-header { + grid-column-start: 1; +} + .dialog-body { padding: 10px 0; + grid-column-start: 2; +} + +.dialog-footer { + grid-column-start: 3; } \ No newline at end of file diff --git a/public/cards/heron/015.png b/public/cards/heron/015.png index 9a3b560..af9a93d 100644 --- a/public/cards/heron/015.png +++ b/public/cards/heron/015.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cc8c8b72a13c1aa958ea4375b994051512d6212ff42b2f3f0af7fc02d771fa43 -size 144481 +oid sha256:fb74c9638f597069603a29bc22bbfcd5ce884975d73dcf7fc6a020ab6ad3ce17 +size 144600 diff --git a/public/cards/heron/029.png b/public/cards/heron/029.png index 807ba50..4301ac0 100644 --- a/public/cards/heron/029.png +++ b/public/cards/heron/029.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:032a5b6161063ce4375c9d1dbe6311302eba7581b4faa536a1fd56964485d6d0 -size 115657 +oid sha256:8fc7c9fb3582c9267cd914fad497a5d8901d186b8fbc21a1621a3aa58c30e203 +size 115347 diff --git a/public/cards/heron/030.png b/public/cards/heron/030.png index 932aaf2..345414b 100644 --- a/public/cards/heron/030.png +++ b/public/cards/heron/030.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:86aa2d749dc9ca23f97b000bd61766b92e3134ddde55d3c667db834357809abe -size 116257 +oid sha256:36bbea2e51bce7010c24e370a3490cff90dcba502a0d5689123e987d9bac43f3 +size 116240 diff --git a/public/cards/heron/031.png b/public/cards/heron/031.png index e5c52b6..0014e64 100644 --- a/public/cards/heron/031.png +++ b/public/cards/heron/031.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:021dd847d22b01c387e8c349ea8902405449320e93806a7aa6ec0f2a43c7b64a -size 128430 +oid sha256:0f19ed83f09e9c18e6be4d37ff70beec57875bc66e427a21ff24eda9681e495b +size 128396 diff --git a/public/cards/heron/032.png b/public/cards/heron/032.png index e1441e6..3e803a5 100644 --- a/public/cards/heron/032.png +++ b/public/cards/heron/032.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:48487d7e57b1c069e77722d581be9aa9a90ab578f26de3025d8ac8ffa1119d35 -size 80494 +oid sha256:15df7c35579f81cda45416e7745bab93c170f10920fdf4c7bbb8e5762db08283 +size 80392 diff --git a/public/cards/heron/033.png b/public/cards/heron/033.png index 24c598e..0dd240d 100644 --- a/public/cards/heron/033.png +++ b/public/cards/heron/033.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:683854ae69feed0aa39188613816999f46185887d26886e20a179e5a2826f3a4 -size 94457 +oid sha256:a58b17fb68afc71a57a959dda6af2f3439506c99d52d547916d10019f2106ebc +size 94466 diff --git a/public/cards/heron/034.png b/public/cards/heron/034.png index 0cebc29..d19eddd 100644 --- a/public/cards/heron/034.png +++ b/public/cards/heron/034.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:93d8145f5d23205845fd9fef27e0014199f3fdf18390b983bfb20ce18d02ee44 -size 128269 +oid sha256:1072ff6cd7880a98f482ad903b07f2d91e59c593906373e8648a755ce08ad917 +size 128151 diff --git a/public/cards/heron/035.png b/public/cards/heron/035.png index 3cd9d18..825e711 100644 --- a/public/cards/heron/035.png +++ b/public/cards/heron/035.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3c08a5ee61c595bdf31761e01b8e2e03922e0113c269cbba8be12011b308e85a -size 137166 +oid sha256:1b7b9111f76f9c8c3d7a663eef6eeb6ed8a23139283e92dca267601b909092b3 +size 137262 diff --git a/public/cards/heron/036.png b/public/cards/heron/036.png index 20849ea..fec0ce1 100644 --- a/public/cards/heron/036.png +++ b/public/cards/heron/036.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f17ede0666dca1c903fb00349ab520bbab3e9ecb8e910280bb6f17f555f64f01 -size 120277 +oid sha256:f134f07373aca223b2ce493f47f0addecba7418ad7dbd744abff7d60a55ec5f3 +size 120072 diff --git a/public/cards/heron/037.png b/public/cards/heron/037.png index 9738a9a..60afa9d 100644 --- a/public/cards/heron/037.png +++ b/public/cards/heron/037.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:efba3b2c3904d9f3da28314b4af5834efc4486096ce7a6557480ad75764c3c78 -size 108809 +oid sha256:dff8fe09eb81d7dbe23f38e134e8ebf6ebbc87ae764d5e4edc272069c1527754 +size 108996 diff --git a/public/cards/heron/038.png b/public/cards/heron/038.png index f806e3c..c0fe806 100644 --- a/public/cards/heron/038.png +++ b/public/cards/heron/038.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e23135c57109f3d4312524ddd5053f0f9387f70a0d1b3e20c3883be48ae702c2 -size 113846 +oid sha256:3415307a01264a09be689f5bba1d792c498a00760ad4dd3c26432c2db4d3c325 +size 113327 diff --git a/public/cards/heron/039.png b/public/cards/heron/039.png index c0d9cf8..0e1ffa7 100644 --- a/public/cards/heron/039.png +++ b/public/cards/heron/039.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f88ad189a2a98678452af3f5adddc1f60975766c46ca6441da52db895b85c111 -size 144222 +oid sha256:b7326eee2e49596027684c9baedf106f51464b9822be6953146c0146ed7cf4d6 +size 144253 diff --git a/public/cards/heron/040.png b/public/cards/heron/040.png index ecb3304..a5b32c3 100644 --- a/public/cards/heron/040.png +++ b/public/cards/heron/040.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:943ad8b54b090f7ddf7feb71eedd507853f8de17986b9f8fd23d1b9aec608c99 -size 148808 +oid sha256:d3db3bc26653cb2f6d7f858bfd673cc4d7597637ced766d508139d589b2fb317 +size 148695 diff --git a/public/cards/heron/041.png b/public/cards/heron/041.png index 347bbd3..ad2a577 100644 --- a/public/cards/heron/041.png +++ b/public/cards/heron/041.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c50a1ff8772b8e8aa25c2b26f7569fd3cbc0d882392c559e1cdb6c98239c404c -size 112723 +oid sha256:fb08e558f26487e14b6e286f9ccc176507dca9c5197e92ffda2c17351898382c +size 112441 diff --git a/public/cards/original/008.png b/public/cards/original/008.png new file mode 100644 index 0000000..96f38c4 --- /dev/null +++ b/public/cards/original/008.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d620f000d2ad0c47036a3b69e47229f7d3ad2435a011ac39ba749add082debe6 +size 49334 diff --git a/public/cards/original/034.png b/public/cards/original/034.png new file mode 100644 index 0000000..7dad6e4 --- /dev/null +++ b/public/cards/original/034.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e5b64e564e7b6fe6618ae2d495d7014667ef6756e4a25fc63a07fb9d3afb8b68 +size 56409 diff --git a/public/cards/original/042.png b/public/cards/original/042.png new file mode 100644 index 0000000..177e745 --- /dev/null +++ b/public/cards/original/042.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:15b60b7924ab195b401e895ceb4cfe70f6725b6589dd1781fac705a4a0ab22b3 +size 55428 diff --git a/public/favicon.ico b/public/favicon.ico index 18993ad..6bb35de 100644 Binary files a/public/favicon.ico and b/public/favicon.ico differ diff --git a/public/settings.png b/public/settings.png new file mode 100644 index 0000000..41457ff --- /dev/null +++ b/public/settings.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8b6540bc69fce62126ecc6b27e2c8b68c5aa26968d4d23cbafb6e79c883e8c3d +size 52293 diff --git a/stores/settingsStore.ts b/stores/settingsStore.ts index 876f28f..e60202a 100644 --- a/stores/settingsStore.ts +++ b/stores/settingsStore.ts @@ -1,14 +1,24 @@ import { defineStore } from "pinia"; -const CARDS_COOKIE_NAME = 'cards_type'; -const CARDS_DEFAULT_VALUE = 'heron'; - +enum CardStyles { + HERON = "heron", + ORIGINAL = "original" +} export const useSettingsStore = defineStore("settingstore", { state: () => ({ - cardStyle: "heron", - shaderQuality: 6, - shaderFramerate: 60, + cardStyle: CardStyles.HERON, + shaderQuality: 0, + shaderFramerate: 10, }), + actions: { + switchCardStyles() { + if (this.cardStyle === CardStyles.HERON) { + this.cardStyle = CardStyles.ORIGINAL + } else { + this.cardStyle = CardStyles.HERON + } + } + }, persist: true });