Skip to content

Improved Al-Kharid gates #661

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ipkpjersi wants to merge 3 commits into
base: master
Choose a base branch
from
+54 −1
Open

Improved Al-Kharid gates #661

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4e54393
Improved Al-Kharid gates
ipkpjersi Dec 21, 2024
d66697f
Restored deleted code
ipkpjersi Dec 21, 2024
0573a13
Added comment about CycleEvent lambda
ipkpjersi Dec 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion 2006Scape Server/src/main/java/com/rs2/game/dialogues/DialogueHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3984,7 +3984,7 @@ else if (player.getItemAssistant().playerHasItem(765))
player.nextChat = 1019;
break;
case 1019:
if (player.absX == 3267 || player.absX == 3268) {
if (player.absX == 3266 || player.absX == 3267 || player.absX == 3268 || player.absX == 3269) {
sendNpcChat1("You must pay a toll of 10 gold coins to pass.",
player.talkingNpc, "Border Guard");
player.nextChat = 1020;
Expand Down
53 changes: 53 additions & 0 deletions 2006Scape Server/src/main/java/com/rs2/game/objects/impl/OtherObjects.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,59 @@ public static void initKharid(Player player, int objectId) {
player.getDialogueHandler().endDialogue();
return;
}

int targetX = player.getX();
int targetY = player.getY();

//Determine intermediate walk coordinates
if (player.getX() == 3266 && player.getY() == 3229) {
targetX = 3267;
targetY = 3228;
} else if (player.getX() == 3266 && player.getY() == 3226) {
targetX = 3267;
targetY = 3227;
} else if (player.getX() == 3269 && player.getY() == 3226) {
targetX = 3268;
targetY = 3227;
} else if (player.getX() == 3269 && player.getY() == 3229) {
targetX = 3268;
targetY = 3228;
}
//We must declare a final targetX and targetY so we can use them inside the CycleEvent lambda.
final int finalTargetX = targetX;
final int finalTargetY = targetY;
//Check if the player needs to walk first
if (targetX != player.getX() || targetY != player.getY()) {
player.getPlayerAssistant().playerWalk(targetX, targetY);

CycleEvent objectWalkToEvent = new CycleEvent() {
@Override
public void execute(CycleEventContainer container) {
if (player.getX() == finalTargetX && player.getY() == finalTargetY) {
if (openKharid(player, objectId)) {
if (player.getX() == 3267) {
player.getPlayerAssistant().movePlayer(player.getX() + 1, player.getY(), 0);
} else if (player.getX() == 3268) {
player.getPlayerAssistant().movePlayer(player.getX() - 1, player.getY(), 0);
}
player.turnPlayerTo(player.objectX, player.objectY);
player.getItemAssistant().deleteItem(995, player.getItemAssistant().getItemSlot(995), 10);
}
container.stop();
}
}

@Override
public void stop() {
//Optional cleanup logic
}
};

player.startCurrentTask(1, objectWalkToEvent); //Start the event with a tick delay
return; //Exit so the rest of the initKharid method doesn't execute immediately
}

//If no intermediate walk is required, proceed directly
if (openKharid(player, objectId)) {
//GameEngine.objectHandler.createAnObject(player, -1, player.objectX, player.objectY, -1);
final int[] coords = new int[2];
Expand Down
Loading