Project_Asakura/Bayshore
1
0
Fork 0
mirror of synced 2025-02-02 04:37:59 +01:00
Code Releases Wiki Activity

Merge pull request #67 from shiroikitsu8/master

Browse Source 
trying to fix terminal scratch
This commit is contained in:
Luna Nightshade 2023-03-21 04:24:57 -07:00 committed by GitHub
commit da73b2fbce
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 29 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config.example.json
View File

@ -10,7 +10,7 @@
"grantFullTuneTicketToNewUsers": 5, "grantFullTuneTicketToNewUsers": 5,
"giftCarsFullyTuned": 0, "giftCarsFullyTuned": 0,
"scratchEnabled": 1, "scratchEnabled": 1,
"scratchType": 1, "scratchType": 0,
"giveMeterReward": 0, "giveMeterReward": 0,
"newCardsBanned": 0, "newCardsBanned": 0,
"enableScreenshot": 0 "enableScreenshot": 0

26
src/modules/terminal.ts
View File

@ -482,13 +482,6 @@ export default class TerminalModule extends Module {
// Get the current date/time (unix epoch) // Get the current date/time (unix epoch)
let date = Math.floor(new Date().getTime() / 1000) let date = Math.floor(new Date().getTime() / 1000)
// Get all of the info for the user
let user = await prisma.user.findFirst({
where: {
id: body.userId
}
});
// Get all of the scratch sheets for the user // Get all of the scratch sheets for the user
let scratchSheets = await prisma.scratchSheet.findMany({ let scratchSheets = await prisma.scratchSheet.findMany({
where: { where: {
@ -559,11 +552,24 @@ export default class TerminalModule extends Module {
} }
}); });
// If the box we uncovered is the car // If the box we uncovered is the car... hehe boi
if (scratchSquare.category == 201) if (scratchSquare.category === 201)
{ {
// Get user last scratch sheet number
let lastUserSheet = await prisma.scratchSheet.findFirst({
where:{
userId: body.userId
},
orderBy:{
sheetNo: 'desc'
}
});
// Last scratch sheet plus 1
let targetSheet:number = Number(lastUserSheet?.sheetNo) + 1 || Number(body.targetSheet) + 1;
// Generate a new scratch sheet for the user // Generate a new scratch sheet for the user
await scratch.generateScratchSheet(body.userId, body.targetSheet + 1) await scratch.generateScratchSheet(body.userId, targetSheet);
} }
} }
catch (error) // Failed to update scratch sheet catch (error) // Failed to update scratch sheet

5
src/modules/terminal/scratch.ts
View File

@ -294,13 +294,14 @@ function shuffleScratchSheet (array: number[][])
// 1 Random Scratch Car // 1 Random Scratch Car
// 25 Random Scratch Stickers // 25 Random Scratch Stickers
// 24 Random Scratch Versus Markers // 24 Random Scratch Versus Markers
function getRandomScratchSheet (carId: number) function getRandomScratchSheet (sheetNo: number)
{ {
// Scratch items list // Scratch items list
let items : number[][] = []; let items : number[][] = [];
let sheetNumber:number = Number(sheetNo % scratchCars.length);
// Add the scratch car for the given index // Add the scratch car for the given index
items.push([201, scratchCars[carId % scratchCars.length]]); items.push([201, scratchCars[sheetNumber]]);
// Add the random scratch stickers // Add the random scratch stickers

18
src/modules/users.ts
View File

@ -123,9 +123,9 @@ export default class UserModule extends Module {
false, // TUTORIAL_ID_UNUSED_17 = 17, false, // TUTORIAL_ID_UNUSED_17 = 17,
false, // TUTORIAL_ID_UNUSED_18 = 18, false, // TUTORIAL_ID_UNUSED_18 = 18,
false, // TUTORIAL_ID_UNUSED_19 = 19, false, // TUTORIAL_ID_UNUSED_19 = 19,
false, // TUTORIAL_ID_GHOST_STAMP = 20, true, // TUTORIAL_ID_GHOST_STAMP = 20,
false, // TUTORIAL_ID_GHOST_STAMP_DECLINED = 21, true, // TUTORIAL_ID_GHOST_STAMP_DECLINED = 21,
false, // TUTORIAL_ID_GHOST_STAMP_FRIENDS = 22, true, // TUTORIAL_ID_GHOST_STAMP_FRIENDS = 22,
false, // TUTORIAL_ID_TERMINAL_SCRATCH = 23, false, // TUTORIAL_ID_TERMINAL_SCRATCH = 23,
false, // TUTORIAL_ID_TURN_SCRATCH_SHEET = 24, false, // TUTORIAL_ID_TURN_SCRATCH_SHEET = 24,
false, // TUTORIAL_ID_INVITE_FRIEND_CAMPAIGN = 25, false, // TUTORIAL_ID_INVITE_FRIEND_CAMPAIGN = 25,
@ -159,7 +159,7 @@ export default class UserModule extends Module {
} }
}); });
console.log('user made') console.log('user made');
if (!user) if (!user)
{ {
@ -179,7 +179,7 @@ export default class UserModule extends Module {
userId: user.id, userId: user.id,
category: wm.wm.protobuf.ItemCategory.CAT_CAR_TICKET_FREE, category: wm.wm.protobuf.ItemCategory.CAT_CAR_TICKET_FREE,
itemId: 5, itemId: 5,
type: 0 // Car Ticket type: Number(0) // Car Ticket
} }
}); });
} }
@ -211,15 +211,15 @@ export default class UserModule extends Module {
} }
}) })
console.log("Current sheet count:", scratchSheetCount); console.log("Current sheet count: ", scratchSheetCount);
// If the user has no scratch sheets // If the user has no scratch sheets
if (scratchSheetCount == 0) if (scratchSheetCount === 0)
{ {
console.log("Generating first sheet ..."); console.log("Generating first sheet ...");
// Generate a new scratch sheet for the user // Generate a new scratch sheet for the user
await scratch.generateScratchSheet(user!.id, 1); await scratch.generateScratchSheet(user!.id, Number(1));
// Set the current scratch sheet to 1 // Set the current scratch sheet to 1
await prisma.user.update({ await prisma.user.update({
@ -227,7 +227,7 @@ export default class UserModule extends Module {
id: user!.id id: user!.id
}, },
data: { data: {
currentSheet: 1 currentSheet: Number(1)
} }
}); });
} }