@wayward/types 2.12.0-beta.dev.20220904.1 → 2.12.0-beta.dev.20220905.1

package/definitions/game/game/entity/Entity.d.ts

@@ -15,7 +15,7 @@ import type { IDamageInfo } from "game/entity/creature/ICreature";
 import type Human from "game/entity/Human";
 import type { IEntityEvents, IProperties, IStatus, Property, StatusEffectChangeReason } from "game/entity/IEntity";
 import { DamageType, EntityType, MoveType, StatusType } from "game/entity/IEntity";
-import { Delay } from "game/entity/IHuman";
+import { Delay, MovingClientSide } from "game/entity/IHuman";
 import type { IStats } from "game/entity/IStats";
 import type NPC from "game/entity/npc/NPC";
 import type Player from "game/entity/player/Player";
@@ -30,14 +30,15 @@ import type { ITemperatureSource } from "game/temperature/ITemperature";
 import type { ITile } from "game/tile/ITerrain";
 import type { ISerializedTranslation } from "language/ITranslation";
 import type Translation from "language/Translation";
+import type { IRendererOrigin } from "renderer/context/RendererOrigin";
 import FieldOfView from "renderer/fieldOfView/FieldOfView";
 import type { CanASeeBType } from "renderer/fieldOfView/IFieldOfView";
-import type { ItemNotifierType, StatNotificationType } from "renderer/notifier/INotifier";
+import type { INotificationLocation, ItemNotifierType, StatNotificationType } from "renderer/notifier/INotifier";
 import { Direction } from "utilities/math/Direction";
 import type { IVector2, IVector3 } from "utilities/math/IVector";
 import Vector2 from "utilities/math/Vector2";
 import type { IVector4 } from "utilities/math/Vector4";
