Merge pull request #121 from Parallaxes/main

Parallaxes · web-flow · commit d19c1798af10 · 2025-02-11T13:48:25.000-08:00
Can't leave until titan is dead
diff --git a/assets/js/platformer/GameEnv.js b/assets/js/platformer/GameEnv.js
@@ -78,6 +78,7 @@ export class GameEnv {
     static bottom;
     static prevBottom;
     static invincible = false;
+    static visible = false;
     static goombaInvincible = false;
     static goombaBounce = false;
     static goombaBounce1 = false;
diff --git a/assets/js/platformer/GameSetterSkibidi.js b/assets/js/platformer/GameSetterSkibidi.js
@@ -104,16 +104,19 @@ const assets = {
       island: { src: "/images/platformer/platforms/island.png" },
       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: 2.0, 
+        sizeRatio: 0.000000001, 
         widthRatio: 1.0,
         heightRatio: 1.0,
-        width: 205, // 205
-        height: 246, // 246
-        scaleSize: 1, // 1
+        width: 0, // 205
+        height: 0, // 246
+        scaleSize: 0, // 1
         speedRatio: 0.7, // framerate, how fast it goes through between displaying each frame or animation
-        hitbox: { widthPercentage: 0.4, heightPercentage: -0.2 }
+        hitbox: { widthPercentage: 0, heightPercentage: 0 }
+
       },
     },
     backgrounds: {
@@ -518,7 +521,7 @@ const assets = {
     { name: 'SkibidiToilet', id: 'SkibidiToilet', class: SkibidiToilet, data: assets.enemies.skibidiToilet, xPercentage:  0.75, minPosition: 0.5 },
     { name: 'escaper', id: 'player', class: PlayerSkibidi, data: assets.players.escaper  },
     { name: 'laser', id: 'Laser', class: Laser, data: assets.obstacles.laser, xPercentage:  0.75, yPercentage: 0.5 },
-    { name: 'tolietfinish', id: 'finishline', class: FinishLine, data: assets.obstacles.toiletfinish, xPercentage: 0.85, yPercentage: 0.77 },
+    { name: 'tolietfinish', id: 'finishline', class: FinishLine, data: assets.obstacles.toiletfinish, xPercentage: 0.85, yPercentage: 0.77, isVisible: false },
     { name: 'complete3', id: 'background', class: BackgroundTransitions,  data: assets.backgrounds.complete3 },
   ];
 
diff --git a/assets/js/platformer/PlayerSkibidi.js b/assets/js/platformer/PlayerSkibidi.js
@@ -1,32 +1,15 @@
 import GameEnv from './GameEnv.js';
 import GameControl from './GameControl.js';
-import PlayerBaseOneD from './PlayerBaseOneD.js'; ///With this you can change the direction of the sprite sheet with just the sprite rows.
+import PlayerBaseOneD from './PlayerBaseOneD.js';
+import SkibidiTitan from './SkibidiTitan.js'; // Import SkibidiTitan
 
-/**
- * @class PlayerSkibidi class
- * @description PlayerSkibidi.js key objective is to eent the user-controlled character in the game.   
- * 
- * The Player class extends the Character class, which in turn extends the GameObject class.
- * Animations and events are activated by key presses, collisions, and gravity.
- * WASD keys are used by user to control The Player object.  
- * 
- * @extends PlayerBase 
- */
-export class PlayerSkibidi extends PlayerBaseOneD { /// Using PlayerBaseOneD added the sprite mirror but deleted the sprite not showing the animations
-
-    /** GameObject instantiation: constructor for PlayerSkibidi object
-     * @extends Character 
-     * @param {HTMLCanvasElement} canvas - The canvas element to draw the player on.
-     * @param {HTMLImageElement} image - The image to draw the player with.
-     * @param {Object} data - The data object containing the player's properties.
-     */
+export class PlayerSkibidi extends PlayerBaseOneD {
     constructor(canvas, image, data) {
         super(canvas, image, data);
         this.invincible = true;
         this.timer = false;
         GameEnv.invincible = false; // Player is NOT invincible
 
-
         this.animationSpeed = data?.animationSpeed;
         this.counter = this.animationSpeed;
         // Goomba variables, deprecate?
@@ -62,7 +45,6 @@ export class PlayerSkibidi extends PlayerBaseOneD { /// Using PlayerBaseOneD add
     
         console.log("New Y Position:", this.y);
     }    
-    
 
     updateFrameX(){
         if (this.frameX < this.maxFrame) {
@@ -90,9 +72,20 @@ export class PlayerSkibidi extends PlayerBaseOneD { /// Using PlayerBaseOneD add
         this.handleCollisionEvent("SkibidiToilet");
         this.handleCollisionEvent("laser");
         this.handleCollisionEvent("powerup"); // created a new case where it detects for collision between player and power-up
+    } 
+    
+    handleDeath() {
+        if (this.state.isDying) {
+            this.canvas.style.transition = "transform 0.5s";
+            this.canvas.style.transform = "rotate(-90deg) translate(-26px, 0%)";
+            GameEnv.playSound("PlayerDeath");
+            setTimeout(async () => {
+                await GameControl.transitionToLevel(GameEnv.levels[GameEnv.levels.indexOf(GameEnv.currentLevel)]);
+            }, 900);
+        }
     }
 
-        handleKeyUp(event) {
+    handleKeyUp(event) {
         const key = event.key;
         if (key in this.pressedKeys) {
             delete this.pressedKeys[key];
@@ -153,6 +146,15 @@ export class PlayerSkibidi extends PlayerBaseOneD { /// Using PlayerBaseOneD add
         // handles additional player reactions
         switch (this.state.collision) {
             case "finishline":
+                const skibidiTitan = GameEnv.gameObjects.find(obj => obj.name === 'skibidiTitan');
+                if (skibidiTitan.currentHp > 0) {
+                    alert("Kill the titan with B buddy, why do you think theres a health bar");
+                    this.setX(0)
+                    this.setY(700)
+                    this.state.animation = 'idle';
+                    break;
+                }   
+
                 // 1. Caught in finishline
                 if (this.collisionData.touchPoints.this.onTopofOther  || this.state.isFinishing ) {
                     // Position player in the center of the finishline 
@@ -175,6 +177,8 @@ export class PlayerSkibidi extends PlayerBaseOneD { /// Using PlayerBaseOneD add
                     this.state.movement.right = true;
                 }
                 break;
+
+    
             case "SkibidiToilet": // Note: Goomba.js and Player.js could be refactored
                 // 1. Player jumps on goomba, interaction with Goomba.js
                 if (this.collisionData.touchPoints.this.top && this.collisionData.touchPoints.other.bottom && this.state.isDying == false) {
@@ -227,6 +231,7 @@ export class PlayerSkibidi extends PlayerBaseOneD { /// Using PlayerBaseOneD add
                 
                 }
                 break;  
+            /*
             case "powerup": 
             if (GameEnv.powerUpCollected) {  
                 console.log("Power-up collision detected! Changing difficulty...");
@@ -246,6 +251,7 @@ export class PlayerSkibidi extends PlayerBaseOneD { /// Using PlayerBaseOneD add
                 GameEnv.update();
                 console.log("Power Up",GameEnv.gameObjects[GameEnv.gameObjects.length - 1]);
                 break;
+            */
         }
 
     }
diff --git a/assets/js/platformer/SkibidiTitan.js b/assets/js/platformer/SkibidiTitan.js
@@ -4,6 +4,8 @@ import GameControl from './GameControl.js';
 import Laser from './Laser.js';
 import Enemy from './Enemy.js';
 import TitanHealth from './TitanHealth.js';
+import GameSetterSkibidi from './GameSetterSkibidi.js';
+import BackgroundTransitions from './BackgroundTransitions.js';
 
 export class skibidiTitan extends Character {
     // Constructor sets up Character object 
@@ -18,10 +20,10 @@ export class skibidiTitan extends Character {
         this.maxPosition = this.x + xPercentage * GameEnv.innerWidth;
 
         // Health properties
-        this.maxHp = 100; // Maximum health points
-        this.currentHp = 100; // Current health points
+        this.maxHp = 200; // Maximum health points
+        this.currentHp = 200; // Current health points
         this.titanHealthBar = new TitanHealth(
-            150, 10, // Width and height of the health bar
+            160, 10, // Width and height of the health bar
             this.canvas.width, this.canvas.height, // Titan dimensions
             this.maxHp, this.currentHp, // Titan's max and current health
             this.x, this.y // Titan's position
@@ -51,10 +53,17 @@ export class skibidiTitan extends Character {
     // Method to handle Titan's death state (makes the Titan disappear)
     handleDeath() {
         if (this.currentHp <= 0 && !this.state.isDead) {
+            this.titanHealthBar = null; // Remove the health bar
             this.state.isDead = true; // Set the Titan as dead
             GameEnv.invincible = true; // Make invincible 
             this.canvas.style.display = "none"; // Hide the Titan's canvas (makes it disappear)
             GameEnv.playSound("goombaDeath"); // Play the death sound
+            //tolietfinish.hitbox.widthPercentage = 0;
+            //tolietfinish.hitbox.heightPercentage = 0;
+        //} else {
+            //tolietfinish.hitbox.widthPercentage = 0.5;
+            //tolietfinish.hitbox.heightPercentage = 0.5;
+        
         }
     }
 
@@ -108,6 +117,8 @@ export class skibidiTitan extends Character {
             );
             this.titanHealthBar.update();
 
+    
+            
             // Laser-related logic
             this.immune = 1;
 
