Fix combat diagonal stuck state, equipment level regression, and minor bugs

- Fix player getting stuck diagonally adjacent to mobs (no diagonal
  correction existed for the player, only for mobs targeting players)
- Sync SLOT_CONFIG with gametypes rankedWeapons/rankedArmors — all
  dimension, set, and legendary items were falling back to level 1
  (Soul Harvester hitting like Sword1, Hellfire Mantle = Cloth Armor)
- Fix Population message using || instead of ?? (total=0 incorrectly
  fell back to world count)
- Clear hurt timeout on entity cleanup to prevent stale sprite updates

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Author: georgeglarson

client/ts/entity/character/character.ts

@@ -78,6 +78,7 @@ export class Character extends Entity {
       attacker.disengage();
       attacker.idle();
     });
+    this.stopHurting();
   }
 
   setMaxHitPoints(hp) {

client/ts/game.ts

@@ -1323,10 +1323,16 @@ export class Game {
         }
       } else {
         if (character.hasTarget()
-          && character.isDiagonallyAdjacent(character.target)
-          && character.target instanceof Player
-          && !character.target.isMoving()) {
-          character.follow(character.target);
+          && character.isDiagonallyAdjacent(character.target)) {
+          if (character.target instanceof Player
+            && !character.target.isMoving()) {
+            // Mob is diagonally adjacent to player — move to cardinal position
+            character.follow(character.target);
+          } else if (character.id === this.playerId
+            && !character.isMoving()) {
+            // Player is diagonally adjacent to mob — move to cardinal position
+            character.follow(character.target);
+          }
         }
       }
     }

server/ts/__tests__/equipment-manager.test.ts

@@ -111,8 +111,8 @@ describe('EquipmentManager', () => {
 
     it('armorLevel should increase after equipping better armor', () => {
       mgr.equip(Types.Entities.PLATEARMOR);
-      // PLATEARMOR is index 3 in SLOT_CONFIG armor rankedItems => level 4
-      expect(mgr.armorLevel).toBe(4);
+      // PLATEARMOR is index 5 in SLOT_CONFIG armor rankedItems => level 6
+      expect(mgr.armorLevel).toBe(6);
     });
   });
 
