diff --git a/config/fish.yml b/config/fish.yml index 172db7d..2c2ff34 100644 --- a/config/fish.yml +++ b/config/fish.yml @@ -645,27 +645,286 @@ rarity: 0 location: "river" activeMonths: 0b000001111100 + +# Sea creatures (https://nookipedia.com/wiki/Sea_creature) +#* Duplicate catches are not included - id: "abalone" name: "Abalone" size: 10 rarity: 0 location: "sea" activeMonths: 0b100001111111 + emoji: "๐Ÿš" - id: "acorn_barnacle" name: "Acorn Barnacle" size: 3 rarity: 0 location: "sea" - activeMonths: 0b000001110000 + activeMonths: 0b111111111111 + emoji: "๐Ÿš" - id: "chambered_nautilus" name: "Chambered nautilus" size: 35 rarity: 0 location: "sea" - activeMonths: 0b000001110000 + activeMonths: 0b001111001110 + emoji: "๐Ÿฆ" - id: "clam" name: "Clam" - size: 35 + size: 4 rarity: 0 location: "sea" + activeMonths: 0b111100001111 + emoji: "๐Ÿš" +- id: "ear_shell" + name: "Ear Shell" + size: 7 + rarity: 0 + location: "sea" + activeMonths: 0b111111111111 + emoji: "๐Ÿš" +- id: "flatworm" + name: "Flatworm" + size: 4 + rarity: 0 + location: "sea" + activeMonths: 0b000000011000 + emoji: "๐Ÿชฑ" +- id: "giant_isopod" + name: "Giant Isopod" + size: 30 + rarity: 0 + location: "sea" + activeMonths: 0b000001111100 + emoji: "๐Ÿชฑ" +- id: "horsehair_crab" + name: "Horsehair Crab" + size: 24 + rarity: 2 + location: "sea" + activeMonths: 0b111100000011 + emoji: "๐Ÿฆ€" +- id: "horseshoe_crab" + name: "Horseshoe Crab" + size: 40 + rarity: 3 + location: "sea" + activeMonths: 0b000000111000 + emoji: "๐Ÿงฒ" +- id: "mantis_shrimp" + name: "Mantis Shrimp" + size: 12 + rarity: 2 + location: "sea" + activeMonths: 0b111111111111 + emoji: "๐Ÿฆ" +- id: "oyster" + name: "Oyster" + size: 8 + rarity: 0 + location: "sea" + activeMonths: 0b110000001111 + emoji: "๐Ÿฆช" +- id: "pearl_oyster" + name: "Pearl Oyster" + size: 10 + rarity: 3 + location: "sea" + activeMonths: 0b111111111111 + emoji: "๐Ÿฆช" +- id: "red_king_crab" + name: "Red King Crab" + size: 50 + rarity: 4 + location: "sea" + activeMonths: 0b111000000011 + emoji: "๐Ÿฆ€" +- id: "scallop" + name: "Scallop" + size: 14 + rarity: 2 + location: "sea" + activeMonths: 0b111111111111 + emoji: "๐Ÿฆช" +- id: "sea_anemone" + name: "Sea anemone" + size: 20 + rarity: 1 + location: "sea" + activeMonths: 0b111111111111 + emoji: "๐Ÿชธ" +- id: "sea_cucumber" + name: "Sea cucumber" + size: 60 + rarity: 1 + location: "sea" + activeMonths: 0b111100000011 + emoji: "๐Ÿฅ’" +- id: "sea_grapes" + name: "Sea grapes" + size: 20 + rarity: 1 + location: "sea" + activeMonths: 0b000001111000 + emoji: "๐Ÿ‡" +- id: "sea_slug" + name: "Sea slug" + size: 4 + rarity: 1 + location: "sea" + activeMonths: 0b111111111111 + emoji: "๐ŸŒ" +- id: "sea_star" + name: "Sea star" + size: 25 + rarity: 0 + location: "sea" + activeMonths: 0b111111111111 + emoji: "โญ" +- id: "sea_urchin" + name: "Sea urchin" + size: 12 + rarity: 1 + location: "sea" activeMonths: 0b000001110000 + emoji: "๐Ÿก" +- id: "seaweed" + name: "Seaweed" + size: 80 + rarity: 0 + location: "sea" + activeMonths: 0b111111100111 + emoji: "๐ŸŒฑ" +- id: "snow_crab" + name: "Snow crab" + size: 30 + rarity: 2 + location: "sea" + activeMonths: 0b111100000011 + emoji: "๐Ÿฆ€" +- id: "spider_crab" + name: "Spider crab" + size: 120 + rarity: 3 + location: "sea" + activeMonths: 0b001100000000 + emoji: "๐Ÿฆ€" +- id: "spiny_lobster" + name: "Spiny lobster" + size: 30 + rarity: 3 + location: "sea" + activeMonths: 0b000000000111 + emoji: "๐Ÿฆž" +- id: "spotted_garden_eel" + name: "Spotted garden eel" + size: 17 + rarity: 2 + location: "sea" + activeMonths: 0b000011111100 + emoji: "๐Ÿ" +- id: "sweet_shrimp" + name: "Sweet shrimp" + size: 12 + rarity: 1 + location: "sea" + activeMonths: 0b110000001111 + emoji: "๐Ÿฆ" +- id: "tiger_prawn" + name: "Tiger prawn" + size: 20 + rarity: 2 + location: "sea" + activeMonths: 0b000001111000 + emoji: "๐Ÿฆ" +- id: "turban_shell" + name: "Turban shell" + size: 12 + rarity: 2 + location: "sea" + activeMonths: 0b001110001111 + emoji: "๐Ÿš" +- id: "dungeness_crab" + name: "Dungeness crab" + size: 10 + rarity: 1 + location: "sea" + activeMonths: 0b111110000011 + emoji: "๐Ÿฆ€" +- id: "firefly_squid" + name: "Firefly squid" + size: 5 + rarity: 3 + location: "sea" + activeMonths: 0b001111000000 + emoji: "๐Ÿฆ‘" +- id: "gazami_crab" + name: "Gazami crab" + size: 15 + rarity: 3 + location: "sea" + activeMonths: 0b000001111110 + emoji: "๐Ÿฆ€" +- id: "gigas_giant_clam" + name: "Gigas giant clam" + size: 115 + rarity: 4 + location: "sea" + activeMonths: 0b000011111000 + emoji: "๐Ÿฆช" +- id: "mussel" + name: "Mussel" + size: 5 + rarity: 1 + location: "sea" + activeMonths: 0b000001111111 + emoji: "๐Ÿฆช" +- id: "sea_pig" + name: "Sea pig" + size: 3 + rarity: 1 + location: "sea" + activeMonths: 0b110000000011 + emoji: "๐Ÿ–" +- id: "sea_pineapple" + name: "Sea pineapple" + size: 10 + rarity: 1 + location: "sea" + activeMonths: 0b000111110000 + emoji: "๐Ÿ" +- id: "slate_pencil_urchin" + name: "Slate pencil urchin" + size: 20 + rarity: 2 + location: "sea" + activeMonths: 0b000011111000 + emoji: "๐Ÿก" +- id: "umbrella_octopus" + name: "Umbrella octopus" + size: 30 + rarity: 3 + location: "sea" + activeMonths: 0b001110001110 + emoji: "๐Ÿ™" +- id: "vampire_squid" + name: "Vampire squid" + size: 20 + rarity: 3 + location: "sea" + activeMonths: 0b000011110000 + emoji: "๐Ÿฆ‘" +- id: "venus_flower_basket" + name: "Venus' flower basket" + size: 25 + rarity: 4 + location: "sea" + activeMonths: 0b110000000111 + emoji: "๐Ÿงบ" +- id: "whelk" + name: "Whelk" + size: 3 + rarity: 0 + location: "sea" + activeMonths: 0b111111111111 + emoji: "๐ŸŒ" diff --git a/site/astro.config.mjs b/site/astro.config.mjs index 461bd30..14e1691 100644 --- a/site/astro.config.mjs +++ b/site/astro.config.mjs @@ -1,8 +1,8 @@ -import { defineConfig } from 'astro/config'; +import { defineConfig } from "astro/config"; import tailwind from "@astrojs/tailwind"; // https://astro.build/config export default defineConfig({ - integrations: [tailwind()] -}); \ No newline at end of file + integrations: [tailwind()] +}); diff --git a/site/package.json b/site/package.json index d3d4e86..72d0043 100644 --- a/site/package.json +++ b/site/package.json @@ -1,19 +1,19 @@ { - "name": "site", - "type": "module", - "version": "0.0.1", - "scripts": { - "dev": "astro dev", - "start": "astro dev", - "build": "astro check && astro build", - "preview": "astro preview", - "astro": "astro" - }, - "dependencies": { - "@astrojs/check": "^0.7.0", - "@astrojs/tailwind": "^5.1.0", - "astro": "^4.10.2", - "tailwindcss": "^3.4.4", - "typescript": "^5.4.5" - } -} \ No newline at end of file + "name": "site", + "type": "module", + "version": "0.0.1", + "scripts": { + "dev": "astro dev", + "start": "astro dev", + "build": "astro check && astro build", + "preview": "astro preview", + "astro": "astro" + }, + "dependencies": { + "@astrojs/check": "^0.7.0", + "@astrojs/tailwind": "^5.1.2", + "astro": "^4.10.2", + "tailwindcss": "^3.4.14", + "typescript": "^5.4.5" + } +} diff --git a/site/pnpm-lock.yaml b/site/pnpm-lock.yaml index 20b9bdc..982ace3 100644 --- a/site/pnpm-lock.yaml +++ b/site/pnpm-lock.yaml @@ -12,14 +12,14 @@ importers: specifier: ^0.7.0 version: 0.7.0(typescript@5.4.5) '@astrojs/tailwind': - specifier: ^5.1.0 - version: 5.1.0(astro@4.10.2(typescript@5.4.5))(tailwindcss@3.4.4) + specifier: ^5.1.2 + version: 5.1.2(astro@4.10.2(typescript@5.4.5))(tailwindcss@3.4.14) astro: specifier: ^4.10.2 version: 4.10.2(typescript@5.4.5) tailwindcss: - specifier: ^3.4.4 - version: 3.4.4 + specifier: ^3.4.14 + version: 3.4.14 typescript: specifier: ^5.4.5 version: 5.4.5 @@ -65,10 +65,10 @@ packages: resolution: {integrity: sha512-Z9IYjuXSArkAUx3N6xj6+Bnvx8OdUSHA8YoOgyepp3+zJmtVYJIl/I18GozdJVW1p5u/CNpl3Km7/gwTJK85cw==} engines: {node: ^18.17.1 || ^20.3.0 || >=21.0.0} - '@astrojs/tailwind@5.1.0': - resolution: {integrity: sha512-BJoCDKuWhU9FT2qYg+fr6Nfb3qP4ShtyjXGHKA/4mHN94z7BGcmauQK23iy+YH5qWvTnhqkd6mQPQ1yTZTe9Ig==} + '@astrojs/tailwind@5.1.2': + resolution: {integrity: sha512-IvOF0W/dtHElcXvhrPR35nHmhyV3cfz1EzPitMGtU7sYy9Hci3BNK1To6FWmVuuNKPxza1IgCGetSynJZL7fOg==} peerDependencies: - astro: ^3.0.0 || ^4.0.0 + astro: ^3.0.0 || ^4.0.0 || ^5.0.0-beta.0 tailwindcss: ^3.0.24 '@astrojs/telemetry@3.1.0': @@ -710,8 +710,8 @@ packages: engines: {node: ^18.17.1 || ^20.3.0 || >=21.0.0, npm: '>=9.6.5', pnpm: '>=7.1.0'} hasBin: true - autoprefixer@10.4.19: - resolution: {integrity: sha512-BaENR2+zBZ8xXhM4pUaKUxlVdxZ0EZhjvbopwnXmxRUfqDmwSpC2lAi/QXvx7NRdPCo1WKEcEF6mV64si1z4Ew==} + autoprefixer@10.4.20: + resolution: {integrity: sha512-XY25y5xSv/wEoqzDyXXME4AFfkZI0P23z6Fs3YgymDnKJkCGOnkL0iTxCa85UTqaSgfcqyf3UA6+c7wUvx/16g==} engines: {node: ^10 || ^12 || >=14} hasBin: true peerDependencies: @@ -749,6 +749,11 @@ packages: engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7} hasBin: true + browserslist@4.24.0: + resolution: {integrity: sha512-Rmb62sR1Zpjql25eSanFGEhAxcFwfA1K0GuQcLoaJBAcENegrQut3hYdhXFF1obQfiDyqIW/cLM5HSJ/9k884A==} + engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7} + hasBin: true + camelcase-css@2.0.1: resolution: {integrity: sha512-QOSvevhslijgYwRx6Rv7zKdMF8lbRmx+uQGx2+vDc+KI/eBnsy9kit5aj23AgGu3pa4t9AgwbnXWqS+iOY+2aA==} engines: {node: '>= 6'} @@ -760,6 +765,9 @@ packages: caniuse-lite@1.0.30001636: resolution: {integrity: sha512-bMg2vmr8XBsbL6Lr0UHXy/21m84FTxDLWn2FSqMd5PrlbMxwJlQnC2YWYxVgp66PZE+BBNF2jYQUBKCo1FDeZg==} + caniuse-lite@1.0.30001669: + resolution: {integrity: sha512-DlWzFDJqstqtIVx1zeSpIMLjunf5SmwOw0N2Ck/QSQdS8PLS4+9HrLaYei4w8BIAL7IB/UEDu889d8vhCTPA0w==} + ccount@2.0.1: resolution: {integrity: sha512-eyrF0jiFpY+3drT6383f1qhkbGsLSifNAjA61IUjZjmLCWjItY6LB9ft9YhoDgwfmclB2zhu51Lc7+95b8NRAg==} @@ -904,6 +912,9 @@ packages: electron-to-chromium@1.4.803: resolution: {integrity: sha512-61H9mLzGOCLLVsnLiRzCbc63uldP0AniRYPV3hbGVtONA1pI7qSGILdbofR7A8TMbOypDocEAjH/e+9k1QIe3g==} + electron-to-chromium@1.5.41: + resolution: {integrity: sha512-dfdv/2xNjX0P8Vzme4cfzHqnPm5xsZXwsolTYr0eyW18IUmNyG08vL+fttvinTfhKfIKdRoqkDIC9e9iWQCNYQ==} + emmet@2.4.7: resolution: {integrity: sha512-O5O5QNqtdlnQM2bmKHtJgyChcrFMgQuulI+WdiOw2NArzprUqqxUW6bgYtKvzKgrsYpuLWalOkdhNP+1jluhCA==} @@ -932,6 +943,10 @@ packages: resolution: {integrity: sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA==} engines: {node: '>=6'} + escalade@3.2.0: + resolution: {integrity: sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==} + engines: {node: '>=6'} + escape-string-regexp@1.0.5: resolution: {integrity: sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==} engines: {node: '>=0.8.0'} @@ -1432,6 +1447,9 @@ packages: node-releases@2.0.14: resolution: {integrity: sha512-y10wOWt8yZpqXmOgRo77WaHEmhYQYGNA6y421PKsKYWEK8aW+cqAphborZDhqfyKrbZEN92CN1X2KbafY2s7Yw==} + node-releases@2.0.18: + resolution: {integrity: sha512-d9VeXT4SJ7ZeOqGX6R5EM022wpL+eWPooLI+5UpWn2jCT1aosUQEhQP214x33Wkwx3JQMvIm+tIoVOdodFS40g==} + normalize-path@3.0.0: resolution: {integrity: sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==} engines: {node: '>=0.10.0'} @@ -1530,6 +1548,9 @@ packages: picocolors@1.0.1: resolution: {integrity: sha512-anP1Z8qwhkbmu7MFP5iTt+wQKXgwzf7zTyGlcdzabySa9vd0Xt392U0rVmz9poOaBj0uHJKyyo9/upk0HrEQew==} + picocolors@1.1.1: + resolution: {integrity: sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==} + picomatch@2.3.1: resolution: {integrity: sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==} engines: {node: '>=8.6'} @@ -1591,6 +1612,10 @@ packages: resolution: {integrity: sha512-Wglpdk03BSfXkHoQa3b/oulrotAkwrlLDRSOb9D0bN86FdRyE9lppSp33aHNPgBa0JKCoB+drFLZkQoRRYae5A==} engines: {node: ^10 || ^12 || >=14} + postcss@8.4.47: + resolution: {integrity: sha512-56rxCq7G/XfB4EkXq9Egn5GCqugWvDFjafDOThIdMBsI15iqPqR5r15TfSr1YPYeEI19YeaXMCbY6u88Y76GLQ==} + engines: {node: ^10 || ^12 || >=14} + preferred-pm@3.1.3: resolution: {integrity: sha512-MkXsENfftWSRpzCzImcp4FRsCc3y1opwB73CfCNWyzMqArju2CrlMHlqB7VexKiPEOjGMbttv1r9fSCn5S610w==} engines: {node: '>=10'} @@ -1728,6 +1753,10 @@ packages: resolution: {integrity: sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==} engines: {node: '>=0.10.0'} + source-map-js@1.2.1: + resolution: {integrity: sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==} + engines: {node: '>=0.10.0'} + space-separated-tokens@2.0.2: resolution: {integrity: sha512-PEGlAwrG8yXGXRjW32fGbg66JAlOAwbObuqVoJpv/mRgoWDQfgH1wDPvtzWyUSNAXBGSk8h755YDbbcEy3SH2Q==} @@ -1786,8 +1815,8 @@ packages: resolution: {integrity: sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==} engines: {node: '>= 0.4'} - tailwindcss@3.4.4: - resolution: {integrity: sha512-ZoyXOdJjISB7/BcLTR6SEsLgKtDStYyYZVLsUtWChO4Ps20CBad7lfJKVDiejocV4ME1hLmyY0WJE3hSDcmQ2A==} + tailwindcss@3.4.14: + resolution: {integrity: sha512-IcSvOcTRcUtQQ7ILQL5quRDg7Xs93PdJEk1ZLbhhvJc7uj/OAhYOnruEiwnGgBvUtaUAJ8/mhSw1o8L2jCiENA==} engines: {node: '>=14.0.0'} hasBin: true @@ -1897,6 +1926,12 @@ packages: peerDependencies: browserslist: '>= 4.21.0' + update-browserslist-db@1.1.1: + resolution: {integrity: sha512-R8UzCaa9Az+38REPiJ1tXlImTJXlVfgHZsglwBD/k6nj76ctsH1E3q4doGrukiLQd3sGQYu56r5+lo5r94l29A==} + hasBin: true + peerDependencies: + browserslist: '>= 4.21.0' + util-deprecate@1.0.2: resolution: {integrity: sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==} @@ -2178,13 +2213,13 @@ snapshots: dependencies: prismjs: 1.29.0 - '@astrojs/tailwind@5.1.0(astro@4.10.2(typescript@5.4.5))(tailwindcss@3.4.4)': + '@astrojs/tailwind@5.1.2(astro@4.10.2(typescript@5.4.5))(tailwindcss@3.4.14)': dependencies: astro: 4.10.2(typescript@5.4.5) - autoprefixer: 10.4.19(postcss@8.4.38) - postcss: 8.4.38 - postcss-load-config: 4.0.2(postcss@8.4.38) - tailwindcss: 3.4.4 + autoprefixer: 10.4.20(postcss@8.4.47) + postcss: 8.4.47 + postcss-load-config: 4.0.2(postcss@8.4.47) + tailwindcss: 3.4.14 transitivePeerDependencies: - ts-node @@ -2853,14 +2888,14 @@ snapshots: - terser - typescript - autoprefixer@10.4.19(postcss@8.4.38): + autoprefixer@10.4.20(postcss@8.4.47): dependencies: - browserslist: 4.23.1 - caniuse-lite: 1.0.30001636 + browserslist: 4.24.0 + caniuse-lite: 1.0.30001669 fraction.js: 4.3.7 normalize-range: 0.1.2 picocolors: 1.0.1 - postcss: 8.4.38 + postcss: 8.4.47 postcss-value-parser: 4.2.0 axobject-query@4.0.0: @@ -2901,12 +2936,21 @@ snapshots: node-releases: 2.0.14 update-browserslist-db: 1.0.16(browserslist@4.23.1) + browserslist@4.24.0: + dependencies: + caniuse-lite: 1.0.30001669 + electron-to-chromium: 1.5.41 + node-releases: 2.0.18 + update-browserslist-db: 1.1.1(browserslist@4.24.0) + camelcase-css@2.0.1: {} camelcase@7.0.1: {} caniuse-lite@1.0.30001636: {} + caniuse-lite@1.0.30001669: {} + ccount@2.0.1: {} chalk@2.4.2: @@ -3030,6 +3074,8 @@ snapshots: electron-to-chromium@1.4.803: {} + electron-to-chromium@1.5.41: {} + emmet@2.4.7: dependencies: '@emmetio/abbreviation': 2.3.3 @@ -3073,6 +3119,8 @@ snapshots: escalade@3.1.2: {} + escalade@3.2.0: {} + escape-string-regexp@1.0.5: {} escape-string-regexp@5.0.0: {} @@ -3756,6 +3804,8 @@ snapshots: node-releases@2.0.14: {} + node-releases@2.0.18: {} + normalize-path@3.0.0: {} normalize-range@0.1.2: {} @@ -3846,6 +3896,8 @@ snapshots: picocolors@1.0.1: {} + picocolors@1.1.1: {} + picomatch@2.3.1: {} pify@2.3.0: {} @@ -3877,6 +3929,13 @@ snapshots: optionalDependencies: postcss: 8.4.38 + postcss-load-config@4.0.2(postcss@8.4.47): + dependencies: + lilconfig: 3.1.2 + yaml: 2.4.5 + optionalDependencies: + postcss: 8.4.47 + postcss-nested@6.0.1(postcss@8.4.38): dependencies: postcss: 8.4.38 @@ -3895,6 +3954,12 @@ snapshots: picocolors: 1.0.1 source-map-js: 1.2.0 + postcss@8.4.47: + dependencies: + nanoid: 3.3.7 + picocolors: 1.1.1 + source-map-js: 1.2.1 + preferred-pm@3.1.3: dependencies: find-up: 5.0.0 @@ -4115,6 +4180,8 @@ snapshots: source-map-js@1.2.0: {} + source-map-js@1.2.1: {} + space-separated-tokens@2.0.2: {} sprintf-js@1.0.3: {} @@ -4174,7 +4241,7 @@ snapshots: supports-preserve-symlinks-flag@1.0.0: {} - tailwindcss@3.4.4: + tailwindcss@3.4.14: dependencies: '@alloc/quick-lru': 5.2.0 arg: 5.0.2 @@ -4327,6 +4394,12 @@ snapshots: escalade: 3.1.2 picocolors: 1.0.1 + update-browserslist-db@1.1.1(browserslist@4.24.0): + dependencies: + browserslist: 4.24.0 + escalade: 3.2.0 + picocolors: 1.1.1 + util-deprecate@1.0.2: {} vfile-location@5.0.2: diff --git a/site/public/favicon.ico b/site/public/favicon.ico new file mode 100644 index 0000000..1061cff Binary files /dev/null and b/site/public/favicon.ico differ diff --git a/site/public/favicon.svg b/site/public/favicon.svg deleted file mode 100644 index f157bd1..0000000 --- a/site/public/favicon.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - diff --git a/site/public/fish_icon.png b/site/public/fish_icon.png new file mode 100644 index 0000000..da6bef8 Binary files /dev/null and b/site/public/fish_icon.png differ diff --git a/site/public/images/Anchovy.png b/site/public/images/Anchovy.png new file mode 100644 index 0000000..8cd430a Binary files /dev/null and b/site/public/images/Anchovy.png differ diff --git a/site/public/images/Angelfish.png b/site/public/images/Angelfish.png new file mode 100644 index 0000000..ed56886 Binary files /dev/null and b/site/public/images/Angelfish.png differ diff --git a/site/public/images/Arapaima.png b/site/public/images/Arapaima.png new file mode 100644 index 0000000..e2adcd3 Binary files /dev/null and b/site/public/images/Arapaima.png differ diff --git a/site/public/images/Arowana.png b/site/public/images/Arowana.png new file mode 100644 index 0000000..13fa28b Binary files /dev/null and b/site/public/images/Arowana.png differ diff --git a/site/public/images/Barbel Steed.png b/site/public/images/Barbel Steed.png new file mode 100644 index 0000000..135fd24 Binary files /dev/null and b/site/public/images/Barbel Steed.png differ diff --git a/site/public/images/Barred Knifejaw.png b/site/public/images/Barred Knifejaw.png new file mode 100644 index 0000000..b5f3fb5 Binary files /dev/null and b/site/public/images/Barred Knifejaw.png differ diff --git a/site/public/images/Barreleye.png b/site/public/images/Barreleye.png new file mode 100644 index 0000000..0e5ac43 Binary files /dev/null and b/site/public/images/Barreleye.png differ diff --git a/site/public/images/Bass.png b/site/public/images/Bass.png new file mode 100644 index 0000000..a918a26 Binary files /dev/null and b/site/public/images/Bass.png differ diff --git a/site/public/images/Betta.png b/site/public/images/Betta.png new file mode 100644 index 0000000..16e910d Binary files /dev/null and b/site/public/images/Betta.png differ diff --git a/site/public/images/Bitterling.png b/site/public/images/Bitterling.png new file mode 100644 index 0000000..e39681c Binary files /dev/null and b/site/public/images/Bitterling.png differ diff --git a/site/public/images/Black Bass.png b/site/public/images/Black Bass.png new file mode 100644 index 0000000..da25bf4 Binary files /dev/null and b/site/public/images/Black Bass.png differ diff --git a/site/public/images/Blowfish.png b/site/public/images/Blowfish.png new file mode 100644 index 0000000..3f64ab9 Binary files /dev/null and b/site/public/images/Blowfish.png differ diff --git a/site/public/images/Blue Marlin.png b/site/public/images/Blue Marlin.png new file mode 100644 index 0000000..b9244fa Binary files /dev/null and b/site/public/images/Blue Marlin.png differ diff --git a/site/public/images/Bluegill.png b/site/public/images/Bluegill.png new file mode 100644 index 0000000..8482ea0 Binary files /dev/null and b/site/public/images/Bluegill.png differ diff --git a/site/public/images/Brook Trout.png b/site/public/images/Brook Trout.png new file mode 100644 index 0000000..b9a46c8 Binary files /dev/null and b/site/public/images/Brook Trout.png differ diff --git a/site/public/images/Butterfly Fish.png b/site/public/images/Butterfly Fish.png new file mode 100644 index 0000000..93553de Binary files /dev/null and b/site/public/images/Butterfly Fish.png differ diff --git a/site/public/images/Carp.png b/site/public/images/Carp.png new file mode 100644 index 0000000..dbcaf8c Binary files /dev/null and b/site/public/images/Carp.png differ diff --git a/site/public/images/Catfish.png b/site/public/images/Catfish.png new file mode 100644 index 0000000..fd15646 Binary files /dev/null and b/site/public/images/Catfish.png differ diff --git a/site/public/images/Char.png b/site/public/images/Char.png new file mode 100644 index 0000000..79103c8 Binary files /dev/null and b/site/public/images/Char.png differ diff --git a/site/public/images/Cherry Salmon.png b/site/public/images/Cherry Salmon.png new file mode 100644 index 0000000..7fd762d Binary files /dev/null and b/site/public/images/Cherry Salmon.png differ diff --git a/site/public/images/Clam.png b/site/public/images/Clam.png new file mode 100644 index 0000000..1f45bb6 Binary files /dev/null and b/site/public/images/Clam.png differ diff --git a/site/public/images/Clown Fish.png b/site/public/images/Clown Fish.png new file mode 100644 index 0000000..f1537e1 Binary files /dev/null and b/site/public/images/Clown Fish.png differ diff --git a/site/public/images/Coelacanth.png b/site/public/images/Coelacanth.png new file mode 100644 index 0000000..aeecc95 Binary files /dev/null and b/site/public/images/Coelacanth.png differ diff --git a/site/public/images/Crawfish.png b/site/public/images/Crawfish.png new file mode 100644 index 0000000..e2ccfda Binary files /dev/null and b/site/public/images/Crawfish.png differ diff --git a/site/public/images/Crucian Carp.png b/site/public/images/Crucian Carp.png new file mode 100644 index 0000000..f697307 Binary files /dev/null and b/site/public/images/Crucian Carp.png differ diff --git a/site/public/images/Dab.png b/site/public/images/Dab.png new file mode 100644 index 0000000..852c257 Binary files /dev/null and b/site/public/images/Dab.png differ diff --git a/site/public/images/Dace.png b/site/public/images/Dace.png new file mode 100644 index 0000000..403286e Binary files /dev/null and b/site/public/images/Dace.png differ diff --git a/site/public/images/Dorado.png b/site/public/images/Dorado.png new file mode 100644 index 0000000..6d53589 Binary files /dev/null and b/site/public/images/Dorado.png differ diff --git a/site/public/images/Ear Shell.png b/site/public/images/Ear Shell.png new file mode 100644 index 0000000..6575a43 Binary files /dev/null and b/site/public/images/Ear Shell.png differ diff --git a/site/public/images/Eel.png b/site/public/images/Eel.png new file mode 100644 index 0000000..d880224 Binary files /dev/null and b/site/public/images/Eel.png differ diff --git a/site/public/images/Football Fish.png b/site/public/images/Football Fish.png new file mode 100644 index 0000000..1d4a201 Binary files /dev/null and b/site/public/images/Football Fish.png differ diff --git a/site/public/images/Freshwater Goby.png b/site/public/images/Freshwater Goby.png new file mode 100644 index 0000000..6d84e41 Binary files /dev/null and b/site/public/images/Freshwater Goby.png differ diff --git a/site/public/images/Frog.png b/site/public/images/Frog.png new file mode 100644 index 0000000..0849f55 Binary files /dev/null and b/site/public/images/Frog.png differ diff --git a/site/public/images/Gar.png b/site/public/images/Gar.png new file mode 100644 index 0000000..d942823 Binary files /dev/null and b/site/public/images/Gar.png differ diff --git a/site/public/images/Giant Catfish.png b/site/public/images/Giant Catfish.png new file mode 100644 index 0000000..32ee1cf Binary files /dev/null and b/site/public/images/Giant Catfish.png differ diff --git a/site/public/images/Giant Snakehead.png b/site/public/images/Giant Snakehead.png new file mode 100644 index 0000000..b984d44 Binary files /dev/null and b/site/public/images/Giant Snakehead.png differ diff --git a/site/public/images/Giant Trevally.png b/site/public/images/Giant Trevally.png new file mode 100644 index 0000000..e1e9d72 Binary files /dev/null and b/site/public/images/Giant Trevally.png differ diff --git a/site/public/images/Golden Trout.png b/site/public/images/Golden Trout.png new file mode 100644 index 0000000..f8adc66 Binary files /dev/null and b/site/public/images/Golden Trout.png differ diff --git a/site/public/images/Goldfish.png b/site/public/images/Goldfish.png new file mode 100644 index 0000000..3a572d5 Binary files /dev/null and b/site/public/images/Goldfish.png differ diff --git a/site/public/images/Great White Shark.png b/site/public/images/Great White Shark.png new file mode 100644 index 0000000..efdab55 Binary files /dev/null and b/site/public/images/Great White Shark.png differ diff --git a/site/public/images/Guppy.png b/site/public/images/Guppy.png new file mode 100644 index 0000000..84a0503 Binary files /dev/null and b/site/public/images/Guppy.png differ diff --git a/site/public/images/Hammerhead Shark.png b/site/public/images/Hammerhead Shark.png new file mode 100644 index 0000000..597efc6 Binary files /dev/null and b/site/public/images/Hammerhead Shark.png differ diff --git a/site/public/images/Herabuna.png b/site/public/images/Herabuna.png new file mode 100644 index 0000000..c15a7c2 Binary files /dev/null and b/site/public/images/Herabuna.png differ diff --git a/site/public/images/Horse Mackerel.png b/site/public/images/Horse Mackerel.png new file mode 100644 index 0000000..397ced8 Binary files /dev/null and b/site/public/images/Horse Mackerel.png differ diff --git a/site/public/images/Horsehair Crab.png b/site/public/images/Horsehair Crab.png new file mode 100644 index 0000000..b43d62b Binary files /dev/null and b/site/public/images/Horsehair Crab.png differ diff --git a/site/public/images/Jellyfish.png b/site/public/images/Jellyfish.png new file mode 100644 index 0000000..4163def Binary files /dev/null and b/site/public/images/Jellyfish.png differ diff --git a/site/public/images/Killifish.png b/site/public/images/Killifish.png new file mode 100644 index 0000000..15b9d15 Binary files /dev/null and b/site/public/images/Killifish.png differ diff --git a/site/public/images/King Salmon.png b/site/public/images/King Salmon.png new file mode 100644 index 0000000..096d0a4 Binary files /dev/null and b/site/public/images/King Salmon.png differ diff --git a/site/public/images/Koi.png b/site/public/images/Koi.png new file mode 100644 index 0000000..f32c6f1 Binary files /dev/null and b/site/public/images/Koi.png differ diff --git a/site/public/images/Large Bass.png b/site/public/images/Large Bass.png new file mode 100644 index 0000000..ccf3e0d Binary files /dev/null and b/site/public/images/Large Bass.png differ diff --git a/site/public/images/Loach.png b/site/public/images/Loach.png new file mode 100644 index 0000000..89c82d7 Binary files /dev/null and b/site/public/images/Loach.png differ diff --git a/site/public/images/Lobster.png b/site/public/images/Lobster.png new file mode 100644 index 0000000..efbe8cf Binary files /dev/null and b/site/public/images/Lobster.png differ diff --git a/site/public/images/Mahi-Mahi.png b/site/public/images/Mahi-Mahi.png new file mode 100644 index 0000000..4578288 Binary files /dev/null and b/site/public/images/Mahi-Mahi.png differ diff --git a/site/public/images/Mitten Crab.png b/site/public/images/Mitten Crab.png new file mode 100644 index 0000000..3e3abcf Binary files /dev/null and b/site/public/images/Mitten Crab.png differ diff --git a/site/public/images/Moray Eel.png b/site/public/images/Moray Eel.png new file mode 100644 index 0000000..ffb293d Binary files /dev/null and b/site/public/images/Moray Eel.png differ diff --git a/site/public/images/Napoleonfish.png b/site/public/images/Napoleonfish.png new file mode 100644 index 0000000..9f02437 Binary files /dev/null and b/site/public/images/Napoleonfish.png differ diff --git a/site/public/images/Neon Tetra.png b/site/public/images/Neon Tetra.png new file mode 100644 index 0000000..8733e29 Binary files /dev/null and b/site/public/images/Neon Tetra.png differ diff --git a/site/public/images/Nibble Fish.png b/site/public/images/Nibble Fish.png new file mode 100644 index 0000000..51c18e8 Binary files /dev/null and b/site/public/images/Nibble Fish.png differ diff --git a/site/public/images/Oarfish.png b/site/public/images/Oarfish.png new file mode 100644 index 0000000..f9f0e3c Binary files /dev/null and b/site/public/images/Oarfish.png differ diff --git a/site/public/images/Ocean Sunfish.png b/site/public/images/Ocean Sunfish.png new file mode 100644 index 0000000..4802fc4 Binary files /dev/null and b/site/public/images/Ocean Sunfish.png differ diff --git a/site/public/images/Octopus.png b/site/public/images/Octopus.png new file mode 100644 index 0000000..775e2b9 Binary files /dev/null and b/site/public/images/Octopus.png differ diff --git a/site/public/images/Olive Flounder.png b/site/public/images/Olive Flounder.png new file mode 100644 index 0000000..35be4c3 Binary files /dev/null and b/site/public/images/Olive Flounder.png differ diff --git a/site/public/images/Pale Chub.png b/site/public/images/Pale Chub.png new file mode 100644 index 0000000..7bafc6f Binary files /dev/null and b/site/public/images/Pale Chub.png differ diff --git a/site/public/images/Pike.png b/site/public/images/Pike.png new file mode 100644 index 0000000..836c509 Binary files /dev/null and b/site/public/images/Pike.png differ diff --git a/site/public/images/Piranha.png b/site/public/images/Piranha.png new file mode 100644 index 0000000..339bec9 Binary files /dev/null and b/site/public/images/Piranha.png differ diff --git a/site/public/images/Pond Smelt.png b/site/public/images/Pond Smelt.png new file mode 100644 index 0000000..2e5c641 Binary files /dev/null and b/site/public/images/Pond Smelt.png differ diff --git a/site/public/images/Pop-Eyed Goldfish.png b/site/public/images/Pop-Eyed Goldfish.png new file mode 100644 index 0000000..a7fd302 Binary files /dev/null and b/site/public/images/Pop-Eyed Goldfish.png differ diff --git a/site/public/images/Puffer Fish.png b/site/public/images/Puffer Fish.png new file mode 100644 index 0000000..fb3202a Binary files /dev/null and b/site/public/images/Puffer Fish.png differ diff --git a/site/public/images/Rainbow Trout.png b/site/public/images/Rainbow Trout.png new file mode 100644 index 0000000..e54318d Binary files /dev/null and b/site/public/images/Rainbow Trout.png differ diff --git a/site/public/images/Rainbowfish.png b/site/public/images/Rainbowfish.png new file mode 100644 index 0000000..4916e5c Binary files /dev/null and b/site/public/images/Rainbowfish.png differ diff --git a/site/public/images/Ranchu Goldfish.png b/site/public/images/Ranchu Goldfish.png new file mode 100644 index 0000000..4b97540 Binary files /dev/null and b/site/public/images/Ranchu Goldfish.png differ diff --git a/site/public/images/Ray.png b/site/public/images/Ray.png new file mode 100644 index 0000000..810d5af Binary files /dev/null and b/site/public/images/Ray.png differ diff --git a/site/public/images/Red Snapper.png b/site/public/images/Red Snapper.png new file mode 100644 index 0000000..688f1d1 Binary files /dev/null and b/site/public/images/Red Snapper.png differ diff --git a/site/public/images/Ribbon Eel.png b/site/public/images/Ribbon Eel.png new file mode 100644 index 0000000..ca5609a Binary files /dev/null and b/site/public/images/Ribbon Eel.png differ diff --git a/site/public/images/Saddled Birchir.png b/site/public/images/Saddled Birchir.png new file mode 100644 index 0000000..c5aa09a Binary files /dev/null and b/site/public/images/Saddled Birchir.png differ diff --git a/site/public/images/Salmon.png b/site/public/images/Salmon.png new file mode 100644 index 0000000..01d91ed Binary files /dev/null and b/site/public/images/Salmon.png differ diff --git a/site/public/images/Saw Shark.png b/site/public/images/Saw Shark.png new file mode 100644 index 0000000..4cbf03e Binary files /dev/null and b/site/public/images/Saw Shark.png differ diff --git a/site/public/images/Sea Bass.png b/site/public/images/Sea Bass.png new file mode 100644 index 0000000..06e4d8d Binary files /dev/null and b/site/public/images/Sea Bass.png differ diff --git a/site/public/images/Sea Butterfly.png b/site/public/images/Sea Butterfly.png new file mode 100644 index 0000000..aad900c Binary files /dev/null and b/site/public/images/Sea Butterfly.png differ diff --git a/site/public/images/Sea Horse.png b/site/public/images/Sea Horse.png new file mode 100644 index 0000000..40824b9 Binary files /dev/null and b/site/public/images/Sea Horse.png differ diff --git a/site/public/images/Small Bass.png b/site/public/images/Small Bass.png new file mode 100644 index 0000000..fd9ce52 Binary files /dev/null and b/site/public/images/Small Bass.png differ diff --git a/site/public/images/Snapping Turtle.png b/site/public/images/Snapping Turtle.png new file mode 100644 index 0000000..88b0f02 Binary files /dev/null and b/site/public/images/Snapping Turtle.png differ diff --git a/site/public/images/Soft-Shelled Turtle.png b/site/public/images/Soft-Shelled Turtle.png new file mode 100644 index 0000000..fc3a130 Binary files /dev/null and b/site/public/images/Soft-Shelled Turtle.png differ diff --git a/site/public/images/Squid.png b/site/public/images/Squid.png new file mode 100644 index 0000000..7c271a0 Binary files /dev/null and b/site/public/images/Squid.png differ diff --git a/site/public/images/Stringfish.png b/site/public/images/Stringfish.png new file mode 100644 index 0000000..ead39fb Binary files /dev/null and b/site/public/images/Stringfish.png differ diff --git a/site/public/images/Sturgeon.png b/site/public/images/Sturgeon.png new file mode 100644 index 0000000..58ae79e Binary files /dev/null and b/site/public/images/Sturgeon.png differ diff --git a/site/public/images/Suckerfish.png b/site/public/images/Suckerfish.png new file mode 100644 index 0000000..71024b3 Binary files /dev/null and b/site/public/images/Suckerfish.png differ diff --git a/site/public/images/Surgeonfish.png b/site/public/images/Surgeonfish.png new file mode 100644 index 0000000..cd03636 Binary files /dev/null and b/site/public/images/Surgeonfish.png differ diff --git a/site/public/images/Sweetfish.png b/site/public/images/Sweetfish.png new file mode 100644 index 0000000..43cd756 Binary files /dev/null and b/site/public/images/Sweetfish.png differ diff --git a/site/public/images/Tadpole.png b/site/public/images/Tadpole.png new file mode 100644 index 0000000..21f0a7e Binary files /dev/null and b/site/public/images/Tadpole.png differ diff --git a/site/public/images/Tilapia.png b/site/public/images/Tilapia.png new file mode 100644 index 0000000..0fcbd01 Binary files /dev/null and b/site/public/images/Tilapia.png differ diff --git a/site/public/images/Tuna.png b/site/public/images/Tuna.png new file mode 100644 index 0000000..ee2a843 Binary files /dev/null and b/site/public/images/Tuna.png differ diff --git a/site/public/images/Whale Shark.png b/site/public/images/Whale Shark.png new file mode 100644 index 0000000..582088a Binary files /dev/null and b/site/public/images/Whale Shark.png differ diff --git a/site/public/images/Yellow Perch.png b/site/public/images/Yellow Perch.png new file mode 100644 index 0000000..f406bb9 Binary files /dev/null and b/site/public/images/Yellow Perch.png differ diff --git a/site/public/images/Zebra Turkeyfish.png b/site/public/images/Zebra Turkeyfish.png new file mode 100644 index 0000000..be32cab Binary files /dev/null and b/site/public/images/Zebra Turkeyfish.png differ diff --git a/site/src/components/NavLink.astro b/site/src/components/NavLink.astro new file mode 100644 index 0000000..556544b --- /dev/null +++ b/site/src/components/NavLink.astro @@ -0,0 +1,7 @@ +--- +const { href, text } = Astro.props; +--- + +{text} diff --git a/site/src/layouts/Layout.astro b/site/src/layouts/Layout.astro index 64391cb..1977bcc 100644 --- a/site/src/layouts/Layout.astro +++ b/site/src/layouts/Layout.astro @@ -1,6 +1,9 @@ --- +import { ViewTransitions } from "astro:transitions"; +import NavLink from "../components/NavLink.astro"; + interface Props { - title: string; + title: string; } const { title } = Astro.props; @@ -8,29 +11,51 @@ const { title } = Astro.props; - - - - - - - Fishing - {title} - - - - + + + + + + + Fishing - {title} + + + +
+ +

