Skip to content

Commit b68a2db

Browse files
committed
better config output!
1 parent 83ade4f commit b68a2db

File tree

2 files changed

+16
-13
lines changed

2 files changed

+16
-13
lines changed

app/components/project/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ const Project = observer(() => {
112112
<div className="menu-item">
113113
<Item>Project</Item>
114114
<span className="path">
115-
{basename(workspace.projectPath)}
115+
{project.name || basename(workspace.projectPath)}
116116
</span>
117117
<Button
118118
color="magenta"

development/sonlvl.js

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,10 @@ const { readFileSync } = require('fs');
44
const { join } = require('path');
55

66
const base = __dirname + '/../../flex2_test/s1disasm/SonLVL INI Files/';
7-
const levels = ['objGHZ.ini'];
87
const format = 'Sonic 1.js';
8+
const projectName = 'Sonic 1';
99
const defaultCmp = 'Nemesis';
10+
const levels = ['obj.ini'];
1011
const pathMod = (str) => str.slice(3);
1112
const palettes = []; // TODO - use SonLVL.ini
1213

@@ -31,7 +32,13 @@ levels.forEach(filename => {
3132
obj[name] = prop;
3233
}
3334
})
34-
if (obj.name && obj.art && obj.mapasm) {
35+
36+
if (obj.xmlfile) {
37+
const xml = readFileSync(join(base, obj.xmlfile), 'utf8');
38+
console.log(xml);
39+
process.exit()
40+
}
41+
if (obj.art && obj.mapasm) {
3542
const flexObj = {
3643
name: obj.name,
3744
palettes,
@@ -68,14 +75,10 @@ levels.forEach(filename => {
6875
objects.push(folder);
6976
});
7077

78+
const config = {
79+
Flex: 2,
80+
name: projectName,
81+
objects,
82+
}
7183

72-
// [Sonic]
73-
// art=../artunc/Sonic.bin
74-
// artcmp=Uncompressed
75-
// mapasm=../_maps/Sonic.asm
76-
// dplcasm=../_maps/Sonic - Dynamic Gfx Script.asm
77-
// frame=1
78-
// [0D]
79-
// name=Signpost
80-
// art=../artnem/Signpost.bin
81-
// mapasm=../_maps/Signpost.asm
84+
// console.log(JSON.stringify(config, 0, 4));

0 commit comments

Comments
 (0)