Skip to content

refactor(start-flag): move player placement logic to TileMapHandler #14

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

Open
jakubiszon wants to merge 4 commits into
base: main
Choose a base branch
from
Open

refactor(start-flag): move player placement logic to TileMapHandler #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c39121e
refactor(start-flag): move player start position logic
jakubiszon Mar 3, 2025
de588ec
doc(TileMapHandler): add codedoc
jakubiszon Mar 3, 2025
c5495e7
fix: pass flag index to resetLevel
jakubiszon Mar 3, 2025
a9320f3
remove comments
jakubiszon Mar 8, 2025
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
52 changes: 36 additions & 16 deletions handlers/TileMapHandler.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,12 @@ class TileMapHandler {
});
}

resetLevel(levelIndex) {
resetLevel(levelIndex, flagIndex) {
SFXHandler.resetSfx();
this.tileMap = WorldDataHandler.levels[levelIndex].tileData;
Camera.updateViewportRelatedToScale(WorldDataHandler.levels[levelIndex].zoomFactor || 1)
this.updateLevelDimensions();
this.setInitialPlayerAndCameraPos(levelIndex);
this.#setInitialPlayerAndCameraPos(levelIndex, flagIndex);
this.levelObjects = [];
this.levelObjects = this.createInitialObjects(WorldDataHandler.levels[levelIndex].levelObjects);
this.deko = this.createInitialDeko(WorldDataHandler.levels[levelIndex].deko);
Expand All @@ -53,26 +53,46 @@ class TileMapHandler {
}
}

setInitialPlayerAndCameraPos(levelIndex) {
//This is a fallback, in case no flag was set in a level (start, ending, or if user forgot to set it)
let initialPlayerValue = { x: 0, y: 0 };
WorldDataHandler.levels[levelIndex].levelObjects.forEach(levelObject => {
if (levelObject.type === ObjectTypes.START_FLAG) {
initialPlayerValue.x = levelObject.x * this.tileSize;
initialPlayerValue.y = levelObject.y * this.tileSize;
}
})
this.player.initialY = initialPlayerValue.x;
this.player.initialX = initialPlayerValue.y;
Camera.moveTo(initialPlayerValue.x, initialPlayerValue.y);
#setInitialPlayerAndCameraPos(levelIndex, flagIndex) {
const initialPlayerTile = this.#getInitialPlayerTile(levelIndex, flagIndex);
this.#setPlayerInitialTile(initialPlayerTile);

const initialPlayerPosition = {
x: initialPlayerTile.x * this.tileSize,
y: initialPlayerTile.y * this.tileSize
};

Camera.moveTo(initialPlayerPosition.x, initialPlayerPosition.y);

//startRemoval
if (typeof LevelSizeHandler === 'function') {
LevelSizeHandler.updateCameraSliders(this.levelWidth * this.tileSize, this.levelHeight * this.tileSize, initialPlayerValue);
LevelSizeHandler.updateCameraSliders(this.levelWidth * this.tileSize, this.levelHeight * this.tileSize, initialPlayerPosition);
}
//endRemoval
}

#getInitialPlayerTile(levelIndex, flagIndex) {
const startFlagsInLevel = WorldDataHandler.levels[levelIndex].levelObjects.filter(levelObject => levelObject.type === ObjectTypes.START_FLAG);

const customEntryFlag = flagIndex && startFlagsInLevel.find(startFlag => startFlag?.extraAttributes?.flagIndex === flagIndex);

const levelStartFlag = (!customEntryFlag) && startFlagsInLevel.find(startFlag => startFlag?.extraAttributes?.levelStartFlag);

const lastFlag = (!levelStartFlag && !customEntryFlag) && startFlagsInLevel[startFlagsInLevel.length - 1];

return customEntryFlag ||
levelStartFlag ||
lastFlag ||
{ x: 0, y: 0 };
}

#setPlayerInitialTile(tile) {
if (this?.player) {
this.player.initialX = tile.x * this.tileSize;
this.player.initialY = tile.y * this.tileSize;
}
}

updateLevelDimensions() {
this.levelWidth = this.getLevelWidth();
this.levelHeight = this.getLevelHeight();
Expand Down Expand Up @@ -235,7 +255,7 @@ class TileMapHandler {
if (this.currentLevel === levelAmounth - 1) {
GameStatistics.stopTimer();
}
this.resetLevel(this.currentLevel);
this.resetLevel(this.currentLevel, PlayMode.customExit?.flagIndex);
if (typeof LevelNavigationHandler === 'function') {
LevelNavigationHandler.updateLevel();
LevelNavigationHandler.adaptLevelList();
Expand Down
26 changes: 2 additions & 24 deletions objects/StartFlag.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,32 +15,9 @@ class StartFlag extends InteractiveLevelObject {
this.flagIndex = this.makeid(3);
this.addChangeableAttribute("flagIndex", this.flagIndex, this.tilemapHandler.currentLevel);
}

const customEntryFlag = startFlagsInLevel.find(startFlag =>
PlayMode?.customExit?.flagIndex && startFlag?.extraAttributes?.flagIndex === PlayMode.customExit.flagIndex
);
const levelStartFlag = startFlagsInLevel.find(startFlag =>
startFlag?.extraAttributes?.levelStartFlag
);

if (customEntryFlag?.extraAttributes?.flagIndex === this.flagIndex || levelStartFlag?.extraAttributes?.flagIndex === this.flagIndex) {
this.setPlayerInitialPosition();
}
else if (!levelStartFlag && !customEntryFlag) {
const lastFlag = startFlagsInLevel[startFlagsInLevel.length - 1];
if (lastFlag.x === this.initialX && lastFlag.y === this.initialY) {
this.setPlayerInitialPosition();
}
}
}

setPlayerInitialPosition() {
if (this.tilemapHandler?.player) {
this.tilemapHandler.player.initialX = this.x;
this.tilemapHandler.player.initialY = this.y;
}
}

//startRemoval
updateLevelStartValue(levelStartValue) {
const startFlagsInTileMapHandler = this.tilemapHandler.filterObjectsByTypes(ObjectTypes.START_FLAG);

Expand All @@ -55,6 +32,7 @@ class StartFlag extends InteractiveLevelObject {
this.addChangeableAttribute("levelStartFlag", false);
}
}
//endRemoval

collisionEvent() {
}
Expand Down