@wayward/types 2.11.3-beta.dev.20220123.2 → 2.11.4-beta.dev.20220127.1

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

@@ -10,8 +10,34 @@
  */
 import type Doodad from "game/doodad/Doodad";
 import type { DoodadType, DoodadTypeGroup } from "game/doodad/IDoodad";
+import type { ActionType } from "game/entity/action/IAction";
+import type Item from "game/item/Item";
 import type TileEvent from "game/tile/TileEvent";
 import type { IVector3 } from "utilities/math/IVector";
+/**
+ * Includes all protected items by default
+ */
+export interface IGetItemOptions {
+    /**
+     * True to exclude protected items
+     */
+    excludeProtectedItems: boolean;
+    /**
+     * True to only include protected items if they pass an item.willBreakOnDamage() check.
+     * excludeProtectedItems must be set to true for this to work.
+     */
+    includeProtectedItemsThatWillNotBreak: ActionType;
+    /**
+     * Item will be ignored
+     */
+    ignoreItem?: Item;
+}
+export interface IGetItemsOptions extends IGetItemOptions {
+    /**
+     * Include sub containers in the search
+     */
+    includeSubContainers: boolean;
+}
 export declare enum CraftStatus {
     Invalid = 0,
     Failed = 1,

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

@@ -17,7 +17,7 @@ import type Player from "game/entity/player/Player";
 import { Quality } from "game/IObject";
 import type { ContainerReference, IContainable, IContainer, IItemDescription, IItemWeightComponent } from "game/item/IItem";
 import { ItemType, ItemTypeGroup } from "game/item/IItem";
-import type { IAddToContainerOptions, IRequirementInfo } from "game/item/IItemManager";
+import type { IAddToContainerOptions, IGetItemOptions, IGetItemsOptions, IRequirementInfo } from "game/item/IItemManager";
 import { CraftStatus, WeightType, ContainerReferenceSource } from "game/item/IItemManager";
 import Item from "game/item/Item";
 import type ItemRecipeRequirementChecker from "game/item/ItemRecipeRequirementChecker";
@@ -188,16 +188,16 @@ export default class ItemManager extends ObjectManager<Item, IItemManagerEvents>
     /**
      * Get the best tier item
      */
-    getBestSafeItemInContainerByUse(container: IContainer, action: ActionType, allowProtectedItems?: boolean, actionMayDamageItem?: boolean, consumable?: boolean): Item | undefined;
-    getItemInContainer(container: IContainer, itemTypeSearch: ItemType, ignoreItem?: Item, allowProtectedItems?: boolean): Item | undefined;
-    getItemForHuman(human: Human, search: ItemType | ItemTypeGroup, ignoreItem?: Item, allowProtectedItems?: boolean): Item | undefined;
-    getItemInContainerByGroup(container: IContainer, itemTypeGroupSearch: ItemTypeGroup, ignoreItem?: Item, allowProtectedItems?: boolean): Item | undefined;
+    getBestSafeItemInContainerByUse(container: IContainer, action: ActionType, options?: Partial<IGetItemsOptions>, consumable?: boolean): Item | undefined;
+    getItemInContainer(container: IContainer, itemTypeSearch: ItemType, options?: Partial<IGetItemOptions>): Item | undefined;
+    getItemForHuman(human: Human, search: ItemType | ItemTypeGroup, options?: Partial<IGetItemOptions>): Item | undefined;
+    getItemInContainerByGroup(container: IContainer, itemTypeGroupSearch: ItemTypeGroup, options?: Partial<IGetItemOptions>): Item | undefined;
     getItemInAdjacentContainersByGroup(position: IVector3, itemTypeGroupSearch: ItemTypeGroup): Item | undefined;
-    getItemsInContainer(container: IContainer, includeSubContainers?: boolean, allowProtectedItems?: boolean): Item[];
-    getItemsInContainerByType(container: IContainer, itemType: ItemType, includeSubContainers?: boolean, filterText?: string): Item[];
-    getItemsInContainerByGroup(container: IContainer, itemGroup: ItemTypeGroup, includeSubContainers?: boolean): Item[];
-    getItemInInventoryByGroup(human: Human, itemTypeGroupSearch: ItemTypeGroup, ignoreItem?: Item): Item | undefined;
-    isItemInContainer(container: IContainer, itemTypeSearch: ItemType, ignoreItem?: Item): boolean;
+    getItemsInContainer(container: IContainer, options?: Partial<IGetItemsOptions>): Item[];
+    getItemsInContainerByType(container: IContainer, itemType: ItemType, options?: Partial<IGetItemsOptions>, filterText?: string): Item[];
+    getItemsInContainerByGroup(container: IContainer, itemGroup: ItemTypeGroup, options?: Partial<IGetItemsOptions>): Item[];
+    getItemInInventoryByGroup(human: Human, itemTypeGroupSearch: ItemTypeGroup, options?: Partial<IGetItemOptions>): Item | undefined;
+    isItemInContainer(container: IContainer, itemTypeSearch: ItemType, options?: Partial<IGetItemOptions>): boolean;
     isContainableInContainer(containable: IContainable, container: IContainer): boolean;
     getAdjacentContainers(humanOrPosition: Human | IVector3, includeNpcs?: boolean, ignoreOptions?: boolean): IContainer[];
     isContainableInAdjacentContainer(player: Player, containable: IContainable, includeNpcs?: boolean, ignoreOptions?: boolean): boolean;
@@ -207,7 +207,7 @@ export default class ItemManager extends ObjectManager<Item, IItemManagerEvents>
      * Returns ordered items for the containers
      * Note: It may return the real containedItems array!
      */
-    getOrderedContainerItems(container: IContainer, allowProtectedItems?: boolean): Item[];
+    getOrderedContainerItems(container: IContainer, options?: Partial<IGetItemOptions>): Item[];
     reduceDismantleWeight(createdItems: Item[], itemWeight: number): void;
     getItemTypeTranslation(itemType: ItemType | ItemTypeGroup): Translation;
     getItemTypeTranslation(itemType: ItemType | ItemTypeGroup, count: number): Translation;

package/definitions/game/multiplayer/IMultiplayer.d.ts

@@ -105,6 +105,8 @@ export declare enum MultiplayerSyncCheck {
 export declare const maxPlayers = 32;
 export declare const packetTickRate = 16;
 export declare const defaultServerPort = 38740;
+export declare const defaultSshServerPort = 38742;
+export declare const defaultSshServerUsername = "wayward";
 export declare const steamLobbyPrefix = "steam:";
 export declare const checkConnectionMatchmakingId = "check";
 export declare const defaultSyncChecks: MultiplayerSyncCheck[];

package/definitions/game/multiplayer/dedicatedServer/ssh/ISsh.d.ts

@@ -8,6 +8,7 @@
  * Wayward is a copyrighted and licensed work. Modification and/or distribution of any source files is prohibited. If you wish to modify the game in any way, please refer to the modding guide:
  * https://github.com/WaywardGame/types/wiki
  */
+import type * as ssh2 from "ssh2";
 import type Log from "utilities/Log";
 export declare const globalHistory: Map<string, string[]>;
 export declare const maxHistory = 50;
@@ -20,7 +21,7 @@ export interface ISshStream {
         toString(): string;
     }) => void): void;
 }
