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
3097dd37
Commit
3097dd37
authored
Feb 29, 2020
by
LoveEevee
Committed by
nanahira
Mar 01, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[PATCH] Add Easier Big Notes setting
parent
2ab0de96
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
38 additions
and
9 deletions
+38
-9
public/src/js/controller.js
public/src/js/controller.js
+5
-1
public/src/js/game.js
public/src/js/game.js
+11
-4
public/src/js/keyboard.js
public/src/js/keyboard.js
+3
-4
public/src/js/settings.js
public/src/js/settings.js
+4
-0
public/src/js/strings.js
public/src/js/strings.js
+15
-0
No files found.
public/src/js/controller.js
View file @
3097dd37
...
@@ -60,7 +60,11 @@ class Controller{
...
@@ -60,7 +60,11 @@ class Controller{
this
.
view
=
new
View
(
this
)
this
.
view
=
new
View
(
this
)
this
.
mekadon
=
new
Mekadon
(
this
,
this
.
game
)
this
.
mekadon
=
new
Mekadon
(
this
,
this
.
game
)
this
.
keyboard
=
new
GameInput
(
this
)
this
.
keyboard
=
new
GameInput
(
this
)
this
.
TaikoForceLv5
=
this
.
keyboard
.
keyboard
.
TaikoForceLv5
&&
!
autoPlayEnabled
&&
(
this
.
multiplayer
!==
2
);
if
(
!
autoPlayEnabled
&&
this
.
multiplayer
!==
2
){
this
.
easierBigNotes
=
settings
.
getItem
(
"
easierBigNotes
"
)
||
this
.
keyboard
.
keyboard
.
TaikoForceLv5
}
else
{
this
.
easierBigNotes
=
false
}
this
.
drumSounds
=
settings
.
getItem
(
"
latency
"
).
drumSounds
this
.
drumSounds
=
settings
.
getItem
(
"
latency
"
).
drumSounds
this
.
playedSounds
=
{}
this
.
playedSounds
=
{}
...
...
public/src/js/game.js
View file @
3097dd37
...
@@ -31,6 +31,7 @@ class Game{
...
@@ -31,6 +31,7 @@ class Game{
this
.
branchNames
=
[
"
normal
"
,
"
advanced
"
,
"
master
"
]
this
.
branchNames
=
[
"
normal
"
,
"
advanced
"
,
"
master
"
]
this
.
resetSection
()
this
.
resetSection
()
this
.
gameLagSync
=
!
this
.
controller
.
touchEnabled
&&
!
(
/Firefox/
.
test
(
navigator
.
userAgent
))
this
.
gameLagSync
=
!
this
.
controller
.
touchEnabled
&&
!
(
/Firefox/
.
test
(
navigator
.
userAgent
))
this
.
lastPressedKeys
=
[
false
,
false
,
false
,
false
]
assets
.
songs
.
forEach
(
song
=>
{
assets
.
songs
.
forEach
(
song
=>
{
if
(
song
.
id
==
selectedSong
.
folder
){
if
(
song
.
id
==
selectedSong
.
folder
){
...
@@ -264,6 +265,11 @@ class Game{
...
@@ -264,6 +265,11 @@ class Game{
var
don_r
=
keys
[
"
don_r
"
]
&&
!
this
.
controller
.
isWaiting
(
"
don_r
"
,
"
score
"
)
var
don_r
=
keys
[
"
don_r
"
]
&&
!
this
.
controller
.
isWaiting
(
"
don_r
"
,
"
score
"
)
var
ka_l
=
keys
[
"
ka_l
"
]
&&
!
this
.
controller
.
isWaiting
(
"
ka_l
"
,
"
score
"
)
var
ka_l
=
keys
[
"
ka_l
"
]
&&
!
this
.
controller
.
isWaiting
(
"
ka_l
"
,
"
score
"
)
var
ka_r
=
keys
[
"
ka_r
"
]
&&
!
this
.
controller
.
isWaiting
(
"
ka_r
"
,
"
score
"
)
var
ka_r
=
keys
[
"
ka_r
"
]
&&
!
this
.
controller
.
isWaiting
(
"
ka_r
"
,
"
score
"
)
if
(
don_l
||
don_r
||
ka_l
||
ka_r
){
this
.
lastPressedKeys
=
[
don_l
,
don_r
,
ka_l
,
ka_r
]
}
else
{
[
don_l
,
don_r
,
ka_l
,
ka_r
]
=
this
.
lastPressedKeys
}
var
checkDon
=
()
=>
{
var
checkDon
=
()
=>
{
if
(
don_l
&&
don_r
){
if
(
don_l
&&
don_r
){
...
@@ -330,10 +336,11 @@ class Game{
...
@@ -330,10 +336,11 @@ class Game{
}
}
var
score
=
0
var
score
=
0
if
(
keysDon
&&
typeDon
||
keysKa
&&
typeKa
){
if
(
keysDon
&&
typeDon
||
keysKa
&&
typeKa
){
if
(
typeDai
&&
!
keyDai
)
{
if
(
typeDai
&&
!
keyDai
){
if
(
this
.
controller
.
TaikoForceLv5
)
{
// Taiko Force Lv5 can't hit both Dons at the same time, so dai offered
if
(
this
.
controller
.
easierBigNotes
){
keyDai
=
true
;
// Taiko Force Lv5 can't hit both Dons at the same time, so dai offered
}
else
if
(
!
circle
.
daiFailed
){
keyDai
=
true
}
else
if
(
!
circle
.
daiFailed
){
circle
.
daiFailed
=
ms
circle
.
daiFailed
=
ms
return
false
return
false
}
else
if
(
ms
<
circle
.
daiFailed
+
this
.
rules
.
daiLeniency
){
}
else
if
(
ms
<
circle
.
daiFailed
+
this
.
rules
.
daiLeniency
){
...
...
public/src/js/keyboard.js
View file @
3097dd37
...
@@ -19,14 +19,13 @@ class Keyboard{
...
@@ -19,14 +19,13 @@ class Keyboard{
pageEvents
.
keyAdd
(
this
,
"
all
"
,
"
both
"
,
this
.
keyEvent
.
bind
(
this
))
pageEvents
.
keyAdd
(
this
,
"
all
"
,
"
both
"
,
this
.
keyEvent
.
bind
(
this
))
pageEvents
.
blurAdd
(
this
,
this
.
blurEvent
.
bind
(
this
))
pageEvents
.
blurAdd
(
this
,
this
.
blurEvent
.
bind
(
this
))
}
}
isTaikoForceLv5
(
kbdSettings
)
{
// the key of Taiko Force Lv5's PC module looks like this
isTaikoForceLv5
(
kbdSettings
)
{
//
console.log(kbdSettings);
//
the key of Taiko Force Lv5's PC module looks like this
return
(
kbdSettings
.
ka_l
[
0
]
===
"
f
"
)
&&
(
kbdSettings
.
ka_r
[
0
]
===
"
e
"
)
&&
(
kbdSettings
.
don_l
[
0
]
===
"
i
"
)
&&
(
kbdSettings
.
don_r
[
0
]
===
"
j
"
);
return
(
kbdSettings
.
ka_l
[
0
]
===
"
f
"
)
&&
(
kbdSettings
.
ka_r
[
0
]
===
"
e
"
)
&&
(
kbdSettings
.
don_l
[
0
]
===
"
i
"
)
&&
(
kbdSettings
.
don_r
[
0
]
===
"
j
"
);
}
}
update
(){
update
(){
var
kbdSettings
=
settings
.
getItem
(
"
keyboardSettings
"
)
var
kbdSettings
=
settings
.
getItem
(
"
keyboardSettings
"
)
this
.
TaikoForceLv5
=
this
.
isTaikoForceLv5
(
kbdSettings
);
this
.
TaikoForceLv5
=
this
.
isTaikoForceLv5
(
kbdSettings
)
//console.log("Taiko Force Lv5", this.TaikoForceLv5);
var
drumKeys
=
{}
var
drumKeys
=
{}
for
(
var
name
in
kbdSettings
){
for
(
var
name
in
kbdSettings
){
var
keys
=
kbdSettings
[
name
]
var
keys
=
kbdSettings
[
name
]
...
...
public/src/js/settings.js
View file @
3097dd37
...
@@ -46,6 +46,10 @@ class Settings{
...
@@ -46,6 +46,10 @@ class Settings{
"
video
"
:
0
,
"
video
"
:
0
,
"
drumSounds
"
:
true
"
drumSounds
"
:
true
}
}
},
easierBigNotes
:
{
type
:
"
toggle
"
,
default
:
false
}
}
}
}
...
...
public/src/js/strings.js
View file @
3097dd37
...
@@ -151,6 +151,9 @@
...
@@ -151,6 +151,9 @@
video
:
"
Video
"
,
video
:
"
Video
"
,
drumSounds
:
"
Drum Sounds
"
drumSounds
:
"
Drum Sounds
"
},
},
easierBigNotes
:
{
name
:
"
大きな音符を簡単にする
"
},
on
:
"
オン
"
,
on
:
"
オン
"
,
off
:
"
オフ
"
,
off
:
"
オフ
"
,
default
:
"
既定値にリセット
"
,
default
:
"
既定値にリセット
"
,
...
@@ -343,6 +346,9 @@ function StringsEn(){
...
@@ -343,6 +346,9 @@ function StringsEn(){
video
:
"
Video
"
,
video
:
"
Video
"
,
drumSounds
:
"
Drum Sounds
"
drumSounds
:
"
Drum Sounds
"
},
},
easierBigNotes
:
{
name
:
"
Easier Big Notes
"
},
on
:
"
On
"
,
on
:
"
On
"
,
off
:
"
Off
"
,
off
:
"
Off
"
,
default
:
"
Reset to Defaults
"
,
default
:
"
Reset to Defaults
"
,
...
@@ -535,6 +541,9 @@ function StringsCn(){
...
@@ -535,6 +541,9 @@ function StringsCn(){
video
:
"
Video
"
,
video
:
"
Video
"
,
drumSounds
:
"
Drum Sounds
"
drumSounds
:
"
Drum Sounds
"
},
},
easierBigNotes
:
{
name
:
"
使大音符变得容易
"
},
on
:
"
开
"
,
on
:
"
开
"
,
off
:
"
关
"
,
off
:
"
关
"
,
default
:
"
重置为默认值
"
,
default
:
"
重置为默认值
"
,
...
@@ -727,6 +736,9 @@ function StringsTw(){
...
@@ -727,6 +736,9 @@ function StringsTw(){
video
:
"
Video
"
,
video
:
"
Video
"
,
drumSounds
:
"
Drum Sounds
"
drumSounds
:
"
Drum Sounds
"
},
},
easierBigNotes
:
{
name
:
"
使大音符變得容易
"
},
on
:
"
開
"
,
on
:
"
開
"
,
off
:
"
關
"
,
off
:
"
關
"
,
default
:
"
重置為默認值
"
,
default
:
"
重置為默認值
"
,
...
@@ -919,6 +931,9 @@ function StringsKo(){
...
@@ -919,6 +931,9 @@ function StringsKo(){
video
:
"
Video
"
,
video
:
"
Video
"
,
drumSounds
:
"
Drum Sounds
"
drumSounds
:
"
Drum Sounds
"
},
},
easierBigNotes
:
{
name
:
"
쉬운 큰 음표
"
},
on
:
"
온
"
,
on
:
"
온
"
,
off
:
"
오프
"
,
off
:
"
오프
"
,
default
:
"
기본값으로 재설정
"
,
default
:
"
기본값으로 재설정
"
,
...
...
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