Skip to content

Commit 7887ac9

Browse files
ParallaxesParallaxes
authored
Merge pull request #119 from casonpollak/VeErA
remodel winter level final edits
2 parents ac3a1b0 + 006ab98 commit 7887ac9

File tree

6 files changed

+71
-53
lines changed

6 files changed

+71
-53
lines changed

‎assets/js/platformer/GameControl.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -280,4 +280,4 @@ const GameControl = {
280280
},
281281
};
282282

283-
export default GameControl;
283+
export default GameControl;

‎assets/js/platformer/GameEnv.js

+23-6
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,10 @@ export class GameEnv {
5555
* @property {number} timerInterval - Variable to hold the interval reference, used by timer objects
5656
* @property {boolean} keyCollected - Checks whether the key has been collected my Mario or not
5757
* @property {boolean} powerUpCollected - Checks whether the powerup has been collected by the escaper sprite
58-
* @property {boolean} wandColleted - Chekcs whether the wand has been collected by the player
59-
* @property {boolean} spellUsed - Chekcs whether the wand has been used by the player
60-
*/
58+
* @property {boolean} wandCollected - Checks whether the wand has been collected by the player
59+
* @property {boolean} spellUsed - Checks whether the wand has been used by the player
60+
61+
*/
6162
static userID = "Guest";
6263
static player = null;
6364
static levels = [];
@@ -96,12 +97,13 @@ export class GameEnv {
9697

9798
static playerChange = false;
9899

99-
static claimedCoinIds = []
100+
static claimedCoinIds = [];
100101

101-
static trashCount = []
102+
static trashCount = [];
102103

103104
static wandCollected = false;
104-
static spellUsed = false;
105+
106+
static spellUsed = false
105107

106108

107109
// Make the constructor throws an error, or effectively make it a private constructor.
@@ -264,6 +266,21 @@ export class GameEnv {
264266
break;
265267
}
266268
}
269+
270+
static customTimeout(callback, delay) {
271+
const start = Date.now();
272+
273+
function loop() {
274+
if (Date.now() - start >= delay) {
275+
callback();
276+
} else {
277+
requestAnimationFrame(loop);
278+
}
279+
}
280+
281+
requestAnimationFrame(loop);
282+
}
283+
267284
}
268285

269286
export default GameEnv;

‎assets/js/platformer/GameSetterWinter.js

