From e7ec8c77ed1b158a4f7e3e143d052599b464b9f3 Mon Sep 17 00:00:00 2001 From: Ginie Date: Wed, 10 Jan 2024 09:22:46 +0100 Subject: [PATCH] v4.0.2 --- dist/nw-data | 2 +- libs/nw-data/generated/cols.ts | 3 +-- libs/nw-data/generated/datatables.ts | 9 --------- libs/nw-data/generated/types.ts | 17 +++++++++-------- package.json | 3 ++- tools/nw-clean.ts | 27 +++++++++++++++++++++++++++ 6 files changed, 40 insertions(+), 21 deletions(-) create mode 100644 tools/nw-clean.ts diff --git a/dist/nw-data b/dist/nw-data index f5682cf6..120ff931 160000 --- a/dist/nw-data +++ b/dist/nw-data @@ -1 +1 @@ -Subproject commit f5682cf6c161ce6450b399d1c8e528ac50c77645 +Subproject commit 120ff9319c6147b4406ca4e42382b95410666635 diff --git a/libs/nw-data/generated/cols.ts b/libs/nw-data/generated/cols.ts index a1730444..6bd3b6c7 100644 --- a/libs/nw-data/generated/cols.ts +++ b/libs/nw-data/generated/cols.ts @@ -1113,7 +1113,6 @@ export const COLS_GATHERABLES = { "IsLootContainer": "boolean", "ItemRestrictionId": "string", "ItemRestrictionQuantity": "string", - "LandmarkIconPath": "string", "MaxRespawnRate": "number", "MinRespawnRate": "number", "MountGatherers": "string", @@ -1127,7 +1126,6 @@ export const COLS_GATHERABLES = { "ResetGatherTimeOnEndInteraction": "boolean", "Restriction": "string", "SongRewardId": "string", - "TooltipImage": "string", "Tradeskill": "string", "WaitForImpact": "boolean", } @@ -1289,6 +1287,7 @@ export const COLS_ITEMDEFINITIONMASTER = { "SalvageGuaranteedPerkCount": "number", "SalvageLootTags": "[]", "SalvageResources": "number", + "ScheduleId": "string", "SoundTableID": "string", "Tier": "number", "TradingCategory": "string", diff --git a/libs/nw-data/generated/datatables.ts b/libs/nw-data/generated/datatables.ts index 36ae711e..9909c0f7 100644 --- a/libs/nw-data/generated/datatables.ts +++ b/libs/nw-data/generated/datatables.ts @@ -309,9 +309,6 @@ export abstract class NwDataLoader { public charactertablesBruteDatatablesDamagetableSwampbeast() { return this.load('charactertables/brute_datatables/javelindata_damagetable_swampbeast.json') } - public charactertablesBruteDatatablesDamagetableYeti2022() { - return this.load('charactertables/brute_datatables/javelindata_damagetable_yeti_2022.json') - } public charactertablesChameleonDatatablesDamagetableChameleon() { return this.load('charactertables/chameleon_datatables/javelindata_damagetable_chameleon.json') } @@ -537,12 +534,6 @@ export abstract class NwDataLoader { public charactertablesIcedryadDatatablesDamagetableIcedryadFrostgrip() { return this.load('charactertables/icedryad_datatables/javelindata_damagetable_icedryad_frostgrip.json') } - public charactertablesIcedryadDatatablesDamagetableYeti2022FrostfangMinion() { - return this.load('charactertables/icedryad_datatables/javelindata_damagetable_yeti_2022_frostfang_minion.json') - } - public charactertablesIcedryadDatatablesDamagetableYeti2022FrostgripMinion() { - return this.load('charactertables/icedryad_datatables/javelindata_damagetable_yeti_2022_frostgrip_minion.json') - } public charactertablesInvasionDatatablesDamagetableInvasionPriest() { return this.load('charactertables/invasion_datatables/javelindata_damagetable_invasion_priest.json') } diff --git a/libs/nw-data/generated/types.ts b/libs/nw-data/generated/types.ts index ef2eb9b3..c28dc126 100644 --- a/libs/nw-data/generated/types.ts +++ b/libs/nw-data/generated/types.ts @@ -1142,7 +1142,6 @@ export interface Gatherables { IsLootContainer: boolean ItemRestrictionId: string ItemRestrictionQuantity: string - LandmarkIconPath: string MaxRespawnRate: number MinRespawnRate: number MountGatherers: string @@ -1156,7 +1155,6 @@ export interface Gatherables { ResetGatherTimeOnEndInteraction: boolean Restriction: string SongRewardId: string - TooltipImage: string Tradeskill: string WaitForImpact: boolean } @@ -1321,6 +1319,7 @@ export interface ItemDefinitionMaster { SalvageGuaranteedPerkCount: number SalvageLootTags: string[] SalvageResources: number + ScheduleId: string SoundTableID: string Tier: number TradingCategory: TradingCategory @@ -7466,9 +7465,7 @@ export type VitalsCategory = | 'Avalancher_Shivers' | 'Avalancher_Shivers_25' | 'Avalancher_Shivers_60' - | 'Avalancher_Shivers_YetiEncounter' | 'Avalancher_Yeti' - | 'Avalancher_YetiEncounter' | 'Avalancher_Yeti_25' | 'Avalancher_Yeti_60' | 'Barbary_Lion' @@ -7942,6 +7939,8 @@ export type VitalsCategory = | 'CorruptedLegion_Cyclops_DG_BrimstoneSands_Crassus_Minion' | 'CorruptedLegion_Cyclops_DG_BrimstoneSands_Named_00' | 'CorruptedLegion_Cyclops_ELITE' + | 'CorruptedLegion_Cyclops_LOC_BOSS_00' + | 'CorruptedLegion_Cyclops_LOC_BOSS_01' | 'CorruptedLegion_Cyclops_Named_00' | 'CorruptedLegion_Cyclops_Named_01' | 'CorruptedLegion_Cyclops_Named_02_ELITE' @@ -10826,19 +10825,16 @@ export type VitalsCategory = | 'IceDryad_Fiend_Shivers_Frostgrip' | 'IceDryad_Fiend_Shivers_Frostgrip_25' | 'IceDryad_Fiend_Shivers_Frostgrip_60' - | 'IceDryad_Fiend_Shivers_YetiEncounter' | 'IceDryad_Melee_Frostfang' | 'IceDryad_Melee_Frostfang_25' | 'IceDryad_Melee_Frostfang_61' | 'IceDryad_Melee_Frostfang_62' | 'IceDryad_Melee_Frostfang_65_ELITE' - | 'IceDryad_Melee_Frostfang_YetiEncounter' | 'IceDryad_Range_Frostgrip' | 'IceDryad_Range_Frostgrip_25' | 'IceDryad_Range_Frostgrip_61' | 'IceDryad_Range_Frostgrip_62' | 'IceDryad_Range_Frostgrip_65_ELITE' - | 'IceDryad_Range_Frostgrip_YetiEncounter' | 'IceGolem' | 'IceWolf' | 'Imhotep' @@ -10902,7 +10898,9 @@ export type VitalsCategory = | 'Legion_Legionnaire_DG_BrimstoneSands_Named_00' | 'Legion_Legionnaire_Ethereal' | 'Legion_Legionnaire_Ethereal_ELITE' + | 'Legion_Legionnaire_Ethereal_LOC_BOSS' | 'Legion_Legionnaire_Ethereal_Named_05_ELITE' + | 'Legion_Legionnaire_LOC_BOSS' | 'Legion_Legionnaire_Named_00' | 'Legion_Legionnaire_Named_01' | 'Legion_Legionnaire_Named_02' @@ -10914,6 +10912,7 @@ export type VitalsCategory = | 'Legion_Legionnaire_NoShield_DG_BrimstoneSands_00' | 'Legion_Legionnaire_NoShield_DG_BrimstoneSands_Crassus_Minion' | 'Legion_Legionnaire_NoShield_ELITE' + | 'Legion_Legionnaire_NoShield_LOC_BOSS' | 'Legion_Legionnaire_Physical' | 'Legion_Legionnaire_Physical_ELITE' | 'Legion_Sagittarii' @@ -10928,6 +10927,7 @@ export type VitalsCategory = | 'Legion_Sagittarii_DG_BrimstoneSands_00' | 'Legion_Sagittarii_DG_BrimstoneSands_Minion' | 'Legion_Sagittarii_ELITE' + | 'Legion_Sagittarii_LOC_BOSS' | 'Legion_Sagittarii_Named_00' | 'Legion_Sagittarii_Named_01' | 'Legion_Signifer' @@ -10944,6 +10944,7 @@ export type VitalsCategory = | 'Legion_Signifer_DG_BrimstoneSands_Minion' | 'Legion_Signifer_DG_BrimstoneSands_Named_00' | 'Legion_Signifer_ELITE' + | 'Legion_Signifer_LOC_BOSS' | 'Legion_Signifer_Named_00' | 'Legion_Signifer_Named_01' | 'Legion_Signifer_Named_02' @@ -12167,6 +12168,7 @@ export type VitalsCategory = | 'Torso_Boss_Ice_Bridge' | 'Torso_Boss_Ice_WeakPoint' | 'Totem_Dryad_Nest_DG_Edengrove_00' + | 'Totem_LOC_BOSS' | 'Totem_Pirate_Cursed' | 'Totem_Pirate_Cursed_58' | 'Totem_Pirate_Cursed_59' @@ -13359,7 +13361,6 @@ export type VitalsCategory = | 'Wraith' | 'Yeti' | 'Yeti_03GC00_Elite' - | 'Yeti_2022' | 'Yeti_Named_04NW08' | 'Yeti_Named_06SW02' | 'Yeti_Named_07SM08' diff --git a/package.json b/package.json index c873525e..41740e10 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "nw-buddy", - "version": "4.0.1-0", + "version": "4.0.2-0", "description": "New World Buddy", "keywords": [], "main": "dist/electron/main.js", @@ -41,6 +41,7 @@ "nw-cdn": "ts-node ./tools/nw-cdn.ts", "nw-generate": "ts-node ./tools/nw-generate.ts", "nw-inspect": "ts-node ./tools/nw-inspect.ts", + "nw-clean": "pnpm build:tools && env-cmd -f .env node ./dist/tools/nw-clean.js", "nw-extract": "pnpm build:tools && env-cmd -f .env node ./dist/tools/nw-extract.js", "nw-convert": "pnpm build:tools && env-cmd -f .env node ./dist/tools/nw-convert.js", "nw-import": "pnpm build:tools && env-cmd -f .env node ./dist/tools/nw-import.js", diff --git a/tools/nw-clean.ts b/tools/nw-clean.ts new file mode 100644 index 00000000..655b7ed6 --- /dev/null +++ b/tools/nw-clean.ts @@ -0,0 +1,27 @@ +import { program } from 'commander' +import * as fs from 'fs' +import { NW_GAME_VERSION, environment } from '../env' + +program.option('-ws, --workspace ', 'workspace dir (live or ptr)', NW_GAME_VERSION).action(async () => { + const options = program.opts<{ + workspace: boolean + }>() + + const unpackDir = environment.nwUnpackDir(options.workspace)! + const convertDir = environment.nwConvertDir(options.workspace)! + + console.log('[CLEAN]', options.workspace) + console.log(' unpack dir:', unpackDir) + console.log('convert dir:', convertDir) + + if (fs.existsSync(unpackDir)) { + console.log('Cleaning unpack directory...') + await fs.promises.rm(unpackDir, { recursive: true }) + } + if (fs.existsSync(convertDir)) { + console.log('Cleaning convert directory...') + await fs.promises.rm(convertDir, { recursive: true }) + } +}) + +program.parse()