-export interface ISshSession {
+export interface ISshSession extends ssh2.Session {
     clientId: string;
     clientLog: Log;
 }

package/definitions/game/multiplayer/dedicatedServer/ssh/SshServer.d.ts

@@ -8,9 +8,10 @@
  * Wayward is a copyrighted and licensed work. Modification and/or distribution of any source files is prohibited. If you wish to modify the game in any way, please refer to the modding guide:
  * https://github.com/WaywardGame/types/wiki
  */
+import type * as ssh2 from "ssh2";
 import type { IFileSystem } from "@hosts/shared/ipc/fileSystem";
 export interface ISshServerOptions {
-    ssh2: any;
+    ssh2: typeof ssh2;
     crypto: any;
     fs: IFileSystem;
     serverName: string;

package/definitions/game/steamworks/ISteamworks.d.ts

@@ -35,8 +35,8 @@ export interface IDedicatedServerInfo {
         dailyChallenge?: boolean;
     };
     ssh: boolean;
-    sshPort?: number;
-    sshUsername?: string;
+    sshPort: number;
+    sshUsername: string;
     sshPassword?: string;
     devMode: boolean;
     syncChecks: MultiplayerSyncCheckLevel;

package/definitions/game/ui/component/dropdown/CreatureDropdown.d.ts

@@ -12,5 +12,5 @@ import { CreatureType } from "game/entity/creature/ICreature";
 import type { IDropdownOption } from "ui/component/Dropdown";
 import EnumDropdown from "ui/component/dropdown/EnumDropdown";
 export default class CreatureDropdown<OTHER_OPTIONS extends string = never> extends EnumDropdown<typeof CreatureType, OTHER_OPTIONS> {
-    constructor(defaultOption: OTHER_OPTIONS | CreatureType, options: Iterable<IDropdownOption<OTHER_OPTIONS>>);
+    constructor(defaultOption: OTHER_OPTIONS | CreatureType, options?: Iterable<IDropdownOption<OTHER_OPTIONS>>);
 }

package/definitions/game/ui/input/Bind.d.ts

@@ -65,7 +65,7 @@ declare enum BindingEvent {
     holding = 2
 }
 declare type BindingEventName = keyof typeof BindingEvent;
-export { BindingEventName as BindingEvent };
+export type { BindingEventName as BindingEvent };
 declare module Bind {
     /**
      * Registers a handler for when the given `Bindable` is pressed. This event won't be fired again until the `Bindable` was then *released*.

package/definitions/game/ui/old/screens/InGameScreen.d.ts

@@ -8,6 +8,7 @@
  * Wayward is a copyrighted and licensed work. Modification and/or distribution of any source files is prohibited. If you wish to modify the game in any way, please refer to the modding guide:
  * https://github.com/WaywardGame/types/wiki
  */
+import { ActionType } from "game/entity/action/IAction";
 import { EquipType } from "game/entity/IHuman";
 import type { IContainer, IDismantleComponent } from "game/item/IItem";
 import { ItemType } from "game/item/IItem";
@@ -79,7 +80,6 @@ export default class InGameScreen extends BaseScreen {
     actionsMenuCentered: boolean;
     private activeContainer;
     private multipleContainersOpened;
-    private contextMenuBindPressed;
     private sortableElement;
     private sortableElementPosition;
     private sortableElementTargetContainer;
@@ -237,7 +237,6 @@ export default class InGameScreen extends BaseScreen {
     onItemEquipToggle(api: IBindHandlerApi): boolean;
     onItemProtectToggle(api: IBindHandlerApi): boolean;
     onContextMenu(api: IBindHandlerApi): boolean;
-    onContextMenuReleased(_api: IBindHandlerApi): void;
     onQuickSlotToggle(api: IBindHandlerApi): boolean;
     onQuickSlot(api: IBindHandlerApi): boolean;
     onQuickSlotClear(api: IBindHandlerApi): boolean;
@@ -252,6 +251,7 @@ export default class InGameScreen extends BaseScreen {
     onHandToggle(api: IBindHandlerApi): boolean;
     onInput(api: IBindHandlerApi): void;
     private clearActionsMenuTileOverlay;
+    getAutoActionItem(actionType: ActionType, allowProtectedItems?: boolean): Item | undefined;
     private runAutoAction;
     private runAction;
     private updateContextMenu;

package/definitions/hosts/shared/globals.d.ts

@@ -8,6 +8,6 @@
  * Wayward is a copyrighted and licensed work. Modification and/or distribution of any source files is prohibited. If you wish to modify the game in any way, please refer to the modding guide:
  * https://github.com/WaywardGame/types/wiki
  */
-export declare const gameVersionStage = "beta", gameVersionMajor = 2, gameVersionMinor = 11, gameVersionPatch = 3, gameVersionName = "Horizons";
+export declare const gameVersionStage = "beta", gameVersionMajor = 2, gameVersionMinor = 11, gameVersionPatch = 4, gameVersionName = "Horizons";
 export declare const gameVersion: string;
 export declare function registerGlobals(globalObject: any): void;

package/package.json

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