Merge pull request #115 from casonpollak/VeErA

Update hills

Author: Parallaxes

assets/js/platformer/GameEnv.js

@@ -95,6 +95,8 @@ export class GameEnv {
 
     static claimedCoinIds = []
 
+    static trashCount = []
+
 
     // Make the constructor throws an error, or effectively make it a private constructor.
     constructor() {

assets/js/platformer/GameSetterHills.js

@@ -20,8 +20,6 @@ const assets = {
       height: 81, //125
       scaleSize: 100,
       },
-      trash: { src: "/images/platformer/trash.png" },
-      trashCan: { src: "/images/platformer/trashbin.png" },
       coin: { src: "/images/platformer/obstacles/coin.png" },
     },
     platforms: {
@@ -144,10 +142,6 @@ const assets = {
     { name: 'coin', id: 'coin', class: Coin, data: assets.obstacles.coin, xPercentage: 0.34, yPercentage: 0.69},
     { name: 'coin', id: 'coin', class: Coin, data: assets.obstacles.coin, xPercentage: 0.31, yPercentage: 0.27},   
     { name: 'coin', id: 'coin', class: Coin, data: assets.obstacles.coin, xPercentage: 0.5, yPercentage: 0.27},   
-    { name: 'trash', id: 'coin', class: Coin, data: assets.obstacles.trash, xPercentage: 0.05, yPercentage: 0.4},
-    { name: 'trash', id: 'coin', class: Coin, data: assets.obstacles.trash, xPercentage: 0.55, yPercentage: 0.3},
-    { name: 'trash', id: 'coin', class: Coin, data: assets.obstacles.trash, xPercentage: 0.2, yPercentage: 0.69},
-    { name: 'trash', id: 'coin', class: Coin, data: assets.obstacles.trash, xPercentage: 0.33, yPercentage: 0.6},
     { name: 'mario', id: 'player', class: PlayerHills, data: assets.players.mario },
     { name: 'tube', id: 'finishline', class: FinishLine, data: assets.obstacles.tube, xPercentage: 0.85, yPercentage: 0.85 },
     { name: 'loading', id: 'background', class: BackgroundTransitions, data: assets.transitions.loading },

assets/js/platformer/GameSetterWinter.js

@@ -7,7 +7,7 @@ import BackgroundSnow from './BackgroundSnow.js';
 import Platform from './Platform.js';
 import PlayerWinter from './PlayerWinter.js';
 import BlockPlatform from './BlockPlatform.js';
-import Coin from './Coin.js';
+import Trash from './Trash.js'
 import Owl from './FlyingOwl.js';
 import Snowman from './EnemySnowman.js';
 import FinishLine from './FinishLine.js';
@@ -26,7 +26,6 @@ const assets = {
       height: 320,
       scaleSize: 50,
       },
-    trashCan: { src: "/images/platformer/trashbin.png" },
     tubeU: { src: "/images/platformer/obstacles/blue-tube-up.png",
     hitbox: { widthPercentage: 0.5, heightPercentage: 0.5},
     width: 300,
@@ -480,11 +479,10 @@ const assets = {
     { name: 'blocks', id: 'jumpPlatform', class: BlockPlatform, data: assets.platforms.boxendright_rotated, xPercentage: 0.755, yPercentage: 0.84 },
     { name: 'blocks', id: 'jumpPlatform', class: BlockPlatform, data: assets.platforms.boxendright_rotated, xPercentage: 0.625, yPercentage: 0.92 },
     { name: 'blocks', id: 'jumpPlatform', class: BlockPlatform, data: assets.platforms.boxendleft_rotated, xPercentage: 0.625, yPercentage: 1 },
-    { name: 'trash', id: 'coin', class: FinishLine, data: assets.obstacles.trash, xPercentage: 0.4, yPercentage: 0.5},
-    { name: 'trash', id: 'coin', class: FinishLine, data: assets.obstacles.trash, xPercentage: 0.63, yPercentage: 0.48},
-    { name: 'trash', id: 'coin', class: FinishLine, data: assets.obstacles.trash, xPercentage: 0.21, yPercentage: 0.6},
-    { name: 'trash', id: 'coin', class: FinishLine, data: assets.obstacles.trash, xPercentage: 0.32, yPercentage: 0.6},
-    { name: 'trashBin', id: 'coin', class: FinishLine, data: assets.obstacles.trashCan, xPercentage: 0.71, yPercentage: 0.6},
+    { name: 'trash', id: 'trash', class: Trash, data: assets.obstacles.trash, xPercentage: 0.4, yPercentage: 0.5},
+    { name: 'trash', id: 'trash', class: Trash, data: assets.obstacles.trash, xPercentage: 0.63, yPercentage: 0.58},
+    { name: 'trash', id: 'trash', class: Trash, data: assets.obstacles.trash, xPercentage: 0.21, yPercentage: 0.6},
+    { name: 'trash', id: 'trash', class: Trash, data: assets.obstacles.trash, xPercentage: 0.32, yPercentage: 0.6},
     { name: 'owl', id: 'owl', class: Owl, data: assets.enemies.Owl, xPercentage: 0.3, minPosition: 0.05 },
     { name: 'owl', id: 'owl', class: Owl, data: assets.enemies.Owl, xPercentage: 0.8, minPosition: 0.05 },
     { name: 'caveman', id: 'snowman', class: Snowman, data: assets.enemies.Snowman, xPercentage: 0.2, minPosition: 0.1, difficulties: ["normal", "hard", "impossible"] },

assets/js/platformer/PlayerWinter.js

@@ -93,6 +93,14 @@ export class PlayerWinter extends PlayerBase {
                 }
                 break;
             case "finishline":
+                // Check if the player has collected all of the trash
+                if(GameEnv.trashCount.length < 4) {
+                    alert("Hey! If you don't clean up after yourself, you will never be able to leave! HAHAHA!")
+                    this.setX(0)
+                    this.setY(500)
+                    this.state.animation = 'idle'
+                    break
+                } 
                 // Check if the player has collected all the coins
                 var collectedAllCoins = true;
                 for (let obj of GameEnv.gameObjects) {
@@ -103,6 +111,7 @@ export class PlayerWinter extends PlayerBase {
                         return;
                     }
                 }
+
                 // Continue with finishline collisions checks
 
                 // 1. Caught in finishline
@@ -124,8 +133,6 @@ export class PlayerWinter extends PlayerBase {
                     this.state.movement.left = false;
                     this.state.movement.right = true;
                 }
-                break;
-            case "finishline":
                 this.x = GameEnv.innerWidth + 1;
                 break;
             case "snowman": // Note: Goomba.js and Player.js could be refactored

assets/js/platformer/Trash.js

@@ -0,0 +1,56 @@
+// imports go below
+import GameEnv from './GameEnv.js';
+import Coin from './Coin.js';
+
+export class Trash extends Coin {
+    constructor(canvas, image, data, xPercentage, yPercentage) {
+        super(canvas, image, data, xPercentage, yPercentage);
+        this.x = xPercentage * GameEnv.innerWidth;
+        this.y = yPercentage * GameEnv.bottom;
+        this.size();
+        this.id = this.initiateId()
+        this.scaleSize = data?.scaleSize || 80;
+    }
+    draw() {
+        this.ctx.drawImage(this.image, 0, 0, this.canvas.width, this.canvas.height);
+    }
+    size() {
+        if (this.id) {
+            if (GameEnv.trashCount.includes(this.id)) {
+                this.hide()
+            }
+        }
+        const scaledHeight = GameEnv.innerHeight * (this.scaleSize / 832);
+        const scaledWidth = scaledHeight * this.aspect_ratio;
+        const coinX = this.coinX;
+        const coinY = (GameEnv.bottom - scaledHeight) * this.coinY;
+
+        // Set variables used in Display and Collision algorithms
+        this.bottom = coinY;
+        this.collisionHeight = scaledHeight;
+        this.collisionWidth = scaledWidth;
+
+        this.canvas.width = scaledWidth;
+        this.canvas.height = scaledHeight;
+        this.canvas.style.width = `${scaledWidth}px`;
+        this.canvas.style.height = `${scaledHeight}px`;
+        this.canvas.style.position = 'absolute';
+        this.canvas.style.left = `${coinX}px`;
+        this.canvas.style.top = `${coinY}px`;
+    }
+    collisionAction() {
+        // check player collision
+        if (this.collisionData.touchPoints.other.id === "player") {
+            if (this.id) {
+                GameEnv.trashCount.push(this.id)
+            }
+           // this is how you find the index of the coin - GameEnv.gameObjects.findIndex(coin => coin.id === this.id)
+            this.destroy();
+
+            GameEnv.playSound("coin");
+
+            
+        }
+    }
+}
+export default Trash;