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

Fix passing through gate to training grounds + make ::shop bots tele to current loc first try (#410)

Browse Source
This commit is contained in:
Daniel Ginovker
2020-08-04 13:27:24 -04:00
committed by GitHub
parent d2e8945578
commit 6684364b64
2 changed files with 2778 additions and 2769 deletions
Download Patch File Download Diff File Expand all files Collapse all files
2006Redone Server/src/main/java/com/rebotted/game/bots/Bot.java
+2 -5
View File
@@ -31,16 +31,13 @@ public class Bot {
botClient.isActive = true; botClient.isActive = true;
botClient.disconnected = false; botClient.disconnected = false;
botClient.npcCanAttack = false; botClient.npcCanAttack = false;
botClient.canWalkTutorial = true;
botClient.tutorialProgress = 36;
GameEngine.playerHandler.newPlayerClient(botClient); GameEngine.playerHandler.newPlayerClient(botClient);
loadPlayerInfo(botClient, username, "bot_password", false); loadPlayerInfo(botClient, username, "bot_password", false);
System.out.println("x is " + x);
if (x == null) {
System.out.println("Bot should be at " + botClient.getX() + ", " + botClient.getY());
}
if (x != null) { if (x != null) {
System.out.println("Moving player to " + x + "," + y + "," + z);
botClient.getPlayerAssistant().movePlayer(x, y, z); botClient.getPlayerAssistant().movePlayer(x, y, z);
} }
new TradeChat().run(); new TradeChat().run();
2006Redone Server/src/main/java/com/rebotted/game/objects/ObjectsActions.java
+34 -22
View File
@@ -100,7 +100,7 @@ public class ObjectsActions {
return; return;
} }
ClimbOther.handleOpenOther(player, objectType); ClimbOther.handleOpenOther(player, objectType);
for (ClimbData t: ClimbData.values()) { for (ClimbData t : ClimbData.values()) {
if (objectType == t.getOpen()) { if (objectType == t.getOpen()) {
ClimbOther.useOther(player, objectType); ClimbOther.useOther(player, objectType);
} }
@@ -114,7 +114,7 @@ public class ObjectsActions {
player.getDoubleGates().useDoubleGate(player, objectType); player.getDoubleGates().useDoubleGate(player, objectType);
PassDoor.processDoor(player, objectType); PassDoor.processDoor(player, objectType);
AbyssalHandler.handleAbyssalTeleport(player, objectType); AbyssalHandler.handleAbyssalTeleport(player, objectType);
OpenObject.interactObject(player, objectType, objectType == 399 ? true : false); OpenObject.interactObject(player, objectType, objectType == 399);
// if its a rock we can mine, mine it // if its a rock we can mine, mine it
if (Mining.rockExists(objectType)) if (Mining.rockExists(objectType))
player.getMining().startMining(player, objectType, player.objectX, player.objectY, player.clickObjectType); player.getMining().startMining(player, objectType, player.objectX, player.objectY, player.clickObjectType);
@@ -154,8 +154,8 @@ public class ObjectsActions {
break; break;
case 6823: case 6823:
if(player.barrowsNpcs[0][1] == 0) { if (player.barrowsNpcs[0][1] == 0) {
NpcHandler.spawnNpc(player, 2030, player.getX(), player.getY()-1, 3, 0, 120, 25, 200, 200, true, true); NpcHandler.spawnNpc(player, 2030, player.getX(), player.getY() - 1, 3, 0, 120, 25, 200, 200, true, true);
player.barrowsNpcs[0][1] = 1; player.barrowsNpcs[0][1] = 1;
} else { } else {
player.getPacketSender().sendMessage("You have already searched in this sarcophagus."); player.getPacketSender().sendMessage("You have already searched in this sarcophagus.");
@@ -163,8 +163,8 @@ public class ObjectsActions {
break; break;
case 6772: case 6772:
if(player.barrowsNpcs[1][1] == 0) { if (player.barrowsNpcs[1][1] == 0) {
NpcHandler.spawnNpc(player, 2029, player.getX()+1, player.getY(), 3, 0, 120, 20, 200, 200, true, true); NpcHandler.spawnNpc(player, 2029, player.getX() + 1, player.getY(), 3, 0, 120, 20, 200, 200, true, true);
player.barrowsNpcs[1][1] = 1; player.barrowsNpcs[1][1] = 1;
} else { } else {
player.getPacketSender().sendMessage("You have already searched in this sarcophagus."); player.getPacketSender().sendMessage("You have already searched in this sarcophagus.");
@@ -172,8 +172,8 @@ public class ObjectsActions {
break; break;
case 6822: case 6822:
if(player.barrowsNpcs[2][1] == 0) { if (player.barrowsNpcs[2][1] == 0) {
NpcHandler.spawnNpc(player, 2028, player.getX(), player.getY()-1, 3, 0, 90, 17, 200, 200, true, true); NpcHandler.spawnNpc(player, 2028, player.getX(), player.getY() - 1, 3, 0, 90, 17, 200, 200, true, true);
player.barrowsNpcs[2][1] = 1; player.barrowsNpcs[2][1] = 1;
} else { } else {
player.getPacketSender().sendMessage("You have already searched in this sarcophagus."); player.getPacketSender().sendMessage("You have already searched in this sarcophagus.");
@@ -181,8 +181,8 @@ public class ObjectsActions {
break; break;
case 6773: case 6773:
if(player.barrowsNpcs[3][1] == 0) { if (player.barrowsNpcs[3][1] == 0) {
NpcHandler.spawnNpc(player, 2027, player.getX(), player.getY()-1, 3, 0, 120, 23, 200, 200, true, true); NpcHandler.spawnNpc(player, 2027, player.getX(), player.getY() - 1, 3, 0, 120, 23, 200, 200, true, true);
player.barrowsNpcs[3][1] = 1; player.barrowsNpcs[3][1] = 1;
} else { } else {
player.getPacketSender().sendMessage("You have already searched in this sarcophagus."); player.getPacketSender().sendMessage("You have already searched in this sarcophagus.");
@@ -194,8 +194,8 @@ public class ObjectsActions {
break; break;
case 6821: case 6821:
if(player.barrowsNpcs[5][1] == 0) { if (player.barrowsNpcs[5][1] == 0) {
NpcHandler.spawnNpc(player, 2025, player.getX()-1, player.getY(), 3, 0, 90, 19, 200, 200, true, true); NpcHandler.spawnNpc(player, 2025, player.getX() - 1, player.getY(), 3, 0, 90, 19, 200, 200, true, true);
player.barrowsNpcs[5][1] = 1; player.barrowsNpcs[5][1] = 1;
} else { } else {
player.getPacketSender().sendMessage("You have already searched in this sarcophagus."); player.getPacketSender().sendMessage("You have already searched in this sarcophagus.");
@@ -266,10 +266,10 @@ public class ObjectsActions {
return; return;
} }
if (player.absX == 2816 && player.getItemAssistant().playerHasItem(6306, 100)) { if (player.absX == 2816 && player.getItemAssistant().playerHasItem(6306, 100)) {
player.getPlayerAssistant().movePlayer(player.absX+1, player.absY, 0); player.getPlayerAssistant().movePlayer(player.absX + 1, player.absY, 0);
player.getItemAssistant().deleteItem(6306, 100); player.getItemAssistant().deleteItem(6306, 100);
} else if (player.absX == 2817) { } else if (player.absX == 2817) {
player.getPlayerAssistant().movePlayer(player.absX+1, player.absY, 0); player.getPlayerAssistant().movePlayer(player.absX + 1, player.absY, 0);
} }
break; break;
@@ -287,22 +287,32 @@ public class ObjectsActions {
return; return;
} }
} else if (player.absX == 2470) { } else if (player.absX == 2470) {
player.getPlayerAssistant().movePlayer(player.absX-1, player.absY, 0); player.getPlayerAssistant().movePlayer(player.absX - 1, player.absY, 0);
player.getPacketSender().sendMessage("You pass through the gate."); player.getPacketSender().sendMessage("You pass through the gate.");
} else if (player.absY == 4433) { } else if (player.absY == 4433) {
player.getPlayerAssistant().movePlayer(player.absX, player.absY+1, 0); player.getPlayerAssistant().movePlayer(player.absX, player.absY + 1, 0);
player.getPacketSender().sendMessage("You pass through the gate."); player.getPacketSender().sendMessage("You pass through the gate.");
} else if (player.absX == 2469) { } else if (player.absX == 2469) {
player.getItemAssistant().deleteItem(1601, 1); player.getItemAssistant().deleteItem(1601, 1);
player.getPlayerAssistant().movePlayer(player.absX+1, player.absY, 0); player.getPlayerAssistant().movePlayer(player.absX + 1, player.absY, 0);
player.getPacketSender().sendMessage("You pass through the gate."); player.getPacketSender().sendMessage("You pass through the gate.");
} else if (player.absY == 4434) { } else if (player.absY == 4434) {
player.getItemAssistant().deleteItem(1601, 1); player.getItemAssistant().deleteItem(1601, 1);
player.getPlayerAssistant().movePlayer(player.absX, player.absY-1, 0); player.getPlayerAssistant().movePlayer(player.absX, player.absY - 1, 0);
player.getPacketSender().sendMessage("You pass through the gate."); player.getPacketSender().sendMessage("You pass through the gate.");
} }
break; break;
case 2039:
case 2041:
if (player.absY == 3356) {
player.getPlayerAssistant().movePlayer(player.absX, player.absY + 1, 0);
} else if (player.absY == 3357) {
player.getPlayerAssistant().movePlayer(player.absX, player.absY - 1, 0);
}
player.getPacketSender().sendMessage("You pass through the gate.");
break;
case 69: case 69:
case 2178: case 2178:
//if (c.objectX == 2675 && c.objectY == 3170) { //if (c.objectX == 2675 && c.objectY == 3170) {
@@ -1169,6 +1179,7 @@ public class ObjectsActions {
container.stop(); container.stop();
} }
@Override @Override
public void stop() { public void stop() {
@@ -1220,6 +1231,7 @@ public class ObjectsActions {
container.stop(); container.stop();
} }
@Override @Override
public void stop() { public void stop() {
@@ -1249,6 +1261,7 @@ public class ObjectsActions {
container.stop(); container.stop();
} }
@Override @Override
public void stop() { public void stop() {
@@ -2100,8 +2113,7 @@ public class ObjectsActions {
if (player.shieldArrav >= 6 && player.getItemAssistant().playerHasItem(759)) { if (player.shieldArrav >= 6 && player.getItemAssistant().playerHasItem(759)) {
GameEngine.objectHandler.createAnObject(player, 2604, objectX, objectY, player.heightLevel, 0); GameEngine.objectHandler.createAnObject(player, 2604, objectX, objectY, player.heightLevel, 0);
Region.addObject(2604, objectX, objectY, 0, 0, 0, false); Region.addObject(2604, objectX, objectY, 0, 0, 0, false);
} } else {
else {
player.getPacketSender().sendMessage("It's locked, maybe I can get the key from somewhere."); player.getPacketSender().sendMessage("It's locked, maybe I can get the key from somewhere.");
} }
break; break;
@@ -2636,10 +2648,10 @@ public class ObjectsActions {
return; return;
} }
if (player.absX == 2816 && player.getItemAssistant().playerHasItem(6306, 100)) { if (player.absX == 2816 && player.getItemAssistant().playerHasItem(6306, 100)) {
player.getPlayerAssistant().movePlayer(player.absX+1, player.absY, 0); player.getPlayerAssistant().movePlayer(player.absX + 1, player.absY, 0);
player.getItemAssistant().deleteItem(6306, 100); player.getItemAssistant().deleteItem(6306, 100);
} else if (player.absX == 2817) { } else if (player.absX == 2817) {
player.getPlayerAssistant().movePlayer(player.absX+1, player.absY, 0); player.getPlayerAssistant().movePlayer(player.absX + 1, player.absY, 0);
} }
break; break;
case 4569: case 4569: