Skip to content

Commit

Permalink
Merge branch 'khbsd_dev' of https://github.com/ghostboats/bg3_mod_helper
Browse files Browse the repository at this point in the history
 into khbsd_dev
  • Loading branch information
khbsd committed Jul 10, 2024
2 parents 3333b3a + 05dff35 commit 1e1b3c0
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 5 deletions.
6 changes: 3 additions & 3 deletions commands/createFileFromTemplate.js
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ let createFileFromTemplateCommand = vscode.commands.registerCommand('bg3-mod-hel
}

let fileName = selectedTemplateName;
if (selectedTemplateName === 'Localization loca.xml') {
if (selectedTemplateName === 'Localization xml') {
const { fileName: localeFileName, fileContent: localeFileContent, selectedLocale } = await handleLocalizationTemplate(fileContent);
if (!localeFileName) {
return;
Expand All @@ -64,7 +64,7 @@ let createFileFromTemplateCommand = vscode.commands.registerCommand('bg3-mod-hel

async function handleLocalizationTemplate(fileContent) {
const selectedLocale = await vscode.window.showQuickPick(locales, {
placeHolder: 'Select a locale for the .loca.xml file'
placeHolder: 'Select a locale for the xml file'
});

if (!selectedLocale) {
Expand All @@ -73,7 +73,7 @@ async function handleLocalizationTemplate(fileContent) {
}

const modName = await getModName();
const fileName = `${modName}_${selectedLocale}.loca.xml`;
const fileName = `${modName}_${selectedLocale}.xml`;
return { fileName, fileContent, selectedLocale };
}

Expand Down
1 change: 1 addition & 0 deletions support_files/lslib_utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@ function dirSeparator(filePath) {
return filePath.toString();
}


// returns the given path, minus the file extension (ie. \home\shiela\doc.txt > \home\shiela\doc)
function baseNamePath(filePath, ext) {
return filePath.substring(0, (filePath.length - ext.length));
Expand Down
5 changes: 3 additions & 2 deletions support_files/process_pak.js
Original file line number Diff line number Diff line change
Expand Up @@ -72,12 +72,13 @@ async function processPak(modPath, unpackLocation = path.join(path.dirname(modPa
rootModPath = getConfig.rootModPath;
modDestPath = getConfig.modDestPath;
zipOnPack = getConfig.zipOnPack;
packingPriority = getConfig.packingPriority
packingPriority = getConfig.packingPriority;

build.ExcludeHidden = getConfig.excludeHidden;
build.Priority = packingPriority
build.Priority = packingPriority;

console.log(build.ExcludeHidden);
console.log(getConfig.excludeHidden);

const lastFolderName = path.basename(rootModPath);
const rootParentPath = path.dirname(rootModPath);
Expand Down

0 comments on commit 1e1b3c0

Please sign in to comment.