diff --git a/ccloader-ui.d.ts b/ccloader-ui.d.ts index 9159a21..8cd00b3 100644 --- a/ccloader-ui.d.ts +++ b/ccloader-ui.d.ts @@ -34,10 +34,11 @@ declare global { } } - interface CCLoaderVersionGuiMixin { + interface TitleScreenGui { + ccloaderVersionGui: sc.TextGui; + } + interface PauseScreenGui { ccloaderVersionGui: sc.TextGui; } - interface TitleScreenGui extends CCLoaderVersionGuiMixin {} - interface PauseScreenGui extends CCLoaderVersionGuiMixin {} } } diff --git a/crosscode.d.ts b/crosscode.d.ts index 4979904..50a15cf 100644 --- a/crosscode.d.ts +++ b/crosscode.d.ts @@ -8,5 +8,3 @@ import './impact-class-system-correct'; import './impact-core'; import './crosscode-external-scripts'; import './modules/__all__'; - -import './unsorted-el-types'; diff --git a/modules/game.feature.achievements.stats-model.d.ts b/modules/game.feature.achievements.stats-model.d.ts index 98d16cb..cdc370a 100644 --- a/modules/game.feature.achievements.stats-model.d.ts +++ b/modules/game.feature.achievements.stats-model.d.ts @@ -22,5 +22,6 @@ declare global { new (): StatsModel; } var StatsModel: StatsModelConstructor; + var stats: StatsModel; } } diff --git a/modules/game.feature.combat.combat-action-steps.d.ts b/modules/game.feature.combat.combat-action-steps.d.ts index e9749e0..0507bf7 100644 --- a/modules/game.feature.combat.combat-action-steps.d.ts +++ b/modules/game.feature.combat.combat-action-steps.d.ts @@ -11,7 +11,7 @@ export {}; declare global { namespace ig { - namespace EVENT_STEP { + namespace ACTION_STEP { namespace SET_TEMP_TARGET { interface Settings { kind: diff --git a/modules/game.feature.combat.combat-shield.d.ts b/modules/game.feature.combat.combat-shield.d.ts index 90b5001..945c4c7 100644 --- a/modules/game.feature.combat.combat-shield.d.ts +++ b/modules/game.feature.combat.combat-shield.d.ts @@ -7,7 +7,7 @@ declare global { interface CombatShield extends ig.Class { isActive( this: this, - combatant: sc.BasicCombatant, + combatant: sc.PlayerBaseEntity, attackingEntity: sc.BasicCombatant.DamagingEntity, attackInfo: sc.AttackInfo, receivingPart: sc.BasicCombatant.DamagingEntity | null | undefined, diff --git a/modules/game.feature.combat.entities.food-icon.d.ts b/modules/game.feature.combat.entities.food-icon.d.ts index 2dc1559..a03072c 100644 --- a/modules/game.feature.combat.entities.food-icon.d.ts +++ b/modules/game.feature.combat.entities.food-icon.d.ts @@ -24,7 +24,7 @@ declare global { sprites: ig.CubeSprite[]; icon: number; - setState(this: this, state: sc.FOOD_ICON_STATE, offset: number): void; + setState(this: this, state: sc.FOOD_ICON_STATE, offset?: Vec2 | null): void; updateSprites(this: this): void; } interface FoodIconEntityConstructor extends ImpactClass { diff --git a/modules/game.feature.combat.model.combat-status.d.ts b/modules/game.feature.combat.model.combat-status.d.ts index 43e2d83..1e87469 100644 --- a/modules/game.feature.combat.model.combat-status.d.ts +++ b/modules/game.feature.combat.model.combat-status.d.ts @@ -9,7 +9,7 @@ declare global { id: number; statusBarEntry: string; offenseModifier: string; - defenseModifier: string; + defenseModifier: keyof typeof sc.MODIFIERS; effects: ig.EffectSheet; duration: number; charge: number; diff --git a/modules/game.feature.menu.gui.map.map-worldmap.d.ts b/modules/game.feature.menu.gui.map.map-worldmap.d.ts index e2e3a21..5a9b023 100644 --- a/modules/game.feature.menu.gui.map.map-worldmap.d.ts +++ b/modules/game.feature.menu.gui.map.map-worldmap.d.ts @@ -6,7 +6,10 @@ export {}; declare global { namespace sc { - interface AreaButton extends ig.FocusGui {} + interface AreaButton extends ig.FocusGui { + key: string; + area: sc.MapModel.Area; + } interface AreaButtonConstructor extends ImpactClass {} var AreaButton: AreaButtonConstructor; diff --git a/modules/game.feature.menu.gui.shop.shop-list.d.ts b/modules/game.feature.menu.gui.shop.shop-list.d.ts index 3990297..ad751cf 100644 --- a/modules/game.feature.menu.gui.shop.shop-list.d.ts +++ b/modules/game.feature.menu.gui.shop.shop-list.d.ts @@ -48,7 +48,7 @@ declare global { sortType?: sc.SORT_TYPE | null, ): void; scrapSellList(this: this, shopItems: sc.ItemID[]): void; - scrapBuyList(this: this, shopItems: sc.ShopModel.ShopItem[]): void; + scrapBuyList(this: this, shopItems: ig.Database.ShopItem[]): void; } interface ShopListMenuConstructor extends ImpactClass {} var ShopListMenu: ShopListMenuConstructor; diff --git a/modules/game.feature.menu.gui.shop.shop-misc.d.ts b/modules/game.feature.menu.gui.shop.shop-misc.d.ts index f93bc87..3f72204 100644 --- a/modules/game.feature.menu.gui.shop.shop-misc.d.ts +++ b/modules/game.feature.menu.gui.shop.shop-misc.d.ts @@ -14,9 +14,9 @@ declare global { ): number; sortList( this: this, - items: sc.ShopModel.ShopItem[], + items: ig.Database.ShopItem[], sortType: sc.SORT_TYPE, - ): sc.ShopModel.ShopItem[]; + ): ig.Database.ShopItem[]; } var ShopHelper: ShopHelper; } diff --git a/modules/game.feature.menu.gui.stats.stats-gui-builds.d.ts b/modules/game.feature.menu.gui.stats.stats-gui-builds.d.ts index 8f476e6..681d66f 100644 --- a/modules/game.feature.menu.gui.stats.stats-gui-builds.d.ts +++ b/modules/game.feature.menu.gui.stats.stats-gui-builds.d.ts @@ -14,25 +14,16 @@ declare global { } namespace Stats { - type StatItemType = - | 'Percent' - | 'Separator' - | 'Time' - | 'KeyValue' - | 'KeyCurMax' - | 'List' - | 'Logs'; - interface StatItem { - type?: StatItemType; - subtype?: StatItemType; + type?: keyof typeof sc.STATS_ENTRY_TYPE; + subtype?: keyof typeof sc.STATS_ENTRY_TYPE; displayName?: string; highlight?: { min: number } | boolean; group?: string; stat?: string; map?: string; - max?(): number; - getSettings?(a: string): StatItem | null; + max?: () => number; + getSettings?: (key: string) => StatItem | null; } } var STATS_BUILD: Record>; diff --git a/modules/game.feature.menu.gui.stats.stats-types.d.ts b/modules/game.feature.menu.gui.stats.stats-types.d.ts index c388997..ab8dba9 100644 --- a/modules/game.feature.menu.gui.stats.stats-types.d.ts +++ b/modules/game.feature.menu.gui.stats.stats-types.d.ts @@ -5,3 +5,43 @@ // requires game.feature.menu.gui.stats.stats-gui-builds // requires game.feature.menu.gui.stats.stats-misc // requires game.feature.menu.gui.synop.synop-misc + +export {}; + +declare global { + namespace sc { + interface StatsBaseEntryGui extends ig.GuiElementBase {} + interface StatsBaseEntryGuiConstructor extends ImpactClass {} + var StatsBaseEntryGui: StatsBaseEntryGuiConstructor; + + namespace STATS_ENTRY_TYPE { + interface Time extends sc.StatsBaseEntryGui {} + interface TimeConstructor extends ImpactClass