Merge pull request #129 from casonpollak/VeErA

change caveman sprite for winter level - veera kalakota

Author: Parallaxes

assets/js/platformer/GameSetterWinter.js

@@ -310,9 +310,9 @@ const assets = {
       hitbox: { widthPercentage: 0.0, heightPercentage: 0.2 }
     },
     Snowman: {
-      src: "/images/platformer/caveman.png",
-      width: 308,
-      height: 327,
+      src: "/images/platformer/sprites/goomba.png",
+      width: 228,
+      height: 177,
       scaleSize: 60,
       speedRatio: 0.7,
       xPercentage: 0.6,
@@ -477,7 +477,7 @@ const assets = {
     { name: 'blocks', id: 'jumpPlatform', class: BlockPlatform, data: assets.platforms.boxendright, xPercentage: 0.789, yPercentage: 0.73 },
     { name: 'trash', id: 'trash', class: Trash, data: assets.obstacles.trash, xPercentage: 0.0632, yPercentage: 0.31},
     { name: 'trash', id: 'trash', class: Trash, data: assets.obstacles.trash, xPercentage: 0.36, yPercentage: 0.63},
-    { name: 'trash', id: 'trash', class: Trash, data: assets.obstacles.trash, xPercentage: 0.565, yPercentage: 0.42},
+    { name: 'trash', id: 'trash', class: Trash, data: assets.obstacles.trash, xPercentage: 0.565, yPercentage: 0.4},
     { name: 'trash', id: 'trash', class: Trash, data: assets.obstacles.trash, xPercentage: 0.72, yPercentage: 0.58},
     { 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 },

assets/js/platformer/PlayerGreece.js

@@ -111,25 +111,25 @@ export class PlayerGreece extends PlayerBase {
                     GameControl.transitionToLevel(GameEnv.levels[index]);
                     break;
                 }
-                console.log("finish line checks")
-                console.log(GameEnv.gameObjects)
-                var collectedCoin
-                if (collectedCoin == false){
-                    for (let obj of GameEnv.gameObjects) {
-                        console.log(obj.jsonifiedElement.id)
-                        if (obj.jsonifiedElement.id === "coin") {
-                            collectedCoin = false
-                            console.log("coin not collected not advancing to next lvl")
-                            return;
-                        }
-                }
-                  } 
-                  collectedCoin = true
-                  console.log("player has item to exit lvl")
-                // Transition to the next level when touching the flag
-                const index = GameEnv.levels.findIndex(level => level.tag === "Water")
-                GameControl.transitionToLevel(GameEnv.levels[index]);
-              //above code were you transition levels is broken and crashes the game when ran
+            //     console.log("finish line checks")
+            //     console.log(GameEnv.gameObjects)
+            //     var collectedCoin
+            //     if (collectedCoin == false){
+            //         for (let obj of GameEnv.gameObjects) {
+            //             console.log(obj.jsonifiedElement.id)
+            //             if (obj.jsonifiedElement.id === "coin") {
+            //                 collectedCoin = false
+            //                 console.log("coin not collected not advancing to next lvl")
+            //                 return;
+            //             }
+            //     }
+            //       } 
+            //       collectedCoin = true
+            //       console.log("player has item to exit lvl")
+            //     // Transition to the next level when touching the flag
+            //     const index = GameEnv.levels.findIndex(level => level.tag === "Quidditch")
+            //     GameControl.transitionToLevel(GameEnv.levels[index]);
+            //   //above code were you transition levels is broken and crashes the game when ran
                 break;
             case "cerberus": // Note: Goomba.js and Player.js could be refactored
                 // 1. Player jumps on goomba, interaction with Goomba.js

assets/js/platformer/PlayerWinter.js

@@ -135,11 +135,13 @@ export class PlayerWinter extends PlayerBase {
                     this.state.movement.left = false;
                     this.state.movement.right = true;
                 }
-                this.canvasHeight = this.canvasHeight * 0.8
-                this.canvasWidth = this.canvasWidth * 0.8
-                GameEnv.customTimeout(() => {
-                    this.x = GameEnv.innerWidth + 1; // handles alert to next level
-                }, 2000);
+                this.x = this.collisionData.newX;
+                this.canvas.style.zIndex = '20'
+                this.canvasHeight = this.canvasHeight * 0.9
+                this.canvasWidth = this.canvasWidth * 0.9
+                setTimeout(() => {
+                    GameControl.transitionToLevel(GameEnv.levels[GameEnv.levels.indexOf(GameEnv.currentLevel) + 1]);
+                }, 1000);
                 break;
             case "snowman": // Note: Goomba.js and Player.js could be refactored
                 // 1. Player jumps on goomba, interaction with Goomba.js