Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
T
Taiko Web
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Packages
Packages
List
Container Registry
Analytics
Analytics
CI / CD
Code Review
Insights
Issues
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nanahira
Taiko Web
Commits
8574ad25
Commit
8574ad25
authored
Nov 01, 2019
by
nanahira
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add auto score
parent
41a64965
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
174 additions
and
8 deletions
+174
-8
public/src/js/assets.js
public/src/js/assets.js
+1
-0
public/src/js/autoscore.js
public/src/js/autoscore.js
+155
-0
public/src/js/controller.js
public/src/js/controller.js
+1
-1
public/src/js/importsongs.js
public/src/js/importsongs.js
+1
-1
public/src/js/parseosu.js
public/src/js/parseosu.js
+6
-1
public/src/js/parsetja.js
public/src/js/parsetja.js
+10
-5
No files found.
public/src/js/assets.js
View file @
8574ad25
...
@@ -24,6 +24,7 @@ var assets = {
...
@@ -24,6 +24,7 @@ var assets = {
"
canvastest.js
"
,
"
canvastest.js
"
,
"
canvascache.js
"
,
"
canvascache.js
"
,
"
parsetja.js
"
,
"
parsetja.js
"
,
"
autoscore.js
"
,
"
about.js
"
,
"
about.js
"
,
"
debug.js
"
,
"
debug.js
"
,
"
session.js
"
,
"
session.js
"
,
...
...
public/src/js/autoscore.js
0 → 100644
View file @
8574ad25
class
AutoScore
{
constructor
(
difficulty
,
level
,
scoremode
,
circles
)
{
this
.
scoremode
=
scoremode
;
this
.
circles
=
circles
;
this
.
basic_max_score_list
=
{
oni
:
[
1200000
,
700000
,
750000
,
800000
,
850000
,
900000
,
950000
,
1000000
,
1050000
,
1100000
,
1200000
],
ura
:
[
1200000
,
700000
,
750000
,
800000
,
850000
,
900000
,
950000
,
1000000
,
1050000
,
1100000
,
1200000
],
hard
:
[
900000
,
550000
,
600000
,
650000
,
700000
,
750000
,
800000
,
850000
,
900000
,
],
normal
:
[
700000
,
400000
,
450000
,
500000
,
550000
,
600000
,
650000
,
700000
,
],
easy
:
[
380000
,
300000
,
320000
,
340000
,
360000
,
380000
,
]
}
const
target
=
this
.
GetTargetScore
(
difficulty
,
level
);
this
.
Score
=
0
;
this
.
ScoreDiff
=
0
;
this
.
ScoreInit
=
0
;
const
max_possible_init
=
Math
.
ceil
(
target
/
this
.
GetMaxCombo
()
/
10
)
*
10
;
//console.log(target);
for
(
var
init
=
100
;
init
<=
max_possible_init
;
init
+=
10
)
{
for
(
var
diff
=
10
;
diff
<
init
;
diff
++
)
{
const
score
=
this
.
TryScore
(
init
,
diff
);
if
(
score
>
target
&&
Math
.
abs
(
score
-
target
)
<
Math
.
abs
(
this
.
Score
-
target
))
{
this
.
Score
=
score
;
this
.
ScoreInit
=
init
;
this
.
ScoreDiff
=
diff
;
//console.log(init, diff, score);
}
if
(
score
>
target
)
{
break
;
}
}
}
}
IsCommonCircle
(
circle
)
{
const
ty
=
circle
.
type
;
return
ty
===
"
don
"
||
ty
===
"
ka
"
||
ty
===
"
daiDon
"
||
ty
===
"
daiKa
"
;
}
TryScore
(
init
,
diff
)
{
var
score
=
0
;
var
combo
=
0
;
for
(
var
circle
of
this
.
circles
)
{
if
(
circle
.
branch
&&
circle
.
branch
.
name
!==
"
master
"
)
{
continue
;
}
if
(
this
.
IsCommonCircle
(
circle
))
{
combo
++
;
if
(
combo
%
100
===
0
&&
this
.
scoremode
!==
1
)
{
score
+=
10000
;
}
}
var
diff_mul
=
0
;
var
multiplier
=
circle
.
gogoTime
?
1.2
:
1
;
if
(
this
.
scoremode
===
1
)
{
diff_mul
=
Math
.
max
(
0
,
Math
.
floor
((
Math
.
min
(
combo
,
100
)
-
1
)
/
10
));
}
else
{
if
(
combo
>=
100
)
{
diff_mul
=
8
;
}
else
if
(
combo
>=
50
)
{
diff_mul
=
4
;
}
else
if
(
combo
>=
30
)
{
diff_mul
=
2
;
}
else
if
(
combo
>=
10
)
{
diff_mul
=
1
;
}
}
switch
(
circle
.
type
)
{
case
"
don
"
:
case
"
ka
"
:
{
score
+=
Math
.
floor
((
init
+
diff
*
diff_mul
)
*
multiplier
/
10
)
*
10
;
break
;
}
case
"
daiDon
"
:
case
"
daiKa
"
:
{
score
+=
Math
.
floor
((
init
+
diff
*
diff_mul
)
*
multiplier
/
5
)
*
10
;
break
;
}
case
"
balloon
"
:
{
score
+=
(
5000
+
300
*
circle
.
requiredHits
)
*
multiplier
;
break
;
}
default
:
{
break
;
}
}
}
return
score
;
}
GetTargetScore
(
difficulty
,
level
)
{
//console.log(difficulty, level)
var
ret
=
this
.
basic_max_score_list
[
difficulty
][
level
];
if
(
!
ret
)
{
ret
=
this
.
basic_max_score_list
[
difficulty
][
0
];
}
return
ret
;
}
GetMaxCombo
()
{
var
combo
=
0
;
for
(
var
circle
of
this
.
circles
)
{
//alert(this.IsCommonCircle(circle));
if
(
this
.
IsCommonCircle
(
circle
)
&&
(
!
circle
.
branch
||
circle
.
branch
.
name
===
"
master
"
))
{
combo
++
;
}
}
return
combo
;
}
}
public/src/js/controller.js
View file @
8574ad25
...
@@ -14,7 +14,7 @@ class Controller{
...
@@ -14,7 +14,7 @@ class Controller{
if
(
selectedSong
.
type
===
"
tja
"
){
if
(
selectedSong
.
type
===
"
tja
"
){
this
.
parsedSongData
=
new
ParseTja
(
songData
,
selectedSong
.
difficulty
,
selectedSong
.
offset
)
this
.
parsedSongData
=
new
ParseTja
(
songData
,
selectedSong
.
difficulty
,
selectedSong
.
offset
)
}
else
{
}
else
{
this
.
parsedSongData
=
new
ParseOsu
(
songData
,
selectedSong
.
offset
)
this
.
parsedSongData
=
new
ParseOsu
(
songData
,
selectedSong
.
difficulty
,
selectedSong
.
offset
)
}
}
this
.
offset
=
this
.
parsedSongData
.
soundOffset
this
.
offset
=
this
.
parsedSongData
.
soundOffset
...
...
public/src/js/importsongs.js
View file @
8574ad25
...
@@ -283,7 +283,7 @@
...
@@ -283,7 +283,7 @@
var
reader
=
new
FileReader
()
var
reader
=
new
FileReader
()
var
promise
=
pageEvents
.
load
(
reader
).
then
(
event
=>
{
var
promise
=
pageEvents
.
load
(
reader
).
then
(
event
=>
{
var
data
=
event
.
target
.
result
.
replace
(
/
\0
/g
,
""
).
split
(
"
\n
"
)
var
data
=
event
.
target
.
result
.
replace
(
/
\0
/g
,
""
).
split
(
"
\n
"
)
var
osu
=
new
ParseOsu
(
data
,
0
,
true
)
var
osu
=
new
ParseOsu
(
data
,
"
oni
"
,
0
,
true
);
var
dir
=
file
.
webkitRelativePath
.
toLowerCase
()
var
dir
=
file
.
webkitRelativePath
.
toLowerCase
()
dir
=
dir
.
slice
(
0
,
dir
.
lastIndexOf
(
"
/
"
)
+
1
)
dir
=
dir
.
slice
(
0
,
dir
.
lastIndexOf
(
"
/
"
)
+
1
)
var
songObj
=
{
var
songObj
=
{
...
...
public/src/js/parseosu.js
View file @
8574ad25
class
ParseOsu
{
class
ParseOsu
{
constructor
(
fileContent
,
offset
,
metaOnly
){
constructor
(
fileContent
,
difficulty
,
offset
,
metaOnly
){
this
.
osu
=
{
this
.
osu
=
{
OFFSET
:
0
,
OFFSET
:
0
,
MSPERBEAT
:
1
,
MSPERBEAT
:
1
,
...
@@ -52,6 +52,7 @@ class ParseOsu{
...
@@ -52,6 +52,7 @@ class ParseOsu{
this
.
metadata
=
this
.
parseMetadata
()
this
.
metadata
=
this
.
parseMetadata
()
this
.
editor
=
this
.
parseEditor
()
this
.
editor
=
this
.
parseEditor
()
this
.
difficulty
=
this
.
parseDifficulty
()
this
.
difficulty
=
this
.
parseDifficulty
()
this
.
_difficulty
=
difficulty
;
if
(
!
metaOnly
){
if
(
!
metaOnly
){
this
.
timingPoints
=
this
.
parseTiming
()
this
.
timingPoints
=
this
.
parseTiming
()
this
.
circles
=
this
.
parseCircles
()
this
.
circles
=
this
.
parseCircles
()
...
@@ -354,6 +355,10 @@ class ParseOsu{
...
@@ -354,6 +355,10 @@ class ParseOsu{
console
.
warn
(
"
Unknown note type found on line
"
+
(
i
+
1
)
+
"
:
"
+
this
.
data
[
i
])
console
.
warn
(
"
Unknown note type found on line
"
+
(
i
+
1
)
+
"
:
"
+
this
.
data
[
i
])
}
}
}
}
this
.
scoremode
=
2
;
var
autoscore
=
new
AutoScore
(
this
.
_difficulty
,
this
.
difficulty
.
overallDifficulty
,
2
,
circles
);
this
.
scoreinit
=
autoscore
.
ScoreInit
;
this
.
scorediff
=
autoscore
.
ScoreDiff
;
return
circles
return
circles
}
}
}
}
public/src/js/parsetja.js
View file @
8574ad25
...
@@ -122,11 +122,6 @@
...
@@ -122,11 +122,6 @@
}
}
parseCircles
(){
parseCircles
(){
var
meta
=
this
.
metadata
[
this
.
difficulty
]
var
meta
=
this
.
metadata
[
this
.
difficulty
]
this
.
scoreinit
=
meta
.
scoreinit
;
this
.
scorediff
=
meta
.
scorediff
;
if
(
this
.
scoreinit
&&
this
.
scorediff
)
{
this
.
scoremode
=
meta
.
scoremode
||
1
;
}
var
ms
=
(
meta
.
offset
||
0
)
*
-
1000
+
this
.
offset
var
ms
=
(
meta
.
offset
||
0
)
*
-
1000
+
this
.
offset
var
bpm
=
Math
.
abs
(
meta
.
bpm
)
||
120
var
bpm
=
Math
.
abs
(
meta
.
bpm
)
||
120
var
scroll
=
1
var
scroll
=
1
...
@@ -453,6 +448,16 @@
...
@@ -453,6 +448,16 @@
this
.
measures
.
sort
((
a
,
b
)
=>
a
.
ms
>
b
.
ms
?
1
:
-
1
)
this
.
measures
.
sort
((
a
,
b
)
=>
a
.
ms
>
b
.
ms
?
1
:
-
1
)
circles
.
forEach
((
circle
,
i
)
=>
circle
.
id
=
i
+
1
)
circles
.
forEach
((
circle
,
i
)
=>
circle
.
id
=
i
+
1
)
}
}
this
.
scoreinit
=
meta
.
scoreinit
;
this
.
scorediff
=
meta
.
scorediff
;
if
(
this
.
scoreinit
&&
this
.
scorediff
)
{
this
.
scoremode
=
meta
.
scoremode
||
1
;
}
else
{
this
.
scoremode
=
meta
.
scoremode
||
2
;
var
autoscore
=
new
AutoScore
(
this
.
difficulty
,
meta
.
level
,
this
.
scoremode
,
circles
);
this
.
scoreinit
=
autoscore
.
ScoreInit
;
this
.
scorediff
=
autoscore
.
ScoreDiff
;
}
return
circles
return
circles
}
}
}
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment