merged

nicoella · Sep 18, 2022 · 8eae373 · 8eae373
2 parents 4518c50 + fb93308
commit 8eae373
Show file tree

Hide file tree

Showing 5 changed files with 96 additions and 31 deletions.
diff --git a/dfsdf b/dfsdf
@@ -0,0 +1,23 @@
+[33mb59cfa8[m[33m ([m[1;36mHEAD -> [m[1;32mgames3[m[33m, [m[1;31morigin/games3[m[33m)[m merged with games
+[33m26e2acb[m[33m ([m[1;31morigin/games[m[33m)[m firebase for bullets
+[33m440d0b0[m spawn locations
+[33mf46b50d[m merged
+[33m1ee53fd[m[33m ([m[1;32mgames[m[33m)[m meow
+[33m76d9437[m sdf
+[33m149a0a0[m added aim shooting
+[33mbf79487[m added health bars
+[33md460f1b[m[33m ([m[1;32mgames2[m[33m)[m fixed duplicate
+[33m80e74d4[m[33m ([m[1;31morigin/games2[m[33m)[m woeds
+[33m1225894[m  z_
+[33mca732f8[m edit
+[33m8ed2173[m d
+[33md69e111[m[33m ([m[1;31morigin/lobby[m[33m)[m finished lobby
+[33m882ee48[m[33m ([m[1;31morigin/main[m[33m, [m[1;31morigin/HEAD[m[33m, [m[1;32mmain[m[33m)[m Merge pull request #2 from astrocat879/codes2
+[33m1b78505[m[33m ([m[1;31morigin/codes2[m[33m, [m[1;32mcodes2[m[33m)[m merged with codes
+[33mb8b53aa[m[33m ([m[1;31morigin/game[m[33m, [m[1;31morigin/codes[m[33m, [m[1;32mcodes[m[33m)[m fixed game codes
+[33m133584b[m ss
+[33m9a28ed5[m codes
+[33me2d0683[m[33m ([m[1;32mbrrrrrrrr[m[33m)[m lobby and main menu
+[33m7fd74f6[m added stufff
+[33mdc1d189[m setup
+[33m46d8418[m Initial commit
diff --git a/dist/assets/you-lose.png b/dist/assets/you-lose.png
diff --git a/dist/assets/you-win.png b/dist/assets/you-win.png
diff --git a/dist/bundle.js b/dist/bundle.js
diff --git a/src/game.js b/src/game.js
@@ -74,7 +74,6 @@ class Game extends Phaser.Scene {
         this.firebaseApp = initializeApp(FBconfig);
         this.db = getDatabase(this.firebaseApp);
         this.playerData = {};
-        this.playerData = [];
         this.prevShoot = -100;
         this.bulletImgs = {};
         this.character;
@@ -121,6 +120,8 @@ class Game extends Phaser.Scene {
             'assets/wind-right.png',
             { frameWidth: 68, frameHeight: 36 }
         );
+        this.load.image('you-win','assets/you-win.png');
+        this.load.image('you-lose','assets/you-lose.png');
         this.load.spritesheet('tabby', 
             'assets/cat-tabby.png',
             { frameWidth: 52, frameHeight: 48 }
@@ -167,7 +168,13 @@ class Game extends Phaser.Scene {
         this.player.body.setGravityY(700);
         this.player.setCollideWorldBounds(true);
 
-        this.playerHealth = new HealthBar(this, 46, 107);
+        if (this.playerCount == 1){
+            this.playerHealth = new HealthBar(this, 46, 107);
+        }
+        else{
+            this.playerHealth = new HealthBar(this, 706, 107);
+        }
+
 
         this.anims.create({
             key: 'wind-left',
@@ -294,10 +301,43 @@ class Game extends Phaser.Scene {
         // FIrebase player stuff
 
         const allPlayersRef = ref(this.db, `${this.gameCode}/players`);
+
+        onChildAdded(allPlayersRef, (snapshot) => { // draw all the other players
+            const addedPlayer = snapshot.val();
+            if(addedPlayer.playerCount==1) this.add.image(70,70,addedPlayer.character);
+            else this.add.image(730,70,addedPlayer.character);
+            if (addedPlayer.id != this.playerNumber){
+                console.log("ON CHILD ADDED");
+                console.log(addedPlayer.id);
+                var newChar = this.physics.add.sprite(addedPlayer.x, addedPlayer.y, addedPlayer.character);
+                this.physics.add.collider(newChar, this.platforms);
+                this.physics.add.collider(newChar, this.drawnPlatform);
+                newChar.setBounce(0.2);
+                newChar.body.setGravityY(700);
+                if (this.playerCount == 1){
+                    newChar.otherplayerHealth = new HealthBar(this, 706, 107);
+                }
+                else{
+                    newChar.otherplayerHealth = new HealthBar(this, 46, 107);
+                }
+                // newChar.otherplayerHealth = new HealthBar(this, 706, 107);
+                newChar.id = addedPlayer.id;
+                newChar.x = addedPlayer.x;
+                newChar.y = addedPlayer.y;
+                this.playerData[addedPlayer.id] = newChar;
+                this.otherPlayer = addedPlayer.id;
+            }
+            // var par = document.getElementById("box");
+            // var bt = document.createElement("button");
+            // bt.textContent = addedPlayer.x;
+            // par.appendChild(bt);
+        });
+
         onValue(allPlayersRef, (snapshot) => {  // update location of all the other players
             this.players = snapshot.val() || {};
             Object.keys(this.players).forEach(characterKey => {
                 if (characterKey != this.playerNumber){
+                    console.log("ON VALUE");
                     const updatedPlayer = this.players[characterKey];
                     const curPlayer = this.playerData[characterKey];
                     curPlayer.x = updatedPlayer.x;
@@ -306,10 +346,17 @@ class Game extends Phaser.Scene {
                     curPlayer.body.velocity.y = 0;
                     curPlayer.x = updatedPlayer.x;
                     curPlayer.y = updatedPlayer.y;
+                    curPlayer.otherplayerHealth.value = updatedPlayer.health;
+                    curPlayer.otherplayerHealth.draw();
                     curPlayer.anims.play(updatedPlayer.animation, true);
+
+                    if (curPlayer.otherplayerHealth.value === 0){
+                        this.add.image(400,100,'you-win').setOrigin(0.5).setScale(1.5);
+                        this.scene.pause();
+                    }
                 }
             })
-        })
+        });
 
         onChildChanged(ref(this.db,`${this.gameCode}/players`), (snapshot) => {
             const player = snapshot.val();
@@ -360,41 +407,27 @@ class Game extends Phaser.Scene {
                         console.log(bullet.id);
                         console.log(this.gameCode);
 
+                        var res = this.playerHealth.decrease(10);
+
+                        // console.log("healhtvalue : "+ this.otherplayerNumber + " "+ this.playerData[this.otherPlayer].otherplayerHealth.value);
+
                         set(ref(getDatabase(initializeApp(FBconfig)), `${this.gameCode}/bullets/${bullet.id}`), {
                             x: bullet.x,
                             y: bullet.y,
                             id: bullet.id,
                             status: false,
                             owner:bullet.owner
                         });
+                        update(this.uref, {health: this.playerHealth.value});
+
+                        if (res == true){
+                            this.add.image(400,100,'you-lose').setOrigin(0.5).setScale(1.5);
+                            this.scene.pause();
+                        }
                     }
                 }
             }
-        })
-
-        onChildAdded(allPlayersRef, (snapshot) => { // draw all the other players
-            const addedPlayer = snapshot.val();
-            if(addedPlayer.playerCount==1) this.add.image(70,70,addedPlayer.character);
-            else this.add.image(730,70,addedPlayer.character);
-            if (addedPlayer.id != this.playerNumber){
-                console.log(addedPlayer.id);
-                var newChar = this.physics.add.sprite(addedPlayer.x, addedPlayer.y, addedPlayer.character);
-                this.physics.add.collider(newChar, this.platforms);
-                this.physics.add.collider(newChar, this.drawnPlatform);
-                newChar.setBounce(0.2);
-                newChar.body.setGravityY(700);
-                newChar.playerHealth = new HealthBar(this, 706, 107);
-                newChar.id = addedPlayer.id;
-                newChar.x = addedPlayer.x;
-                newChar.y = addedPlayer.y;
-                this.playerData[addedPlayer.id] = newChar;
-                this.otherPlayer = addedPlayer.id;
-            }
-            // var par = document.getElementById("box");
-            // var bt = document.createElement("button");
-            // bt.textContent = addedPlayer.x;
-            // par.appendChild(bt);
-        })
+        });
 
         // Bullet Class
         var Bullet = new Phaser.Class({
@@ -441,6 +474,7 @@ class Game extends Phaser.Scene {
                         if(key=='status') status = data.val()[key];
                     }
                 });
+                // console.log(status);
                 if(this.gameCode && status) {
                     set(ref(getDatabase(initializeApp(FBconfig)), `${this.gameCode}/bullets/${this.id}`), {
                         x: this.x,
@@ -478,11 +512,20 @@ class Game extends Phaser.Scene {
             var otherHealth = this.playerData[this.otherPlayer].health - 5;
             update(ref(getDatabase(initializeApp(FBconfig)), `${this.gameCode}/players/${this.otherPlayer}`), { health: otherHealth });
         }*/
+
+        function g (a, b) {
+            a.setActive(false);
+            a.setVisible(false);
+        }
+
         this.physics.add.overlap(this.bullets, this.platforms, f, null, this);
         //this.physics.add.overlap(this.bullets, this.players[this.otherPlayer], g, null, this);
 
         this.physics.add.collider(this.bullets, this.platforms);
         //this.physics.add.collider(this.bullets, this.players[this.otherPlayer]);
+
+        this.physics.add.overlap(this.bullets, this.playerData[this.otherPlayer], g, null, this);
+        this.physics.add.collider(this.bullets, this.playerData[this.otherPlayer]);
     }
 
     update (){
@@ -599,14 +642,13 @@ class Game extends Phaser.Scene {
         // update ur position in firebase
         if (Math.round(this.player.x) != this.previousX || Math.round(this.player.y) != this.previousY || this.player.anims.currentAnim.key != this.prevAnim) {
             this.uref = ref(this.db, `${this.gameCode}/players/${this.playerNumber}`);
-            set(this.uref, {
+            update(this.uref, {
                 id: this.playerNumber,
                 playerCount: this.playerCount,
                 character: this.playerChar,
                 x: Math.round(this.player.x),
                 y: Math.floor(this.player.y),
                 animation: this.player.anims.currentAnim.key,
-                health: this.playerHealth.value
             })
         }
         this.previousX = Math.round(this.player.x);