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

Random slayer task amounts, Move unequiped item to same slot as weapon you are equiping (#206)

Browse Source 
* tidy up

* Update DialogueHandler.java

* Slayer master gives specific difficulty tasks

* int

* tidy up

* replace difficulty int, with variable

* Dragons give lower amount needed to kill

* vail -> vial

* Update ObjectsActions.java

* tidy up

* tidy up

* tidy up

* Assign random amounts

* tidy up, remove magic numbers

* move rebinding of equip slot

* tidy up and move unequiped items to same inventory slot

* Drop castlewars flag when equiping a weapon

* vars

* tidy up
This commit is contained in:
Danial
2019-11-22 08:10:30 +13:00
committed by Daniel Ginovker
parent 92688def31
commit 4b3bb7ade7
10 changed files with 376 additions and 395 deletions
Download Patch File Download Diff File Expand all files Collapse all files
2006Redone Server/src/redone/net/packets/impl/ClickingButtons.java
+10 -18
View File
@@ -1794,24 +1794,21 @@ public class ClickingButtons implements PacketType {
case 9179:
if (player.dialogueAction == 2) {
player.getPlayerAssistant().startTeleport(2884, 3395, 0,
"modern");
player.getPlayerAssistant().startTeleport(2884, 3395, 0, "modern");
}
if (player.dialogueAction == 122 && player.objectId == 12163 || player.objectId == 12165 || player.objectId == 12166) {//champ
player.getPlayerAssistant().startTeleport(3203, 3343, 0, "modern");
} else if (player.objectId == 12164) {
if (player.dialogueAction == 122) {
player.getActionSender().sendMessage("You can't take the canoe to the Champion Guild because you're already there!");
player.getPlayerAssistant().handleCanoe();
player.getActionSender().sendMessage("You can't take the canoe to the Champion Guild because you're already there!");
player.getPlayerAssistant().handleCanoe();
}
}
if (player.dialogueAction == 4) {
player.getPlayerAssistant().startTeleport(2444, 5170, 0,
"modern");
player.getPlayerAssistant().startTeleport(2444, 5170, 0, "modern");
}
if (player.dialogueAction == 3) {
player.getPlayerAssistant().startTeleport(3243, 3513, 0,
"modern");
player.getPlayerAssistant().startTeleport(3243, 3513, 0, "modern");
}
if (player.dialogueAction == 31) {
player.getDialogueHandler().sendDialogues(502, player.npcType);
@@ -1826,8 +1823,7 @@ public class ClickingButtons implements PacketType {
player.getDialogueHandler().sendDialogues(376, player.npcType);
}
if (player.dialogueAction == 51) {
player.getPlayerAssistant().gloryTeleport(3293, 3174, 0,
"modern");
player.getPlayerAssistant().gloryTeleport(3293, 3174, 0, "modern");
}
Teles.necklaces(player);
if (player.dialogueAction == 52) {
@@ -1864,8 +1860,7 @@ public class ClickingButtons implements PacketType {
case 9180:
if (player.dialogueAction == 2) {
player.getPlayerAssistant().startTeleport(2471, 10137, 0,
"modern");
player.getPlayerAssistant().startTeleport(2471, 10137, 0, "modern");
}
if (player.dialogueAction == 69) {
player.getDialogueHandler().sendDialogues(500003, player.npcType);
@@ -1879,12 +1874,10 @@ public class ClickingButtons implements PacketType {
}
}
if (player.dialogueAction == 3) {
player.getPlayerAssistant().startTeleport(3363, 3676, 0,
"modern");
player.getPlayerAssistant().startTeleport(3363, 3676, 0, "modern");
}
if (player.dialogueAction == 4) {
player.getPlayerAssistant().startTeleport(2659, 2676, 0,
"modern");
player.getPlayerAssistant().startTeleport(2659, 2676, 0, "modern");
}
if (player.dialogueAction == 31) {
player.getDialogueHandler().sendDialogues(501, player.npcType);
@@ -1899,8 +1892,7 @@ public class ClickingButtons implements PacketType {
player.getDialogueHandler().sendDialogues(377, player.npcType);
}
if (player.dialogueAction == 51) {
player.getPlayerAssistant().gloryTeleport(2911, 3152, 0,
"modern");
player.getPlayerAssistant().gloryTeleport(2911, 3152, 0, "modern");
}
Teles.necklaces(player);
if (player.dialogueAction == 52) {