Skip to content

Commit

Permalink
Remove support for deprecated Tibia clients
Browse files Browse the repository at this point in the history
  • Loading branch information
mathiasbynens committed Nov 26, 2017
1 parent 5c1e4e6 commit 9b6bc29
Show file tree
Hide file tree
Showing 35 changed files with 27 additions and 956 deletions.
2 changes: 0 additions & 2 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1,4 +1,2 @@
# Automatically normalize line endings for all text-based files.
* text=auto
# Ensure export files get CRLF line endings.
*.exp text eol=crlf
7 changes: 1 addition & 6 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,15 +1,10 @@
data
test/data
test/data-without-markers
test/data-from-minimap
test/maps-new
test/maps-new-without-markers
test/minimap
test/flash/maps-with-markers.exp
test/flash/maps-without-markers.exp

# Installed npm modules
node_modules
package-lock.json

# Folder view configuration files
.DS_Store
Expand Down
59 changes: 12 additions & 47 deletions bin/cli.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,8 @@ const argv = require('argh').argv;
const mkdirp = require('mkdirp');
const rimraf = require('rimraf');

const convertFromMaps = require('../src/from-maps.js');
const convertFromMinimap = require('../src/from-minimap.js');
const convertToMaps = require('../src/to-maps.js');
const generateBoundsFromAutomap = require('../src/generate-bounds-from-automap.js');
const convertToMinimap = require('../src/to-minimap.js');
const generateBoundsFromMinimap = require('../src/generate-bounds-from-minimap.js');
const info = require('../package.json');

Expand All @@ -31,9 +29,8 @@ const main = () => {
if (process.argv.length == 2) {
console.log(`${info.name} v${info.version} - ${info.homepage}`);
console.log('\nUsage:\n');
console.log(`\t${info.name} --from-maps=./Automap --output-dir=./data`);
console.log(`\t${info.name} --from-data=./data --output-dir=./Automap --no-markers`);
console.log(`\t${info.name} --from-data=./data-without-markers --flash-export-file=./flash/maps-without-markers.exp --no-markers`);
console.log(`\t${info.name} --from-minimap=./minimap --output-dir=./data`);
console.log(`\t${info.name} --from-data=./data --output-dir=./minimap --no-markers`);
process.exit(1);
}

Expand All @@ -42,39 +39,16 @@ const main = () => {
return process.exit(0);
}

if (!argv['from-maps'] && !argv['from-minimap'] && !argv['from-data']) {
console.log('Missing `--from-maps`, `--from-minimap`, or `--from-data` flag.');
if (!argv['from-minimap'] && !argv['from-data']) {
console.log('Missing `--from-minimap`, or `--from-data` flag.');
return process.exit(1);
}

if (
argv['from-maps'] && argv['from-data'] ||
argv['from-minimap'] && argv['from-data'] ||
argv['from-maps'] && argv['from-minimap']
) {
console.log('Cannot combine `--from-maps` with `--from-minimap` or `--from-data`. Pick one.');
if (argv['from-minimap'] && argv['from-data']) {
console.log('Cannot combine `--from-minimap` with `--from-data`. Pick one.');
return process.exit(1);
}

if (argv['from-maps']) {
if (argv['from-maps'] === true) {
console.log('`--from-maps` path not specified. Using the default, i.e. `Automap`.');
argv['from-maps'] = 'Automap';
}
const mapsDirectory = path.resolve(String(argv['from-maps']));
if (!argv['output-dir'] || argv['output-dir'] === true) {
console.log('`--output-dir` path not specified. Using the default, i.e. `data`.');
argv['output-dir'] = 'data';
}
const dataDirectory = path.resolve(String(argv['output-dir']));
emptyDirectory(dataDirectory)
.then(() => generateBoundsFromAutomap(mapsDirectory, dataDirectory))
.then((bounds) => convertFromMaps(
bounds, mapsDirectory, dataDirectory, !excludeMarkers
));
return;
}

if (argv['from-minimap']) {
if (argv['from-minimap'] === true) {
console.log('`--from-minimap` path not specified. Using the default, i.e. `minimap`.');
Expand All @@ -100,24 +74,15 @@ const main = () => {
argv['from-data'] = 'data';
}
const dataDirectory = path.resolve(argv['from-data']);
if (argv['flash-export-file'] === true) {
console.log('`--flash-export-file` path not specified.');
return process.exit(1);
}
if (argv['flash-export-file']) {
convertToMaps(dataDirectory, argv['flash-export-file'], !excludeMarkers, true);
return;
}
if (!argv['output-dir'] || argv['output-dir'] === true) {
console.log('`--output-dir` path not specified. Using the default, i.e. `Automap-new`.');
argv['output-dir'] = 'Automap-new';
console.log('`--output-dir` path not specified. Using the default, i.e. `minimap-new`.');
argv['output-dir'] = 'minimap-new';
}
const mapsDirectory = path.resolve(String(argv['output-dir']));
const minimapDirectory = path.resolve(mapsDirectory, '../minimap');
emptyDirectory(mapsDirectory)
const minimapDirectory = path.resolve(String(argv['output-dir']));
emptyDirectory(minimapDirectory)
.then(() => emptyDirectory(minimapDirectory))
.then(() => {
convertToMaps(dataDirectory, mapsDirectory, !excludeMarkers, false);
convertToMinimap(dataDirectory, minimapDirectory, !excludeMarkers);
});
return;
}
Expand Down
Loading

0 comments on commit 9b6bc29

Please sign in to comment.