@rian8337/osu-difficulty-calculator 1.3.0 → 1.4.12
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/DroidPerformanceCalculator.js +52 -62
- package/dist/DroidPerformanceCalculator.js.map +1 -0
- package/dist/DroidStarRating.js +36 -7
- package/dist/DroidStarRating.js.map +1 -0
- package/dist/MapStars.js +1 -0
- package/dist/MapStars.js.map +1 -0
- package/dist/OsuPerformanceCalculator.js +10 -7
- package/dist/OsuPerformanceCalculator.js.map +1 -0
- package/dist/OsuStarRating.js +1 -0
- package/dist/OsuStarRating.js.map +1 -0
- package/dist/base/DifficultyAttributes.js +1 -0
- package/dist/base/DifficultyAttributes.js.map +1 -0
- package/dist/base/PerformanceCalculator.js +16 -4
- package/dist/base/PerformanceCalculator.js.map +1 -0
- package/dist/base/Skill.js +1 -0
- package/dist/base/Skill.js.map +1 -0
- package/dist/base/StarRating.js +2 -0
- package/dist/base/StarRating.js.map +1 -0
- package/dist/base/StrainSkill.js +1 -0
- package/dist/base/StrainSkill.js.map +1 -0
- package/dist/index.js +1 -0
- package/dist/index.js.map +1 -0
- package/dist/preprocessing/DifficultyHitObject.js +23 -0
- package/dist/preprocessing/DifficultyHitObject.js.map +1 -0
- package/dist/preprocessing/DifficultyHitObjectCreator.js +43 -1
- package/dist/preprocessing/DifficultyHitObjectCreator.js.map +1 -0
- package/dist/skills/DroidAim.js +3 -2
- package/dist/skills/DroidAim.js.map +1 -0
- package/dist/skills/DroidFlashlight.js +2 -1
- package/dist/skills/DroidFlashlight.js.map +1 -0
- package/dist/skills/DroidRhythm.js +8 -4
- package/dist/skills/DroidRhythm.js.map +1 -0
- package/dist/skills/DroidSkill.js +15 -1
- package/dist/skills/DroidSkill.js.map +1 -0
- package/dist/skills/DroidTap.js +3 -3
- package/dist/skills/DroidTap.js.map +1 -0
- package/dist/skills/DroidVisual.js +81 -0
- package/dist/skills/DroidVisual.js.map +1 -0
- package/dist/skills/OsuAim.js +1 -0
- package/dist/skills/OsuAim.js.map +1 -0
- package/dist/skills/OsuFlashlight.js +1 -0
- package/dist/skills/OsuFlashlight.js.map +1 -0
- package/dist/skills/OsuSkill.js +1 -0
- package/dist/skills/OsuSkill.js.map +1 -0
- package/dist/skills/OsuSpeed.js +1 -0
- package/dist/skills/OsuSpeed.js.map +1 -0
- package/package.json +3 -3
- package/typings/index.d.ts +219 -126
|
@@ -32,6 +32,7 @@ class DifficultyHitObjectCreator {
|
|
|
32
32
|
* Generates difficulty hitobjects for difficulty calculation.
|
|
33
33
|
*/
|
|
34
34
|
generateDifficultyObjects(params) {
|
|
35
|
+
params.preempt ??= 600;
|
|
35
36
|
this.mode = params.mode;
|
|
36
37
|
const circleSize = params.circleSize;
|
|
37
38
|
const scale = (1 - (0.7 * (circleSize - 5)) / 5) / 2;
|
|
@@ -42,6 +43,8 @@ class DifficultyHitObjectCreator {
|
|
|
42
43
|
const object = new DifficultyHitObject_1.DifficultyHitObject(params.objects[i]);
|
|
43
44
|
object.object.scale = scale;
|
|
44
45
|
if (object.object instanceof osu_base_1.Slider) {
|
|
46
|
+
object.velocity =
|
|
47
|
+
object.object.velocity * params.speedMultiplier;
|
|
45
48
|
object.object.nestedHitObjects.forEach((h) => {
|
|
46
49
|
h.scale = scale;
|
|
47
50
|
});
|
|
@@ -52,6 +55,7 @@ class DifficultyHitObjectCreator {
|
|
|
52
55
|
const lastObject = difficultyObjects[i - 1];
|
|
53
56
|
const lastLastObject = difficultyObjects[i - 2];
|
|
54
57
|
object.startTime = object.object.startTime / params.speedMultiplier;
|
|
58
|
+
object.endTime = object.object.endTime / params.speedMultiplier;
|
|
55
59
|
if (!lastObject) {
|
|
56
60
|
difficultyObjects.push(object);
|
|
57
61
|
continue;
|
|
@@ -59,8 +63,45 @@ class DifficultyHitObjectCreator {
|
|
|
59
63
|
object.deltaTime =
|
|
60
64
|
(object.object.startTime - lastObject.object.startTime) /
|
|
61
65
|
params.speedMultiplier;
|
|
62
|
-
// Cap to 25ms to prevent difficulty calculation breaking from
|
|
66
|
+
// Cap to 25ms to prevent difficulty calculation breaking from simultaneous objects.
|
|
63
67
|
object.strainTime = Math.max(this.minDeltaTime, object.deltaTime);
|
|
68
|
+
const visibleObjects = params.objects.filter((o) => o.startTime / params.speedMultiplier > object.startTime &&
|
|
69
|
+
o.startTime / params.speedMultiplier <=
|
|
70
|
+
object.endTime + params.preempt);
|
|
71
|
+
object.noteDensity = 1;
|
|
72
|
+
for (const hitObject of visibleObjects) {
|
|
73
|
+
// Calculate delta time assuming the current object is a circle.
|
|
74
|
+
let deltaTime = Math.abs(hitObject.startTime / params.speedMultiplier -
|
|
75
|
+
object.startTime);
|
|
76
|
+
// But if the current object is a slider, then we alter the delta time to account for slider end time.
|
|
77
|
+
if (object.object instanceof osu_base_1.Slider) {
|
|
78
|
+
if (object.object.startTime >= hitObject.startTime &&
|
|
79
|
+
object.object.endTime <= hitObject.startTime) {
|
|
80
|
+
// If the object starts when the slider is active, then the slider is technically still visible.
|
|
81
|
+
// Set delta time to 0.
|
|
82
|
+
deltaTime = 0;
|
|
83
|
+
}
|
|
84
|
+
else {
|
|
85
|
+
// Otherwise, we take the delta time from the slider head or tail, whichever is smaller as it's the closest time.
|
|
86
|
+
deltaTime = Math.min(deltaTime, Math.abs(hitObject.startTime / params.speedMultiplier -
|
|
87
|
+
object.endTime));
|
|
88
|
+
}
|
|
89
|
+
}
|
|
90
|
+
object.noteDensity += 1 - deltaTime / params.preempt;
|
|
91
|
+
if (!(hitObject instanceof osu_base_1.Spinner)) {
|
|
92
|
+
object.overlappingFactor +=
|
|
93
|
+
// Penalize objects that are too close to the object in both distance
|
|
94
|
+
// and delta time to prevent stream maps from being overweighted.
|
|
95
|
+
Math.max(0, 1 -
|
|
96
|
+
object.object.stackedPosition.getDistance(hitObject.stackedEndPosition) /
|
|
97
|
+
(3 * object.object.radius)) *
|
|
98
|
+
(7.5 /
|
|
99
|
+
(1 +
|
|
100
|
+
Math.exp(0.15 *
|
|
101
|
+
(Math.max(deltaTime, this.minDeltaTime) -
|
|
102
|
+
75))));
|
|
103
|
+
}
|
|
104
|
+
}
|
|
64
105
|
if (object.object instanceof osu_base_1.Spinner ||
|
|
65
106
|
lastObject.object instanceof osu_base_1.Spinner) {
|
|
66
107
|
difficultyObjects.push(object);
|
|
@@ -235,3 +276,4 @@ class DifficultyHitObjectCreator {
|
|
|
235
276
|
}
|
|
236
277
|
}
|
|
237
278
|
exports.DifficultyHitObjectCreator = DifficultyHitObjectCreator;
|
|
279
|
+
//# sourceMappingURL=DifficultyHitObjectCreator.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"DifficultyHitObjectCreator.js","sourceRoot":"","sources":["../../src/preprocessing/DifficultyHitObjectCreator.ts"],"names":[],"mappings":"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"}
|
package/dist/skills/DroidAim.js
CHANGED
|
@@ -49,7 +49,7 @@ class DroidAim extends DroidSkill_1.DroidSkill {
|
|
|
49
49
|
let currentVelocity = current.lazyJumpDistance / current.strainTime;
|
|
50
50
|
// But if the last object is a slider, then we extend the travel velocity through the slider into the current object.
|
|
51
51
|
if (last.object instanceof osu_base_1.Slider &&
|
|
52
|
-
last.object.ticks >
|
|
52
|
+
last.object.ticks > 0 &&
|
|
53
53
|
this.withSliders) {
|
|
54
54
|
// Calculate the slider velocity from slider head to slider end.
|
|
55
55
|
const travelVelocity = last.travelDistance / last.travelTime;
|
|
@@ -61,7 +61,7 @@ class DroidAim extends DroidSkill_1.DroidSkill {
|
|
|
61
61
|
// As above, do the same for the previous hitobject.
|
|
62
62
|
let prevVelocity = last.lazyJumpDistance / last.strainTime;
|
|
63
63
|
if (lastLast.object instanceof osu_base_1.Slider &&
|
|
64
|
-
lastLast.object.ticks >
|
|
64
|
+
lastLast.object.ticks > 0 &&
|
|
65
65
|
this.withSliders) {
|
|
66
66
|
const travelVelocity = lastLast.travelDistance / lastLast.travelTime;
|
|
67
67
|
const movementVelocity = last.minimumJumpDistance / last.minimumJumpTime;
|
|
@@ -207,3 +207,4 @@ class DroidAim extends DroidSkill_1.DroidSkill {
|
|
|
207
207
|
}
|
|
208
208
|
}
|
|
209
209
|
exports.DroidAim = DroidAim;
|
|
210
|
+
//# sourceMappingURL=DroidAim.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"DroidAim.js","sourceRoot":"","sources":["../../src/skills/DroidAim.ts"],"names":[],"mappings":";;;AAAA,iDAAqE;AAErE,6CAA0C;AAE1C;;GAEG;AACH,MAAa,QAAS,SAAQ,uBAAU;IAsBpC,YAAY,IAAW,EAAE,WAAoB;QACzC,KAAK,CAAC,IAAI,CAAC,CAAC;QAtBY,oBAAe,GAAW,KAAK,CAAC;QAChC,oBAAe,GAAW,IAAI,CAAC;QAC/B,wBAAmB,GAAW,EAAE,CAAC;QACjC,2BAAsB,GAAW,IAAI,CAAC;QACtC,mBAAc,GAAW,IAAI,CAAC;QAE1D;;WAEG;QACc,6BAAwB,GAAW,GAAG,CAAC;QAExD,qBAAqB;QACJ,kBAAa,GAAW,GAAG,CAAC;QAE5B,wBAAmB,GAAW,GAAG,CAAC;QAClC,yBAAoB,GAAW,CAAC,CAAC;QACjC,qBAAgB,GAAW,GAAG,CAAC;QAC/B,6BAAwB,GAAW,IAAI,CAAC;QAOrD,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;IACnC,CAAC;IAED;;OAEG;IACO,aAAa,CAAC,OAA4B;QAChD,IAAI,OAAO,CAAC,MAAM,YAAY,kBAAO,EAAE;YACnC,OAAO,CAAC,CAAC;SACZ;QAED,OAAO,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,GAAG,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC;IACtE,CAAC;IAED;;OAEG;IACK,WAAW,CAAC,OAA4B;QAC5C,IACI,IAAI,CAAC,QAAQ,CAAC,MAAM,IAAI,CAAC;YACzB,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,MAAM,YAAY,kBAAO,EAC5C;YACE,OAAO,CAAC,CAAC;SACZ;QAED,MAAM,IAAI,GAAwB,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;QACnD,MAAM,QAAQ,GAAwB,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;QAEvD,qIAAqI;QACrI,IAAI,eAAe,GACf,OAAO,CAAC,gBAAgB,GAAG,OAAO,CAAC,UAAU,CAAC;QAElD,qHAAqH;QACrH,IACI,IAAI,CAAC,MAAM,YAAY,iBAAM;YAC7B,IAAI,CAAC,MAAM,CAAC,KAAK,GAAG,CAAC;YACrB,IAAI,CAAC,WAAW,EAClB;YACE,gEAAgE;YAChE,MAAM,cAAc,GAChB,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC,UAAU,CAAC;YAE1C,qEAAqE;YACrE,MAAM,gBAAgB,GAClB,OAAO,CAAC,mBAAmB,GAAG,OAAO,CAAC,eAAe,CAAC;YAE1D,2CAA2C;YAC3C,eAAe,GAAG,IAAI,CAAC,GAAG,CACtB,eAAe,EACf,gBAAgB,GAAG,cAAc,CACpC,CAAC;SACL;QAED,oDAAoD;QACpD,IAAI,YAAY,GAAW,IAAI,CAAC,gBAAgB,GAAG,IAAI,CAAC,UAAU,CAAC;QAEnE,IACI,QAAQ,CAAC,MAAM,YAAY,iBAAM;YACjC,QAAQ,CAAC,MAAM,CAAC,KAAK,GAAG,CAAC;YACzB,IAAI,CAAC,WAAW,EAClB;YACE,MAAM,cAAc,GAChB,QAAQ,CAAC,cAAc,GAAG,QAAQ,CAAC,UAAU,CAAC;YAElD,MAAM,gBAAgB,GAClB,IAAI,CAAC,mBAAmB,GAAG,IAAI,CAAC,eAAe,CAAC;YAEpD,YAAY,GAAG,IAAI,CAAC,GAAG,CACnB,YAAY,EACZ,gBAAgB,GAAG,cAAc,CACpC,CAAC;SACL;QAED,IAAI,cAAc,GAAW,CAAC,CAAC;QAC/B,IAAI,eAAe,GAAW,CAAC,CAAC;QAChC,IAAI,WAAW,GAAW,CAAC,CAAC;QAC5B,IAAI,mBAAmB,GAAW,CAAC,CAAC;QAEpC,sCAAsC;QACtC,IAAI,MAAM,GAAW,eAAe,CAAC;QAErC,IACI,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,UAAU,EAAE,IAAI,CAAC,UAAU,CAAC;YAC7C,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,UAAU,EAAE,IAAI,CAAC,UAAU,CAAC,EACtD;YACE,2BAA2B;YAE3B,IACI,OAAO,CAAC,KAAK,KAAK,IAAI;gBACtB,IAAI,CAAC,KAAK,KAAK,IAAI;gBACnB,QAAQ,CAAC,KAAK,KAAK,IAAI,EACzB;gBACE,uDAAuD;gBACvD,MAAM,UAAU,GAAW,IAAI,CAAC,GAAG,CAC/B,eAAe,EACf,YAAY,CACf,CAAC;gBAEF,cAAc,GAAG,IAAI,CAAC,uBAAuB,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;gBAC7D,eAAe,GAAG,IAAI,CAAC,wBAAwB,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;gBAE/D,6CAA6C;gBAC7C,IAAI,OAAO,CAAC,UAAU,GAAG,GAAG,EAAE;oBAC1B,eAAe,GAAG,CAAC,CAAC;iBACvB;qBAAM;oBACH,eAAe;wBACX,0FAA0F;wBAC1F,IAAI,CAAC,wBAAwB,CAAC,IAAI,CAAC,KAAK,CAAC;4BACzC,6DAA6D;4BAC7D,IAAI,CAAC,GAAG,CAAC,UAAU,EAAE,GAAG,GAAG,OAAO,CAAC,UAAU,CAAC;4BAC9C,8CAA8C;4BAC9C,IAAI,CAAC,GAAG,CACJ,IAAI,CAAC,GAAG,CACJ,CAAC,IAAI,CAAC,EAAE,GAAG,CAAC,CAAC;gCACT,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,GAAG,GAAG,OAAO,CAAC,UAAU,CAAC,GAAG,EAAE,CAAC,CACnD,EACD,CAAC,CACJ;4BACD,4DAA4D;4BAC5D,IAAI,CAAC,GAAG,CACJ,IAAI,CAAC,GAAG,CACJ,CAAC,CAAC,IAAI,CAAC,EAAE,GAAG,CAAC,CAAC;gCACV,CAAC,oBAAS,CAAC,KAAK,CACZ,OAAO,CAAC,gBAAgB,EACxB,EAAE,EACF,GAAG,CACN;oCACG,EAAE,CAAC,CAAC;gCACR,EAAE,CACT,EACD,CAAC,CACJ,CAAC;iBACT;gBAED,gGAAgG;gBAChG,cAAc;oBACV,UAAU;wBACV,CAAC,CAAC;4BACE,IAAI,CAAC,GAAG,CACJ,cAAc,EACd,IAAI,CAAC,GAAG,CACJ,IAAI,CAAC,uBAAuB,CAAC,IAAI,CAAC,KAAK,CAAC,EACxC,CAAC,CACJ,CACJ,CAAC,CAAC;gBACX,sGAAsG;gBACtG,eAAe;oBACX,GAAG;wBACH,GAAG;4BACC,CAAC,CAAC;gCACE,IAAI,CAAC,GAAG,CACJ,eAAe,EACf,IAAI,CAAC,GAAG,CACJ,IAAI,CAAC,wBAAwB,CACzB,QAAQ,CAAC,KAAK,CACjB,EACD,CAAC,CACJ,CACJ,CAAC,CAAC;aAClB;SACJ;QAED,IAAI,IAAI,CAAC,GAAG,CAAC,YAAY,EAAE,eAAe,CAAC,EAAE;YACzC,2IAA2I;YAC3I,YAAY;gBACR,CAAC,IAAI,CAAC,gBAAgB,GAAG,QAAQ,CAAC,cAAc,CAAC;oBACjD,IAAI,CAAC,UAAU,CAAC;YACpB,eAAe;gBACX,CAAC,OAAO,CAAC,gBAAgB,GAAG,IAAI,CAAC,cAAc,CAAC;oBAChD,OAAO,CAAC,UAAU,CAAC;YAEvB,oEAAoE;YACpE,MAAM,aAAa,GAAW,IAAI,CAAC,GAAG,CAClC,IAAI,CAAC,GAAG,CACJ,CAAC,CAAC,IAAI,CAAC,EAAE,GAAG,CAAC,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,YAAY,GAAG,eAAe,CAAC,CAAC;gBACtD,IAAI,CAAC,GAAG,CAAC,YAAY,EAAE,eAAe,CAAC,CAC9C,EACD,CAAC,CACJ,CAAC;YAEF,8FAA8F;YAC9F,MAAM,mBAAmB,GAAW,IAAI,CAAC,GAAG,CACxC,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,UAAU,EAAE,IAAI,CAAC,UAAU,CAAC,EACnD,IAAI,CAAC,GAAG,CAAC,YAAY,GAAG,eAAe,CAAC,CAC3C,CAAC;YAEF,iGAAiG;YACjG,MAAM,sBAAsB,GACxB,IAAI,CAAC,GAAG,CAAC,YAAY,GAAG,eAAe,CAAC;gBACxC,wBAAwB;gBACxB,IAAI,CAAC,GAAG,CACJ,IAAI,CAAC,GAAG,CACJ,CAAC,IAAI,CAAC,EAAE,GAAG,CAAC,CAAC;oBACT,IAAI,CAAC,GAAG,CACJ,CAAC,EACD,IAAI,CAAC,GAAG,CACJ,OAAO,CAAC,gBAAgB,EACxB,IAAI,CAAC,gBAAgB,CACxB,GAAG,GAAG,CACV,CACR,EACD,CAAC,CACJ,CAAC;YAEN,iDAAiD;YACjD,mBAAmB;gBACf,IAAI,CAAC,GAAG,CAAC,mBAAmB,EAAE,sBAAsB,CAAC;oBACrD,aAAa,CAAC;YAElB,+BAA+B;YAC/B,mBAAmB,IAAI,IAAI,CAAC,GAAG,CAC3B,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,UAAU,EAAE,IAAI,CAAC,UAAU,CAAC;gBACzC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,UAAU,EAAE,IAAI,CAAC,UAAU,CAAC,EACjD,CAAC,CACJ,CAAC;SACL;QAED,IAAI,IAAI,CAAC,UAAU,EAAE;YACjB,oCAAoC;YACpC,WAAW,GAAG,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC,UAAU,CAAC;SACvD;QAED,6FAA6F;QAC7F,MAAM,IAAI,IAAI,CAAC,GAAG,CACd,eAAe,GAAG,IAAI,CAAC,oBAAoB,EAC3C,cAAc,GAAG,IAAI,CAAC,mBAAmB;YACrC,mBAAmB,GAAG,IAAI,CAAC,wBAAwB,CAC1D,CAAC;QAEF,2CAA2C;QAC3C,IAAI,IAAI,CAAC,WAAW,EAAE;YAClB,MAAM,IAAI,WAAW,GAAG,IAAI,CAAC,gBAAgB,CAAC;SACjD;QAED,OAAO,MAAM,CAAC;IAClB,CAAC;IAED;;OAEG;IACK,gBAAgB,CAAC,OAA4B;QACjD,IAAI,UAAU,GAAW,CAAC,CAAC;QAE3B,IAAI,OAAO,CAAC,UAAU,GAAG,IAAI,CAAC,aAAa,EAAE;YACzC,UAAU;gBACN,IAAI;oBACJ,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,aAAa,GAAG,OAAO,CAAC,UAAU,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,CAAC;SACnE;QAED,MAAM,cAAc,GAAW,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,cAAc,IAAI,CAAC,CAAC;QACrE,MAAM,QAAQ,GAAW,IAAI,CAAC,GAAG,CAC7B,IAAI,CAAC,wBAAwB,EAC7B,cAAc,GAAG,OAAO,CAAC,mBAAmB,CAC/C,CAAC;QAEF,OAAO,CACH,CAAC,EAAE;YACC,UAAU;YACV,IAAI,CAAC,GAAG,CAAC,QAAQ,GAAG,IAAI,CAAC,wBAAwB,EAAE,CAAC,CAAC,CAAC;YAC1D,OAAO,CAAC,UAAU,CACrB,CAAC;IACN,CAAC;IAED;;OAEG;IACgB,aAAa,CAAC,OAA4B;QACzD,IAAI,CAAC,aAAa,IAAI,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;QAC1D,IAAI,CAAC,aAAa;YACd,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,GAAG,IAAI,CAAC,eAAe,CAAC;QAEvD,OAAO,IAAI,CAAC,aAAa,CAAC;IAC9B,CAAC;IAED;;OAEG;IACgB,eAAe,CAAC,OAA4B;QAC3D,IAAI,IAAI,CAAC,WAAW,EAAE;YAClB,OAAO,CAAC,oBAAoB,GAAG,IAAI,CAAC,aAAa,CAAC;SACrD;aAAM;YACH,OAAO,CAAC,uBAAuB,GAAG,IAAI,CAAC,aAAa,CAAC;SACxD;IACL,CAAC;IAED;;OAEG;IACK,uBAAuB,CAAC,KAAa;QACzC,OAAO,IAAI,CAAC,GAAG,CACX,IAAI,CAAC,GAAG,CACJ,CAAC,CAAC,GAAG,CAAC,CAAC;YACH,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,IAAI,CAAC,EAAE,EAAE,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,GAAG,CAAC,EAAE,KAAK,CAAC,CAAC;gBACtD,IAAI,CAAC,EAAE,GAAG,CAAC,CAAC,CACvB,EACD,CAAC,CACJ,CAAC;IACN,CAAC;IAED;;OAEG;IACK,wBAAwB,CAAC,KAAa;QAC1C,OAAO,CAAC,GAAG,IAAI,CAAC,uBAAuB,CAAC,KAAK,CAAC,CAAC;IACnD,CAAC;CACJ;AA1UD,4BA0UC"}
|
|
@@ -10,7 +10,7 @@ class DroidFlashlight extends DroidSkill_1.DroidSkill {
|
|
|
10
10
|
constructor() {
|
|
11
11
|
super(...arguments);
|
|
12
12
|
this.historyLength = 10;
|
|
13
|
-
this.skillMultiplier = 0.
|
|
13
|
+
this.skillMultiplier = 0.15;
|
|
14
14
|
this.strainDecayBase = 0.15;
|
|
15
15
|
this.reducedSectionCount = 10;
|
|
16
16
|
this.reducedSectionBaseline = 0.75;
|
|
@@ -58,3 +58,4 @@ class DroidFlashlight extends DroidSkill_1.DroidSkill {
|
|
|
58
58
|
}
|
|
59
59
|
}
|
|
60
60
|
exports.DroidFlashlight = DroidFlashlight;
|
|
61
|
+
//# sourceMappingURL=DroidFlashlight.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"DroidFlashlight.js","sourceRoot":"","sources":["../../src/skills/DroidFlashlight.ts"],"names":[],"mappings":";;;AAAA,iDAA6C;AAE7C,6CAA0C;AAE1C;;GAEG;AACH,MAAa,eAAgB,SAAQ,uBAAU;IAA/C;;QACgC,kBAAa,GAAW,EAAE,CAAC;QAC3B,oBAAe,GAAW,IAAI,CAAC;QAC/B,oBAAe,GAAW,IAAI,CAAC;QAC/B,wBAAmB,GAAW,EAAE,CAAC;QACjC,2BAAsB,GAAW,IAAI,CAAC;QACtC,mBAAc,GAAW,IAAI,CAAC;IAgE9D,CAAC;IA9Da,aAAa,CAAC,OAA4B;QAChD,IAAI,OAAO,CAAC,MAAM,YAAY,kBAAO,EAAE;YACnC,OAAO,CAAC,CAAC;SACZ;QAED,MAAM,aAAa,GAAW,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC;QAEzD,IAAI,aAAa,GAAW,CAAC,CAAC;QAE9B,IAAI,oBAAoB,GAAW,CAAC,CAAC;QAErC,IAAI,MAAM,GAAW,CAAC,CAAC;QAEvB,IAAI,IAAI,GAAwB,OAAO,CAAC;QAExC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,EAAE,CAAC,EAAE;YAC3C,MAAM,aAAa,GAAwB,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;YAE5D,IAAI,CAAC,CAAC,aAAa,CAAC,MAAM,YAAY,kBAAO,CAAC,EAAE;gBAC5C,MAAM,YAAY,GACd,OAAO,CAAC,MAAM,CAAC,eAAe,CAAC,QAAQ,CACnC,aAAa,CAAC,MAAM,CAAC,WAAW,CACnC,CAAC,MAAM,CAAC;gBAEb,oBAAoB,IAAI,IAAI,CAAC,UAAU,CAAC;gBAExC,uFAAuF;gBACvF,IAAI,CAAC,KAAK,CAAC,EAAE;oBACT,aAAa,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,YAAY,GAAG,EAAE,CAAC,CAAC;iBAClD;gBAED,2FAA2F;gBAC3F,MAAM,SAAS,GAAW,IAAI,CAAC,GAAG,CAC9B,CAAC,EACD,aAAa,CAAC,gBAAgB,GAAG,aAAa,GAAG,EAAE,CACtD,CAAC;gBAEF,MAAM;oBACF,CAAC,SAAS,GAAG,aAAa,GAAG,YAAY,CAAC;wBAC1C,oBAAoB,CAAC;aAC5B;YAED,IAAI,GAAG,aAAa,CAAC;SACxB;QAED,OAAO,IAAI,CAAC,GAAG,CAAC,aAAa,GAAG,MAAM,EAAE,CAAC,CAAC,CAAC;IAC/C,CAAC;IAED;;OAEG;IACgB,aAAa,CAAC,OAA4B;QACzD,IAAI,CAAC,aAAa,IAAI,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;QAC1D,IAAI,CAAC,aAAa;YACd,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,GAAG,IAAI,CAAC,eAAe,CAAC;QAEvD,OAAO,IAAI,CAAC,aAAa,CAAC;IAC9B,CAAC;IAEkB,eAAe,CAAC,OAA4B;QAC3D,OAAO,CAAC,gBAAgB,GAAG,IAAI,CAAC,aAAa,CAAC;IAClD,CAAC;CACJ;AAtED,0CAsEC"}
|
|
@@ -14,11 +14,14 @@ class DroidRhythm extends DroidSkill_1.DroidSkill {
|
|
|
14
14
|
this.reducedSectionCount = 5;
|
|
15
15
|
this.reducedSectionBaseline = 0.75;
|
|
16
16
|
this.strainDecayBase = 0.3;
|
|
17
|
-
this.starsPerDouble =
|
|
18
|
-
this.rhythmMultiplier = 0.75;
|
|
17
|
+
this.starsPerDouble = 1.75;
|
|
19
18
|
this.historyTimeMax = 5000; // 5 seconds of calculateRhythmBonus max.
|
|
20
19
|
this.currentRhythm = 1;
|
|
21
20
|
this.hitWindow = new osu_base_1.OsuHitWindow(overallDifficulty);
|
|
21
|
+
const odScaling = Math.pow(this.hitWindow.overallDifficulty, 2) / 400;
|
|
22
|
+
this.rhythmMultiplier =
|
|
23
|
+
0.75 +
|
|
24
|
+
(this.hitWindow.overallDifficulty >= 0 ? odScaling : -odScaling);
|
|
22
25
|
}
|
|
23
26
|
/**
|
|
24
27
|
* Calculates a rhythm multiplier for the difficulty of the tap associated with historic data of the current object.
|
|
@@ -55,8 +58,8 @@ class DroidRhythm extends DroidSkill_1.DroidSkill {
|
|
|
55
58
|
(Math.min(prevDelta, currentDelta) /
|
|
56
59
|
Math.max(prevDelta, currentDelta))), 2));
|
|
57
60
|
const windowPenalty = Math.min(1, Math.max(0, Math.abs(prevDelta - currentDelta) -
|
|
58
|
-
this.hitWindow.hitWindowFor300() * 0.
|
|
59
|
-
(this.hitWindow.hitWindowFor300() * 0.
|
|
61
|
+
this.hitWindow.hitWindowFor300() * 0.4) /
|
|
62
|
+
(this.hitWindow.hitWindowFor300() * 0.4));
|
|
60
63
|
let effectiveRatio = windowPenalty * currentRatio;
|
|
61
64
|
if (firstDeltaSwitch) {
|
|
62
65
|
if (prevDelta <= 1.25 * currentDelta &&
|
|
@@ -128,3 +131,4 @@ class DroidRhythm extends DroidSkill_1.DroidSkill {
|
|
|
128
131
|
}
|
|
129
132
|
}
|
|
130
133
|
exports.DroidRhythm = DroidRhythm;
|
|
134
|
+
//# sourceMappingURL=DroidRhythm.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"DroidRhythm.js","sourceRoot":"","sources":["../../src/skills/DroidRhythm.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.DroidSkill = void 0;
|
|
4
|
+
const osu_base_1 = require("@rian8337/osu-base");
|
|
4
5
|
const StrainSkill_1 = require("../base/StrainSkill");
|
|
5
6
|
/**
|
|
6
7
|
* Used to processes strain values of difficulty hitobjects, keep track of strain levels caused by the processed objects
|
|
@@ -8,9 +9,22 @@ const StrainSkill_1 = require("../base/StrainSkill");
|
|
|
8
9
|
*/
|
|
9
10
|
class DroidSkill extends StrainSkill_1.StrainSkill {
|
|
10
11
|
difficultyValue() {
|
|
12
|
+
const sortedStrains = this.strainPeaks
|
|
13
|
+
.slice()
|
|
14
|
+
.sort((a, b) => {
|
|
15
|
+
return b - a;
|
|
16
|
+
});
|
|
17
|
+
// We are reducing the highest strains first to account for extreme difficulty spikes.
|
|
18
|
+
for (let i = 0; i < Math.min(sortedStrains.length, this.reducedSectionCount); ++i) {
|
|
19
|
+
const scale = Math.log10(osu_base_1.Interpolation.lerp(1, 10, osu_base_1.MathUtils.clamp(i / this.reducedSectionCount, 0, 1)));
|
|
20
|
+
sortedStrains[i] *= osu_base_1.Interpolation.lerp(this.reducedSectionBaseline, 1, scale);
|
|
21
|
+
}
|
|
11
22
|
// Math here preserves the property that two notes of equal difficulty x, we have their summed difficulty = x * starsPerDouble.
|
|
12
23
|
// This also applies to two sets of notes with equal difficulty.
|
|
13
|
-
return Math.pow(
|
|
24
|
+
return Math.pow(sortedStrains
|
|
25
|
+
.filter((v) => v > 0)
|
|
26
|
+
.reduce((a, v) => a + Math.pow(v, 1 / Math.log2(this.starsPerDouble)), 0), Math.log2(this.starsPerDouble));
|
|
14
27
|
}
|
|
15
28
|
}
|
|
16
29
|
exports.DroidSkill = DroidSkill;
|
|
30
|
+
//# sourceMappingURL=DroidSkill.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"DroidSkill.js","sourceRoot":"","sources":["../../src/skills/DroidSkill.ts"],"names":[],"mappings":";;;AAAA,iDAA8D;AAC9D,qDAAkD;AAElD;;;GAGG;AACH,MAAsB,UAAW,SAAQ,yBAAW;IAMvC,eAAe;QACpB,MAAM,aAAa,GAAa,IAAI,CAAC,WAAW;aAC3C,KAAK,EAAE;aACP,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;YACX,OAAO,CAAC,GAAG,CAAC,CAAC;QACjB,CAAC,CAAC,CAAC;QAEP,sFAAsF;QACtF,KACI,IAAI,CAAC,GAAG,CAAC,EACT,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,aAAa,CAAC,MAAM,EAAE,IAAI,CAAC,mBAAmB,CAAC,EAC5D,EAAE,CAAC,EACL;YACE,MAAM,KAAK,GAAW,IAAI,CAAC,KAAK,CAC5B,wBAAa,CAAC,IAAI,CACd,CAAC,EACD,EAAE,EACF,oBAAS,CAAC,KAAK,CAAC,CAAC,GAAG,IAAI,CAAC,mBAAmB,EAAE,CAAC,EAAE,CAAC,CAAC,CACtD,CACJ,CAAC;YAEF,aAAa,CAAC,CAAC,CAAC,IAAI,wBAAa,CAAC,IAAI,CAClC,IAAI,CAAC,sBAAsB,EAC3B,CAAC,EACD,KAAK,CACR,CAAC;SACL;QAED,+HAA+H;QAC/H,gEAAgE;QAChE,OAAO,IAAI,CAAC,GAAG,CACX,aAAa;aACR,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC;aACpB,MAAM,CACH,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CACL,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,EACvD,CAAC,CACJ,EACL,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,CACjC,CAAC;IACN,CAAC;CACJ;AA/CD,gCA+CC"}
|
package/dist/skills/DroidTap.js
CHANGED
|
@@ -9,7 +9,6 @@ const DroidSkill_1 = require("./DroidSkill");
|
|
|
9
9
|
class DroidTap extends DroidSkill_1.DroidSkill {
|
|
10
10
|
constructor(mods, overallDifficulty) {
|
|
11
11
|
super(mods);
|
|
12
|
-
this.historyLength = 32;
|
|
13
12
|
this.skillMultiplier = 1375;
|
|
14
13
|
this.reducedSectionCount = 5;
|
|
15
14
|
this.reducedSectionBaseline = 0.75;
|
|
@@ -37,8 +36,8 @@ class DroidTap extends DroidSkill_1.DroidSkill {
|
|
|
37
36
|
strainTime = osu_base_1.Interpolation.lerp(this.previous[0].strainTime, strainTime, strainTime / greatWindowFull);
|
|
38
37
|
}
|
|
39
38
|
// Cap deltatime to the OD 300 hitwindow.
|
|
40
|
-
// 0.58 is derived from making sure 260 BPM 1/4 OD5 streams aren't nerfed harshly, whilst 0.
|
|
41
|
-
strainTime /= osu_base_1.MathUtils.clamp(strainTime / greatWindowFull / 0.58, 0.
|
|
39
|
+
// 0.58 is derived from making sure 260 BPM 1/4 OD5 streams aren't nerfed harshly, whilst 0.91 limits the effect of the cap.
|
|
40
|
+
strainTime /= osu_base_1.MathUtils.clamp(strainTime / greatWindowFull / 0.58, 0.91, 1);
|
|
42
41
|
let speedBonus = 1;
|
|
43
42
|
if (strainTime < this.minSpeedBonus) {
|
|
44
43
|
speedBonus +=
|
|
@@ -82,3 +81,4 @@ class DroidTap extends DroidSkill_1.DroidSkill {
|
|
|
82
81
|
}
|
|
83
82
|
}
|
|
84
83
|
exports.DroidTap = DroidTap;
|
|
84
|
+
//# sourceMappingURL=DroidTap.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"DroidTap.js","sourceRoot":"","sources":["../../src/skills/DroidTap.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,81 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.DroidVisual = void 0;
|
|
4
|
+
const osu_base_1 = require("@rian8337/osu-base");
|
|
5
|
+
const DroidSkill_1 = require("./DroidSkill");
|
|
6
|
+
/**
|
|
7
|
+
* Represents the skill required to read every object in the map.
|
|
8
|
+
*/
|
|
9
|
+
class DroidVisual extends DroidSkill_1.DroidSkill {
|
|
10
|
+
constructor(mods, preempt) {
|
|
11
|
+
super(mods);
|
|
12
|
+
this.historyLength = 4;
|
|
13
|
+
this.starsPerDouble = 1.025;
|
|
14
|
+
this.reducedSectionCount = 10;
|
|
15
|
+
this.reducedSectionBaseline = 0.75;
|
|
16
|
+
this.skillMultiplier = 20;
|
|
17
|
+
this.strainDecayBase = 0.1;
|
|
18
|
+
this.preempt = preempt;
|
|
19
|
+
this.isHidden = mods.some((m) => m instanceof osu_base_1.ModHidden);
|
|
20
|
+
}
|
|
21
|
+
/**
|
|
22
|
+
* @param current The hitobject to calculate.
|
|
23
|
+
*/
|
|
24
|
+
strainValueOf(current) {
|
|
25
|
+
if (current.object instanceof osu_base_1.Spinner) {
|
|
26
|
+
return 0;
|
|
27
|
+
}
|
|
28
|
+
// Start with base density and give global bonus for Hidden.
|
|
29
|
+
// Add density caps for sanity.
|
|
30
|
+
let strain = Math.min(20, Math.pow(current.noteDensity, 2)) /
|
|
31
|
+
10 /
|
|
32
|
+
(1 + current.overlappingFactor);
|
|
33
|
+
if (this.isHidden) {
|
|
34
|
+
strain +=
|
|
35
|
+
Math.min(25, Math.pow(current.noteDensity, 1.25)) /
|
|
36
|
+
10 /
|
|
37
|
+
(1 + current.overlappingFactor / 1.25);
|
|
38
|
+
}
|
|
39
|
+
// Give bonus for AR higher than 10.33.
|
|
40
|
+
if (this.preempt < 400) {
|
|
41
|
+
strain += Math.pow(400 - this.preempt, 1.3) / 135;
|
|
42
|
+
}
|
|
43
|
+
if (current.object instanceof osu_base_1.Slider) {
|
|
44
|
+
const scalingFactor = 50 / current.object.radius;
|
|
45
|
+
// Reward sliders based on velocity.
|
|
46
|
+
strain +=
|
|
47
|
+
// Avoid overbuffing extremely fast sliders.
|
|
48
|
+
Math.min(15, current.velocity * 1.5) *
|
|
49
|
+
// Scale with distance travelled to avoid overbuffing fast sliders with short distance.
|
|
50
|
+
Math.min(1, current.travelDistance / scalingFactor / 125);
|
|
51
|
+
let cumulativeStrainTime = 0;
|
|
52
|
+
// Reward for velocity changes based on last few sliders.
|
|
53
|
+
for (let i = 0; i < this.previous.length; ++i) {
|
|
54
|
+
const last = this.previous[i];
|
|
55
|
+
cumulativeStrainTime += last.strainTime;
|
|
56
|
+
if (!(last.object instanceof osu_base_1.Slider)) {
|
|
57
|
+
continue;
|
|
58
|
+
}
|
|
59
|
+
strain +=
|
|
60
|
+
// Avoid overbuffing extremely fast velocity changes.
|
|
61
|
+
Math.min(15, 2.5 * Math.abs(current.velocity - last.velocity)) *
|
|
62
|
+
// Scale with distance travelled to avoid overbuffing fast sliders with short distance.
|
|
63
|
+
Math.min(1, last.travelDistance / scalingFactor / 100) *
|
|
64
|
+
// Scale with cumulative strain time to avoid overbuffing past sliders.
|
|
65
|
+
Math.min(1, 300 / cumulativeStrainTime);
|
|
66
|
+
}
|
|
67
|
+
}
|
|
68
|
+
return strain;
|
|
69
|
+
}
|
|
70
|
+
strainValueAt(current) {
|
|
71
|
+
this.currentStrain *= this.strainDecay(current.deltaTime);
|
|
72
|
+
this.currentStrain +=
|
|
73
|
+
this.strainValueOf(current) * this.skillMultiplier;
|
|
74
|
+
return this.currentStrain;
|
|
75
|
+
}
|
|
76
|
+
saveToHitObject(current) {
|
|
77
|
+
current.visualStrain = this.currentStrain;
|
|
78
|
+
}
|
|
79
|
+
}
|
|
80
|
+
exports.DroidVisual = DroidVisual;
|
|
81
|
+
//# sourceMappingURL=DroidVisual.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"DroidVisual.js","sourceRoot":"","sources":["../../src/skills/DroidVisual.ts"],"names":[],"mappings":"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"}
|
package/dist/skills/OsuAim.js
CHANGED
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"OsuAim.js","sourceRoot":"","sources":["../../src/skills/OsuAim.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"OsuFlashlight.js","sourceRoot":"","sources":["../../src/skills/OsuFlashlight.ts"],"names":[],"mappings":";;;AAAA,iDAA6C;AAE7C,yCAAsC;AAEtC;;GAEG;AACH,MAAa,aAAc,SAAQ,mBAAQ;IAA3C;;QACgC,kBAAa,GAAW,EAAE,CAAC;QAC3B,oBAAe,GAAW,IAAI,CAAC;QAC/B,oBAAe,GAAW,IAAI,CAAC;QAC/B,wBAAmB,GAAW,EAAE,CAAC;QACjC,2BAAsB,GAAW,IAAI,CAAC;QACtC,yBAAoB,GAAW,IAAI,CAAC;QACpC,gBAAW,GAAW,CAAC,CAAC;IA8DxD,CAAC;IA5Da,aAAa,CAAC,OAA4B;QAChD,IAAI,OAAO,CAAC,MAAM,YAAY,kBAAO,EAAE;YACnC,OAAO,CAAC,CAAC;SACZ;QAED,MAAM,aAAa,GAAW,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC;QAEzD,IAAI,aAAa,GAAW,CAAC,CAAC;QAE9B,IAAI,oBAAoB,GAAW,CAAC,CAAC;QAErC,IAAI,MAAM,GAAW,CAAC,CAAC;QAEvB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,EAAE,CAAC,EAAE;YAC3C,MAAM,QAAQ,GAAwB,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;YAEvD,IAAI,QAAQ,CAAC,MAAM,YAAY,kBAAO,EAAE;gBACpC,SAAS;aACZ;YAED,MAAM,YAAY,GACd,OAAO,CAAC,MAAM,CAAC,eAAe,CAAC,QAAQ,CACnC,QAAQ,CAAC,MAAM,CAAC,WAAW,CAC9B,CAAC,MAAM,CAAC;YAEb,oBAAoB,IAAI,QAAQ,CAAC,UAAU,CAAC;YAE5C,uFAAuF;YACvF,IAAI,CAAC,KAAK,CAAC,EAAE;gBACT,aAAa,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,YAAY,GAAG,EAAE,CAAC,CAAC;aAClD;YAED,2FAA2F;YAC3F,MAAM,SAAS,GAAW,IAAI,CAAC,GAAG,CAC9B,CAAC,EACD,QAAQ,CAAC,gBAAgB,GAAG,aAAa,GAAG,EAAE,CACjD,CAAC;YAEF,MAAM;gBACF,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,CAAC,GAAG,SAAS,GAAG,aAAa,GAAG,YAAY,CAAC;oBAC7D,oBAAoB,CAAC;SAC5B;QAED,OAAO,IAAI,CAAC,GAAG,CAAC,aAAa,GAAG,MAAM,EAAE,CAAC,CAAC,CAAC;IAC/C,CAAC;IAED;;OAEG;IACgB,aAAa,CAAC,OAA4B;QACzD,IAAI,CAAC,aAAa,IAAI,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;QAC1D,IAAI,CAAC,aAAa;YACd,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,GAAG,IAAI,CAAC,eAAe,CAAC;QAEvD,OAAO,IAAI,CAAC,aAAa,CAAC;IAC9B,CAAC;IAEkB,eAAe,CAAC,OAA4B;QAC3D,OAAO,CAAC,gBAAgB,GAAG,IAAI,CAAC,aAAa,CAAC;IAClD,CAAC;CACJ;AArED,sCAqEC"}
|
package/dist/skills/OsuSkill.js
CHANGED
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"OsuSkill.js","sourceRoot":"","sources":["../../src/skills/OsuSkill.ts"],"names":[],"mappings":";;;AAAA,iDAA8D;AAC9D,qDAAkD;AAElD;;;GAGG;AACH,MAAsB,QAAS,SAAQ,yBAAW;IAWrC,eAAe;QACpB,IAAI,UAAU,GAAW,CAAC,CAAC;QAC3B,IAAI,MAAM,GAAW,CAAC,CAAC;QAEvB,MAAM,aAAa,GAAa,IAAI,CAAC,WAAW;aAC3C,KAAK,EAAE;aACP,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;YACX,OAAO,CAAC,GAAG,CAAC,CAAC;QACjB,CAAC,CAAC,CAAC;QAEP,sFAAsF;QACtF,KACI,IAAI,CAAC,GAAG,CAAC,EACT,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,aAAa,CAAC,MAAM,EAAE,IAAI,CAAC,mBAAmB,CAAC,EAC5D,EAAE,CAAC,EACL;YACE,MAAM,KAAK,GAAW,IAAI,CAAC,KAAK,CAC5B,wBAAa,CAAC,IAAI,CACd,CAAC,EACD,EAAE,EACF,oBAAS,CAAC,KAAK,CAAC,CAAC,GAAG,IAAI,CAAC,mBAAmB,EAAE,CAAC,EAAE,CAAC,CAAC,CACtD,CACJ,CAAC;YAEF,aAAa,CAAC,CAAC,CAAC,IAAI,wBAAa,CAAC,IAAI,CAClC,IAAI,CAAC,sBAAsB,EAC3B,CAAC,EACD,KAAK,CACR,CAAC;SACL;QAED,4EAA4E;QAC5E,+CAA+C;QAC/C,aAAa;aACR,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;YACX,OAAO,CAAC,GAAG,CAAC,CAAC;QACjB,CAAC,CAAC;aACD,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE;YAChB,UAAU,IAAI,MAAM,GAAG,MAAM,CAAC;YAC9B,MAAM,IAAI,IAAI,CAAC,WAAW,CAAC;QAC/B,CAAC,CAAC,CAAC;QAEP,OAAO,UAAU,GAAG,IAAI,CAAC,oBAAoB,CAAC;IAClD,CAAC;CACJ;AAvDD,4BAuDC"}
|
package/dist/skills/OsuSpeed.js
CHANGED
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"OsuSpeed.js","sourceRoot":"","sources":["../../src/skills/OsuSpeed.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@rian8337/osu-difficulty-calculator",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.4.12",
|
|
4
4
|
"description": "A module for calculating osu!standard beatmap difficulty and performance value with respect to the current difficulty and performance algorithm.",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"osu",
|
|
@@ -30,10 +30,10 @@
|
|
|
30
30
|
"url": "https://github.com/Rian8337/osu-droid-module/issues"
|
|
31
31
|
},
|
|
32
32
|
"dependencies": {
|
|
33
|
-
"@rian8337/osu-base": "^1.
|
|
33
|
+
"@rian8337/osu-base": "^1.4.8"
|
|
34
34
|
},
|
|
35
35
|
"publishConfig": {
|
|
36
36
|
"access": "public"
|
|
37
37
|
},
|
|
38
|
-
"gitHead": "
|
|
38
|
+
"gitHead": "bccb494a9760b2b4a75d4b7c47647a5105630704"
|
|
39
39
|
}
|