nonebot-plugin-osubot 6.20.0__tar.gz → 6.20.1__tar.gz

{nonebot-plugin-osubot-6.20.0 → nonebot-plugin-osubot-6.20.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nonebot-plugin-osubot
-Version: 6.20.0
+Version: 6.20.1
 Summary: OSUbot in NoneBot2
 License: AGPL-3.0
 Author-email: yaowan233 <572473053@qq.com>

{nonebot-plugin-osubot-6.20.0 → nonebot-plugin-osubot-6.20.1}/nonebot_plugin_osubot/api.py

@@ -170,6 +170,7 @@ async def get_user_scores(
         return all_scores[:limit]
 
     elif source == "ppysb":
+        limit = min(limit, 100)
         url = f"https://api.ppy.sb/v1/get_player_scores?scope={scope}&id={uid}&mode={FGM[mode]}&limit={limit}&include_failed={int(include_failed)}"
         data = await make_request(url, {}, "未找到该玩家BP")
         data = ScoresResponse(**data)

{nonebot-plugin-osubot-6.20.0 → nonebot-plugin-osubot-6.20.1}/nonebot_plugin_osubot/draw/catch_preview_templates/js/catch/PalpableCatchHitObject.js

@@ -6,8 +6,24 @@ function PalpableCatchHitObject(data, beatmap) {
     this.color = data.color;
     this.radius = data.radius;
     this.hyperDash = false;
+    this.edge = false;
     this.XDistToNext = [1, 1, 1];
+    this.hitSound = data.hitSound || "0";
 }
+
+PalpableCatchHitObject.prototype.getHitsoundLabel = function (){
+    let hsLabels = [];
+    if (this.hitSound == null || this.hitSound == undefined || !this.hitSound) // hs = null | undifined | "" | "0"
+        return null;
+    else {
+        if (this.hitSound & 2) hsLabels.push("W");
+        if (this.hitSound & 8) hsLabels.push("C");
+        if (this.hitSound & 4) hsLabels.push("F");
+        if (hsLabels.length === 0) return null;
+        return hsLabels.join("|");
+    }
+};
+
 PalpableCatchHitObject.prototype.draw = function (time, ctx) {
     var dt = this.time - time;
     if (dt >= -this.beatmap.FALLOUT_TIME) {
@@ -24,7 +40,10 @@ PalpableCatchHitObject.prototype.draw2 = function (obj, SCALE, ctx, BORDER_WIDTH
         if (this.hyperDash) this.drawDashCircle2({ x: obj.x + BORDER_WIDTH, y: obj.y + BORDER_HEIGHT }, SCALE, ctx);
         this.drawCircle2({ x: obj.x + BORDER_WIDTH, y: obj.y + BORDER_HEIGHT }, SCALE, ctx);
     }
-    if (combo) this.drawCombo2({ x: obj.x + BORDER_WIDTH, y: obj.y + BORDER_HEIGHT }, SCALE, combo, ctx);
+    if (combo) {
+        if (typeof(combo) === "number") this.drawCombo2({ x: obj.x + BORDER_WIDTH, y: obj.y + BORDER_HEIGHT }, SCALE, "x" + combo, ctx);
+        else this.drawCombo2({ x: obj.x + BORDER_WIDTH, y: obj.y + BORDER_HEIGHT }, SCALE, combo, ctx);
+    }
 }
 PalpableCatchHitObject.prototype.predraw2 = function (SCREENSHEIGHT, COLMARGIN, SCALE, offset) {
     // 去除offset
@@ -83,7 +102,7 @@ PalpableCatchHitObject.prototype.drawCombo2 = function (position, SCALE, combo,
     ctx.font = "normal 16px 'Segoe UI'";
     ctx.textBaseline = "middle";
     ctx.textAlign = "start";
-    ctx.fillText("x" + combo, position.x + this.radius * SCALE * 2, position.y);
+    ctx.fillText(combo, position.x + this.radius * SCALE * 2, position.y);
     ctx.restore();
 };
 PalpableCatchHitObject.prototype.drawBanana = function (position, ctx) {

{nonebot-plugin-osubot-6.20.0 → nonebot-plugin-osubot-6.20.1}/nonebot_plugin_osubot/draw/catch_preview_templates/js/catch/bananashower.js

@@ -29,5 +29,6 @@ BananaShower.prototype.buildNested = function() {
         time += spacing;
         i++;
     }
+    this.nested[this.nested.length - 1].hitSound = this.hitSound;
     return this;
 };

{nonebot-plugin-osubot-6.20.0 → nonebot-plugin-osubot-6.20.1}/nonebot_plugin_osubot/draw/catch_preview_templates/js/catch/catch.js

@@ -150,6 +150,7 @@ function Catch(osu, mods) {
                 x: hitObject.position.x,
                 color: hitObject.color,
                 radius: this.circleRadius,
+                hitSound: hitObject.hitSound,
             }, this);
 
             this.palpableObjects.push(pch);
@@ -289,6 +290,8 @@ function Catch(osu, mods) {
         else {
             lastExcess = Math.clamp(distanceToHyper, 0, this.halfCatcherWidth);
             //this.whiteDashes.push({ score: distanceToHyper, time: currentObject.time });
+            // 标注再加20像素就变红果的白果跳
+            if (distanceToNext > 2 * this.halfCatcherWidth && distanceToHyper < 20) currentObject.edge = true;
         }
 
         lastDirection = thisDirection;
@@ -357,7 +360,7 @@ Catch.prototype.draw = function (time, ctx) {
 /**
  * @param {number} SCALE 缩放大小（0.2=缩放为1/5）
  * @param {number} SPEED 播放速度 DT=1.5 HT=0.75 在ctb不影响谱面，只影响时间和BPM标注
- * @param {{showDistance: boolean, distanceStart: number, distanceEnd: number, distanceType: number}} params 其他参数
+ * @param {{showLabelType: number, distanceStart: number, distanceEnd: number, distanceType: number}} params 其他参数
  */
 Catch.prototype.draw2 = function (SCALE, SPEED = 1, params = {}) {
     // 初定每一列20个屏幕大小，不够换列
@@ -405,7 +408,7 @@ Catch.prototype.draw2 = function (SCALE, SPEED = 1, params = {}) {
             if (this.TimingPoints[i].kiai) lastKiaiStart = this.TimingPoints[i].time - offset;
         }
         // 绿线在ctb无关紧要，正常模式不用加，标注距离时只加变化的
-        if (params.showDistance) {
+        if (params.showLabelType === 1) {
             if (this.TimingPoints[i].parent) {
                 if (Math.abs(this.TimingPoints[i].sliderVelocity - lastSV) < 0.001) {
                     lastSV = this.TimingPoints[i].sliderVelocity;
@@ -679,16 +682,59 @@ Catch.prototype.draw2 = function (SCALE, SPEED = 1, params = {}) {
             combo += 1;
         }
         // 借用combo位显示距离，省事！
-        if (params.showDistance) {
+        if (params.showLabelType === 1) {
             if (objs[i].type === "Fruit" || objs[i].type === "Droplet") {
                 let distanceType = params.distanceType;
                 if (this.fullCatchObjects[i].XDistToNext[distanceType] >= params.distanceStart && this.fullCatchObjects[i].XDistToNext[distanceType] <= params.distanceEnd)
                     showCombo = this.fullCatchObjects[i].XDistToNext[distanceType];
             }
         }
+        // 借用combo位显示音效，省事！
+        else if (params.showLabelType === 2) {
+            if (objs[i].type === "Fruit" || objs[i].type === "Banana") {
+                showCombo = this.fullCatchObjects[i].getHitsoundLabel();
+            }
+        }
 
-        else if (combo > lastCombo && combo > 0 && combo % comboSplit === 0) showCombo = combo;
+        else if (combo > lastCombo && combo > 0 && (combo % comboSplit === 0 || this.fullCatchObjects[i].edge)) showCombo = combo;
         this.fullCatchObjects[i].draw2(objs[i], SCALE, ctx2, BORDER_WIDTH, BORDER_HEIGHT, showCombo);
+
+        // 标注edge
+        if (this.fullCatchObjects[i].edge && i < this.fullCatchObjects.length - 1) {
+            ctx2.save();
+            ctx2.beginPath();
+            let _x1 = objs[i].x + BORDER_WIDTH;
+            let _y1 = objs[i].y + BORDER_HEIGHT;
+            let _x2 = objs[i+1].x + BORDER_WIDTH;
+            let _y2 = objs[i+1].y + BORDER_HEIGHT;
+            if (_y1 > _y2) {
+                ctx2.moveTo(_x1, _y1);
+                ctx2.lineTo(_x2, _y2);
+            }
+            // 不在同一轨道上
+            else if (_y1 < _y2) {
+                let line_end_x2 = _x2 - Beatmap.WIDTH * SCALE - 2 * COLMARGIN;
+                let line_end_y2 = _y2 + 2 * BORDER_HEIGHT - height;
+                let line_middle_y2 = BORDER_HEIGHT;
+                let line_middle_x2 = (line_end_x2 - _x1) * (line_end_y2 - line_middle_y2) / (_y1 - line_end_y2) + line_end_x2;
+                if (line_middle_x2) {
+                    ctx2.moveTo(_x1, _y1);
+                    ctx2.lineTo(line_middle_x2, line_middle_y2);
+                }
+                let line_start_x1 = _x1 + Beatmap.WIDTH * SCALE + 2 * COLMARGIN;
+                let line_start_y1 = _y1 + height - 2 * BORDER_HEIGHT;
+                let line_middle_y1 = height - BORDER_HEIGHT;
+                let line_middle_x1 = (_x2 - line_start_x1) * (_y2 - line_middle_y1) / (line_start_y1 - _y2) + _x2;
+                if (line_middle_x1) {
+                    ctx2.moveTo(line_middle_x1, line_middle_y1);
+                    ctx2.lineTo(_x2, _y2);
+                }
+            }
+            ctx2.strokeStyle = '#fff';
+            ctx2.lineWidth = 3;
+            ctx2.stroke();
+        }
+
         lastCombo = combo;
     }
 
@@ -698,18 +744,23 @@ Catch.prototype.draw2 = function (SCALE, SPEED = 1, params = {}) {
     extraBarTimes.map((_barTime) => {
         let _objs = objs.filter((obj) => Math.abs(obj.time - _barTime * 1000) < EDGE_OFFSET);
         _objs.map((_obj) => {
-            let distanceType = params.distanceType;
-            let _dist = this.fullCatchObjects[_obj.index].XDistToNext[distanceType];
-            if (_dist < params.distanceStart || _dist > params.distanceEnd) _dist = null;
+            let label = null;
+            if (params.showLabelType === 1) {
+                let distanceType = params.distanceType;
+                label = this.fullCatchObjects[_obj.index].XDistToNext[distanceType];
+                if (label < params.distanceStart || label > params.distanceEnd) label = null;
+            }
+            else if (params.showLabelType === 2) {
+                label = this.fullCatchObjects[_obj.index].getHitsoundLabel();
+            }
+
             if (_obj.y > SCREENSHEIGHT * SCALE - 5) {
                 // note靠近下边缘，在上一列的上边缘再画一个
-                if (params.showDistance) this.fullCatchObjects[_obj.index].draw2({ time: _obj.time, type: _obj.type, x: _obj.x - (Beatmap.WIDTH * SCALE + 2 * COLMARGIN), y: 0, col: _obj.col - 1 }, SCALE, ctx2, BORDER_WIDTH, BORDER_HEIGHT, _dist);
-                else this.fullCatchObjects[_obj.index].draw2({ time: _obj.time, type: _obj.type, x: _obj.x - (Beatmap.WIDTH * SCALE + 2 * COLMARGIN), y: 0, col: _obj.col - 1 }, SCALE, ctx2, BORDER_WIDTH, BORDER_HEIGHT);
+                this.fullCatchObjects[_obj.index].draw2({ time: _obj.time, type: _obj.type, x: _obj.x - (Beatmap.WIDTH * SCALE + 2 * COLMARGIN), y: 0, col: _obj.col - 1 }, SCALE, ctx2, BORDER_WIDTH, BORDER_HEIGHT, label);
             }
             else if (_obj.y < 5) {
                 // note靠近上边缘，在下一列的下边缘再画一个
-                if (params.showDistance) this.fullCatchObjects[_obj.index].draw2({ time: _obj.time, type: _obj.type, x: _obj.x + (Beatmap.WIDTH * SCALE + 2 * COLMARGIN), y: SCREENSHEIGHT * SCALE, col: _obj.col + 1 }, SCALE, ctx2, BORDER_WIDTH, BORDER_HEIGHT, _dist);
-                else this.fullCatchObjects[_obj.index].draw2({ time: _obj.time, type: _obj.type, x: _obj.x + (Beatmap.WIDTH * SCALE + 2 * COLMARGIN), y: SCREENSHEIGHT * SCALE, col: _obj.col + 1 }, SCALE, ctx2, BORDER_WIDTH, BORDER_HEIGHT);
+                this.fullCatchObjects[_obj.index].draw2({ time: _obj.time, type: _obj.type, x: _obj.x + (Beatmap.WIDTH * SCALE + 2 * COLMARGIN), y: SCREENSHEIGHT * SCALE, col: _obj.col + 1 }, SCALE, ctx2, BORDER_WIDTH, BORDER_HEIGHT, label);
             }
         });
     });

{nonebot-plugin-osubot-6.20.0 → nonebot-plugin-osubot-6.20.1}/nonebot_plugin_osubot/draw/catch_preview_templates/js/catch/juicestream.js

@@ -6,12 +6,14 @@ function JuiceStream(data, beatmap)
     this.sliderType = this.points[0];
     this.points[0] = this.position;
     for (var i = 1; i < this.points.length; i++)
-    {
+    { 
         this.points[i] = new Point(this.points[i].split(':'));
     }
     this.repeat = data[6] | 0;
     this.pixelLength = +data[7];
 
+    this.hitSounds = this.hitSoundString.split('|');
+
     this.timingPoint = this.beatmap.timingPointAt(this.time);
     this.beatLength = this.timingPoint.beatLength;
     this.timingPointStart = this.timingPoint.time;
@@ -99,6 +101,7 @@ JuiceStream.prototype.generateTicks = function(spanIndex, spanStartTime, spanDur
 JuiceStream.prototype.buildNested = function() {
     this.nested = [];
 
+    let nestedIndex = 0;
     let lastEvent = null;
     for(let i = 0; i < this.events.length; i++) {
         // generate tiny droplets since the last point
@@ -151,7 +154,9 @@ JuiceStream.prototype.buildNested = function() {
                     x: this.curve.pointAt(this.events[i].pathProgress).x,
                     color: this.color,
                     radius: this.beatmap.circleRadius,
+                    hitSound: this.hitSounds[nestedIndex] || "0",
                 }, this.beatmap));
+                nestedIndex++;
                 break;
         }
     }

{nonebot-plugin-osubot-6.20.0 → nonebot-plugin-osubot-6.20.1}/nonebot_plugin_osubot/draw/catch_preview_templates/js/standard/curve/curve.js

@@ -21,5 +21,25 @@ Curve.parse = function(sliderType, points, pixelLength)
         }
     }
     catch(e) {}
-    return new LinearBezier(points, pixelLength, sliderType == 'L');
+    try
+    {
+        return new LinearBezier(points, pixelLength, sliderType == 'L');
+    }
+    catch(e)
+    {
+        return new SingleNoteCurve(points[0]);
+    }
 }
+
+
+
+function SingleNoteCurve(point)
+{
+    this.path = [point];
+};
+SingleNoteCurve.prototype = Object.create(Curve.prototype);
+SingleNoteCurve.prototype.constructor = SingleNoteCurve;
+SingleNoteCurve.prototype.pointAt = function(t)
+{
+    return this.path[0];
+};

{nonebot-plugin-osubot-6.20.0 → nonebot-plugin-osubot-6.20.1}/nonebot_plugin_osubot/draw/catch_preview_templates/js/standard/slider.js

@@ -12,6 +12,8 @@ function Slider(data, beatmap)
     this.repeat = data[6] | 0;
     this.pixelLength = +data[7];
 
+    this.hitSoundString = data[8] || "";
+
     var sliderTime = this.beatmap.timingPointAt(this.time).beatLength * (
             this.pixelLength / this.beatmap.SliderMultiplier
         ) / 100;

{nonebot-plugin-osubot-6.20.0 → nonebot-plugin-osubot-6.20.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "nonebot-plugin-osubot"
-version = "6.20.0"
+version = "6.20.1"
 description = "OSUbot in NoneBot2"
 authors = [
     { name = "yaowan233", email = "572473053@qq.com" },