Merge pull request #132 from tiny-devs/dev

Tab info and client fixes

Author: diguifi

client/public/bundle.js

@@ -149,28 +149,28 @@ export class Player {
         switch (direction) {
             case Direction.Up:
                 if (!this.isOnBorder(collisionShape, +this.x, +this.y - 1)) {
-                    if (collisionShape[+this.y - 1][+this.x]) {
+                    if (collisionShape[+this.y - 1][+this.x] !== 0 && collisionShape[+this.y - 1][+this.x] !== -1) {
                         valid = false
                     }
                 }
                 break
             case Direction.Down:
                 if (!this.isOnBorder(collisionShape, +this.x, +this.y + 1)) {
-                    if (collisionShape[+this.y + 1][+this.x]) {
+                    if (collisionShape[+this.y + 1][+this.x] !== 0 && collisionShape[+this.y + 1][+this.x] !== -1) {
                         valid = false
                     }
                 }
                 break
             case Direction.Left:
                 if (!this.isOnBorder(collisionShape, +this.x - 1, +this.y)) {
-                    if (collisionShape[+this.y][+this.x - 1]) {
+                    if (collisionShape[+this.y][+this.x - 1] !== 0 && collisionShape[+this.y][+this.x - 1] !== -1) {
                         valid = false
                     }
                 }
                 break
             case Direction.Right:
                 if (!this.isOnBorder(collisionShape, +this.x + 1, +this.y)) {
-                    if (collisionShape[+this.y][+this.x + 1]) {
+                    if (collisionShape[+this.y][+this.x + 1] !== 0 && collisionShape[+this.y][+this.x + 1] !== -1) {
                         valid = false
                     }
                 }

client/src/entities/Player.ts

@@ -70,6 +70,8 @@ export class GameClient {
     private adminPassword: string = ''
     private afkTimeout: number = 0
     private afkInterval: number = 240000 // 4min
+    private afkTabMinCountdown: number = 9
+    private afkTabSecCountdown: number = 59
 
     constructor(game: Game, clientConfigs: PlayerConfig, mainElements: Main) {
         document.onkeydown = this.checkKey.bind(this)
@@ -187,6 +189,8 @@ export class GameClient {
             this.mobileMovement()
         }
 
+        this.showStatusOnTab()
+
         this.game = game
         this.ws = null
         this.loggedIn = false
@@ -286,6 +290,8 @@ export class GameClient {
     }
 
     checkKey(e: Partial<KeyboardEvent>) {
+        this.afkTabMinCountdown = 9
+        this.afkTabSecCountdown = 59
         this.restartAfkTimer()
         if (this.canMove) {
             this.delayMove()
@@ -566,6 +572,34 @@ export class GameClient {
         }, this.afkInterval);
     }
 
+    showStatusOnTab() {
+        setTimeout(async () => {
+            this.afkCountdownTick()
+            if (document.hidden) {
+                const player = this.game.spritesLayer.getPlayerById(this.playerId)!
+                document.title = `AFK: ${this.afkTabMinCountdown}:${this.afkTabSecCountdown} HP: ${player.hp}`;
+            } else {
+                document.title = 'TLO'
+            }
+
+            this.showStatusOnTab()
+        }, 900);
+    }
+
+    afkCountdownTick() {
+        if (this.afkTabMinCountdown > 0 && this.afkTabSecCountdown == 0) {
+            this.afkTabMinCountdown -= 1
+        }
+
+        if (this.afkTabSecCountdown == 0) {
+            if (this.afkTabMinCountdown > 0) {
+                this.afkTabSecCountdown = 59
+            }
+        } else {
+            this.afkTabSecCountdown -= 1
+        }
+    }
+
     pingPong() {
         this.ws!.send(`${Command.Ping}`)