juan/japanese-drum-game
1
0
Fork 0
mirror of https://github.com/jiojciojsioe3/a3cjroijsiojiorj.git synced 2024-11-15 15:31:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

improve

Browse Source
This commit is contained in:
purerosefallen 2019-11-02 00:45:37 +08:00
parent f3f57ea1a5
commit 88fc5dbbb6
No known key found for this signature in database
GPG Key ID: E6D78C90943A3185
2 changed files with 65 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
public/src/js/autoscore.js
View File

@ -63,22 +63,37 @@ class AutoScore {
this.Score = 0; this.Score = 0;
this.ScoreDiff = 0; this.ScoreDiff = 0;
this.ScoreInit = 0; this.ScoreInit = 0;
const max_possible_init = Math.ceil(target / this.GetMaxCombo() / 10) * 10; var max_init = this.GetMaxPossibleInit(target);
//console.log(target); var min_init = 100;
for (var init = 100; init <= max_possible_init; init += 10) { while (true) {
for (var diff = 10; diff < init; diff++) { this.ScoreInit = (max_init + min_init) / 2;
const score = this.TryScore(init, diff); this.ScoreDiff = Math.round(this.ScoreInit / 4);
if (score > target && Math.abs(score - target) < Math.abs(this.Score - target)) { this.Score = this.TryScore(this.ScoreInit, this.ScoreDiff);
this.Score = score; //console.log(min_init, max_init, this.ScoreInit, this.ScoreDiff, this.Score);
this.ScoreInit = init; if (this.ScoreInit === target) {
this.ScoreDiff = diff; this.ScoreInit = Math.floor(this.ScoreInit / 10) * 10;
//console.log(init, diff, score); this.ScoreDiff = Math.round(this.ScoreInit / 4);
this.Score = this.TryScore(this.ScoreInit, this.ScoreDiff);
break;
} else if (this.Score >= target) {
max_init = this.ScoreInit;
} else {
min_init = this.ScoreInit;
} }
if (score > target) { if (max_init - min_init <= 10) {
this.ScoreInit = Math.floor(this.ScoreInit / 10) * 10;
this.ScoreDiff = Math.round(this.ScoreInit / 4);
this.Score = this.TryScore(this.ScoreInit, this.ScoreDiff);
break; break;
} }
} }
while (this.Score < target) {
this.ScoreInit += 10;
this.ScoreDiff = Math.round(this.ScoreInit / 4);
this.Score = this.TryScore(this.ScoreInit, this.ScoreDiff);
//console.log(this.ScoreInit, this.ScoreDiff, this.Score);
} }
//console.log(this.ScoreInit, this.ScoreDiff, this.Score);
} }
IsCommonCircle(circle) { IsCommonCircle(circle) {
const ty = circle.type; const ty = circle.type;
@ -152,4 +167,39 @@ class AutoScore {
} }
return combo; return combo;
} }
GetMaxPossibleInit(target) {
var basic_score = 0;
if (this.scoremode !== 1) {
const max_combo = this.GetMaxCombo();
basic_score += Math.floor(max_combo / 100);
}
var combo = 0;
for (var circle of this.circles) {
if (circle.branch && circle.branch.name !== "master") {
continue;
}
var multiplier = circle.gogoTime ? 1.2 : 1;
switch (circle.type) {
case "don":
case "ka": {
combo += (1 * multiplier);
break;
}
case "daiDon":
case "daiKa": {
combo += (2 * multiplier);
break;
}
case "balloon": {
basic_score += (5000 + 300 * circle.requiredHits) * multiplier;
break;
}
default: {
break;
}
}
}
combo = Math.floor(combo);
return Math.ceil((target - basic_score) / combo / 10) * 10;
}
} }

2
public/src/js/parseosu.js
View File

@ -356,7 +356,7 @@ class ParseOsu{
} }
} }
this.scoremode = 2; this.scoremode = 2;
var autoscore = new AutoScore(this._difficulty, 0, 2, circles); var autoscore = new AutoScore(this._difficulty, parseInt(this.difficulty.overallDifficulty) * 2, 2, circles);
this.scoreinit = autoscore.ScoreInit; this.scoreinit = autoscore.ScoreInit;
this.scorediff = autoscore.ScoreDiff; this.scorediff = autoscore.ScoreDiff;
return circles return circles