From a5e3e6e8f2341e66c967f7510297380e7940ca3c Mon Sep 17 00:00:00 2001 From: dginovker Date: Thu, 20 Jun 2019 11:02:00 -0400 Subject: [PATCH] Added highscores --- 2006Redone Server/data/characters/irdb.txt | 32 +- 2006Redone Server/data/characters/irdb1.txt | 195 +++++ 2006Redone Server/data/characters/irdb2.txt | 195 +++++ 2006Redone Server/data/characters/irdb3.txt | 195 +++++ 2006Redone Server/data/characters/irdb4.txt | 195 +++++ .../src/redone/game/items/ItemAssistant.java | 11 + .../game/players/HighscoresHandler.java | 60 ++ .../redone/game/players/PlayerAssistant.java | 14 +- .../src/redone/game/players/PlayerSave.java | 677 ++++++++++-------- .../src/redone/net/packets/impl/Commands.java | 41 +- 10 files changed, 1301 insertions(+), 314 deletions(-) create mode 100644 2006Redone Server/data/characters/irdb1.txt create mode 100644 2006Redone Server/data/characters/irdb2.txt create mode 100644 2006Redone Server/data/characters/irdb3.txt create mode 100644 2006Redone Server/data/characters/irdb4.txt create mode 100644 2006Redone Server/src/redone/game/players/HighscoresHandler.java diff --git a/2006Redone Server/data/characters/irdb.txt b/2006Redone Server/data/characters/irdb.txt index 2c10e550..d6f808cc 100644 --- a/2006Redone Server/data/characters/irdb.txt +++ b/2006Redone Server/data/characters/irdb.txt @@ -4,8 +4,8 @@ character-password = pwjojo [CHARACTER] character-height = 2 -character-posx = 3209 -character-posy = 3215 +character-posx = 3210 +character-posy = 3219 character-rights = 0 hasStarter = false bankPin1 = 0 @@ -15,7 +15,7 @@ bankPin4 = 0 hasBankpin = false pinRegisteredDeleteDay = 0 requestPinDelete = false -lastLoginDate = 20190519 +lastLoginDate = 20190520 setPin = false hasPaid = false lostCannon = false @@ -34,7 +34,7 @@ brightness = 3 closeTutorialInterface = true canWalkTutorial = true village = false -lastThieve = 0 +lastThieve = 1561040960580 homeTele = 0 strongHold = false character-energy = 100 @@ -55,8 +55,8 @@ blackMarks = 0 tutorial-progress = 36 skull-timer = 0 recoilHits = 0 -lastX = 3209 -lastY = 3215 +lastX = 3210 +lastY = 3219 lastH = 2 removedTask0 = -1 removedTask1 = -1 @@ -156,7 +156,7 @@ character-skill = 13 1 0 character-skill = 14 1 0 character-skill = 15 1 0 character-skill = 16 1 0 -character-skill = 17 1 0 +character-skill = 17 1 40 character-skill = 18 1 0 character-skill = 19 1 0 character-skill = 20 1 0 @@ -166,20 +166,24 @@ character-skill = 23 1 0 character-skill = 24 1 0 [ITEMS] -character-item = 0 1352 1 -character-item = 1 591 1 +character-item = 0 996 1 character-item = 2 304 1 character-item = 3 316 1 -character-item = 4 1926 1 character-item = 5 1932 1 character-item = 6 2310 1 character-item = 7 1266 1 -character-item = 8 1206 1 -character-item = 12 883 25 -character-item = 16 558 4 -character-item = 17 560 2 +character-item = 16 558 3 +character-item = 17 560 1 [BANK] +character-bank = 0 1352 1 +character-bank = 1 591 1 +character-bank = 2 883 25 +character-bank = 3 558 1 +character-bank = 4 560 1 +character-bank = 5 1926 1 +character-bank = 6 1206 1 +character-bank = 7 996 2 [FRIENDS] diff --git a/2006Redone Server/data/characters/irdb1.txt b/2006Redone Server/data/characters/irdb1.txt new file mode 100644 index 00000000..0916dee4 --- /dev/null +++ b/2006Redone Server/data/characters/irdb1.txt @@ -0,0 +1,195 @@ +[ACCOUNT] +character-username = irdb1 +character-password = pwjojo + +[CHARACTER] +character-height = 0 +character-posx = 3234 +character-posy = 3226 +character-rights = 0 +hasStarter = false +bankPin1 = 0 +bankPin2 = 0 +bankPin3 = 0 +bankPin4 = 0 +hasBankpin = false +pinRegisteredDeleteDay = 0 +requestPinDelete = false +lastLoginDate = 20190520 +setPin = false +hasPaid = false +lostCannon = false +cannonX = 0 +cannonY = 0 +myBalls = 0 +poison = false +spiritTree = false +npcCanAttack = true +rope = false +rope2 = false +recievedMask = false +recievedReward = false +isBotting = false +brightness = 3 +closeTutorialInterface = true +canWalkTutorial = true +village = false +lastThieve = 0 +homeTele = 0 +strongHold = false +character-energy = 100 +crystal-bow-shots = 0 +splitChat = false +canSpeak = true +barrowsNpcs = 0 0 +barrowsNpcs = 1 0 +barrowsNpcs = 2 0 +barrowsNpcs = 3 0 +barrowsNpcs = 4 0 +barrowsNpcs = 5 0 +questStages = 0 +SlayerMaster = 0 +music = false false false false false false true false false false false false false false false false false false false false false false false false false false false false true false false false false false false false false false false false false false false false false false false false false false +randomActions = 0 +blackMarks = 0 +tutorial-progress = 36 +skull-timer = 0 +recoilHits = 0 +lastX = 3234 +lastY = 3226 +lastH = 0 +removedTask0 = -1 +removedTask1 = -1 +removedTask2 = -1 +removedTask3 = -1 +creationAddress = +has-npc = false +summonId = 0 +thankedForDonation = 0 +membership = false +questPoints = 0 +bananas = 0 +magic-book = 0 +special-amount = 0.5 +musicOn = true +needsNewTask = false +luthas = false +selected-coffin = 0 +runeMist = 0 +cookAss = 0 +pirateTreasure = 0 +ptjob = 0 +doricQuest = 0 +dragonSlayerQuestStage = 0 +impsC = 0 +knightS = 0 +sheepShear = 0 +romeo-juliet = 0 +gertCat = 0 +cw-games = 0 +witchspot = 0 +restGhost = 0 +vampSlayer = 0 +RatDied2 = false +teleblock-length = 0 +pc-points = 0 +lastYell = 0 +slayerTask = 0 +taskAmount = 0 +magePoints = 0 +autoRet = 0 +barrowsKillCount = 0 +slayerPoints = 0 +flagged = false +wave = 0 +gwkc = 0 +isRunning = false +fightMode = 0 +void = 0 0 0 0 0 + +[EQUIPMENT] +character-equip = 0 -1 1 +character-equip = 1 -1 1 +character-equip = 2 -1 1 +character-equip = 3 -1 0 +character-equip = 4 -1 1 +character-equip = 5 -1 1 +character-equip = 6 -1 0 +character-equip = 7 -1 1 +character-equip = 8 -1 0 +character-equip = 9 -1 1 +character-equip = 10 -1 1 +character-equip = 11 -1 0 +character-equip = 12 -1 1 +character-equip = 13 -1 0 + +[LOOK] +character-look = 0 0 +character-look = 1 0 +character-look = 2 18 +character-look = 3 26 +character-look = 4 33 +character-look = 5 36 +character-look = 6 42 +character-look = 7 10 +character-look = 8 0 +character-look = 9 0 +character-look = 10 0 +character-look = 11 0 +character-look = 12 0 + +[SKILLS] +character-skill = 0 1 0 +character-skill = 1 1 0 +character-skill = 2 1 0 +character-skill = 3 10 1300 +character-skill = 4 1 0 +character-skill = 5 1 0 +character-skill = 6 1 0 +character-skill = 7 1 0 +character-skill = 8 1 0 +character-skill = 9 1 0 +character-skill = 10 1 0 +character-skill = 11 1 0 +character-skill = 12 1 0 +character-skill = 13 1 0 +character-skill = 14 1 0 +character-skill = 15 1 0 +character-skill = 16 1 0 +character-skill = 17 1 0 +character-skill = 18 1 0 +character-skill = 19 1 0 +character-skill = 20 1 0 +character-skill = 21 1 0 +character-skill = 22 1 0 +character-skill = 23 1 0 +character-skill = 24 1 0 + +[ITEMS] +character-item = 0 1352 1 +character-item = 1 591 1 +character-item = 2 304 1 +character-item = 3 316 1 +character-item = 4 1926 1 +character-item = 5 1932 1 +character-item = 6 2310 1 +character-item = 7 1266 1 +character-item = 8 1206 1 +character-item = 9 1278 1 +character-item = 10 1172 1 +character-item = 11 842 1 +character-item = 12 883 25 +character-item = 13 557 25 +character-item = 14 559 15 +character-item = 15 556 6 +character-item = 16 558 4 +character-item = 17 560 2 + +[BANK] + +[FRIENDS] + +[IGNORES] + +[EOF] + diff --git a/2006Redone Server/data/characters/irdb2.txt b/2006Redone Server/data/characters/irdb2.txt new file mode 100644 index 00000000..a20f97e2 --- /dev/null +++ b/2006Redone Server/data/characters/irdb2.txt @@ -0,0 +1,195 @@ +[ACCOUNT] +character-username = irdb2 +character-password = pwjojo + +[CHARACTER] +character-height = 0 +character-posx = 3233 +character-posy = 3229 +character-rights = 0 +hasStarter = false +bankPin1 = 0 +bankPin2 = 0 +bankPin3 = 0 +bankPin4 = 0 +hasBankpin = false +pinRegisteredDeleteDay = 0 +requestPinDelete = false +lastLoginDate = 20190520 +setPin = false +hasPaid = false +lostCannon = false +cannonX = 0 +cannonY = 0 +myBalls = 0 +poison = false +spiritTree = false +npcCanAttack = true +rope = false +rope2 = false +recievedMask = false +recievedReward = false +isBotting = false +brightness = 3 +closeTutorialInterface = false +canWalkTutorial = true +village = false +lastThieve = 0 +homeTele = 0 +strongHold = false +character-energy = 100 +crystal-bow-shots = 0 +splitChat = false +canSpeak = true +barrowsNpcs = 0 0 +barrowsNpcs = 1 0 +barrowsNpcs = 2 0 +barrowsNpcs = 3 0 +barrowsNpcs = 4 0 +barrowsNpcs = 5 0 +questStages = 0 +SlayerMaster = 0 +music = false false false false false false true false false false false false false false false false false false false false false false false false false false false false true false false false false false false false false false false false false false false false false false false false false false +randomActions = 0 +blackMarks = 0 +tutorial-progress = 36 +skull-timer = 0 +recoilHits = 0 +lastX = 3233 +lastY = 3229 +lastH = 0 +removedTask0 = -1 +removedTask1 = -1 +removedTask2 = -1 +removedTask3 = -1 +creationAddress = +has-npc = false +summonId = 0 +thankedForDonation = 0 +membership = false +questPoints = 0 +bananas = 0 +magic-book = 0 +special-amount = 0.0 +musicOn = true +needsNewTask = false +luthas = false +selected-coffin = 0 +runeMist = 0 +cookAss = 0 +pirateTreasure = 0 +ptjob = 0 +doricQuest = 0 +dragonSlayerQuestStage = 0 +impsC = 0 +knightS = 0 +sheepShear = 0 +romeo-juliet = 0 +gertCat = 0 +cw-games = 0 +witchspot = 0 +restGhost = 0 +vampSlayer = 0 +RatDied2 = false +teleblock-length = 0 +pc-points = 0 +lastYell = 0 +slayerTask = 0 +taskAmount = 0 +magePoints = 0 +autoRet = 0 +barrowsKillCount = 0 +slayerPoints = 0 +flagged = false +wave = 0 +gwkc = 0 +isRunning = false +fightMode = 0 +void = 0 0 0 0 0 + +[EQUIPMENT] +character-equip = 0 -1 1 +character-equip = 1 -1 1 +character-equip = 2 -1 1 +character-equip = 3 -1 0 +character-equip = 4 -1 1 +character-equip = 5 -1 1 +character-equip = 6 -1 0 +character-equip = 7 -1 1 +character-equip = 8 -1 0 +character-equip = 9 -1 1 +character-equip = 10 -1 1 +character-equip = 11 -1 0 +character-equip = 12 -1 1 +character-equip = 13 -1 0 + +[LOOK] +character-look = 0 0 +character-look = 1 7 +character-look = 2 25 +character-look = 3 29 +character-look = 4 35 +character-look = 5 39 +character-look = 6 44 +character-look = 7 14 +character-look = 8 7 +character-look = 9 8 +character-look = 10 9 +character-look = 11 5 +character-look = 12 0 + +[SKILLS] +character-skill = 0 1 0 +character-skill = 1 1 0 +character-skill = 2 1 0 +character-skill = 3 10 1300 +character-skill = 4 1 0 +character-skill = 5 1 0 +character-skill = 6 1 0 +character-skill = 7 1 0 +character-skill = 8 1 0 +character-skill = 9 1 0 +character-skill = 10 1 0 +character-skill = 11 1 0 +character-skill = 12 1 0 +character-skill = 13 1 0 +character-skill = 14 1 0 +character-skill = 15 1 0 +character-skill = 16 1 0 +character-skill = 17 1 0 +character-skill = 18 1 0 +character-skill = 19 1 0 +character-skill = 20 1 0 +character-skill = 21 1 0 +character-skill = 22 1 0 +character-skill = 23 1 0 +character-skill = 24 1 0 + +[ITEMS] +character-item = 0 1352 1 +character-item = 1 591 1 +character-item = 2 304 1 +character-item = 3 316 1 +character-item = 4 1926 1 +character-item = 5 1932 1 +character-item = 6 2310 1 +character-item = 7 1266 1 +character-item = 8 1206 1 +character-item = 9 1278 1 +character-item = 10 1172 1 +character-item = 11 842 1 +character-item = 12 883 25 +character-item = 13 557 25 +character-item = 14 559 15 +character-item = 15 556 6 +character-item = 16 558 4 +character-item = 17 560 2 + +[BANK] + +[FRIENDS] + +[IGNORES] + +[EOF] + diff --git a/2006Redone Server/data/characters/irdb3.txt b/2006Redone Server/data/characters/irdb3.txt new file mode 100644 index 00000000..8a400b76 --- /dev/null +++ b/2006Redone Server/data/characters/irdb3.txt @@ -0,0 +1,195 @@ +[ACCOUNT] +character-username = irdb3 +character-password = pwjojo + +[CHARACTER] +character-height = 0 +character-posx = 3233 +character-posy = 3229 +character-rights = 0 +hasStarter = false +bankPin1 = 0 +bankPin2 = 0 +bankPin3 = 0 +bankPin4 = 0 +hasBankpin = false +pinRegisteredDeleteDay = 0 +requestPinDelete = false +lastLoginDate = 20190520 +setPin = false +hasPaid = false +lostCannon = false +cannonX = 0 +cannonY = 0 +myBalls = 0 +poison = false +spiritTree = false +npcCanAttack = true +rope = false +rope2 = false +recievedMask = false +recievedReward = false +isBotting = false +brightness = 3 +closeTutorialInterface = false +canWalkTutorial = true +village = false +lastThieve = 0 +homeTele = 0 +strongHold = false +character-energy = 100 +crystal-bow-shots = 0 +splitChat = false +canSpeak = true +barrowsNpcs = 0 0 +barrowsNpcs = 1 0 +barrowsNpcs = 2 0 +barrowsNpcs = 3 0 +barrowsNpcs = 4 0 +barrowsNpcs = 5 0 +questStages = 0 +SlayerMaster = 0 +music = false false false false false false true false false false false false false false false false false false false false false false false false false false false false true false false false false false false false false false false false false false false false false false false false false false +randomActions = 0 +blackMarks = 0 +tutorial-progress = 36 +skull-timer = 0 +recoilHits = 0 +lastX = 3233 +lastY = 3229 +lastH = 0 +removedTask0 = -1 +removedTask1 = -1 +removedTask2 = -1 +removedTask3 = -1 +creationAddress = +has-npc = false +summonId = 0 +thankedForDonation = 0 +membership = false +questPoints = 0 +bananas = 0 +magic-book = 0 +special-amount = 0.0 +musicOn = true +needsNewTask = false +luthas = false +selected-coffin = 0 +runeMist = 0 +cookAss = 0 +pirateTreasure = 0 +ptjob = 0 +doricQuest = 0 +dragonSlayerQuestStage = 0 +impsC = 0 +knightS = 0 +sheepShear = 0 +romeo-juliet = 0 +gertCat = 0 +cw-games = 0 +witchspot = 0 +restGhost = 0 +vampSlayer = 0 +RatDied2 = false +teleblock-length = 0 +pc-points = 0 +lastYell = 0 +slayerTask = 0 +taskAmount = 0 +magePoints = 0 +autoRet = 0 +barrowsKillCount = 0 +slayerPoints = 0 +flagged = false +wave = 0 +gwkc = 0 +isRunning = false +fightMode = 0 +void = 0 0 0 0 0 + +[EQUIPMENT] +character-equip = 0 -1 1 +character-equip = 1 -1 1 +character-equip = 2 -1 1 +character-equip = 3 -1 0 +character-equip = 4 -1 1 +character-equip = 5 -1 1 +character-equip = 6 -1 0 +character-equip = 7 -1 1 +character-equip = 8 -1 0 +character-equip = 9 -1 1 +character-equip = 10 -1 1 +character-equip = 11 -1 0 +character-equip = 12 -1 1 +character-equip = 13 -1 0 + +[LOOK] +character-look = 0 0 +character-look = 1 7 +character-look = 2 25 +character-look = 3 29 +character-look = 4 35 +character-look = 5 39 +character-look = 6 44 +character-look = 7 14 +character-look = 8 7 +character-look = 9 8 +character-look = 10 9 +character-look = 11 5 +character-look = 12 0 + +[SKILLS] +character-skill = 0 1 0 +character-skill = 1 1 0 +character-skill = 2 1 0 +character-skill = 3 10 1300 +character-skill = 4 1 0 +character-skill = 5 1 0 +character-skill = 6 1 0 +character-skill = 7 1 0 +character-skill = 8 1 0 +character-skill = 9 1 0 +character-skill = 10 1 0 +character-skill = 11 1 0 +character-skill = 12 1 0 +character-skill = 13 1 0 +character-skill = 14 1 0 +character-skill = 15 1 0 +character-skill = 16 1 0 +character-skill = 17 1 0 +character-skill = 18 1 0 +character-skill = 19 1 0 +character-skill = 20 1 0 +character-skill = 21 1 0 +character-skill = 22 1 0 +character-skill = 23 1 0 +character-skill = 24 1 0 + +[ITEMS] +character-item = 0 1352 1 +character-item = 1 591 1 +character-item = 2 304 1 +character-item = 3 316 1 +character-item = 4 1926 1 +character-item = 5 1932 1 +character-item = 6 2310 1 +character-item = 7 1266 1 +character-item = 8 1206 1 +character-item = 9 1278 1 +character-item = 10 1172 1 +character-item = 11 842 1 +character-item = 12 883 25 +character-item = 13 557 25 +character-item = 14 559 15 +character-item = 15 556 6 +character-item = 16 558 4 +character-item = 17 560 2 + +[BANK] + +[FRIENDS] + +[IGNORES] + +[EOF] + diff --git a/2006Redone Server/data/characters/irdb4.txt b/2006Redone Server/data/characters/irdb4.txt new file mode 100644 index 00000000..592a4991 --- /dev/null +++ b/2006Redone Server/data/characters/irdb4.txt @@ -0,0 +1,195 @@ +[ACCOUNT] +character-username = irdb4 +character-password = pwjojo + +[CHARACTER] +character-height = 0 +character-posx = 3233 +character-posy = 3229 +character-rights = 0 +hasStarter = false +bankPin1 = 0 +bankPin2 = 0 +bankPin3 = 0 +bankPin4 = 0 +hasBankpin = false +pinRegisteredDeleteDay = 0 +requestPinDelete = false +lastLoginDate = 20190520 +setPin = false +hasPaid = false +lostCannon = false +cannonX = 0 +cannonY = 0 +myBalls = 0 +poison = false +spiritTree = false +npcCanAttack = true +rope = false +rope2 = false +recievedMask = false +recievedReward = false +isBotting = false +brightness = 3 +closeTutorialInterface = false +canWalkTutorial = true +village = false +lastThieve = 0 +homeTele = 0 +strongHold = false +character-energy = 100 +crystal-bow-shots = 0 +splitChat = false +canSpeak = true +barrowsNpcs = 0 0 +barrowsNpcs = 1 0 +barrowsNpcs = 2 0 +barrowsNpcs = 3 0 +barrowsNpcs = 4 0 +barrowsNpcs = 5 0 +questStages = 0 +SlayerMaster = 0 +music = false false false false false false true false false false false false false false false false false false false false false false false false false false false false true false false false false false false false false false false false false false false false false false false false false false +randomActions = 0 +blackMarks = 0 +tutorial-progress = 36 +skull-timer = 0 +recoilHits = 0 +lastX = 3233 +lastY = 3229 +lastH = 0 +removedTask0 = -1 +removedTask1 = -1 +removedTask2 = -1 +removedTask3 = -1 +creationAddress = +has-npc = false +summonId = 0 +thankedForDonation = 0 +membership = false +questPoints = 0 +bananas = 0 +magic-book = 0 +special-amount = 0.0 +musicOn = true +needsNewTask = false +luthas = false +selected-coffin = 0 +runeMist = 0 +cookAss = 0 +pirateTreasure = 0 +ptjob = 0 +doricQuest = 0 +dragonSlayerQuestStage = 0 +impsC = 0 +knightS = 0 +sheepShear = 0 +romeo-juliet = 0 +gertCat = 0 +cw-games = 0 +witchspot = 0 +restGhost = 0 +vampSlayer = 0 +RatDied2 = false +teleblock-length = 0 +pc-points = 0 +lastYell = 0 +slayerTask = 0 +taskAmount = 0 +magePoints = 0 +autoRet = 0 +barrowsKillCount = 0 +slayerPoints = 0 +flagged = false +wave = 0 +gwkc = 0 +isRunning = false +fightMode = 0 +void = 0 0 0 0 0 + +[EQUIPMENT] +character-equip = 0 -1 1 +character-equip = 1 -1 1 +character-equip = 2 -1 1 +character-equip = 3 -1 0 +character-equip = 4 -1 1 +character-equip = 5 -1 1 +character-equip = 6 -1 0 +character-equip = 7 -1 1 +character-equip = 8 -1 0 +character-equip = 9 -1 1 +character-equip = 10 -1 1 +character-equip = 11 -1 0 +character-equip = 12 -1 1 +character-equip = 13 -1 0 + +[LOOK] +character-look = 0 0 +character-look = 1 7 +character-look = 2 25 +character-look = 3 29 +character-look = 4 35 +character-look = 5 39 +character-look = 6 44 +character-look = 7 14 +character-look = 8 7 +character-look = 9 8 +character-look = 10 9 +character-look = 11 5 +character-look = 12 0 + +[SKILLS] +character-skill = 0 1 0 +character-skill = 1 1 0 +character-skill = 2 1 0 +character-skill = 3 10 1300 +character-skill = 4 1 0 +character-skill = 5 1 0 +character-skill = 6 1 0 +character-skill = 7 1 0 +character-skill = 8 1 0 +character-skill = 9 1 0 +character-skill = 10 1 0 +character-skill = 11 1 0 +character-skill = 12 1 0 +character-skill = 13 1 0 +character-skill = 14 1 0 +character-skill = 15 1 0 +character-skill = 16 1 0 +character-skill = 17 1 0 +character-skill = 18 1 0 +character-skill = 19 1 0 +character-skill = 20 1 0 +character-skill = 21 1 0 +character-skill = 22 1 0 +character-skill = 23 1 0 +character-skill = 24 1 0 + +[ITEMS] +character-item = 0 1352 1 +character-item = 1 591 1 +character-item = 2 304 1 +character-item = 3 316 1 +character-item = 4 1926 1 +character-item = 5 1932 1 +character-item = 6 2310 1 +character-item = 7 1266 1 +character-item = 8 1206 1 +character-item = 9 1278 1 +character-item = 10 1172 1 +character-item = 11 842 1 +character-item = 12 883 25 +character-item = 13 557 25 +character-item = 14 559 15 +character-item = 15 556 6 +character-item = 16 558 4 +character-item = 17 560 2 + +[BANK] + +[FRIENDS] + +[IGNORES] + +[EOF] + diff --git a/2006Redone Server/src/redone/game/items/ItemAssistant.java b/2006Redone Server/src/redone/game/items/ItemAssistant.java index 8e6d6741..19705927 100644 --- a/2006Redone Server/src/redone/game/items/ItemAssistant.java +++ b/2006Redone Server/src/redone/game/items/ItemAssistant.java @@ -2337,6 +2337,17 @@ public class ItemAssistant { return freeS; } + public int getBankQuantitiy(int itemID) + { + for (int i = 0; i < c.bankItems.length; i++) { + if (c.bankItems[i] == itemID) + { + return c.bankItemsN[i]; + } + } + return 0; + } + public void fromBank(int itemID, int fromSlot, int amount) { if (amount > 0) { if (c.bankItems[fromSlot] > 0) { diff --git a/2006Redone Server/src/redone/game/players/HighscoresHandler.java b/2006Redone Server/src/redone/game/players/HighscoresHandler.java new file mode 100644 index 00000000..0c4202db --- /dev/null +++ b/2006Redone Server/src/redone/game/players/HighscoresHandler.java @@ -0,0 +1,60 @@ +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; + +public class HighscoresHandler { + public ArrayList players = new ArrayList<>(); + + public HighscoresHandler() { + File dir = new File("./data/characters"); + File[] directoryListing = dir.listFiles(); + for (File child : directoryListing) { + Client player = new Client(null, -1); + player.playerName = child.getName().split("\\.")[0]; + loadPlayerInfo(player, child.getName().split("\\.")[0], "", false); + players.add(player); + } + } + + public String getRank(int i, String sortBy) { + switch (sortBy) + { + case "level": + players.sort(new totalLevelComparator()); + return players.get(i).playerName + ": " + players.get(i).getPlayerAssistant().getTotalLevel(); + case "gold": + 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; + } + } + + private class totalLevelComparator implements Comparator { + @Override + public int compare(Client client, Client t1) { + return - client.getPlayerAssistant().getTotalLevel() + t1.getPlayerAssistant().getTotalLevel(); + } + } + + private class totalGoldComparator implements Comparator { + @Override + public int compare(Client client, Client t1) { + return - client.getPlayerAssistant().totalGold() + t1.getPlayerAssistant().totalGold(); + } + } + + private class totalDmgComparator implements Comparator { + @Override + public int compare(Client client, Client t1) { + return - client.totalDamageDealt + t1.totalDamageDealt; + } + } + +} diff --git a/2006Redone Server/src/redone/game/players/PlayerAssistant.java b/2006Redone Server/src/redone/game/players/PlayerAssistant.java index 3cf4234f..bb2b7ce9 100644 --- a/2006Redone Server/src/redone/game/players/PlayerAssistant.java +++ b/2006Redone Server/src/redone/game/players/PlayerAssistant.java @@ -2455,9 +2455,9 @@ public class PlayerAssistant { } } - public void levelUp(int skill) { - SkillHandler.resetSkills(player); - int totalLevel = getLevelForXP(player.playerXP[0]) + public int getTotalLevel() + { + return getLevelForXP(player.playerXP[0]) + getLevelForXP(player.playerXP[1]) + getLevelForXP(player.playerXP[2]) + getLevelForXP(player.playerXP[3]) @@ -2478,8 +2478,11 @@ public class PlayerAssistant { + getLevelForXP(player.playerXP[18]) + getLevelForXP(player.playerXP[19]) + getLevelForXP(player.playerXP[20]); + } - sendFrame126("Total Lvl: " + totalLevel, 3984); + public void levelUp(int skill) { + SkillHandler.resetSkills(player); + sendFrame126("Total Lvl: " + getTotalLevel(), 3984); switch (skill) { case 0: sendFrame126("Congratulations, you just advanced an attack level!", @@ -3328,4 +3331,7 @@ public class PlayerAssistant { } } + public int totalGold() { + return player.getItemAssistant().getBankQuantitiy(996) + player.getItemAssistant().getItemAmount(995); + } } diff --git a/2006Redone Server/src/redone/game/players/PlayerSave.java b/2006Redone Server/src/redone/game/players/PlayerSave.java index e4d0172f..1902c322 100644 --- a/2006Redone Server/src/redone/game/players/PlayerSave.java +++ b/2006Redone Server/src/redone/game/players/PlayerSave.java @@ -14,8 +14,12 @@ public class PlayerSave { /** * Loading **/ - public static int loadGame(Client player, String playerName, - String playerPass) { + public static int loadGame(Client player, String playerName, String playerPass) { + return loadPlayerInfo(player, playerName, playerPass, true); + } + + public static int loadPlayerInfo(Client player, String playerName, String playerPass, boolean doRealLogin) + { String line = ""; String token = ""; String token2 = ""; @@ -55,287 +59,399 @@ public class PlayerSave { token2 = token2.trim(); token3 = token2.split("\t"); switch (ReadMode) { - case 1: - if (token.equals("character-password")) { - if (playerPass.equalsIgnoreCase(token2)) { - playerPass = token2; - } else { - return 3; + case 1: + if (!doRealLogin) + break; + if (token.equals("character-password")) { + if (playerPass.equalsIgnoreCase(token2)) { + playerPass = token2; + } else { + return 3; + } } - } - break; - case 2: - if (token.equals("character-height")) { - player.heightLevel = Integer.parseInt(token2); - } else if (token.equals("character-posx")) { - player.teleportToX = Integer.parseInt(token2) <= 0 ? player.lastX : Integer.parseInt(token2); - } else if (token.equals("character-posy")) { - player.teleportToY = Integer.parseInt(token2) <= 0 ? player.lastY : Integer.parseInt(token2); - } else if (token.equals("character-rights")) { - player.playerRights = Integer.parseInt(token2); - } else if (token.equals("blackMarks")) { - player.blackMarks = Integer.parseInt(token2); - } else if (token.equals("lostCannon")) { - player.lostCannon = Boolean.parseBoolean(token2); - } else if (token.equals("myBalls")) { - player.getCannon().myBalls = Integer.parseInt(token2); - } else if (token.equals("cannonX")) { - player.cannonX = Integer.parseInt(token2); - } else if (token.equals("cannonY")) { - player.cannonY = Integer.parseInt(token2); - } else if (token.equals("removedTask0")) { - player.removedTasks[0] = Integer.parseInt(token2); - } else if (token.equals("removedTask1")) { - player.removedTasks[1] = Integer.parseInt(token2); - } else if (token.equals("removedTask2")) { - player.removedTasks[2] = Integer.parseInt(token2); - } else if (token.equals("removedTask3")) { - player.removedTasks[3] = Integer.parseInt(token2); - } else if (token.equals("SlayerMaster")) { - player.SlayerMaster = Integer.parseInt(token2); - } else if (token.equals("slayerTask")) { - player.slayerTask = Integer.parseInt(token2); - } else if (token.equals("slayerPoints")) { - player.slayerPoints = Integer.parseInt(token2); - } else if (token.equals("taskAmount")) { - player.taskAmount = Integer.parseInt(token2); - } else if (token.equals("cw-games")) { - player.cwGames = Integer.parseInt(token2); - } else if (token.equals("crystal-bow-shots")) { - player.crystalBowArrowCount = Integer.parseInt(token2); - } else if (token.equals("randomActions")) { - player.randomActions = Integer.parseInt(token2); - } else if (token.equals("skull-timer")) { - player.skullTimer = Integer.parseInt(token2); - } else if (token.equals("recoilHits")) { - player.recoilHits = Integer.parseInt(token2); - } else if (token.equals("brightness")) { - player.brightness = Integer.parseInt(token2); - } else if (token.equals("spiritTree")) { - player.spiritTree = Boolean.parseBoolean(token2); - } else if (token.equals("npcCanAttack")) { - player.npcCanAttack = Boolean.parseBoolean(token2); - } else if (token.equals("rope")) { - player.rope = Boolean.parseBoolean(token2); - } else if (token.equals("rope2")) { - player.rope2 = Boolean.parseBoolean(token2); - } else if (token.equals("recievedMask")) { - player.recievedMask = Boolean.parseBoolean(token2); - } else if (token.equals("recievedReward")) { - player.recievedReward = Boolean.parseBoolean(token2); - } else if (token.equals("splitChat")) { - player.splitChat = Boolean.parseBoolean(token2); - } else if (token.equals("hasPaid")) { - player.hasPaid = Boolean.parseBoolean(token2); - } else if (token.equals("poison")) { - player.poison = Boolean.parseBoolean(token2); - } else if (token.equals("closeTutorialInterface")) { - player.closeTutorialInterface = Boolean - .parseBoolean(token2); - } else if (token.equals("canWalkTutorial")) { - player.canWalkTutorial = Boolean.parseBoolean(token2); - } else if (token.equals("needsNewTask")) { - player.needsNewTask = Boolean.parseBoolean(token2); - } else if (token.equals("isBotting")) { - player.isBotting = Boolean.parseBoolean(token2); - } else if (token.equals("musicOn")) { - player.musicOn = Boolean.parseBoolean(token2); - } else if (token.equals("barrowsNpcs")) { - player.barrowsNpcs[Integer.parseInt(token3[0])][1] = Integer.parseInt(token3[1]); - } else if (token.equals("summonId")) { - player.summonId = Integer.parseInt(token2); - } else if (token.equals("has-npc")) { - player.hasNpc = Boolean.parseBoolean(token2); - } else if (token.equals("barrowsKillCount")) { - player.barrowsKillCount = Integer.parseInt(token2); - } else if (token.equals("luthas")) { - player.luthas = Boolean.parseBoolean(token2); - } else if (token.equals("village")) { - player.village = Boolean.parseBoolean(token2); - } else if (token.equals("lastThieve")) { - player.lastThieve = Long.parseLong(token2); - } else if (token.equals("homeTele")) { - player.homeTele = Long.parseLong(token2); - } else if (token.equals("tutorial-progress")) { - player.tutorialProgress = Integer.parseInt(token2); - } else if (token.equals("strongHold")) { - player.strongHold = Boolean.parseBoolean(token2); - } else if (token.equals("filter")) { - player.filter = Boolean.parseBoolean(token2); - } else if (token.equals("ratdied2")) { - player.ratdied2 = Boolean.parseBoolean(token2); - } else if (token.equals("questStages")) { - player.questStages = Integer.parseInt(token2); - } else if (token.equals("cookAss")) { - player.cookAss = Integer.parseInt(token2); - } else if (token.equals("bananas")) { - player.bananas = Integer.parseInt(token2); - } else if (token.equals("sheepShear")) { - player.sheepShear = Integer.parseInt(token2); - } else if (token.equals("runeMist")) { - player.runeMist = Integer.parseInt(token2); - } else if (token.equals("dragonSlayerQuestStage")) { - player.dragonSlayerQuestStage = Integer.parseInt(token2); - } else if (token.equals("doricQuest")) { - player.doricQuest = Integer.parseInt(token2); - } else if (token.equals("pirateTreasure")) { - player.pirateTreasure = Integer.parseInt(token2); - } else if (token.equals("romeo-juliet")) { - player.romeojuliet = Integer.parseInt(token2); - } else if (token.equals("vampSlayer")) { - player.vampSlayer = Integer.parseInt(token2); - } else if (token.equals("gertCat")) { - player.gertCat = Integer.parseInt(token2); - } else if (token.equals("witchspot")) { - player.witchspot = Integer.parseInt(token2); - } else if (token.equals("restGhost")) { - player.restGhost = Integer.parseInt(token2); - } else if (token.equals("impsC")) { - player.impsC = Integer.parseInt(token2); - } else if (token.equals("knightS")) { - player.knightS = Integer.parseInt(token2); - } else if (token.equals("lastX")) { - player.lastX = Integer.parseInt(token2); - } else if (token.equals("lastY")) { - player.lastY = Integer.parseInt(token2); - } else if (token.equals("lastH")) { - player.lastH = Integer.parseInt(token2); - } else if (token.equals("hasStarter")) { - player.hasStarter = Boolean.parseBoolean(token2); - } else if (token.equals("thankedForDonation")) { - player.thankedForDonation = Integer.parseInt(token2); - } else if (token.equals("membership")) { - player.membership = Boolean.parseBoolean(token2); - } else if (token.equals("canSpeak")) { - player.canSpeak = Boolean.parseBoolean(token2); - } else if (token.equals("questPoints")) { - player.questPoints = Integer.parseInt(token2); - } else if (token.equals("magic-book")) { - player.playerMagicBook = Integer.parseInt(token2); - } else if (token.equals("special-amount")) { - player.specAmount = Double.parseDouble(token2); - } else if (token.equals("selected-coffin")) { - player.randomCoffin = Integer.parseInt(token2); - } else if (token.equals("isRunning")) { - player.isRunning2 = Boolean.parseBoolean(token2); - } else if (token.equals("character-energy")) { - player.playerEnergy = Integer.parseInt(token2); - } else if (token.equals("teleblock-length")) { - player.teleBlockDelay = System.currentTimeMillis(); - player.teleBlockLength = Integer.parseInt(token2); - } else if (token.equals("lastYell")) { - player.lastYell = Long.parseLong(token2); - } else if (token.equals("pc-points")) { - player.pcPoints = Integer.parseInt(token2); - } else if (token.equals("magePoints")) { - player.magePoints = Integer.parseInt(token2); - } else if (token.equals("autoRet")) { - player.autoRet = Integer.parseInt(token2); - } else if (token.equals("flagged")) { - player.accountFlagged = Boolean.parseBoolean(token2); - } else if (token.equals("lastLoginDate")) { - player.lastLoginDate = Integer.parseInt(token2); - } else if (token.equals("hasBankpin")) { - player.hasBankpin = Boolean.parseBoolean(token2); - } else if (token.equals("setPin")) { - player.setPin = Boolean.parseBoolean(token2); - } else if (token.equals("pinRegisteredDeleteDay")) { - player.pinDeleteDateRequested = Integer.parseInt(token2); - } else if (token.equals("requestPinDelete")) { - player.requestPinDelete = Boolean.parseBoolean(token2); - } else if (token.equals("bankPin1")) { - player.bankPin1 = Integer.parseInt(token2); - } else if (token.equals("bankPin2")) { - player.bankPin2 = Integer.parseInt(token2); - } else if (token.equals("bankPin3")) { - player.bankPin3 = Integer.parseInt(token2); - } else if (token.equals("bankPin4")) { - player.bankPin4 = Integer.parseInt(token2); - } else if (token.equals("wave")) { - player.waveId = Integer.parseInt(token2); - } else if (token.equals("ptjob")) { - player.ptjob = Integer.parseInt(token2); - } else if (token.equals("creationAddress")) { - player.creationAddress = token2; - } else if (token.equals("music")) { - for (int j = 0; j < token3.length; j++) { - player.getPlayList().unlocked[j] = Boolean.parseBoolean(token3[j]); + break; + case 2: + switch (token) { + case "character-height": + player.heightLevel = Integer.parseInt(token2); + break; + case "character-posx": + player.teleportToX = Integer.parseInt(token2) <= 0 ? player.lastX : Integer.parseInt(token2); + break; + case "character-posy": + player.teleportToY = Integer.parseInt(token2) <= 0 ? player.lastY : Integer.parseInt(token2); + break; + case "character-rights": + player.playerRights = Integer.parseInt(token2); + break; + case "blackMarks": + player.blackMarks = Integer.parseInt(token2); + break; + case "lostCannon": + player.lostCannon = Boolean.parseBoolean(token2); + break; + case "myBalls": + player.getCannon().myBalls = Integer.parseInt(token2); + break; + case "cannonX": + player.cannonX = Integer.parseInt(token2); + break; + case "cannonY": + player.cannonY = Integer.parseInt(token2); + break; + case "removedTask0": + player.removedTasks[0] = Integer.parseInt(token2); + break; + case "removedTask1": + player.removedTasks[1] = Integer.parseInt(token2); + break; + case "removedTask2": + player.removedTasks[2] = Integer.parseInt(token2); + break; + case "removedTask3": + player.removedTasks[3] = Integer.parseInt(token2); + break; + case "SlayerMaster": + player.SlayerMaster = Integer.parseInt(token2); + break; + case "slayerTask": + player.slayerTask = Integer.parseInt(token2); + break; + case "slayerPoints": + player.slayerPoints = Integer.parseInt(token2); + break; + case "taskAmount": + player.taskAmount = Integer.parseInt(token2); + break; + case "cw-games": + player.cwGames = Integer.parseInt(token2); + break; + case "crystal-bow-shots": + player.crystalBowArrowCount = Integer.parseInt(token2); + break; + case "randomActions": + player.randomActions = Integer.parseInt(token2); + break; + case "skull-timer": + player.skullTimer = Integer.parseInt(token2); + break; + case "recoilHits": + player.recoilHits = Integer.parseInt(token2); + break; + case "brightness": + player.brightness = Integer.parseInt(token2); + break; + case "spiritTree": + player.spiritTree = Boolean.parseBoolean(token2); + break; + case "npcCanAttack": + player.npcCanAttack = Boolean.parseBoolean(token2); + break; + case "rope": + player.rope = Boolean.parseBoolean(token2); + break; + case "rope2": + player.rope2 = Boolean.parseBoolean(token2); + break; + case "recievedMask": + player.recievedMask = Boolean.parseBoolean(token2); + break; + case "recievedReward": + player.recievedReward = Boolean.parseBoolean(token2); + break; + case "splitChat": + player.splitChat = Boolean.parseBoolean(token2); + break; + case "hasPaid": + player.hasPaid = Boolean.parseBoolean(token2); + break; + case "poison": + player.poison = Boolean.parseBoolean(token2); + break; + case "closeTutorialInterface": + player.closeTutorialInterface = Boolean + .parseBoolean(token2); + break; + case "canWalkTutorial": + player.canWalkTutorial = Boolean.parseBoolean(token2); + break; + case "needsNewTask": + player.needsNewTask = Boolean.parseBoolean(token2); + break; + case "isBotting": + player.isBotting = Boolean.parseBoolean(token2); + break; + case "musicOn": + player.musicOn = Boolean.parseBoolean(token2); + break; + case "barrowsNpcs": + player.barrowsNpcs[Integer.parseInt(token3[0])][1] = Integer.parseInt(token3[1]); + break; + case "summonId": + player.summonId = Integer.parseInt(token2); + break; + case "has-npc": + player.hasNpc = Boolean.parseBoolean(token2); + break; + case "barrowsKillCount": + player.barrowsKillCount = Integer.parseInt(token2); + break; + case "luthas": + player.luthas = Boolean.parseBoolean(token2); + break; + case "village": + player.village = Boolean.parseBoolean(token2); + break; + case "lastThieve": + player.lastThieve = Long.parseLong(token2); + break; + case "homeTele": + player.homeTele = Long.parseLong(token2); + break; + case "tutorial-progress": + player.tutorialProgress = Integer.parseInt(token2); + break; + case "strongHold": + player.strongHold = Boolean.parseBoolean(token2); + break; + case "filter": + player.filter = Boolean.parseBoolean(token2); + break; + case "ratdied2": + player.ratdied2 = Boolean.parseBoolean(token2); + break; + case "questStages": + player.questStages = Integer.parseInt(token2); + break; + case "cookAss": + player.cookAss = Integer.parseInt(token2); + break; + case "bananas": + player.bananas = Integer.parseInt(token2); + break; + case "sheepShear": + player.sheepShear = Integer.parseInt(token2); + break; + case "runeMist": + player.runeMist = Integer.parseInt(token2); + break; + case "dragonSlayerQuestStage": + player.dragonSlayerQuestStage = Integer.parseInt(token2); + break; + case "doricQuest": + player.doricQuest = Integer.parseInt(token2); + break; + case "pirateTreasure": + player.pirateTreasure = Integer.parseInt(token2); + break; + case "romeo-juliet": + player.romeojuliet = Integer.parseInt(token2); + break; + case "vampSlayer": + player.vampSlayer = Integer.parseInt(token2); + break; + case "gertCat": + player.gertCat = Integer.parseInt(token2); + break; + case "witchspot": + player.witchspot = Integer.parseInt(token2); + break; + case "restGhost": + player.restGhost = Integer.parseInt(token2); + break; + case "impsC": + player.impsC = Integer.parseInt(token2); + break; + case "knightS": + player.knightS = Integer.parseInt(token2); + break; + case "lastX": + player.lastX = Integer.parseInt(token2); + break; + case "lastY": + player.lastY = Integer.parseInt(token2); + break; + case "lastH": + player.lastH = Integer.parseInt(token2); + break; + case "hasStarter": + player.hasStarter = Boolean.parseBoolean(token2); + break; + case "thankedForDonation": + player.thankedForDonation = Integer.parseInt(token2); + break; + case "membership": + player.membership = Boolean.parseBoolean(token2); + break; + case "canSpeak": + player.canSpeak = Boolean.parseBoolean(token2); + break; + case "questPoints": + player.questPoints = Integer.parseInt(token2); + break; + case "magic-book": + player.playerMagicBook = Integer.parseInt(token2); + break; + case "special-amount": + player.specAmount = Double.parseDouble(token2); + break; + case "selected-coffin": + player.randomCoffin = Integer.parseInt(token2); + break; + case "isRunning": + player.isRunning2 = Boolean.parseBoolean(token2); + break; + case "character-energy": + player.playerEnergy = Integer.parseInt(token2); + break; + case "teleblock-length": + player.teleBlockDelay = System.currentTimeMillis(); + player.teleBlockLength = Integer.parseInt(token2); + break; + case "lastYell": + player.lastYell = Long.parseLong(token2); + break; + case "pc-points": + player.pcPoints = Integer.parseInt(token2); + break; + case "magePoints": + player.magePoints = Integer.parseInt(token2); + break; + case "autoRet": + player.autoRet = Integer.parseInt(token2); + break; + case "flagged": + player.accountFlagged = Boolean.parseBoolean(token2); + break; + case "lastLoginDate": + player.lastLoginDate = Integer.parseInt(token2); + break; + case "hasBankpin": + player.hasBankpin = Boolean.parseBoolean(token2); + break; + case "setPin": + player.setPin = Boolean.parseBoolean(token2); + break; + case "pinRegisteredDeleteDay": + player.pinDeleteDateRequested = Integer.parseInt(token2); + break; + case "requestPinDelete": + player.requestPinDelete = Boolean.parseBoolean(token2); + break; + case "bankPin1": + player.bankPin1 = Integer.parseInt(token2); + break; + case "bankPin2": + player.bankPin2 = Integer.parseInt(token2); + break; + case "bankPin3": + player.bankPin3 = Integer.parseInt(token2); + break; + case "bankPin4": + player.bankPin4 = Integer.parseInt(token2); + break; + case "wave": + player.waveId = Integer.parseInt(token2); + break; + case "ptjob": + player.ptjob = Integer.parseInt(token2); + break; + case "creationAddress": + player.creationAddress = token2; + break; + case "music": + for (int j = 0; j < token3.length; j++) { + player.getPlayList().unlocked[j] = Boolean.parseBoolean(token3[j]); + } + break; + case "void": + for (int j = 0; j < token3.length; j++) { + player.voidStatus[j] = Integer.parseInt(token3[j]); + } + break; + case "gwkc": + player.killCount = Integer.parseInt(token2); + break; + case "fightMode": + player.fightMode = Integer.parseInt(token2); + break; } - } else if (token.equals("void")) { - for (int j = 0; j < token3.length; j++) { - player.voidStatus[j] = Integer.parseInt(token3[j]); + break; + case 3: + if (token.equals("character-equip")) { + player.playerEquipment[Integer.parseInt(token3[0])] = Integer.parseInt(token3[1]); + player.playerEquipmentN[Integer.parseInt(token3[0])] = Integer.parseInt(token3[2]); } - } else if (token.equals("gwkc")) { - player.killCount = Integer.parseInt(token2); - } else if (token.equals("fightMode")) { - player.fightMode = Integer.parseInt(token2); - } - break; - case 3: - if (token.equals("character-equip")) { - player.playerEquipment[Integer.parseInt(token3[0])] = Integer.parseInt(token3[1]); - player.playerEquipmentN[Integer.parseInt(token3[0])] = Integer.parseInt(token3[2]); - } - break; - case 4: - if (token.equals("character-look")) { - player.playerAppearance[Integer.parseInt(token3[0])] = Integer .parseInt(token3[1]); - } - break; - case 5: - if (token.equals("character-skill")) { - player.playerLevel[Integer.parseInt(token3[0])] = Integer.parseInt(token3[1]); - player.playerXP[Integer.parseInt(token3[0])] = Integer.parseInt(token3[2]); - } - break; - case 6: - if (token.equals("character-item")) { - player.playerItems[Integer.parseInt(token3[0])] = Integer.parseInt(token3[1]); - player.playerItemsN[Integer.parseInt(token3[0])] = Integer .parseInt(token3[2]); - } - break; - case 7: - if (token.equals("character-bank")) { - player.bankItems[Integer.parseInt(token3[0])] = Integer.parseInt(token3[1]); - player.bankItemsN[Integer.parseInt(token3[0])] = Integer.parseInt(token3[2]); - } - break; - case 8: - if (token.equals("character-friend")) { - player.friends[Integer.parseInt(token3[0])] = Long.parseLong(token3[1]); - } - break; - case 9: - if (token.equals("character-ignore")) { + break; + case 4: + if (token.equals("character-look")) { + player.playerAppearance[Integer.parseInt(token3[0])] = Integer .parseInt(token3[1]); + } + break; + case 5: + if (token.equals("character-skill")) { + player.playerLevel[Integer.parseInt(token3[0])] = Integer.parseInt(token3[1]); + player.playerXP[Integer.parseInt(token3[0])] = Integer.parseInt(token3[2]); + } + break; + case 6: + if (token.equals("character-item")) { + player.playerItems[Integer.parseInt(token3[0])] = Integer.parseInt(token3[1]); + player.playerItemsN[Integer.parseInt(token3[0])] = Integer .parseInt(token3[2]); + } + break; + case 7: + if (token.equals("character-bank")) { + player.bankItems[Integer.parseInt(token3[0])] = Integer.parseInt(token3[1]); + player.bankItemsN[Integer.parseInt(token3[0])] = Integer.parseInt(token3[2]); + } + break; + case 8: + if (token.equals("character-friend")) { + player.friends[Integer.parseInt(token3[0])] = Long.parseLong(token3[1]); + } + break; + case 9: + if (token.equals("character-ignore")) { player.ignores[Integer.parseInt(token3[0])] = Long.parseLong(token3[1]); - } - break; + } + break; } } else { - if (line.equals("[ACCOUNT]")) { - ReadMode = 1; - } else if (line.equals("[CHARACTER]")) { - ReadMode = 2; - } else if (line.equals("[EQUIPMENT]")) { - ReadMode = 3; - } else if (line.equals("[LOOK]")) { - ReadMode = 4; - } else if (line.equals("[SKILLS]")) { - ReadMode = 5; - } else if (line.equals("[ITEMS]")) { - ReadMode = 6; - } else if (line.equals("[BANK]")) { - ReadMode = 7; - } else if (line.equals("[FRIENDS]")) { - ReadMode = 8; - } else if (line.equals("[IGNORES]")) { - ReadMode = 9; - } else if (line.equals("[EOF]")) { - try { - characterfile.close(); - } catch (IOException ioexception) { - } - return 1; + switch (line) { + case "[ACCOUNT]": + ReadMode = 1; + break; + case "[CHARACTER]": + ReadMode = 2; + break; + case "[EQUIPMENT]": + ReadMode = 3; + break; + case "[LOOK]": + ReadMode = 4; + break; + case "[SKILLS]": + ReadMode = 5; + break; + case "[ITEMS]": + ReadMode = 6; + break; + case "[BANK]": + ReadMode = 7; + break; + case "[FRIENDS]": + ReadMode = 8; + break; + case "[IGNORES]": + ReadMode = 9; + break; + case "[EOF]": + try { + characterfile.close(); + } catch (IOException ignored) { + } + return 1; } } try { @@ -346,9 +462,12 @@ public class PlayerSave { } try { characterfile.close(); - } catch (IOException ioexception) { + } catch (IOException ignored) { } - return 13; + if (doRealLogin) + return 13; + else + return 14; } /** diff --git a/2006Redone Server/src/redone/net/packets/impl/Commands.java b/2006Redone Server/src/redone/net/packets/impl/Commands.java index 952a848d..6b6b0a60 100644 --- a/2006Redone Server/src/redone/net/packets/impl/Commands.java +++ b/2006Redone Server/src/redone/net/packets/impl/Commands.java @@ -5,6 +5,7 @@ import redone.Constants; import redone.game.items.ItemAssistant; import redone.game.npcs.NpcHandler; import redone.game.players.Client; +import redone.game.players.HighscoresHandler; import redone.game.players.PlayerHandler; import redone.net.packets.PacketType; import redone.util.GameLogger; @@ -52,30 +53,36 @@ public class Commands implements PacketType { switch (playerCommand) { case "close_interface": - player.getPlayerAssistant().closeAllWindows(); - break; + player.getPlayerAssistant().closeAllWindows(); + break; case "commands": - player.getActionSender().sendMessage("::players, ::highscores"); - break; + player.getActionSender().sendMessage("::players, ::highscores"); + break; case "highscores": + HighscoresHandler hs = new HighscoresHandler(); String[] highscores = new String[]{ "@dre@Highscores", "", - "Top 5 Highest total level:", - "1", "2", "3", "4", "5", + "Top 5 Total Level:", + hs.getRank(0, "level"), hs.getRank(1, "level"), hs.getRank(2, "level"), hs.getRank(3, "level"), hs.getRank(4, "level"), "", - "Top 5 Highest coins stack:", - "1", "2", "3", "4", "5" + "Top 5 Wealthiest Players:", + hs.getRank(0, "gold"), hs.getRank(1, "gold"), hs.getRank(2, "gold"), hs.getRank(3, "gold"), hs.getRank(4, "gold"), + "", + "Top 5 Highest Total Damage:", + hs.getRank(0, "damage"), hs.getRank(1, "damage"), hs.getRank(2, "damage"), hs.getRank(3, "damage"), hs.getRank(4, "damage"), }; - player.getPlayerAssistant().sendFrame126("@dre@Highscores", 8144); - player.getPlayerAssistant().sendFrame126("", 8145); - player.getPlayerAssistant().sendFrame126("Top 5 Highest total level:", 8145); - player.getPlayerAssistant().sendFrame126("1", 8145); - player.getPlayerAssistant().sendFrame126("1", 8145); - player.getPlayerAssistant().sendFrame126("1", 8145); - player.getPlayerAssistant().sendFrame126("1", 8145); - player.getPlayerAssistant().sendFrame126("1", 8145); - break; + + for (int i = 8144; i < 8195; i++) { + player.getPlayerAssistant().sendFrame126("", i); + } + + for (int i = 8144; i < 8144 + highscores.length; i++) { + player.getPlayerAssistant().sendFrame126(highscores[i - 8144], i+3); + } + player.getPlayerAssistant().showInterface(8134); + + break; }