@wayward/types 2.13.0-beta.dev.20230401.1 → 2.13.0-beta.dev.20230403.1

package/definitions/game/game/Game.d.ts

@@ -55,6 +55,7 @@ export declare class Game extends EventEmitter.Host<IGameEvents> {
     private difficultyOptions;
     customMilestoneModifiersAllowed: boolean;
     difficulty: GameMode;
+    gameplayModifierData: Record<number, any>;
     replay: ReplayManager | undefined;
     saveVersion: string;
     shouldUpdateTablesAndWeight: boolean;

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

@@ -12,6 +12,7 @@ import type { SfxType } from "audio/IAudio";
 import type { IEventEmitter } from "event/EventEmitter";
 import Entity from "game/entity/Entity";
 import type { IEntityConstructorOptions, IEntityEvents, IMoveToOptions } from "game/entity/IEntity";
+import { MoveFlag } from "game/entity/IEntity";
 import { DamageType, MoveType } from "game/entity/IEntity";
 import { MovingClientSide } from "game/entity/IHuman";
 import type { IMovementTime } from "game/IGame";
@@ -34,7 +35,7 @@ export interface IEntityMovableEvents extends IEntityEvents {
     /**
      * Called after moving.
      */
-    postMove(fromTile: Tile, toTile: Tile): void;
+    postMove(fromTile: Tile, toTile: Tile, flags: MoveFlag): void;
 }
 /**
  * Entity class that allows movement

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

@@ -12,9 +12,10 @@ import type { IEventEmitter } from "event/EventEmitter";
 import Doodad from "game/doodad/Doodad";
 import type Creature from "game/entity/creature/Creature";
 import type { IDamageInfo } from "game/entity/creature/ICreature";
+import { CreatureType } from "game/entity/creature/ICreature";
 import EntityWithStats from "game/entity/EntityWithStats";
 import type { IAttack, ICausesDamage, IEntityConstructorOptions } from "game/entity/IEntity";
-import { AttackType, IStatChangeInfo, StatusEffectChangeReason, StatusType } from "game/entity/IEntity";
+import { AttackType, DamageType, IStatChangeInfo, StatusEffectChangeReason, StatusType } from "game/entity/IEntity";
 import type { ICheckUnderOptions, ICrafted, ICustomizations, IHumanEvents, ILoadOnIslandOptions, IRestData, IVoyageInfo } from "game/entity/IHuman";
 import { EquipType, RestCancelReason, SkillType } from "game/entity/IHuman";
 import type { IStat } from "game/entity/IStats";
@@ -115,7 +116,7 @@ export default abstract class Human<TypeType extends number = number> extends En
      * Flag that will prevent a humans vehicle from showing up until the movement finishews
      */
     isMovingSuppressVehicleClientside: boolean;
-    protected readonly milestonesCollection: import("../options/modifiers/GameplayModifiersManager").GameplayModifiersCollection<import("../options/modifiers/milestone/MilestoneModifier").default, Milestone, import("../options/modifiers/milestone/MilestoneModifier").MilestoneModifierInstance, [(Human<number> | undefined)?]>;
+    protected readonly milestonesCollection: import("../options/modifiers/GameplayModifiersManager").GameplayModifiersCollection<import("../options/modifiers/milestone/MilestoneModifier").default, Milestone, import("../options/modifiers/milestone/MilestoneModifier").MilestoneModifierInstance<any>, [(Human<number> | undefined)?]>;
     protected gameOptionsCached?: IGameOptionsPlayer;
     protected cachedMovementPenalty?: number;
     constructor(entityOptions?: IEntityConstructorOptions<TypeType>);
@@ -123,7 +124,7 @@ export default abstract class Human<TypeType extends number = number> extends En
     abstract createNoteManager(): INoteManager;
     abstract createMessageManager(): IMessageManager;
     abstract createQuestManager(): IQuestManager;
-    abstract addMilestone(milestone: Milestone, data?: number, update?: boolean): void;
+    abstract addMilestone(milestone: Milestone, data?: number | string, update?: boolean): void;
     createSkillManager(): SkillManager;
     isLocalPlayer(): boolean;
     getGameOptionsBeforeModifiers(): IGameOptionsPlayer;
@@ -249,7 +250,7 @@ export default abstract class Human<TypeType extends number = number> extends En
     unequip(item: Item, internal?: boolean, skipMessage?: boolean, skipRevertItem?: boolean): void;
     private updateOffHandState;
     unequipAll(): void;
-    canJump(): boolean;
+    getJumpTile(): Tile | undefined;
     hasDelay(): boolean;
     addDelay(delay: number, replace?: boolean, addStaminaDelay?: boolean): void;
     /**
@@ -384,6 +385,10 @@ export default abstract class Human<TypeType extends number = number> extends En
      * Gets this human's current carried weight, scaled down to what it would be without any weight bonuses applied
      */
     getScaledWeight(): number;
+    hasDiscoveredVulnOrResist(creatureType: CreatureType, damageType: DamageType): boolean;
+    discoverVulnOrResist(creatureType: CreatureType, damageType: DamageType): void;
+    getDiscoveredVulnsAndResists(): Map<CreatureType, Set<DamageType>>;
+    getDiscoveredVulnsAndResists(creatureType: CreatureType): Set<DamageType>;
     get asCorpse(): undefined;
     get asCreature(): undefined;
     get asDoodad(): undefined;

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

@@ -220,12 +220,16 @@ export declare enum DamageType {
 export declare module DamageType {
     function getAll(...damageTypes: DamageType[]): DamageType[];
 }
+export declare const RESIST_IMMUNITY = 99;
+export declare const RESIST_REGEN = 100;
 export declare class Defense {
     base: number;
     resist: Attributes;
     vulnerable: Attributes;
     constructor(base: number);
     setResistance(damageTypes: DamageType, amount: number): this;
+    setImmunity(damageTypes: DamageType): this;
+    setRegen(damageTypes: DamageType): this;
     setVulnerability(damageTypes: DamageType, amount: number): this;
     copy(): Defense;
     equals(defense: Defense): boolean;
@@ -239,7 +243,7 @@ declare class AttributesImpl {
     reset(amount?: number): void;
     all(): [DamageType, number][];
     types(): DamageType[];
-    has(): boolean;
+    has(type?: DamageType): boolean;
     copy(): Attributes;
     equals(attrs: Attributes): boolean;
 }
@@ -276,9 +280,20 @@ export interface IMoveToOptions {
     movementDelay?: Delay | number;
     animation?: MoveAnimation;
     onMoveCompletedParticles?: IRGB;
+    /**
+     * What caused the move?
+     */
+    flags?: MoveFlag;
 }
 export declare enum MoveAnimation {
     Normal = 0,
     Jump = 1
 }
+export declare enum MoveFlag {
+    None = 0,
+    /**
+     * Skips damage due to movement
+     */
+    SkipEncumberedChecks = 1
+}
 export {};

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

@@ -11,10 +11,10 @@
 import type { Events } from "event/EventEmitter";
 import type Doodad from "game/doodad/Doodad";
 import type { ActionType } from "game/entity/action/IAction";
-import type { IDamageInfo } from "game/entity/creature/ICreature";
+import type { CreatureType, IDamageInfo } from "game/entity/creature/ICreature";
 import type EntityWithStats from "game/entity/EntityWithStats";
 import type Human from "game/entity/Human";
-import type { AttackType } from "game/entity/IEntity";
+import type { AttackType, DamageType } from "game/entity/IEntity";
 import type { IMovementIntent, WeightStatus } from "game/entity/player/IPlayer";
 import type { ISkillEvents } from "game/entity/skill/SkillManager";
 import type { IHasImagePath, Quality } from "game/IObject";
@@ -255,6 +255,9 @@ export interface IHumanEvents extends Events<EntityWithStats>, ISkillEvents {
      * @param tile Tile the human is now on
      */
     setPosition(tile: Tile): void;
+    discoverVulnOrResist(creatureType: CreatureType, damageType: DamageType): any;
+    hasDiscoveredVulnOrResist(creatureType: CreatureType, damageType: DamageType, defaultState: boolean): boolean | undefined;
+    getDiscoveredVulnsAndResists(): Map<CreatureType, Set<DamageType>>;
 }
 export interface IHairstyleDescription extends IModdable, IHasImagePath {
     name: string;

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

@@ -19,7 +19,7 @@ export declare const actionDescriptionsSlow: {
     75: import("./Action").Action<[import("game/entity/action/IAction").ActionArgument.ItemNearby], import("../Human").default<number>, void, import("./actions/ConsumeItem").IConsumeItemCanUse, [import("../../item/Item").default]>;
     78: import("./Action").Action<[import("game/entity/action/IAction").ActionArgument.ItemNearby], import("../Human").default<number>, void, import("game/entity/action/actions/AttachContainer").IAttachContainerCanUse, [import("../../item/Item").default]>;
     3: 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)?]>;
-    28: import("./Action").Action<[import("game/entity/action/IAction").ActionArgument.ItemNearby, [import("game/entity/action/IAction").ActionArgument.Vector3, import("game/entity/action/IAction").ActionArgument.Undefined]], import("../Human").default<number>, void, import("game/entity/action/actions/Build").IBuildCanUse, [import("../../item/Item").default, (import("../../../utilities/math/IVector").IVector3 | undefined)?]>;
+    28: import("./Action").Action<[import("game/entity/action/IAction").ActionArgument.ItemNearby, [import("game/entity/action/IAction").ActionArgument.Tile, import("game/entity/action/IAction").ActionArgument.Undefined]], import("../Human").default<number>, void, import("game/entity/action/actions/Build").IBuildCanUse, [import("../../item/Item").default, (import("../../tile/Tile").default | undefined)?]>;
     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]>;
@@ -91,7 +91,7 @@ export declare const actionDescriptionsSlow: {
     54: import("./Action").Action<[], import("../Human").default<number>, void, import("game/entity/action/actions/PickUpAllItems").IPickUpAllItemsCanUse, []>;
     81: 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/PickUpExcrement").IPickUpExcrementCanUse, [(import("../../item/Item").default | undefined)?]>;
     53: import("./Action").Action<[], import("../Human").default<number>, void, import("game/entity/action/IAction").IActionUsable, []>;
-    74: import("./Action").Action<[import("game/entity/action/IAction").ActionArgument.ItemNearby, [import("game/entity/action/IAction").ActionArgument.Vector3, import("game/entity/action/IAction").ActionArgument.Undefined]], import("../Human").default<number>, void, import("game/entity/action/actions/Build").IBuildCanUse, [import("../../item/Item").default, (import("../../../utilities/math/IVector").IVector3 | undefined)?]>;
+    74: import("./Action").Action<[import("game/entity/action/IAction").ActionArgument.ItemNearby, [import("game/entity/action/IAction").ActionArgument.Tile, import("game/entity/action/IAction").ActionArgument.Undefined]], import("../Human").default<number>, void, import("game/entity/action/actions/Build").IBuildCanUse, [import("../../item/Item").default, (import("../../tile/Tile").default | undefined)?]>;
     25: import("./Action").Action<[import("game/entity/action/IAction").ActionArgument.ItemInventory], import("../Human").default<number>, void, import("game/entity/action/actions/Plant").IPlantCanUse, [import("../../item/Item").default]>;
     24: import("./Action").Action<[import("game/entity/action/IAction").ActionArgument.ItemNearby], import("../Human").default<number>, void, import("game/entity/action/actions/Pour").IPourCanUse, [import("../../item/Item").default]>;
     41: import("./Action").Action<[import("game/entity/action/IAction").ActionArgument.ItemNearby], import("../Human").default<number>, void, import("game/entity/action/actions/PourOnYourself").IPourOnYourselfCanUse, [import("../../item/Item").default]>;

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

@@ -18,5 +18,5 @@ export interface IBuildCanUse extends IActionUsable {
     tile: Tile;
     buildInfo: IItemBuild;
 }
-declare const _default: Action<[ActionArgument.ItemNearby, [ActionArgument.Vector3, ActionArgument.Undefined]], import("../../Human").default<number>, void, IBuildCanUse, [import("../../../item/Item").default, (import("../../../../utilities/math/IVector").IVector3 | undefined)?]>;
+declare const _default: Action<[ActionArgument.ItemNearby, [ActionArgument.Tile, ActionArgument.Undefined]], import("../../Human").default<number>, void, IBuildCanUse, [import("../../../item/Item").default, (Tile | undefined)?]>;
 export default _default;

package/definitions/game/game/entity/action/actions/PlaceDown.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.ItemNearby, [import("../IAction").ActionArgument.Vector3, import("../IAction").ActionArgument.Undefined]], import("../../Human").default<number>, void, import("game/entity/action/actions/Build").IBuildCanUse, [import("../../../item/Item").default, (import("../../../../utilities/math/IVector").IVector3 | undefined)?]>;
+declare const _default: import("../Action").Action<[import("../IAction").ActionArgument.ItemNearby, [import("../IAction").ActionArgument.Tile, import("../IAction").ActionArgument.Undefined]], import("../../Human").default<number>, void, import("game/entity/action/actions/Build").IBuildCanUse, [import("../../../item/Item").default, (import("../../../tile/Tile").default | undefined)?]>;
 export default _default;

package/definitions/game/game/entity/action/actions/helper/TreasureGathering.d.ts

@@ -13,7 +13,7 @@ import type Human from "game/entity/Human";
 import type Item from "game/item/Item";
 import type DrawnMap from "game/mapping/DrawnMap";
 import type { ITreasure } from "game/mapping/DrawnMap";
-import type { IVector3 } from "utilities/math/IVector";
+import type Tile from "game/tile/Tile";
 declare namespace TreasureGathering {
     interface IGatherable {
         map: DrawnMap;
@@ -21,7 +21,7 @@ declare namespace TreasureGathering {
         toolRange?: number;
         maxRange?: number;
         treasure: ITreasure;
-        position: IVector3;
+        gatherPointTile: Tile;
     }
     enum GatherablesResult {
         Blocked = 0,
@@ -40,7 +40,7 @@ declare namespace TreasureGathering {
     }
     interface IGatherResult {
         result: Result;
-        position?: IVector3;
+        tile?: Tile;
         treasure?: ITreasure;
     }
     function gather(action: IActionHandlerApi<Human>, itemRange: number, requireMap: boolean, tool?: Item, canGather?: ICanGather): IGatherResult;

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

@@ -330,6 +330,7 @@ export interface IDamageOutcome {
     resistTypes: DamageType[];
     vulnerable: number;
     vulnerableTypes: DamageType[];
+    immunities: DamageType[];
     noDamage: boolean;
     regenerate: number[];
     soundEffect?: SfxType;

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

@@ -117,7 +117,8 @@ export declare enum TurnTypeFlag {
     /**
      * Indicates the turn is passing due to a movement
      */
-    Movement = 8
+    Movement = 8,
+    DontTickAnim = 16
 }
 export interface IAttackHand {
     mainHand: number;

package/definitions/game/game/inspection/InfoProvider.d.ts

@@ -76,7 +76,7 @@ export declare abstract class InfoProvider extends EventEmitter.Host<IInfoProvid
     static subtitle(...translations: Array<TranslationGenerator | undefined>): SimpleInfoProvider;
     static description(...translations: Array<TranslationGenerator | undefined>): SimpleInfoProvider;
     static text(...translations: Array<TranslationGenerator | undefined>): SimpleInfoProvider;
-    static list(...translations: Array<TranslationGenerator | undefined>): SimpleInfoProvider;
+    static list(...translations: Array<InfoProvider | TranslationGenerator | undefined>): SimpleInfoProvider;
     static ofComponent(componentSupplier: () => Component): InfoProvider;
     private displayLevel?;
     protected component?: Component;

package/definitions/game/game/inspection/InspectionTypeMap.d.ts

@@ -29,7 +29,7 @@ import SkillInspection from "game/inspection/inspections/SkillInspection";
 import StatInspection from "game/inspection/inspections/StatInspection";
 import TileEventInspection from "game/inspection/inspections/TileEventInspection";
 import TileInspection from "game/inspection/inspections/TileInspection";
-import type { IVector3 } from "utilities/math/IVector";
+import type Tile from "game/tile/Tile";
 declare const inspectionTypeMap: {
     12: typeof ActionInspection;
     14: typeof CorpseInspection;
@@ -56,7 +56,7 @@ declare const inspectionTypeMap: {
 };
 export type InspectionClass = Class<Inspection<any>> & {
     isWorldInspection?(inspectType: InspectType): boolean;
-    getFromTile?(position: IVector3, context: InfoProviderContext, inspectType: InspectType): ArrayOr<Inspection<any>>;
+    getFromTile?(tile: Tile, context: InfoProviderContext, inspectType: InspectType): ArrayOr<Inspection<any>>;
     /**
      * Whether or not this inspection class can handle the given arguments.
      * @param args A list of arguments that an inspection can be provided

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

@@ -9,15 +9,16 @@
  * https://github.com/WaywardGame/types/wiki
  */
 import type Creature from "game/entity/creature/Creature";
-import type { IInspector } from "game/inspection/IInfoProvider";
+import type { CreatureType } from "game/entity/creature/ICreature";
+import type Human from "game/entity/Human";
 import { InfoDisplayLevel } from "game/inspection/IInfoProvider";
 import { InfoProvider } from "game/inspection/InfoProvider";
 import type { InfoProviderContext } from "game/inspection/InfoProviderContext";
-import Translation from "language/Translation";
 import type { TranslationGenerator } from "ui/component/IComponent";
 export default class ResistancesAndVulnerabilitiesInfoProvider extends InfoProvider {
     private readonly creature;
-    static getTranslation(creature: Creature, inspector: IInspector | undefined, revealer?: Translation, creatureName?: import("../../../../language/impl/TranslationImpl").default): import("../../../../language/impl/TranslationImpl").default | undefined;
+    static get(creatureType: CreatureType, human?: Human): import("game/inspection/InfoProvider").SimpleInfoProvider;
+    private static translateVulnOrResist;
     constructor(creature: Creature);
     getClass(): string[];
     getDefaultDisplayLevel(): InfoDisplayLevel;

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

@@ -11,7 +11,9 @@
 import type { BiomeType } from "game/biome/IBiome";
 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 NPC from "game/entity/npc/NPC";
 import type { IIslandTemplate, TickFlag, TileUpdateType } from "game/IGame";
 import type { MultiplayerLoadingDescription } from "game/meta/Loading";
@@ -87,6 +89,8 @@ export interface IIslandEvents {
      * @param doodad Doodad that caused the change
      */
     portsChanged(doodad: Doodad): any;
+    getDefense(defense: Defense | undefined, target: Human | Creature | CreatureType): Defense | undefined;
+    calculateAttackOutcome(damageOutcome: IDamageOutcome, input: IDamageOutcomeInput, attackValue: number, defenseValue: number): IDamageOutcome | undefined;
 }
 export interface ILegacySeeds {
     type: SeedType.Legacy;

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

@@ -172,10 +172,6 @@ export default class Island extends EventEmitter.Host<IIslandEvents> implements
      * @returns The default terrain type with a fallback to dirt (which shouldn't happen without mods or bugs).
      */
     getDefaultTerrainType(tile: Tile): TerrainType;
-    /**
-     * Ensures a point is valid and is not the edge of the map
-     */
-    ensureValidPoint<T extends IVector2>(point?: T): T | undefined;
     getDirectionFromMovement(x: number, y: number): Direction.East | Direction.North | Direction.West | Direction.South;
     getTileFromPoint(point: IVector3): Tile;
     getTile(x: number, y: number, z: number, disableLog?: boolean): Tile;

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

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

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

@@ -9,6 +9,8 @@
  * https://github.com/WaywardGame/types/wiki
  */
 import EventEmitter from "event/EventEmitter";
+import type { CreatureType } from "game/entity/creature/ICreature";
+import type { DamageType } from "game/entity/IEntity";
 import type { Game } from "game/Game";
 import { Milestone, MilestoneVisibility } from "game/milestones/IMilestone";
 type IMilestoneUpdate = [Milestone, (number | string)?];
@@ -48,6 +50,8 @@ export declare class MilestoneManager extends EventEmitter.Host<IMilestoneEvents
     isUnlockableInMode(milestone: Milestone, mode?: import("../options/IGameOptions").GameMode): boolean;
     reset(): void;
     getDiscovered(milestone: Milestone): (string | number)[] | undefined;
+    getDiscoveredResistsAndVulns(): Map<CreatureType, Set<DamageType>>;
+    getDiscoveredResistsAndVulns(creatureType: CreatureType): Set<DamageType>;
     getVisibility(milestone: Milestone): MilestoneVisibility;
     isDiscovered(milestone: Milestone, data: number | string): boolean;
     private updateMilestone;

package/definitions/game/game/options/modifiers/GameplayModifier.d.ts

@@ -14,7 +14,7 @@ import type Translation from "language/Translation";
 import { RandomInstance } from "utilities/random/IRandom";
 import type { Random } from "utilities/random/Random";
 import { RandomReference } from "utilities/random/RandomReference";
-export declare abstract class GameplayModifierInstance<ID extends number, INSTANCE_ARGS extends any[] = []> {
+export declare abstract class GameplayModifierInstance<ID extends number, INSTANCE_ARGS extends any[] = [], DATA = any> {
     readonly id: ID;
     readonly random: Random;
     protected readonly args: INSTANCE_ARGS;
@@ -26,6 +26,9 @@ export declare abstract class GameplayModifierInstance<ID extends number, INSTAN
     getTitle(): import("../../../language/impl/TranslationImpl").default;
     protected abstract getDefaultTitle(): Translation;
     setTitle(initializer: (defaultTitle: Translation) => Translation): this;
+    getData(): DATA | undefined;
+    setData(data?: DATA): this;
+    clearData(): this;
 }
 export type GetModifierInstance<MODIFIER extends GameplayModifier<number, GameplayModifierInstance<number, any[]>, any[]>> = MODIFIER extends GameplayModifier<number, infer INSTANCE, any[]> ? INSTANCE : never;
 export type GetModifierId<MODIFIER extends GameplayModifier<number, GameplayModifierInstance<number, any[]>, any[]>> = MODIFIER extends GameplayModifier<infer ID, any, any[]> ? ID : never;

package/definitions/game/game/options/modifiers/milestone/MilestoneModifier.d.ts

@@ -27,7 +27,7 @@ export declare enum MilestoneModifierGroup {
     Merchants = 10
 }
 export declare const milestoneGroupIcons: Record<MilestoneModifierGroup, string>;
-export declare class MilestoneModifierInstance extends GameplayModifierInstance<Milestone, [Human?]> {
+export declare class MilestoneModifierInstance<DATA = any> extends GameplayModifierInstance<Milestone, [Human?], DATA> {
     protected get player(): Human<number> | undefined;
     isEnabledForPlayer(entity: Entity): boolean;
     protected getDefaultTitle(): import("../../../../language/impl/TranslationImpl").default;
@@ -45,6 +45,6 @@ export default abstract class MilestoneModifier extends GameplayModifier<Milesto
     constructor(id?: Milestone);
     instantiate(id: Milestone, human?: Human): MilestoneModifierInstance | undefined;
     abstract getOptions(): IGameOptionsPartial;
-    initialize(instance: MilestoneModifierInstance): MilestoneModifierInstance;
+    initialize(instance: MilestoneModifierInstance): MilestoneModifierInstance<any>;
     abstract getGroup(): MilestoneModifierGroup;
 }

package/definitions/game/game/options/modifiers/milestone/modifiers/Multidisciplined.d.ts

@@ -0,0 +1,32 @@
+/*!
+ * 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 type Human from "game/entity/Human";
+import { DamageType, Defense } from "game/entity/IEntity";
+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 { 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 {
+    getOptions(): IGameOptionsPartial;
+    getGroup(): MilestoneModifierGroup;
+    instantiate(id: Milestone, player?: Player): MultidisciplinedMilestoneModifierInstance | 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;
+    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>>;
+}
+export {};

package/definitions/game/game/options/modifiers/milestone/modifiers/Retailer.d.ts

@@ -12,14 +12,12 @@ import type Player from "game/entity/player/Player";
 import type { Milestone } from "game/milestones/IMilestone";
 import type { IGameOptionsPartial } from "game/options/IGameOptions";
 import MilestoneModifier, { MilestoneModifierGroup, MilestoneModifierInstance } from "game/options/modifiers/milestone/MilestoneModifier";
-import type { Random } from "utilities/random/Random";
 export default class Retailer extends MilestoneModifier {
     getOptions(): IGameOptionsPartial;
     instantiate(id: Milestone, player?: Player): RetailerMilestoneModifierInstance | undefined;
     getGroup(): MilestoneModifierGroup;
 }
 declare class RetailerMilestoneModifierInstance extends MilestoneModifierInstance {
-    constructor(id: Milestone, random: Random, player?: Player);
     onSpawnPlayer(player: Player): void;
 }
 export {};

package/definitions/game/language/Dictionary.d.ts

@@ -22,8 +22,8 @@ declare enum Dictionary {
     Challenge = 10,
     ChangelogChangeType = 11,
     CharacterSort = 12,
-    CombatStrength = 13,
-    CombatDangerLevel = 14,
+    CombatDangerLevel = 13,
+    CombatStrength = 14,
     Command = 15,
     Corpse = 16,
     CraftEfficacy = 17,

package/definitions/game/language/DictionaryMap.d.ts

@@ -100,8 +100,8 @@ declare const dictionaryMap: {
     10: typeof Challenge;
     11: typeof ChangeType;
     12: typeof CharacterSort;
-    13: typeof CombatStrength;
-    14: typeof CombatDangerLevel;
+    13: typeof CombatDangerLevel;
+    14: typeof CombatStrength;
     15: typeof Command;
     16: typeof CreatureType;
     17: typeof CraftEfficacy;
@@ -209,8 +209,8 @@ export declare const strictDictionaries: {
     10: typeof Challenge;
     11: typeof ChangeType;
     12: typeof CharacterSort;
-    13: typeof CombatStrength;
-    14: typeof CombatDangerLevel;
+    13: typeof CombatDangerLevel;
+    14: typeof CombatStrength;
     15: typeof Command;
     16: typeof CreatureType;
     17: typeof CraftEfficacy;