-export default abstract class Entity extends EventEmitter.Host<IEntityEvents> implements IReferenceable, IInspector, ITemperatureSource, IVector3 {
+export default abstract class Entity extends EventEmitter.Host<IEntityEvents> implements IReferenceable, IInspector, ITemperatureSource, INotificationLocation, IRendererOrigin, IVector3 {
     readonly stat: Stats<this>;
     entityType: EntityType;
     id: number;
@@ -47,13 +48,21 @@ export default abstract class Entity extends EventEmitter.Host<IEntityEvents> im
     x: number;
     y: number;
     /**
-     * Not guaranteed to be synced between the server and client for Player entities
+     * Not guaranteed to be synced between the server and client for Human entities
      */
     fromX: number;
     /**
-     * Not guaranteed to be synced between the server and client for Player entities
+     * Not guaranteed to be synced between the server and client for Human entities
      */
     fromY: number;
+    /**
+     * Not guaranteed to be synced between the server and client for Human entities
+     */
+    isMoving: boolean;
+    /**
+     * Only used for Human entities
+     */
+    movementCompleteZ: number | undefined;
     moveType: MoveType | undefined;
     anim: number;
     stopNextMovement: boolean;
@@ -65,7 +74,10 @@ export default abstract class Entity extends EventEmitter.Host<IEntityEvents> im
     islandId: IslandId;
     attackAnimationType: DamageType | undefined;
     attackAnimationTime: IMovementTime | undefined;
-    isMovingClientside: boolean;
+    /**
+     * The state of what the client thinks is happening to this entity (regarding movement)
+     */
+    movingClientside: MovingClientSide;
     allowSmartMovementClientside: boolean;
     protected _movementTime: {
         start: number;
@@ -118,9 +130,11 @@ export default abstract class Entity extends EventEmitter.Host<IEntityEvents> im
      * Faces the target and animates a bump into effect
      */
     animateBumpTowards(x: number, y: number): void;
+    protected setMoving(delay: Delay, fromX: number, fromY: number, toZ?: number): void;
     animateAttack(damageType: DamageType[] | undefined): void;
     getMovementPoint(timeStamp: number): IVector2;
     getMovementProgress(timeStamp: number): number;
+    protected onMovementCompleted(): void;
     getMoveType(): MoveType;
     setMoveType(moveType: MoveType): void;
     isInFov(): boolean;

package/definitions/game/game/entity/Human.d.ts

@@ -65,7 +65,6 @@ export default abstract class Human extends Entity implements IHasInsulation {
     handEquippedToLast: EquipType.OffHand | EquipType.MainHand;
     inventory: IContainer;
     isConnecting: boolean;
-    movementCompleteZ: number | undefined;
     options: Readonly<IOptions>;
     islandId: IslandId;
     readonly equipEffects: Map<EquipEffect, EquipEffects>;
@@ -82,7 +81,6 @@ export default abstract class Human extends Entity implements IHasInsulation {
     walkSoundCounter: number;
     containerSortInfo: Record<string, IContainerSortInfo>;
     dialogContainerInfo: Record<number, IDialogInfo>;
-    isMoving: boolean;
     readonly movementIntent: IMovementIntent;
     walkPath: IWalkPath | undefined;
     identifier: string;
@@ -91,7 +89,6 @@ export default abstract class Human extends Entity implements IHasInsulation {
     messages: IMessageManager;
     notes: INoteManager;
     private readonly privateStore;
-    finishedMovingClientside: boolean;
     nextMoveTime: number;
     nextMoveDirection: Direction.Cardinal | Direction.None | undefined;
     private lastVehicleMoveDirection;
@@ -129,6 +126,7 @@ export default abstract class Human extends Entity implements IHasInsulation {
      */
     isServer(): boolean;
     isMultiplayerHost(): boolean;
+    protected onMovementCompleted(): void;
     moveTowardsIsland(direction: Direction.Cardinal | Direction.None, options?: Partial<IMoveToIslandOptions>): Promise<void>;
     moveToIslandPosition(position: IVector2, options?: Partial<IMoveToIslandOptions>): Promise<void>;
     /**

package/definitions/game/game/entity/IHuman.d.ts

@@ -419,6 +419,12 @@ export interface IVoyageInfo {
     usedItems?: Item[];
     wantedItems?: ItemType[];
 }
+export declare enum MovingClientSide {
+    NoInput = 0,
+    Moving = 1,
+    Moved = 2,
+    PreNoInput = 3
+}
 /**
  * The swimming skill required to travel to another island
  *

package/definitions/game/game/entity/action/usable/UsableAction.d.ts

@@ -64,15 +64,17 @@ export interface IUsableActionUsing<REQUIREMENTS extends IUsableActionRequiremen
         validate(player: Player, value: Item): boolean;
     } ? Item : never) | (REQUIREMENTS["item"] extends {
         find(player: Player): Item;
-    } ? Item : never));
+    } ? Item : never) | (REQUIREMENTS["item"] extends {
+        allowOnlyItemType(player: Player, type: ItemType): boolean;
+    } ? undefined : never));
     itemType: ((REQUIREMENTS["item"] extends true ? ItemType : never) | (undefined extends REQUIREMENTS["item"] ? undefined : never) | (REQUIREMENTS["item"] extends {
         allowNone: true;
     } ? undefined : never) | (REQUIREMENTS["item"] extends {
         validate(player: Player, value: Item): boolean;
-    } ? ItemType : never) | (REQUIREMENTS["item"] extends {
+    } ? ItemType | undefined : never) | (REQUIREMENTS["item"] extends {
         find(player: Player): Item;
     } ? ItemType : never) | (REQUIREMENTS["item"] extends {
-        allowOnlyItemType(player: Player): boolean;
+        allowOnlyItemType(player: Player, type: ItemType): boolean;
     } ? ItemType : never));
     doodad: ((REQUIREMENTS["doodad"] extends true ? Doodad : never) | (undefined extends REQUIREMENTS["doodad"] ? undefined : never) | (REQUIREMENTS["doodad"] extends {
         allowNone: true;