Skip to content

Commit 1528c3e

Browse files
authored
Merge pull request #128 from Parallaxes/main
Power up FINALLY removed
2 parents d7e2d05 + 5de7174 commit 1528c3e

File tree

4 files changed

+6
-78
lines changed

4 files changed

+6
-78
lines changed

assets/js/platformer/GameSetterBossFight.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import Background from './Background.js'
22
import BackgroundTransitions from './BackgroundTransitions.js';
33
import Platform from './Platform.js';
4-
import JumpPlatform2 from './PlatformJump2.js';
4+
//import JumpPlatform2 from './PlatformJump2.js';
55
import BlockPlatform from './BlockPlatform.js';
66
import Coin from './Coin.js';
77
import skibidiTitan from './SkibidiTitan.js';

assets/js/platformer/GameSetterSkibidi.js

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import Background from './Background.js'
22
import BackgroundTransitions from './BackgroundTransitions.js';
33
import Platform from './Platform.js';
4-
import JumpPlatform2 from './PlatformJump2.js';
4+
//import JumpPlatform2 from './PlatformJump2.js';
55
import BlockPlatform from './BlockPlatform.js';
66
import Coin from './Coin.js';
77
import skibidiTitan from './SkibidiTitan.js';
@@ -105,7 +105,7 @@ const assets = {
105105
island: { src: "/images/platformer/platforms/island.png" },
106106
block: { src: "/images/platformer/platforms/brick_block.png" }, //MAY need 3 new variables: sizeRatio, widthRatio, and heightRatio
107107

108-
108+
/*
109109
itemBlock2: { //power-up
110110
src: "/images/platformer/sprites/jumppowerup.png", //spritesheet
111111
sizeRatio: 0.000000001,
@@ -118,6 +118,7 @@ const assets = {
118118
hitbox: { widthPercentage: 0, heightPercentage: 0 }
119119
120120
},
121+
*/
121122
},
122123
backgrounds: {
123124
boss: { src: "/images/platformer/backgrounds/BossBackground.png", parallaxSpeed: 0.4, moveOnKeyAction: true },
@@ -510,7 +511,7 @@ const assets = {
510511
{ name: 'blocks', id: 'jumpPlatform', class: BlockPlatform, data: assets.platforms.sand, xPercentage: 0.7, yPercentage: 0.84 },
511512
{ name: 'blocks', id: 'jumpPlatform', class: BlockPlatform, data: assets.platforms.sand, xPercentage: 0.3, yPercentage: 0.4 },
512513
///{ name: 'coin', id: 'coin', class: Coin, data: assets.obstacles.vbucks, xPercentage: 0.475, yPercentage: 0.5 },
513-
{ name: 'itemBlock2', id: 'jumpPlatform', class: JumpPlatform2, data: assets.platforms.itemBlock2, xPercentage: 0.56, yPercentage: 0.8 }, //item block is a platform
514+
// { name: 'itemBlock2', id: 'jumpPlatform', class: JumpPlatform2, data: assets.platforms.itemBlock2, xPercentage: 0.56, yPercentage: 0.8 }, //item block is a platform
514515
//{ name: 'itemBlock2', id: 'jumpPlatform', class: BlockPlatform, data: assets.platforms.itemBlock2, xPercentage: 0.56, yPercentage: 0.8 }, //item block is a platform
515516
{ name: 'coin', id: 'coin', class: Coin, data: assets.obstacles.coin, xPercentage: 0.35, yPercentage: 0.85 },
516517
{ name: 'coin', id: 'coin', class: Coin, data: assets.obstacles.coin, xPercentage: 0.3, yPercentage: 0.34 },

assets/js/platformer/PlatformJump2.js

-73
This file was deleted.

assets/js/platformer/PlayerSkibidi.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ export class PlayerSkibidi extends PlayerBaseOneD {
7171
this.handleCollisionEvent("finishline");
7272
this.handleCollisionEvent("SkibidiToilet");
7373
this.handleCollisionEvent("laser");
74-
this.handleCollisionEvent("powerup"); // created a new case where it detects for collision between player and power-up
74+
//this.handleCollisionEvent("powerup"); // created a new case where it detects for collision between player and power-up
7575
}
7676

7777
handleDeath() {

0 commit comments

Comments
 (0)