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

God capes, Ancient chamber teleport and axe array checks (#16)

Browse Source 
* Revised shop re-stocking interval.

* Revised shop re-stocking interval.

* Updated character save directory.

* Renamed new player save directory from accounts to characters.

* Added inverse for random toggle, since it's the first thing I type every time.

* Added god capes.

* Re-implemented experiments.

* Yell now looks a little cleaner.

* Fixed outside of bounds exception on High scores, when player count doesn't meet threshold.

* Cleaned up Magic Teleports class and added level requirements.

* Fixed exit portal from ancient chamber.

* Added check to ensure axe id isn't outside the bounds of expected axes.
This commit is contained in:
Ben Maher
2019-10-06 17:35:24 +01:00
committed by Daniel Ginovker
parent b327e34f8e
commit f777f24e53
10 changed files with 77 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files
2006Redone Server/src/redone/game/objects/ObjectsActions.java
+13 -1
View File
@@ -190,7 +190,7 @@ public class ObjectsActions {
case 6707:
player.getBarrows().useStairs();
break;
case 10284:
player.getBarrows().useChest();
break;
@@ -2605,6 +2605,18 @@ public class ObjectsActions {
player.getPlayerAssistant().walkTo(0, -1);
}
break;
case 2873:
if (player.getItemAssistant().hasFreeSlots(1))
player.getItemAssistant().addItem(2412, 1);
break;
case 2874:
if (player.getItemAssistant().hasFreeSlots(1))
player.getItemAssistant().addItem(2414, 1);
break;
case 2875:
if (player.getItemAssistant().hasFreeSlots(1))
player.getItemAssistant().addItem(2413, 1);
break;
}
}
2006Redone Server/src/redone/game/objects/impl/Climbing.java
+13 -20
View File
@@ -18,7 +18,7 @@ import redone.util.Misc;
public class Climbing {
private static final int CLIMB_UP = 828, CLIMB_DOWN = CLIMB_UP;
public static void handleClimbing(final Client client) {
if (System.currentTimeMillis() - client.climbDelay < 1200) {
return;
@@ -40,7 +40,7 @@ public class Climbing {
}
}, 1);
}
public static void processClimbing(Client client) {
switch (client.objectId) {
case 9584:
@@ -48,16 +48,16 @@ public class Climbing {
client.getPlayerAssistant().movePlayer(2933, 3282, 0);
}
break;
case 272:
client.getPlayerAssistant().movePlayer(client.absX, client.absY, 1);
break;
case 273:
client.getPlayerAssistant().movePlayer(client.absX, client.absY, 0);
break;
case 245:
if (client.objectY == 3224) {
client.getPlayerAssistant().movePlayer(client.absX, client.absY+2, 2);
@@ -297,6 +297,7 @@ public class Climbing {
break;
case 6434:
case 5167:
UseOther.useDown(client, client.objectId);
break;
case 1767:
@@ -321,15 +322,7 @@ public class Climbing {
client.getActionSender().sendMessage("You climb down.");
break;
case 5167:
if (Constants.EXPERIMENTS) {
UseOther.useDown(client, client.objectId);
} else {
client.getActionSender().sendMessage(
"Experiments are currently disabled.");
}
break;
case 2147:
case 2147:
client.getPlayerAssistant().movePlayer(3104, 9576, 0);
client.startAnimation(827);
client.getActionSender().sendMessage("You climb down.");
@@ -545,7 +538,7 @@ public class Climbing {
client.getPlayerAssistant().movePlayer(3230, 3394, 1);
}
break;
case 5096:
client.getPlayerAssistant().movePlayer(2649, 9591, 0);
break;
@@ -667,7 +660,7 @@ public class Climbing {
if (System.currentTimeMillis() - client.climbDelay < 1200) {
return;
}
switch (client.heightLevel) {
case -1:
client.getPlayerAssistant().movePlayer(client.absX, client.absY, 0);
@@ -754,7 +747,7 @@ public class Climbing {
client.getDialogueHandler().sendOption2("Climb Up.", "Climb Down.");
client.dialogueAction = 147;
}
private static void close(Client client, int actionButtonId) {
if (actionButtonId == 9157) {
client.getActionSender().sendMessage("You climb up.");
@@ -766,7 +759,7 @@ public class Climbing {
client.getPlayerAssistant().closeAllWindows();
client.nextChat = 0;
}
public static void handleLadderButtons(Client client, int actionButtonId) {
if (client.dialogueAction != 147) {
return;
@@ -791,5 +784,5 @@ public class Climbing {
}
break;
}
}
}
}