Merge pull request #279 from RSamaium/v4.2.1

V4.2.1

packages/client/src/Presets/AnimationSpritesheet.ts

@@ -1,14 +1,19 @@
 import { Direction } from '@rpgjs/common'
 import { Animation } from '../Effects/AnimationCharacter'
 
-export const RMSpritesheet = (framesWidth, framesHeight, frameStand = 1) => {
+export const RMSpritesheet = (framesWidth: number, framesHeight: number, frameStand: number = 1) => {
+
+ if (framesWidth <= frameStand) {
+ frameStand = framesWidth - 1
+ }
 
  const frameY = direction => {
+ const gap = Math.max(4 - framesHeight, 0)
  return {
  [Direction.Down]: 0,
- [Direction.Left]: 1,
- [Direction.Right]: 2,
- [Direction.Up]: 3
+ [Direction.Left]: Math.max(0, 1 - gap),
+ [Direction.Right]: Math.max(0, 2 - gap),
+ [Direction.Up]: Math.max(0, 3 - gap)
  }[direction]
  }
 

packages/client/src/Tilemap/index.ts

@@ -108,7 +108,9 @@ export default class TileMap extends Container {
  // if (yObject - tile.y >= height) {
  // return false
  // }
- const zIntersection = intersection([zObject, zObject + height], [realZ, realZ + tile.height])
+ // Always get tile.height for height. TODO: Fix this the height of the character. To be seen according to future implementations...
+ // Discussion: https://community.rpgjs.dev/d/250-rpgjs-v420/6
+ const zIntersection = intersection([zObject, zObject + tile.height /** Old code: height */], [realZ, realZ + tile.height])
  if (!zIntersection) {
  return true
  }

packages/common/src/Game.ts

@@ -84,7 +84,7 @@ export class RpgCommonGame extends EventEmitter {
  }
 
  const routesMove: any = []
- 
+
  while (player.pendingMove.length > 0) {
  const inputData = player.pendingMove.shift()
 
@@ -131,6 +131,7 @@ export class RpgCommonGame extends EventEmitter {
  input == Direction.Up ||
  input == Direction.Down
  ) {
+ player.moving = true
  moving = true
  const isMove = await player.moveByDirection(+input, deltaTimeInt || 1)
  if (isMove) {
@@ -149,6 +150,7 @@ export class RpgCommonGame extends EventEmitter {
  inputs.push(input)
  }
 
+
  return {
  player,
  inputs

packages/compiler/src/build/vite-plugin-config.toml.ts

@@ -514,6 +514,7 @@ export default function configTomlPlugin(options: ClientBuildConfigOptions = {},
  else if (id.endsWith('virtual-server.ts')) {
  const codeToTransform = dd`
  import { expressServer } from '@rpgjs/server/express'
+ import { RpgWorld } from '@rpgjs/server'
  import * as url from 'url'
  import modules from './${MODULE_NAME}'
  import globalConfig from './${GLOBAL_CONFIG_SERVER}'
@@ -524,6 +525,16 @@ export default function configTomlPlugin(options: ClientBuildConfigOptions = {},
  globalConfig,
  basePath: __dirname,
  envs: ${envsString}
+ }).then(({ server, game }) => {
+ if (import.meta['hot']) {
+ import.meta['hot'].on("vite:beforeFullReload", () => {
+ server.close();
+ RpgWorld.getPlayers().forEach(player => {
+ player.gameReload();
+ });
+ game.stop();
+ });
+ }
  })
  `;
  return codeToTransform

packages/compiler/src/jsonSchema/compilation.ts

@@ -36,5 +36,11 @@ export default {
  "vite": {
  "type": "object",
  "additionalProperties": true
+ },
+ "spritesheetDirectories": {
+ "type": "array",
+ "items": {
+ "type": "string"
+ }
  }
 }

packages/sample2/main/events/npc.ts

@@ -12,14 +12,5 @@ export default class CatEvent extends RpgEvent {
  Components.text('{id}')
  )
  this.speed = Speed.Slow
- this.attachShape({
- height: 100,
- width: 100,
- positioning: ShapePositioning.Center
- })
- }
-
- onDetect(player, shape) {
- this.moveTo(player).subscribe()
  }
 }

packages/sample2/rpg.toml

@@ -9,6 +9,8 @@ modules = [
  # '@rpgjs/title-screen'
 ]
 
+spritesheetDirectories = []
+
 [start]
  map = 'map'
  graphic = 'male'
@@ -22,4 +24,6 @@ modules = [
 
 [compilerOptions.build]
  serverUrl = '$ENV:VITE_SERVER_URL'
- pwaEnabled = false
+ pwaEnabled = false
+
+

packages/server/package.json

@@ -38,7 +38,7 @@
  "pretty-error": "^4.0.0",
  "rxjs": "7.8.0",
  "sat": "^0.9.0",
- "simple-room": "^3.1.1",
+ "simple-room": "^3.1.2",
  "socket.io": "^4.6.1"
  },
  "gitHead": "5abe6ca78be96524d74a052a230f2315c900ddee",

packages/server/src/Gui/Gui.ts

@@ -18,6 +18,7 @@ export class Gui extends EventEmitter {
  blockPlayerInput = false
  } = {}): Promise<any> {
  return new Promise((resolve) => {
+ this.player.moving = false
  this.player.emit('gui.open', {
  guiId: this.id,
  data

packages/server/src/express/server.ts

@@ -83,15 +83,5 @@ export function expressServer(modules: ModuleType[], options: ExpressServerOptio
  process.on('unhandledRejection', function (reason: any) {
  console.log(pe.render(reason))
  })
-
- if (import.meta['hot']) {
- import.meta['hot'].on("vite:beforeFullReload", () => {
- server.close()
- Query.getPlayers().forEach(player => {
- player.gameReload()
- })
- rpgGame.stop()
- });
- }
  })
 }

packages/server/src/server.ts

@@ -293,7 +293,7 @@ export class RpgServerEngine {
  if (!playerInstance) continue
  const player = playerInstance.otherPossessedPlayer ?? playerInstance
  if (player.pendingMove.length > 0) {
- player.moving = true
+
  const lastFrame = player.pendingMove[player.pendingMove.length - 1]
  if (this.inputOptions.workers) obj.push(player.toObject())
  else {

packages/tiled/src/parser/parser.ts

@@ -205,6 +205,9 @@ export class TiledParser {
  const setLayer = (type) => {
  if (!type) return
  TiledParser.toArray(type).forEach((val: any) => {
+ if (this.layers.has(+val._attributes.id)) {
+ throw new Error(`Tiled Parser Error: Layer with id ${val._attributes.id} already exists`)
+ }
  this.layers.set(+val._attributes.id, val)
  })
  }