mirror of
https://github.com/2006-Scape/2006Scape.git
synced 2026-07-06 08:39:06 +00:00
Fixup highscores, ignore admin dev and bots
This commit is contained in:
@@ -16,13 +16,18 @@ public class HighscoresHandler {
|
|||||||
Client player = new Client(null, -1);
|
Client player = new Client(null, -1);
|
||||||
player.playerName = child.getName().split("\\.")[0];
|
player.playerName = child.getName().split("\\.")[0];
|
||||||
loadPlayerInfo(player, child.getName().split("\\.")[0], "", false);
|
loadPlayerInfo(player, child.getName().split("\\.")[0], "", false);
|
||||||
|
if (player.playerRights >= 2 || // admin or dev
|
||||||
|
player.isBot || player.playerName.startsWith("♥")) { // ignore bots
|
||||||
|
System.out.println("Skipping player " + player.playerName);
|
||||||
|
continue;
|
||||||
|
}
|
||||||
players.add(player);
|
players.add(player);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getRank(Client player, int i, String sortBy) {
|
public String getRank(Client player, int i, String sortBy) {
|
||||||
if (players.size() <= i || player.playerRights >= 2) {
|
if (players.size() <= i) {
|
||||||
return "Nobody";
|
return "-----";
|
||||||
}
|
}
|
||||||
|
|
||||||
switch (sortBy) {
|
switch (sortBy) {
|
||||||
@@ -32,6 +37,7 @@ public class HighscoresHandler {
|
|||||||
case "gold":
|
case "gold":
|
||||||
players.sort(new totalGoldComparator());
|
players.sort(new totalGoldComparator());
|
||||||
return players.get(i).playerName + ": " + players.get(i).getPlayerAssistant().totalGold() + "gp";
|
return players.get(i).playerName + ": " + players.get(i).getPlayerAssistant().totalGold() + "gp";
|
||||||
|
case "damage":
|
||||||
default:
|
default:
|
||||||
players.sort(new globalDmgComparator());
|
players.sort(new globalDmgComparator());
|
||||||
return players.get(i).playerName + ": " + players.get(i).globalDamageDealt;
|
return players.get(i).playerName + ": " + players.get(i).globalDamageDealt;
|
||||||
|
|||||||
@@ -169,30 +169,43 @@ public class Commands implements PacketType {
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
PlayerSave.saveGame((Client) p);
|
PlayerSave.saveGame((Client) p);
|
||||||
System.out.println("Saved game for " + p.playerName
|
System.out.println("Saved game for " + p.playerName + ".");
|
||||||
+ ".");
|
|
||||||
Server.lastMassSave = System.currentTimeMillis();
|
Server.lastMassSave = System.currentTimeMillis();
|
||||||
}
|
}
|
||||||
HighscoresHandler hs = new HighscoresHandler();
|
HighscoresHandler hs = new HighscoresHandler();
|
||||||
String[] highscores = new String[]{
|
String[] highscores = new String[]{
|
||||||
"@dre@Highscores",
|
|
||||||
"",
|
|
||||||
"Top 5 Total Level:",
|
"Top 5 Total Level:",
|
||||||
hs.getRank(player, 0, "level"), hs.getRank(player,1, "level"), hs.getRank(player,2, "level"), hs.getRank(player,3, "level"), hs.getRank(player,4, "level"),
|
hs.getRank(player, 0, "level"),
|
||||||
|
hs.getRank(player, 1, "level"),
|
||||||
|
hs.getRank(player, 2, "level"),
|
||||||
|
hs.getRank(player, 3, "level"),
|
||||||
|
hs.getRank(player, 4, "level"),
|
||||||
"",
|
"",
|
||||||
"Top 5 Wealthiest Players:",
|
"Top 5 Wealthiest Players:",
|
||||||
hs.getRank(player,0, "gold"), hs.getRank(player,1, "gold"), hs.getRank(player,2, "gold"), hs.getRank(player,3, "gold"), hs.getRank(player, 4, "gold"),
|
hs.getRank(player, 0, "gold"),
|
||||||
|
hs.getRank(player, 1, "gold"),
|
||||||
|
hs.getRank(player, 2, "gold"),
|
||||||
|
hs.getRank(player, 3, "gold"),
|
||||||
|
hs.getRank(player, 4, "gold"),
|
||||||
"",
|
"",
|
||||||
"Top 5 Highest Total Damage:",
|
"Top 5 Highest Total Damage:",
|
||||||
hs.getRank(player,0, "damage"), hs.getRank(player,1, "damage"), hs.getRank(player,2, "damage"), hs.getRank(player, 3, "damage"), hs.getRank(player, 4, "damage"),
|
hs.getRank(player, 0, "damage"),
|
||||||
|
hs.getRank(player, 1, "damage"),
|
||||||
|
hs.getRank(player, 2, "damage"),
|
||||||
|
hs.getRank(player, 3, "damage"),
|
||||||
|
hs.getRank(player, 4, "damage"),
|
||||||
};
|
};
|
||||||
|
|
||||||
for (int i = 8144; i < 8245; i++) {
|
|
||||||
player.getPlayerAssistant().sendFrame126("", i);
|
|
||||||
}
|
|
||||||
|
|
||||||
for (int i = 8144; i < 8144 + highscores.length; i++) {
|
// Clear all lines
|
||||||
player.getPlayerAssistant().sendFrame126(highscores[i - 8144], i+3);
|
for (int i = 8144; i < 8195; i++) player.getPlayerAssistant().sendFrame126("", i);
|
||||||
|
|
||||||
|
player.getPlayerAssistant().sendFrame126("@dre@Highscores", 8144);
|
||||||
|
|
||||||
|
int lineNumber = 8147;
|
||||||
|
for (String line : highscores){
|
||||||
|
System.out.println(line + " - " + lineNumber);
|
||||||
|
player.getPlayerAssistant().sendFrame126(line, lineNumber++);
|
||||||
}
|
}
|
||||||
player.getPlayerAssistant().showInterface(8134);
|
player.getPlayerAssistant().showInterface(8134);
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user