@wayward/types 2.11.0-beta.dev.20211124.1 → 2.11.0-beta.dev.20211126.1

package/definitions/game/game/doodad/Doodad.d.ts

@@ -132,7 +132,7 @@ export default class Doodad extends EventEmitter.Host<IDoodadEvents> implements
     isValid(): boolean;
     isInGroup(doodadTypeGroup: DoodadTypeGroup): boolean;
     updateGroupCache(doodadTypeGroup: DoodadTypeGroup): boolean;
-    getTile(): ITile;
+    getTile(ignoreCache?: boolean): ITile;
     getTileId(): number;
     getPoint(): IVector3;
     canGrow(): boolean;

package/definitions/game/game/doodad/IDoodad.d.ts

@@ -282,6 +282,11 @@ export declare enum DoodadType {
     CactusScarecrow = 123,
     PapayaTree = 124
 }
+/**
+ * All tree types that can be spawned during map gen
+ * !! This must be kept in sync with the tree list in setupTiles !!
+ */
+export declare type MapGenDoodadTrees = DoodadType.MapleTree | DoodadType.CoconutTree | DoodadType.JoshuaTree | DoodadType.SpruceTree | DoodadType.CypressTree | DoodadType.AppleTree | DoodadType.SpruceTreeWithSnow | DoodadType.WhitePineTree | DoodadType.WhitePineTreeWithSnow | DoodadType.PapayaTree;
 export declare enum DoodadTypeGroup {
     Invalid = 400,
     LitCampfire = 401,

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

@@ -55,11 +55,11 @@ export default abstract class Human extends Entity implements IHasInsulation {
     readonly equipEffects: Map<EquipEffect, EquipEffects>;
     restData: IRestData | undefined;
     score: number;
-    skill: SkillManager;
     state: PlayerState;
     swimming: boolean;
     vehicleItemReference: ItemReference | undefined;
     identifier: string;
+    skill: SkillManager;
     private readonly privateStore;
     constructor();
     createSkillManager(): SkillManager;

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

@@ -13,9 +13,10 @@ import { Stat } from "game/entity/IStats";
 import type { IStatHost } from "game/entity/Stats";
 import type Stats from "game/entity/Stats";
 export declare class StatsFactory {
-    private readonly host;
     private readonly stats;
+    private readonly _host;
     constructor(host: IStatHost);
+    private get host();
     /**
      * If the condition is not falsey, runs the initializer on this factory.
      */

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

@@ -17,9 +17,10 @@ export interface IStatHost extends EventEmitter.Host<IStatEvents> {
     stats: IStats;
 }
 export default class Stats<T extends IStatHost> {
-    private readonly host;
     private get stats();
+    private readonly _host;
     constructor(host: T);
+    private get host();
     /**
      * Initializes the given stat from a `StatFactory` instance.
      * @param factory The factory to initialize the stat from.

package/definitions/game/game/entity/action/Actions.d.ts

@@ -23,12 +23,12 @@ declare const actionDescriptions: {
     49: import("./Action").Action<[], import("../player/Player").default | import("../npc/NPC").default, boolean, []>;
     25: import("./Action").Action<[import("game/entity/action/IAction").ActionArgument.ItemNearby], import("../player/Player").default, void, [import("../../item/Item").default]>;
     66: import("./Action").Action<[import("game/entity/action/IAction").ActionArgument.ItemType, import("game/entity/action/IAction").ActionArgument.ItemArrayNearby, import("game/entity/action/IAction").ActionArgument.ItemArrayNearby, [import("game/entity/action/IAction").ActionArgument.ItemNearby, import("game/entity/action/IAction").ActionArgument.Undefined], [import("game/entity/action/IAction").ActionArgument.Boolean, import("game/entity/action/IAction").ActionArgument.Undefined]], import("../player/Player").default | import("../npc/NPC").default, void, [import("../../item/IItem").ItemType, import("../../item/Item").default[], import("../../item/Item").default[], (import("../../item/Item").default | undefined)?, (boolean | undefined)?]>;
+    31: import("./Action").Action<[import("game/entity/action/IAction").ActionArgument.ItemNearby], import("../player/Player").default | import("../npc/NPC").default, void, [import("../../item/Item").default]>;
     79: import("./Action").Action<[], import("../player/Player").default | import("../npc/NPC").default, void, []>;
     12: import("./Action").Action<[[import("game/entity/action/IAction").ActionArgument.ItemInventory, import("game/entity/action/IAction").ActionArgument.Undefined]], import("../player/Player").default | import("../npc/NPC").default, void, [(import("../../item/Item").default | undefined)?]>;
     0: import("./Action").Action<[import("game/entity/action/IAction").ActionArgument.ItemNearby], import("../player/Player").default | import("../npc/NPC").default, void, [import("../../item/Item").default]>;
     39: import("./Action").Action<[import("game/entity/action/IAction").ActionArgument.ItemNearby], import("../player/Player").default | import("../npc/NPC").default, void, [import("../../item/Item").default]>;
     38: import("./Action").Action<[import("game/entity/action/IAction").ActionArgument.ItemNearby], import("../player/Player").default | import("../npc/NPC").default, void, [import("../../item/Item").default]>;
-    31: import("./Action").Action<[import("game/entity/action/IAction").ActionArgument.ItemNearby], import("../player/Player").default | import("../npc/NPC").default, void, [import("../../item/Item").default]>;
     61: import("./Action").Action<[], import("../player/Player").default | import("../npc/NPC").default, void, []>;
     8: import("./Action").Action<[import("game/entity/action/IAction").ActionArgument.ItemNearby], import("../player/Player").default | import("../npc/NPC").default, void, [import("../../item/Item").default]>;
     55: import("./Action").Action<[import("game/entity/action/IAction").ActionArgument.ItemNearby, [import("game/entity/action/IAction").ActionArgument.Boolean, import("game/entity/action/IAction").ActionArgument.Undefined], [import("game/entity/action/IAction").ActionArgument.Boolean, import("game/entity/action/IAction").ActionArgument.Undefined], [import("game/entity/action/IAction").ActionArgument.String, import("game/entity/action/IAction").ActionArgument.Undefined]], import("../player/Player").default | import("../npc/NPC").default, void, [import("../../item/Item").default, (boolean | undefined)?, (boolean | undefined)?, (string | undefined)?]>;

package/definitions/game/game/entity/action/IAction.d.ts

@@ -63,7 +63,7 @@ export declare enum ActionType {
     OpenContainer = 28,
     Preserve = 29,
     OpenBottle = 30,
-    DrinkCure = 31,
+    Cure = 31,
     TellTime = 32,
     SailToCivilization = 33,
     Transmogrify = 34,

package/definitions/game/game/entity/creature/corpse/Corpse.d.ts

@@ -15,6 +15,7 @@ import type { IObject } from "game/IObject";
 import type { IslandId } from "game/island/IIsland";
 import { ItemType } from "game/item/IItem";
 import type { IReferenceable } from "game/reference/IReferenceManager";
+import type { ITile } from "game/tile/ITerrain";
 import type { ISerializedTranslation } from "language/ITranslation";
 import type Translation from "language/Translation";
 import type { IVector3 } from "utilities/math/IVector";
@@ -48,6 +49,7 @@ export default class Corpse extends EventEmitter.Host<ICorpseEvents> implements
      * - `corpse.getName(undefined, 3)` // "acid spitter demons"
      */
     getName(article?: boolean, count?: number): Translation;
+    getTile(): ITile;
     update(): void;
     getResources(clientSide?: boolean): ItemType[];
 }

package/definitions/game/game/entity/player/Player.d.ts

@@ -10,7 +10,7 @@
  */
 import type { IEventEmitter } from "event/EventEmitter";
 import type Doodad from "game/doodad/Doodad";
-import { ActionType } from "game/entity/action/IAction";
+import type { ActionType } from "game/entity/action/IAction";
 import Creature from "game/entity/creature/Creature";
 import { CreatureType } from "game/entity/creature/ICreature";
 import Human from "game/entity/Human";

package/definitions/game/game/entity/player/quest/QuestManager.d.ts

@@ -17,13 +17,14 @@ import { QuestType } from "game/entity/player/quest/quest/IQuest";
 import type { RequirementInstance } from "game/entity/player/quest/quest/Quest";
 import type { Game } from "game/Game";
 export default class QuestManager extends EventEmitter.Host<IQuestManagerEvents> {
-    private readonly host;
     static reset(): void;
     private readonly quests;
     private readonly eventBusTriggers;
     private readonly hostTriggers;
     private readonly initializedQuests;
+    private readonly _host;
     constructor(host: Player);
+    private get host();
     /**
      * Get all quests
      */

package/definitions/game/game/entity/skill/SkillManager.d.ts

@@ -27,14 +27,16 @@ export interface ISkillEvents {
     skillChange(skill: SkillType, value: number, oldValue: number): any;
 }
 export declare type SkillSet = Record<SkillType, ISkillLevel>;
+export interface ISkillHost extends EventEmitter.Host<ISkillEvents> {
+    readonly island: Island;
+}
 export default class SkillManager {
-    private readonly host;
     private readonly configuration;
     private skills;
     private cachedTotalSkill?;
-    constructor(host: EventEmitter.Host<ISkillEvents> & {
-        readonly island: Island;
-    }, configuration: ISkillConfiguration);
+    private readonly _host;
+    constructor(host: ISkillHost, configuration: ISkillConfiguration);
+    private get host();
     has(skill: SkillType): boolean;
     /**
      * @returns whether the given skill is maxed-out. Ignores bonus.

package/definitions/game/game/entity/status/StatusEffect.d.ts

@@ -58,8 +58,9 @@ export default abstract class StatusEffect extends EventEmitter.Host<IStatusEffe
     readonly type: StatusType;
     static update(effect: StatusEffect): void;
     private registered;
-    protected readonly entity: Entity;
+    private readonly _entity;
     constructor(type: StatusType, entity: Entity | undefined);
+    protected get entity(): Entity;
     getOptions(): IGameOptionsStatusEffect;
     register(): void;
     /**

package/definitions/game/game/inspection/infoProviders/item/ItemUses.d.ts

@@ -50,10 +50,10 @@ export default class ItemUses extends Uses<Item> {
         type: ItemType;
         description: IItemDescription;
         quality: import("../../../IObject").Quality;
-        action: ActionType.Eat | ActionType.DrinkItem | ActionType.Heal | ActionType.DrinkCure | ActionType.HealOther;
-        union: import("../UseInfo").IUseInfoBase<Item, ActionType.Eat | ActionType.DrinkItem | ActionType.Heal | ActionType.DrinkCure | ActionType.HealOther>;
+        action: ActionType.Eat | ActionType.DrinkItem | ActionType.Heal | ActionType.Cure | ActionType.HealOther;
+        union: import("../UseInfo").IUseInfoBase<Item, ActionType.Eat | ActionType.DrinkItem | ActionType.Heal | ActionType.Cure | ActionType.HealOther>;
         details: Set<symbol>;
-    }, ActionType.Eat | ActionType.DrinkItem | ActionType.Heal | ActionType.DrinkCure | ActionType.HealOther, {
+    }, ActionType.Eat | ActionType.DrinkItem | ActionType.Heal | ActionType.Cure | ActionType.HealOther, {
         generateUseConsumeTooltip: () => (tooltip: import("../../../../ui/tooltip/Tooltip").default, stat: import("../../../entity/IStats").Stat, base: number) => import("../../../../ui/tooltip/Tooltip").default;
     }, Item> | import("../UseInfo").default<{
         objectType: CreationId.Item;

package/definitions/game/game/inspection/infoProviders/item/use/ItemConsumeInfo.d.ts

@@ -26,10 +26,10 @@ declare const _default: UseInfo<{
     type: import("../../../../item/IItem").ItemType;
     description: import("../../../../item/IItem").IItemDescription;
     quality: import("../../../../IObject").Quality;
-    action: ActionType.Eat | ActionType.DrinkItem | ActionType.Heal | ActionType.DrinkCure | ActionType.HealOther;
-    union: import("game/inspection/infoProviders/UseInfo").IUseInfoBase<Item, ActionType.Eat | ActionType.DrinkItem | ActionType.Heal | ActionType.DrinkCure | ActionType.HealOther>;
+    action: ActionType.Eat | ActionType.DrinkItem | ActionType.Heal | ActionType.Cure | ActionType.HealOther;
+    union: import("game/inspection/infoProviders/UseInfo").IUseInfoBase<Item, ActionType.Eat | ActionType.DrinkItem | ActionType.Heal | ActionType.Cure | ActionType.HealOther>;
     details: Set<symbol>;
-}, ActionType.Eat | ActionType.DrinkItem | ActionType.Heal | ActionType.DrinkCure | ActionType.HealOther, {
+}, ActionType.Eat | ActionType.DrinkItem | ActionType.Heal | ActionType.Cure | ActionType.HealOther, {
     generateUseConsumeTooltip: () => (tooltip: Tooltip, stat: Stat, base: number) => Tooltip;
 }, Item>;
 export default _default;

package/definitions/game/game/island/Island.d.ts

@@ -91,8 +91,10 @@ export default class Island extends EventEmitter.Host<IIslandEvents> implements
      */
     readonly players: Set<Player>;
     previousSaveVersion: IVersionInfo | undefined;
+    brokenReferencesCount: number;
     civilizationScore: number;
     spawnPoint: IVector3;
+    private _loadedReferences;
     private _tiles;
     private _world;
     modifiersCollection?: IslandModifiersCollection;
@@ -128,7 +130,7 @@ export default class Island extends EventEmitter.Host<IIslandEvents> implements
      * Removes all players and stores tiles references
      * @param resetState True if the game state is resetting
      */
-    unload(resetState?: boolean): void;
+    unload(): void;
     delete(): void;
     private fastForward;
     hydrateFromOldGame(oldGame: IGameOld): void;
@@ -251,5 +253,9 @@ export default class Island extends EventEmitter.Host<IIslandEvents> implements
     rangeFinder(weaponRange: number, playerSkillLevel: number, useMaxRange?: boolean): number;
     getRandomQuality(bonusQuality?: number): Quality.None | Quality.Superior | Quality.Remarkable | Quality.Exceptional;
     getQualityDurabilityBonus(quality: Quality, itemDurability: number, getMax?: boolean): number;
+    /**
+     * Only allow loading references once
+     * Even if an island is unloaded, the loaded references will remain
+     */
     loadReferences(): void;
 }

package/definitions/game/game/island/IslandManager.d.ts

@@ -21,8 +21,14 @@ export default class IslandManager extends Map<IslandId, Island> {
     get default(): Island;
     /**
      * Gets an island by id
+     * @throws Errors if the island does not exist
      */
     get(islandId: IslandId): Island;
+    /**
+     * Gets an island by id. Try to use "get" instead!
+     * @returns Island or undefined if it does not exist
+     */
+    getIfExists(islandId: IslandId): Island | undefined;
     /**
      * Gets an island by position
      */

package/definitions/game/game/item/IItem.d.ts

@@ -243,7 +243,7 @@ export declare type ConsumeItemStatsTuple = [health: number, stamina: number, hu
 export interface IOnUse {
     [ActionType.Apply]?: ConsumeItemStatsTuple;
     [ActionType.Build]?: DoodadType | [build: DoodadType, keepItem: true];
-    [ActionType.DrinkCure]?: ConsumeItemStatsTuple;
+    [ActionType.Cure]?: ConsumeItemStatsTuple;
     [ActionType.DrinkItem]?: ConsumeItemStatsTuple;
     [ActionType.Eat]?: ConsumeItemStatsTuple;
     [ActionType.Heal]?: ConsumeItemStatsTuple;

package/definitions/game/game/item/ItemManager.d.ts

@@ -112,7 +112,7 @@ export default class ItemManager extends ObjectManager<Item, IItemManagerEvents>
     getPoint(itemOrContainer?: Item | IContainer): Vector3 | undefined;
     resolveContainer(container?: IContainer): Doodad | Item | Player | NPC | IContainer | ITile | undefined;
     getContainerReference(containable: IContainable | undefined, showWarnings?: boolean): ContainerReference;
-    derefenceContainerReference(containerReference: ContainerReference): IContainable | undefined;
+    derefenceContainerReference(containerReference: ContainerReference, showWarnings?: boolean): IContainable | undefined;
     hashContainer(containable: IContainable): string;
     hashContainerReference(containerReference: ContainerReference): string;
     updateContainedWithin(containable: IContainable, containedWithin: IContainer | undefined): void;
@@ -182,7 +182,7 @@ export default class ItemManager extends ObjectManager<Item, IItemManagerEvents>
     getNPCWithItemInInventory(containable: IContainable): NPC | undefined;
     countItemsInContainer(containers: IContainer | IContainer[], itemTypeSearch: ItemType, ignoreItem?: Item): number;
     countItemsInContainerByGroup(containers: IContainer | IContainer[], itemTypeGroupSearch: ItemTypeGroup, ignoreItem?: Item): number;
-    getSafeItemInContainerByUse(container: IContainer, action: ActionType, allowProtectedItems?: boolean): Item | undefined;
+    getSafeItemInContainerByUse(container: IContainer, action: ActionType, allowProtectedItems?: boolean, canDamageItem?: boolean, consumable?: boolean): Item | undefined;
     getItemInContainer(container: IContainer, itemTypeSearch: ItemType, ignoreItem?: Item, allowProtectedItems?: boolean): Item | undefined;
     getItemForHuman(human: Human, search: ItemType | ItemTypeGroup, allowProtectedItems?: boolean): Item | undefined;
     getItemInContainerByGroup(container: IContainer, itemTypeGroupSearch: ItemTypeGroup, ignoreItemId?: number, allowProtectedItems?: boolean): Item | undefined;

package/definitions/game/game/item/ItemReferenceManager.d.ts

@@ -16,6 +16,6 @@ declare module ItemReferenceManager {
      */
     function getContainerReferenceSlow(containable: IContainable, includeIsland?: boolean): ContainerReference;
     function getContainerReferenceInIsland(island: Island, containable: IContainable | undefined, showWarnings?: boolean): ContainerReference;
-    function derefenceContainerReference(containerRef: ContainerReference, island?: Island): object | undefined;
+    function derefenceContainerReference(containerRef: ContainerReference, island?: Island, showWarnings?: boolean): object | undefined;
 }
 export default ItemReferenceManager;

package/definitions/game/game/mapgen/IMapGen.d.ts

@@ -9,6 +9,7 @@
  * https://github.com/WaywardGame/types/wiki
  */
 import type { BiomeTypes } from "game/biome/IBiome";
+import type { MapGenDoodadTrees } from "game/doodad/IDoodad";
 import type Island from "game/island/Island";
 import type { ITemplateOptions } from "game/mapgen/MapGenHelpers";
 import type { Load } from "game/meta/Loading";
@@ -51,7 +52,7 @@ export interface IMapGenGenerateInput {
     getBiomeHeightMap(x: number, y: number): number;
     getRandomQuality(tileType: number): number;
     setTileGen(x: number, y: number, z: number, value: number): void;
-    setTree(type: number, override?: number): number;
+    setTree(type: MapGenDoodadTrees, override?: number): number;
     setTileVein(x: number, y: number, z: number, value: number, terrainType: number): void;
     setCaveOres(dValue: number, tileData: number, x: number, y: number, z: number): void;
 }

package/definitions/game/renderer/notifier/Notifier.d.ts

@@ -30,7 +30,7 @@ export default class Notifier {
     private spriteAtlas;
     constructor(context: RendererContext, capacity: number);
     setResources(resourceContainer: IResourceContainer): void;
-    clear(): void;
+    delete(): void;
     addItem(location: INotificationLocation, itemNotifierType: ItemNotifierType, type: ItemType, _broken?: boolean): void;
     addCreature(location: INotificationLocation, creatureNotifierType: CreatureNotifierType, type: CreatureType, aberrant?: boolean): void;
     addStat(location: INotificationLocation, type: StatNotificationType, value: number): void;

package/definitions/test/core/applicationInteractions.d.ts

@@ -14,6 +14,7 @@ import { Direction } from "../../game/utilities/math/Direction";
 import type { Random, SeededGenerator } from "../../game/utilities/random/Random";
 import type { INewGameOptions } from "../interfaces";
 import { GameMode } from "../interfaces";
+import type { IslandId } from "../../game/game/island/IIsland";
 import ApplicationDom from "./applicationDom";
 import ApplicationLogger from "./applicationLogger";
 export default class ApplicationInteractions {
@@ -64,6 +65,8 @@ export default class ApplicationInteractions {
     joinMultiplayerDedicatedServer(gameCode: string): Promise<void>;
     pauseGame(): Promise<void>;
     unpauseGame(): Promise<void>;
+    moveToIslandId(islandId: IslandId): Promise<void>;
+    verifyIslandReferences(islandId: IslandId): Promise<void>;
     getGameStateAsJson(): Promise<string>;
     saveStateAndVerifyWithPrevious(): Promise<void>;
     clearSavedStates(): void;

package/definitions/test/core/chromeDriver.d.ts

@@ -9,10 +9,11 @@
  * https://github.com/WaywardGame/types/wiki
  */
 export default class ChromeDriver {
+    private readonly appId;
     readonly port: number;
     private process;
     private exitHandler;
-    constructor();
+    constructor(appId: string);
     start(): Promise<void>;
     stop(): void;
 }

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@wayward/types",
 	"description": "TypeScript declarations for Wayward, used for modding.",
-	"version": "2.11.0-beta.dev.20211124.1",
+	"version": "2.11.0-beta.dev.20211126.1",
 	"license": "MIT",
 	"repository": {
 		"type": "git",