diff --git a/gulpfile.js b/gulpfile.js index 1aa68bd7..cc82f6ee 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -264,21 +264,25 @@ let printHelp = () => { gutil.log('') .log(chalk.cyan( '= HELP ' + '='.repeat(cliLineLength))) .log(` - ${chalk.cyan('usage:')} ${chalk.gray('$ npm run gulp [task] -- [--options] ...')} + ${chalk.cyan('documentation:')} ${chalk.gray('https://github.com/exodus4d/pathfinder/wiki/GulpJs')} + + ${chalk.cyan('usage:')} ${chalk.gray('$ npm run gulp [task] -- [--options] ...')} ${chalk.cyan('tasks:')} - ${chalk.gray('default')} Development environment. Working with row src files and file watcher, default: - ${chalk.gray('')} ${chalk.gray('--jsUglify=false --jsSourcemaps=false')} - ${chalk.gray('production')} Production build. Concat and ugliry static resources, default: - ${chalk.gray('')} ${chalk.gray('--jsUglify=true --jsSourcemaps=true')} ${chalk.gray('help')} This view + ${chalk.gray('default')} Development environment. Working with row src files and file watcher, default: + ${chalk.gray('')} ${chalk.gray('--jsUglify=false --jsSourcemaps=false --cssSourcemaps=false --gzip=false --brotli=false')} + ${chalk.gray('production')} Production build. Concat and uglify static resources, default: + ${chalk.gray('')} ${chalk.gray('--jsUglify=true --jsSourcemaps=true --cssSourcemaps=true --gzip=true --brotli=true')} ${chalk.cyan('options:')} - ${chalk.gray('--tag')} Required build version. --tag="v1.2.4" -> dest path: public/js/v1.2.4 - ${chalk.gray('--jsUglify')} Set js uglification. (true || false) - ${chalk.gray('--jsSourcemaps')} Set js sourcemaps generation. (true || false) - ${chalk.gray('--gzip')} Set "gzip" compression mode. (true || false) - ${chalk.gray('--brotli')} Set "brotli" compression mode. (true || false) + ${chalk.gray('--tag')} Set build version. ${chalk.gray('default: --tag="v1.2.4" -> dest path: public/js/v1.2.4')} + ${chalk.gray('--jsUglify')} Set js uglification. ${chalk.gray('(true || false)')} + ${chalk.gray('--jsSourcemaps')} Set js sourcemaps generation. ${chalk.gray('(true || false)')} + ${chalk.gray('--cssSourcemaps')} Set CSS sourcemaps generation. ${chalk.gray('(true || false)')} + ${chalk.gray('--gzip')} Set "gzip" compression mode. ${chalk.gray('(true || false)')} + ${chalk.gray('--brotli')} Set "brotli" compression mode. ${chalk.gray('(true || false)')} + ${chalk.gray('--debug')} Set debug mode (more output). ${chalk.gray('(true || false)')} `) .log(chalk.cyan('='.repeat(cliBoxLength))) .log(''); @@ -828,14 +832,6 @@ gulp.task( ) ); -gulp.task( - 'test', - gulp.series( - 'task:cleanCssBuild', - 'task:watchCss' - ) -); - gulp.task( 'default', gulp.series( diff --git a/public/js/v1.2.4/app/init.js b/public/js/v1.2.4/app/init.js index f0826162..0b0e6f8f 100644 --- a/public/js/v1.2.4/app/init.js +++ b/public/js/v1.2.4/app/init.js @@ -334,31 +334,31 @@ define(['jquery'], function($) { // signature groups signatureGroups: { 1: { - name: 'combat site', //* + name: '(combat site|kampfgebiet|site de combat)', //* label: 'Combat' }, 2: { - name: 'relic site', //* + name: '(relic site|reliktgebiet|site de reliques)', //* label: 'Relic' }, 3: { - name: 'data site', + name: '(data site|datengebiet|site de données)', label: 'Data' }, 4: { - name: 'gas site', + name: '(gas site|gasgebiet|site de collecte de gaz)', label: 'Gas' }, 5: { - name: 'wormhole', + name: '(wormhole|wurmloch|trou de ver)', label: 'Wormhole' }, 6: { - name: 'ore site', + name: '(ore site|mineraliengebiet|site de minerai)', label: 'Ore' }, 7: { - name: 'ghost', + name: '(ghost)', label: 'Ghost' } }, diff --git a/public/js/v1.2.4/app/ui/system_signature.js b/public/js/v1.2.4/app/ui/system_signature.js index 6640d1e8..4ce53bad 100644 --- a/public/js/v1.2.4/app/ui/system_signature.js +++ b/public/js/v1.2.4/app/ui/system_signature.js @@ -98,6 +98,10 @@ define([ let validSignatureNames = [ // allowed signature type/names 'Cosmic Anomaly', 'Cosmic Signature', + 'Kosmische Anomalie', + 'Kosmische Signatur', + 'Anomalie cosmique', + 'Signature cosmique', 'Космическая аномалия', // == "Cosmic Anomaly" 'Источники сигналов' // == "Cosmic Signature" ]; @@ -658,7 +662,8 @@ define([ // get groupId by groupName for (let prop in signatureGroupOptions) { if(signatureGroupOptions.hasOwnProperty(prop)){ - if(signatureGroupOptions[prop] === sigGroup){ + let reg = new RegExp(signatureGroupOptions[prop], 'i'); + if (reg.test(sigGroup)) { sigGroupId = parseInt( prop ); break; } @@ -2453,4 +2458,4 @@ define([ getAllSignatureNamesBySystem: getAllSignatureNamesBySystem }; -}); \ No newline at end of file +});