Fishing Bot

+ + +
+ +
+
+ + diff --git a/site/src/pages/gallery.astro b/site/src/pages/gallery.astro new file mode 100644 index 0000000..8338bb2 --- /dev/null +++ b/site/src/pages/gallery.astro @@ -0,0 +1,52 @@ +--- +import Layout from "../layouts/Layout.astro"; +import fs from "fs"; + +const imageList = fs.readdirSync("./public/images"); +--- + + +
+
+
+

Gallery

+
+ { + imageList.map(filename => { + return ( +
+
+ +
+

+ {filename.split(".png")[0]} +

+
+ ); + }) + } +
+
+
+
+ + + diff --git a/site/src/pages/index.astro b/site/src/pages/index.astro index 3f0c674..e50ddcf 100644 --- a/site/src/pages/index.astro +++ b/site/src/pages/index.astro @@ -4,23 +4,82 @@ import Layout from "../layouts/Layout.astro";
-
-

Fishing Bot

-
- +
-

Discord

+

About

+

+ The Fishing Bot is a text-based fishing simulator where you + can fish, eat, and throw various objects. It is designed as + a multiplayer experience for people who enjoy text-based + games or just want to mess with their friends. +

+ +
+ +

History

+

+ It was originally created by Axyo in 2013 for his website, + Multiplayer Piano. The Fishing Bot became the only way users + can change their colors, so it grew in popularity as people + wanted to get their favorite color. Nowadays, Multiplayer + Piano is run by different people and the Fishing Bot is only + on MultiplayerPiano.net, as the color changing admin + functionality does not work on the original site anymore as + of 2020 (we don't have the admin password anymore). Brandon + no longer runs the Fishing Bot, that is now done with his + permission by me, Hri7566. +

+ +
+ +

+ MultiplayerPiano.net +

+

+ Click here to join the test/fishing room on MPP.net! (Max 50 users at + a time) +

+ +
+ +

Discord

Click here to join the Discord server! + > to join the Discord fishing server! +

+ +
+ +

Talkomatic

+

+ As of October 2024, the Fishing Bot is also on Talkomatic! If you don't see it there, the bot has likely gone + offline, so let me know on Discord - @hri7566

+ + diff --git a/src/api/api/server.ts b/src/api/api/server.ts index 796a696..37d49d9 100644 --- a/src/api/api/server.ts +++ b/src/api/api/server.ts @@ -6,30 +6,12 @@ import path from "path"; const logger = new Logger("Server"); export const server = Bun.serve( - createBunServeHandler( - { - router: appRouter, - createContext: createContext, - req: new Request("https://github.com/Hri7566"), - endpoint: "/" - }, - { - async fetch(req, server) { - console.log(req); - const url = new URL(req.url).pathname; - - const pathargs = url.split("/"); - - if (pathargs[0] === "images") { - const file = path.join("./images/", url); - const data = Bun.file(file); - return new Response(data); - } else { - return new Response(); - } - } - } - ) + createBunServeHandler({ + router: appRouter, + createContext: createContext, + req: new Request("https://github.com/Hri7566"), + endpoint: "/" + }) ); logger.info("Started on port", (process.env.PORT as string) || 3000); diff --git a/src/api/cli/commands.ts b/src/api/cli/commands.ts index 97bc90b..c87aec5 100644 --- a/src/api/cli/commands.ts +++ b/src/api/cli/commands.ts @@ -1,5 +1,6 @@ import type { ReadlineCommand } from "./ReadlineCommand"; import { deltoken } from "./commands/deltoken"; +import { fruit } from "./commands/fruit"; import { gentoken } from "./commands/gentoken"; import { grow_fruit } from "./commands/grow_fruit"; import { help } from "./commands/help"; @@ -13,4 +14,5 @@ readlineCommands.push(gentoken); readlineCommands.push(deltoken); readlineCommands.push(lstoken); readlineCommands.push(stop); +readlineCommands.push(fruit); readlineCommands.push(grow_fruit); diff --git a/src/api/cli/commands/fruit.ts b/src/api/cli/commands/fruit.ts new file mode 100644 index 0000000..495d819 --- /dev/null +++ b/src/api/cli/commands/fruit.ts @@ -0,0 +1,15 @@ +import { getAllTokens } from "@server/data/token"; +import { ReadlineCommand } from "../ReadlineCommand"; +import { getFruitCount, growFruit } from "@server/fish/tree"; + +export const fruit = new ReadlineCommand( + "fruit", + ["fruit", "kekklefruit", "tree"], + "Show the amount of kekklefruit on the tree", + "fruit", + async line => { + const fruit = await getFruitCount(); + + return `The tree has ${fruit} kekklefruit.`; + } +); diff --git a/src/util/api/trpc.ts b/src/util/api/trpc.ts index 992660e..b33ed7c 100644 --- a/src/util/api/trpc.ts +++ b/src/util/api/trpc.ts @@ -3,28 +3,21 @@ import type { AppRouter } from "@server/api/trpc"; require("dotenv").config(); export function gettRPC(token: string) { - const fishingURL = process.env.FISHING_API_URL as string; + const fishingURL = + process.env.FISHING_API_URL || "https://fishing.hri7566.info/api"; - const firstLink = httpBatchLink({ - url: fishingURL, - headers() { - return { - Authorization: token - }; - } + return createTRPCClient({ + links: [ + httpBatchLink({ + url: fishingURL, + headers() { + return { + Authorization: token + }; + } + }) + ] }); - - const secondLink = httpBatchLink({ - url: "https://fishing.hri7566.info/api", - headers() { - return { - Authorization: token - }; - } - }); - - const links = firstLink ? [firstLink, secondLink] : [secondLink]; - return createTRPCClient({ links }); } export default gettRPC;