Skip to content

refactored ColliderMap to prevent undefined in mutliplayer #199

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Techbot merged 1 commit into from
Jun 3, 2024
Merged

refactored ColliderMap to prevent undefined in mutliplayer #199

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions client/src/game/entities/layers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,13 @@ import { useJigsStore } from '../../stores/jigs';

export default class Layers {
jigs: any;
colliderMap: any;

constructor() {
this.jigs = useJigsStore();
}

loadLayers(self) {
var map = self.make.tilemap({ key: self.jigs.city + "_" + self.jigs.tiled, tileWidth: 32, tileHeight: 32 });
loadLayers(scene) {
var map = scene.make.tilemap({ key: scene.jigs.city + "_" + scene.jigs.tiled, tileWidth: 32, tileHeight: 32 });

this.jigs.tilesetArray_1.forEach(function loader(image: any) {
map.addTilesetImage(image);
Expand All @@ -30,11 +29,11 @@ export default class Layers {
map.addTilesetImage(image);
}, this);

self.colliderMap = map.createLayer('Tile Layer 1', this.jigs.tilesetArray_1).setDepth(1);
scene.colliderMap = map.createLayer('Tile Layer 1', this.jigs.tilesetArray_1).setDepth(1);
map.createLayer('Tile Layer 2', this.jigs.tilesetArray_2).setDepth(2).setPipeline('Light2D');
map.createLayer('Tile Layer 3', this.jigs.tilesetArray_3).setDepth(3).setPipeline('Light2D');
map.createLayer('Tile Layer 4', this.jigs.tilesetArray_4).setDepth(5).setPipeline('Light2D');
self.animatedTiles.init(map);
scene.animatedTiles.init(map);

}
}
6 changes: 2 additions & 4 deletions client/src/game/entities/player.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,12 +47,10 @@ export default class Player {
.setScale(.85)
}

add(colliderMap) {
add() {

this.x = this.player.x;
this.y = this.player.y;

this.colliderMap = colliderMap
this.light = new Light(this.scene, this.player.x, this.player.y, null);
this.gun = new Gun(this.scene, this.player.x, this.player.y, 'gun');
this.sword = new Sword(this.scene, this.player.x, this.player.y, null);
Expand Down Expand Up @@ -131,7 +129,7 @@ export default class Player {
return;
}
this.scene.physics.world.collide(this.scene.localPlayer.entity, this.scene.Walls.walls);
this.playerMovement.move(this.scene.currentPlayer, velocity, this.colliderMap);
this.playerMovement.move(this.scene.currentPlayer, velocity, this.scene.colliderMap);
this.jigs.mobClick = 0;

///////////////////////////////////////////////////////////////////////
Expand Down
14 changes: 0 additions & 14 deletions src/Entities/MapGrid.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,20 +280,6 @@ function getAllMissionBosses($userMG)
return $switchesArray;
}















function getSwitches($type)
{
switch ($type) {
Expand Down