fixed bugs

fauwara · May 11, 2022 · 14087db · 14087db
1 parent e0e2ad3
commit 14087db
Show file tree

Hide file tree

Showing 10 changed files with 541 additions and 2,220 deletions.
diff --git a/game/js/bootGame.js b/game/js/bootGame.js
@@ -1,11 +1,10 @@
 class bootGame extends Phaser.Scene {
+
 	constructor() {
 		super("bootGame");
 	}
 
 	preload() {
-		// html to get user input
-		// this.load.html('nameform', 'game/assets/user-input.html');
 		//images
 		// main menu images
 		this.load.image("title", "game/assets/title.png");
@@ -15,7 +14,7 @@ class bootGame extends Phaser.Scene {
 		// game images
 		this.load.image("bg", "game/assets/bg.png");
 		this.load.image("player", "game/assets/samurai.png");
-		//sprites
+		// game sprites
 		this.load.spritesheet("ghost", "game/assets/ghost-sprite.png", {
 			//ghosts
 			frameWidth: 75,
@@ -26,27 +25,11 @@ class bootGame extends Phaser.Scene {
 			frameWidth: 22,
 			frameHeight: 22,
 		});
-
-		// audio
-		// this.load.audio("roblox-death-audio", "src/assets/roblox-death.mp3"); // "src/assets/roblox-death.ogg",
 	}
 
 	create() {
 
-		///////////////////////////////////////// create animations
-		////////////// main menu animations
-		// play button
-		this.anims.create({
-			key: "play",
-			frames: this.anims.generateFrameNumbers("play", {
-				start: 0,
-				end: 1,
-			}),
-			frameRate: 5,
-			repeat: -1,
-		});
-
-		// this.add.text(20, 20, "Loading Game...");
+		// animations
 		this.anims.create({
 			key: "candy_beam",
 			frames: this.anims.generateFrameNumbers("candy", {
@@ -56,6 +39,7 @@ class bootGame extends Phaser.Scene {
 			frameRate: 5,
 			repeat: -1,
 		});
+
 		// ghost walk animation
 		this.anims.create({
 			key: "ghost_walk",
@@ -67,8 +51,6 @@ class bootGame extends Phaser.Scene {
 			repeat: -1,
 		});
 
-		// this.deathSound = this.sound.add("roblox-death-audio");
-
 		this.scene.start("mainMenu");
 	}
 }
diff --git a/game/js/console-messages.js b/game/js/console-messages.js
@@ -1,4 +1,5 @@
 console.log(" Hows the music? \n\n                          .\n                          |\ \n                         _j    .___,\n                        (_j    |---|\n                              _|   |\n                     .____.  (_j  _|\n                     |.--.| .    (_J\n                     |l__j|  .\n                     |+ oo| .\n                     l____j\n\n");
+
 // *                       _____
 // *                    __/_ ///
 // *                   / _/    \

diff --git a/game/js/endScene.js b/game/js/endScene.js
@@ -25,6 +25,7 @@ class endScene extends Phaser.Scene {
 				"Content-type": "application/json; charset=UTF-8"
 			}
 		})
+
 		.then(res => res.json())
 		.then(json => console.log(json));
 
@@ -33,7 +34,7 @@ class endScene extends Phaser.Scene {
 		playButton.setInteractive();
 
 		playButton.on('pointerdown', () => {
-			this.scene.start("mainGame");
+			this.scene.start("stage1");
 		});
 	}
 }
diff --git a/game/js/game.js b/game/js/game.js
@@ -2,7 +2,7 @@ var config = {
 	type: Phaser.AUTO,
 	width: 1200,
 	height: 675,
-	scene: [bootGame, mainMenu, mainGame, endScene],
+	scene: [bootGame, mainMenu, stage1, stage2, endScene],
 	pixelArt: true,
 	dom: {
         createContainer: true
@@ -16,13 +16,7 @@ var config = {
 	},
 };
 
-var player; //player
-var playerSpeed = 200;
 var distance;
-var target = new Phaser.Math.Vector2();
 var candyTarget = new Phaser.Math.Vector2();
 
-// actually need these ig
-// var userId;
-
 var game = new Phaser.Game(config);
diff --git a/game/js/mainGame.js b/game/js/mainGame.js
diff --git a/game/js/mainMenu.js b/game/js/mainMenu.js
@@ -3,64 +3,25 @@ class mainMenu extends Phaser.Scene {
 		super("mainMenu");
 	}
 
-    preload() {
-        this.load.html('nameform', 'game/assets/user-input.html');
-    }
+	preload() {
+		this.load.html('nameform', 'game/assets/user-input.html');
+	}
 
 	create() {
-		// this.add.text(20, 20, "Loading Game...");
-		// let playButton = this.physics.add.image(config.width/2, config.height/2, "player");
-
-		// game title
-        this.add.image(600, 200, 'title');
-
-        // user input
-        var element = this.add.dom(600, 330).createFromCache('nameform');
 
-        let htplay = this.add.image(400, 430, 'htplay').setInteractive();
+		// game title
+		this.add.image(600, 200, 'title');
+
+		// user input
+		var element = this.add.dom(600, 330).createFromCache('nameform');
+
+		let htplay = this.add.image(400, 430, 'htplay').setInteractive();
 		let play = this.add.image(600, 430, 'play').setInteractive();
 		let leaderboard = this.add.image(800, 430, 'trophy').setInteractive();
-		
+
 		play.on('pointerdown', () => {
-            var userId = element.getChildByName('user-id');
-			this.scene.start("mainGame", {name: userId.value, score: 0});
+			var userId = element.getChildByName('user-id');
+			this.scene.start("stage1", { name: userId.value, score: 0 });
 		});
-
-		// element.setPerspective(800);
-    	// element.addListener('click');
-
- 	//    element.on('click', function (event) {
-
-    //     if (event.target.name === 'playButton')
-    //     {
-    //         var inputText = this.getChildByName('nameField');
-
-    //         //  Have they entered anything?
-    //         if (inputText.value !== '')
-    //         {
-    //             //  Turn off the click events
-    //             this.removeListener('click');
-
-    //             //  Hide the login element
-    //             this.setVisible(false);
-
-    //             //  Populate the text with whatever they typed in
-    //             text.setText('Welcome ' + inputText.value);
-    //         }
-    //         else
-    //         {
-    //             //  Flash the prompt
-    //             this.scene.tweens.add({
-    //                 targets: text,
-    //                 alpha: 0.2,
-    //                 duration: 250,
-    //                 ease: 'Power3',
-    //                 yoyo: true
-    //             });
-    //                     }
-    //     }
-
-    // });
-
 	}
 }