Skip to content
This repository was archived by the owner on Sep 2, 2023. It is now read-only.

Commit f6a80a0

Browse files
author
Awbugl
committed
Update Code
1 parent 2a1d1f0 commit f6a80a0

File tree

3 files changed

+35
-14
lines changed

3 files changed

+35
-14
lines changed

Andreal.Core/Executor/ArcExecutor.cs

Lines changed: 26 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -246,6 +246,32 @@ private async Task<MessageChain> Const()
246246

247247
if (!ArcaeaHelper.SongInfoParser(Command, out var song, out _, out var errMessage)) return errMessage;
248248

249+
if (song.SongID is "last" or "lasteternity")
250+
{
251+
var lastsong = ArcaeaCharts.QueryByID("last");
252+
var lasteternitysong = ArcaeaCharts.QueryByID("lasteternity");
253+
var msg = new MessageChain();
254+
255+
for (var i = 0; i < lastsong.Count; i++)
256+
if (i == 2 || lastsong[i].JacketOverride)
257+
msg.Append(ImageMessage.FromPath(await Path.ArcaeaSong(lastsong[i])));
258+
259+
msg.Append(ImageMessage.FromPath(await Path.ArcaeaSong(lasteternitysong[3])));
260+
261+
msg.Append(lastsong.NameWithPackage);
262+
263+
foreach (var t in lastsong)
264+
{
265+
msg.Append("\n" + t.ConstString);
266+
if(t.AudioOverride) msg.Append($" ({t.NameEn})");
267+
}
268+
269+
msg.Append(lasteternitysong[3].ConstString);
270+
msg.Append($" ({lasteternitysong[3].NameEn})");
271+
272+
return msg;
273+
}
274+
249275
return await song.FullConstString();
250276
}
251277

@@ -316,19 +342,6 @@ private async Task<MessageChain> FloorOrCeil(bool isFloor)
316342
return await new ArcRecord5ImageGenerator(b30data, isFloor).Generate();
317343
}
318344

319-
private static double CalcSongConst(string scores, double rating)
320-
{
321-
var score = Convert.ToDouble(scores);
322-
return score switch
323-
{
324-
>= 10000000 => rating - 2,
325-
>= 9800000 => rating - 1 - (score - 9800000) / 200000,
326-
_ => rating > 0
327-
? rating - (score - 9500000) / 300000
328-
: 0.0
329-
};
330-
}
331-
332345
private async Task<MessageChain> Recent()
333346
{
334347
var data = await ArcaeaUnlimitedApi.UserInfo(User!.ArcCode);

Andreal.Core/Model/Arcaea/ArcaeaSong.cs

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,12 @@ internal async Task<MessageChain> FullConstString()
2424
if (i == 2 || this[i].JacketOverride)
2525
msg.Append(ImageMessage.FromPath(await Path.ArcaeaSong(this[i])));
2626
msg.Append(NameWithPackage);
27-
for (var i = 0; i < Count; i++) msg.Append("\n" + this[i].ConstString);
27+
28+
for (var i = 0; i < Count; i++)
29+
{
30+
msg.Append("\n" + this[i].ConstString);
31+
if(this[i].AudioOverride) msg.Append($" ({this[i].NameEn})");
32+
}
2833

2934
return msg;
3035
}

Andreal.Core/Utils/ArcaeaHelper.cs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,9 @@ internal static bool SongInfoParser(IEnumerable<string> command, out ArcaeaSong
5757
}
5858

5959
song = result[0];
60+
61+
if (song.SongID == "lasteternity") dif = 3;
62+
6063
return true;
6164
}
6265
}

0 commit comments

Comments
 (0)