noxious/server
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Renamed frameSpeed > frameRate

Browse Source
This commit is contained in:
Dennis Postma 2024-12-21 02:27:14 +01:00
parent 2c10b54582
commit 5c47edd230
9 changed files with 54 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
package-lock.json generated
View File

@ -5,7 +5,7 @@
"packages": { "packages": {
"": { "": {
"dependencies": { "dependencies": {
"@prisma/client": "^5.17.0", "@prisma/client": "^6.1.0",
"@types/ioredis": "^4.28.10", "@types/ioredis": "^4.28.10",
"bcryptjs": "^2.4.3", "bcryptjs": "^2.4.3",
"bullmq": "^5.13.2", "bullmq": "^5.13.2",
@ -16,7 +16,6 @@
"jsonwebtoken": "^9.0.2", "jsonwebtoken": "^9.0.2",
"nodemailer": "^6.9.15", "nodemailer": "^6.9.15",
"pino": "^9.3.2", "pino": "^9.3.2",
"prisma": "^5.17.0",
"sharp": "^0.33.4", "sharp": "^0.33.4",
"socket.io": "^4.7.5", "socket.io": "^4.7.5",
"typescript": "^5.5.3", "typescript": "^5.5.3",
@ -30,6 +29,7 @@
"@types/nodemailer": "^6.4.16", "@types/nodemailer": "^6.4.16",
"nodemon": "^3.1.4", "nodemon": "^3.1.4",
"prettier": "^3.3.3", "prettier": "^3.3.3",
"prisma": "^6.1.0",
"ts-node": "^10.9.2" "ts-node": "^10.9.2"
} }
}, },
@ -530,13 +530,13 @@
] ]
}, },
"node_modules/@prisma/client": { "node_modules/@prisma/client": {
"version": "5.22.0", "version": "6.1.0",
"resolved": "https://registry.npmjs.org/@prisma/client/-/client-5.22.0.tgz", "resolved": "https://registry.npmjs.org/@prisma/client/-/client-6.1.0.tgz",
"integrity": "sha512-M0SVXfyHnQREBKxCgyo7sffrKttwE6R8PMq330MIUF0pTwjUhLbW84pFDlf06B27XyCR++VtjugEnIHdr07SVA==", "integrity": "sha512-AbQYc5+EJKm1Ydfq3KxwcGiy7wIbm4/QbjCKWWoNROtvy7d6a3gmAGkKjK0iUCzh+rHV8xDhD5Cge8ke/kiy5Q==",
"hasInstallScript": true, "hasInstallScript": true,
"license": "Apache-2.0", "license": "Apache-2.0",
"engines": { "engines": {
"node": ">=16.13" "node": ">=18.18"
}, },
"peerDependencies": { "peerDependencies": {
"prisma": "*" "prisma": "*"
@ -548,48 +548,53 @@
} }
}, },
"node_modules/@prisma/debug": { "node_modules/@prisma/debug": {
"version": "5.22.0", "version": "6.1.0",
"resolved": "https://registry.npmjs.org/@prisma/debug/-/debug-5.22.0.tgz", "resolved": "https://registry.npmjs.org/@prisma/debug/-/debug-6.1.0.tgz",
"integrity": "sha512-AUt44v3YJeggO2ZU5BkXI7M4hu9BF2zzH2iF2V5pyXT/lRTyWiElZ7It+bRH1EshoMRxHgpYg4VB6rCM+mG5jQ==", "integrity": "sha512-0himsvcM4DGBTtvXkd2Tggv6sl2JyUYLzEGXXleFY+7Kp6rZeSS3hiTW9mwtUlXrwYbJP6pwlVNB7jYElrjWUg==",
"devOptional": true,
"license": "Apache-2.0" "license": "Apache-2.0"
}, },
"node_modules/@prisma/engines": { "node_modules/@prisma/engines": {
"version": "5.22.0", "version": "6.1.0",
"resolved": "https://registry.npmjs.org/@prisma/engines/-/engines-5.22.0.tgz", "resolved": "https://registry.npmjs.org/@prisma/engines/-/engines-6.1.0.tgz",
"integrity": "sha512-UNjfslWhAt06kVL3CjkuYpHAWSO6L4kDCVPegV6itt7nD1kSJavd3vhgAEhjglLJJKEdJ7oIqDJ+yHk6qO8gPA==", "integrity": "sha512-GnYJbCiep3Vyr1P/415ReYrgJUjP79fBNc1wCo7NP6Eia0CzL2Ot9vK7Infczv3oK7JLrCcawOSAxFxNFsAERQ==",
"devOptional": true,
"hasInstallScript": true, "hasInstallScript": true,
"license": "Apache-2.0", "license": "Apache-2.0",
"dependencies": { "dependencies": {
"@prisma/debug": "5.22.0", "@prisma/debug": "6.1.0",
"@prisma/engines-version": "5.22.0-44.605197351a3c8bdd595af2d2a9bc3025bca48ea2", "@prisma/engines-version": "6.1.0-21.11f085a2012c0f4778414c8db2651556ee0ef959",
"@prisma/fetch-engine": "5.22.0", "@prisma/fetch-engine": "6.1.0",
"@prisma/get-platform": "5.22.0" "@prisma/get-platform": "6.1.0"
} }
}, },
"node_modules/@prisma/engines-version": { "node_modules/@prisma/engines-version": {
"version": "5.22.0-44.605197351a3c8bdd595af2d2a9bc3025bca48ea2", "version": "6.1.0-21.11f085a2012c0f4778414c8db2651556ee0ef959",
"resolved": "https://registry.npmjs.org/@prisma/engines-version/-/engines-version-5.22.0-44.605197351a3c8bdd595af2d2a9bc3025bca48ea2.tgz", "resolved": "https://registry.npmjs.org/@prisma/engines-version/-/engines-version-6.1.0-21.11f085a2012c0f4778414c8db2651556ee0ef959.tgz",
"integrity": "sha512-2PTmxFR2yHW/eB3uqWtcgRcgAbG1rwG9ZriSvQw+nnb7c4uCr3RAcGMb6/zfE88SKlC1Nj2ziUvc96Z379mHgQ==", "integrity": "sha512-PdJqmYM2Fd8K0weOOtQThWylwjsDlTig+8Pcg47/jszMuLL9iLIaygC3cjWJLda69siRW4STlCTMSgOjZzvKPQ==",
"devOptional": true,
"license": "Apache-2.0" "license": "Apache-2.0"
}, },
"node_modules/@prisma/fetch-engine": { "node_modules/@prisma/fetch-engine": {
"version": "5.22.0", "version": "6.1.0",
"resolved": "https://registry.npmjs.org/@prisma/fetch-engine/-/fetch-engine-5.22.0.tgz", "resolved": "https://registry.npmjs.org/@prisma/fetch-engine/-/fetch-engine-6.1.0.tgz",
"integrity": "sha512-bkrD/Mc2fSvkQBV5EpoFcZ87AvOgDxbG99488a5cexp5Ccny+UM6MAe/UFkUC0wLYD9+9befNOqGiIJhhq+HbA==", "integrity": "sha512-asdFi7TvPlEZ8CzSZ/+Du5wZ27q6OJbRSXh+S8ISZguu+S9KtS/gP7NeXceZyb1Jv1SM1S5YfiCv+STDsG6rrg==",
"devOptional": true,
"license": "Apache-2.0", "license": "Apache-2.0",
"dependencies": { "dependencies": {
"@prisma/debug": "5.22.0", "@prisma/debug": "6.1.0",
"@prisma/engines-version": "5.22.0-44.605197351a3c8bdd595af2d2a9bc3025bca48ea2", "@prisma/engines-version": "6.1.0-21.11f085a2012c0f4778414c8db2651556ee0ef959",
"@prisma/get-platform": "5.22.0" "@prisma/get-platform": "6.1.0"
} }
}, },
"node_modules/@prisma/get-platform": { "node_modules/@prisma/get-platform": {
"version": "5.22.0", "version": "6.1.0",
"resolved": "https://registry.npmjs.org/@prisma/get-platform/-/get-platform-5.22.0.tgz", "resolved": "https://registry.npmjs.org/@prisma/get-platform/-/get-platform-6.1.0.tgz",
"integrity": "sha512-pHhpQdr1UPFpt+zFfnPazhulaZYCUqeIcPpJViYoq9R+D/yw4fjE+CtnsnKzPYm0ddUbeXUzjGVGIRVgPDCk4Q==", "integrity": "sha512-ia8bNjboBoHkmKGGaWtqtlgQOhCi7+f85aOkPJKgNwWvYrT6l78KgojLekE8zMhVk0R9lWcifV0Pf8l3/15V0Q==",
"devOptional": true,
"license": "Apache-2.0", "license": "Apache-2.0",
"dependencies": { "dependencies": {
"@prisma/debug": "5.22.0" "@prisma/debug": "6.1.0"
} }
}, },
"node_modules/@socket.io/component-emitter": { "node_modules/@socket.io/component-emitter": {
@ -1472,6 +1477,7 @@
"version": "2.3.3", "version": "2.3.3",
"resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz", "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
"integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==", "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
"dev": true,
"hasInstallScript": true, "hasInstallScript": true,
"license": "MIT", "license": "MIT",
"optional": true, "optional": true,
@ -2188,19 +2194,20 @@
} }
}, },
"node_modules/prisma": { "node_modules/prisma": {
"version": "5.22.0", "version": "6.1.0",
"resolved": "https://registry.npmjs.org/prisma/-/prisma-5.22.0.tgz", "resolved": "https://registry.npmjs.org/prisma/-/prisma-6.1.0.tgz",
"integrity": "sha512-vtpjW3XuYCSnMsNVBjLMNkTj6OZbudcPPTPYHqX0CJfpcdWciI1dM8uHETwmDxxiqEwCIE6WvXucWUetJgfu/A==", "integrity": "sha512-aFI3Yi+ApUxkwCJJwyQSwpyzUX7YX3ihzuHNHOyv4GJg3X5tQsmRaJEnZ+ZyfHpMtnyahhmXVfbTZ+lS8ZtfKw==",
"devOptional": true,
"hasInstallScript": true, "hasInstallScript": true,
"license": "Apache-2.0", "license": "Apache-2.0",
"dependencies": { "dependencies": {
"@prisma/engines": "5.22.0" "@prisma/engines": "6.1.0"
}, },
"bin": { "bin": {
"prisma": "build/index.js" "prisma": "build/index.js"
}, },
"engines": { "engines": {
"node": ">=16.13" "node": ">=18.18"
}, },
"optionalDependencies": { "optionalDependencies": {
"fsevents": "2.3.3" "fsevents": "2.3.3"

8
package.json
View File

@ -6,7 +6,7 @@
"format": "prettier --write src/" "format": "prettier --write src/"
}, },
"dependencies": { "dependencies": {
"@prisma/client": "^5.17.0", "@prisma/client": "^6.1.0",
"@types/ioredis": "^4.28.10", "@types/ioredis": "^4.28.10",
"bcryptjs": "^2.4.3", "bcryptjs": "^2.4.3",
"bullmq": "^5.13.2", "bullmq": "^5.13.2",
@ -17,7 +17,6 @@
"jsonwebtoken": "^9.0.2", "jsonwebtoken": "^9.0.2",
"nodemailer": "^6.9.15", "nodemailer": "^6.9.15",
"pino": "^9.3.2", "pino": "^9.3.2",
"prisma": "^5.17.0",
"sharp": "^0.33.4", "sharp": "^0.33.4",
"socket.io": "^4.7.5", "socket.io": "^4.7.5",
"typescript": "^5.5.3", "typescript": "^5.5.3",
@ -29,8 +28,9 @@
"@types/jsonwebtoken": "^9.0.6", "@types/jsonwebtoken": "^9.0.6",
"@types/node": "^20.14.11", "@types/node": "^20.14.11",
"@types/nodemailer": "^6.4.16", "@types/nodemailer": "^6.4.16",
"ts-node": "^10.9.2",
"nodemon": "^3.1.4", "nodemon": "^3.1.4",
"prettier": "^3.3.3" "prettier": "^3.3.3",
"prisma": "^6.1.0",
"ts-node": "^10.9.2"
} }
} }

