AnthonyDuan/taiko-web
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #186 from bui/songselect-add-crowns

Browse Source 
SongSelect: Add crowns
This commit is contained in:
Bui
2020-03-07 13:54:14 +00:00
committed by GitHub
parent f53788ee27 5316f0f371
commit 5a1be53e21
20 changed files with 865 additions and 180 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
public/src/js/game.js
View File

@@ -18,10 +18,11 @@ class Game{
title: selectedSong.title,
difficulty: this.rules.difficulty
}
this.HPGain = 100 / this.songData.circles.filter(circle => {
var combo = this.songData.circles.filter(circle => {
var type = circle.type
return (type === "don" || type === "ka" || type === "daiDon" || type === "daiKa") && (!circle.branch || circle.branch.active)
}).length
this.soulPoints = this.rules.soulPoints(combo)
this.paused = false
this.started = false
this.mainMusicPlaying = false
@@ -639,12 +640,15 @@ class Game{
switch(score){
case 450:
this.globalScore.good++
this.globalScore.gauge += this.soulPoints.good
break
case 230:
this.globalScore.ok++
this.globalScore.gauge += this.soulPoints.ok
break
case 0:
this.globalScore.bad++
this.globalScore.gauge += this.soulPoints.bad
break
}
if (this.songData.scoremode) {
@@ -658,12 +662,10 @@ class Game{
}
}
// Gauge update
if(score !== 0){
this.globalScore.gauge += this.HPGain
}else if(this.globalScore.gauge - this.HPGain > 0){
this.globalScore.gauge -= this.HPGain
}else{
if(this.globalScore.gauge < 0){
this.globalScore.gauge = 0
}else if(this.globalScore.gauge > 10000){
this.globalScore.gauge = 10000
}
// Points update
if (this.songData.scoremode == 2) {
@@ -730,10 +732,6 @@ class Game{
this.currentCircle = closestCircle
}
}
this.HPGain = 100 / this.songData.circles.filter(circle => {
var type = circle.type
return (type === "don" || type === "ka" || type === "daiDon" || type === "daiKa") && (!circle.branch || circle.branch.active)
}).length
if(this.controller.multiplayer === 1){
p2.send("branch", activeName)
}