Commit 3589e949 authored by nanahira's avatar nanahira

pre-add rainbow crown

parent d34885ae
Pipeline #226 passed with stages
in 1 minute and 40 seconds
...@@ -1348,7 +1348,13 @@ ...@@ -1348,7 +1348,13 @@
if(config.type){ if(config.type){
var grd = ctx.createLinearGradient(0, 0, 94, 0) var grd = ctx.createLinearGradient(0, 0, 94, 0)
if(config.type === "gold"){ if(config.type === "rainbow"){ // TODO
grd.addColorStop(0, "#ffffc5")
grd.addColorStop(0.23, "#ffff44")
grd.addColorStop(0.53, "#efbd12")
grd.addColorStop(0.83, "#ffff44")
grd.addColorStop(1, "#efbd12")
}else if(config.type === "gold"){
grd.addColorStop(0, "#ffffc5") grd.addColorStop(0, "#ffffc5")
grd.addColorStop(0.23, "#ffff44") grd.addColorStop(0.23, "#ffff44")
grd.addColorStop(0.53, "#efbd12") grd.addColorStop(0.53, "#efbd12")
......
...@@ -677,7 +677,7 @@ class Scoresheet{ ...@@ -677,7 +677,7 @@ class Scoresheet{
} }
var crownType = null var crownType = null
if(this.rules[p].clearReached(results.gauge)){ if(this.rules[p].clearReached(results.gauge)){
crownType = results.bad === "0" ? "gold" : "silver" crownType = results.bad === "0" ? (results.ok === "0" ? "rainbow" : "gold") : "silver"
} }
if(crownType !== null){ if(crownType !== null){
noCrownResultWait = 0; noCrownResultWait = 0;
...@@ -704,7 +704,7 @@ class Scoresheet{ ...@@ -704,7 +704,7 @@ class Scoresheet{
} }
if(this.state.screen === "fadeIn" && elapsed >= 1200 && !this.state["fullcomboPlayed" + p]){ if(this.state.screen === "fadeIn" && elapsed >= 1200 && !this.state["fullcomboPlayed" + p]){
this.state["fullcomboPlayed" + p] = true this.state["fullcomboPlayed" + p] = true
if(crownType === "gold"){ if(crownType === "gold" || crownType === "rainbow"){ // TODO: sound effect of donder full combo
this.playSound("v_results_fullcombo" + (p === 1 ? "2" : ""), p) this.playSound("v_results_fullcombo" + (p === 1 ? "2" : ""), p)
} }
} }
...@@ -925,10 +925,10 @@ class Scoresheet{ ...@@ -925,10 +925,10 @@ class Scoresheet{
var clearReached = this.controller.game.rules.clearReached(this.resultsObj.gauge) var clearReached = this.controller.game.rules.clearReached(this.resultsObj.gauge)
var crown = "" var crown = ""
if(clearReached){ if(clearReached){
crown = this.resultsObj.bad === 0 ? "gold" : "silver" crown = this.resultsObj.bad === 0 ? (this.resultsObj.ok === 0 ? "rainbow" : "gold") : "silver"
} }
if(!oldScore || oldScore.points <= this.resultsObj.points){ if(!oldScore || oldScore.points <= this.resultsObj.points){
if(oldScore && (oldScore.crown === "gold" || oldScore.crown === "silver" && !crown)){ if(oldScore && (oldScore.crown === "rainbow" || oldScore.crown === "gold" && (crown === "silver" || !crown) || oldScore.crown === "silver" && !crown)){
crown = oldScore.crown crown = oldScore.crown
} }
this.resultsObj.crown = crown this.resultsObj.crown = crown
...@@ -938,7 +938,7 @@ class Scoresheet{ ...@@ -938,7 +938,7 @@ class Scoresheet{
scoreStorage.add(hash, difficulty, this.resultsObj, true, title).catch(() => { scoreStorage.add(hash, difficulty, this.resultsObj, true, title).catch(() => {
this.showWarning = {name: "scoreSaveFailed"} this.showWarning = {name: "scoreSaveFailed"}
}) })
}else if(oldScore && (crown === "gold" && oldScore.crown !== "gold" || crown && !oldScore.crown)){ }else if(oldScore && ((crown === "rainbow" && oldScore.crown !== "rainbow") || crown === "gold" && (oldScore.crown === "silver" ||!oldScore.crown) || crown && !oldScore.crown)){
oldScore.crown = crown oldScore.crown = crown
scoreStorage.add(hash, difficulty, oldScore, true, title).catch(() => { scoreStorage.add(hash, difficulty, oldScore, true, title).catch(() => {
this.showWarning = {name: "scoreSaveFailed"} this.showWarning = {name: "scoreSaveFailed"}
......
...@@ -7,7 +7,7 @@ class ScoreStorage{ ...@@ -7,7 +7,7 @@ class ScoreStorage{
this.songTitles = {} this.songTitles = {}
this.difficulty = ["oni", "ura", "hard", "normal", "easy"] this.difficulty = ["oni", "ura", "hard", "normal", "easy"]
this.scoreKeys = ["points", "good", "ok", "bad", "maxCombo", "drumroll"] this.scoreKeys = ["points", "good", "ok", "bad", "maxCombo", "drumroll"]
this.crownValue = ["", "silver", "gold"] this.crownValue = ["", "silver", "gold", "rainbow"]
} }
load(strings, loadFailed){ load(strings, loadFailed){
var scores = {} var scores = {}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment