In progress changes for attacking and enemy spawning

jebarpg · jebarpg · commit 6431e5a5cdaa · 2025-10-10T20:46:32.000-07:00
diff --git a/client/components/cursors.js b/client/components/cursors.js
@@ -3,6 +3,13 @@ export default class Cursors {
     this.channel = channel
     this.cursors = scene.input.keyboard.createCursorKeys()
 
+    this.keys = scene.input.keyboard.addKeys({
+            w: Phaser.Input.Keyboard.KeyCodes.W,
+            a: Phaser.Input.Keyboard.KeyCodes.A,
+            s: Phaser.Input.Keyboard.KeyCodes.S,
+            d: Phaser.Input.Keyboard.KeyCodes.D
+        });
+
     scene.events.on('update', this.update, this)
   }
 
@@ -14,18 +21,18 @@ export default class Cursors {
       down: false,
       none: true
     }
-    if (this.cursors.left.isDown) {
+    if (this.cursors.left.isDown || this.keys.a.isDown) {
       move.left = true
       move.none = false
-    } else if (this.cursors.right.isDown) {
+    } else if (this.cursors.right.isDown || this.keys.d.isDown) {
       move.right = true
       move.none = false
     }
 
-    if (this.cursors.up.isDown) {
+    if (this.cursors.up.isDown || this.keys.w.isDown) {
       move.up = true
       move.none = false
-    } else if (this.cursors.down.isDown) {
+    } else if (this.cursors.down.isDown || this.keys.s.isDown) {
       move.down = true
       move.none = false
     }
diff --git a/client/scenes/gameScene.js b/client/scenes/gameScene.js
@@ -32,18 +32,45 @@ export default class GameScene extends Scene {
     new Cursors(this, this.channel)
     new Controls(this, this.channel)
 
+    // Disable the browser's context menu for right-click
+    this.input.mouse.disableContextMenu();
+
+    // Listen for pointerdown events
+    this.input.on('pointerdown', function (pointer) {
+      let attack = {
+        sword: false,
+        fireball: false,
+        none: true
+      }
+      if (pointer.leftButtonDown()) {
+        attack.sword = true
+        attack.none = false
+      } else if (pointer.rightButtonDown()) {
+        attack.fireball = true
+        attack.none = false
+      }
+      if (attack.sword || attack.fireball || attack.none !== this.prevNoAttack) {
+        let total = 0
+        if (attack.sword) total += 1
+        if (attack.fireball) total += 2
+        let str36 = total.toString(36)
+        this.channel.emit('playerAttack', str36)
+      }
+    }, this); // 'this' ensures the callback context is the scene
+
     FullscreenButton(this)
 
-    let addDummyDude = this.add
-      .text(this.cameras.main.width / 2, this.cameras.main.height / 2 - 100, 'CLICK ME', { fontSize: 48 })
-      .setOrigin(0.5)
-    addDummyDude.setInteractive().on('pointerdown', () => {
-      this.channel.emit('addDummy')
-    })
+    // let addDummyDude = this.add
+    //   .text(this.cameras.main.width / 2, this.cameras.main.height / 2 - 100, 'CLICK ME', { fontSize: 48 })
+    //   .setOrigin(0.5)
+    // addDummyDude.setInteractive().on('pointerdown', () => {
+    //   this.channel.emit('addDummy')
+    // })
 
     let healthText = this.add.text(0,0, "HP: ", { fontSize: 48 })
     let scoreText = this.add.text(0,48, "Score: ", { fontSize: 48 })
-    let directionText = this.add.text(0,96, "Direction: ", { fontSize: 48 })
+    let orbText = this.add.text(0,96, "Orbs: ", { fontSize: 48 })
+    let directionText = this.add.text(0,144, "Direction: ", { fontSize: 48 })
 
     const parseUpdates = updates => {
       if (typeof updates === undefined || updates === '') return []
@@ -56,15 +83,16 @@ export default class GameScene extends Scene {
       let u2 = []
 
       u.forEach((el, i) => {
-        if (i % 7 === 0) {
+        if (i % 8 === 0) {
           u2.push({
             playerId: u[i + 0],
             x: parseInt(u[i + 1], 36),
             y: parseInt(u[i + 2], 36),
             dead: parseInt(u[i + 3]) === 1 ? true : false,
             health: parseInt(u[i + 4], 36),
             score: parseInt(u[i + 5], 36),
-            direction: parseInt(u[i + 6], 36)
+            direction: parseInt(u[i + 6], 36),
+            orbs: parseInt(u[i + 7], 36)
           })
         }
       })
@@ -74,7 +102,7 @@ export default class GameScene extends Scene {
     const updatesHandler = updates => {
       updates.forEach(gameObject => {
         //console.log(gameObject)
-        const { playerId, x, y, dead, health, score, direction } = gameObject
+        const { playerId, x, y, dead, health, score, direction, orbs } = gameObject
         const alpha = dead ? 0 : 1
 
         if (Object.keys(this.objects).includes(playerId)) {
@@ -87,6 +115,7 @@ export default class GameScene extends Scene {
             healthText.setText("HP: " + health)
             scoreText.setText("Score: " + score)
             directionText.setText("Direction: " + direction)
+            orbText.setText("Orbs: " + orbs)
           }
         } else {
           // if the gameObject does NOT exist,
diff --git a/server/game/components/player.js b/server/game/components/player.js
@@ -1,5 +1,5 @@
 export class Player extends Phaser.Physics.Arcade.Sprite {
-  constructor(scene, playerId, x = 200, y = 200, dummy = false, health = 100, score = 0, direction = 4) {
+  constructor(scene, playerId, x = 200, y = 200, dummy = false, health = 100, score = 0, direction = 4, orbs = 0) {
     super(scene, x, y, '')
     scene.add.existing(this)
     scene.physics.add.existing(this)
@@ -14,10 +14,12 @@ export class Player extends Phaser.Physics.Arcade.Sprite {
 
     this.playerId = playerId
     this.move = {}
+    this.attack = {}
 
     this.health = health
     this.score = score
     this.direction = direction
+    this.orbs = orbs
 
     this.setDummy(dummy)
 
@@ -69,15 +71,19 @@ export class Player extends Phaser.Physics.Arcade.Sprite {
 
     switch(int){
       case 1:
+        // left
         this.direction = 1
         break;
       case 2:
+        // right
         this.direction = 2
         break;
       case 4:
+        // up
         this.direction = 4
         break;
       case 8:
+        // down
         this.direction = 8
         break;
     }
@@ -87,6 +93,18 @@ export class Player extends Phaser.Physics.Arcade.Sprite {
     this.move = move
   }
 
+  setAttack(data) {
+    let int = parseInt(data, 36)
+
+    let attack = {
+      sword: int === 1,
+      fireball: int === 2,
+      none: int === 4
+    }
+
+    this.attack = attack
+  }
+
   update() {
     if (this.move.left) this.setVelocityX(-160)
     else if (this.move.right) this.setVelocityX(160)
@@ -95,6 +113,16 @@ export class Player extends Phaser.Physics.Arcade.Sprite {
     if (this.move.up) this.setVelocityY(-160)
     else if (this.move.down) this.setVelocityY(160)
     else this.setVelocityY(0)
+
+    if (this.attack.sword) {
+      //this.setVelocityX(160)
+    }
+    else if (this.attack.fireball) {
+      //this.setVelocityX(-160)
+    }
+    else {
+      //this.setVelocityX(0)
+    }
   }
 
   postUpdate() {
diff --git a/server/game/gameScene.js b/server/game/gameScene.js
@@ -24,7 +24,7 @@ export class GameScene extends Scene {
   }
 
   prepareToSync(player) {
-    return `${player.playerId},${Math.round(player.x).toString(36)},${Math.round(player.y).toString(36)},${player.dead === true ? 1 : 0},${Math.round(player.health).toString(36)},${Math.round(player.score).toString(36)},${Math.round(player.direction).toString(36)},`
+    return `${player.playerId},${Math.round(player.x).toString(36)},${Math.round(player.y).toString(36)},${player.dead === true ? 1 : 0},${Math.round(player.health).toString(36)},${Math.round(player.score).toString(36)},${Math.round(player.direction).toString(36)},${Math.round(player.orbs).toString(36)},`
   }
 
   getState() {
@@ -37,6 +37,7 @@ export class GameScene extends Scene {
 
   create() {
     this.playersGroup = this.add.group()
+    this.enemiesGroup = this.add.group()
 
     const addDummy = () => {
       let x = Phaser.Math.RND.integerInRange(50, 800)
@@ -78,6 +79,14 @@ export class GameScene extends Scene {
         })
       })
 
+      channel.on('playerAttack', data => {
+        this.playersGroup.children.iterate(player => {
+          if (player.playerId === channel.playerId) {
+            player.setAttack(data)
+          }
+        })
+      })
+
       channel.on('addPlayer', data => {
         let dead = this.playersGroup.getFirstDead()
         if (dead) {
