@rpgjs/common 5.0.0-alpha.33 → 5.0.0-alpha.36

package/dist/database/Item.d.ts

@@ -7,6 +7,7 @@ interface ItemData {
     atk: number;
     pdef: number;
     sdef: number;
+    icon: string;
     onAdd: (player: RpgCommonPlayer) => void;
 }
 export declare class Item {
@@ -17,6 +18,7 @@ export declare class Item {
     atk: import('@signe/reactive').WritableSignal<number>;
     pdef: import('@signe/reactive').WritableSignal<number>;
     sdef: import('@signe/reactive').WritableSignal<number>;
+    icon: import('@signe/reactive').WritableSignal<string>;
     quantity: import('@signe/reactive').WritableSignal<number>;
     onAdd: (player: RpgCommonPlayer) => void;
     constructor(data?: ItemData);

package/dist/database/Skill.d.ts

@@ -6,12 +6,14 @@ export interface SkillData {
     hitRate: number;
     power: number;
     coefficient: Record<string, number>;
+    icon: string;
 }
 export declare class Skill {
     id: import('@signe/reactive').WritableSignal<string>;
     name: import('@signe/reactive').WritableSignal<string>;
     description: import('@signe/reactive').WritableSignal<string>;
     spCost: import('@signe/reactive').WritableSignal<number>;
+    icon: import('@signe/reactive').WritableSignal<string>;
     hitRate: import('@signe/reactive').WritableSignal<number>;
     power: import('@signe/reactive').WritableSignal<number>;
     coefficient: import('@signe/reactive').WritableObjectSignal<{}>;

package/dist/index.d.ts

@@ -11,3 +11,4 @@ export * from './database';
 export * from './PerlinNoise';
 export * from '@rpgjs/physic';
 export * from './Presets';
+export * from './weather';

package/dist/index.js

@@ -2506,6 +2506,7 @@ class Item {
     this.atk = signal(0);
     this.pdef = signal(0);
     this.sdef = signal(0);
+    this.icon = signal("");
     this.quantity = signal(1);
     this.onAdd = () => {
     };
@@ -2515,6 +2516,7 @@ class Item {
     this.atk.set(data?.atk ?? 0);
     this.pdef.set(data?.pdef ?? 0);
     this.sdef.set(data?.sdef ?? 0);
+    this.icon.set(data?.icon ?? "");
     this.onAdd = data?.onAdd?.bind(this) ?? (() => {
     });
   }
@@ -2522,6 +2524,12 @@ class Item {
 __decorateClass$2([
   id()
 ], Item.prototype, "id");
+__decorateClass$2([
+  sync()
+], Item.prototype, "name");
+__decorateClass$2([
+  sync()
+], Item.prototype, "icon");
 __decorateClass$2([
   sync()
 ], Item.prototype, "quantity");
@@ -2541,6 +2549,7 @@ class Skill {
     this.name = signal("");
     this.description = signal("");
     this.spCost = signal(0);
+    this.icon = signal("");
     this.hitRate = signal(0);
     this.power = signal(0);
     this.coefficient = signal({});
@@ -2551,11 +2560,21 @@ class Skill {
     this.hitRate.set(data?.hitRate ?? 0);
     this.power.set(data?.power ?? 0);
     this.coefficient.set(data?.coefficient ?? {});
+    this.icon.set(data?.icon ?? "");
   }
 }
 __decorateClass$1([
   id()
 ], Skill.prototype, "id");
+__decorateClass$1([
+  sync()
+], Skill.prototype, "name");
+__decorateClass$1([
+  sync()
+], Skill.prototype, "spCost");
+__decorateClass$1([
+  sync()
+], Skill.prototype, "icon");
 
 var __defProp = Object.defineProperty;
 var __decorateClass = (decorators, target, key, kind) => {
@@ -9686,8 +9705,8 @@ class PredictionController {
     this.lastAckFrame = 0;
     this.lastAckTick = 0;
     this.correctionThreshold = config.correctionThreshold ?? 5;
-    this.historyTtlMs = config.historyTtlMs ?? 2e3;
-    this.maxHistoryEntries = config.maxHistoryEntries ?? 200;
+    this.historyTtlMs = config.historyTtlMs ?? 1e4;
+    this.maxHistoryEntries = config.maxHistoryEntries ?? 1200;
   }
   recordInput(direction, timestamp) {
     const frame = ++this.frameCounter;
@@ -9705,6 +9724,9 @@ class PredictionController {
   hasPendingInputs() {
     return this.history.length > 0;
   }
+  getPendingInputs() {
+    return [...this.history];
+  }
   queueServerSnapshot(snapshot) {
     if (this.hasPendingInputs()) {
       this.pendingSnapshot = snapshot;
@@ -9721,22 +9743,59 @@ class PredictionController {
   }
   applyServerAck(ack) {
     if (typeof ack.frame !== "number") {
-      return;
+      const result2 = {
+        acknowledgedFrame: this.lastAckFrame,
+        acknowledgedTick: this.lastAckTick,
+        pendingInputs: [...this.history],
+        needsReconciliation: false
+      };
+      if (ack.state) {
+        result2.state = ack.state;
+      }
+      return result2;
     }
-    this.lastAckFrame = Math.max(this.lastAckFrame, ack.frame);
-    if (typeof ack.serverTick === "number") {
-      this.lastAckTick = Math.max(this.lastAckTick, ack.serverTick);
+    if (ack.frame < this.lastAckFrame) {
+      const result2 = {
+        acknowledgedFrame: this.lastAckFrame,
+        acknowledgedTick: this.lastAckTick,
+        pendingInputs: [...this.history],
+        needsReconciliation: false
+      };
+      if (ack.state) {
+        result2.state = ack.state;
+      }
+      return result2;
     }
+    const nextAckFrame = Math.max(this.lastAckFrame, ack.frame);
+    const nextAckTick = typeof ack.serverTick === "number" ? Math.max(this.lastAckTick, ack.serverTick) : this.lastAckTick;
+    let needsReconciliation = false;
+    if (ack.state) {
+      const acknowledgedEntry = this.history.find(
+        (entry) => entry.frame === nextAckFrame && !!entry.state
+      );
+      const comparisonState = acknowledgedEntry?.state ?? this.config.getCurrentState();
+      const dx = comparisonState.x - ack.state.x;
+      const dy = comparisonState.y - ack.state.y;
+      const distance = Math.hypot(dx, dy);
+      needsReconciliation = distance > this.correctionThreshold;
+    }
+    this.lastAckFrame = nextAckFrame;
+    this.lastAckTick = nextAckTick;
     this.history = this.history.filter((entry) => entry.frame > this.lastAckFrame);
-    if (ack.state && !this.hasPendingInputs()) {
-      this.applySnapshot(ack.state);
-      this.pendingSnapshot = null;
-      return;
-    }
-    if (this.pendingSnapshot && !this.hasPendingInputs()) {
+    if (!needsReconciliation && this.pendingSnapshot && !this.hasPendingInputs()) {
       this.applySnapshot(this.pendingSnapshot);
       this.pendingSnapshot = null;
     }
+    const result = {
+      acknowledgedFrame: this.lastAckFrame,
+      acknowledgedTick: this.lastAckTick,
+      pendingInputs: [...this.history],
+      needsReconciliation
+    };
+    if (ack.state) {
+      result.state = ack.state;
+    }
+    return result;
   }
   cleanup(now) {
     this.trimHistory(now);
@@ -10043,12 +10102,17 @@ class RpgCommonMap {
   }
   loadPhysic() {
     this.clearPhysic();
-    const hitboxes = this.data()?.hitboxes ?? [];
-    const gap = 100;
-    this.addStaticHitbox("map-width-left", -gap, 0, gap, this.data().height);
-    this.addStaticHitbox("map-width-right", this.data().width, 0, gap, this.data().height);
-    this.addStaticHitbox("map-height-top", 0, -gap, this.data().width, gap);
-    this.addStaticHitbox("map-height-bottom", 0, this.data().height, this.data().width, gap);
+    const mapData = this.data?.();
+    const mapWidth = typeof mapData?.width === "number" ? mapData.width : 0;
+    const mapHeight = typeof mapData?.height === "number" ? mapData.height : 0;
+    const hitboxes = Array.isArray(mapData?.hitboxes) ? mapData.hitboxes : [];
+    if (mapWidth > 0 && mapHeight > 0) {
+      const gap = 100;
+      this.addStaticHitbox("map-width-left", -gap, 0, gap, mapHeight);
+      this.addStaticHitbox("map-width-right", mapWidth, 0, gap, mapHeight);
+      this.addStaticHitbox("map-height-top", 0, -gap, mapWidth, gap);
+      this.addStaticHitbox("map-height-bottom", 0, mapHeight, mapWidth, gap);
+    }
     for (let staticHitbox of hitboxes) {
       if ("x" in staticHitbox) {
         this.addStaticHitbox(staticHitbox.id ?? generateShortUUID(), staticHitbox.x, staticHitbox.y, staticHitbox.width, staticHitbox.height);
@@ -10058,13 +10122,29 @@ class RpgCommonMap {
     }
     this.playersSubscription = this.players.observable.subscribe(
       ({ value: player, type, key }) => {
+        if (type === "remove") {
+          this.removeHitbox(key);
+          return;
+        }
+        if (type == "reset") {
+          if (!player) return;
+          for (let id in player) {
+            const _player = player[id];
+            _player.id = _player.id ?? id;
+            this.createCharacterHitbox(_player, "hero");
+          }
+          return;
+        }
         if (!player) return;
         if (type === "add") {
           player.id = key;
           this.createCharacterHitbox(player, "hero");
-        } else if (type === "remove") {
-          this.removeHitbox(key);
         } else if (type === "update") {
+          player.id = player.id ?? key;
+          if (!this.getBody(key)) {
+            this.createCharacterHitbox(player, "hero");
+            return;
+          }
           if (this.isPhysicsSyncingSignals) {
             return;
           }
@@ -10085,9 +10165,41 @@ class RpgCommonMap {
         }
         this.removeHitbox(key);
       } else if (type === "update") {
+        event.id = event.id ?? key;
+        if (!this.getBody(key)) {
+          this.createCharacterHitbox(event, "npc", {
+            mass: 100
+          });
+          return;
+        }
         this.updateCharacterHitbox(event);
+      } else if (type === "reset") {
+        for (const id in event) {
+          const _event = event[id];
+          if (!_event) continue;
+          _event.id = _event.id ?? id;
+          this.createCharacterHitbox(_event, "npc", {
+            mass: 100
+          });
+        }
       }
     });
+    const players = this.players();
+    for (const id in players) {
+      const player = players[id];
+      if (!player) continue;
+      player.id = player.id ?? id;
+      this.createCharacterHitbox(player, "hero");
+    }
+    const events = this.events();
+    for (const id in events) {
+      const event = events[id];
+      if (!event) continue;
+      event.id = event.id ?? id;
+      this.createCharacterHitbox(event, "npc", {
+        mass: 100
+      });
+    }
     if (this.autoTickEnabled) {
       this.tickSubscription = this.tick$.subscribe(({ delta }) => {
         this.runFixedTicks(delta);
@@ -10285,6 +10397,12 @@ class RpgCommonMap {
     if (!owner?.id) {
       return;
     }
+    const existingEntity = this.physic.getEntityByUUID(owner.id);
+    if (existingEntity) {
+      existingEntity.owner = owner;
+      this.updateCharacterHitbox(owner);
+      return;
+    }
     const hitbox = typeof owner.hitbox === "function" ? owner.hitbox() : owner.hitbox;
     const width = hitbox?.w ?? 32;
     const height = hitbox?.h ?? 32;
@@ -10301,6 +10419,9 @@ class RpgCommonMap {
   }
   updateCharacterHitbox(owner) {
     if (!owner?.id) return;
+    const entity = this.physic.getEntityByUUID(owner.id);
+    if (!entity) return;
+    entity.owner = owner;
     const hitbox = typeof owner.hitbox === "function" ? owner.hitbox() : owner.hitbox;
     const width = hitbox?.w ?? 32;
     const height = hitbox?.h ?? 32;
@@ -10688,22 +10809,26 @@ class RpgCommonMap {
         }
       }
     });
-    const entityWidth = width;
-    const entityHeight = height;
     entity.onPositionChange(({ x, y }) => {
+      const currentOwner = entity.owner;
+      if (!currentOwner) {
+        return;
+      }
+      const entityWidth = entity.width || width;
+      const entityHeight = entity.height || height;
       const topLeftX2 = x - entityWidth / 2;
       const topLeftY2 = y - entityHeight / 2;
       let changed = false;
-      if (typeof owner.x === "function" && typeof owner.x.set === "function") {
-        owner.x.set(Math.round(topLeftX2));
+      if (typeof currentOwner.x === "function" && typeof currentOwner.x.set === "function") {
+        currentOwner.x.set(Math.round(topLeftX2));
         changed = true;
       }
-      if (typeof owner.y === "function" && typeof owner.y.set === "function") {
-        owner.y.set(Math.round(topLeftY2));
+      if (typeof currentOwner.y === "function" && typeof currentOwner.y.set === "function") {
+        currentOwner.y.set(Math.round(topLeftY2));
         changed = true;
       }
       if (changed) {
-        owner.applyFrames?.();
+        currentOwner.applyFrames?.();
       }
     });
     entity.addResolutionFilter((self, other) => {