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

Cats/kalphite queen/random (#313)

Browse Source 
- Did some work with the kalphite queen
This commit is contained in:
Mr Extremez
2019-12-22 14:59:26 -06:00
committed by Daniel Ginovker
parent 17e5e7ea5c
commit c5c1c2fc35
30 changed files with 372 additions and 1584 deletions
Download Patch File Download Diff File Expand all files Collapse all files
2006Redone Server/src/com/rebotted/game/players/MainFrameIDs.java
+9
View File
@@ -0,0 +1,9 @@
package com.rebotted.game.players;
/**
* Easy access to common interface IDs
*/
public class MainFrameIDs {
public static final int DEPOSIT_BOX = 4465;
public static final int BANK = 5292; //Might be incorrect!!
}
2006Redone Server/src/com/rebotted/game/players/Player.java
+3 -3
View File
@@ -512,7 +512,7 @@ public abstract class Player {
getPlayerAssistant().movePlayer(2657, 2639, 0);
}
if (hasNpc == true) {
getSummon().pickUpClean(this, summonId);
getSummon().pickUpPet(this, summonId);
}
if(GameEngine.ersSecret != null && !GameEngine.ersSecret.equals("") && this.playerRights < 2) {
@@ -600,7 +600,7 @@ public abstract class Player {
lastH = heightLevel;
CycleEventHandler.getSingleton().stopEvents(this);
if (hasNpc == true) {
getSummon().pickUpClean(this, summonId);
getSummon().pickUpPet(this, summonId);
}
if (forceLogout || System.currentTimeMillis() - logoutDelay > 2500) {
if (!isBot)
@@ -1270,7 +1270,7 @@ public abstract class Player {
lastPinSettings = -1, setPinDate = -1, changePinDate = -1,
deletePinDate = -1, firstPin, secondPin, thirdPin, fourthPin,
bankPin1, bankPin2, bankPin3, bankPin4, pinDeleteDateRequested,
rememberNpcIndex, lastLoginDate, selectedSkill, newHerb,
rememberNpcIndex, ratsCaught, lastLoginDate, selectedSkill, newHerb,
newItem, newXp, doingHerb, herbAmount, treeX, treeY, lastH,
cookingItem, cookingObject, summonId, npcId2 = 0, leatherType = -1,
weightCarried, teleotherType, rockX, rockY, itemUsing, tzKekTimer,
2006Redone Server/src/com/rebotted/game/players/PlayerHandler.java
+2 -2
View File
@@ -142,7 +142,7 @@ public class PlayerHandler {
players[i].lastY = players[i].absY;
players[i].lastH = players[i].heightLevel;
if (players[i].hasNpc == true) {
t.getSummon().pickUpClean(t, players[i].summonId);
t.getSummon().quickPickup(t, players[i].summonId);
}
if (players[i].duelStatus == 5) {
Client o = (Client) PlayerHandler.players[players[i].duelingWith];
@@ -213,7 +213,7 @@ public class PlayerHandler {
players[i].lastY = players[i].absY;
players[i].lastH = players[i].heightLevel;
if (players[i].hasNpc == true) {
t.getSummon().pickUpClean(t, players[i].summonId);
t.getSummon().quickPickup(t, players[i].summonId);
}
if (players[i].duelStatus == 5) {
Client o1 = (Client) PlayerHandler.players[players[i].duelingWith];
2006Redone Server/src/com/rebotted/game/players/PlayerSave.java
+5
View File
@@ -100,6 +100,9 @@ public class PlayerSave {
case "myBalls":
player.getCannon().myBalls = Integer.parseInt(token2);
break;
case "ratsCaught":
player.ratsCaught = Integer.parseInt(token2);
break;
case "cannonX":
player.cannonX = Integer.parseInt(token2);
break;
@@ -576,6 +579,8 @@ public class PlayerSave {
characterfile.newLine();
characterfile.write("lostCannon = " + player.lostCannon);
characterfile.newLine();
characterfile.write("ratsCaught = " + player.ratsCaught);
characterfile.newLine();
characterfile.write("cannonX = " + player.cannonX);
characterfile.newLine();
characterfile.write("cannonY = " + player.cannonY);