diff --git a/XEditLib.dll b/XEditLib.dll index edfe0792..93ee96d9 100644 Binary files a/XEditLib.dll and b/XEditLib.dll differ diff --git a/app/bethesdaFiles.json b/app/bethesdaFiles.json index bc3fd534..98523ebb 100644 --- a/app/bethesdaFiles.json +++ b/app/bethesdaFiles.json @@ -2,7 +2,9 @@ "plugins": { "TES5": ["Skyrim.esm", "Update.esm", "Dawnguard.esm", "HearthFires.esm", "Dragonborn.esm"], "SSE": ["Skyrim.esm", "Update.esm", "Dawnguard.esm", "HearthFires.esm", "Dragonborn.esm"], + "TES5VR": ["Skyrim.esm", "Update.esm", "Dawnguard.esm", "HearthFires.esm", "Dragonborn.esm", "SkyrimVR.esm"], "FO4": ["Fallout4.esm", "DLCCoast.esm", "DLCNukaWorld.esm", "DLCRobot.esm", "DLCworkshop03.esm", "DLCworkshop02.esm", "DLCworkshop01.esm"], + "FO4VR": ["Fallout4.esm", "Fallout4_VR.esm", "DLCCoast.esm", "DLCNukaWorld.esm", "DLCRobot.esm", "DLCworkshop03.esm", "DLCworkshop02.esm", "DLCworkshop01.esm"], "FO3": ["Fallout3.esm", "Anchorage.esm", "ThePitt.esm", "BrokenSteel.esm", "PointLookout.esm", "Zeta.esm"], "FNV": ["FalloutNV.esm", "TribalPack.esm", "MercenaryPack.esm", "ClassicPack.esm", "CaravanPack.esm", "OldWorldBlues.esm", "LonesomeRoad.esm", "HonestHearts.esm", "DeadMoney.esm", "GunRunnersArsenal.esm"], "TES4": ["Oblivion.esm", "DLCShiveringIsles.esp", "DLCHorseArmor.esp", "DlCOrrery.esp", "DLCVileLair.esp", "DLCMehrunesRazor.esp", "DLCSpellTomes.esp", "DLCThievesDen.esp", "DLCBattlehornCastle.esp", "DLCfrostcrag.esp", "Knights.esp"] @@ -10,7 +12,9 @@ "archives": { "TES5": ["Skyrim - Animations.bsa", "Skyrim - Misc.bsa", "Skyrim - Textures.bsa", "Skyrim - Interface.bsa", "Skyrim - Meshes.bsa", "Skyrim - Shaders.bsa", "Skyrim - Sounds.bsa", "Skyrim - Voices.bsa", "Skyrim - VoicesExtra.bsa", "Update.bsa", "Dawnguard.bsa", "Dragonborn.bsa", "HearthFires.bsa", "HighResTexturePack01.bsa", "HighResTexturePack02.bsa", "HighResTexturePack03.bsa"], "SSE": ["Skyrim - Animations.bsa", "Skyrim - Interface.bsa", "Skyrim - Meshes0.bsa", "Skyrim - Meshes1.bsa", "Skyrim - Misc.bsa", "Skyrim - Patch.bsa", "Skyrim - Shaders.bsa", "Skyrim - Sounds.bsa", "Skyrim - Textures0.bsa", "Skyrim - Textures1.bsa", "Skyrim - Textures2.bsa", "Skyrim - Textures3.bsa", "Skyrim - Textures4.bsa", "Skyrim - Textures5.bsa", "Skyrim - Textures6.bsa", "Skyrim - Textures7.bsa", "Skyrim - Textures8.bsa", "Skyrim - Voices_en0.bsa"], + "TES5VR": ["Skyrim - Animations.bsa", "Skyrim - Interface.bsa", "Skyrim - Meshes0.bsa", "Skyrim - Meshes1.bsa", "Skyrim - Misc.bsa", "Skyrim - Patch.bsa", "Skyrim - Shaders.bsa", "Skyrim - Sounds.bsa", "Skyrim - Textures0.bsa", "Skyrim - Textures1.bsa", "Skyrim - Textures2.bsa", "Skyrim - Textures3.bsa", "Skyrim - Textures4.bsa", "Skyrim - Textures5.bsa", "Skyrim - Textures6.bsa", "Skyrim - Textures7.bsa", "Skyrim - Textures8.bsa", "Skyrim - Voices_en0.bsa", "Skyrim_VR - Main.bsa"], "FO4": ["Fallout4 - Animations.ba2", "Fallout4 - Interface.ba2", "Fallout4 - Materials.ba2", "Fallout4 - Meshes.ba2", "Fallout4 - MeshesExtra.ba2", "Fallout4 - Misc.ba2", "Fallout4 - Nvflex.ba2", "Fallout4 - Shaders.ba2", "Fallout4 - Sounds.ba2", "Fallout4 - Startup.ba2", "Fallout4 - Textures1.ba2", "Fallout4 - Textures2.ba2", "Fallout4 - Textures3.ba2", "Fallout4 - Textures4.ba2", "Fallout4 - Textures5.ba2", "Fallout4 - Textures6.ba2", "Fallout4 - Textures7.ba2", "Fallout4 - Textures8.ba2", "Fallout4 - Textures9.ba2", "Fallout4 - Voices.ba2", "ccBGSFO4001-PipBoy(Black) - Main.ba2", "ccBGSFO4001-PipBoy(Black) - Textures.ba2", "ccBGSFO4003-PipBoy(Camo01) - Main.ba2", "ccBGSFO4003-PipBoy(Camo01) - Textures.ba2", "ccBGSFO4004-PipBoy(Camo02) - Main.ba2", "ccBGSFO4004-PipBoy(Camo02) - Textures.ba2", "ccBGSFO4006-PipBoy(Chrome) - Main.ba2", "ccBGSFO4006-PipBoy(Chrome) - Textures.ba2", "ccBGSFO4016-Prey - Main.ba2", "ccBGSFO4016-Prey - Textures.ba2", "ccBGSFO4018-GaussRiflePrototype - Main.ba2", "ccBGSFO4018-GaussRiflePrototype - Textures.ba2", "ccBGSFO4019-ChineseStealthArmor - Main.ba2", "ccBGSFO4019-ChineseStealthArmor - Textures.ba2", "ccBGSFO4020-PowerArmorSkin(Black) - Main.ba2", "ccBGSFO4020-PowerArmorSkin(Black) - Textures.ba2", "ccBGSFO4038-HorseArmor - Main.ba2", "ccBGSFO4038-HorseArmor - Textures.ba2", "ccBGSFO4044-HellfirePowerArmor - Main.ba2", "ccBGSFO4044-HellfirePowerArmor - Textures.ba2", "ccFRSFO4001-HandmadeShotgun - Main.ba2", "ccFRSFO4001-HandmadeShotgun - Textures.ba2", "ccFSVFO4001-ModularMilitaryBackpack - Main.ba2", "ccFSVFO4001-ModularMilitaryBackpack - Textures.ba2", "ccFSVFO4002-MidCenturyModern - Main.ba2", "ccFSVFO4002-MidCenturyModern - Textures.ba2"], + "FO4VR": ["Fallout4 - Animations.ba2", "Fallout4 - Interface.ba2", "Fallout4 - Materials.ba2", "Fallout4 - Meshes.ba2", "Fallout4 - MeshesExtra.ba2", "Fallout4 - Misc.ba2", "Fallout4 - Nvflex.ba2", "Fallout4 - Shaders.ba2", "Fallout4 - Sounds.ba2", "Fallout4 - Startup.ba2", "Fallout4 - Textures1.ba2", "Fallout4 - Textures2.ba2", "Fallout4 - Textures3.ba2", "Fallout4 - Textures4.ba2", "Fallout4 - Textures5.ba2", "Fallout4 - Textures6.ba2", "Fallout4 - Textures7.ba2", "Fallout4 - Textures8.ba2", "Fallout4 - Textures9.ba2", "Fallout4 - Voices.ba2", "Fallout4_VR - Main.ba2", "Fallout4_VR - Shaders.ba2", "Fallout4_VR - Textures.ba2", "ccBGSFO4001-PipBoy(Black) - Main.ba2", "ccBGSFO4001-PipBoy(Black) - Textures.ba2", "ccBGSFO4003-PipBoy(Camo01) - Main.ba2", "ccBGSFO4003-PipBoy(Camo01) - Textures.ba2", "ccBGSFO4004-PipBoy(Camo02) - Main.ba2", "ccBGSFO4004-PipBoy(Camo02) - Textures.ba2", "ccBGSFO4006-PipBoy(Chrome) - Main.ba2", "ccBGSFO4006-PipBoy(Chrome) - Textures.ba2", "ccBGSFO4016-Prey - Main.ba2", "ccBGSFO4016-Prey - Textures.ba2", "ccBGSFO4018-GaussRiflePrototype - Main.ba2", "ccBGSFO4018-GaussRiflePrototype - Textures.ba2", "ccBGSFO4019-ChineseStealthArmor - Main.ba2", "ccBGSFO4019-ChineseStealthArmor - Textures.ba2", "ccBGSFO4020-PowerArmorSkin(Black) - Main.ba2", "ccBGSFO4020-PowerArmorSkin(Black) - Textures.ba2", "ccBGSFO4038-HorseArmor - Main.ba2", "ccBGSFO4038-HorseArmor - Textures.ba2", "ccBGSFO4044-HellfirePowerArmor - Main.ba2", "ccBGSFO4044-HellfirePowerArmor - Textures.ba2", "ccFRSFO4001-HandmadeShotgun - Main.ba2", "ccFRSFO4001-HandmadeShotgun - Textures.ba2", "ccFSVFO4001-ModularMilitaryBackpack - Main.ba2", "ccFSVFO4001-ModularMilitaryBackpack - Textures.ba2", "ccFSVFO4002-MidCenturyModern - Main.ba2", "ccFSVFO4002-MidCenturyModern - Textures.ba2"], "FO3": ["Anchorage - Main.bsa", "Anchorage - Sounds.bsa", "BrokenSteel - Main.bsa", "BrokenSteel - Sounds.bsa", "Fallout - MenuVoices.bsa", "Fallout - Meshes.bsa", "Fallout - Misc.bsa", "Fallout - Sound.bsa", "Fallout - Textures.bsa", "Fallout - Voices.bsa", "PointLookout - Main.bsa", "PointLookout - Sounds.bsa", "ThePitt - Main.bsa", "ThePitt - Sounds.bsa", "Zeta - Main.bsa", "Zeta - Sounds.bsa"], "FNV": ["CaravanPack - Main.bsa", "ClassicPack - Main.bsa", "DeadMoney - Main.bsa", "DeadMoney - Sounds.bsa", "Fallout - Meshes.bsa", "Fallout - Misc.bsa", "Fallout - Sound.bsa", "Fallout - Textures.bsa", "Fallout - Textures2.bsa", "Fallout - Voices1.bsa", "GunRunnersArsenal - Main.bsa", "GunRunnersArsenal - Sounds.bsa", "HonestHearts - Main.bsa", "HonestHearts - Sounds.bsa", "LonesomeRoad - Main.bsa", "LonesomeRoad - Sounds.bsa", "MercenaryPack - Main.bsa", "OldWorldBlues - Main.bsa", "OldWorldBlues - Sounds.bsa", "TribalPack - Main.bsa", "Update.bsa"], "TES4": ["DLCShiveringIsles - Faces.bsa", "DLCShiveringIsles - Meshes.bsa", "DLCShiveringIsles - Sounds.bsa", "DLCShiveringIsles - Textures.bsa", "DLCShiveringIsles - Voices.bsa", "Knights.bsa", "Oblivion - Meshes.bsa", "Oblivion - Misc.bsa", "Oblivion - Sounds.bsa", "Oblivion - Textures - Compressed.bsa", "Oblivion - Voices1.bsa", "Oblivion - Voices2.bsa"] diff --git a/app/docs/development/apis/xelib/setup.json b/app/docs/development/apis/xelib/setup.json index 09a61193..dbdd9d0f 100644 --- a/app/docs/development/apis/xelib/setup.json +++ b/app/docs/development/apis/xelib/setup.json @@ -45,6 +45,14 @@ { "key": "gmFO4", "description": "Fallout 4" + }, + { + "key": "gmTES5VR", + "description": "Skyrim VR" + }, + { + "key": "gmFO4VR", + "description": "Fallout 4 VR" } ] }, diff --git a/app/images/games/6.png b/app/images/games/6.png new file mode 100644 index 00000000..49820624 Binary files /dev/null and b/app/images/games/6.png differ diff --git a/app/images/games/7.png b/app/images/games/7.png new file mode 100644 index 00000000..916f8fe0 Binary files /dev/null and b/app/images/games/7.png differ diff --git a/src/javascripts/Services/shared/bsaBuilder.js b/src/javascripts/Services/shared/bsaBuilder.js index 3d76faf7..a4d312f7 100644 --- a/src/javascripts/Services/shared/bsaBuilder.js +++ b/src/javascripts/Services/shared/bsaBuilder.js @@ -1,5 +1,5 @@ ngapp.service('bsaBuilder', function($rootScope, settingsService, gameService, progressLogger) { - let archiveExts = { 'FO4': '.ba2' }, + let archiveExts = { 'FO4': '.ba2', 'FO4VR': '.ba2' }, settings, archiveExt; diff --git a/src/javascripts/Views/merge/merge.js b/src/javascripts/Views/merge/merge.js index e255e61f..882db5a3 100644 --- a/src/javascripts/Views/merge/merge.js +++ b/src/javascripts/Views/merge/merge.js @@ -9,7 +9,7 @@ ngapp.config(['$stateProvider', function ($stateProvider) { ngapp.controller('mergeController', function($rootScope, $scope, $timeout, progressService, hotkeyService, mergeService, mergeLoadService, mergeBuilder, mergeDataService, mergeStatusService, loadOrderService, eventService, relinker, gameService) { let {cacheDataFolders, updatePluginDataFolder} = mergeDataService, {readyToBeBuilt, updateStatus} = mergeStatusService, - relinkGames = [xelib.gmTES5, xelib.gmSSE]; + relinkGames = [xelib.gmTES5, xelib.gmSSE, xelib.gmTES5VR]; // helper functions let updateMergeStatuses = function() { diff --git a/src/javascripts/Views/shared/archiveCreationSettings.js b/src/javascripts/Views/shared/archiveCreationSettings.js index 8973ed2a..c00564ce 100644 --- a/src/javascripts/Views/shared/archiveCreationSettings.js +++ b/src/javascripts/Views/shared/archiveCreationSettings.js @@ -40,8 +40,8 @@ ngapp.run(function($rootScope, settingsService, gameService) { if (settings.archiveCreation.initialized) return; Object.assign(settings.archiveCreation, { initialized: true, - createTexturesArchive: gameService.appName === 'SSE', - maxSize: (gameService.appName === 'FO4' ? 16 : 2) * GIGABYTE + createTexturesArchive: gameService.appName === 'SSE' || gameService.appName === 'TES5VR', + maxSize: (gameService.appName === 'FO4' || gameService.appName === 'FO4VR' ? 16 : 2) * GIGABYTE }); settingsService.saveProfileSettings(); });