Project_Asakura/Bayshore_6r_legacy
1
0
Fork 0
mirror of https://github.com/shiroikitsu8/Bayshore_6r_legacy.git synced 2024-11-28 01:11:00 +01:00
Code

Merge pull request #62 from shiroikitsu8/master

Browse Source 
randomizer, default place regionid must not 0, blocking vanilla tp chip id
This commit is contained in:
Luna 2023-02-21 11:18:56 +00:00 committed by GitHub
commit 5d4f1c4336
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 196 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -10,3 +10,4 @@ config.json
package-lock.json
ecosystem.config.js
static/*
screenshot/*

3
config.example.json
View File

@ -12,6 +12,7 @@
"scratchEnabled": 1,
"scratchType": 1,
"giveMeterReward": 0,
"newCardsBanned": 0
"newCardsBanned": 0,
"enableScreenshot": 0
}
}

3
src/allnet.ts
View File

@ -4,6 +4,7 @@ import { unzipSync } from "zlib";
import { Module } from "./module";
import iconv from "iconv-lite";
import { Config } from "./config";
import * as common from "./modules/util/common";
// TODO: Move this into the config
const STARTUP_URI = `https://${Config.getConfig().serverIp || "localhost"}:9002`;
@ -75,7 +76,7 @@ export default class AllnetModule extends Module {
let regionName = Config.getConfig().regionName;
let placeId = Config.getConfig().placeId;
let country = Config.getConfig().country;
let regionId = Config.getConfig().regionId;
let regionId = common.sanitizeInputNotZero(Number(Config.getConfig().regionId)) || 1;
// TODO: Implement board authentication here.

8
src/config.ts
View File

@ -47,12 +47,16 @@ export interface GameOptions {
grantFullTuneTicketToNewUsers: number;
// Give meter reward every n*100 play
giveMeterReward: number; //1 is on, 0 is off
giveMeterReward: number; // 1 is on, 0 is off
// if the new card is not in the User databese
// set this option to 1 will not create a new card
// and prevent new card registration
newCardsBanned: number;//1 is on, 0 is off
newCardsBanned: number; // 1 is on, 0 is off
// revision check
// set this option to 1 to enable screenshot feature
enableScreenshot: number; // 1 is on, 0 is off
}
export class Config {

35
src/modules/cars.ts
View File

@ -1,4 +1,5 @@
import { Application } from "express";
import { Config } from "../config";
import { Module } from "module";
import { prisma } from "..";
@ -28,6 +29,19 @@ export default class CarModule extends Module {
// Get Challenger Data
let opponentsTarget = await carFunctions.getOpponentsTarget(body.carId, registeredTarget.registeredargetAvailable);
// Set Screenshot Count
let screenshotCount = 0;
// Check if screenshot feature enabled or not
let enableScreenshot = Config.getConfig().gameOptions.enableScreenshot || 0;
// Screenshot feature enabled
if(enableScreenshot === 1)
{
// Set the screnshot chance count
screenshotCount = 99;
}
// Response data
let msg = {
error: wm.wm.protobuf.ErrorCode.ERR_SUCCESS,
@ -43,7 +57,7 @@ export default class CarModule extends Module {
rgPreviousVersionPlayCount: 0,
stCompleted_100Episodes: car!.stCompleted100Episodes,
auraMotifAutoChange: false,
screenshotCount: 0,
screenshotCount: screenshotCount,
transferred: false,
// Stamp or Challenger
@ -136,6 +150,9 @@ export default class CarModule extends Module {
// Get the request body for the update car request
let body = wm.wm.protobuf.UpdateCarRequest.decode(req.body);
// Not deleting car
if(body.toBeDeleted === false || body.toBeDeleted === undefined || body.toBeDeleted === null)
{
// Update the car
await carFunctions.updateCar(body);
@ -163,6 +180,22 @@ export default class CarModule extends Module {
});
}
}
}
// Deleting car
else
{
console.log('Deleting Car ID : ' + body.carId);
// Mark Deleted Car
await prisma.carState.update({
where:{
dbId: body.carId
},
data:{
toBeDeleted: body.toBeDeleted
}
})
}
// Response data
let msg = {

77
src/modules/cars/functions.ts
View File

@ -138,18 +138,37 @@ export async function getOpponentsTarget(carId: number, registeredargetAvailable
// Randomize pick
let random: number = 1;
let randomArray: number[] = [];
let maxNumber = 5;
if(opponentTargetCount < 5)
{
maxNumber = opponentTargetCount;
}
// Randomize it 5 times
for(let i=0; i<5; i++)
while(randomArray.length < 5)
{
random = Math.floor(Math.random() * opponentTargetCount);
// Pick random car Id
random = Math.floor(Math.random() * opponentTargetCount + 0.9);
// Try randomize it again if it's 0, and fix if more than car length
if(random < 1 || random >= opponentTargetCount)
{
random = Math.floor(Math.random() * opponentTargetCount + 0.9);
}
// Try randomize it again if it's 1
if(random === 1)
// Random Number not yet selected
if(randomArray.indexOf(random) === -1)
{
random = Math.floor(Math.random() * opponentTargetCount);
// Push current number to array
randomArray.push(random);
}
}
// Pick the array number
let pickRandom = Math.floor(Math.random() * randomArray.length + 0.9);
random = randomArray[pickRandom];
// Check opponents target
let opponentTarget = await prisma.carStampTarget.findMany({
@ -157,9 +176,14 @@ export async function getOpponentsTarget(carId: number, registeredargetAvailable
stampTargetCarId: carId,
recommended: true,
},
orderBy:{
locked: 'desc'
orderBy: [
{
id: 'asc'
},
{
recommended: 'desc'
}
],
skip: random,
take: 1,
});
@ -205,6 +229,12 @@ export async function getOpponentsTarget(carId: number, registeredargetAvailable
result = Math.abs(carChallengers.result);
}
// Error handling if regionId is below 1 or above 47
if(carTarget!.regionId < 1 || carTarget!.regionId > 47)
{
carTarget!.regionId = Math.floor(Math.random() * 10) + 10;
}
// Push the data
challenger = wmproto.wm.protobuf.ChallengerCar.create({
car: carTarget,
@ -322,26 +352,33 @@ export async function createCar(body: wm.protobuf.CreateCarRequest)
}
}
// Randomize regionId
let regionId: number = 18;
// Randomize pick
let random: number = 1;
let randomArray: number[] = [];
// Randomize it 5 times
for(let i=0; i<5; i++)
while(randomArray.length < 5)
{
regionId = Math.floor(Math.random() * 47) + 1;
// Pick random car Id
random = Math.floor(Math.random() * 47 + 0.9) + 1;
// Try randomize it again if it's 0, and fix if more than car length
if(random < 1 || random > 47)
{
random = Math.floor(Math.random() * 47 + 0.9) + 1;
}
// Try randomize it again if it's 1
if(regionId === 1)
// Random Number not yet selected
if(randomArray.indexOf(random) === -1)
{
regionId = Math.floor(Math.random() * 47) + 1;
// Push current number to array
randomArray.push(random);
}
}
// Error handling if regionId is below 1 or above 47
if(regionId < 1 || regionId > 47)
{
regionId = Math.floor(Math.random() * 10) + 10;
}
// Pick the array number
let pickRandom = Math.floor(Math.random() * randomArray.length + 0.9);
random = randomArray[pickRandom];
// Default car values
let carInsert = {
@ -358,7 +395,7 @@ export async function createCar(body: wm.protobuf.CreateCarRequest)
carSettingsDbId: settings.dbId,
carStateDbId: state.dbId,
carGTWingDbId: gtWing.dbId,
regionId: regionId,
regionId: random,
lastPlayedAt: date,
lastPlayedPlaceId: 1, // Server Default
};

8
src/modules/game.ts
View File

@ -230,11 +230,11 @@ export default class GameModule extends Module {
// Save Screenshot
app.post('/method/save_screenshot', async (req, res) => {
// Get the information from the request
// Get the request body
let body = wm.wm.protobuf.SaveScreenshotRequest.decode(req.body);
// TODO: Actual stuff here
// This is literally just bare-bones so the shit boots
// Perform the save screenshot request for the car
await gameFunction.saveScreenshot(body);
// Response data
let msg = {
@ -246,6 +246,6 @@ export default class GameModule extends Module {
// Send the response to the client
common.sendResponse(message, res);
});
})
}
}

40
src/modules/game/functions.ts
View File

@ -1,4 +1,7 @@
import { prisma } from "../..";
import { Config } from "../../config";
import path from "path";
import fs from "fs";
// Import Proto
import { wm } from "../../wmmt/wm.proto";
@ -408,3 +411,40 @@ export async function getGhostBattleRecord(body: wm.protobuf.LoadGameHistoryRequ
return { ghostBattle_records }
}
// Save Screenshot
export async function saveScreenshot(body: wm.protobuf.SaveScreenshotRequest)
{
// Check if screenshot feature enabled or not
let enableScreenshot = Config.getConfig().gameOptions.enableScreenshot || 0;
// Screenshot feature enabled
if(enableScreenshot === 1)
{
let filename: string | undefined = undefined;
filename = `${body.timestamp}_${body.carId}_${body.imageType}.png`;
let dir = path.join('screenshot');
if (!fs.existsSync(dir)){
fs.mkdirSync(dir);
}
// Combine the filename with the save location
let fullname = path.join('screenshot', filename);
// Attempt to write to the file
fs.writeFile(fullname, body.image, (err) => {
if (err)
{
console.log(err);
}
else
{
console.log(`Screenshot saved successfully as '${filename}'`)
}
});
}
}

7
src/modules/ghost/ghost_history.ts
View File

@ -195,7 +195,6 @@ export async function saveOCMGhostHistory(body: wm.protobuf.SaveGameResultReques
where:{
carId: saveExGhostHistory.carId,
ocmMainDraw: saveExGhostHistory.ocmMainDraw,
area: saveExGhostHistory.area,
competitionId: ocmEventDate!.competitionId,
periodId: 0
}
@ -207,7 +206,7 @@ export async function saveOCMGhostHistory(body: wm.protobuf.SaveGameResultReques
if(countGBR)
{
// Check if the newest advantage distance is bigger than the older advantage distance
if(countGBR!.result < saveExGhostHistory.result)
if(countGBR.result < saveExGhostHistory.result)
{
console.log('OCM Ghost Tally found');
@ -217,7 +216,6 @@ export async function saveOCMGhostHistory(body: wm.protobuf.SaveGameResultReques
// Get OCM Period ID
let OCM_periodId = await prisma.oCMPeriod.findFirst({
where:{
competitionDbId: ocmEventDate!.dbId,
competitionId: ocmEventDate!.competitionId,
startAt:
{
@ -248,7 +246,6 @@ export async function saveOCMGhostHistory(body: wm.protobuf.SaveGameResultReques
let getGBR = await prisma.oCMGhostBattleRecord.findFirst({
where:{
carId: saveExGhostHistory.carId,
area: saveExGhostHistory.area,
competitionId: ocmEventDate!.competitionId,
}
});
@ -323,7 +320,7 @@ export async function saveOCMGhostHistory(body: wm.protobuf.SaveGameResultReques
else
{
console.log('OCM Ghost Battle Record not found');
console.log('Creating new OOCM Ghost Battle Record entry');
console.log('Creating new OCM Ghost Battle Record entry');
// Current date is OCM Main Draw
if(ocmEventDate!.competitionStartAt < date && ocmEventDate!.competitionCloseAt > date)

9
src/modules/resource.ts
View File

@ -25,10 +25,13 @@ export default class ResourceModule extends Module {
// Empty list of place records
let places: wm.wm.protobuf.Place[] = [];
// Region ID must not 0
let regionId = common.sanitizeInputNotZero(Number(Config.getConfig().regionId)) || 1;
// Response data
places.push(new wm.wm.protobuf.Place({
placeId: Config.getConfig().placeId || 'JPN0123',
regionId: Number(Config.getConfig().regionId) || 1,
regionId: regionId,
shopName: Config.getConfig().shopName || 'Bayshore',
country: Config.getConfig().country || 'JPN'
}));
@ -46,7 +49,7 @@ export default class ResourceModule extends Module {
await prisma.placeList.create({
data:{
placeId: Config.getConfig().placeId || 'JPN0123',
regionId: Number(Config.getConfig().regionId) || 1,
regionId: regionId,
shopName: Config.getConfig().shopName || 'Bayshore',
country: Config.getConfig().country || 'JPN'
}
@ -61,7 +64,7 @@ export default class ResourceModule extends Module {
id: checkPlaceList.id
},
data:{
regionId: Number(Config.getConfig().regionId),
regionId: regionId,
shopName: Config.getConfig().shopName,
country: Config.getConfig().country
}

14
src/modules/users.ts
View File

@ -20,8 +20,8 @@ export default class UserModule extends Module {
// Get the request body for the load user request
let body = wm.wm.protobuf.LoadUserRequest.decode(req.body);
// Block blank card.ini data
if(body.cardChipId.match(/7F5C9744F11111114326.*/))
// Block blank card.ini data and vanilla TP blank card data
if(body.cardChipId.match(/7F5C9744F11111114326.*/) || body.cardChipId.match(/0000000000.*/))
{
body.cardChipId = '';
body.accessCode = '';
@ -39,6 +39,9 @@ export default class UserModule extends Module {
state: true,
gtWing: true,
lastPlayedPlace: true
},
where:{
state: { toBeDeleted: false } // except deleted car
}
}
}
@ -59,12 +62,7 @@ export default class UserModule extends Module {
if (!body.cardChipId || !body.accessCode)
{
let msg = {
error: wm.wm.protobuf.ErrorCode.ERR_USER_SUCCEEDED,
numOfOwnedCars: 0,
spappState: wm.wm.protobuf.SmartphoneAppState.SPAPP_UNREGISTERED,
transferState: wm.wm.protobuf.TransferState.NOT_REGISTERED
}
msg.error = wm.wm.protobuf.ErrorCode.ERR_USER_SUCCEEDED;
// Encode the response
let message = wm.wm.protobuf.LoadUserResponse.encode(msg);