hytopia 0.3.27 → 0.3.29

package/examples/hygrounds/classes/GameManager.ts

@@ -20,6 +20,7 @@ import {
   ITEM_SPAWN_ITEMS,
   MINIMUM_PLAYERS_TO_START,
   SPAWN_REGION_AABB,
+  RANK_WIN_EXP,
 } from '../gameConfig';
 
 import GamePlayerEntity from './GamePlayerEntity';
@@ -96,7 +97,7 @@ export default class GameManager {
     this._gameActive = false;
     this.world.chatManager.sendBroadcastMessage('Game over! Starting the next round in 10 seconds...', 'FF0000');
     
-    this._focusWinningPlayer();
+    this._identifyWinningPlayer();
 
     // Clear any existing restart timer
     if (this._restartTimer) {
@@ -113,8 +114,9 @@ export default class GameManager {
     if (!this.world) return;
 
     const playerEntity = new GamePlayerEntity(player);
+    
     playerEntity.spawn(this.world, this.getRandomSpawnPosition());
-
+  
     // Sync UI for the new player
     this.syncTimer(player);
     this.syncLeaderboard(player);
@@ -124,17 +126,20 @@ export default class GameManager {
       player.ui.sendData({ type: 'game-start' });
       this._sendGameStartAnnouncements(player);
     }
+
+    // Load player's data
+    playerEntity.loadPersistedData();
   }
 
   /**
    * Increments kill count for a player and updates the leaderboard
    */
-  public addKill(playerId: string): void {
-    const killCount = this._killCounter.get(playerId) ?? 0;
+  public addKill(playerUsername: string): void {
+    const killCount = this._killCounter.get(playerUsername) ?? 0;
     const newKillCount = killCount + 1;
     
-    this._killCounter.set(playerId, newKillCount);
-    this._updateLeaderboardUI(playerId, newKillCount);
+    this._killCounter.set(playerUsername, newKillCount);
+    this._updateLeaderboardUI(playerUsername, newKillCount);
   }
 
   /**
@@ -242,7 +247,7 @@ export default class GameManager {
     this.resetLeaderboard();
   }
 
-  public _focusWinningPlayer() {
+  public _identifyWinningPlayer() {
     if (!this.world) return;
 
     // Find player with most kills
@@ -263,6 +268,11 @@ export default class GameManager {
 
     if (!winningPlayerEntity) return;
 
+    // Give winning player XP for winning
+    if (winningPlayerEntity instanceof GamePlayerEntity) {
+      winningPlayerEntity.addExp(RANK_WIN_EXP);
+    }
+
     this.world.entityManager.getAllPlayerEntities().forEach(playerEntity => {
       if (playerEntity instanceof GamePlayerEntity) {
         if (playerEntity.player.username !== winningPlayer) { // don't change camera for the winner

package/examples/hygrounds/classes/GamePlayerEntity.ts

@@ -10,6 +10,8 @@ import {
   World,
   PlayerEntityController,
   PlayerUIEvent,
+  SceneUI,
+  ErrorHandler,
 } from 'hytopia';
 
 import ChestEntity from './ChestEntity';
@@ -17,7 +19,7 @@ import GunEntity from './GunEntity';
 import ItemEntity from './ItemEntity';
 import PickaxeEntity from './weapons/PickaxeEntity';
 import MeleeWeaponEntity from './MeleeWeaponEntity';
-import { BUILD_BLOCK_ID } from '../gameConfig';
+import { BUILD_BLOCK_ID, RANKS, RANK_KILL_EXP, RANK_SAVE_INTERVAL_EXP } from '../gameConfig';
 import GameManager from './GameManager';
 
 const BASE_HEALTH = 100;
@@ -27,6 +29,7 @@ const INTERACT_RANGE = 4;
 const MAX_HEALTH = 100;
 const MAX_SHIELD = 100;
 const TOTAL_INVENTORY_SLOTS = 6;
+const STARTING_MATERIALS = 30;
 
 interface InventoryItem {
   name: string;
@@ -34,17 +37,25 @@ interface InventoryItem {
   quantity: number;
 }
 
+interface PlayerPersistedData extends Record<string, unknown> {
+  totalExp: number
+}
+
 export default class GamePlayerEntity extends PlayerEntity {
   private readonly _damageAudio: Audio;
   private readonly _inventory: (ItemEntity | undefined)[] = new Array(TOTAL_INVENTORY_SLOTS).fill(undefined);
   private _dead: boolean = false;
   private _health: number = BASE_HEALTH;
   private _inventoryActiveSlotIndex: number = 0;
+  private _lastExpSave: number = 0;
   private _maxHealth: number = MAX_HEALTH;
   private _maxShield: number = MAX_SHIELD;
-  private _materials: number = 0;
+  private _materials: number = STARTING_MATERIALS;
+  private _rankIndex: number = 0;
+  private _rankSceneUI: SceneUI;
   private _respawnTimer: NodeJS.Timeout | undefined;
   private _shield: number = BASE_SHIELD;
+  private _totalExp: number = 0;
 
   // Player entities always assign a PlayerController to the entity
   public get playerController(): PlayerEntityController {
@@ -80,6 +91,14 @@ export default class GamePlayerEntity extends PlayerEntity {
     this._setupPlayerUI();
     this._setupPlayerCamera();
     this._setupPlayerHeadshotCollider();
+    
+    this._rankSceneUI = new SceneUI({
+      attachedToEntity: this,
+      templateId: 'player-rank',
+      state: { iconUri: 'icons/ranks/unranked.png' },
+      viewDistance: 8,
+      offset: { x: 0, y: 1.15, z: 0 },
+    });
 
     this._damageAudio = new Audio({
       attachedToEntity: this,
@@ -95,6 +114,20 @@ export default class GamePlayerEntity extends PlayerEntity {
     this._autoHealTicker();
     this._outOfWorldTicker();
     this._updatePlayerUIHealth();
+    this._updatePlayerUIMaterials();
+
+    this._rankSceneUI.load(world);
+  }
+
+  public addExp(exp: number): void {
+    this._totalExp += exp;
+    this._updatePlayerUIExp();
+
+    // Save the player's data to persisted storage every so often.
+    if (this._totalExp - this._lastExpSave >= RANK_SAVE_INTERVAL_EXP) {
+      this.savePersistedData();
+      this._lastExpSave = this._totalExp;
+    }
   }
 
   public addItemToInventory(item: ItemEntity): void {
@@ -123,6 +156,7 @@ export default class GamePlayerEntity extends PlayerEntity {
 
       if (attacker) {
         GameManager.instance.addKill(attacker.player.username);
+        attacker.addExp(RANK_KILL_EXP);
         this.focusCameraOnPlayer(attacker);
       }
 
@@ -207,6 +241,23 @@ export default class GamePlayerEntity extends PlayerEntity {
     return this._inventory[this._inventoryActiveSlotIndex] === item;
   }
 
+  public async loadPersistedData(): Promise<void> {
+    if (!this.isSpawned) {
+      return ErrorHandler.error('PlayerEntity not spawned');
+    }
+
+    const data = await this.player.getPersistedData();
+
+    if (data) {
+      const persistedData = data as unknown as PlayerPersistedData;
+
+      this._lastExpSave = persistedData.totalExp;
+      this._totalExp = persistedData.totalExp;
+    }
+
+    this._updatePlayerUIExp();
+  }
+
   public resetAnimations(): void {
     this.playerController.idleLoopedAnimations = ['idle_lower', 'idle_upper'];
     this.playerController.interactOneshotAnimations = [];
@@ -220,7 +271,7 @@ export default class GamePlayerEntity extends PlayerEntity {
   }
 
   public resetMaterials(): void {
-    this._materials = 0;
+    this._materials = STARTING_MATERIALS;
     this._updatePlayerUIMaterials();
   }
 
@@ -237,6 +288,14 @@ export default class GamePlayerEntity extends PlayerEntity {
     this.setPosition(GameManager.instance.getRandomSpawnPosition());
   }
 
+  public savePersistedData(): void {
+    let data: PlayerPersistedData = {
+      totalExp: this._totalExp,
+    };
+
+    this.player.setPersistedData(data);
+  }
+
   public setActiveInventorySlotIndex(index: number): void {
     if (index !== this._inventoryActiveSlotIndex) {
       this._inventory[this._inventoryActiveSlotIndex]?.unequip();
@@ -339,6 +398,12 @@ export default class GamePlayerEntity extends PlayerEntity {
     this.nametagSceneUI.setViewDistance(8); // lessen view distance so you only see player names when close
     this.player.ui.load('ui/index.html');
 
+    // Load rank data
+    this.player.ui.sendData({
+      type: 'ranks',
+      ranks: RANKS,
+    });
+
     // Handle inventory selection from mobile UI
     this.player.ui.on(PlayerUIEvent.DATA, (payload) => {
       const { data } = payload;
@@ -574,6 +639,24 @@ export default class GamePlayerEntity extends PlayerEntity {
     });
   }
 
+  private _updatePlayerUIExp(): void {
+    const rankIndex = this._totalExpToRankIndex(this._totalExp);
+
+    if (rankIndex !== this._rankIndex) {
+      this._rankIndex = rankIndex;
+
+      this._rankSceneUI.setState({
+        iconUri: RANKS[this._rankIndex].iconUri,
+      });
+    }
+
+    this.player.ui.sendData({
+      type: 'exp-update',
+      totalExp: this._totalExp,
+      rankIndex,
+    });
+  }
+
   private _playDamageAudio(): void {
     this._damageAudio.setDetune(-200 + Math.random() * 800);
     this._damageAudio.play(this.world!, true);
@@ -602,4 +685,21 @@ export default class GamePlayerEntity extends PlayerEntity {
       this._outOfWorldTicker();
     }, 3000);
   }
+
+  private _totalExpToRankIndex(totalExp: number): number {
+    // Get the rank index for the player's total exp
+    for (let i = 0; i < RANKS.length - 1; i++) {
+      if (totalExp >= RANKS[i].totalExp && totalExp < RANKS[i + 1].totalExp) {
+        return i;
+      }
+    }
+    
+    // If we've reached the highest rank
+    if (totalExp >= RANKS[RANKS.length - 1].totalExp) {
+      return RANKS.length - 1;
+    }
+    
+    // Default to unranked (index 0) if below first rank
+    return 0;
+  }
 }

package/examples/hygrounds/classes/GunEntity.ts

@@ -62,6 +62,8 @@ export default abstract class GunEntity extends ItemEntity {
     this._reloadAudio = new Audio({
       attachedToEntity: this,
       uri: options.reloadAudioUri,  
+      referenceDistance: 8,
+      cutoffDistance: 20,
     });
 
     this._shootAudio = new Audio({
@@ -69,6 +71,7 @@ export default abstract class GunEntity extends ItemEntity {
       uri: options.shootAudioUri,
       volume: 0.3,
       referenceDistance: 8,
+      cutoffDistance: 60,
     });
   }
 

package/examples/hygrounds/classes/ItemEntity.ts

@@ -103,6 +103,7 @@ export default class ItemEntity extends Entity {
       uri: this.consumeAudioUri,
       volume: 0.5,
       referenceDistance: 5,
+      cutoffDistance: 15,
     })).play(this.world);
 
   }

package/examples/hygrounds/classes/MeleeWeaponEntity.ts

@@ -43,6 +43,7 @@ export default abstract class MeleeWeaponEntity extends ItemEntity {
       uri: options.attackAudioUri,
       volume: 0.3,
       referenceDistance: 3,
+      cutoffDistance: 15,
     });
 
     this._hitAudio = new Audio({
@@ -50,6 +51,7 @@ export default abstract class MeleeWeaponEntity extends ItemEntity {
       uri: options.hitAudioUri,
       volume: 0.3,
       referenceDistance: 3,
+      cutoffDistance: 15,
     });
   }
 

package/examples/hygrounds/classes/weapons/PistolEntity.ts

@@ -5,7 +5,7 @@ import type GamePlayerEntity from '../GamePlayerEntity';
 
 const DEFAULT_PISTOL_OPTIONS: GunEntityOptions = {
   ammo: 15,
-  damage: 18,
+  damage: 14,
   fireRate: 4,
   heldHand: 'right',
   iconImageUri: 'icons/pistol.png',

package/examples/hygrounds/classes/weapons/RocketLauncherEntity.ts

@@ -183,7 +183,8 @@ export default class RocketLauncherEntity extends GunEntity {
       // Explosion Audio
       (new Audio({
         uri: 'audio/sfx/rocket-launcher-explosion.mp3',
-        referenceDistance: 20,
+        referenceDistance: 15,
+        cutoffDistance: 100,
         volume: 0.4,
       })).play(world);
 

package/examples/hygrounds/dev/persistence/player-player-1.json

@@ -0,0 +1,3 @@
+{
+  "totalExp": 2400
+}

package/examples/hygrounds/dev/persistence/player-player-2.json

@@ -0,0 +1,3 @@
+{
+  "totalExp": 7700
+}

package/examples/hygrounds/dev/persistence/player-player-3.json

@@ -0,0 +1,3 @@
+{
+  "totalExp": 800
+}