From 8bc9aee5943ce6ae397eb95b4aa50f3beffd5f86 Mon Sep 17 00:00:00 2001 From: LoveEevee Date: Sat, 5 Jan 2019 10:44:28 +0300 Subject: [PATCH 1/3] ImportSongs: Add song genre --- public/src/js/canvasdraw.js | 2 +- public/src/js/importsongs.js | 292 ++++++++++++++++++++++++++++++ public/src/js/loadsong.js | 8 + public/src/js/parseosu.js | 10 +- public/src/js/parsetja.js | 38 ++-- public/src/js/scoresheet.js | 10 +- public/src/js/songselect.js | 162 +++-------------- public/src/js/strings.js | 55 ++++++ public/src/js/titlescreen.js | 4 + public/src/js/view.js | 6 +- public/src/views/loadsong.html | 4 +- public/src/views/titlescreen.html | 2 +- templates/index.html | 12 +- 13 files changed, 423 insertions(+), 182 deletions(-) create mode 100644 public/src/js/importsongs.js create mode 100644 public/src/js/strings.js diff --git a/public/src/js/canvasdraw.js b/public/src/js/canvasdraw.js index 9ad98ac..48e3bbb 100644 --- a/public/src/js/canvasdraw.js +++ b/public/src/js/canvasdraw.js @@ -1167,7 +1167,7 @@ ctx.stroke() this.layeredText({ ctx: ctx, - text: "クリア", + text: strings.clear, fontSize: 18, fontFamily: config.font, x: gaugeClear + 3, diff --git a/public/src/js/importsongs.js b/public/src/js/importsongs.js new file mode 100644 index 0000000..f26018c --- /dev/null +++ b/public/src/js/importsongs.js @@ -0,0 +1,292 @@ +class ImportSongs{ + constructor(songSelect, event){ + this.songSelect = songSelect + this.songSelect.redrawRunning = false + this.songSelect.pointer(false) + + this.loaderDiv = document.createElement("div") + this.loaderDiv.innerHTML = assets.pages["loadsong"] + loader.screen.appendChild(this.loaderDiv) + var loadingText = document.getElementById("loading-text") + loadingText.appendChild(document.createTextNode(strings.loading)) + loadingText.setAttribute("alt", strings.loading) + + var files = [] + for(var i = 0; i < event.target.files.length; i++){ + files.push(event.target.files[i]) + } + var extensionRegex = /\.[^\/]+$/ + files.sort((a, b) => { + var path1 = a.webkitRelativePath.replace(extensionRegex, "") + var path2 = b.webkitRelativePath.replace(extensionRegex, "") + return path1 > path2 ? 1 : -1 + }) + + this.tjaFiles = [] + this.osuFiles = [] + var metaFiles = [] + this.otherFiles = {} + this.songs = [] + this.courseTypes = { + "easy": 0, + "normal": 1, + "hard": 2, + "oni": 3, + "ura": 4 + } + this.categories = { + "j-pop": "J-POP", + "pop": "J-POP", + "アニメ": "アニメ", + "anime": "アニメ", + "アニメ": "アニメ", + "ボーカロイド™曲": "ボーカロイド™曲", + "ボーカロイド曲": "ボーカロイド™曲", + "ボーカロイド": "ボーカロイド™曲", + "vocaloid™ music": "ボーカロイド™曲", + "vocaloid music": "ボーカロイド™曲", + "vocaloid": "ボーカロイド™曲", + "バラエティ": "バラエティ", + "バラエティー": "バラエティ", + "どうよう": "バラエティ", + "童謡・民謡": "バラエティ", + "variety": "バラエティ", + "children": "バラエティ", + "children/folk": "バラエティ", + "children-folk": "バラエティ", + "クラシック": "クラシック", + "クラッシック": "クラシック", + "classical": "クラシック", + "classic": "クラシック", + "ゲームミュージック": "ゲームミュージック", + "game music": "ゲームミュージック", + "ナムコオリジナル": "ナムコオリジナル", + "namco original": "ナムコオリジナル" + } + + for(var i = 0; i < files.length; i++){ + var file = files[i] + var name = file.name.toLowerCase() + var path = file.webkitRelativePath.toLowerCase() + if(name.endsWith(".tja")){ + this.tjaFiles.push({ + file: file, + index: i + }) + }else if(name.endsWith(".osu")){ + this.osuFiles.push({ + file: file, + index: i + }) + }else if(name === "genre.ini" || name === "box.def"){ + var level = (file.webkitRelativePath.match(/\//g) || []).length + metaFiles.push({ + file: file, + level: (level * 2) + (name === "genre.ini" ? 1 : 0) + }) + }else{ + this.otherFiles[file.webkitRelativePath.toLowerCase()] = file + } + } + + var metaPromises = [] + + metaFiles.forEach(fileObj => { + metaPromises.push(this.addMeta(fileObj)) + }) + + Promise.all(metaPromises).then(() => { + var songPromises = [] + + this.tjaFiles.forEach(fileObj => { + songPromises.push(this.addTja(fileObj)) + }) + this.osuFiles.forEach(fileObj => { + songPromises.push(this.addOsu(fileObj)) + }) + Promise.all(songPromises).then(this.loaded.bind(this)) + }) + } + + addMeta(fileObj){ + var file = fileObj.file + var level = fileObj.level + var name = file.name.toLowerCase() + var reader = new FileReader() + var promise = pageEvents.load(reader).then(event => { + var data = event.target.result.replace(/\0/g, "").split("\n") + var category + if(name === "genre.ini"){ + var key + for(var i = 0; i < data.length; i++){ + var line = data[i].trim().toLowerCase() + if(line.startsWith("[") && line.endsWith("]")){ + key = line.slice(1, -1) + }else if(key === "genre"){ + var equalsPos = line.indexOf("=") + if(equalsPos !== -1 && line.slice(0, equalsPos).trim() === "genrename"){ + var value = line.slice(equalsPos + 1).trim() + category = this.categories[value] || data[i].trim().slice(equalsPos + 1).trim() + break + } + } + } + }else if(name === "box.def"){ + for(var i = 0; i < data.length; i++){ + var line = data[i].trim().toLowerCase() + if(line.startsWith("#title:")){ + var value = line.slice(7).trim() + if(value in this.categories){ + category = this.categories[value] + } + }else if(line.startsWith("#genre:")){ + var value = line.slice(7).trim() + category = this.categories[value] || data[i].trim().slice(7).trim() + break + } + } + } + if(category){ + var metaPath = file.webkitRelativePath.toLowerCase().slice(0, file.name.length * -1) + this.tjaFiles.forEach(fileObj => { + var tjaPath = fileObj.file.webkitRelativePath.toLowerCase().slice(0, fileObj.file.name.length * -1) + if(tjaPath.startsWith(metaPath) && (!("categoryLevel" in fileObj) || fileObj.categoryLevel < level)){ + fileObj.category = category + fileObj.categoryLevel = level + } + }) + } + }).catch(() => {}) + reader.readAsText(file, "sjis") + return promise + } + + addTja(fileObj){ + var file = fileObj.file + var index = fileObj.index + var category = fileObj.category + var reader = new FileReader() + var promise = pageEvents.load(reader).then(event => { + var data = event.target.result.replace(/\0/g, "").split("\n") + var tja = new ParseTja(data, "oni", 0, true) + var songObj = { + id: index + 1, + type: "tja", + chart: data, + stars: [] + } + var dir = file.webkitRelativePath.toLowerCase() + dir = dir.slice(0, dir.lastIndexOf("/") + 1) + var hasCategory = false + for(var diff in tja.metadata){ + var meta = tja.metadata[diff] + songObj.title = songObj.title_en = meta.title || file.name.slice(0, file.name.lastIndexOf(".")) + var subtitle = meta.subtitle || "" + if(subtitle.startsWith("--")){ + subtitle = subtitle.slice(2) + } + songObj.subtitle = songObj.subtitle_en = subtitle + songObj.preview = meta.demostart ? Math.floor(meta.demostart * 1000) : 0 + if(meta.level){ + songObj.stars[this.courseTypes[diff]] = meta.level + } + if(meta.wave){ + songObj.music = this.otherFiles[dir + meta.wave.toLowerCase()] + } + if(meta.genre in this.categories){ + songObj.category = this.categories[meta.genre] + } + } + if(!songObj.category){ + songObj.category = category || this.getCategory(file) + } + if(songObj.music && songObj.stars.filter(star => star).length !== 0){ + this.songs[index] = songObj + } + }).catch(() => {}) + reader.readAsText(file, "sjis") + return promise + } + + addOsu(fileObj){ + var file = fileObj.file + var index = fileObj.index + var category = fileObj.category + var reader = new FileReader() + var promise = pageEvents.load(reader).then(event => { + var data = event.target.result.replace(/\0/g, "").split("\n") + var osu = new ParseOsu(data, 0, true) + var dir = file.webkitRelativePath.toLowerCase() + dir = dir.slice(0, dir.lastIndexOf("/") + 1) + var songObj = { + id: index + 1, + type: "osu", + chart: data, + subtitle: osu.metadata.ArtistUnicode || osu.metadata.Artist, + subtitle_en: osu.metadata.Artist || osu.metadata.ArtistUnicode, + preview: osu.generalInfo.PreviewTime, + stars: [null, null, null, parseInt(osu.difficulty.overallDifficulty) || 1], + music: this.otherFiles[dir + osu.generalInfo.AudioFilename.toLowerCase()] + } + var filename = file.name.slice(0, file.name.lastIndexOf(".")) + var title = osu.metadata.TitleUnicode || osu.metadata.Title + if(title){ + var suffix = "" + var matches = filename.match(/\[.+?\]$/) + if(matches){ + suffix = " " + matches[0] + } + songObj.title = title + suffix + songObj.title_en = (osu.metadata.Title || osu.metadata.TitleUnicode) + suffix + }else{ + songObj.title = filename + } + if(songObj.music){ + this.songs[index] = songObj + } + songObj.category = category || this.getCategory(file) + }).catch(() => {}) + reader.readAsText(file) + return promise + } + + getCategory(file){ + var path = file.webkitRelativePath.toLowerCase().split("/") + for(var i = path.length - 2; i >= 0; i--){ + for(var cat in this.categories){ + if(path[i].indexOf(cat) !== -1){ + return this.categories[cat] + } + } + } + } + + loaded(){ + this.songs = this.songs.filter(song => typeof song !== "undefined") + if(this.songs.length){ + assets.songs = this.songs + assets.customSongs = true + assets.customSelected = 0 + assets.sounds["don"].play() + this.songSelect.clean() + setTimeout(() => { + loader.screen.removeChild(this.loaderDiv) + this.clean() + new SongSelect("browse", false, this.songSelect.touchEnabled) + }, 500) + }else{ + loader.screen.removeChild(this.loaderDiv) + this.songSelect.browse.parentNode.reset() + this.songSelect.redrawRunning = true + this.clean() + } + } + + clean(){ + delete this.loaderDiv + delete this.songs + delete this.tjaFiles + delete this.osuFiles + delete this.otherFiles + } +} diff --git a/public/src/js/loadsong.js b/public/src/js/loadsong.js index 57c3565..a4b5a76 100644 --- a/public/src/js/loadsong.js +++ b/public/src/js/loadsong.js @@ -6,6 +6,14 @@ class LoadSong{ this.touchEnabled = touchEnabled loader.changePage("loadsong") + var loadingText = document.getElementById("loading-text") + loadingText.appendChild(document.createTextNode(strings.loading)) + loadingText.setAttribute("alt", strings.loading) + if(multiplayer){ + var cancel = document.getElementById("p2-cancel-button") + cancel.appendChild(document.createTextNode(strings.cancel)) + cancel.setAttribute("alt", strings.cancel) + } this.run() } run(){ diff --git a/public/src/js/parseosu.js b/public/src/js/parseosu.js index d56791c..e2b347f 100644 --- a/public/src/js/parseosu.js +++ b/public/src/js/parseosu.js @@ -278,7 +278,7 @@ class ParseOsu{ id: circleID, start: start + this.offset, type: "balloon", - txt: "ふうせん", + txt: strings.note.balloon, speed: speed, endTime: endTime + this.offset, requiredHits: requiredHits, @@ -296,10 +296,10 @@ class ParseOsu{ if(hitSound & this.osu.FINISH){ type = "daiDrumroll" - txt = "連打(大)ーっ!!" + txt = strings.note.daiDrumroll }else{ type = "drumroll" - txt = "連打ーっ!!" + txt = strings.note.drumroll } circles.push(new Circle({ id: circleID, @@ -328,10 +328,10 @@ class ParseOsu{ } }else if(hitSound & this.osu.WHISTLE || hitSound & this.osu.CLAP){ type = "ka" - txt = "カッ" + txt = strings.note.ka }else if(hitSound & this.osu.NORMAL || hitSound === 0){ type = "don" - txt = "ドン" + txt = strings.note.don }else{ emptyValue = true } diff --git a/public/src/js/parsetja.js b/public/src/js/parsetja.js index a571588..0055b99 100644 --- a/public/src/js/parsetja.js +++ b/public/src/js/parsetja.js @@ -12,15 +12,15 @@ this.soundOffset = 0 this.noteTypes = [ {name: false, txt: false}, - {name: "don", txt: "ドン"}, - {name: "ka", txt: "カッ"}, - {name: "daiDon", txt: "ドン(大)"}, - {name: "daiKa", txt: "カッ(大)"}, - {name: "drumroll", txt: "連打ーっ!!"}, - {name: "daiDrumroll", txt: "連打(大)ーっ!!"}, - {name: "balloon", txt: "ふうせん"}, + {name: "don", txt: strings.note.don}, + {name: "ka", txt: strings.note.ka}, + {name: "daiDon", txt: strings.note.daiDon}, + {name: "daiKa", txt: strings.note.daiKa}, + {name: "drumroll", txt: strings.note.drumroll}, + {name: "daiDrumroll", txt: strings.note.daiDrumroll}, + {name: "balloon", txt: strings.note.balloon}, {name: false, txt: false}, - {name: "balloon", txt: "ふうせん"} + {name: "balloon", txt: strings.note.balloon} ] this.courseTypes = { "0": "easy", @@ -41,6 +41,7 @@ parseMetadata(){ var metaNumbers = ["bpm", "offset", "demostart", "level"] var inSong = false + var hasSong = false var courses = {} var currentCourse = {} var courseName = this.difficulty @@ -53,18 +54,22 @@ if(name === "start" && !inSong){ inSong = true - for(var name in currentCourse){ - if(!(courseName in courses)){ - courses[courseName] = {} + if(!hasSong){ + for(var name in currentCourse){ + if(!(courseName in courses)){ + courses[courseName] = {} + } + courses[courseName][name] = currentCourse[name] } - courses[courseName][name] = currentCourse[name] + courses[courseName].start = lineNum + 1 + courses[courseName].end = this.data.length } - courses[courseName].start = lineNum + 1 - courses[courseName].end = this.data.length - }else if(name === "end" && inSong){ inSong = false - courses[courseName].end = lineNum + if(!hasSong){ + hasSong = true + courses[courseName].end = lineNum + } } }else if(!inSong){ @@ -82,6 +87,7 @@ }else{ courseName = value } + hasSong = false }else if(name === "balloon"){ value = value ? value.split(",").map(digit => parseInt(digit)) : [] }else if(this.inArray(name, metaNumbers)){ diff --git a/public/src/js/scoresheet.js b/public/src/js/scoresheet.js index e7e9303..d827ef7 100644 --- a/public/src/js/scoresheet.js +++ b/public/src/js/scoresheet.js @@ -363,7 +363,7 @@ class Scoresheet{ }, ctx => { this.draw.layeredText({ ctx: ctx, - text: "成績発表", + text: strings.results, fontSize: 48, fontFamily: this.font, x: 23, @@ -459,8 +459,8 @@ class Scoresheet{ ctx.fillStyle = "#fff" ctx.strokeStyle = "#000" ctx.lineWidth = 0.5 - ctx.fillText("点", 788, 284) - ctx.strokeText("点", 788, 284) + ctx.fillText(strings.points, 788, 284) + ctx.strokeText(strings.points, 788, 284) this.draw.score({ ctx: ctx, @@ -487,7 +487,7 @@ class Scoresheet{ grd.addColorStop(0.9, "#f7fb00") this.draw.layeredText({ ctx: ctx, - text: "最大コンボ数", + text: strings.maxCombo, x: 1149, y: 193, fontSize: 29, @@ -501,7 +501,7 @@ class Scoresheet{ ]) this.draw.layeredText({ ctx: ctx, - text: "連打数", + text: strings.drumroll, x: 1150, y: 233, fontSize: 29, diff --git a/public/src/js/songselect.js b/public/src/js/songselect.js index 7ee58be..81b58ea 100644 --- a/public/src/js/songselect.js +++ b/public/src/js/songselect.js @@ -118,15 +118,15 @@ class SongSelect{ } }) this.songs.push({ - title: "もどる", + title: strings.back, skin: this.songSkin.back, action: "back" }) this.songs.push({ - title: "ランダムに曲をえらぶ", + title: strings.randomSong, skin: this.songSkin.random, action: "random", - category: "ランダム" + category: strings.random }) if(touchEnabled){ if(fromTutorial === "tutorial"){ @@ -134,31 +134,31 @@ class SongSelect{ } }else{ this.songs.push({ - title: "あそびかた説明", + title: strings.tutorial, skin: this.songSkin.tutorial, action: "tutorial", - category: "ランダム" + category: strings.random }) } this.songs.push({ - title: "このシミュレータについて", + title: strings.aboutSimulator, skin: this.songSkin.about, action: "about", - category: "ランダム" + category: strings.random }) if("webkitdirectory" in HTMLInputElement.prototype && !(/Android|iPhone|iPad/.test(navigator.userAgent))){ this.browse = document.getElementById("browse") pageEvents.add(this.browse, "change", this.browseChange.bind(this)) this.songs.push({ - title: assets.customSongs ? "デフォルト曲リスト" : "参照する…", + title: assets.customSongs ? strings.defaultSongList : strings.browse, skin: this.songSkin.browse, action: "browse", - category: "ランダム" + category: strings.random }) } this.songs.push({ - title: "もどる", + title: strings.back, skin: this.songSkin.back, action: "back" }) @@ -177,19 +177,19 @@ class SongSelect{ } this.diffOptions = [{ - text: "もどる", + text: strings.back, fill: "#efb058", iconName: "back", iconFill: "#f7d39c", letterSpacing: 4 }, { - text: "演奏オプション", + text: strings.songOptions, fill: "#b2e442", iconName: "options", iconFill: "#d9f19f", letterSpacing: 0 }] - this.optionsList = ["なし", "オート", "ネットプレイ"] + this.optionsList = [strings.none, strings.auto, strings.netplay] this.draw = new CanvasDraw() this.songTitleCache = new CanvasCache() @@ -199,12 +199,12 @@ class SongSelect{ this.sessionCache = new CanvasCache() this.currentSongCache = new CanvasCache() - this.difficulty = ["かんたん", "ふつう", "むずかしい", "おに"] + this.difficulty = [strings.easy, strings.normal, strings.hard, strings.oni] this.difficultyId = ["easy", "normal", "hard", "oni", "ura"] this.sessionText = { - "sessionstart": "オンラインセッションを開始する！", - "sessionend": "オンラインセッションを終了する" + "sessionstart": strings.sessionStart, + "sessionend": strings.sessionEnd } this.selectedSong = 0 @@ -557,124 +557,7 @@ class SongSelect{ } browseChange(event){ - this.redrawRunning = false - this.pointer(false) - - var loaderDiv = document.createElement("div") - loaderDiv.innerHTML = assets.pages["loadsong"] - loader.screen.appendChild(loaderDiv) - var files = event.target.files - var promises = [] - var tjaFiles = [] - var osuFiles = [] - var otherFiles = {} - - for(var i = 0; i < files.length; i++){ - var file = files[i] - var name = file.name.toLowerCase() - if(name.endsWith(".tja")){ - tjaFiles.push([file, i]) - }else if(name.endsWith(".osu")){ - osuFiles.push([file, i]) - }else{ - otherFiles[file.webkitRelativePath.toLowerCase()] = file - } - } - var songs = [] - var courseTypes = {"easy": 0, "normal": 1, "hard": 2, "oni": 3, "ura": 4} - for(var i = 0; i < tjaFiles.length; i++){ - let file = tjaFiles[i][0] - let index = tjaFiles[i][1] - var reader = new FileReader() - promises.push(pageEvents.load(reader).then(event => { - var data = event.target.result.replace(/\0/g, "").split("\n") - var tja = new ParseTja(data, "oni", 0, true) - var songObj = { - id: index + 1, - type: "tja", - chart: data, - stars: [] - } - var dir = file.webkitRelativePath.toLowerCase() - dir = dir.slice(0, dir.lastIndexOf("/") + 1) - for(var diff in tja.metadata){ - var meta = tja.metadata[diff] - songObj.title = songObj.title_en = meta.title || file.name.slice(0, file.name.lastIndexOf(".")) - var subtitle = meta.subtitle || "" - if(subtitle.startsWith("--")){ - subtitle = subtitle.slice(2) - } - songObj.subtitle = songObj.subtitle_en = subtitle - songObj.preview = meta.demostart ? Math.floor(meta.demostart * 1000) : 0 - if(meta.level){ - songObj.stars[courseTypes[diff]] = meta.level - } - if(meta.wave){ - songObj.music = otherFiles[dir + meta.wave.toLowerCase()] - } - } - if(songObj.music && songObj.stars.filter(star => star).length !== 0){ - songs[index] = songObj - } - }).catch(() => {})) - reader.readAsText(file, "sjis") - } - for(var i = 0; i < osuFiles.length; i++){ - let file = osuFiles[i][0] - let index = osuFiles[i][1] - var reader = new FileReader() - promises.push(pageEvents.load(reader).then(event => { - var data = event.target.result.replace(/\0/g, "").split("\n") - var osu = new ParseOsu(data, 0, true) - var dir = file.webkitRelativePath.toLowerCase() - dir = dir.slice(0, dir.lastIndexOf("/") + 1) - var songObj = { - id: index + 1, - type: "osu", - chart: data, - subtitle: osu.metadata.ArtistUnicode || osu.metadata.Artist, - subtitle_en: osu.metadata.Artist || osu.metadata.ArtistUnicode, - preview: osu.generalInfo.PreviewTime, - stars: [null, null, null, parseInt(osu.difficulty.overallDifficulty) || 1], - music: otherFiles[dir + osu.generalInfo.AudioFilename.toLowerCase()] - } - var filename = file.name.slice(0, file.name.lastIndexOf(".")) - var title = osu.metadata.TitleUnicode || osu.metadata.Title - if(title){ - var suffix = "" - var matches = filename.match(/\[.+?\]$/) - if(matches){ - suffix = " " + matches[0] - } - songObj.title = title + suffix - songObj.title_en = (osu.metadata.Title || osu.metadata.TitleUnicode) + suffix - }else{ - songObj.title = filename - } - if(songObj.music){ - songs[index] = songObj - } - }).catch(() => {})) - reader.readAsText(file) - } - Promise.all(promises).then(() => { - songs = songs.filter(song => typeof song !== "undefined") - if(songs.length){ - assets.songs = songs - assets.customSongs = true - assets.customSelected = 0 - assets.sounds["don"].play() - this.clean() - setTimeout(() => { - loader.screen.removeChild(loaderDiv) - new SongSelect("browse", false, this.touchEnabled) - }, 500) - }else{ - loader.screen.removeChild(loaderDiv) - this.browse.parentNode.reset() - this.redrawRunning = true - } - }) + new ImportSongs(this, event) } toSelectDifficulty(fromP2){ @@ -996,7 +879,7 @@ class SongSelect{ }, ctx => { this.draw.layeredText({ ctx: ctx, - text: "曲をえらぶ", + text: strings.selectSong, fontSize: 48, fontFamily: this.font, x: 53, @@ -1025,9 +908,14 @@ class SongSelect{ h: this.songAsset.marginTop, id: category + selectedSong.skin.outline }, ctx => { + if(category in strings.categories){ + var categoryName = strings.categories[category] + }else{ + var categoryName = category + } this.draw.layeredText({ ctx: ctx, - text: category, + text: categoryName, fontSize: 40, fontFamily: this.font, x: 280 / 2, @@ -1236,7 +1124,7 @@ class SongSelect{ }, ctx => { this.draw.layeredText({ ctx: ctx, - text: "むずかしさをえらぶ", + text: strings.selectDifficulty, fontSize: 46, fontFamily: this.font, x: 53, diff --git a/public/src/js/strings.js b/public/src/js/strings.js new file mode 100644 index 0000000..ba5eea3 --- /dev/null +++ b/public/src/js/strings.js @@ -0,0 +1,55 @@ +class StringsJa{ + constructor(){ + this.tilteProceed = "Click or Press Enter!" + this.categories = { + "J-POP": "J-POP", + "アニメ": "アニメ", + "ボーカロイド™曲": "ボーカロイド™曲", + "バラエティ": "バラエティ", + "クラシック": "クラシック", + "ゲームミュージック": "ゲームミュージック", + "ナムコオリジナル": "ナムコオリジナル" + } + this.selectSong = "曲をえらぶ" + this.selectDifficulty = "むずかしさをえらぶ" + this.back = "もどる" + this.random = "ランダム" + this.randomSong = "ランダムに曲をえらぶ" + this.tutorial = "あそびかた説明" + this.aboutSimulator = "このシミュレータについて" + this.browse = "参照する…" + this.defaultSongList = "デフォルト曲リスト" + this.songOptions = "演奏オプション" + this.none = "なし" + this.auto = "オート" + this.netplay = "ネットプレイ" + this.easy = "かんたん" + this.normal = "ふつう" + this.hard = "むずかしい" + this.oni = "おに" + this.sessionStart = "オンラインセッションを開始する！" + this.sessionEnd = "オンラインセッションを終了する" + this.loading = "Loading..." + this.cancel = "Cancel" + this.note = { + don: "ドン", + ka: "カッ", + daiDon: "ドン(大)", + daiKa: "カッ(大)", + drumroll: "連打ーっ!!", + daiDrumroll: "連打(大)ーっ!!", + balloon: "ふうせん" + } + this.clear = "クリア" + this.pauseOptions = [ + "演奏をつづける", + "はじめからやりなおす", + "「曲をえらぶ」にもどる" + ] + this.results = "成績発表" + this.points = "点" + this.maxCombo = "最大コンボ数" + this.drumroll = "連打数" + } +} +var strings = new StringsJa() diff --git a/public/src/js/titlescreen.js b/public/src/js/titlescreen.js index 71e8c7e..af49297 100644 --- a/public/src/js/titlescreen.js +++ b/public/src/js/titlescreen.js @@ -2,6 +2,10 @@ class Titlescreen{ constructor(){ loader.changePage("titlescreen") this.titleScreen = document.getElementById("title-screen") + var proceed = document.getElementById("tilte-proceed") + proceed.appendChild(document.createTextNode(strings.tilteProceed)) + proceed.setAttribute("alt", strings.tilteProceed) + pageEvents.keyAdd(this, "all", "down", this.keyDown.bind(this)) pageEvents.add(this.titleScreen, ["mousedown", "touchstart"], this.onPressed.bind(this)) assets.sounds["title"].play() diff --git a/public/src/js/view.js b/public/src/js/view.js index e527f76..d45b267 100644 --- a/public/src/js/view.js +++ b/public/src/js/view.js @@ -14,11 +14,7 @@ this.touchp2Class = false this.darkDonBg = false - this.pauseOptions = [ - "演奏をつづける", - "はじめからやりなおす", - "「曲をえらぶ」にもどる" - ] + this.pauseOptions = strings.pauseOptions this.categories = { "J-POP": { sort: 0, diff --git a/public/src/views/loadsong.html b/public/src/views/loadsong.html index 6571b85..4412c05 100644 --- a/public/src/views/loadsong.html +++ b/public/src/views/loadsong.html @@ -1,7 +1,7 @@
-
Loading...
-
Cancel
+
+
diff --git a/public/src/views/titlescreen.html b/public/src/views/titlescreen.html index bc5ce4f..c2d0b25 100644 --- a/public/src/views/titlescreen.html +++ b/public/src/views/titlescreen.html @@ -1,4 +1,4 @@
太鼓の達人ウェブ
-
Click or Press Enter!
+
diff --git a/templates/index.html b/templates/index.html index c35e3d1..806047e 100644 --- a/templates/index.html +++ b/templates/index.html @@ -1,13 +1,3 @@ - - - - - - - - - - @@ -57,6 +47,8 @@ + + From 886979ad36ab3527afb58223a0fd2b8a24a534e6 Mon Sep 17 00:00:00 2001 From: LoveEevee Date: Sat, 5 Jan 2019 15:24:09 +0300 Subject: [PATCH 2/3] Allow non-standard genre field, add genre to osu songs --- public/src/js/importsongs.js | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/public/src/js/importsongs.js b/public/src/js/importsongs.js index f26018c..d81241f 100644 --- a/public/src/js/importsongs.js +++ b/public/src/js/importsongs.js @@ -148,13 +148,15 @@ } if(category){ var metaPath = file.webkitRelativePath.toLowerCase().slice(0, file.name.length * -1) - this.tjaFiles.forEach(fileObj => { + var filesLoop = fileObj => { var tjaPath = fileObj.file.webkitRelativePath.toLowerCase().slice(0, fileObj.file.name.length * -1) if(tjaPath.startsWith(metaPath) && (!("categoryLevel" in fileObj) || fileObj.categoryLevel < level)){ fileObj.category = category fileObj.categoryLevel = level } - }) + } + this.tjaFiles.forEach(filesLoop) + this.osuFiles.forEach(filesLoop) } }).catch(() => {}) reader.readAsText(file, "sjis") @@ -193,8 +195,8 @@ if(meta.wave){ songObj.music = this.otherFiles[dir + meta.wave.toLowerCase()] } - if(meta.genre in this.categories){ - songObj.category = this.categories[meta.genre] + if(meta.genre){ + songObj.category = this.categories[meta.genre.toLowerCase()] || meta.genre } } if(!songObj.category){ From 23f17aa26da53596aa5e58e27e1d0d954b9be143 Mon Sep 17 00:00:00 2001 From: LoveEevee Date: Sat, 5 Jan 2019 18:54:06 +0300 Subject: [PATCH 3/3] Fix typo in a variable name --- public/src/js/strings.js | 2 +- public/src/js/titlescreen.js | 6 +++--- public/src/views/titlescreen.html | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/public/src/js/strings.js b/public/src/js/strings.js index ba5eea3..b1ed85b 100644 --- a/public/src/js/strings.js +++ b/public/src/js/strings.js @@ -1,6 +1,6 @@ class StringsJa{ constructor(){ - this.tilteProceed = "Click or Press Enter!" + this.titleProceed = "Click or Press Enter!" this.categories = { "J-POP": "J-POP", "アニメ": "アニメ", diff --git a/public/src/js/titlescreen.js b/public/src/js/titlescreen.js index af49297..3c5d40b 100644 --- a/public/src/js/titlescreen.js +++ b/public/src/js/titlescreen.js @@ -2,9 +2,9 @@ class Titlescreen{ constructor(){ loader.changePage("titlescreen") this.titleScreen = document.getElementById("title-screen") - var proceed = document.getElementById("tilte-proceed") - proceed.appendChild(document.createTextNode(strings.tilteProceed)) - proceed.setAttribute("alt", strings.tilteProceed) + var proceed = document.getElementById("title-proceed") + proceed.appendChild(document.createTextNode(strings.titleProceed)) + proceed.setAttribute("alt", strings.titleProceed) pageEvents.keyAdd(this, "all", "down", this.keyDown.bind(this)) pageEvents.add(this.titleScreen, ["mousedown", "touchstart"], this.onPressed.bind(this)) diff --git a/public/src/views/titlescreen.html b/public/src/views/titlescreen.html index c2d0b25..91f0fee 100644 --- a/public/src/views/titlescreen.html +++ b/public/src/views/titlescreen.html @@ -1,4 +1,4 @@
太鼓の達人ウェブ
-
+