Merge branch 'master' of https://github.com/fudgepop01/amiibox

fudgepop01 · Sep 5, 2021 · f83496c · f83496c
2 parents 6e7c8d6 + 16fe32e
commit f83496c
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -1,3 +1,5 @@
+# UNSTABLE BRANCH - THINGS MAY BREAK
+
 [![ko-fi](https://www.ko-fi.com/img/githubbutton_sm.svg)](https://ko-fi.com/J3J8Y3EA)
 
 ### Amiibox Homepage & Download Link: https://fudgepop01.github.io/amiibox/

diff --git a/src/components/Entrance.svelte b/src/components/Entrance.svelte
@@ -11,7 +11,7 @@
 	let readFile = promisify(fs.readFile);
 
 	const dispatch = createEventDispatcher();
-
+	
 	async function setKeys() {
 		let keyPath = (await remote.dialog.showOpenDialog({
 			message: 'select key_retail.bin'
@@ -30,6 +30,15 @@
 		await writeFile(`${remote.app.getPath('userData')}/PATHS.json`, JSON.stringify(config, null, 2), 'utf8');
 		needsKeys = false;
 	}
+	
+	async function setAbilities() {
+		let abilityPath = (await remote.dialog.showOpenDialog({
+			message: 'select abilities.txt'
+		})).filePaths[0];
+
+		config.abilities = abilityPath;
+		await writeFile(`${remote.app.getPath('userData')}/PATHS.json`, JSON.stringify(config, null, 2), 'utf8');
+	}
 
 	async function setRegions() {
 		let regionPath = (await remote.dialog.showOpenDialog({
@@ -53,6 +62,19 @@
 		config.regions = '__DEFAULT__';
 		await writeFile(`${remote.app.getPath('userData')}/PATHS.json`, JSON.stringify(config, null, 2), 'utf8');
 	}
+	
+	async function setAbilitiesToDefualt() {
+		const confirmation = await remote.dialog.showMessageBox({
+			type: "question",
+			buttons: ["cancel", "ok"],
+			title: 'confirmation',
+			message: "are you sure you wish to reset the abilities to default?"
+		})[0];
+		if (confirmation === 0) return;
+
+		config.abilities = '__DEFAULT__';
+		await writeFile(`${remote.app.getPath('userData')}/PATHS.json`, JSON.stringify(config, null, 2), 'utf8');
+	}
 
 	let config;
 	let needsKeys;
@@ -62,12 +84,13 @@
 			console.log(await readFile(`${remote.app.getPath('userData')}/PATHS.json`, 'utf8'));
 		}
 		catch (e) {
-			await writeFile(`${remote.app.getPath('userData')}/PATHS.json`, '{"keys":"UNCONFIGURED","regions":"__DEFAULT__"}', 'utf8');
+			await writeFile(`${remote.app.getPath('userData')}/PATHS.json`, '{"keys":"UNCONFIGURED","regions":"__DEFAULT__","abilities":"__DEFAULT__"}', 'utf8');
 		}
 
 		config = JSON.parse(await readFile(`${remote.app.getPath('userData')}/PATHS.json`, 'utf8'));
 		if (!FULL_TOGGLE) config.regions = '__default__';
 		needsKeys = (config.keys === "UNCONFIGURED");
+		config.abilities = 'DEFAULT_ABILITIES';
 	})
 </script>
 
@@ -115,6 +138,8 @@
     <div class="ui container">
 			<div class={`${needsKeys ? 'massive' : 'small'} ui fluid buttons`}>
       	<button class={`enter-btn ui ${needsKeys ? '' : 'basic'} red button`} on:click={() => setKeys()}>select keys</button>
+		<button class={"enter-btn ui basic red button"} on:click={() => setAbilities()}>select ability file</button>
+		<button class={"enter-btn ui basic red button"} on:click={() => setAbilitiesToDefualt()}>RESET ability config</button>
       	{#if FULL_TOGGLE}
 					<button class={"enter-btn ui basic red button"} on:click={() => setRegions()}>select region config</button>
 					<button class={"enter-btn ui basic red button"} on:click={() => setRegionsToDefualt()}>RESET region config</button>

diff --git a/src/components/Main.svelte b/src/components/Main.svelte
@@ -28,8 +28,9 @@
     let config = JSON.parse(await readFile(`${remote.app.getPath('userData')}/PATHS.json`, 'utf8'));
     if (!FULL_TOGGLE) config.regions = '__default__';
     if (config.keys !== 'UNCONFIGURED') keys = config.keys;
-
-    abilities = (await readFile(`${__dirname}/amiibo/abilities.txt`, 'utf8')).split(EOL);
+	if (config.abilities == '__DEFAULT__') { abilities = (await readFile(`${__dirname}/amiibo/abilities.txt`, 'utf8')).split(EOL)}
+	else abilities = (await readFile(config.abilities, 'utf8')).split(EOL);
+	
     const splitted = (await readFile(
       config.regions === '__DEFAULT__'
         ? `${__dirname}/amiibo/regions.txt`