dan63
/
TetraStats
mirror of https://github.com/dan63047/TetraStats.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Stats ranks for everyone

This commit is contained in:
dan63047 2024-03-08 02:06:35 +03:00
parent f95ffb59aa
commit 66acbc2d48
3 changed files with 47 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
lib/data_objects/tetrio.dart
View File

@ -313,6 +313,10 @@ class TetrioPlayer {
return tlSeason1.lessStrictCheck(other.tlSeason1); return tlSeason1.lessStrictCheck(other.tlSeason1);
} }
TetrioPlayerFromLeaderboard convertToPlayerFromLeaderboard() => TetrioPlayerFromLeaderboard(
userId, username, role, xp, country, supporterTier > 0, verified, state, gamesPlayed, gamesWon,
tlSeason1.rating, tlSeason1.glicko??0, tlSeason1.rd??noTrRd, tlSeason1.rank, tlSeason1.bestRank, tlSeason1.apm??0, tlSeason1.pps??0, tlSeason1.vs??0, tlSeason1.decaying);
@override @override
String toString() { String toString() {
return "$username ($state)"; return "$username ($state)";
@ -1140,23 +1144,23 @@ class News {
} }
class PlayerLeaderboardPosition{ class PlayerLeaderboardPosition{
late LeaderboardPosition apm; late LeaderboardPosition? apm;
late LeaderboardPosition pps; late LeaderboardPosition? pps;
late LeaderboardPosition vs; late LeaderboardPosition? vs;
late LeaderboardPosition gamesPlayed; late LeaderboardPosition? gamesPlayed;
late LeaderboardPosition gamesWon; late LeaderboardPosition? gamesWon;
late LeaderboardPosition winrate; late LeaderboardPosition? winrate;
late LeaderboardPosition app; late LeaderboardPosition? app;
late LeaderboardPosition vsapm; late LeaderboardPosition? vsapm;
late LeaderboardPosition dss; late LeaderboardPosition? dss;
late LeaderboardPosition dsp; late LeaderboardPosition? dsp;
late LeaderboardPosition appdsp; late LeaderboardPosition? appdsp;
late LeaderboardPosition cheese; late LeaderboardPosition? cheese;
late LeaderboardPosition gbe; late LeaderboardPosition? gbe;
late LeaderboardPosition nyaapp; late LeaderboardPosition? nyaapp;
late LeaderboardPosition area; late LeaderboardPosition? area;
late LeaderboardPosition estTr; late LeaderboardPosition? estTr;
late LeaderboardPosition accOfEst; late LeaderboardPosition? accOfEst;
PlayerLeaderboardPosition({ PlayerLeaderboardPosition({
required this.apm, required this.apm,
@ -1178,7 +1182,7 @@ class PlayerLeaderboardPosition{
required this.accOfEst required this.accOfEst
}); });
PlayerLeaderboardPosition.fromSearchResults(List<LeaderboardPosition> results){ PlayerLeaderboardPosition.fromSearchResults(List<LeaderboardPosition?> results){
apm = results[0]; apm = results[0];
pps = results[1]; pps = results[1];
vs = results[2]; vs = results[2];
@ -1834,15 +1838,26 @@ class TetrioPlayersLeaderboard {
} }
} }
PlayerLeaderboardPosition? getLeaderboardPosition(String userID) { PlayerLeaderboardPosition? getLeaderboardPosition(TetrioPlayer user) {
if (leaderboard.indexWhere((element) => element.userId == userID) == -1) return null; if (user.tlSeason1.gamesPlayed == 0) return null;
bool fakePositions = false;
late List<TetrioPlayerFromLeaderboard> copyOfLeaderboard;
if (leaderboard.indexWhere((element) => element.userId == user.userId) == -1){
fakePositions =true;
copyOfLeaderboard = List.of(leaderboard);
copyOfLeaderboard.add(user.convertToPlayerFromLeaderboard());
}
List<Stats> stats = [Stats.apm, Stats.pps, Stats.vs, Stats.gp, Stats.gw, Stats.wr, List<Stats> stats = [Stats.apm, Stats.pps, Stats.vs, Stats.gp, Stats.gw, Stats.wr,
Stats.app, Stats.vsapm, Stats.dss, Stats.dsp, Stats.appdsp, Stats.cheese, Stats.gbe, Stats.nyaapp, Stats.area, Stats.eTR, Stats.acceTR]; Stats.app, Stats.vsapm, Stats.dss, Stats.dsp, Stats.appdsp, Stats.cheese, Stats.gbe, Stats.nyaapp, Stats.area, Stats.eTR, Stats.acceTR];
List<LeaderboardPosition> results = []; List<LeaderboardPosition?> results = [];
for (Stats stat in stats) { for (Stats stat in stats) {
List<TetrioPlayerFromLeaderboard> sortedLeaderboard = getStatRanking(leaderboard, stat, reversed: false); List<TetrioPlayerFromLeaderboard> sortedLeaderboard = getStatRanking(fakePositions ? copyOfLeaderboard : leaderboard, stat, reversed: false);
int position = sortedLeaderboard.indexWhere((element) => element.userId == userID) + 1; int position = sortedLeaderboard.indexWhere((element) => element.userId == user.userId) + 1;
results.add(LeaderboardPosition(position, position / sortedLeaderboard.length)); if (position == 0) {
results.add(null);
} else {
results.add(LeaderboardPosition(fakePositions ? 1001 : position, position / sortedLeaderboard.length));
}
} }
return PlayerLeaderboardPosition.fromSearchResults(results); return PlayerLeaderboardPosition.fromSearchResults(results);
} }
@ -1921,7 +1936,11 @@ class TetrioPlayerFromLeaderboard {
this.apm, this.apm,
this.pps, this.pps,
this.vs, this.vs,
this.decaying); this.decaying){
nerdStats = NerdStats(apm, pps, vs);
estTr = EstTr(apm, pps, vs, nerdStats.app, nerdStats.dss, nerdStats.dsp, nerdStats.gbe);
playstyle = Playstyle(apm, pps, nerdStats.app, nerdStats.vsapm, nerdStats.dsp, nerdStats.gbe, estTr.srarea, estTr.statrank);
}
double get winrate => gamesWon / gamesPlayed; double get winrate => gamesWon / gamesPlayed;
double get esttracc => estTr.esttr - rating; double get esttracc => estTr.esttr - rating;

2
lib/views/main_view.dart
View File

@ -174,7 +174,7 @@ class _MainState extends State<MainView> with TickerProviderStateMixin {
// Get tetra League leaderboard // Get tetra League leaderboard
everyone = teto.getCachedLeaderboard(); everyone = teto.getCachedLeaderboard();
everyone ??= await teto.fetchTLLeaderboard(); everyone ??= await teto.fetchTLLeaderboard();
meAmongEveryone = await compute(everyone!.getLeaderboardPosition, me.userId); meAmongEveryone = await compute(everyone!.getLeaderboardPosition, me);
if (meAmongEveryone != null) teto.cacheLeaderboardPositions(me.userId, meAmongEveryone!); if (meAmongEveryone != null) teto.cacheLeaderboardPositions(me.userId, meAmongEveryone!);
} }

4
lib/widgets/tl_thingy.dart
View File

@ -302,7 +302,7 @@ class _TLThingyState extends State<TLThingy> {
color: oldTl!.estTr!.esttr > currentTl.estTr!.esttr ? Colors.redAccent : Colors.greenAccent color: oldTl!.estTr!.esttr > currentTl.estTr!.esttr ? Colors.redAccent : Colors.greenAccent
),), ),),
if (oldTl?.estTr?.esttr != null && widget.lbPositions?.estTr != null) const TextSpan(text: " • "), if (oldTl?.estTr?.esttr != null && widget.lbPositions?.estTr != null) const TextSpan(text: " • "),
if (widget.lbPositions?.estTr != null) TextSpan(text: widget.lbPositions!.estTr.position >= 1000 ? "Top ${f2.format(widget.lbPositions!.estTr.percentage*100)}%" : "№${widget.lbPositions!.estTr.position}") if (widget.lbPositions?.estTr != null) TextSpan(text: widget.lbPositions!.estTr!.position >= 1000 ? "Top ${f2.format(widget.lbPositions!.estTr!.percentage*100)}%" : "№${widget.lbPositions!.estTr!.position}")
] ]
), ),
), ),
@ -328,7 +328,7 @@ class _TLThingyState extends State<TLThingy> {
color: oldTl!.esttracc! > currentTl.esttracc! ? Colors.redAccent : Colors.greenAccent color: oldTl!.esttracc! > currentTl.esttracc! ? Colors.redAccent : Colors.greenAccent
),), ),),
if (oldTl?.esttracc != null && widget.lbPositions?.accOfEst != null) const TextSpan(text: " • "), if (oldTl?.esttracc != null && widget.lbPositions?.accOfEst != null) const TextSpan(text: " • "),
if (widget.lbPositions?.accOfEst != null) TextSpan(text: widget.lbPositions!.accOfEst.position >= 1000 ? "Top ${f2.format(widget.lbPositions!.accOfEst.percentage*100)}%" : "№${widget.lbPositions!.accOfEst.position}") if (widget.lbPositions?.accOfEst != null) TextSpan(text: widget.lbPositions!.accOfEst!.position >= 1000 ? "Top ${f2.format(widget.lbPositions!.accOfEst!.percentage*100)}%" : "№${widget.lbPositions!.accOfEst!.position}")
] ]
), ),
), ),