@@ -169,8 +169,8 @@ describe('EquipmentManager', () => {
 
     it('should update the level when equipping a new item', () => {
       mgr.equip(Types.Entities.GOLDENSWORD);
-      // GOLDENSWORD is index 6 in SLOT_CONFIG weapon rankedItems => level 7
-      expect(mgr.getLevel('weapon')).toBe(7);
+      // GOLDENSWORD is index 14 in SLOT_CONFIG weapon rankedItems => level 15
+      expect(mgr.getLevel('weapon')).toBe(15);
     });
 
     it('should mark slot as non-default after equipping a non-default item', () => {

server/ts/__tests__/equipment.handler.test.ts

@@ -184,8 +184,8 @@ describe('EquipmentHandler', () => {
 
     it('should update armor level after equipping', () => {
       equipArmor(ctx, Types.Entities.PLATEARMOR);
-      // PLATEARMOR is index 3 in rankedItems => level 4
-      expect(ctx.getEquipment().armorLevel).toBe(4);
+      // PLATEARMOR is index 5 in rankedItems => level 6
+      expect(ctx.getEquipment().armorLevel).toBe(6);
     });
 
     it('should not affect weapon slot', () => {
@@ -219,8 +219,8 @@ describe('EquipmentHandler', () => {
 
     it('should update weapon level after equipping', () => {
       equipWeapon(ctx, Types.Entities.GOLDENSWORD);
-      // GOLDENSWORD is index 6 in rankedItems => level 7
-      expect(ctx.getEquipment().weaponLevel).toBe(7);
+      // GOLDENSWORD is index 14 in rankedItems => level 15
+      expect(ctx.getEquipment().weaponLevel).toBe(15);
     });
 
     it('should not affect armor slot', () => {
@@ -535,8 +535,8 @@ describe('EquipmentHandler', () => {
 
     it('getArmorLevel should reflect equipped armor rank', () => {
       equipArmor(ctx, Types.Entities.REDARMOR);
-      // REDARMOR is index 4 => level 5
-      expect(getArmorLevel(ctx)).toBe(5);
+      // REDARMOR is index 7 => level 8
+      expect(getArmorLevel(ctx)).toBe(8);
     });
   });
 

server/ts/__tests__/message.test.ts

@@ -400,10 +400,10 @@ describe('Messages.Population', () => {
     expect(msg.serialize()).toEqual([Types.Messages.POPULATION, 15, 15]);
   });
 
-  it('should fall back total to world count when total is 0 (falsy)', () => {
+  it('should use total=0 correctly instead of falling back', () => {
     const msg = new Messages.Population(5, 0);
-    // Because of `this.total || this.world`, total=0 is falsy, falls back to world
-    expect(msg.serialize()).toEqual([Types.Messages.POPULATION, 5, 5]);
+    // total=0 is a valid value (no players), should not fall back to world count
+    expect(msg.serialize()).toEqual([Types.Messages.POPULATION, 5, 0]);
   });
 
   it('should handle world count of 0', () => {

server/ts/message.ts

@@ -156,12 +156,9 @@ export const Messages = {
     }
 
     serialize(): unknown[] {
-      // Hacked this
-      // Made total prop optional
-      // Added condition to fallbac to world count
       return [Types.Messages.POPULATION,
         this.world,
-        this.total || this.world];
+        this.total ?? this.world];
     }
   },
 

shared/ts/equipment/equipment-types.ts

@@ -37,10 +37,28 @@ export const SLOT_CONFIG: Record<EquipmentSlot, SlotConfig> = {
       Types.Entities.SWORD1,
       Types.Entities.SWORD2,
       Types.Entities.AXE,
+      Types.Entities.TEC9,
       Types.Entities.MORNINGSTAR,
+      Types.Entities.MP5,
+      Types.Entities.RAYGUN,
       Types.Entities.BLUESWORD,
+      Types.Entities.TENTACLE,
+      Types.Entities.LASERGUN,
       Types.Entities.REDSWORD,
-      Types.Entities.GOLDENSWORD
+      Types.Entities.CRYSTALSTAFF,
+      Types.Entities.VOIDBLADE,
+      Types.Entities.PLASMAHELIX,
+      Types.Entities.GOLDENSWORD,
+      // Set Weapons (high tier)
+      Types.Entities.BERSERKER_BLADE,
+      Types.Entities.GUARDIAN_HAMMER,
+      Types.Entities.SHADOW_DAGGER,
+      Types.Entities.DRAGON_SWORD,
+      // Legendary Weapons (boss-only drops, highest tier)
+      Types.Entities.GREEDS_EDGE,
+      Types.Entities.DRAGONBONE_CLEAVER,
+      Types.Entities.VOIDHEART_BLADE,
+      Types.Entities.SOUL_HARVESTER
     ],
     defaultItem: Types.Entities.SWORD1,
     affectsHP: false,
@@ -50,10 +68,23 @@ export const SLOT_CONFIG: Record<EquipmentSlot, SlotConfig> = {
     rankedItems: [
       Types.Entities.CLOTHARMOR,
       Types.Entities.LEATHERARMOR,
+      Types.Entities.HAZMATSUIT,
       Types.Entities.MAILARMOR,
+      Types.Entities.VOIDCLOAK,
       Types.Entities.PLATEARMOR,
+      Types.Entities.SHIELDBUBBLE,
       Types.Entities.REDARMOR,
-      Types.Entities.GOLDENARMOR
+      Types.Entities.CRYSTALSHELL,
+      Types.Entities.MECHARMOR,
+      Types.Entities.GOLDENARMOR,
+      // Set Armors (high tier)
+      Types.Entities.BERSERKER_MAIL,
+      Types.Entities.GUARDIAN_PLATE,
+      Types.Entities.SHADOW_CLOAK,
+      Types.Entities.DRAGON_SCALE,
+      // Legendary Armors (boss-only drops, highest tier)
+      Types.Entities.CROWN_UNDYING,
+      Types.Entities.HELLFIRE_MANTLE
     ],
     defaultItem: Types.Entities.CLOTHARMOR,
     affectsHP: true,