@hytopia.com/examples 1.0.14 → 1.0.17

package/frontiers-rpg-game/assets/ui/index.html

@@ -400,6 +400,7 @@ window.ItemTooltips = (function() {
   .backpack-slot:hover .item-tooltip,
   .backpack-hotbar-slot:hover .item-tooltip,
   .backpack-wearable-slot:hover .item-tooltip,
+  .hud-hotbar-slot:hover .item-tooltip,
       .merchant-slot:hover .item-tooltip,
     .merchant-hotbar-slot:hover .item-tooltip,
     .crafting-slot:hover .item-tooltip,
@@ -3112,12 +3113,13 @@ window.ItemTooltips = (function() {
 
   .quests-section:first-child {
     flex: 1;
-    min-height: 0;
+    min-height: 50%;
   }
 
-  /* When active quests section has only placeholder, don't expand */
+  /* When active quests section has only placeholder, still maintain minimum height */
   .quests-section:first-child:has(.quests-empty-section:only-child) {
-    flex: none;
+    flex: 1;
+    min-height: 50%;
   }
 
   .quests-section-title {
@@ -6211,6 +6213,16 @@ window.ItemTooltips = (function() {
         else if (healthPercent > 0.33) healthBarFill.classList.add('health-medium');
         else healthBarFill.classList.add('health-low');
       }
+
+      if (state.type) {
+        // Remove any existing type classes
+        nameplate.classList.remove('boss');
+        
+        // Apply boss class if entity type is boss
+        if (state.type === 'boss') {
+          nameplate.classList.add('boss');
+        }
+      }
     });
 
     function showDamageNumber(amount, type) {
@@ -6419,14 +6431,8 @@ window.ItemTooltips = (function() {
   .entity-nameplate-health-bar-fill.health-medium { background-color: #FFC107; }
   .entity-nameplate-health-bar-fill.health-low { background-color: #f44336; }
 
-  .entity-nameplate.elite .entity-nameplate-name {
-    font-size: 12px;
-    font-weight: 700;
-    background: linear-gradient(45deg, #ffd700, #ffed4e);
-    -webkit-background-clip: text;
-    -webkit-text-fill-color: transparent;
-    background-clip: text;
-    filter: drop-shadow(0 0 8px rgba(255,215,0,0.5)) drop-shadow(0 1px 3px rgba(0,0,0,0.9));
+  .entity-nameplate.boss .entity-nameplate-name {
+    color: #ef4444;
   }
 </style>
 
@@ -6856,6 +6862,23 @@ window.ItemTooltips = (function() {
     hytopia.sendData({ type: 'setSelectedHotbarIndex', index });
   }
 
+  // Use shared tooltip system (same as backpack)
+  function createTooltip(slot, itemData) {
+    if (window.ItemTooltips) {
+      ItemTooltips.createTooltip(slot, itemData, {
+        tooltipClass: 'item-tooltip',
+        contentClass: 'item-tooltip-content',
+        showSellPrice: true
+      });
+    }
+  }
+
+  function removeTooltip(slot) {
+    if (window.ItemTooltips) {
+      ItemTooltips.removeTooltip(slot, 'item-tooltip');
+    }
+  }
+
   // Update Functions
   function updateHealthBar(health, maxHealth) {
     const healthBar = document.querySelector('.hud-health-fill');
@@ -6919,6 +6942,9 @@ window.ItemTooltips = (function() {
     
     content.innerHTML = '';
     
+    // Clear existing tooltip
+    removeTooltip(slot);
+    
     if (itemData.removed) {
       content.textContent = position + 1;
     } else {
@@ -6934,6 +6960,9 @@ window.ItemTooltips = (function() {
         quantity.textContent = itemData.quantity.toLocaleString();
         content.appendChild(quantity);
       }
+      
+      // Create tooltip
+      createTooltip(slot, itemData);
     }
   }
 
@@ -7334,7 +7363,7 @@ window.ItemTooltips = (function() {
     justify-content: center;
     cursor: pointer;
     transition: all var(--hud-transition);
-    overflow: hidden;
+    overflow: visible;
     box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.5);
   }
 
@@ -8064,8 +8093,6 @@ window.ItemTooltips = (function() {
       font-size: 8px;
     }
 
-
-
     .hud-help-icon {
       font-size: 18px;
     }

package/frontiers-rpg-game/assets/ui/menus/quests.html

@@ -524,12 +524,13 @@
 
   .quests-section:first-child {
     flex: 1;
-    min-height: 0;
+    min-height: 50%;
   }
 
-  /* When active quests section has only placeholder, don't expand */
+  /* When active quests section has only placeholder, still maintain minimum height */
   .quests-section:first-child:has(.quests-empty-section:only-child) {
-    flex: none;
+    flex: 1;
+    min-height: 50%;
   }
 
   .quests-section-title {

package/frontiers-rpg-game/assets/ui/scene-ui-templates/entity-nameplate.html

@@ -129,6 +129,16 @@
         else if (healthPercent > 0.33) healthBarFill.classList.add('health-medium');
         else healthBarFill.classList.add('health-low');
       }
+
+      if (state.type) {
+        // Remove any existing type classes
+        nameplate.classList.remove('boss');
+        
+        // Apply boss class if entity type is boss
+        if (state.type === 'boss') {
+          nameplate.classList.add('boss');
+        }
+      }
     });
 
     function showDamageNumber(amount, type) {
@@ -337,13 +347,7 @@
   .entity-nameplate-health-bar-fill.health-medium { background-color: #FFC107; }
   .entity-nameplate-health-bar-fill.health-low { background-color: #f44336; }
 
-  .entity-nameplate.elite .entity-nameplate-name {
-    font-size: 12px;
-    font-weight: 700;
-    background: linear-gradient(45deg, #ffd700, #ffed4e);
-    -webkit-background-clip: text;
-    -webkit-text-fill-color: transparent;
-    background-clip: text;
-    filter: drop-shadow(0 0 8px rgba(255,215,0,0.5)) drop-shadow(0 1px 3px rgba(0,0,0,0.9));
+  .entity-nameplate.boss .entity-nameplate-name {
+    color: #ef4444;
   }
 </style>

package/frontiers-rpg-game/assets/ui/shared/item-tooltips.html

@@ -151,6 +151,7 @@ window.ItemTooltips = (function() {
   .backpack-slot:hover .item-tooltip,
   .backpack-hotbar-slot:hover .item-tooltip,
   .backpack-wearable-slot:hover .item-tooltip,
+  .hud-hotbar-slot:hover .item-tooltip,
       .merchant-slot:hover .item-tooltip,
     .merchant-hotbar-slot:hover .item-tooltip,
     .crafting-slot:hover .item-tooltip,

package/frontiers-rpg-game/dev/persistence/player-player-1.json

@@ -1,37 +1,22 @@
 {
-  "health": 130,
-  "currentRegionId": "stalkhaven-port",
+  "health": 120,
+  "currentRegionId": "chitter-forest",
   "skillExperience": [
     [
       "exploration",
-      375
-    ],
-    [
-      "agility",
-      79
+      225
     ],
     [
       "combat",
-      320
+      162
     ],
     [
-      "foraging",
-      8
+      "agility",
+      20
     ]
   ],
   "backpack": {
-    "items": [
-      {
-        "position": 0,
-        "itemId": "common_mushroom",
-        "quantity": 3
-      },
-      {
-        "position": 1,
-        "itemId": "ratkin_tooth",
-        "quantity": 3
-      }
-    ]
+    "items": []
   },
   "hotbar": {
     "items": [
@@ -46,31 +31,25 @@
       {
         "position": 3,
         "itemId": "gold",
-        "quantity": 147
+        "quantity": 82
       },
       {
         "position": 1,
-        "itemId": "raw_hide",
-        "quantity": 2
+        "itemId": "ratkin_tail"
       },
       {
         "position": 4,
-        "itemId": "ratkin_eyes"
+        "itemId": "ratkin_tooth"
       },
       {
         "position": 5,
-        "itemId": "ratkin_tail",
-        "quantity": 2
+        "itemId": "ratkin_eyes",
+        "quantity": 3
       },
       {
         "position": 6,
         "itemId": "ratkin_bones",
         "quantity": 3
-      },
-      {
-        "position": 7,
-        "itemId": "common_seeds",
-        "quantity": 4
       }
     ]
   },
@@ -95,27 +74,11 @@
       },
       {
         "questId": "tested-mettle",
-        "state": "completed",
+        "state": "active",
         "objectiveProgress": {
           "kill-5-ratkin": 5,
           "dodge-3-times": 3,
-          "talk-to-mark": 1
-        }
-      },
-      {
-        "questId": "hammers-and-crafting",
-        "state": "active",
-        "objectiveProgress": {
-          "gather-materials": 2,
-          "craft-item": 0,
-          "talk-to-arden": 0
-        }
-      },
-      {
-        "questId": "stalkhavens-outpost",
-        "state": "active",
-        "objectiveProgress": {
-          "talk-to-chanterelion": 0
+          "talk-to-mark": 0
         }
       }
     ]
@@ -131,10 +94,10 @@
       }
     ]
   },
-  "currentRegionSpawnFacingAngle": 180,
+  "currentRegionSpawnFacingAngle": 0,
   "currentRegionSpawnPoint": {
-    "x": -6,
-    "y": 8,
-    "z": -28
+    "x": -7,
+    "y": 2,
+    "z": 76
   }
 }

package/frontiers-rpg-game/src/GameClock.ts

@@ -1,6 +1,6 @@
 import type GameRegion from './GameRegion';
 
-const CYCLE_CLOCK_INTERVAL_MS = 5000; // Update clock every 1 second
+const CYCLE_CLOCK_INTERVAL_MS = 5000; // Update clock every 5 second
 const CYCLE_CLOCK_OFFSET_HOURS = 7;
 const CYCLE_DAY_MAX_SKYBOX_INTENSITY = 1.2;
 const CYCLE_DURATION_MS = 24 * 60 * 1000; // Day/Night Cycle Every 24 minutes
@@ -49,9 +49,19 @@ export default class GameClock {
   private _updateRegionClockCycle(region: GameRegion): void {
     const world = region.world;
     
-    // Calculate sun position in circular path
+    // Calculate sun position with asymmetric day/night cycle (75% day, 25% night)
     const timeProgress = this._timeMs / CYCLE_DURATION_MS;
-    const sunAngle = timeProgress * 2 * Math.PI;
+    
+    // Create asymmetric sun angle: 75% of time for day, 25% for night
+    let sunAngle: number;
+    if (timeProgress < 0.75) {
+      // Day period: map first 75% of cycle to first half of sine wave (0 to π)
+      sunAngle = (timeProgress / 0.75) * Math.PI;
+    } else {
+      // Night period: map last 25% of cycle to second half of sine wave (π to 2π)
+      sunAngle = Math.PI + ((timeProgress - 0.75) / 0.25) * Math.PI;
+    }
+    
     const sunRadius = 300;
     const sunHeight = 100 + Math.sin(sunAngle) * 150;
     

package/frontiers-rpg-game/src/GameManager.ts

@@ -7,6 +7,7 @@ import type GameRegion from './GameRegion';
 
 // Regions
 import ChitterForestRegion from './regions/chitter-forest/ChitterForestRegion';
+import HearthwildsRegion from './regions/hearthwilds/HearthwildsRegion';
 import RatkinNestRegion from './regions/ratkin-nest/RatkinNestRegion';
 import StalkhavenRegion from './regions/stalkhaven/StalkhavenRegion';
 import StalkhavenPortRegion from './regions/stalkhaven-port/StalkhavenPortRegion';
@@ -46,10 +47,17 @@ export default class GameManager {
     this._regions.set(chitterForestRegion.id, chitterForestRegion);
     GameClock.instance.addRegionClockCycle(chitterForestRegion);
 
+    // Hearthwilds
+    // const hearthwildsRegion = new HearthwildsRegion();
+    // this._regions.set(hearthwildsRegion.id, hearthwildsRegion);
+    // GameClock.instance.addRegionClockCycle(hearthwildsRegion);
+    // this._startRegion = hearthwildsRegion;
+
     // Ratkin Nest
     const ratkinNestRegion = new RatkinNestRegion();
     this._regions.set(ratkinNestRegion.id, ratkinNestRegion);
     GameClock.instance.addRegionClockCycle(ratkinNestRegion);
+    // this._startRegion = ratkinNestRegion;
     
     // Stalkhaven
     const stalkhavenRegion = new StalkhavenRegion();

package/frontiers-rpg-game/src/GamePlayer.ts

@@ -359,6 +359,10 @@ export default class GamePlayer {
     this._spawnHeldItem();
   }
 
+  public onPlayerReconnected(): void {
+    this._loadUI();
+  }
+
   public removeEntityAlert(entityClass: typeof BaseEntity): void {
     if (!this._entityAlertClassNames.has(entityClass.name)) return;
 

package/frontiers-rpg-game/src/GamePlayerEntity.ts

@@ -71,16 +71,53 @@ export default class GamePlayerEntity extends DefaultPlayerEntity implements IDa
   }
 
   public get adjustedFacingDirection(): Vector3Like {
-    const shoulderAngleRad = -this.player.camera.shoulderAngle * Math.PI / 180;
+    // This implementation is a bit of a hack to get the right "tuned" facing
+    // direction based on the center crosshair of the player relative to the shoulder
+    // angle offset. We should probabaly find a better way to handle screen center relative
+    // to shoulder angle offset & taking zoom into account in the future..
+    const shoulderAngleRad = -this.player.camera.shoulderAngle * 0.017453292519943295;
     const facingDirection = this.player.camera.facingDirection;
-    const cos = Math.cos(shoulderAngleRad);
-    const sin = Math.sin(shoulderAngleRad);
-
-    return {
-      x: facingDirection.x * cos + facingDirection.z * sin,
-      y: facingDirection.y,
-      z: -facingDirection.x * sin + facingDirection.z * cos
-    } 
+    
+    // Pre-calculate trigonometric values
+    const shoulderCos = Math.cos(shoulderAngleRad);
+    const shoulderSin = Math.sin(shoulderAngleRad);
+    const adjustedX = facingDirection.x * shoulderCos + facingDirection.z * shoulderSin;
+    const adjustedZ = -facingDirection.x * shoulderSin + facingDirection.z * shoulderCos;
+    
+    // Optimized pitch calculations - single pass
+    const pitch = this.player.camera.orientation.pitch;
+    const isNegativePitch = pitch < 0;
+    const absPitch = isNegativePitch ? -pitch : pitch;
+    const maxPitch = isNegativePitch ? 1.2 : 1.8;
+    const pitchRatio = absPitch > maxPitch ? 1.0 : absPitch / maxPitch;
+    const pitchRatioSquared = pitchRatio * pitchRatio; // Calculate once, use twice
+    
+    // Combined offset calculations
+    const rightOffsetFactor = pitchRatioSquared * 0.5236;
+    const upwardAdjustment = isNegativePitch ? pitchRatioSquared * 0.08727 : -pitchRatioSquared * 0.08727;
+    
+    // Fast right vector calculation and normalization
+    const rightX = -adjustedZ;
+    const rightZ = adjustedX;
+    const lengthSq = rightX * rightX + rightZ * rightZ;
+    
+    if (lengthSq > 0) {
+      const invLength = 1.0 / Math.sqrt(lengthSq);
+      const rightOffsetX = rightX * invLength * rightOffsetFactor;
+      const rightOffsetZ = rightZ * invLength * rightOffsetFactor;
+      
+      return {
+        x: adjustedX + rightOffsetX,
+        y: facingDirection.y + upwardAdjustment,
+        z: adjustedZ + rightOffsetZ
+      };
+    }
+    
+    return { 
+      x: adjustedX, 
+      y: facingDirection.y + upwardAdjustment, 
+      z: adjustedZ 
+    };
   }
 
   public get canDodge(): boolean {

package/frontiers-rpg-game/src/GameRegion.ts

@@ -19,8 +19,8 @@ import GamePlayerEntity from './GamePlayerEntity';
 
 const DEFAULT_MAX_AMBIENT_LIGHT_INTENSITY = 1.5;
 const DEFAULT_MAX_DIRECTIONAL_LIGHT_INTENSITY = 3.25;
-const DEFAULT_MIN_AMBIENT_LIGHT_INTENSITY = 0.4;
-const DEFAULT_MIN_DIRECTIONAL_LIGHT_INTENSITY = 0.3;
+const DEFAULT_MIN_AMBIENT_LIGHT_INTENSITY = 0.5;
+const DEFAULT_MIN_DIRECTIONAL_LIGHT_INTENSITY = 0.4;
 
 export enum GameRegionPlayerEvent {
   REACHED = 'GameRegion.REACHED',
@@ -86,6 +86,7 @@ export default class GameRegion {
     this._world.stop(); // Keep it in stopped state, when a player joins the world, we'll start it.
     this._world.on(PlayerEvent.JOINED_WORLD, ({ player }) => this.onPlayerJoin(player));
     this._world.on(PlayerEvent.LEFT_WORLD, ({ player }) => this.onPlayerLeave(player));
+    this._world.on(PlayerEvent.RECONNECTED_WORLD, ({ player }) => this.onPlayerReconnected(player));
 
     // temp
     // this._world.simulation.enableDebugRendering(true);
@@ -140,6 +141,7 @@ export default class GameRegion {
   }
 
   protected async onPlayerJoin(player: Player) {
+    console.log('onPlayerJoin', this.name);
     const gamePlayer = await GamePlayer.getOrCreate(player);
     
     // Set the current region for the player
@@ -189,4 +191,17 @@ export default class GameRegion {
       this._world.stop();
     }
   }
+
+  // The RECONNECTED_WORLD even is only emitted by the engine when the player disconnects and
+  // reconnects to the game with a known connectionId before the close connection timeout finishes
+  // which gives them 5 second window to reconnect after disconnecting. This event will fire such
+  // as if a player unintentionally refreshes the page, if their browser crashes but restarts quickly
+  // with the same connectionId in the URL, etc.
+  // The HYTOPIA SDK handles resynchronization of all persisted state back to the player client such as
+  // their entity, scene ui states, etc, but anything that uses ephemeral state (Such as UI) we need
+  // to handle reloading for them manually here.
+  protected async onPlayerReconnected(player: Player) { 
+    const gamePlayer = await GamePlayer.getOrCreate(player);
+    gamePlayer.onPlayerReconnected();
+  }
 }

package/frontiers-rpg-game/src/entities/BaseCombatEntity.ts

@@ -14,6 +14,9 @@ import {
 } from 'hytopia';
 
 const MOVEMENT_NOT_STUCK_DISTANCE_SQUARED = 3;
+const COMBAT_REGEN_DEFAULT_DELAY_MS = 7000; // 7 seconds
+const COMBAT_REGEN_DEFAULT_RATE = 0.03; // 3% per second
+const COMBAT_REGEN_INTERVAL_MS = 3000; // 3 seconds
 
 import BaseEntity, { BaseEntityOptions } from './BaseEntity';
 import GamePlayerEntity from '../GamePlayerEntity';
@@ -47,6 +50,8 @@ export type BaseCombatEntityOptions = {
   aggroTargetTypes?: (typeof BaseEntity | typeof GamePlayerEntity)[];
   attacks?: BaseCombatEntityAttack[];
   health: number;
+  outOfCombatRegenDelayMs?: number;
+  outOfCombatRegenPerSecondRate?: number; // rate per second as a percent, ie 0.03 is 3% per second
 } & BaseEntityOptions;
 
 export default class BaseCombatEntity extends BaseEntity {
@@ -73,6 +78,10 @@ export default class BaseCombatEntity extends BaseEntity {
   private _attackTotalWeight: number = 0;
   private _diameterSquared: number = 0;
   private _nextAttack: BaseCombatEntityAttack | null = null;
+  private _outOfCombatRegenAccumulatorMs: number = 0;
+  private _outOfCombatRegenDelayAccumulatorMs: number = 0;
+  private _outOfCombatRegenDelayMs: number;
+  private _outOfCombatRegenPerSecondRate: number;
   private _stopMoving: boolean = false;
 
   constructor(options: BaseCombatEntityOptions) {
@@ -90,6 +99,8 @@ export default class BaseCombatEntity extends BaseEntity {
     this._attackTotalWeight = this._attacks.reduce((sum, attack) => sum + attack.weight, 0);
     this._diameterSquared = this.width > this.depth ? this.width ** 2 : this.depth ** 2;
     this._nextAttack = this._pickRandomAttack();
+    this._outOfCombatRegenDelayMs = options.outOfCombatRegenDelayMs ?? COMBAT_REGEN_DEFAULT_DELAY_MS;
+    this._outOfCombatRegenPerSecondRate = options.outOfCombatRegenPerSecondRate ?? COMBAT_REGEN_DEFAULT_RATE;
     
     // Set accumulator to interval to trigger immediate target check on first tick
     this._aggroRetargetAccumulatorMs = this._aggroRetargetIntervalMs;
@@ -300,7 +311,28 @@ export default class BaseCombatEntity extends BaseEntity {
       this._updateTargeting();
     }
 
-    if (!this._aggroActiveTarget) return;
+    if (this._aggroActiveTarget) {
+      this._outOfCombatRegenAccumulatorMs = 0;
+      this._outOfCombatRegenDelayAccumulatorMs = 0;
+    } else {
+      if (this.health === this.maxHealth || !this._outOfCombatRegenPerSecondRate) return;
+
+      // Delay regen until we hit the delay threshold if set.
+      if (this._outOfCombatRegenDelayMs && this._outOfCombatRegenDelayAccumulatorMs < this._outOfCombatRegenDelayMs) {
+        this._outOfCombatRegenDelayAccumulatorMs += tickDeltaMs;
+        return;
+      }
+
+      // Regen every interval if set.
+      if (this._outOfCombatRegenPerSecondRate && this._outOfCombatRegenAccumulatorMs >= COMBAT_REGEN_INTERVAL_MS) {
+        this._outOfCombatRegenAccumulatorMs = 0;
+        this.adjustHealth(Math.ceil(this.maxHealth * this._outOfCombatRegenPerSecondRate * (COMBAT_REGEN_INTERVAL_MS / 1000)));
+      } else {
+        this._outOfCombatRegenAccumulatorMs += tickDeltaMs;
+      }
+
+      return;
+    }
 
     const targetDistanceSquared = this.calculateDistanceSquaredToTarget(this._aggroActiveTarget);
 

package/frontiers-rpg-game/src/entities/BaseEntity.ts

@@ -56,6 +56,8 @@ export type BaseEntityItemDrop = {
   quantity?: number;
 }
 
+export type BaseEntityNameplateType = 'normal' | 'boss';
+
 export type BaseEntityOptions = {
   combatExperienceReward?: number;
   controller?: PathfindingEntityController;
@@ -75,6 +77,7 @@ export type BaseEntityOptions = {
   moveAnimationSpeed?: number;
   moveOptions?: MoveOptions;
   moveSpeed?: number;
+  nameplateType?: BaseEntityNameplateType;
   nameplateViewDistnace?: number;
   pathfindingOptions?: PathfindingOptions;
   pushable?: boolean;
@@ -103,6 +106,7 @@ export default class BaseEntity extends Entity implements IInteractable, IDamage
   private _moveOptions: MoveOptions | undefined;
   private _moveSpeed: number; 
   private _nameplateSceneUI: SceneUI;
+  private _nameplateType: BaseEntityNameplateType | undefined; 
   private _nameplateViewDistance: number | undefined;
   private _optionMap: Map<number, BaseEntityDialogueOption> = new Map();
   private _pathfindingOptions: PathfindingOptions | undefined;
@@ -135,6 +139,7 @@ export default class BaseEntity extends Entity implements IInteractable, IDamage
     this._moveOptions = options.moveOptions;
     this._moveSpeed = options.moveSpeed ?? 2;
     this._faceSpeed = options.faceSpeed ?? this._moveSpeed * 2;
+    this._nameplateType = options.nameplateType;
     this._nameplateViewDistance = options.nameplateViewDistnace;
     this._pathfindingOptions = options.pathfindingOptions;
     this._pushable = options.pushable ?? false;
@@ -170,6 +175,21 @@ export default class BaseEntity extends Entity implements IInteractable, IDamage
   public get pathfindingController(): PathfindingEntityController { return this.controller as PathfindingEntityController; }
   public get pushable(): boolean { return this._pushable; }
 
+  public adjustHealth(amount: number, attacker?: Entity): void {
+    // ignore if maHealth is 0 (infinite), or full health and positive amount, or dead and negative amount
+    if (this._maxHealth === 0 || (amount > 0 && this._health === this.maxHealth) || (amount < 0 && this._health === 0)) return;
+
+    this._health = Math.max(0, Math.min(this.maxHealth, this._health + amount));
+
+    this._nameplateSceneUI.setState({
+      health: this._health
+    });
+
+    if (this._health <= 0) {
+      this.die(attacker);
+    }
+  }
+
   public die(killer?: Entity): void {
     if (this._dying) return;
 
@@ -303,19 +323,8 @@ export default class BaseEntity extends Entity implements IInteractable, IDamage
   }
 
   public takeDamage(damage: number, attacker?: Entity): void {
-    // Infinite health, doesn't take damage if max health is 0
-    if (this._maxHealth === 0) return; 
-
-    this._health = Math.max(0, this._health - damage);
-
-    this._nameplateSceneUI.setState({
-      damage,
-      health: this._health
-    });
-
-    if (this._health <= 0) {
-      this.die(attacker);
-    }
+    console.log(damage);
+    this.adjustHealth(-damage, attacker);
   }
 
   public wander(speed: number = this._moveSpeed, options: WanderOptions): void {
@@ -367,6 +376,7 @@ export default class BaseEntity extends Entity implements IInteractable, IDamage
         interactable: this.isInteractable,
         interactActionText: this.interactActionText,
         maxHealth: this.maxHealth,
+        type: this._nameplateType,
       },
     });
   }

package/frontiers-rpg-game/src/entities/enemies/QueenWeaverEntity.ts

@@ -67,6 +67,7 @@ export default class QueenWeaverEntity extends BaseCombatEntity {
       faceSpeed: 4,
       health: 1000,
       idleAnimations: [ 'waiting' ],
+      nameplateType: 'boss',
       modelUri: 'models/enemies/weaver.gltf',
       modelScale: 1.3,
       moveAnimations: [ 'walking' ],

package/frontiers-rpg-game/src/entities/enemies/RatkinBruteEntity.ts

@@ -51,7 +51,7 @@ export default class RatkinBruteEntity extends BaseCombatEntity {
           weight: 2,
         },
       ],
-      combatExperienceReward: 30,
+      combatExperienceReward: 25,
       deathAnimations: [ 'death' ],
       deathDespawnDelayMs: 1000,
       deathItemDrops: [
@@ -64,7 +64,7 @@ export default class RatkinBruteEntity extends BaseCombatEntity {
         { itemClass: CommonMushroomItem, minQuantity: 1, maxQuantity: 3, weight: 1 },
         { itemClass: CommonSeedsItem, minQuantity: 1, maxQuantity: 3, weight: 1 },
       ],
-      health: 140,
+      health: 70,
       idleAnimations: [ 'idle' ],
       modelUri: 'models/enemies/ratkin-brute.gltf',
       modelScale: 0.6,

package/frontiers-rpg-game/src/entities/enemies/RatkinRangerEntity.ts

@@ -43,7 +43,7 @@ export default class RatkinRangerEntity extends BaseCombatEntity {
           weight: 3,
         },
       ],
-      combatExperienceReward: 20,
+      combatExperienceReward: 18,
       deathAnimations: [ 'death' ],
       deathDespawnDelayMs: 1000,
       deathItemDrops: [
@@ -56,7 +56,7 @@ export default class RatkinRangerEntity extends BaseCombatEntity {
         { itemClass: CommonMushroomItem, minQuantity: 1, maxQuantity: 3, weight: 1 },
         { itemClass: CommonSeedsItem, minQuantity: 1, maxQuantity: 3, weight: 1 },
       ],
-      health: 100,
+      health: 50,
       idleAnimations: [ 'idle' ],
       modelUri: 'models/enemies/ratkin-ranger.gltf',
       modelScale: 0.8,