fix merge conflict

Author: Matthew Wilber

assets/audio/bot_kill.mp3

@@ -45,4 +45,7 @@ const gameConfig = {
     ]
 };
 
+// Set up character selection in local storage
+localStorage.setItem("character", "alpha");
+
 new Phaser.Game(gameConfig);

assets/audio/end_game.wav

@@ -21,9 +21,13 @@ export class GameScene extends Phaser.Scene {
         this.load.image('ground', 'assets/images/ground.png');
         this.load.image('wall', 'assets/images/wall.png');
         this.load.image('platform', 'assets/images/platform.png');
-        this.load.spritesheet('zeta', 
-            'assets/images/zeta_spritesheet_'+this.character.name+'.png',
-            { frameWidth: 40, frameHeight: this.character.height }
+        this.load.spritesheet('zeta_alpha', 
+            'assets/images/zeta_spritesheet_alpha.png',
+            { frameWidth: 40, frameHeight: 66 }
+        );
+        this.load.spritesheet('zeta_beta', 
+            'assets/images/zeta_spritesheet_beta.png',
+            { frameWidth: 40, frameHeight: 60 }
         );
         this.load.spritesheet('door', 
             'assets/images/door.png',
@@ -37,10 +41,20 @@ export class GameScene extends Phaser.Scene {
             'assets/images/protector_spritesheet.png',
             { frameWidth: 50, frameHeight: 50 }
         );
+
+        this.load.audio('aud_end_game', 'assets/audio/end_game.wav');
+        this.load.audio('aud_jump', 'assets/audio/jump.wav');
+        this.load.audio('aud_walk', 'assets/audio/walk.wav');
+        this.load.audio('aud_power_down', 'assets/audio/power_down.wav');
+        this.load.audio('aud_power_up', 'assets/audio/power_up.wav');
+        this.load.audio('aud_success', 'assets/audio/success.mp3');
+        this.load.audio('aud_bot_kill', 'assets/audio/bot_kill.mp3');
     }
 
     create() {
 
+        this.charactername = 'zeta_'+localStorage.getItem("character");
+
         this.botKillCount = 0;
 
         // Add the background image
@@ -49,6 +63,9 @@ export class GameScene extends Phaser.Scene {
         // Set up sprite animations
         this.initAnimation();
 
+        // Set up the sound fx
+        this.createAudio();
+
         // Add a game controller with devault arrow keys
         this.cursors = this.input.keyboard.createCursorKeys();
 
@@ -87,29 +104,44 @@ export class GameScene extends Phaser.Scene {
     update(scenetime) {
 
         if (this.cursors.left.isDown){
+            if(!this.audWalk.isPlaying && this.player.body.touching.down) this.audWalk.play();
             this.player.setVelocityX(-200);
             this.player.anims.play('left', true);
         }else if (this.cursors.right.isDown){
+            if(!this.audWalk.isPlaying && this.player.body.touching.down) this.audWalk.play();
             this.player.setVelocityX(200);
             this.player.anims.play('right', true);
         }else{
+            this.audWalk.stop();
             this.player.setVelocityX(0);
             this.player.anims.play('turn');
         }
 
         if (this.cursors.up.isDown && this.player.body.touching.down){
+            this.audJump.play();
             this.player.setVelocityY(-750);
         }
 
         if( this.botKillCount >= this.botSpawnCount ){
             // All bots destroyed
+            this.audSuccess.play();
             this.botKillCount = 0;
             this.door.setActive(true);
             this.door.anims.play('doorOpen');
         }
 
     }
 
+    createAudio(){
+        this.audEndGame = this.sound.add('aud_end_game');
+        this.audJump = this.sound.add('aud_jump');
+        this.audWalk = this.sound.add('aud_walk');
+        this.audPowerDown = this.sound.add('aud_power_down');
+        this.audPowerUp = this.sound.add('aud_power_up');
+        this.audSuccess = this.sound.add('aud_success');
+        this.audBotKill = this.sound.add('aud_bot_kill');
+    }
+
     createSwitches(){
         let switches = this.physics.add.staticGroup();
 
@@ -148,7 +180,7 @@ export class GameScene extends Phaser.Scene {
     }
 
     createPlayer() {
-        let player = this.physics.add.sprite(400, 450, 'zeta');
+        let player = this.physics.add.sprite(400, 450, this.charactername);
 
         player.setBounce(0.2);
         player.setCollideWorldBounds(true);
@@ -179,8 +211,10 @@ export class GameScene extends Phaser.Scene {
 
     handleCollisionEnemy(player, bot) {
         if(bot.active){
+            this.audEndGame.play();
             this.scene.start('EndScene');
         }else{
+            this.audBotKill.play();
             let tmpbot = this.physics.add.staticSprite(bot.x, bot.y, 'bot');
             tmpbot.anims.play('botAsplode');
             bot.destroy();
@@ -220,6 +254,7 @@ export class GameScene extends Phaser.Scene {
     }
 
     disableBots(){
+        this.audPowerDown.play();
         for( let bot of this.bots.getChildren() ){
             bot.setVelocity(0,0).setActive(false);
         }
@@ -231,6 +266,7 @@ export class GameScene extends Phaser.Scene {
     }
 
     enableBots(){
+        this.audPowerUp.play();
         for( let botSwitch of this.switches.getChildren() ){
             botSwitch.anims.play('switchOn');
             botSwitch.setActive(true);
@@ -242,22 +278,28 @@ export class GameScene extends Phaser.Scene {
     }
 
     initAnimation() {
+
+        // Clear out the zeta anims to allow for character change
+        this.anims.remove('left');
+        this.anims.remove('turn');
+        this.anims.remove('right');
+
         this.anims.create({
             key: 'left',
-            frames: this.anims.generateFrameNumbers('zeta', { start: 0, end: 3 }),
+            frames: this.anims.generateFrameNumbers(this.charactername, { start: 0, end: 3 }),
             frameRate: 20,
             repeat: -1
         });
 
         this.anims.create({
             key: 'turn',
-            frames: [ { key: 'zeta', frame: 4 } ],
+            frames: [ { key: this.charactername, frame: 4 } ],
             frameRate: 20
         });
 
         this.anims.create({
             key: 'right',
-            frames: this.anims.generateFrameNumbers('zeta', { start: 5, end: 8 }),
+            frames: this.anims.generateFrameNumbers(this.charactername, { start: 5, end: 8 }),
             frameRate: 20,
             repeat: -1
         });

assets/audio/intro_jingle.mp3

@@ -9,16 +9,137 @@ export class IntroScene extends Phaser.Scene {
 	}
 
 	preload() {
-        this.load.image('splash', 'assets/images/intro_splash.png');
+        this.load.image('intro_bkg', 'assets/images/intro_splash_bkg.png');
+        this.load.image('intro_title', 'assets/images/intro_splash_title.png');
+        this.load.spritesheet('intro_alpha', 
+            'assets/images/intro_splash_alpha.png',
+            { frameWidth: 208, frameHeight: 483 }
+        );
+        this.load.spritesheet('intro_beta', 
+            'assets/images/intro_splash_beta.png',
+            { frameWidth: 207, frameHeight: 436 }
+        );
+
+        this.load.audio('aud_intro_jingle', 'assets/audio/intro_jingle.mp3');
+        this.load.audio('aud_intro_start', 'assets/audio/intro_start.mp3');
+        this.load.audio('aud_intro_title', 'assets/audio/intro_title.wav');
+        this.load.audio('aud_intro_wooshhit', 'assets/audio/intro_woosh_hit.mp3');
+        this.load.audio('aud_select', 'assets/audio/intro_select.mp3');
+        //this.load.audio('aud_intro_loop','assets/audio/intro_loop.mp3')
     }
 
     create() {
+
+        this.anims.create({
+            key: 'alpha_static',
+            frames: [ { key: 'intro_alpha', frame: 0 } ],
+            frameRate: 20
+        });
+        this.anims.create({
+            key: 'alpha_hilite',
+            frames: [ { key: 'intro_alpha', frame: 1 } ],
+            frameRate: 20
+        });
+        this.anims.create({
+            key: 'beta_static',
+            frames: [ { key: 'intro_beta', frame: 0 } ],
+            frameRate: 20
+        });
+        this.anims.create({
+            key: 'beta_hilite',
+            frames: [ { key: 'intro_beta', frame: 1 } ],
+            frameRate: 20
+        });
+
+        this.audJingle = this.sound.add('aud_intro_jingle');
+        this.audStartGame = this.sound.add('aud_intro_start');
+        this.audSelect = this.sound.add('aud_select');
+        this.audTitle = this.sound.add('aud_intro_title');
+        this.audWooshHit = this.sound.add('aud_intro_wooshhit');
+        //this.audLoop = this.sound.add('aud_intro_loop');
+
         // Add the background image
-        this.splash = this.add.image(400, 300, 'splash');
+        this.bkg = this.add.image(400, 300, 'intro_bkg').setAlpha(0);
+        this.title = this.add.image(400, -300, 'intro_title');
+        this.alpha = this.add.sprite(1200, 358, 'intro_alpha');
+        this.beta = this.add.sprite(-204, 382, 'intro_beta');
+        this.selector = this.add.container();
+
+        this.selector.add(this.alpha);
+        this.selector.add(this.beta);
+
+        var timeline = this.tweens.createTimeline();
+        var timelineb = this.tweens.createTimeline();
+        timeline.add({
+            targets: this.bkg,
+            alpha: 1,
+            ease: 'QuadraticOut',
+            duration: 1000,
+            delay: 0,
+            onStart: ()=>{this.audJingle.play()}
+        });
+        timeline.add({
+            targets: [this.alpha],
+            x: 488,
+            ease: 'QuadraticIn',
+            duration: 250,
+            delay: 0,
+            onStart: ()=>{this.audWooshHit.play()}
+        });
+        timelineb.add({
+            targets: this.beta,
+            x: 324,
+            ease: 'QuadraticIn',
+            duration: 250,
+            delay: 1000
+        });
+        timeline.add({
+            targets: this.title,
+            y: 300,
+            ease: 'Bounce.easeOut',
+            duration: 1000,
+            delay: 0,
+            onStart: ()=>{/*this.audLoop.play('',{loop:true})*/}
+        });
+
+        timeline.play();
+        timelineb.play();
 
-        this.splash.setInteractive().on('pointerdown', () => { 
-            console.log('start game'); 
+        this.alpha.setInteractive();
+        this.beta.setInteractive();
+        
+        this.alpha.on('pointerdown', () => { 
+            this.audStartGame.play();
+            localStorage.setItem("character", "alpha");
+            this.scene.start('Level1');
+        });
+
+        this.beta.on('pointerdown', () => { 
+            this.audStartGame.play();
+            localStorage.setItem("character", "beta");
             this.scene.start('Level1');
+            
         });
+
+        this.alpha.on('pointerover', () => { 
+            this.audSelect.play();
+            this.selector.bringToTop(this.alpha);
+            this.alpha.anims.play('alpha_hilite');
+        }, this);
+
+        this.alpha.on('pointerout', () => { 
+            this.alpha.anims.play('alpha_static');
+        }, this);
+
+        this.beta.on('pointerover', () => { 
+            this.audSelect.play();
+            this.selector.bringToTop(this.beta);
+            this.beta.anims.play('beta_hilite');
+        }, this);
+
+        this.beta.on('pointerout', () => { 
+            this.beta.anims.play('beta_static');
+        }, this);
+
     }
 }