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

Commit

Permalink
Update Code
Browse files Browse the repository at this point in the history
  • Loading branch information
Awbugl committed Jul 18, 2022
1 parent 2a1d1f0 commit f6a80a0
Show file tree
Hide file tree
Showing 3 changed files with 35 additions and 14 deletions.
39 changes: 26 additions & 13 deletions Andreal.Core/Executor/ArcExecutor.cs
Original file line number Diff line number Diff line change
Expand Up @@ -246,6 +246,32 @@ private async Task<MessageChain> Const()

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

if (song.SongID is "last" or "lasteternity")
{
var lastsong = ArcaeaCharts.QueryByID("last");
var lasteternitysong = ArcaeaCharts.QueryByID("lasteternity");
var msg = new MessageChain();

for (var i = 0; i < lastsong.Count; i++)
if (i == 2 || lastsong[i].JacketOverride)
msg.Append(ImageMessage.FromPath(await Path.ArcaeaSong(lastsong[i])));

msg.Append(ImageMessage.FromPath(await Path.ArcaeaSong(lasteternitysong[3])));

msg.Append(lastsong.NameWithPackage);

foreach (var t in lastsong)
{
msg.Append("\n" + t.ConstString);
if(t.AudioOverride) msg.Append($" ({t.NameEn})");
}

msg.Append(lasteternitysong[3].ConstString);
msg.Append($" ({lasteternitysong[3].NameEn})");

return msg;
}

return await song.FullConstString();
}

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

private static double CalcSongConst(string scores, double rating)
{
var score = Convert.ToDouble(scores);
return score switch
{
>= 10000000 => rating - 2,
>= 9800000 => rating - 1 - (score - 9800000) / 200000,
_ => rating > 0
? rating - (score - 9500000) / 300000
: 0.0
};
}

private async Task<MessageChain> Recent()
{
var data = await ArcaeaUnlimitedApi.UserInfo(User!.ArcCode);
Expand Down
7 changes: 6 additions & 1 deletion Andreal.Core/Model/Arcaea/ArcaeaSong.cs
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,12 @@ internal async Task<MessageChain> FullConstString()
if (i == 2 || this[i].JacketOverride)
msg.Append(ImageMessage.FromPath(await Path.ArcaeaSong(this[i])));
msg.Append(NameWithPackage);
for (var i = 0; i < Count; i++) msg.Append("\n" + this[i].ConstString);

for (var i = 0; i < Count; i++)
{
msg.Append("\n" + this[i].ConstString);
if(this[i].AudioOverride) msg.Append($" ({this[i].NameEn})");
}

return msg;
}
Expand Down
3 changes: 3 additions & 0 deletions Andreal.Core/Utils/ArcaeaHelper.cs
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,9 @@ internal static bool SongInfoParser(IEnumerable<string> command, out ArcaeaSong
}

song = result[0];

if (song.SongID == "lasteternity") dif = 3;

return true;
}
}

0 comments on commit f6a80a0

Please sign in to comment.