chore: merge with beta

.env.defaults

@@ -78,7 +78,7 @@ MAX_PLAYERS=200
 # Update time to parse packets in milliseconds (update every 300ms)
 UPDATE_TIME=300
 # Game version
-GVER='0.1.0-beta'
+GVER='0.1.1-beta'
 # Used for hotfixes and minor updates that do not require a full update.
 MINOR=''
 # If to load regions from cache.

package.json

@@ -1,6 +1,6 @@
 {
     "name": "kaetram",
-    "version": "0.1.0",
+    "version": "0.1.1",
     "private": true,
     "packageManager": "[email protected]",
     "author": "Veradictus",

packages/client/data/sprites.json

@@ -40,6 +40,9 @@
     { "id": "player/weapon/firestaff", "width": 48, "height": 48, "idleSpeed": 250, "offsetX": -16, "offsetY": -20 },
     { "id": "player/weapon/cursestaff", "width": 48, "height": 48, "idleSpeed": 250, "offsetX": -16, "offsetY": -20 },
 
+    { "id": "player/weapon/lantern", "width": 48, "height": 48, "idleSpeed": 250, "offsetX": -16, "offsetY": -20 },
+    { "id": "player/weapon/lantern2", "width": 48, "height": 48, "idleSpeed": 250, "offsetX": -16, "offsetY": -20 },
+
     { "id": "crowns/artist" },
     { "id": "crowns/tier1" },
     { "id": "crowns/tier2" },
@@ -673,55 +676,6 @@
         "offsetX": -4,
         "offsetY": -8
     },
-    {
-        "id": "mobs/boss",
-        "width": 64,
-        "height": 72,
-        "animations": {
-            "atk_right": {
-                "length": 6,
-                "row": 0
-            },
-            "walk_right": {
-                "length": 3,
-                "row": 1
-            },
-            "idle_right": {
-                "length": 4,
-                "row": 2
-            },
-            "atk_up": {
-                "length": 5,
-                "row": 3
-            },
-            "walk_up": {
-                "length": 4,
-                "row": 4
-            },
-            "idle_up": {
-                "length": 4,
-                "row": 5
-            },
-            "atk_down": {
-                "length": 6,
-                "row": 6
-            },
-            "walk_down": {
-                "length": 4,
-                "row": 7
-            },
-            "idle_down": {
-                "length": 4,
-                "row": 8
-            },
-            "Group 5": {
-                "length": 3,
-                "row": 9
-            }
-        },
-        "offsetX": -24,
-        "offsetY": -36
-    },
     {
         "id": "npcs/boxingman",
         "width": 24,
@@ -824,6 +778,13 @@
         "offsetX": -9,
         "offsetY": -32
     },
+    {
+        "id": "mobs/paladin",
+        "width": 32,
+        "height": 32,
+        "offsetX": -5,
+        "offsetY": -8
+    },
     {
         "id": "mobs/cactus",
         "width": 48,
@@ -5713,6 +5674,10 @@
             "atk": {
                 "length": 4,
                 "row": 1
+            },
+            "info": {
+                "length": 4,
+                "row": 2
             }
         }
     },
@@ -6051,9 +6016,10 @@
         "offsetY": -13
     },
     {
-        "id": "yellowbat",
+        "id": "mobs/yellowbat",
         "width": 32,
         "height": 48,
+        "idleSpeed": 100,
         "animations": {
             "atk_right": {
                 "length": 5,
@@ -7104,5 +7070,8 @@
     { "id": "items/goldring2", "offsetX": 0, "offsetY": 0 },
     { "id": "items/ironboots", "offsetX": 0, "offsetY": 0 },
     { "id": "items/ironring", "offsetX": 0, "offsetY": 0 },
-    { "id": "items/silverring2", "offsetX": 0, "offsetY": 0 }
+    { "id": "items/silverring2", "offsetX": 0, "offsetY": 0 },
+
+    { "id": "items/lantern", "offsetX": 0, "offsetY": 0 },
+    { "id": "items/lantern2", "offsetX": 0, "offsetY": 0 }
 ]

packages/client/package.json

@@ -9,7 +9,7 @@
     "dependencies": {
         "@kaetram/common": "workspace:*",
         "gl-tiled": "^1.0.0",
-        "illuminated": "^1.3.0",
+        "illuminated": "^1.3.5",
         "pako": "^2.1.0",
         "socket.io-client": "^4.5.4"
     },

packages/client/scss/game/impl/_bubbles.scss

@@ -21,8 +21,15 @@
 .pointer {
     pointer-events: none;
     user-select: none;
+
     position: absolute;
+
     display: inline-block;
+
+    width: 4.5rem;
+    height: 4.5rem;
+
+    background: url('/img/pointer.png') no-repeat;
 }
 
 .bubble {

packages/client/src/controllers/entities.ts

@@ -280,6 +280,9 @@ export default class EntitiesController {
 
         player.ready = true;
 
+        // If the player has a light source then we add it to the renderer.
+        if (player.hasLight()) this.game.renderer.addPlayerLight(player);
+
         return player;
     }