@wayward/types 2.13.0-beta.dev.20230404.1 → 2.13.0-beta.dev.20230406.1

package/definitions/game/event/EventBuses.d.ts

@@ -30,6 +30,7 @@ import type Item from "game/item/Item";
 import type ItemManager from "game/item/ItemManager";
 import type Loading from "game/meta/Loading";
 import type Prompts from "game/meta/prompt/Prompts";
+import type { MilestoneManager } from "game/milestones/MilestoneManager";
 import type TileEvent from "game/tile/TileEvent";
 import type TileEventManager from "game/tile/TileEventManager";
 import type LanguageManager from "language/LanguageManager";
@@ -77,7 +78,8 @@ export declare enum EventBus {
     Ui = 32,
     UiActionBar = 33,
     UiMovementHandler = 34,
-    WorldRenderer = 35
+    WorldRenderer = 35,
+    Milestones = 36
 }
 declare const eventBuses: {
     [EventBus.Actions](): ActionExecutor<any, any, any, any, any>;
@@ -116,6 +118,7 @@ declare const eventBuses: {
     [EventBus.UiActionBar](): ActionBar;
     [EventBus.UiMovementHandler](): MovementHandler;
     [EventBus.WorldRenderer](): WorldRenderer;
+    [EventBus.Milestones](): MilestoneManager;
 };
 export interface IEventBusRegistration {
     subscribe: NullaryFunction;

package/definitions/game/event/EventManager.d.ts

@@ -11,8 +11,11 @@
 import type { EventBusHost } from "event/EventBuses";
 import { EventBus } from "event/EventBuses";
 import type { Events, IEventEmitterHost, IEventEmitterHostClass } from "event/EventEmitter";
+import type EventEmitter from "event/EventEmitter";
 type HostOrHostClass = IEventEmitterHost<any> | IEventEmitterHostClass<any>;
-type HostFromHostOrHostClass<H> = H extends IEventEmitterHostClass<any> ? InstanceOf<H> : H;
+type HostFromHostOrHostClass<H> = H extends {
+    event: EventEmitter<null, any>;
+} ? H : H extends IEventEmitterHostClass<any> ? InstanceOf<H> : H;
 export type Emitter = HostOrHostClass;
 export type EmitterOrBus = EventBus | Emitter;
 export type Event<E extends EmitterOrBus> = keyof Events<E extends EventBus ? EventBusHost<E> : E>;

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

@@ -189,6 +189,10 @@ export default class Doodad extends Entity<IDoodadDescription, DoodadType, Dooda
     unhitch(): void;
     damage(forceBreak?: boolean, skipDropAsItem?: boolean, skipSound?: boolean, skipResources?: boolean): void;
     getDefaultDurability(random?: import("../../utilities/random/Random").Random<import("../../utilities/random/generators/LegacySeededGenerator").LegacySeededGenerator | import("../../utilities/random/generators/PCGSeededGenerator").PCGSeededGenerator>): number;
+    /**
+     * Gets the container to use for doodad executed actions
+     */
+    getTargetContainer(): IContainer | undefined;
     addTreasureChestLoot(): void;
     attachStillContainer(item: Item): void;
     detachStillContainer(human: Human): Item | undefined;

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

@@ -46,7 +46,9 @@ export default class CombatStrengthManager {
      * Calculates a float value between 0 and 1 representing a creature's difficulty.
      */
     getCreature(creature: Creature | CreatureType, aberrant?: boolean): number;
-    getCreatureDifficultyAgainstHuman(creature: Creature | CreatureType, aberrant?: boolean, human?: Human): number;
+    getCreatureDifficultyAgainstHuman(creature: Creature, human: Human): number;
+    private getEstimatedTurnsToKillHuman;
+    private getEstimatedTurnsToKillCreature;
     /**
      * Calculates a value representing a creature's combat strength.
      *

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

@@ -34,7 +34,8 @@ import type EntityWithStats from "game/entity/EntityWithStats";
 import type Tile from "game/tile/Tile";
 import type EntityMovable from "game/entity/EntityMovable";
 import type { RenderSource, UpdateRenderFlag } from "renderer/IRenderer";
-export default abstract class Entity<DescriptionType = unknown, TypeType extends number = number, TagType = unknown, CounterType = unknown> extends EventEmitter.Host<IEntityEvents> implements IReferenceable, IInspector, ITemperatureSource, INotificationLocation, IVector3 {
+import type { IVector4 } from "utilities/math/Vector4";
+export default abstract class Entity<DescriptionType = unknown, TypeType extends number = number, TagType = unknown, CounterType = unknown> extends EventEmitter.Host<IEntityEvents> implements IReferenceable, IInspector, ITemperatureSource, INotificationLocation, IVector4 {
     abstract readonly entityType: EntityType;
     abstract readonly tileUpdateType: TileUpdateType;
     id: number;

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

@@ -244,6 +244,10 @@ declare class AttributesImpl {
     all(): [DamageType, number][];
     types(): DamageType[];
     has(type?: DamageType): boolean;
+    /**
+     * Returns true if any of the given damage types are exactly the given value.
+     */
+    hasTypeAtValue(damage: DamageType, exactly: number): boolean;
     copy(): Attributes;
     equals(attrs: Attributes): boolean;
 }

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

@@ -191,6 +191,11 @@ export interface IHumanEvents extends Events<EntityWithStats>, ISkillEvents {
      * @returns The amount of damage the player should take (the player will take this damage)
      */
     damage(damageInfo: IDamageInfo): number | void;
+    /**
+     * Called when an doodad is picked up
+     * @param doodad The doodad object
+     */
+    pickUpDoodad?(doodad: Doodad): any;
     /**
      * Called when the player tick starts
      */

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

@@ -23,7 +23,7 @@ export declare const actionDescriptionsSlow: {
     5: import("./Action").Action<[import("game/entity/action/IAction").ActionArgument.ItemInventory], import("../Human").default<number>, void, import("game/entity/action/actions/Butcher").IButcherCanUse, [import("../../item/Item").default]>;
     120: import("./Action").Action<[import("game/entity/action/IAction").ActionArgument.ItemInventory], import("../Human").default<number>, void, import("game/entity/action/actions/CageCreature").ICageCreature, [import("../../item/Item").default]>;
     16: import("./Action").Action<[import("game/entity/action/IAction").ActionArgument.ItemInventory], import("../Human").default<number>, void, import("game/entity/action/actions/Cast").ICastCanUse, [import("../../item/Item").default]>;
-    99: import("./Action").Action<[[import("game/entity/action/IAction").ActionArgument.ItemInventory, import("game/entity/action/IAction").ActionArgument.Undefined]], import("../Human").default<number>, void, import("game/entity/action/actions/Gather").IGatherCanUse, [(import("../../item/Item").default | undefined)?]>;
+    99: import("./Action").Action<[[import("game/entity/action/IAction").ActionArgument.ItemInventory, import("game/entity/action/IAction").ActionArgument.Undefined], [import("game/entity/action/IAction").ActionArgument.Tile, import("game/entity/action/IAction").ActionArgument.Undefined]], import("../../doodad/Doodad").default | import("../Human").default<number>, void, import("game/entity/action/actions/Gather").IGatherCanUse, [(import("../../item/Item").default | undefined)?, (import("../../tile/Tile").default | undefined)?]>;
     71: import("./Action").Action<[[import("game/entity/action/IAction").ActionArgument.Container, import("game/entity/action/IAction").ActionArgument.NPCNearby, import("game/entity/action/IAction").ActionArgument.Undefined], [import("game/entity/action/IAction").ActionArgument.Boolean, import("game/entity/action/IAction").ActionArgument.Undefined]], import("../Human").default<number>, void, import("game/entity/action/actions/ToggleContainer").IToggleContainerCanUse, [(import("../npc/NPC").default | import("../../item/IItem").IContainer | undefined)?, (boolean | undefined)?]>;
     50: import("./Action").Action<[[import("game/entity/action/IAction").ActionArgument.Doodad, import("game/entity/action/IAction").ActionArgument.Undefined], [import("game/entity/action/IAction").ActionArgument.Boolean, import("game/entity/action/IAction").ActionArgument.Undefined]], import("../Human").default<number>, true | undefined, import("game/entity/action/actions/ToggleDoor").IToggleDoorCanUse, [(import("../../doodad/Doodad").default | undefined)?, (boolean | undefined)?]>;
     26: import("./Action").Action<[import("game/entity/action/IAction").ActionArgument.ItemNearby], import("../Human").default<number>, void, import("game/entity/action/IAction").IActionUsable, [import("../../item/Item").default]>;
@@ -49,11 +49,11 @@ export declare const actionDescriptionsSlow: {
     38: import("./Action").Action<[[import("game/entity/action/IAction").ActionArgument.Undefined, import("game/entity/action/IAction").ActionArgument.ItemNearby, import("game/entity/action/IAction").ActionArgument.Doodad]], import("../Human").default<number>, void, import("game/entity/action/IAction").IActionUsable, [(import("../../doodad/Doodad").default | import("../../item/Item").default | undefined)?]>;
     110: import("./Action").Action<[import("game/entity/action/IAction").ActionArgument.ItemInventory, [import("game/entity/action/IAction").ActionArgument.ItemInventory, import("game/entity/action/IAction").ActionArgument.Undefined]], import("../Human").default<number>, void, import("game/entity/action/actions/Exude").IExudeCanUse, [import("../../item/Item").default, (import("../../item/Item").default | undefined)?]>;
     36: import("./Action").Action<[import("game/entity/action/IAction").ActionArgument.ItemInventory], import("../Human").default<number>, void, import("game/entity/action/actions/Attack").IAttackCloseUpCanUse | import("game/entity/action/actions/Attack").IAttackThrowItemCanUse | import("game/entity/action/actions/Attack").IAttackRangedWeaponCanUse, [import("../../item/Item").default]>;
-    22: import("./Action").Action<[[import("game/entity/action/IAction").ActionArgument.ItemInventory, import("game/entity/action/IAction").ActionArgument.Undefined]], import("../Human").default<number>, void, import("game/entity/action/actions/Gather").IGatherCanUse, [(import("../../item/Item").default | undefined)?]>;
+    22: import("./Action").Action<[[import("game/entity/action/IAction").ActionArgument.ItemInventory, import("game/entity/action/IAction").ActionArgument.Undefined], [import("game/entity/action/IAction").ActionArgument.Tile, import("game/entity/action/IAction").ActionArgument.Undefined]], import("../../doodad/Doodad").default | import("../Human").default<number>, void, import("game/entity/action/actions/Gather").IGatherCanUse, [(import("../../item/Item").default | undefined)?, (import("../../tile/Tile").default | undefined)?]>;
     15: import("./Action").Action<[import("game/entity/action/IAction").ActionArgument.ItemNearby], import("../Human").default<number>, void, import("game/entity/action/actions/GatherLiquid").IGatherLiquidCanUse, [import("../../item/Item").default]>;
     86: import("./Action").Action<[[import("game/entity/action/IAction").ActionArgument.ItemNearbyIncludingTradeContainer, import("game/entity/action/IAction").ActionArgument.Undefined], [import("game/entity/action/IAction").ActionArgument.Container, import("game/entity/action/IAction").ActionArgument.Undefined], [import("game/entity/action/IAction").ActionArgument.ItemType, import("game/entity/action/IAction").ActionArgument.Undefined], [import("game/entity/action/IAction").ActionArgument.Quality, import("game/entity/action/IAction").ActionArgument.Undefined], [import("game/entity/action/IAction").ActionArgument.String, import("game/entity/action/IAction").ActionArgument.Undefined]], import("../Human").default<number>, void, import("game/entity/action/actions/MoveItem").MoveItemCanUse, [(import("../../item/Item").default | undefined)?, (import("../../item/IItem").IContainer | undefined)?, (import("../../item/IItem").ItemType | undefined)?, (import("../../IObject").Quality | undefined)?, (string | undefined)?]>;
     52: import("./Action").Action<[import("game/entity/action/IAction").ActionArgument.ItemInventory], import("../Human").default<number>, void, import("game/entity/action/actions/Grasp").IGraspCanUse, [import("../../item/Item").default]>;
-    69: import("./Action").Action<[[import("game/entity/action/IAction").ActionArgument.ItemInventory, import("game/entity/action/IAction").ActionArgument.Undefined]], import("../Human").default<number>, void, import("game/entity/action/actions/Harvest").IHarvestCanUse, [(import("../../item/Item").default | undefined)?]>;
+    69: import("./Action").Action<[[import("game/entity/action/IAction").ActionArgument.ItemInventory, import("game/entity/action/IAction").ActionArgument.Undefined], [import("game/entity/action/IAction").ActionArgument.Tile, import("game/entity/action/IAction").ActionArgument.Undefined]], import("../../doodad/Doodad").default | import("../Human").default<number>, void, import("game/entity/action/actions/Harvest").IHarvestCanUse, [(import("../../item/Item").default | undefined)?, (import("../../tile/Tile").default | undefined)?]>;
     12: import("./Action").Action<[import("game/entity/action/IAction").ActionArgument.ItemNearby], import("../Human").default<number>, void, import("./actions/ConsumeItem").IConsumeItemCanUse, [import("../../item/Item").default]>;
     46: import("./Action").Action<[import("game/entity/action/IAction").ActionArgument.ItemInventory], import("../Human").default<number>, void, import("game/entity/action/actions/HealOther").IHealOtherCanUse, [import("../../item/Item").default]>;
     76: import("./Action").Action<[], import("../Human").default<number>, void, import("game/entity/action/actions/ToggleHitch").IToggleHitchCanUse, []>;
@@ -67,7 +67,7 @@ export declare const actionDescriptionsSlow: {
     }, [import("../../item/Item").default]>;
     17: import("./Action").Action<[import("game/entity/action/IAction").ActionArgument.ItemInventory], import("../Human").default<number>, void, import("game/entity/action/actions/Lockpick").ILockpickCanUse, [import("../../item/Item").default]>;
     85: import("./Action").Action<[[import("game/entity/action/IAction").ActionArgument.ItemInventory, import("game/entity/action/IAction").ActionArgument.Undefined], [import("game/entity/action/IAction").ActionArgument.AttackType, import("game/entity/action/IAction").ActionArgument.Undefined], [import("game/entity/action/IAction").ActionArgument.ItemInventory, import("game/entity/action/IAction").ActionArgument.Undefined]], import("../Human").default<number>, void, import("game/entity/action/actions/Attack").IAttackCanUse, [(import("../../item/Item").default | undefined)?, (import("../IEntity").AttackType | undefined)?, (import("../../item/Item").default | undefined)?]>;
-    100: import("./Action").Action<[[import("game/entity/action/IAction").ActionArgument.ItemInventory, import("game/entity/action/IAction").ActionArgument.Undefined]], import("../Human").default<number>, void, import("game/entity/action/actions/Gather").IGatherCanUse, [(import("../../item/Item").default | undefined)?]>;
+    100: import("./Action").Action<[[import("game/entity/action/IAction").ActionArgument.ItemInventory, import("game/entity/action/IAction").ActionArgument.Undefined], [import("game/entity/action/IAction").ActionArgument.Tile, import("game/entity/action/IAction").ActionArgument.Undefined]], import("../../doodad/Doodad").default | import("../Human").default<number>, void, import("game/entity/action/actions/Gather").IGatherCanUse, [(import("../../item/Item").default | undefined)?, (import("../../tile/Tile").default | undefined)?]>;
     58: import("./Action").Action<[import("game/entity/action/IAction").ActionArgument.Direction], import("../Human").default<number>, void, {
         usable: true;
     }, [import("../../../utilities/math/Direction").Direction.None | import("../../../utilities/math/Direction").Direction.East | import("../../../utilities/math/Direction").Direction.North | import("../../../utilities/math/Direction").Direction.West | import("../../../utilities/math/Direction").Direction.South]>;

package/definitions/game/game/entity/action/actions/Attack.d.ts

@@ -37,7 +37,6 @@ export interface IAttackThrowItemCanUse extends IBaseCanUse {
 export interface IAttackRangedWeaponCanUse extends IBaseCanUse {
     attackType: AttackType.RangedWeapon;
     weapon: Item;
-    weaponDescription: IItemDescription;
     ranged: IRanged;
     rangedRequiredWeapon?: Item;
     ammoItem: Item;

package/definitions/game/game/entity/action/actions/Chop.d.ts

@@ -8,5 +8,5 @@
  * 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
  */
-declare const _default: import("../Action").Action<[[import("../IAction").ActionArgument.ItemInventory, import("../IAction").ActionArgument.Undefined]], import("../../Human").default<number>, void, import("game/entity/action/actions/Gather").IGatherCanUse, [(import("../../../item/Item").default | undefined)?]>;
+declare const _default: import("../Action").Action<[[import("../IAction").ActionArgument.ItemInventory, import("../IAction").ActionArgument.Undefined], [import("../IAction").ActionArgument.Tile, import("../IAction").ActionArgument.Undefined]], import("../../../doodad/Doodad").default | import("../../Human").default<number>, void, import("game/entity/action/actions/Gather").IGatherCanUse, [(import("../../../item/Item").default | undefined)?, (import("../../../tile/Tile").default | undefined)?]>;
 export default _default;

package/definitions/game/game/entity/action/actions/Dig.d.ts

@@ -17,6 +17,7 @@ import { TerrainType } from "game/tile/ITerrain";
 import type Tile from "game/tile/Tile";
 export interface IDigGenericCanUse extends IActionUsable {
     type: "PickUpExcrement" | "PickUp" | "Gather";
+    tile: Tile;
 }
 export interface IDigTileCanUse extends IActionUsable {
     type: "Tile";

package/definitions/game/game/entity/action/actions/Gather.d.ts

@@ -54,7 +54,7 @@ export interface IGatherDoodadCanUse extends IGatherBaseCanUse {
     doodadDescription: IDoodadDescription;
     growingStage?: GrowingStage;
 }
-export interface IGatherDoodadHarvestCanUse extends IActionUsable {
+export interface IGatherDoodadHarvestCanUse extends IGatherBaseCanUse {
     gatherType: GatherType.DoodadHarvest;
     tool?: Item;
 }
@@ -63,5 +63,5 @@ export interface IGatherTerrainCanUse extends IGatherBaseCanUse {
     terrainDescription: ITerrainDescription;
 }
 export type IGatherCanUse = IGatherTileEventCanUse | IGatherDoodadCanUse | IGatherDoodadHarvestCanUse | IGatherTerrainCanUse;
-declare const _default: Action<[[ActionArgument.ItemInventory, ActionArgument.Undefined]], import("../../Human").default<number>, void, IGatherCanUse, [(Item | undefined)?]>;
+declare const _default: Action<[[ActionArgument.ItemInventory, ActionArgument.Undefined], [ActionArgument.Tile, ActionArgument.Undefined]], Doodad | import("../../Human").default<number>, void, IGatherCanUse, [(Item | undefined)?, (Tile | undefined)?]>;
 export default _default;

package/definitions/game/game/entity/action/actions/Harvest.d.ts

@@ -20,5 +20,5 @@ export interface IHarvestCanUse extends IActionUsable {
     doodad: Doodad;
     resources: ILootItem[];
 }
-declare const _default: Action<[[ActionArgument.ItemInventory, ActionArgument.Undefined]], import("../../Human").default<number>, void, IHarvestCanUse, [(Item | undefined)?]>;
+declare const _default: Action<[[ActionArgument.ItemInventory, ActionArgument.Undefined], [ActionArgument.Tile, ActionArgument.Undefined]], Doodad | import("../../Human").default<number>, void, IHarvestCanUse, [(Item | undefined)?, (import("../../../tile/Tile").default | undefined)?]>;
 export default _default;

package/definitions/game/game/entity/action/actions/Mine.d.ts

@@ -8,5 +8,5 @@
  * 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
  */
-declare const _default: import("../Action").Action<[[import("../IAction").ActionArgument.ItemInventory, import("../IAction").ActionArgument.Undefined]], import("../../Human").default<number>, void, import("game/entity/action/actions/Gather").IGatherCanUse, [(import("../../../item/Item").default | undefined)?]>;
+declare const _default: import("../Action").Action<[[import("../IAction").ActionArgument.ItemInventory, import("../IAction").ActionArgument.Undefined], [import("../IAction").ActionArgument.Tile, import("../IAction").ActionArgument.Undefined]], import("../../../doodad/Doodad").default | import("../../Human").default<number>, void, import("game/entity/action/actions/Gather").IGatherCanUse, [(import("../../../item/Item").default | undefined)?, (import("../../../tile/Tile").default | undefined)?]>;
 export default _default;

package/definitions/game/game/entity/action/actions/helper/ConfirmGatherHarvest.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 Doodad from "game/doodad/Doodad";
 import type { IActionConfirmerApi } from "game/entity/action/IAction";
 import type Human from "game/entity/Human";
-export default function (action: IActionConfirmerApi<Human>): Promise<boolean>;
+export default function (action: IActionConfirmerApi<Human | Doodad>): Promise<boolean>;

package/definitions/game/game/entity/creature/Creature.d.ts

@@ -10,11 +10,11 @@
  */
 import { SfxType } from "audio/IAudio";
 import type { IEventEmitter } from "event/EventEmitter";
-import type { CreatureType, ICreatureDescription, ICreatureEvents, IDamageInfo, IHitch } from "game/entity/creature/ICreature";
+import type { CreatureAttackOutcome, CreatureType, ICreatureAttackOutcomeAttack, ICreatureDescription, ICreatureEvents, IDamageInfo, IHitch } from "game/entity/creature/ICreature";
 import EntityWithStats from "game/entity/EntityWithStats";
 import type Human from "game/entity/Human";
 import type { IEntityConstructorOptions, IStatChangeInfo } from "game/entity/IEntity";
-import { AiType, EntityType, MoveType } from "game/entity/IEntity";
+import { AiType, Defense, EntityType, MoveType } from "game/entity/IEntity";
 import type { IStat } from "game/entity/IStats";
 import type { IMovementTime } from "game/IGame";
 import { TileUpdateType } from "game/IGame";
@@ -80,6 +80,7 @@ export default class Creature extends EntityWithStats<ICreatureDescription, Crea
     isTamed(): boolean;
     isValid(): boolean;
     getCommandedAiType(): AiType | undefined;
+    getDefense(human?: Human): Defense;
     /**
      * Check is a creature is allowed to attack the target (rules of engagement)
      * @param target Target thing to attack
@@ -131,7 +132,9 @@ export default class Creature extends EntityWithStats<ICreatureDescription, Crea
      * Large creatures should render over the doodad over layer, which means we should hide the doodad over layer for doodads on the creatures tile.
      */
     updateDoodadOverHiddenState(tile: Tile, shouldBeHidden: boolean): void;
-    processAttack(description: ICreatureDescription, humans: Human[], moveType: MoveType, enemy: Human | Creature | undefined): boolean;
+    getAttackOutcome(enemy: Human | Creature | undefined, force: true, humans?: Human[], description?: ICreatureDescription, moveType?: MoveType): ICreatureAttackOutcomeAttack;
+    getAttackOutcome(enemy: Human | Creature | undefined, force?: boolean, humans?: Human[], description?: ICreatureDescription, moveType?: MoveType): CreatureAttackOutcome;
+    processAttack(description: ICreatureDescription, humans: Human[], moveType: MoveType | undefined, enemyIn: Human | Creature | undefined): boolean;
     getProducedTemperature(): number | undefined;
     protected updateDoodadOverHiddenStateForCurrentTile(hidden?: boolean): void;
     protected updateTile(fromTile: Tile, toTile: Tile): boolean;

package/definitions/game/game/entity/creature/ICreature.d.ts

@@ -19,6 +19,7 @@ import { AiType } from "game/entity/IEntity";
 import type { IStat } from "game/entity/IStats";
 import type { IPackedMessage } from "game/entity/player/IMessageManager";
 import type { ItemType, ItemTypeGroup } from "game/item/IItem";
+import type Item from "game/item/Item";
 import type { LootGroupType } from "game/item/LootGroups";
 import type { ITemperatureDescription } from "game/temperature/ITemperature";
 import type { TileEventType } from "game/tile/ITileEvent";
@@ -30,6 +31,7 @@ import type Translation from "language/Translation";
 import type { IModdable } from "mod/ModRegistry";
 import type { StatNotificationType } from "renderer/notifier/INotifier";
 import type { IRGB } from "utilities/Color";
+import type { IRange } from "utilities/math/Range";
 export declare enum CreatureType {
     Slime = 0,
     JellyCube = 1,
@@ -388,3 +390,34 @@ export declare const CREATURE_FLEE_DISTANCE_SQ: number;
 export declare const TAMED_CREATURE_FOLLOW_CLOSE_DISTANCE = 1;
 export declare const TAMED_CREATURE_FOLLOW_FAR_DISTANCE = 6;
 export declare const settableAiTypes: Set<AiType>;
+export interface ICreatureAttackOutcomeBase {
+    enemy?: Human | Creature;
+    willAttack: boolean;
+    breakAway: boolean;
+    hidden: boolean;
+    ai: AiType;
+}
+export interface ICreatureAttackOutcomeNoAttack extends ICreatureAttackOutcomeBase {
+    willAttack: false;
+    hidden: false;
+}
+export interface ICreatureAttackOutcomeHidden extends ICreatureAttackOutcomeBase {
+    willAttack: true;
+    hidden: true;
+}
+export interface ICreatureAttackOutcomeAttack extends ICreatureAttackOutcomeBase {
+    enemy: Human | Creature;
+    willAttack: true;
+    hidden: false;
+    ai: AiType;
+    maxParryingMultiplier: number;
+    damagedVehicle?: Item;
+    combatNote?: any[];
+    damageEquipment: boolean;
+    creatureHitRange: IRange;
+    enemyDefense: number;
+    pityPointOfDamageChance: number;
+    effectiveness: number;
+    damageScale: number;
+}
+export type CreatureAttackOutcome = ICreatureAttackOutcomeNoAttack | ICreatureAttackOutcomeHidden | ICreatureAttackOutcomeAttack;

package/definitions/game/game/entity/npc/npcs/Merchant.d.ts

@@ -14,7 +14,6 @@ import { AiType } from "game/entity/IEntity";
 import { EquipType } from "game/entity/IHuman";
 import type { INPCConstructorOptions } from "game/entity/npc/INPC";
 import NPC from "game/entity/npc/NPC";
-import type Player from "game/entity/player/Player";
 import type { IContainer } from "game/item/IItem";
 import { ItemType } from "game/item/IItem";
 import type Item from "game/item/Item";
@@ -30,8 +29,8 @@ export default class MerchantNPC extends NPC {
     modifyCustomerCredit(customer: Human, creditChange: number): number;
     getActions(): ActionType[] | undefined;
     getPublicContainer(): IContainer | undefined;
-    getSellPrice(player: Player, item: Item): number | undefined;
-    getBuyPrice(player: Player, item: Item): IMerchantBuyPrice | undefined;
+    getSellPrice(human: Human, item: Item): number | undefined;
+    getBuyPrice(human: Human, item: Item): IMerchantBuyPrice | undefined;
     /**
      * Closes container dialogs
      */

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

@@ -9,7 +9,6 @@
  * https://github.com/WaywardGame/types/wiki
  */
 import type { Events } from "event/EventEmitter";
-import type Doodad from "game/doodad/Doodad";
 import type Human from "game/entity/Human";
 import type { HairColor, HairStyle, SkinColor } from "game/entity/IHuman";
 import type { IMessage } from "game/entity/player/IMessageManager";
@@ -86,11 +85,6 @@ export interface IPlayerEvents extends Events<Human> {
      * @param id The id of the note that was read.
      */
     readNote(id: number): any;
-    /**
-     * Called when an doodad is picked up
-     * @param doodad The doodad object
-     */
-    pickUpDoodad?(doodad: Doodad): any;
     /**
      * Called when a player sails to civilization.
      */

package/definitions/game/game/inspection/infoProviders/LabelledValue.d.ts

@@ -19,7 +19,8 @@ export declare enum LabelledValueDisplayMode {
     "label (value)" = 1,
     "value label" = 2,
     "value (label)" = 3,
-    "label value" = 4
+    "label value" = 4,
+    "label - value" = 5
 }
 export default class LabelledValue extends InfoProvider {
     private readonly label;

package/definitions/game/game/inspection/infoProviders/creature/Aberrant.d.ts

@@ -10,12 +10,14 @@
  */
 import type Creature from "game/entity/creature/Creature";
 import { InfoProvider } from "game/inspection/InfoProvider";
+import LabelledValue from "game/inspection/infoProviders/LabelledValue";
 export default class AberrantInfoProvider extends InfoProvider {
     private readonly creature;
     private aberrant;
+    private tamed;
     constructor(creature: Creature);
     getClass(): string[];
     hasContent(): boolean;
-    get(): import("../../../../language/impl/TranslationImpl").default;
+    get(): LabelledValue;
     onTickEnd(): void;
 }

package/definitions/game/game/inspection/infoProviders/creature/Difficulty.d.ts

@@ -16,8 +16,10 @@ export default class DifficultyInfoProvider extends InfoProvider {
     private health;
     private ai;
     private aberrant;
+    private tamed;
     constructor(creature: Creature);
     getClass(): string[];
+    hasContent(): boolean;
     get(): LabelledValue;
     onTickEnd(): void;
 }

package/definitions/game/game/inspection/infoProviders/creature/ResistancesAndVulnerabilities.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 EventEmitter from "event/EventEmitter";
 import type Creature from "game/entity/creature/Creature";
 import type { CreatureType } from "game/entity/creature/ICreature";
 import type Human from "game/entity/Human";
@@ -15,9 +16,13 @@ import { InfoDisplayLevel } from "game/inspection/IInfoProvider";
 import { InfoProvider } from "game/inspection/InfoProvider";
 import type { InfoProviderContext } from "game/inspection/InfoProviderContext";
 import type { TranslationGenerator } from "ui/component/IComponent";
+export interface IResistancesAndVulnerabilitiesInfoProviderClassEvents {
+    shouldDisplayUndiscoveredResistsAndVulns(skill: number, human: Human): boolean | undefined;
+}
 export default class ResistancesAndVulnerabilitiesInfoProvider extends InfoProvider {
     private readonly creature;
-    static get(creatureType: CreatureType, human?: Human): import("game/inspection/InfoProvider").SimpleInfoProvider;
+    static event: EventEmitter<null, IResistancesAndVulnerabilitiesInfoProviderClassEvents>;
+    static get(creatureType: CreatureType, human?: Human): import("game/inspection/InfoProvider").SimpleInfoProvider[];
     private static translateVulnOrResist;
     constructor(creature: Creature);
     getClass(): string[];

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

@@ -0,0 +1,17 @@
+/*!
+ * Copyright 2011-2021 Unlok
+ * https://www.unlok.ca
+ *
+ * Credits & Thanks:
+ * https://www.unlok.ca/credits-thanks/
+ *
+ * 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 { DamageType } from "game/entity/IEntity";
+import type { IItemDescription } from "game/item/IItem";
+import type Item from "game/item/Item";
+declare namespace MagicalDamageType {
+    function translate(item?: Item, description?: IItemDescription, defaultDamageType?: DamageType): import("../../../../language/impl/TranslationImpl").default;
+}
+export default MagicalDamageType;

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

@@ -13,7 +13,7 @@ import type Doodad from "game/doodad/Doodad";
 import type Creature from "game/entity/creature/Creature";
 import type { CreatureType, IDamageOutcome, IDamageOutcomeInput } from "game/entity/creature/ICreature";
 import type Human from "game/entity/Human";
-import type { Defense } from "game/entity/IEntity";
+import type { DamageType, Defense } from "game/entity/IEntity";
 import type NPC from "game/entity/npc/NPC";
 import type { IIslandTemplate, TickFlag, TileUpdateType } from "game/IGame";
 import type { MultiplayerLoadingDescription } from "game/meta/Loading";
@@ -89,7 +89,7 @@ export interface IIslandEvents {
      * @param doodad Doodad that caused the change
      */
     portsChanged(doodad: Doodad): any;
-    getDefense(defense: Defense | undefined, target: Human | Creature | CreatureType): Defense | undefined;
+    getDefense(defense: Defense | undefined, target: Human | Creature | CreatureType, damageType?: DamageType): Defense | undefined;
     calculateAttackOutcome(damageOutcome: IDamageOutcome, input: IDamageOutcomeInput, attackValue: number, defenseValue: number): IDamageOutcome | undefined;
 }
 export interface ILegacySeeds {

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

@@ -19,7 +19,7 @@ import CreatureManager from "game/entity/creature/CreatureManager";
 import type { IDamageInfo, IDamageOutcome, IDamageOutcomeInput } from "game/entity/creature/ICreature";
 import FlowFieldManager from "game/entity/flowfield/FlowFieldManager";
 import Human from "game/entity/Human";
-import { SkillType } from "game/entity/IHuman";
+import type { SkillType } from "game/entity/IHuman";
 import NPCManager from "game/entity/npc/NPCManager";
 import type { Game } from "game/Game";
 import type { IGameOld } from "game/IGame";
@@ -179,8 +179,6 @@ export default class Island extends EventEmitter.Host<IIslandEvents> implements
     createTile(x: number, y: number, z: number, index: number): Tile;
     setTile(x: number, y: number, z: number, tile: Tile): Tile;
     getOrCreateTile(index: number, x: number, y: number, z: number): Tile;
-    makeLavaPassage(human: Human): TerrainType | undefined;
-    makeCaveEntrance(human: Human, chance?: number): TerrainType | undefined;
     updateFlowFieldTile(tile: Tile, tileUpdateType: TileUpdateType, updatedRenderer?: boolean): void;
     /**
      * Checks if island.tileData is synced with Tile.data
@@ -215,11 +213,6 @@ export default class Island extends EventEmitter.Host<IIslandEvents> implements
     checkForTargetInRange(tile: Tile, direction: Direction.Cardinal, range: number, includePlayers?: boolean): IMobCheck;
     fireBreath(x: number, y: number, z: number, facingDirection: Direction, itemName?: Translation, player?: boolean): void;
     coolFires(requirements: IRequirementInfo, human: Human): void;
-    /**
-     * Create puddles around a point and limit them (so they can't expand infinitely).
-     * @param point x/y/z of the splash/puddle source.
-     */
-    createPuddles(point: IVector3): void;
     /**
      * Resets & recalculates the civilization score
      */

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

@@ -15,9 +15,9 @@ import type Creature from "game/entity/creature/Creature";
 import type { Quality } from "game/IObject";
 import type { IMoveToTileOptions, ItemType, ItemTypeGroup } from "game/item/IItem";
 import type Item from "game/item/Item";
+import type Tile from "game/tile/Tile";
 import type TileEvent from "game/tile/TileEvent";
 import type { Direction } from "utilities/math/Direction";
-import type { IVector3 } from "utilities/math/IVector";
 /**
  * Includes all protected items by default
  */
@@ -81,7 +81,7 @@ export interface IRequirementInfo {
     missingDoodads?: Set<DoodadType | DoodadTypeGroup>;
     fireSourceDoodad?: Doodad;
     fireSourceTileEvent?: TileEvent;
-    fireSourceLavaPosition?: IVector3;
+    fireSourceLavaTile?: Tile;
     faceDirection?: Direction.Cardinal;
     actionNotUsable?: IActionNotUsable;
 }

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

@@ -26,7 +26,7 @@ import type { IObject, IObjectOptions } from "game/IObject";
 import { Quality } from "game/IObject";
 import type { IslandId } from "game/island/IIsland";
 import type { ContainerReference, DisplayableItemType, IConstructedInfo, IContainable, IContainer, IItemDescription, IItemDisassembleResult, IItemUsed, IMagicalPropertyInfo, IMoveToTileOptions, ItemCounter, ItemTag, ItemTypeExtra } from "game/item/IItem";
-import { BookType, ItemType, ItemTypeGroup, ItemWeightChange, SYMBOL_CONTAINER_CACHED_REFERENCE, ItemDamageResult } from "game/item/IItem";
+import { BookType, ItemDamageResult, ItemType, ItemTypeGroup, ItemWeightChange, SYMBOL_CONTAINER_CACHED_REFERENCE } from "game/item/IItem";
 import type { IPlaceOnTileOptions } from "game/item/IItemManager";
 import ItemMapManager from "game/item/ItemMapManager";
 import type { IHasMagic, MagicalSubPropertySubTypes } from "game/magic/MagicalPropertyManager";
@@ -294,6 +294,7 @@ export default class Item extends EntityMovable<IItemDescription, ItemType, Item
      * Gets the inherit item type.
      */
     getInheritItemRecipeSkill(): SkillType;
+    getDamageType(): DamageType;
     /**
      * Returns the damage types associated with a skill with a fallback for whatever damage types the item normally provides
      * @param skillType The skill to get default damage types from

package/definitions/game/game/magic/MagicalPropertyType.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 { DamageType } from "game/entity/IEntity";
 import { SkillType } from "game/entity/IHuman";
 import { Stat } from "game/entity/IStats";
 import type { IItemDescription, IMagicalPropertyInfo } from "game/item/IItem";
@@ -64,7 +65,8 @@ export declare enum MagicalPropertyType {
     /**
      * Adds a property that emits skill bonus to anybody within range (3x3 square) of the doodad.
      */
-    DoodadSkill = 27
+    DoodadSkill = 27,
+    ElementalDamage = 28
 }
 export interface IMagicalPropertyDescription {
     /**
@@ -86,5 +88,6 @@ export interface MagicalPropertyTypeSubTypeMap {
     [MagicalPropertyType.Skill]: SkillType;
     [MagicalPropertyType.Reputation]: Stat;
     [MagicalPropertyType.DoodadSkill]: SkillType;
+    [MagicalPropertyType.ElementalDamage]: DamageType;
 }
 export declare const magicalPropertyDescriptions: PartialRecord<MagicalPropertyType, IMagicalPropertyDescription>;

package/definitions/game/game/milestones/IMilestone.d.ts

@@ -59,7 +59,7 @@ export declare enum Milestone {
     Murderer = 47,
     Retailer = 48,
     Masochist = 49,
-    Multidisciplined = 50
+    Versatile = 50
 }
 export type ExcludeInternalMilestones<MILESTONE extends Milestone> = PickValueKeys<typeof Milestone, MILESTONE> extends `Internal${string}` ? never : MILESTONE;
 export declare enum MilestoneVisibility {

package/definitions/game/game/options/modifiers/milestone/modifiers/{Multidisciplined.d.ts → Versatile.d.ts}

@@ -14,19 +14,23 @@ import type Creature from "game/entity/creature/Creature";
 import type { CreatureType, IDamageOutcome, IDamageOutcomeInput } from "game/entity/creature/ICreature";
 import type Player from "game/entity/player/Player";
 import type Island from "game/island/Island";
+import type Item from "game/item/Item";
+import type ItemManager from "game/item/ItemManager";
 import type { Milestone } from "game/milestones/IMilestone";
 import type { IGameOptionsPartial } from "game/options/IGameOptions";
 import MilestoneModifier, { MilestoneModifierGroup, MilestoneModifierInstance } from "game/options/modifiers/milestone/MilestoneModifier";
-export default class Multidisciplined extends MilestoneModifier {
+export default class Versatile extends MilestoneModifier {
     getOptions(): IGameOptionsPartial;
     getGroup(): MilestoneModifierGroup;
-    instantiate(id: Milestone, player?: Player): MultidisciplinedMilestoneModifierInstance | undefined;
+    instantiate(id: Milestone, player?: Player): VersatileMilestoneModifierInstance | undefined;
 }
-declare class MultidisciplinedMilestoneModifierInstance extends MilestoneModifierInstance<Record<string, Map<CreatureType, Set<DamageType>>>> {
-    protected getDefense(island: Island, defense: Defense | undefined, target: Human | Creature | CreatureType): Defense | undefined;
+declare class VersatileMilestoneModifierInstance extends MilestoneModifierInstance<Record<string, Map<CreatureType, Set<DamageType>>>> {
+    protected onCreateItem(manager: ItemManager, item: Item): void;
+    protected getDefense(island: Island, defense: Defense | undefined, target: Human | Creature | CreatureType, damageType?: DamageType): Defense | undefined;
     protected calculateAttackOutcome(island: Island, outcome: IDamageOutcome, input: IDamageOutcomeInput, attackValue: number, defenseValue: number): IDamageOutcome | undefined;
     protected hasDiscoveredVulnOrResist(player: Player, creature: CreatureType, damageType: DamageType): boolean | undefined;
     protected discoverVulnOrResist(player: Player, creature: CreatureType, damageType: DamageType): void;
     protected getDiscoveredVulnsAndResists(player: Player): Map<CreatureType, Set<DamageType>>;
+    protected shouldDisplayUndiscoveredResistsAndVulns(host: any, skill: number, human: Human): boolean | undefined;
 }
 export {};

package/definitions/game/game/tile/Tile.d.ts

@@ -235,6 +235,20 @@ export default class Tile implements IVector4, Partial<ITileContainer>, IFieldOf
      * Decrease the depth of a water tile if under 6 connected tiles
      */
     consumeWaterTile(): void;
+    /**
+     * Used to check if lava exists below, then create a passage above
+     * @returns True if it created a lava passage
+     */
+    makeLavaPassage(source: Human | undefined): boolean;
+    /**
+     * Used to genererate and find appropriate cave entrances
+     * @returns True if it created cave entrances
+     */
+    makeCaveEntrance(source: Human | undefined, chance?: number): boolean;
+    /**
+     * Create puddles around a point and limit them (so they can't expand infinitely)
+     */
+    createPuddles(): void;
     addOrUpdateOverlay(overlay: IOverlayInfo): void;
     removeOverlay(overlay: IOverlayInfo): void;
     canSeeObject(type: CanASeeBType, object: IVector4 & {