mirror of
https://github.com/cassoule/flopobot_v2.git
synced 2026-03-18 13:30:36 +01:00
clean, lint, format
This commit is contained in:
@@ -30,6 +30,7 @@
|
||||
```
|
||||
|
||||
## Features
|
||||
|
||||
- **Moderation Tools** : Includes commands for managing server members.
|
||||
- **AI Integration** : Utilizes AI APIs for enhanced interactions.
|
||||
- **Game Mechanics** : Implements game features and logic.
|
||||
@@ -38,6 +39,7 @@
|
||||
- **Web Integration** : Designed to work alongside a [FlopoSite](https://floposite.com) (see [FlopoSite's repo)](https://github.com/cassoule/floposite)).
|
||||
|
||||
## Additional Information
|
||||
|
||||
Note that FlopoBot is a work in progress, and new features and improvements are continually being added. Contributions and feedback are welcome !
|
||||
|
||||
FlopoBot was orriginally created to be integrated in a specific Discord server, so adding it to other servers won't provide the full experience (for now).
|
||||
@@ -45,5 +47,6 @@ FlopoBot was orriginally created to be integrated in a specific Discord server,
|
||||
FlopoSite though is public and can be used by anyone :)
|
||||
|
||||
## Related Links
|
||||
|
||||
- [FlopoSite Website](https://floposite.com)
|
||||
- [FlopoSite Repository](https://github.com/cassoule/floposite)
|
||||
36
package-lock.json
generated
36
package-lock.json
generated
@@ -14,7 +14,7 @@
|
||||
"@prisma/client": "^6.19.2",
|
||||
"axios": "^1.9.0",
|
||||
"discord-interactions": "^4.0.0",
|
||||
"discord.js": "^14.18.0",
|
||||
"discord.js": "^14.25.1",
|
||||
"dotenv": "^16.0.3",
|
||||
"express": "^4.18.2",
|
||||
"node-cron": "^3.0.3",
|
||||
@@ -700,9 +700,9 @@
|
||||
}
|
||||
},
|
||||
"node_modules/@vladfrangu/async_event_emitter": {
|
||||
"version": "2.4.6",
|
||||
"resolved": "https://registry.npmjs.org/@vladfrangu/async_event_emitter/-/async_event_emitter-2.4.6.tgz",
|
||||
"integrity": "sha512-RaI5qZo6D2CVS6sTHFKg1v5Ohq/+Bo2LZ5gzUEwZ/WkHhwtGTCB/sVLw8ijOkAUxasZ+WshN/Rzj4ywsABJ5ZA==",
|
||||
"version": "2.4.7",
|
||||
"resolved": "https://registry.npmjs.org/@vladfrangu/async_event_emitter/-/async_event_emitter-2.4.7.tgz",
|
||||
"integrity": "sha512-Xfe6rpCTxSxfbswi/W/Pz7zp1WWSNn4A0eW4mLkQUewCrXXtMj31lCg+iQyTkh/CkusZSq9eDflu7tjEDXUY6g==",
|
||||
"license": "MIT",
|
||||
"engines": {
|
||||
"node": ">=v14.0.0",
|
||||
@@ -856,13 +856,13 @@
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/axios": {
|
||||
"version": "1.13.2",
|
||||
"resolved": "https://registry.npmjs.org/axios/-/axios-1.13.2.tgz",
|
||||
"integrity": "sha512-VPk9ebNqPcy5lRGuSlKx752IlDatOjT9paPlm8A7yOuW2Fbvp4X3JznJtT4f0GzGLLiWE9W8onz51SqLYwzGaA==",
|
||||
"version": "1.13.5",
|
||||
"resolved": "https://registry.npmjs.org/axios/-/axios-1.13.5.tgz",
|
||||
"integrity": "sha512-cz4ur7Vb0xS4/KUN0tPWe44eqxrIu31me+fbang3ijiNscE129POzipJJA6zniq2C/Z6sJCjMimjS8Lc/GAs8Q==",
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"follow-redirects": "^1.15.6",
|
||||
"form-data": "^4.0.4",
|
||||
"follow-redirects": "^1.15.11",
|
||||
"form-data": "^4.0.5",
|
||||
"proxy-from-env": "^1.1.0"
|
||||
}
|
||||
},
|
||||
@@ -2070,9 +2070,9 @@
|
||||
"license": "ISC"
|
||||
},
|
||||
"node_modules/follow-redirects": {
|
||||
"version": "1.15.9",
|
||||
"resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.9.tgz",
|
||||
"integrity": "sha512-gew4GsXizNgdoRyqmyfMHyAmXsZDk6mHkSxZFCzW9gwlbtOW44CDtYavM+y+72qD/Vq2l550kMF52DT8fOLJqQ==",
|
||||
"version": "1.15.11",
|
||||
"resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.11.tgz",
|
||||
"integrity": "sha512-deG2P0JfjrTxl50XGCDyfI97ZGVCxIpfKYmfyrQ54n5FO/0gfIES8C/Psl6kWVDolizcaaxZJnTS0QSMxvnsBQ==",
|
||||
"funding": [
|
||||
{
|
||||
"type": "individual",
|
||||
@@ -2106,9 +2106,9 @@
|
||||
}
|
||||
},
|
||||
"node_modules/form-data": {
|
||||
"version": "4.0.4",
|
||||
"resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.4.tgz",
|
||||
"integrity": "sha512-KrGhL9Q4zjj0kiUt5OO4Mr/A/jlI2jDYs5eHBpYHPcBEVSiipAvn2Ko2HnPe20rmcuuvMHNdZFp+4IlGTMF0Ow==",
|
||||
"version": "4.0.5",
|
||||
"resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.5.tgz",
|
||||
"integrity": "sha512-8RipRLol37bNs2bhoV67fiTEvdTrbMUYcFTiy3+wuuOnUog2QBHCZWXDRijWQfAkhBj2Uf5UnVaiWwA5vdd82w==",
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"asynckit": "^0.4.0",
|
||||
@@ -2813,9 +2813,9 @@
|
||||
"license": "ISC"
|
||||
},
|
||||
"node_modules/magic-bytes.js": {
|
||||
"version": "1.12.1",
|
||||
"resolved": "https://registry.npmjs.org/magic-bytes.js/-/magic-bytes.js-1.12.1.tgz",
|
||||
"integrity": "sha512-ThQLOhN86ZkJ7qemtVRGYM+gRgR8GEXNli9H/PMvpnZsE44Xfh3wx9kGJaldg314v85m+bFW6WBMaVHJc/c3zA==",
|
||||
"version": "1.13.0",
|
||||
"resolved": "https://registry.npmjs.org/magic-bytes.js/-/magic-bytes.js-1.13.0.tgz",
|
||||
"integrity": "sha512-afO2mnxW7GDTXMm5/AoN1WuOcdoKhtgXjIvHmobqTD1grNplhGdv3PFOyjCVmrnOZBIT/gD/koDKpYG+0mvHcg==",
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/math-intrinsics": {
|
||||
|
||||
@@ -13,7 +13,10 @@
|
||||
"register": "node commands.js",
|
||||
"dev": "nodemon index.js",
|
||||
"prisma:generate": "prisma generate",
|
||||
"prisma:migrate": "prisma migrate dev"
|
||||
"prisma:migrate": "prisma migrate dev",
|
||||
"format": "prettier --write .",
|
||||
"lint": "eslint . --ext .js,.jsx,.ts,.tsx",
|
||||
"stripe:whook": "stripe listen --forward-to localhost:3000/api/buy-coins"
|
||||
},
|
||||
"author": "Milo Gourvest",
|
||||
"license": "MIT",
|
||||
@@ -23,7 +26,7 @@
|
||||
"@prisma/client": "^6.19.2",
|
||||
"axios": "^1.9.0",
|
||||
"discord-interactions": "^4.0.0",
|
||||
"discord.js": "^14.18.0",
|
||||
"discord.js": "^14.25.1",
|
||||
"dotenv": "^16.0.3",
|
||||
"express": "^4.18.2",
|
||||
"node-cron": "^3.0.3",
|
||||
|
||||
3167
pnpm-lock.yaml
generated
Normal file
3167
pnpm-lock.yaml
generated
Normal file
File diff suppressed because it is too large
Load Diff
97
prisma/migrations/20260209222315/migration.sql
Normal file
97
prisma/migrations/20260209222315/migration.sql
Normal file
@@ -0,0 +1,97 @@
|
||||
/*
|
||||
Warnings:
|
||||
|
||||
- You are about to alter the column `offered_at` on the `bids` table. The data in that column could be lost. The data in that column will be cast from `String` to `DateTime`.
|
||||
- You are about to alter the column `timestamp` on the `games` table. The data in that column could be lost. The data in that column will be cast from `String` to `DateTime`.
|
||||
- You are about to alter the column `created_at` on the `logs` table. The data in that column could be lost. The data in that column will be cast from `String` to `DateTime`.
|
||||
- You are about to alter the column `closing_at` on the `market_offers` table. The data in that column could be lost. The data in that column will be cast from `String` to `DateTime`.
|
||||
- You are about to alter the column `opening_at` on the `market_offers` table. The data in that column could be lost. The data in that column will be cast from `String` to `DateTime`.
|
||||
- You are about to alter the column `posted_at` on the `market_offers` table. The data in that column could be lost. The data in that column will be cast from `String` to `DateTime`.
|
||||
- You are about to alter the column `created_at` on the `transactions` table. The data in that column could be lost. The data in that column will be cast from `String` to `DateTime`.
|
||||
|
||||
*/
|
||||
-- RedefineTables
|
||||
PRAGMA defer_foreign_keys=ON;
|
||||
PRAGMA foreign_keys=OFF;
|
||||
CREATE TABLE "new_bids" (
|
||||
"id" TEXT NOT NULL PRIMARY KEY,
|
||||
"bidder_id" TEXT NOT NULL,
|
||||
"market_offer_id" TEXT NOT NULL,
|
||||
"offer_amount" INTEGER NOT NULL,
|
||||
"offered_at" DATETIME DEFAULT CURRENT_TIMESTAMP,
|
||||
CONSTRAINT "bids_bidder_id_fkey" FOREIGN KEY ("bidder_id") REFERENCES "users" ("id") ON DELETE RESTRICT ON UPDATE CASCADE,
|
||||
CONSTRAINT "bids_market_offer_id_fkey" FOREIGN KEY ("market_offer_id") REFERENCES "market_offers" ("id") ON DELETE RESTRICT ON UPDATE CASCADE
|
||||
);
|
||||
INSERT INTO "new_bids" ("bidder_id", "id", "market_offer_id", "offer_amount", "offered_at") SELECT "bidder_id", "id", "market_offer_id", "offer_amount", "offered_at" FROM "bids";
|
||||
DROP TABLE "bids";
|
||||
ALTER TABLE "new_bids" RENAME TO "bids";
|
||||
CREATE TABLE "new_games" (
|
||||
"id" TEXT NOT NULL PRIMARY KEY,
|
||||
"p1" TEXT NOT NULL,
|
||||
"p2" TEXT,
|
||||
"p1_score" INTEGER,
|
||||
"p2_score" INTEGER,
|
||||
"p1_elo" INTEGER,
|
||||
"p2_elo" INTEGER,
|
||||
"p1_new_elo" INTEGER,
|
||||
"p2_new_elo" INTEGER,
|
||||
"type" TEXT,
|
||||
"timestamp" DATETIME,
|
||||
CONSTRAINT "games_p1_fkey" FOREIGN KEY ("p1") REFERENCES "users" ("id") ON DELETE RESTRICT ON UPDATE CASCADE,
|
||||
CONSTRAINT "games_p2_fkey" FOREIGN KEY ("p2") REFERENCES "users" ("id") ON DELETE SET NULL ON UPDATE CASCADE
|
||||
);
|
||||
INSERT INTO "new_games" ("id", "p1", "p1_elo", "p1_new_elo", "p1_score", "p2", "p2_elo", "p2_new_elo", "p2_score", "timestamp", "type") SELECT "id", "p1", "p1_elo", "p1_new_elo", "p1_score", "p2", "p2_elo", "p2_new_elo", "p2_score", "timestamp", "type" FROM "games";
|
||||
DROP TABLE "games";
|
||||
ALTER TABLE "new_games" RENAME TO "games";
|
||||
CREATE TABLE "new_logs" (
|
||||
"id" TEXT NOT NULL PRIMARY KEY,
|
||||
"user_id" TEXT NOT NULL,
|
||||
"action" TEXT,
|
||||
"target_user_id" TEXT,
|
||||
"coins_amount" INTEGER,
|
||||
"user_new_amount" INTEGER,
|
||||
"created_at" DATETIME DEFAULT CURRENT_TIMESTAMP,
|
||||
CONSTRAINT "logs_user_id_fkey" FOREIGN KEY ("user_id") REFERENCES "users" ("id") ON DELETE RESTRICT ON UPDATE CASCADE,
|
||||
CONSTRAINT "logs_target_user_id_fkey" FOREIGN KEY ("target_user_id") REFERENCES "users" ("id") ON DELETE SET NULL ON UPDATE CASCADE
|
||||
);
|
||||
INSERT INTO "new_logs" ("action", "coins_amount", "created_at", "id", "target_user_id", "user_id", "user_new_amount") SELECT "action", "coins_amount", "created_at", "id", "target_user_id", "user_id", "user_new_amount" FROM "logs";
|
||||
DROP TABLE "logs";
|
||||
ALTER TABLE "new_logs" RENAME TO "logs";
|
||||
CREATE TABLE "new_market_offers" (
|
||||
"id" TEXT NOT NULL PRIMARY KEY,
|
||||
"skin_uuid" TEXT NOT NULL,
|
||||
"seller_id" TEXT NOT NULL,
|
||||
"starting_price" INTEGER NOT NULL,
|
||||
"buyout_price" INTEGER,
|
||||
"final_price" INTEGER,
|
||||
"status" TEXT NOT NULL,
|
||||
"posted_at" DATETIME DEFAULT CURRENT_TIMESTAMP,
|
||||
"opening_at" DATETIME NOT NULL,
|
||||
"closing_at" DATETIME NOT NULL,
|
||||
"buyer_id" TEXT,
|
||||
CONSTRAINT "market_offers_skin_uuid_fkey" FOREIGN KEY ("skin_uuid") REFERENCES "skins" ("uuid") ON DELETE RESTRICT ON UPDATE CASCADE,
|
||||
CONSTRAINT "market_offers_seller_id_fkey" FOREIGN KEY ("seller_id") REFERENCES "users" ("id") ON DELETE RESTRICT ON UPDATE CASCADE,
|
||||
CONSTRAINT "market_offers_buyer_id_fkey" FOREIGN KEY ("buyer_id") REFERENCES "users" ("id") ON DELETE SET NULL ON UPDATE CASCADE
|
||||
);
|
||||
INSERT INTO "new_market_offers" ("buyer_id", "buyout_price", "closing_at", "final_price", "id", "opening_at", "posted_at", "seller_id", "skin_uuid", "starting_price", "status") SELECT "buyer_id", "buyout_price", "closing_at", "final_price", "id", "opening_at", "posted_at", "seller_id", "skin_uuid", "starting_price", "status" FROM "market_offers";
|
||||
DROP TABLE "market_offers";
|
||||
ALTER TABLE "new_market_offers" RENAME TO "market_offers";
|
||||
CREATE TABLE "new_transactions" (
|
||||
"id" TEXT NOT NULL PRIMARY KEY,
|
||||
"session_id" TEXT NOT NULL,
|
||||
"user_id" TEXT NOT NULL,
|
||||
"coins_amount" INTEGER NOT NULL,
|
||||
"amount_cents" INTEGER NOT NULL,
|
||||
"currency" TEXT NOT NULL DEFAULT 'eur',
|
||||
"customer_email" TEXT,
|
||||
"customer_name" TEXT,
|
||||
"payment_status" TEXT NOT NULL,
|
||||
"created_at" DATETIME DEFAULT CURRENT_TIMESTAMP,
|
||||
CONSTRAINT "transactions_user_id_fkey" FOREIGN KEY ("user_id") REFERENCES "users" ("id") ON DELETE RESTRICT ON UPDATE CASCADE
|
||||
);
|
||||
INSERT INTO "new_transactions" ("amount_cents", "coins_amount", "created_at", "currency", "customer_email", "customer_name", "id", "payment_status", "session_id", "user_id") SELECT "amount_cents", "coins_amount", "created_at", "currency", "customer_email", "customer_name", "id", "payment_status", "session_id", "user_id" FROM "transactions";
|
||||
DROP TABLE "transactions";
|
||||
ALTER TABLE "new_transactions" RENAME TO "transactions";
|
||||
CREATE UNIQUE INDEX "transactions_session_id_key" ON "transactions"("session_id");
|
||||
PRAGMA foreign_keys=ON;
|
||||
PRAGMA defer_foreign_keys=OFF;
|
||||
3
prisma/migrations/migration_lock.toml
Normal file
3
prisma/migrations/migration_lock.toml
Normal file
@@ -0,0 +1,3 @@
|
||||
# Please do not edit this file manually
|
||||
# It should be added in your version-control system (e.g., Git)
|
||||
provider = "sqlite"
|
||||
@@ -102,12 +102,14 @@ export async function handleTimeoutCommand(req, res, client) {
|
||||
if (remaining === 0) {
|
||||
clearInterval(countdownInterval);
|
||||
|
||||
const votersList = (await Promise.all(poll.voters
|
||||
.map(async (voterId) => {
|
||||
const user = await userService.getUser(voterId);
|
||||
return `- ${user?.globalName || "Utilisateur Inconnu"}`;
|
||||
})
|
||||
)).join("\n");
|
||||
const votersList = (
|
||||
await Promise.all(
|
||||
poll.voters.map(async (voterId) => {
|
||||
const user = await userService.getUser(voterId);
|
||||
return `- ${user?.globalName || "Utilisateur Inconnu"}`;
|
||||
}),
|
||||
)
|
||||
).join("\n");
|
||||
|
||||
try {
|
||||
await DiscordRequest(poll.endpoint, {
|
||||
@@ -143,12 +145,14 @@ export async function handleTimeoutCommand(req, res, client) {
|
||||
// --- Periodic Update Logic ---
|
||||
// Update the message every second with the new countdown
|
||||
try {
|
||||
const votersList = (await Promise.all(poll.voters
|
||||
.map(async (voterId) => {
|
||||
const user = await userService.getUser(voterId);
|
||||
return `- ${user?.globalName || "Utilisateur Inconnu"}`;
|
||||
})
|
||||
)).join("\n");
|
||||
const votersList = (
|
||||
await Promise.all(
|
||||
poll.voters.map(async (voterId) => {
|
||||
const user = await userService.getUser(voterId);
|
||||
return `- ${user?.globalName || "Utilisateur Inconnu"}`;
|
||||
}),
|
||||
)
|
||||
).join("\n");
|
||||
|
||||
await DiscordRequest(poll.endpoint, {
|
||||
method: "PATCH",
|
||||
|
||||
@@ -75,10 +75,14 @@ export async function handlePollVote(req, res) {
|
||||
|
||||
io.emit("poll-update"); // Notify frontend clients of the change
|
||||
|
||||
const votersList = (await Promise.all(poll.voters.map(async (vId) => {
|
||||
const user = await userService.getUser(vId);
|
||||
return `- ${user?.globalName || "Utilisateur Inconnu"}`;
|
||||
}))).join("\n");
|
||||
const votersList = (
|
||||
await Promise.all(
|
||||
poll.voters.map(async (vId) => {
|
||||
const user = await userService.getUser(vId);
|
||||
return `- ${user?.globalName || "Utilisateur Inconnu"}`;
|
||||
}),
|
||||
)
|
||||
).join("\n");
|
||||
|
||||
// --- 4. Check for Majority ---
|
||||
if (isVotingFor && poll.for >= poll.requiredMajority) {
|
||||
|
||||
@@ -190,22 +190,22 @@ async function handleAdminCommands(message) {
|
||||
|
||||
switch (command) {
|
||||
case "?sp":
|
||||
let msgText = ""
|
||||
let msgText = "";
|
||||
for (let skinTierRank = 1; skinTierRank <= 4; skinTierRank++) {
|
||||
msgText += `\n--- Tier Rank: ${skinTierRank} ---\n`;
|
||||
let skinMaxLevels = 4;
|
||||
let skinMaxChromas = 4;
|
||||
for (let skinLevel = 1; skinLevel < skinMaxLevels; skinLevel++) {
|
||||
msgText += (`Levels: ${skinLevel}/${skinMaxLevels}, MaxChromas: ${1}/${skinMaxChromas} - `);
|
||||
msgText += (`${getDummySkinUpgradeProbs(skinLevel, 1, skinTierRank, skinMaxLevels, skinMaxChromas, 15).successProb.toFixed(4)}, `);
|
||||
msgText += (`${getDummySkinUpgradeProbs(skinLevel, 1, skinTierRank, skinMaxLevels, skinMaxChromas, 15).destructionProb.toFixed(4)}, `);
|
||||
msgText += (`${getDummySkinUpgradeProbs(skinLevel, 1, skinTierRank, skinMaxLevels, skinMaxChromas, 15).upgradePrice}\n`);
|
||||
msgText += `Levels: ${skinLevel}/${skinMaxLevels}, MaxChromas: ${1}/${skinMaxChromas} - `;
|
||||
msgText += `${getDummySkinUpgradeProbs(skinLevel, 1, skinTierRank, skinMaxLevels, skinMaxChromas, 15).successProb.toFixed(4)}, `;
|
||||
msgText += `${getDummySkinUpgradeProbs(skinLevel, 1, skinTierRank, skinMaxLevels, skinMaxChromas, 15).destructionProb.toFixed(4)}, `;
|
||||
msgText += `${getDummySkinUpgradeProbs(skinLevel, 1, skinTierRank, skinMaxLevels, skinMaxChromas, 15).upgradePrice}\n`;
|
||||
}
|
||||
for (let skinChroma = 1; skinChroma < skinMaxChromas; skinChroma++) {
|
||||
msgText += (`Levels: ${skinMaxLevels}/${skinMaxLevels}, MaxChromas: ${skinChroma}/${skinMaxChromas} - `);
|
||||
msgText += (`${getDummySkinUpgradeProbs(skinMaxLevels, skinChroma, skinTierRank, skinMaxLevels, skinMaxChromas, 15).successProb.toFixed(4)}, `);
|
||||
msgText += (`${getDummySkinUpgradeProbs(skinMaxLevels, skinChroma, skinTierRank, skinMaxLevels, skinMaxChromas, 15).destructionProb.toFixed(4)}, `);
|
||||
msgText += (`${getDummySkinUpgradeProbs(skinMaxLevels, skinChroma, skinTierRank, skinMaxLevels, skinMaxChromas, 15).upgradePrice}\n`);
|
||||
msgText += `Levels: ${skinMaxLevels}/${skinMaxLevels}, MaxChromas: ${skinChroma}/${skinMaxChromas} - `;
|
||||
msgText += `${getDummySkinUpgradeProbs(skinMaxLevels, skinChroma, skinTierRank, skinMaxLevels, skinMaxChromas, 15).successProb.toFixed(4)}, `;
|
||||
msgText += `${getDummySkinUpgradeProbs(skinMaxLevels, skinChroma, skinTierRank, skinMaxLevels, skinMaxChromas, 15).destructionProb.toFixed(4)}, `;
|
||||
msgText += `${getDummySkinUpgradeProbs(skinMaxLevels, skinChroma, skinTierRank, skinMaxLevels, skinMaxChromas, 15).upgradePrice}\n`;
|
||||
}
|
||||
message.reply(msgText);
|
||||
msgText = "";
|
||||
|
||||
@@ -97,35 +97,33 @@ export async function eloHandler(p1Id, p2Id, p1Score, p2Score, type, scores = nu
|
||||
|
||||
if (scores) {
|
||||
await gameService.insertGame({
|
||||
id: `${p1Id}-${p2Id}-${Date.now()}`,
|
||||
p1: p1Id,
|
||||
p2: p2Id,
|
||||
p1Score: scores.p1,
|
||||
p2Score: scores.p2,
|
||||
p1Elo: p1CurrentElo,
|
||||
p2Elo: p2CurrentElo,
|
||||
p1NewElo: finalP1Elo,
|
||||
p2NewElo: finalP2Elo,
|
||||
type: type,
|
||||
timestamp: Date.now(),
|
||||
});
|
||||
id: `${p1Id}-${p2Id}-${Date.now()}`,
|
||||
p1: p1Id,
|
||||
p2: p2Id,
|
||||
p1Score: scores.p1,
|
||||
p2Score: scores.p2,
|
||||
p1Elo: p1CurrentElo,
|
||||
p2Elo: p2CurrentElo,
|
||||
p1NewElo: finalP1Elo,
|
||||
p2NewElo: finalP2Elo,
|
||||
type: type,
|
||||
timestamp: Date.now(),
|
||||
});
|
||||
} else {
|
||||
await gameService.insertGame({
|
||||
id: `${p1Id}-${p2Id}-${Date.now()}`,
|
||||
p1: p1Id,
|
||||
p2: p2Id,
|
||||
p1Score: p1Score,
|
||||
p2Score: p2Score,
|
||||
p1Elo: p1CurrentElo,
|
||||
p2Elo: p2CurrentElo,
|
||||
p1NewElo: finalP1Elo,
|
||||
p2NewElo: finalP2Elo,
|
||||
type: type,
|
||||
timestamp: Date.now(),
|
||||
});
|
||||
id: `${p1Id}-${p2Id}-${Date.now()}`,
|
||||
p1: p1Id,
|
||||
p2: p2Id,
|
||||
p1Score: p1Score,
|
||||
p2Score: p2Score,
|
||||
p1Elo: p1CurrentElo,
|
||||
p2Elo: p2CurrentElo,
|
||||
p1NewElo: finalP1Elo,
|
||||
p2NewElo: finalP2Elo,
|
||||
type: type,
|
||||
timestamp: Date.now(),
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -142,12 +140,14 @@ export async function pokerEloHandler(room) {
|
||||
if (playerIds.length < 2) return; // Not enough players to calculate Elo
|
||||
|
||||
// Fetch all players' Elo data at once
|
||||
const dbPlayers = await Promise.all(playerIds.map(async (id) => {
|
||||
const user = await userService.getUser(id);
|
||||
const eloData = await gameService.getUserElo(id);
|
||||
const elo = eloData?.elo || 1000;
|
||||
return { ...user, elo };
|
||||
}));
|
||||
const dbPlayers = await Promise.all(
|
||||
playerIds.map(async (id) => {
|
||||
const user = await userService.getUser(id);
|
||||
const eloData = await gameService.getUserElo(id);
|
||||
const elo = eloData?.elo || 1000;
|
||||
return { ...user, elo };
|
||||
}),
|
||||
);
|
||||
|
||||
const winnerIds = new Set(room.winners);
|
||||
const playerCount = dbPlayers.length;
|
||||
|
||||
@@ -165,7 +165,7 @@ export function apiRoutes(client, io) {
|
||||
isVCT: isVCTSkin(item.displayName),
|
||||
isChampions: isChampionsSkin(item.displayName),
|
||||
vctRegion: getVCTRegion(item.displayName),
|
||||
}
|
||||
};
|
||||
});
|
||||
res.json({
|
||||
selectedSkins: contentSkins,
|
||||
@@ -236,9 +236,7 @@ export function apiRoutes(client, io) {
|
||||
try {
|
||||
const skin = await skinService.getSkin(req.params.uuid);
|
||||
const skinData = skins.find((s) => s.uuid === skin.uuid);
|
||||
if (
|
||||
!skinData
|
||||
) {
|
||||
if (!skinData) {
|
||||
return res.status(403).json({ error: "Invalid skin." });
|
||||
}
|
||||
if (skin.userId !== userId) {
|
||||
@@ -248,7 +246,9 @@ export function apiRoutes(client, io) {
|
||||
const marketOffers = await marketService.getMarketOffersBySkin(skin.uuid);
|
||||
const activeOffers = marketOffers.filter((offer) => offer.status === "pending" || offer.status === "open");
|
||||
if (activeOffers.length > 0) {
|
||||
return res.status(403).json({ error: "Impossible de vendre ce skin, une offre FlopoMarket est déjà en cours." });
|
||||
return res
|
||||
.status(403)
|
||||
.json({ error: "Impossible de vendre ce skin, une offre FlopoMarket est déjà en cours." });
|
||||
}
|
||||
|
||||
const commandUser = await userService.getUser(userId);
|
||||
@@ -288,14 +288,14 @@ export function apiRoutes(client, io) {
|
||||
const { successProb, destructionProb, upgradePrice } = getSkinUpgradeProbs(skin, skinData);
|
||||
|
||||
const segments = [
|
||||
{ id: 'SUCCEEDED', color: '5865f2', percent: successProb, label: 'Réussie' },
|
||||
{ id: 'DESTRUCTED', color: 'f26558', percent: destructionProb, label: 'Détruit' },
|
||||
{ id: 'NONE', color: '18181818', percent: 1 - successProb - destructionProb, label: 'Échec' },
|
||||
]
|
||||
{ id: "SUCCEEDED", color: "5865f2", percent: successProb, label: "Réussie" },
|
||||
{ id: "DESTRUCTED", color: "f26558", percent: destructionProb, label: "Détruit" },
|
||||
{ id: "NONE", color: "18181818", percent: 1 - successProb - destructionProb, label: "Échec" },
|
||||
];
|
||||
|
||||
res.json({ segments, upgradePrice });
|
||||
} catch (error) {
|
||||
console.log(error)
|
||||
console.log(error);
|
||||
res.status(500).json({ error: "Failed to fetch skin upgrade." });
|
||||
}
|
||||
});
|
||||
@@ -305,10 +305,7 @@ export function apiRoutes(client, io) {
|
||||
try {
|
||||
const skin = await skinService.getSkin(req.params.uuid);
|
||||
const skinData = skins.find((s) => s.uuid === skin.uuid);
|
||||
if (
|
||||
!skinData ||
|
||||
(skin.currentLvl >= skinData.levels.length && skin.currentChroma >= skinData.chromas.length)
|
||||
) {
|
||||
if (!skinData || (skin.currentLvl >= skinData.levels.length && skin.currentChroma >= skinData.chromas.length)) {
|
||||
return res.status(403).json({ error: "Skin is already maxed out or invalid skin." });
|
||||
}
|
||||
if (skin.userId !== userId) {
|
||||
@@ -381,7 +378,9 @@ export function apiRoutes(client, io) {
|
||||
});
|
||||
}
|
||||
|
||||
console.log(`${commandUser.username} attempted to upgrade skin ${skin.uuid} - ${succeeded ? "SUCCEEDED" : destructed ? "DESTRUCTED" : "FAILED"}`);
|
||||
console.log(
|
||||
`${commandUser.username} attempted to upgrade skin ${skin.uuid} - ${succeeded ? "SUCCEEDED" : destructed ? "DESTRUCTED" : "FAILED"}`,
|
||||
);
|
||||
res.json({ wonId: succeeded ? "SUCCEEDED" : destructed ? "DESTRUCTED" : "NONE" });
|
||||
} catch (error) {
|
||||
console.error("Error fetching skin upgrade:", error);
|
||||
@@ -470,7 +469,7 @@ export function apiRoutes(client, io) {
|
||||
try {
|
||||
const games = await gameService.getUserGames(req.params.id);
|
||||
const eloHistory = games
|
||||
.filter((g) => g.type !== 'POKER_ROUND' && g.type !== 'SOTD')
|
||||
.filter((g) => g.type !== "POKER_ROUND" && g.type !== "SOTD")
|
||||
.filter((game) => game.p2 !== null)
|
||||
.map((game) => (game.p1 === req.params.id ? game.p1NewElo : game.p2NewElo));
|
||||
eloHistory.splice(0, 0, 1000);
|
||||
@@ -489,7 +488,7 @@ export function apiRoutes(client, io) {
|
||||
offer.skin = await skinService.getSkin(offer.skinUuid);
|
||||
offer.seller = await userService.getUser(offer.sellerId);
|
||||
offer.buyer = offer.buyerId ? await userService.getUser(offer.buyerId) : null;
|
||||
offer.bids = await marketService.getOfferBids(offer.id) || {};
|
||||
offer.bids = (await marketService.getOfferBids(offer.id)) || {};
|
||||
for (const bid of offer.bids) {
|
||||
bid.bidder = await userService.getUser(bid.bidderId);
|
||||
}
|
||||
@@ -509,7 +508,10 @@ export function apiRoutes(client, io) {
|
||||
|
||||
router.get("/user/:id/games-history", async (req, res) => {
|
||||
try {
|
||||
const games = (await gameService.getUserGames(req.params.id)).filter((g) => g.type !== 'POKER_ROUND' && g.type !== 'SOTD').reverse().slice(0, 50);
|
||||
const games = (await gameService.getUserGames(req.params.id))
|
||||
.filter((g) => g.type !== "POKER_ROUND" && g.type !== "SOTD")
|
||||
.reverse()
|
||||
.slice(0, 50);
|
||||
res.json({ games });
|
||||
} catch (err) {
|
||||
res.status(500).json({ error: "Failed to fetch games history." });
|
||||
@@ -1160,7 +1162,7 @@ export function apiRoutes(client, io) {
|
||||
try {
|
||||
const user = await userService.getUser(discordId);
|
||||
if (!user) return res.status(404).json({ message: "Utilisateur introuvable" });
|
||||
const reward = isWin ? score * 2 : score;
|
||||
const reward = isWin ? score * 2 : score;
|
||||
const newCoins = user.coins + reward;
|
||||
await userService.updateUserCoins(discordId, newCoins);
|
||||
await logService.insertLog({
|
||||
@@ -1182,7 +1184,6 @@ export function apiRoutes(client, io) {
|
||||
router.post("/queue/leave", async (req, res) => {
|
||||
const { discordId, game, reason } = req.body;
|
||||
if (game === "snake" && (reason === "beforeunload" || reason === "route-leave")) {
|
||||
|
||||
const lobby = Object.values(activeSnakeGames).find(
|
||||
(l) => (l.p1.id === discordId || l.p2.id === discordId) && !l.gameOver,
|
||||
);
|
||||
@@ -1261,11 +1262,11 @@ export function apiRoutes(client, io) {
|
||||
const FLAPI_URL = process.env.DEV_SITE === "true" ? process.env.FLAPI_URL_DEV : process.env.FLAPI_URL;
|
||||
|
||||
const session = await stripe.checkout.sessions.create({
|
||||
payment_method_types: ['card'],
|
||||
payment_method_types: ["card"],
|
||||
line_items: [
|
||||
{
|
||||
price_data: {
|
||||
currency: 'eur',
|
||||
currency: "eur",
|
||||
product_data: {
|
||||
name: offer.label,
|
||||
description: `Achat de ${offer.label} pour FlopoBot`,
|
||||
@@ -1275,7 +1276,7 @@ export function apiRoutes(client, io) {
|
||||
quantity: 1,
|
||||
},
|
||||
],
|
||||
mode: 'payment',
|
||||
mode: "payment",
|
||||
success_url: `${FLAPI_URL}/payment-success?session_id={CHECKOUT_SESSION_ID}`,
|
||||
cancel_url: `${FLAPI_URL}/dashboard`,
|
||||
metadata: {
|
||||
@@ -1284,9 +1285,11 @@ export function apiRoutes(client, io) {
|
||||
},
|
||||
});
|
||||
|
||||
console.log(`[CHECKOUT] New session for user ${userId}: ${session.id}, offer: ${offer.id} (${offer.coins} coins for ${offer.amount_cents} cents)`);
|
||||
console.log(
|
||||
`[CHECKOUT] New session for user ${userId}: ${session.id}, offer: ${offer.id} (${offer.coins} coins for ${offer.amount_cents} cents)`,
|
||||
);
|
||||
|
||||
res.json({ sessionId: session.id });
|
||||
res.json({ sessionId: session.id, url: session.url });
|
||||
} catch (error) {
|
||||
console.error("Error creating checkout session:", error);
|
||||
res.status(500).json({ error: "Failed to create checkout session" });
|
||||
@@ -1294,7 +1297,7 @@ export function apiRoutes(client, io) {
|
||||
});
|
||||
|
||||
router.post("/buy-coins", async (req, res) => {
|
||||
const sig = req.headers['stripe-signature'];
|
||||
const sig = req.headers["stripe-signature"];
|
||||
const endpointSecret = process.env.STRIPE_WEBHOOK_SECRET;
|
||||
|
||||
if (!endpointSecret) {
|
||||
@@ -1315,7 +1318,7 @@ export function apiRoutes(client, io) {
|
||||
}
|
||||
|
||||
// Handle the event
|
||||
if (event.type === 'checkout.session.completed') {
|
||||
if (event.type === "checkout.session.completed") {
|
||||
const session = event.data.object;
|
||||
|
||||
// Extract metadata from the checkout session
|
||||
@@ -1333,7 +1336,7 @@ export function apiRoutes(client, io) {
|
||||
}
|
||||
|
||||
// Verify payment was successful
|
||||
if (session.payment_status !== 'paid') {
|
||||
if (session.payment_status !== "paid") {
|
||||
console.error(`Payment not completed for session ${session.id}`);
|
||||
return res.status(400).json({ error: "Payment not completed" });
|
||||
}
|
||||
@@ -1380,12 +1383,16 @@ export function apiRoutes(client, io) {
|
||||
userNewAmount: newCoins,
|
||||
});
|
||||
|
||||
console.log(`Payment processed: ${commandUserId} purchased ${expectedCoins} coins for ${amountPaid/100} ${currency}`);
|
||||
console.log(
|
||||
`Payment processed: ${commandUserId} purchased ${expectedCoins} coins for ${amountPaid / 100} ${currency}`,
|
||||
);
|
||||
|
||||
// Notify user via Discord if possible
|
||||
try {
|
||||
const discordUser = await client.users.fetch(commandUserId);
|
||||
await discordUser.send(`✅ Votre achat de ${expectedCoins} FlopoCoins a été confirmé ! Merci pour votre soutien !`);
|
||||
await discordUser.send(
|
||||
`✅ Votre achat de ${expectedCoins} FlopoCoins a été confirmé ! Merci pour votre soutien !`,
|
||||
);
|
||||
} catch (e) {
|
||||
console.log(`Could not DM user ${commandUserId}:`, e.message);
|
||||
}
|
||||
|
||||
@@ -183,7 +183,11 @@ export function blackjackRoutes(io) {
|
||||
}
|
||||
|
||||
emitUpdate("player-joined", snapshot(room));
|
||||
emitPlayerUpdate({ id: userId, msg: `${user?.globalName || user?.username} a rejoint la table de Blackjack.`, timestamp: Date.now() });
|
||||
emitPlayerUpdate({
|
||||
id: userId,
|
||||
msg: `${user?.globalName || user?.username} a rejoint la table de Blackjack.`,
|
||||
timestamp: Date.now(),
|
||||
});
|
||||
return res.status(200).json({ message: "joined" });
|
||||
});
|
||||
|
||||
@@ -225,7 +229,11 @@ export function blackjackRoutes(io) {
|
||||
delete room.players[userId];
|
||||
emitUpdate("player-left", snapshot(room));
|
||||
const user = await client.users.fetch(userId);
|
||||
emitPlayerUpdate({ id: userId, msg: `${user?.globalName || user?.username} a quitté la table de Blackjack.`, timestamp: Date.now() });
|
||||
emitPlayerUpdate({
|
||||
id: userId,
|
||||
msg: `${user?.globalName || user?.username} a quitté la table de Blackjack.`,
|
||||
timestamp: Date.now(),
|
||||
});
|
||||
return res.status(200).json({ message: "left" });
|
||||
}
|
||||
});
|
||||
@@ -361,7 +369,11 @@ export function blackjackRoutes(io) {
|
||||
for (const userId of Object.keys(room.leavingAfterRound)) {
|
||||
delete room.players[userId];
|
||||
const user = await client.users.fetch(userId);
|
||||
emitPlayerUpdate({ id: userId, msg: `${user?.globalName || user?.username} a quitté la table de Blackjack.`, timestamp: Date.now() });
|
||||
emitPlayerUpdate({
|
||||
id: userId,
|
||||
msg: `${user?.globalName || user?.username} a quitté la table de Blackjack.`,
|
||||
timestamp: Date.now(),
|
||||
});
|
||||
}
|
||||
// Prepare next round
|
||||
startBetting(room, now);
|
||||
|
||||
@@ -54,7 +54,9 @@ export function monkeRoutes(client, io) {
|
||||
return res.status(500).json({ error: "Failed to update user coins" });
|
||||
}
|
||||
|
||||
monkePaths[userId] = [{ round: 0, choice: null, result: null, bet: initialBet, extractValue: null, timestamp: Date.now() }];
|
||||
monkePaths[userId] = [
|
||||
{ round: 0, choice: null, result: null, bet: initialBet, extractValue: null, timestamp: Date.now() },
|
||||
];
|
||||
|
||||
return res.status(200).json({ message: "Monke game started", userGamePath: monkePaths[userId] });
|
||||
});
|
||||
@@ -70,7 +72,8 @@ export function monkeRoutes(client, io) {
|
||||
|
||||
const currentRound = monkePaths[userId].length - 1;
|
||||
if (step !== currentRound) return res.status(400).json({ error: "Invalid step for the current round" });
|
||||
if (monkePaths[userId][currentRound].choice !== null) return res.status(400).json({ error: "This round has already been played" });
|
||||
if (monkePaths[userId][currentRound].choice !== null)
|
||||
return res.status(400).json({ error: "This round has already been played" });
|
||||
const randomLoseChoice = Math.floor(Math.random() * 3); // 0, 1, or 2
|
||||
|
||||
if (choice !== randomLoseChoice) {
|
||||
@@ -79,7 +82,14 @@ export function monkeRoutes(client, io) {
|
||||
monkePaths[userId][currentRound].extractValue = Math.round(monkePaths[userId][currentRound].bet * 1.33);
|
||||
monkePaths[userId][currentRound].timestamp = Date.now();
|
||||
|
||||
monkePaths[userId].push({ round: currentRound + 1, choice: null, result: null, bet: monkePaths[userId][currentRound].extractValue, extractValue: null, timestamp: Date.now() });
|
||||
monkePaths[userId].push({
|
||||
round: currentRound + 1,
|
||||
choice: null,
|
||||
result: null,
|
||||
bet: monkePaths[userId][currentRound].extractValue,
|
||||
extractValue: null,
|
||||
timestamp: Date.now(),
|
||||
});
|
||||
|
||||
return res.status(200).json({ message: "Round won", userGamePath: monkePaths[userId], lost: false });
|
||||
} else {
|
||||
|
||||
@@ -132,7 +132,10 @@ export function pokerRoutes(client, io) {
|
||||
if (Object.values(pokerRooms).some((r) => r.players[userId] || r.queue[userId])) {
|
||||
return res.status(403).json({ message: "You are already in a room or queue." });
|
||||
}
|
||||
if (!pokerRooms[roomId].fakeMoney && pokerRooms[roomId].minBet > ((await userService.getUser(userId))?.coins ?? 0)) {
|
||||
if (
|
||||
!pokerRooms[roomId].fakeMoney &&
|
||||
pokerRooms[roomId].minBet > ((await userService.getUser(userId))?.coins ?? 0)
|
||||
) {
|
||||
return res.status(403).json({ message: "You do not have enough coins to join this room." });
|
||||
}
|
||||
|
||||
|
||||
@@ -277,7 +277,7 @@ export async function onGameOver(client, gameType, playerId, winnerId, reason =
|
||||
game.p1.id === winnerId ? 1 : 0,
|
||||
game.p2.id === winnerId ? 1 : 0,
|
||||
title.toUpperCase(),
|
||||
scores
|
||||
scores,
|
||||
);
|
||||
const winnerName = game.p1.id === winnerId ? game.p1.name : game.p2.name;
|
||||
resultText = `Victoire de ${winnerName}`;
|
||||
|
||||
@@ -17,9 +17,7 @@ export async function getUsersByElo() {
|
||||
include: { elo: true },
|
||||
orderBy: { elo: { elo: "desc" } },
|
||||
});
|
||||
return users
|
||||
.filter((u) => u.elo)
|
||||
.map((u) => ({ ...u, elo: u.elo?.elo ?? null }));
|
||||
return users.filter((u) => u.elo).map((u) => ({ ...u, elo: u.elo?.elo ?? null }));
|
||||
}
|
||||
|
||||
function toGame(game) {
|
||||
|
||||
@@ -40,15 +40,17 @@ export async function getMarketOffersBySkin(skinUuid) {
|
||||
buyer: { select: { username: true, globalName: true } },
|
||||
},
|
||||
});
|
||||
return offers.map((offer) => toOffer({
|
||||
...offer,
|
||||
skinName: offer.skin?.displayName,
|
||||
skinIcon: offer.skin?.displayIcon,
|
||||
sellerName: offer.seller?.username,
|
||||
sellerGlobalName: offer.seller?.globalName,
|
||||
buyerName: offer.buyer?.username ?? null,
|
||||
buyerGlobalName: offer.buyer?.globalName ?? null,
|
||||
}));
|
||||
return offers.map((offer) =>
|
||||
toOffer({
|
||||
...offer,
|
||||
skinName: offer.skin?.displayName,
|
||||
skinIcon: offer.skin?.displayIcon,
|
||||
sellerName: offer.seller?.username,
|
||||
sellerGlobalName: offer.seller?.globalName,
|
||||
buyerName: offer.buyer?.username ?? null,
|
||||
buyerGlobalName: offer.buyer?.globalName ?? null,
|
||||
}),
|
||||
);
|
||||
}
|
||||
|
||||
export async function insertMarketOffer(data) {
|
||||
|
||||
@@ -14,12 +14,11 @@ export async function deleteSOTD() {
|
||||
|
||||
export async function getAllSOTDStats() {
|
||||
const stats = await prisma.sotdStat.findMany({
|
||||
include: { user: { select: { globalName: true } } },
|
||||
include: { user: { select: { globalName: true, avatarUrl: true } } },
|
||||
orderBy: [{ score: "desc" }, { moves: "asc" }, { time: "asc" }],
|
||||
});
|
||||
return stats.map((s) => ({
|
||||
...s,
|
||||
globalName: s.user?.globalName,
|
||||
}));
|
||||
}
|
||||
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
import prisma from "../prisma/client.js";
|
||||
import { socketEmit } from "../server/socket.js";
|
||||
|
||||
export async function getUser(id) {
|
||||
const user = await prisma.user.findUnique({
|
||||
@@ -36,6 +37,7 @@ export async function updateUser(data) {
|
||||
}
|
||||
|
||||
export async function updateUserCoins(id, coins) {
|
||||
await socketEmit("data-updated", { table: "users", action: "update", userId: id, newCoins: coins });
|
||||
return prisma.user.update({ where: { id }, data: { coins } });
|
||||
}
|
||||
|
||||
|
||||
@@ -8,7 +8,9 @@ export async function drawCaseContent(caseType = "standard", poolSize = 100) {
|
||||
try {
|
||||
const dbSkins = await skinService.getAllAvailableSkins();
|
||||
const esportSkins = [];
|
||||
for (const s of skins.filter((s) => dbSkins.find((dbSkin) => dbSkin.displayName.includes("Classic (VCT") && dbSkin.uuid === s.uuid))) {
|
||||
for (const s of skins.filter((s) =>
|
||||
dbSkins.find((dbSkin) => dbSkin.displayName.includes("Classic (VCT") && dbSkin.uuid === s.uuid),
|
||||
)) {
|
||||
const dbSkin = await skinService.getSkin(s.uuid);
|
||||
esportSkins.push({
|
||||
...s,
|
||||
@@ -59,14 +61,14 @@ export async function drawCaseContent(caseType = "standard", poolSize = 100) {
|
||||
.filter((s) => dbSkins.find((dbSkin) => dbSkin.uuid === s.uuid))
|
||||
.filter((s) => {
|
||||
if (caseType === "ultra") {
|
||||
return !(s.displayName.toLowerCase().includes("vct") && s.displayName.toLowerCase().includes("classic"))
|
||||
return !(s.displayName.toLowerCase().includes("vct") && s.displayName.toLowerCase().includes("classic"));
|
||||
} else {
|
||||
return !s.displayName.toLowerCase().includes("vct");
|
||||
}
|
||||
})
|
||||
.filter((s) => {
|
||||
if (caseType === "ultra") {
|
||||
return true
|
||||
return true;
|
||||
} else {
|
||||
return isChampionsSkin(s.displayName) === false;
|
||||
}
|
||||
@@ -75,7 +77,8 @@ export async function drawCaseContent(caseType = "standard", poolSize = 100) {
|
||||
for (const s of filtered) {
|
||||
const dbSkin = await skinService.getSkin(s.uuid);
|
||||
const weight = tierWeights[s.contentTierUuid] ?? 0;
|
||||
if (weight > 0) { // <--- CRITICAL: Remove 0 weight skins
|
||||
if (weight > 0) {
|
||||
// <--- CRITICAL: Remove 0 weight skins
|
||||
weightedPool.push({
|
||||
...s,
|
||||
tierColor: dbSkin?.tierColor,
|
||||
@@ -90,7 +93,7 @@ export async function drawCaseContent(caseType = "standard", poolSize = 100) {
|
||||
const result = [];
|
||||
|
||||
// 2. Adjust count if the pool is smaller than requested
|
||||
const actualCount = Math.min(count, list.length) ;
|
||||
const actualCount = Math.min(count, list.length);
|
||||
|
||||
for (let i = 0; i < actualCount; i++) {
|
||||
let r = Math.random() * totalWeight;
|
||||
@@ -172,10 +175,19 @@ export async function drawCaseSkin(caseContent) {
|
||||
|
||||
export function getSkinUpgradeProbs(skin, skinData) {
|
||||
const successProb =
|
||||
(1 - (((skin.currentChroma + skin.currentLvl + skinData.chromas.length + skinData.levels.length) / 18) * (parseInt(skin.tierRank) / 4)))/1.5;
|
||||
const destructionProb = ((skin.currentChroma + skinData.levels.length) / (skinData.chromas.length + skinData.levels.length)) * (parseInt(skin.tierRank) / 5) * 0.075;
|
||||
(1 -
|
||||
((skin.currentChroma + skin.currentLvl + skinData.chromas.length + skinData.levels.length) / 18) *
|
||||
(parseInt(skin.tierRank) / 4)) /
|
||||
1.5;
|
||||
const destructionProb =
|
||||
((skin.currentChroma + skinData.levels.length) / (skinData.chromas.length + skinData.levels.length)) *
|
||||
(parseInt(skin.tierRank) / 5) *
|
||||
0.075;
|
||||
const nextLvl = skin.currentLvl < skinData.levels.length ? skin.currentLvl + 1 : skin.currentLvl;
|
||||
const nextChroma = skin.currentLvl === skinData.levels.length && skin.currentChroma < skinData.chromas.length ? skin.currentChroma + 1 : skin.currentChroma;
|
||||
const nextChroma =
|
||||
skin.currentLvl === skinData.levels.length && skin.currentChroma < skinData.chromas.length
|
||||
? skin.currentChroma + 1
|
||||
: skin.currentChroma;
|
||||
const calculateNextPrice = () => {
|
||||
let result = parseFloat(skin.basePrice);
|
||||
result *= 1 + nextLvl / Math.max(skinData.levels.length, 2);
|
||||
@@ -187,10 +199,18 @@ export function getSkinUpgradeProbs(skin, skinData) {
|
||||
return { successProb, destructionProb, upgradePrice };
|
||||
}
|
||||
|
||||
export function getDummySkinUpgradeProbs(skinLevel, skinChroma, skinTierRank, skinMaxLevels, skinMaxChromas, skinMaxPrice) {
|
||||
export function getDummySkinUpgradeProbs(
|
||||
skinLevel,
|
||||
skinChroma,
|
||||
skinTierRank,
|
||||
skinMaxLevels,
|
||||
skinMaxChromas,
|
||||
skinMaxPrice,
|
||||
) {
|
||||
const successProb =
|
||||
1 - (((skinChroma + skinLevel + (skinMaxChromas + skinMaxLevels)) / 18) * (parseInt(skinTierRank) / 4));
|
||||
const destructionProb = ((skinChroma + skinMaxLevels) / (skinMaxChromas + skinMaxLevels)) * (parseInt(skinTierRank) / 5) * 0.1;
|
||||
const upgradePrice = Math.max(Math.floor((parseFloat(skinMaxPrice) * (1 - successProb))), 1);
|
||||
1 - ((skinChroma + skinLevel + (skinMaxChromas + skinMaxLevels)) / 18) * (parseInt(skinTierRank) / 4);
|
||||
const destructionProb =
|
||||
((skinChroma + skinMaxLevels) / (skinMaxChromas + skinMaxLevels)) * (parseInt(skinTierRank) / 5) * 0.1;
|
||||
const upgradePrice = Math.max(Math.floor(parseFloat(skinMaxPrice) * (1 - successProb)), 1);
|
||||
return { successProb, destructionProb, upgradePrice };
|
||||
}
|
||||
|
||||
@@ -432,10 +432,26 @@ function formatTierText(rank, displayName) {
|
||||
|
||||
export function isMeleeSkin(skinName) {
|
||||
const name = skinName.toLowerCase();
|
||||
return !(name.includes("classic") || name.includes("shorty") || name.includes("frenzy") || name.includes("ghost") || name.includes("sheriff") || name.includes("stinger") || name.includes("spectre") ||
|
||||
name.includes("bucky") || name.includes("judge") || name.includes("bulldog") || name.includes("guardian") ||
|
||||
name.includes("vandal") || name.includes("phantom") || name.includes("marshal") || name.includes("outlaw") ||
|
||||
name.includes("operator") || name.includes("ares") || name.includes("odin"));
|
||||
return !(
|
||||
name.includes("classic") ||
|
||||
name.includes("shorty") ||
|
||||
name.includes("frenzy") ||
|
||||
name.includes("ghost") ||
|
||||
name.includes("sheriff") ||
|
||||
name.includes("stinger") ||
|
||||
name.includes("spectre") ||
|
||||
name.includes("bucky") ||
|
||||
name.includes("judge") ||
|
||||
name.includes("bulldog") ||
|
||||
name.includes("guardian") ||
|
||||
name.includes("vandal") ||
|
||||
name.includes("phantom") ||
|
||||
name.includes("marshal") ||
|
||||
name.includes("outlaw") ||
|
||||
name.includes("operator") ||
|
||||
name.includes("ares") ||
|
||||
name.includes("odin")
|
||||
);
|
||||
}
|
||||
|
||||
export function isVCTSkin(skinName) {
|
||||
@@ -444,31 +460,78 @@ export function isVCTSkin(skinName) {
|
||||
}
|
||||
|
||||
const VCT_TEAMS = {
|
||||
"vct-am": [
|
||||
/x 100t\)$/g, /x c9\)$/g, /x eg\)$/g, /x fur\)$/g, /x krü\)$/g, /x lev\)$/g, /x loud\)$/g,
|
||||
/x mibr\)$/g, /x sen\)$/g, /x nrg\)$/g, /x g2\)$/g, /x nv\)$/g, /x 2g\)$/g
|
||||
],
|
||||
"vct-emea": [
|
||||
/x bbl\)$/g, /x fnc\)$/g, /x fut\)$/g, /x m8\)$/g, /x gx\)$/g, /x kc\)$/g, /x navi\)$/g,
|
||||
/x th\)$/g, /x tl\)$/g, /x vit\)$/g, /x ulf\)$/g, /x pcf\)$/g, /x koi\)$/g, /x apk\)$/g
|
||||
],
|
||||
"vct-pcf": [
|
||||
/x dfm\)$/g, /x drx\)$/g, /x fs\)$/g, /x gen\)$/g, /x ge\)$/g, /x prx\)$/g, /x rrq\)$/g,
|
||||
/x t1\)$/g, /x ts\)$/g, /x zeta\)$/g, /x vl\)$/g, /x ns\)$/g, /x tln\)$/g, /x boom\)$/g, /x bld\)$/g
|
||||
],
|
||||
"vct-cn": [
|
||||
/x ag\)$/g, /x blg\)$/g, /x edg\)$/g, /x fpx\)$/g, /x jdg\)$/g, /x nova\)$/g, /x tec\)$/g,
|
||||
/x te\)$/g, /x tyl\)$/g, /x wol\)$/g, /x xlg\)$/g, /x xlg\)$/g, /x drg\)$/g
|
||||
]
|
||||
"vct-am": [
|
||||
/x 100t\)$/g,
|
||||
/x c9\)$/g,
|
||||
/x eg\)$/g,
|
||||
/x fur\)$/g,
|
||||
/x krü\)$/g,
|
||||
/x lev\)$/g,
|
||||
/x loud\)$/g,
|
||||
/x mibr\)$/g,
|
||||
/x sen\)$/g,
|
||||
/x nrg\)$/g,
|
||||
/x g2\)$/g,
|
||||
/x nv\)$/g,
|
||||
/x 2g\)$/g,
|
||||
],
|
||||
"vct-emea": [
|
||||
/x bbl\)$/g,
|
||||
/x fnc\)$/g,
|
||||
/x fut\)$/g,
|
||||
/x m8\)$/g,
|
||||
/x gx\)$/g,
|
||||
/x kc\)$/g,
|
||||
/x navi\)$/g,
|
||||
/x th\)$/g,
|
||||
/x tl\)$/g,
|
||||
/x vit\)$/g,
|
||||
/x ulf\)$/g,
|
||||
/x pcf\)$/g,
|
||||
/x koi\)$/g,
|
||||
/x apk\)$/g,
|
||||
],
|
||||
"vct-pcf": [
|
||||
/x dfm\)$/g,
|
||||
/x drx\)$/g,
|
||||
/x fs\)$/g,
|
||||
/x gen\)$/g,
|
||||
/x ge\)$/g,
|
||||
/x prx\)$/g,
|
||||
/x rrq\)$/g,
|
||||
/x t1\)$/g,
|
||||
/x ts\)$/g,
|
||||
/x zeta\)$/g,
|
||||
/x vl\)$/g,
|
||||
/x ns\)$/g,
|
||||
/x tln\)$/g,
|
||||
/x boom\)$/g,
|
||||
/x bld\)$/g,
|
||||
],
|
||||
"vct-cn": [
|
||||
/x ag\)$/g,
|
||||
/x blg\)$/g,
|
||||
/x edg\)$/g,
|
||||
/x fpx\)$/g,
|
||||
/x jdg\)$/g,
|
||||
/x nova\)$/g,
|
||||
/x tec\)$/g,
|
||||
/x te\)$/g,
|
||||
/x tyl\)$/g,
|
||||
/x wol\)$/g,
|
||||
/x xlg\)$/g,
|
||||
/x xlg\)$/g,
|
||||
/x drg\)$/g,
|
||||
],
|
||||
};
|
||||
|
||||
export function getVCTRegion(skinName) {
|
||||
if (!isVCTSkin(skinName)) return null;
|
||||
const name = skinName.toLowerCase().trim();
|
||||
for (const [region, regexes] of Object.entries(VCT_TEAMS)) {
|
||||
if (regexes.some(regex => regex.test(name))) {
|
||||
return region;
|
||||
}
|
||||
if (regexes.some((regex) => regex.test(name))) {
|
||||
return region;
|
||||
}
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user