4
prisma/migrations/20241217160850_init/migration.sql
View File

@ -42,7 +42,7 @@ CREATE TABLE `SpriteAction` (
`isLooping` BOOLEAN NOT NULL DEFAULT false, `isLooping` BOOLEAN NOT NULL DEFAULT false,
`frameWidth` INTEGER NOT NULL DEFAULT 0, `frameWidth` INTEGER NOT NULL DEFAULT 0,
`frameHeight` INTEGER NOT NULL DEFAULT 0, `frameHeight` INTEGER NOT NULL DEFAULT 0,
`frameSpeed` INTEGER NOT NULL DEFAULT 0, `frameRate` INTEGER NOT NULL DEFAULT 0,
PRIMARY KEY (`id`) PRIMARY KEY (`id`)
) DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci; ) DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
@ -177,7 +177,7 @@ CREATE TABLE `Object` (
`originX` DECIMAL(65, 30) NOT NULL DEFAULT 0, `originX` DECIMAL(65, 30) NOT NULL DEFAULT 0,
`originY` DECIMAL(65, 30) NOT NULL DEFAULT 0, `originY` DECIMAL(65, 30) NOT NULL DEFAULT 0,
`isAnimated` BOOLEAN NOT NULL DEFAULT false, `isAnimated` BOOLEAN NOT NULL DEFAULT false,
`frameSpeed` INTEGER NOT NULL DEFAULT 0, `frameRate` INTEGER NOT NULL DEFAULT 0,
`frameWidth` INTEGER NOT NULL DEFAULT 0, `frameWidth` INTEGER NOT NULL DEFAULT 0,
`frameHeight` INTEGER NOT NULL DEFAULT 0, `frameHeight` INTEGER NOT NULL DEFAULT 0,
`createdAt` DATETIME(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3), `createdAt` DATETIME(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3),

2
prisma/schema/game.prisma
View File

@ -38,7 +38,7 @@ model SpriteAction {
isLooping Boolean @default(false) isLooping Boolean @default(false)
frameWidth Int @default(0) frameWidth Int @default(0)
frameHeight Int @default(0) frameHeight Int @default(0)
frameSpeed Int @default(0) frameRate Int @default(0)
} }
model Item { model Item {

2
prisma/schema/zone.prisma
View File

@ -13,7 +13,7 @@ model Object {
originX Decimal @default(0) originX Decimal @default(0)
originY Decimal @default(0) originY Decimal @default(0)
isAnimated Boolean @default(false) isAnimated Boolean @default(false)
frameSpeed Int @default(0) frameRate Int @default(0)
frameWidth Int @default(0) frameWidth Int @default(0)
frameHeight Int @default(0) frameHeight Int @default(0)
createdAt DateTime @default(now()) createdAt DateTime @default(now())

4
src/socketEvents/gameMaster/assetManager/object/update.ts
View File

@ -10,7 +10,7 @@ type Payload = {
originX: number originX: number
originY: number originY: number
isAnimated: boolean isAnimated: boolean
frameSpeed: number frameRate: number
frameWidth: number frameWidth: number
frameHeight: number frameHeight: number
} }
@ -44,7 +44,7 @@ export default class ObjectUpdateEvent {
originX: data.originX, originX: data.originX,
originY: data.originY, originY: data.originY,
isAnimated: data.isAnimated, isAnimated: data.isAnimated,
frameSpeed: data.frameSpeed, frameRate: data.frameRate,
frameWidth: data.frameWidth, frameWidth: data.frameWidth,
frameHeight: data.frameHeight frameHeight: data.frameHeight
} }

2
src/socketEvents/gameMaster/assetManager/sprite/update.ts
View File

@ -375,7 +375,7 @@ export default class SpriteUpdateEvent {
isLooping: action.isLooping, isLooping: action.isLooping,
frameWidth: action.frameWidth, frameWidth: action.frameWidth,
frameHeight: action.frameHeight, frameHeight: action.frameHeight,
frameSpeed: action.frameSpeed frameRate: action.frameRate
} }
} }

2
src/utilities/http.ts
View File

@ -189,7 +189,7 @@ async function addHttpRoutes(app: Application) {
frameCount: JSON.parse(JSON.stringify(spriteAction.sprites)).length, frameCount: JSON.parse(JSON.stringify(spriteAction.sprites)).length,
frameWidth: spriteAction.frameWidth, frameWidth: spriteAction.frameWidth,
frameHeight: spriteAction.frameHeight, frameHeight: spriteAction.frameHeight,
frameSpeed: spriteAction.frameSpeed frameRate: spriteAction.frameRate
}) })
}) })

2
src/utilities/types.ts
View File

@ -34,7 +34,7 @@ export type AssetData = {
frameCount?: number frameCount?: number
frameWidth?: number frameWidth?: number
frameHeight?: number frameHeight?: number
frameSpeed?: number frameRate?: number
} }
export type WorldSettings = { export type WorldSettings = {