Merge pull request #128 from Parallaxes/main

Power up FINALLY removed
nighthawkcoders · Feb 14, 2025 · 1528c3e · 1528c3e
2 parents d7e2d05 + 5de7174
commit 1528c3e
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 78 deletions.
diff --git a/assets/js/platformer/GameSetterBossFight.js b/assets/js/platformer/GameSetterBossFight.js
@@ -1,7 +1,7 @@
 import Background from './Background.js'
 import BackgroundTransitions from './BackgroundTransitions.js';
 import Platform from './Platform.js';
-import JumpPlatform2 from './PlatformJump2.js';
+//import JumpPlatform2 from './PlatformJump2.js';
 import BlockPlatform from './BlockPlatform.js';
 import Coin from './Coin.js';
 import skibidiTitan from './SkibidiTitan.js';

diff --git a/assets/js/platformer/GameSetterSkibidi.js b/assets/js/platformer/GameSetterSkibidi.js
@@ -1,7 +1,7 @@
 import Background from './Background.js'
 import BackgroundTransitions from './BackgroundTransitions.js';
 import Platform from './Platform.js';
-import JumpPlatform2 from './PlatformJump2.js';
+//import JumpPlatform2 from './PlatformJump2.js';
 import BlockPlatform from './BlockPlatform.js';
 import Coin from './Coin.js';
 import skibidiTitan from './SkibidiTitan.js';
@@ -105,7 +105,7 @@ const assets = {
       island: { src: "/images/platformer/platforms/island.png" },
       block: { src: "/images/platformer/platforms/brick_block.png" }, //MAY need 3 new variables: sizeRatio, widthRatio, and heightRatio
 
-
+  /*
       itemBlock2: { //power-up
         src: "/images/platformer/sprites/jumppowerup.png", //spritesheet
         sizeRatio: 0.000000001, 
@@ -118,6 +118,7 @@ const assets = {
         hitbox: { widthPercentage: 0, heightPercentage: 0 }
 
       },
+      */
     },
     backgrounds: {
       boss: { src: "/images/platformer/backgrounds/BossBackground.png", parallaxSpeed: 0.4, moveOnKeyAction: true },
@@ -510,7 +511,7 @@ const assets = {
     { name: 'blocks', id: 'jumpPlatform', class: BlockPlatform, data: assets.platforms.sand, xPercentage: 0.7, yPercentage: 0.84 },
     { name: 'blocks', id: 'jumpPlatform', class: BlockPlatform, data: assets.platforms.sand, xPercentage: 0.3, yPercentage: 0.4 },
     ///{ name: 'coin', id: 'coin', class: Coin, data: assets.obstacles.vbucks, xPercentage: 0.475, yPercentage: 0.5 },
-    { name: 'itemBlock2', id: 'jumpPlatform', class: JumpPlatform2, data: assets.platforms.itemBlock2, xPercentage: 0.56, yPercentage: 0.8 }, //item block is a platform
+   // { name: 'itemBlock2', id: 'jumpPlatform', class: JumpPlatform2, data: assets.platforms.itemBlock2, xPercentage: 0.56, yPercentage: 0.8 }, //item block is a platform
     //{ name: 'itemBlock2', id: 'jumpPlatform', class: BlockPlatform, data: assets.platforms.itemBlock2, xPercentage: 0.56, yPercentage: 0.8 }, //item block is a platform
     { name: 'coin', id: 'coin', class: Coin, data: assets.obstacles.coin, xPercentage: 0.35, yPercentage: 0.85 },
     { name: 'coin', id: 'coin', class: Coin, data: assets.obstacles.coin, xPercentage: 0.3, yPercentage: 0.34 },

diff --git a/assets/js/platformer/PlatformJump2.js b/assets/js/platformer/PlatformJump2.js
diff --git a/assets/js/platformer/PlayerSkibidi.js b/assets/js/platformer/PlayerSkibidi.js
@@ -71,7 +71,7 @@ export class PlayerSkibidi extends PlayerBaseOneD {
         this.handleCollisionEvent("finishline");
         this.handleCollisionEvent("SkibidiToilet");
         this.handleCollisionEvent("laser");
-        this.handleCollisionEvent("powerup"); // created a new case where it detects for collision between player and power-up
+        //this.handleCollisionEvent("powerup"); // created a new case where it detects for collision between player and power-up
     } 
 
     handleDeath() {