From 4c60ff20a66a996fccb93e1255cf08ffae777f55 Mon Sep 17 00:00:00 2001 From: Nuno Duque Nunes Date: Thu, 4 Jun 2026 02:00:50 +0100 Subject: [PATCH] update before dev merge --- .gitignore | 40 +++++++++++ data/.gitkeep | 0 data/characters.json | 11 +++ data/config.json | 3 +- data/tg-history/2026-06-01-00.json | 29 -------- data/tg-history/2026-06-01-02.json | 29 -------- data/tg-history/2026-06-01-04.json | 29 -------- data/tg-history/2026-06-01-06.json | 29 -------- data/tg-history/2026-06-01-08.json | 29 -------- data/tg-history/2026-06-01-20.json | 62 +++++++++++++--- data/tg-history/2026-06-01-22.json | 29 -------- data/usermap.json | 3 +- data/wrank.json | 109 ++++++++++++++++++++++++++++- messages/emojis.json | 8 +-- messages/users/ayana.json | 7 +- messages/users/dey.json | 2 +- messages/users/flash.json | 2 +- messages/users/invicjusz.json | 2 +- messages/users/zephyr.json | 3 +- 19 files changed, 228 insertions(+), 198 deletions(-) create mode 100644 .gitignore create mode 100644 data/.gitkeep delete mode 100644 data/tg-history/2026-06-01-00.json delete mode 100644 data/tg-history/2026-06-01-02.json delete mode 100644 data/tg-history/2026-06-01-04.json delete mode 100644 data/tg-history/2026-06-01-06.json delete mode 100644 data/tg-history/2026-06-01-08.json delete mode 100644 data/tg-history/2026-06-01-22.json diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..dbe35b0 --- /dev/null +++ b/.gitignore @@ -0,0 +1,40 @@ +# Dependencies +node_modules/ + +# Environment variables — never commit these +.env + +# Runtime data — server-specific, never commit +data/config.json +data/characters.json +data/accounts.json +data/usermap.json +data/wrank.json +data/bringer.json +data/sessionPreferences.json +data/tg-history/ + +# Keep the data directory structure but not the contents +!data/.gitkeep +!data/tg-history/.gitkeep + +# Messages — user-specific files stay local +messages/users/ + +# Keep the users directory structure +!messages/users/.gitkeep + +# TypeScript build output +dist/ + +# Logs +*.log +npm-debug.log* + +# OS files +.DS_Store +Thumbs.db + +# Editor +.vscode/ +.idea/ \ No newline at end of file diff --git a/data/.gitkeep b/data/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/data/characters.json b/data/characters.json index 01cd3b0..d629f08 100644 --- a/data/characters.json +++ b/data/characters.json @@ -86,6 +86,17 @@ } ] }, + "cobain": { + "characters": [ + { + "name": "Ancano", + "class": "DM", + "level": 75, + "nation": "Capella", + "active": true + } + ] + }, "sean": { "characters": [ { diff --git a/data/config.json b/data/config.json index 5d6d184..af1cbb8 100644 --- a/data/config.json +++ b/data/config.json @@ -1,4 +1,5 @@ { "showLevelInMessages": true, - "showClassInMessages": true + "showClassInMessages": true, + "confirmYesMessage": "⚔️ TG is confirmed for tonight!" } \ No newline at end of file diff --git a/data/tg-history/2026-06-01-00.json b/data/tg-history/2026-06-01-00.json deleted file mode 100644 index 8956b56..0000000 --- a/data/tg-history/2026-06-01-00.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "slot": 0, - "date": "2026-06-01", - "confirmed": false, - "nationKD": { - "source": "Procyon", - "capella": { - "k": 0, - "d": 0 - }, - "procyon": { - "k": 0, - "d": 0 - } - }, - "scores": [ - { - "usermapKey": "flash", - "characterName": "»Flash«", - "class": "WI", - "nation": "Procyon", - "pts": 2000, - "submittedAt": "2026-06-01T03:22:25.475Z", - "slot": 0, - "date": "2026-06-01", - "submittedByOfficer": false - } - ] -} \ No newline at end of file diff --git a/data/tg-history/2026-06-01-02.json b/data/tg-history/2026-06-01-02.json deleted file mode 100644 index a8125e1..0000000 --- a/data/tg-history/2026-06-01-02.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "slot": 2, - "date": "2026-06-01", - "confirmed": false, - "nationKD": { - "source": "Procyon", - "capella": { - "k": 0, - "d": 0 - }, - "procyon": { - "k": 0, - "d": 0 - } - }, - "scores": [ - { - "usermapKey": "flash", - "characterName": "»Flash«", - "class": "WI", - "nation": "Procyon", - "pts": 100, - "submittedAt": "2026-06-01T03:22:43.115Z", - "slot": 2, - "date": "2026-06-01", - "submittedByOfficer": false - } - ] -} \ No newline at end of file diff --git a/data/tg-history/2026-06-01-04.json b/data/tg-history/2026-06-01-04.json deleted file mode 100644 index 5d14a7b..0000000 --- a/data/tg-history/2026-06-01-04.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "slot": 4, - "date": "2026-06-01", - "confirmed": false, - "nationKD": { - "source": "Procyon", - "capella": { - "k": 0, - "d": 0 - }, - "procyon": { - "k": 0, - "d": 0 - } - }, - "scores": [ - { - "usermapKey": "flash", - "characterName": "»Flash«", - "class": "WI", - "nation": "Procyon", - "pts": 100, - "submittedAt": "2026-06-01T03:22:48.373Z", - "slot": 4, - "date": "2026-06-01", - "submittedByOfficer": false - } - ] -} \ No newline at end of file diff --git a/data/tg-history/2026-06-01-06.json b/data/tg-history/2026-06-01-06.json deleted file mode 100644 index 5d474f7..0000000 --- a/data/tg-history/2026-06-01-06.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "slot": 6, - "date": "2026-06-01", - "confirmed": false, - "nationKD": { - "source": "Procyon", - "capella": { - "k": 0, - "d": 0 - }, - "procyon": { - "k": 0, - "d": 0 - } - }, - "scores": [ - { - "usermapKey": "flash", - "characterName": "»Flash«", - "class": "WI", - "nation": "Procyon", - "pts": 100, - "submittedAt": "2026-06-01T03:22:54.521Z", - "slot": 6, - "date": "2026-06-01", - "submittedByOfficer": false - } - ] -} \ No newline at end of file diff --git a/data/tg-history/2026-06-01-08.json b/data/tg-history/2026-06-01-08.json deleted file mode 100644 index a73c62a..0000000 --- a/data/tg-history/2026-06-01-08.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "slot": 8, - "date": "2026-06-01", - "confirmed": false, - "nationKD": { - "source": "Procyon", - "capella": { - "k": 0, - "d": 0 - }, - "procyon": { - "k": 0, - "d": 0 - } - }, - "scores": [ - { - "usermapKey": "flash", - "characterName": "»Flash«", - "class": "WI", - "nation": "Procyon", - "pts": 100, - "submittedAt": "2026-06-01T03:23:03.650Z", - "slot": 8, - "date": "2026-06-01", - "submittedByOfficer": false - } - ] -} \ No newline at end of file diff --git a/data/tg-history/2026-06-01-20.json b/data/tg-history/2026-06-01-20.json index 0f614da..8b1570c 100644 --- a/data/tg-history/2026-06-01-20.json +++ b/data/tg-history/2026-06-01-20.json @@ -5,12 +5,12 @@ "nationKD": { "source": "Procyon", "capella": { - "k": 0, - "d": 0 + "k": 8, + "d": 49 }, "procyon": { - "k": 0, - "d": 0 + "k": 49, + "d": 8 } }, "scores": [ @@ -19,22 +19,66 @@ "characterName": "»Flash«", "class": "WI", "nation": "Procyon", - "pts": 4000, - "submittedAt": "2026-06-01T03:18:24.563Z", + "pts": 2490, + "submittedAt": "2026-06-01T18:41:43.076Z", "slot": 20, "date": "2026-06-01", - "submittedByOfficer": true + "submittedByOfficer": false }, { "usermapKey": "invicjusz", "characterName": "ElementalEnchant", "class": "FB", "nation": "Procyon", - "pts": 5000, - "submittedAt": "2026-06-01T03:19:12.073Z", + "pts": 948, + "submittedAt": "2026-06-01T18:42:39.059Z", + "slot": 20, + "date": "2026-06-01", + "submittedByOfficer": true + }, + { + "usermapKey": "ayana", + "characterName": "«MonkeyHunter»", + "class": "DM", + "nation": "Procyon", + "pts": 2535, + "submittedAt": "2026-06-01T18:48:50.902Z", "slot": 20, "date": "2026-06-01", "submittedByOfficer": true + }, + { + "usermapKey": "zephyr", + "characterName": "XefronYokuda", + "class": "FA", + "nation": "Capella", + "pts": 943, + "submittedAt": "2026-06-01T18:54:19.398Z", + "slot": 20, + "date": "2026-06-01", + "submittedByOfficer": false + }, + { + "usermapKey": "dey", + "characterName": "«Deystroyer»", + "class": "BL", + "nation": "Capella", + "pts": 2236, + "submittedAt": "2026-06-01T19:09:05.313Z", + "slot": 20, + "date": "2026-06-01", + "submittedByOfficer": false + }, + { + "usermapKey": "keira", + "characterName": "«Keira»", + "class": "WI", + "nation": "Capella", + "pts": 2000, + "submittedAt": "2026-06-02T10:15:05.313Z", + "slot": 20, + "date": "2026-06-01", + "submittedByOfficer": false } ] } \ No newline at end of file diff --git a/data/tg-history/2026-06-01-22.json b/data/tg-history/2026-06-01-22.json deleted file mode 100644 index d37c85a..0000000 --- a/data/tg-history/2026-06-01-22.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "slot": 22, - "date": "2026-06-01", - "confirmed": false, - "nationKD": { - "source": "Procyon", - "capella": { - "k": 0, - "d": 0 - }, - "procyon": { - "k": 0, - "d": 0 - } - }, - "scores": [ - { - "usermapKey": "flash", - "characterName": "»Flash«", - "class": "WI", - "nation": "Procyon", - "pts": 2000, - "submittedAt": "2026-06-01T03:22:14.287Z", - "slot": 22, - "date": "2026-06-01", - "submittedByOfficer": false - } - ] -} \ No newline at end of file diff --git a/data/usermap.json b/data/usermap.json index ae57a72..8354c33 100644 --- a/data/usermap.json +++ b/data/usermap.json @@ -9,5 +9,6 @@ "ibenni": "ayana", "zephyr_74135": "zephyr", "eat.jim.sleep": "keira", - "mar1n1987": "marin" + "mar1n1987": "marin", + "coba5539": "cobain" } \ No newline at end of file diff --git a/data/wrank.json b/data/wrank.json index 0c2404c..bd88ead 100644 --- a/data/wrank.json +++ b/data/wrank.json @@ -2,10 +2,113 @@ "2026-W23": { "weekKey": "2026-W23", "entries": { - "capella": [], - "procyon": [] + "capella": [ + { + "usermapKey": "zephyr", + "characterName": "XefronYokuda", + "class": "FA", + "nation": "Capella", + "weeklyPoints": 2126, + "tgCount": 3, + "currentRank": 3, + "previousRank": 3 + }, + { + "usermapKey": "dey", + "characterName": "«Deystroyer»", + "class": "BL", + "nation": "Capella", + "weeklyPoints": 4940, + "tgCount": 3, + "currentRank": 1, + "previousRank": 2 + }, + { + "usermapKey": "keira", + "characterName": "«Keira»", + "class": "WI", + "nation": "Capella", + "weeklyPoints": 4000, + "tgCount": 2, + "currentRank": 2, + "previousRank": 1 + }, + { + "usermapKey": "sean", + "characterName": "»No.1«", + "class": "FB", + "nation": "Capella", + "weeklyPoints": 1666, + "tgCount": 1, + "currentRank": 4, + "previousRank": 4 + } + ], + "procyon": [ + { + "usermapKey": "flash", + "characterName": "»Flash«", + "class": "WI", + "nation": "Procyon", + "weeklyPoints": 8872, + "tgCount": 3, + "currentRank": 1, + "previousRank": 1 + }, + { + "usermapKey": "invicjusz", + "characterName": "ElementalEnchant", + "class": "FB", + "nation": "Procyon", + "weeklyPoints": 2503, + "tgCount": 2, + "currentRank": 3, + "previousRank": 3 + }, + { + "usermapKey": "ayana", + "characterName": "«MonkeyHunter»", + "class": "DM", + "nation": "Procyon", + "weeklyPoints": 4741, + "tgCount": 2, + "currentRank": 2, + "previousRank": 2 + } + ] + }, + "scoreIndex": { + "flash": [ + "2026-06-01-20", + "2026-06-02-20", + "2026-06-03-20" + ], + "invicjusz": [ + "2026-06-01-20", + "2026-06-02-20" + ], + "ayana": [ + "2026-06-01-20", + "2026-06-02-20" + ], + "zephyr": [ + "2026-06-01-20", + "2026-06-02-20", + "2026-06-03-20" + ], + "dey": [ + "2026-06-01-20", + "2026-06-02-20", + "2026-06-03-20" + ], + "keira": [ + "2026-06-01-20", + "2026-06-02-20" + ], + "sean": [ + "2026-06-02-20" + ] }, - "scoreIndex": {}, "bringer": { "capella": null, "procyon": null, diff --git a/messages/emojis.json b/messages/emojis.json index cf6404d..0f835ba 100644 --- a/messages/emojis.json +++ b/messages/emojis.json @@ -36,8 +36,8 @@ "wrank_9_gold": "", "wrank_10": "", "wrank_10_gold": "", - "kd": "", - "score": "", - "rank": "", - "borrowed": "🔗" + "kd": "<:kd:1510999195782217768>", + "score": "<:score:1510999256901750884>", + "rank": "<:rank:1510999225998249995>", + "borrowed": "<:share:1511000283973550080>" } diff --git a/messages/users/ayana.json b/messages/users/ayana.json index aede962..17f721a 100644 --- a/messages/users/ayana.json +++ b/messages/users/ayana.json @@ -1,13 +1,16 @@ { "public": { "yes": [ - { "clicks": 1, "random": true, "messages": ["Ayana is in"]}, + { "clicks": 1, "random": true, "messages": ["HELP, KURWA! I survive, easy!", "Send emergency services!", "Aiaiaiaiai I'm unmoved, HELP!", "You want beef?! Let's go!", "I don't give a fuuuuuck", "Ayana is in"]}, { "clicks": 10, "random": true, "messages": ["Ayana..."] } ], "no": [ { "clicks": 1, "random": true, "messages": [ "Went for a kebab", - "Doesn't give a fuck" + "Doesn't give a fuck", + "Went outside... for a change", + "Is touching grass", + "Is unavailable, call your local DM hotline" ] } ] diff --git a/messages/users/dey.json b/messages/users/dey.json index 9eaa719..a079b5e 100644 --- a/messages/users/dey.json +++ b/messages/users/dey.json @@ -1,7 +1,7 @@ { "public": { "yes": [ - { "clicks": 1, "random": true, "messages": ["Dey is in"]}, + { "clicks": 1, "random": true, "messages": ["Dey is in", "Dey is in... for now", "Welcome indeed!", "A bit of this, a bit of that."]}, { "clicks": 2, "random": true, "messages": ["Courageous now, new account afterall"] }, { "clicks": 10, "random": true, "messages": ["Now you're just asking for it."] } ], diff --git a/messages/users/flash.json b/messages/users/flash.json index c3f1eee..2242eed 100644 --- a/messages/users/flash.json +++ b/messages/users/flash.json @@ -4,7 +4,7 @@ { "clicks": 1, "random": true, - "messages": ["The King has arrived. 👑", "Flash is in, bow down.", "👑 Royalty has entered the raid.","{alias[0]} is in"] + "messages": ["Flash? Flash? Flash!!", "The King has arrived. 👑", "Flash is in, bow down.","{alias[0]} is in"] }, { "clicks": 2, "random": true, "messages": ["Flash? Flash? Flash!!"] } ], diff --git a/messages/users/invicjusz.json b/messages/users/invicjusz.json index 9df0f70..6f2771a 100644 --- a/messages/users/invicjusz.json +++ b/messages/users/invicjusz.json @@ -2,7 +2,7 @@ "public": { "yes": [ { "clicks": 1, "random": true, "messages": [ - "Vic is in" + "Vic is in", "Inviiiiiiiiiiiicjusz" ] }, { "clicks": 2, "random": true, "messages": ["Vic is really in"] }, diff --git a/messages/users/zephyr.json b/messages/users/zephyr.json index 250b5c2..eae8d5e 100644 --- a/messages/users/zephyr.json +++ b/messages/users/zephyr.json @@ -5,7 +5,8 @@ "Legend is in", "Best FA shows up", "Healmeister reporting for duty", - "Capella MVP is up" + "Capella MVP is up", + "A wild Zephyr appears!" ] } ],