+29-34
Original file line numberDiff line numberDiff line change
@@ -82,13 +82,13 @@ const assets = {
8282
sandblock: {src:"/images/platformer/platforms/sandblock.png"},
8383
snowyfloor: { src: "/images/platformer/platforms/grass.png" },
8484
snowywood: { src: "/images/platformer/platforms/snowywood.png" },
85-
boxmiddle: { src: "/images/platformer/platforms/block-left.png"},
86-
boxendleft: {src: "images/platformer/platforms/block-left.png"},
87-
boxendright: {src: "images/platformer/platforms/block-left.png"},
88-
boxback: {src: "images/platformer/platforms/block-left.png"},
89-
boxmiddle_rotated: {src: "images/platformer/platforms/block-left.png"},
90-
boxendleft_rotated: {src: "/images/platformer/platforms/block-left.png"},
91-
boxendright_rotated: {src: "images/platformer/platforms/block-left.png"},
85+
boxmiddle: { src: "/images/platformer/platforms/boxmiddle.png"},
86+
boxendleft: {src: "/images/platformer/platforms/boxendleft.png"},
87+
boxendright: {src: "/images/platformer/platforms/boxendright.png"},
88+
boxback: {src: "/images/platformer/platforms/boxback.png"},
89+
boxmiddle_rotated: {src: "/images/platformer/platforms/boxmiddle_rotated.png"},
90+
boxendleft_rotated: {src: "/images/platformer/platforms/boxendleft_rotated.png"},
91+
boxendright_rotated: {src: "/images/platformer/platforms/boxendright_rotated.png"},
9292
alien: { src: "/images/platformer/platforms/alien.png" },
9393
bricks: { src: "/images/platformer/platforms/brick_wall.png" },
9494
lava: { src: "/images/platformer/platforms/lava.jpg" },
@@ -459,38 +459,33 @@ const assets = {
459459
{ name: 'winter', id: 'background', class: BackgroundSnow, data: assets.backgrounds.winter },
460460
{ name: 'snowfall', id: 'background', class: BackgroundSnowfall, data: assets.backgrounds.snow },
461461
{ name: 'snowyfloor', id: 'platform', class: Platform, data: assets.platforms.snowyfloor },
462-
{ name: 'blocks', id: 'jumpPlatform', class: BlockPlatform, data: assets.platforms.boxmiddle, xPercentage: 0.2, yPercentage: 0.82 },
463-
{ name: 'blocks', id: 'jumpPlatform', class: BlockPlatform, data: assets.platforms.boxmiddle, xPercentage: 0.2368, yPercentage: 0.82 },
464-
{ name: 'blocks', id: 'jumpPlatform', class: BlockPlatform, data: assets.platforms.boxmiddle, xPercentage: 0.2736, yPercentage: 0.82 },
465-
{ name: 'blocks', id: 'jumpPlatform', class: BlockPlatform, data: assets.platforms.boxmiddle, xPercentage: 0.3104, yPercentage: 0.82 },
466-
{ name: 'blocks', id: 'jumpPlatform', class: BlockPlatform, data: assets.platforms.boxendright, xPercentage: 0.3472, yPercentage: 0.82 },
467-
{ name: 'blocks', id: 'jumpPlatform', class: BlockPlatform, data: assets.platforms.boxendleft, xPercentage: 0.384, yPercentage: 0.715 },
468-
{ name: 'blocks', id: 'jumpPlatform', class: BlockPlatform, data: assets.platforms.boxendright, xPercentage: 0.4208, yPercentage: 0.715 },
469-
{ name: 'blocks', id: 'jumpPlatform', class: BlockPlatform, data: assets.platforms.boxendleft_rotated, xPercentage: 0.5090, yPercentage: 0.56 },
470-
{ name: 'blocks', id: 'jumpPlatform', class: BlockPlatform, data: assets.platforms.boxmiddle_rotated, xPercentage: 0.5090, yPercentage: 0.48 },
471-
{ name: 'blocks', id: 'jumpPlatform', class: BlockPlatform, data: assets.platforms.boxmiddle_rotated, xPercentage: 0.5090, yPercentage: 0.40 },
472-
{ name: 'blocks', id: 'jumpPlatform', class: BlockPlatform, data: assets.platforms.boxendright_rotated, xPercentage: 0.5090, yPercentage: 0.32 },
473-
{ name: 'blocks', id: 'jumpPlatform', class: BlockPlatform, data: assets.platforms.boxendright, xPercentage: 0.655, yPercentage: 0.68 },
474-
{ name: 'blocks', id: 'jumpPlatform', class: BlockPlatform, data: assets.platforms.boxendleft, xPercentage: 0.62, yPercentage: 0.68 },
475-
{ name: 'blocks', id: 'jumpPlatform', class: BlockPlatform, data: assets.platforms.boxendright, xPercentage: 0.72, yPercentage: 0.76 },
476-
{ name: 'blocks', id: 'jumpPlatform', class: BlockPlatform, data: assets.platforms.boxendleft, xPercentage: 0.69, yPercentage: 0.76 },
477-
{ name: 'blocks', id: 'jumpPlatform', class: BlockPlatform, data: assets.platforms.boxendleft_rotated, xPercentage: 0.755, yPercentage: 1 },
478-
{ name: 'blocks', id: 'jumpPlatform', class: BlockPlatform, data: assets.platforms.boxmiddle_rotated, xPercentage: 0.755, yPercentage: 0.92 },
479-
{ name: 'blocks', id: 'jumpPlatform', class: BlockPlatform, data: assets.platforms.boxendright_rotated, xPercentage: 0.755, yPercentage: 0.84 },
480-
{ name: 'blocks', id: 'jumpPlatform', class: BlockPlatform, data: assets.platforms.boxendright_rotated, xPercentage: 0.625, yPercentage: 0.92 },
481-
{ name: 'blocks', id: 'jumpPlatform', class: BlockPlatform, data: assets.platforms.boxendleft_rotated, xPercentage: 0.625, yPercentage: 1 },
482-
{ name: 'trash', id: 'trash', class: Trash, data: assets.obstacles.trash, xPercentage: 0.4, yPercentage: 0.5},
483-
{ name: 'trash', id: 'trash', class: Trash, data: assets.obstacles.trash, xPercentage: 0.63, yPercentage: 0.58},
484-
{ name: 'trash', id: 'trash', class: Trash, data: assets.obstacles.trash, xPercentage: 0.21, yPercentage: 0.6},
485-
{ name: 'trash', id: 'trash', class: Trash, data: assets.obstacles.trash, xPercentage: 0.32, yPercentage: 0.6},
462+
{ name: 'blocks', id: 'jumpPlatform', class: BlockPlatform, data: assets.platforms.boxendleft, xPercentage: 0.25, yPercentage: 0.78 },
463+
{ name: 'blocks', id: 'jumpPlatform', class: BlockPlatform, data: assets.platforms.boxmiddle, xPercentage: 0.2868, yPercentage: 0.78 },
464+
{ name: 'blocks', id: 'jumpPlatform', class: BlockPlatform, data: assets.platforms.boxmiddle, xPercentage: 0.3236, yPercentage: 0.78 },
465+
{ name: 'blocks', id: 'jumpPlatform', class: BlockPlatform, data: assets.platforms.boxmiddle, xPercentage: 0.3604, yPercentage: 0.74 },
466+
{ name: 'blocks', id: 'jumpPlatform', class: BlockPlatform, data: assets.platforms.boxendright, xPercentage: 0.3972, yPercentage: 0.7 },
467+
{ name: 'blocks', id: 'jumpPlatform', class: BlockPlatform, data: assets.platforms.boxendleft, xPercentage: 0.0632, yPercentage: 0.41 },
468+
{ name: 'blocks', id: 'jumpPlatform', class: BlockPlatform, data: assets.platforms.boxendleft, xPercentage: 0.1, yPercentage: 0.45 },
469+
{ name: 'blocks', id: 'jumpPlatform', class: BlockPlatform, data: assets.platforms.boxmiddle, xPercentage: 0.1368, yPercentage: 0.45 },
470+
{ name: 'blocks', id: 'jumpPlatform', class: BlockPlatform, data: assets.platforms.boxmiddle, xPercentage: 0.1736, yPercentage: 0.48 },
471+
{ name: 'blocks', id: 'jumpPlatform', class: BlockPlatform, data: assets.platforms.boxendright, xPercentage: 0.5632, yPercentage: 0.52 },
472+
{ name: 'blocks', id: 'jumpPlatform', class: BlockPlatform, data: assets.platforms.boxendright, xPercentage: 0.6, yPercentage: 0.45 },
473+
{ name: 'blocks', id: 'jumpPlatform', class: BlockPlatform, data: assets.platforms.boxendright, xPercentage: 0.6368, yPercentage: 0.45 },
474+
{ name: 'blocks', id: 'jumpPlatform', class: BlockPlatform, data: assets.platforms.boxmiddle, xPercentage: 0.1368, yPercentage: 0.995 },
475+
{ name: 'blocks', id: 'jumpPlatform', class: BlockPlatform, data: assets.platforms.boxendright, xPercentage: 0.755, yPercentage: 0.68 },
476+
{ name: 'blocks', id: 'jumpPlatform', class: BlockPlatform, data: assets.platforms.boxendleft, xPercentage: 0.72, yPercentage: 0.68 },
477+
{ name: 'blocks', id: 'jumpPlatform', class: BlockPlatform, data: assets.platforms.boxendright, xPercentage: 0.789, yPercentage: 0.73 },
478+
{ name: 'trash', id: 'trash', class: Trash, data: assets.obstacles.trash, xPercentage: 0.0632, yPercentage: 0.31},
479+
{ name: 'trash', id: 'trash', class: Trash, data: assets.obstacles.trash, xPercentage: 0.36, yPercentage: 0.63},
480+
{ name: 'trash', id: 'trash', class: Trash, data: assets.obstacles.trash, xPercentage: 0.565, yPercentage: 0.42},
481+
{ name: 'trash', id: 'trash', class: Trash, data: assets.obstacles.trash, xPercentage: 0.72, yPercentage: 0.58},
486482
{ name: 'owl', id: 'owl', class: Owl, data: assets.enemies.Owl, xPercentage: 0.3, minPosition: 0.05 },
487483
{ name: 'owl', id: 'owl', class: Owl, data: assets.enemies.Owl, xPercentage: 0.8, minPosition: 0.05 },
488484
{ name: 'caveman', id: 'snowman', class: Snowman, data: assets.enemies.Snowman, xPercentage: 0.2, minPosition: 0.1, difficulties: ["normal", "hard", "impossible"] },
489485
{ name: 'caveman', id: 'snowman', class: Snowman, data: assets.enemies.Snowman, xPercentage: 0.35, minPosition: 0.1, difficulties: ["normal", "hard", "impossible"] },
490486
{ name: 'caveman', id: 'snowman', class: Snowman, data: assets.enemies.Snowman, xPercentage: 0.5, minPosition: 0.1, difficulties: ["normal", "hard", "impossible"] },
491487
{ name: 'mario', id: 'player', class: PlayerWinter, data: assets.players.whitemario },
492-
{ name: 'cabin', id: 'finishline', class: FinishLine, data: assets.obstacles.cabin, xPercentage: 0.85, yPercentage: 0.775 },
493-
{ name: 'tubeU', id: 'minifinishline', class: FinishLine, data: assets.obstacles.tubeU, xPercentage: 0.675, yPercentage: 0.8615 },
488+
{ name: 'cabin', id: 'finishline', class: FinishLine, data: assets.obstacles.cabin, xPercentage: 0.85, yPercentage: 0.79 },
494489
{ name: 'quidditchEnd', id: 'background', class: BackgroundTransitions, data: assets.transitions.quidditchEnd },
495490
];
496491

@@ -500,4 +495,4 @@ const assets = {
500495
objects: objects
501496
};
502497

503-
export default GameSetterWinter;
498+
export default GameSetterWinter;

‎assets/js/platformer/PlatformJump.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ export class JumpPlatform extends GameObject {
2525

2626
collisionAction() {
2727
// Collision only applies to the item block when Mario collides with it
28-
if (this.collisionData.touchPoints.other.id === "player" && this.name === "itemBlock") {
28+
if (this.collisionData.touchPoints.other.id === "player" && (this.name === "itemBlock" || this.name === "wand")) {
2929
this.handleItemBlockCollision();
3030
}
3131
}
@@ -40,7 +40,7 @@ export class JumpPlatform extends GameObject {
4040
// Remove the block from the display
4141
this.canvas.style.display = 'none';
4242
}
43-
43+
4444
// Set platform position
4545
size() {
4646
// Formula for Height should be on constant ratio, using a proportion of 832

‎assets/js/platformer/PlayerHills.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -83,22 +83,22 @@ export class PlayerHills extends PlayerBase {
8383
if (this.collisionData.touchPoints.this.right && GameEnv.keyCollected) {
8484
this.state.movement.right = false;
8585
this.state.movement.left = true;
86-
// GameEnv.gameObjects[GameEnv.gameObjects.length - 1].updateImg()
86+
GameEnv.gameObjects[GameEnv.gameObjects.length - 1].updateImg()
8787
// setTimeout(() => {
8888
// this.x = GameEnv.innerWidth + 1;
8989
// }, 1250);
90-
setTimeout(() => {
90+
GameEnv.customTimeout(() => {
9191
GameControl.transitionToLevel(GameEnv.levels[GameEnv.levels.indexOf(GameEnv.currentLevel) + 1]);
9292
}, 1000);
9393
// 3. Collision between player left and finishline
9494
} else if (this.collisionData.touchPoints.this.left && GameEnv.keyCollected) {
9595
this.state.movement.left = false;
9696
this.state.movement.right = true;
97-
// GameEnv.gameObjects[GameEnv.gameObjects.length - 1].updateImg()
97+
GameEnv.gameObjects[GameEnv.gameObjects.length - 1].updateImg()
9898
// setTimeout(() => {
9999
// this.x = GameEnv.innerWidth + 1;
100100
// }, 1250);
101-
setTimeout(() => {
101+
GameEnv.customTimeout(() => {
102102
GameControl.transitionToLevel(GameEnv.levels[GameEnv.levels.indexOf(GameEnv.currentLevel) + 1]);
103103
}, 1000);
104104
}

‎assets/js/platformer/PlayerWinter.js

+12-6
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,8 @@ export class PlayerWinter extends PlayerBase {
101101
this.state.animation = 'idle'
102102
break
103103
}
104+
105+
104106
// Check if the player has collected all the coins
105107
var collectedAllCoins = true;
106108
for (let obj of GameEnv.gameObjects) {
@@ -117,13 +119,13 @@ export class PlayerWinter extends PlayerBase {
117119
// 1. Caught in finishline
118120
if (this.collisionData.touchPoints.this.top && this.collisionData.touchPoints.other.bottom) {
119121
// Position player in the center of the finishline
120-
this.x = this.collisionData.newX;
122+
// this.x = this.collisionData.newX;
121123
// Using natural gravity wait for player to reach floor
122-
if (Math.abs(this.y - this.bottom) <= GameEnv.gravity) {
124+
// if (Math.abs(this.y - this.bottom) <= GameEnv.gravity) {
123125
// Force end of level condition
124-
const index = GameEnv.levels.findIndex(level => level.tag === "Skibidi")
125-
GameControl.transitionToLevel(GameEnv.levels[index]);
126-
}
126+
// const index = GameEnv.levels.findIndex(level => level.tag === "Skibidi")
127+
// GameControl.transitionToLevel(GameEnv.levels[index]);
128+
// }
127129
// 2. Collision between player right and finishline
128130
} else if (this.collisionData.touchPoints.this.right) {
129131
this.state.movement.right = false;
@@ -133,7 +135,11 @@ export class PlayerWinter extends PlayerBase {
133135
this.state.movement.left = false;
134136
this.state.movement.right = true;
135137
}
136-
this.x = GameEnv.innerWidth + 1;
138+
this.canvasHeight = this.canvasHeight * 0.8
139+
this.canvasWidth = this.canvasWidth * 0.8
140+
GameEnv.customTimeout(() => {
141+
this.x = GameEnv.innerWidth + 1; // handles alert to next level
142+
}, 2000);
137143
break;
138144
case "snowman": // Note: Goomba.js and Player.js could be refactored
139145
// 1. Player jumps on goomba, interaction with Goomba.js

0 commit comments

Comments
 (0)