2006-Scape/2006Scape
1
0
Fork 0
mirror of https://github.com/2006-Scape/2006Scape.git synced 2026-07-07 16:49:07 +00:00
Code Issues 4.5k Packages Projects Releases 10 Wiki Activity

Highscores fix

Browse Source
This commit is contained in:
dginovker
2019-06-28 15:50:51 -04:00
parent 01008c7254
commit e7d5f36880
16 changed files with 70 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
2006Redone Server/src/redone/game/players/HighscoresHandler.java
+4 -5
View File
@@ -2,7 +2,6 @@ package redone.game.players;
import java.io.File;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
import static redone.game.players.PlayerSave.loadPlayerInfo;
@@ -31,8 +30,8 @@ public class HighscoresHandler {
players.sort(new totalGoldComparator());
return players.get(i).playerName + ": " + players.get(i).getPlayerAssistant().totalGold() + "gp";
default:
players.sort(new totalDmgComparator());
return players.get(i).playerName + ": " + players.get(i).totalDamageDealt;
players.sort(new globalDmgComparator());
return players.get(i).playerName + ": " + players.get(i).globalDamageDealt;
}
}
@@ -50,10 +49,10 @@ public class HighscoresHandler {
}
}
private class totalDmgComparator implements Comparator<Client> {
private class globalDmgComparator implements Comparator<Client> {
@Override
public int compare(Client client, Client t1) {
return - client.totalDamageDealt + t1.totalDamageDealt;
return - client.globalDamageDealt + t1.globalDamageDealt;
}
}
2006Redone Server/src/redone/game/players/Player.java
+2 -2
View File
@@ -94,7 +94,7 @@ public abstract class Player {
dialogueAction = 0, autocastId, followDistance, followId2,
barrageCount = 0, delayedDamage = 0, delayedDamage2 = 0,
pcPoints = 0, magePoints = 0, desertTreasure = 0,
lastArrowUsed = -1, autoRet = 1, pcDamage = 0, xInterfaceId = 0,
lastArrowUsed = -1, autoRet = 0, pcDamage = 0, xInterfaceId = 0,
xRemoveId = 0, xRemoveSlot = 0, tzhaarToKill = 0, tzhaarKilled = 0,
waveId, frozenBy = 0, poisonDamage = 0, teleAction = 0,
bonusAttack = 0, lastNpcAttacked = 0, killCount = 0, witchspot,
@@ -397,7 +397,7 @@ public abstract class Player {
playerIndex, oldPlayerIndex, lastWeaponUsed, projectileStage,
crystalBowArrowCount, playerMagicBook, teleGfx, teleEndAnimation,
teleHeight, teleX, teleY, rangeItemUsed, killingNpcIndex,
totalDamageDealt, oldNpcIndex, fightMode, attackTimer;
totalDamageDealt, globalDamageDealt, oldNpcIndex, fightMode, attackTimer;
public boolean magicFailed, oldMagicFailed;
public int bowSpecShot, clickNpcType, clickObjectType, objectId, objectX,
objectY, objectXOffset, objectYOffset, objectDistance;
2006Redone Server/src/redone/game/players/PlayerSave.java
+12
View File
@@ -39,6 +39,11 @@ public class PlayerSave {
if (File1) {
// new File ("./characters/"+playerName+".txt");
} else {
if (playerName.equals(""))
{
//it's the .gitignore :P
return 0;
}
Misc.println(playerName + ": character file not found.");
player.newPlayer = false;
return 0;
@@ -135,6 +140,9 @@ public class PlayerSave {
case "debugMode":
player.debugMode = Boolean.parseBoolean(token2);
break;
case "global-damage":
player.globalDamageDealt = Integer.parseInt(token2);
break;
case "skull-timer":
player.skullTimer = Integer.parseInt(token2);
break;
@@ -622,6 +630,10 @@ public class PlayerSave {
characterfile.write(Boolean.toString(player.isBotting), 0,
Boolean.toString(player.isBotting).length());
characterfile.newLine();
characterfile.write("global-damage = ", 0, 16);
characterfile.write(Integer.toString(player.globalDamageDealt), 0, Integer
.toString(player.globalDamageDealt).length());
characterfile.newLine();
characterfile.write("brightness = ", 0, 13);
characterfile.write(Integer.toString(player.brightness), 0, Integer
.toString(player.brightness).length());