diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index a8be84fe..c0c166c6 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,14 +7,19 @@
-
+
+
+
-
+
+
+
+
math.sq
@@ -29,25 +34,20 @@
+
+
+
+
+
+
+
-
-
-
@@ -97,6 +97,18 @@
+
+
+
@@ -107,9 +119,14 @@
1572306880139
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/2006Redone Client/src/ClientSettings.java b/2006Redone Client/src/ClientSettings.java
index b57f81a9..918528e7 100644
--- a/2006Redone Client/src/ClientSettings.java
+++ b/2006Redone Client/src/ClientSettings.java
@@ -34,7 +34,4 @@ public class ClientSettings {
public static final BigInteger RSA_MODULUS = new BigInteger("91553247461173033466542043374346300088148707506479543786501537350363031301992107112953015516557748875487935404852620239974482067336878286174236183516364787082711186740254168914127361643305190640280157664988536979163450791820893999053469529344247707567448479470137716627440246788713008490213212272520901741443");
public static final BigInteger RSA_EXPONENT = new BigInteger("65537");
-
- public final static Boolean SNOW = true;
-
}
diff --git a/2006Redone Client/src/Flo.java b/2006Redone Client/src/Flo.java
index c6d5e579..bcd0e2ee 100644
--- a/2006Redone Client/src/Flo.java
+++ b/2006Redone Client/src/Flo.java
@@ -2,6 +2,9 @@
// Jad home page: http://www.kpdus.com/jad.html
// Decompiler options: packimports(3)
+import java.util.Calendar;
+import java.util.GregorianCalendar;
+
public final class Flo {
public static void unpackConfig(StreamLoader streamLoader) {
@@ -25,7 +28,8 @@ public final class Flo {
return;
} else if (i == 1) {
anInt390 = stream.read3Bytes();
- if (ClientSettings.SNOW) {
+ Calendar date = new GregorianCalendar();
+ if ((date.get(Calendar.MONTH) + 1) == 12) {
anInt390 = 0xffffff;
}
method262(anInt390);
diff --git a/2006Redone Client/src/Game.java b/2006Redone Client/src/Game.java
index 157a67a5..5264f37f 100644
--- a/2006Redone Client/src/Game.java
+++ b/2006Redone Client/src/Game.java
@@ -4795,18 +4795,6 @@ public class Game extends RSApplet {
if (inputString.equals("::dataon")) {
showInfo = !showInfo;
}
- if (inputString.equals("::clip")) {
- for (int k1 = 0; k1 < 4; k1++) {
- for (int i2 = 1; i2 < 103; i2++) {
- for (int k2 = 1; k2 < 103; k2++) {
- aClass11Array1230[k1].anIntArrayArray294[i2][k2] = 0;
- }
-
- }
-
- }
-
- }
}
if (inputString.startsWith("::")) {
stream.createFrame(103);
diff --git a/2006Redone Server/src/com/rebotted/game/content/combat/magic/MagicRequirements.java b/2006Redone Server/src/com/rebotted/game/content/combat/magic/MagicRequirements.java
index 0330aedd..46de09bc 100644
--- a/2006Redone Server/src/com/rebotted/game/content/combat/magic/MagicRequirements.java
+++ b/2006Redone Server/src/com/rebotted/game/content/combat/magic/MagicRequirements.java
@@ -15,7 +15,7 @@ public class MagicRequirements {
}
break;
case 555:
- if (wep == 1383 || wep == 1395) {
+ if (wep == 1383 || wep == 1395 || wep == 6562) {
return true;
}
break;
@@ -25,7 +25,7 @@ public class MagicRequirements {
}
break;
case 557:
- if (wep == 1385 || wep == 1399 || wep == 3053) {
+ if (wep == 1385 || wep == 1399 || wep == 3053 || wep == 6562) {
return true;
}
break;
diff --git a/2006Redone Server/src/com/rebotted/game/content/combat/range/DwarfCannon.java b/2006Redone Server/src/com/rebotted/game/content/combat/range/DwarfCannon.java
index 92df80e1..c77efb2a 100644
--- a/2006Redone Server/src/com/rebotted/game/content/combat/range/DwarfCannon.java
+++ b/2006Redone Server/src/com/rebotted/game/content/combat/range/DwarfCannon.java
@@ -86,6 +86,7 @@ public class DwarfCannon {
if (setUpStage >= 4) {
container.stop();
setUpStage = 0;
+ player.CannonSetupStage = setUpStage;
settingUp = false;
return;
}
@@ -102,6 +103,7 @@ public class DwarfCannon {
placeObject(OBJECT_PARTS[setUpStage], player.absX, player.absY, true);
player.getItemAssistant().deleteItem(ITEM_PARTS[setUpStage], 1);
setUpStage ++;
+ player.CannonSetupStage = setUpStage;
}
@Override
public void stop() {
@@ -148,7 +150,7 @@ public class DwarfCannon {
}
public boolean hasCannon() {
- return (player.cannonX > 0) && (player.cannonY > 0) || (player.cannonX > 0 && player.cannonY > 0);
+ return (player.CannonSetupStage != 0 || (player.cannonX > 0 && player.cannonY > 0));
}
private boolean myCannon(int x, int y) {
@@ -313,7 +315,7 @@ public class DwarfCannon {
}
}
}
-
+
public void pickup(int x, int y) {
if (!myCannon(x, y)) {
player.getPacketSender().sendMessage("You can't pick up somebody else's cannon!");
@@ -343,13 +345,13 @@ public class DwarfCannon {
player.cannonX = 0;
player.cannonY = 0;
}
-
+
public void placeObject(int id, int x, int y, boolean add) {
GameEngine.objectHandler.placeObject(new Objects(id, x, y, 0, 516, 10, 0));
if (add)
Region.addObject(id, x, y, 0, 10, 516, true);
}
-
+
public void removeObject(int x, int y) {
placeObject(-1, x, y, false);
}
diff --git a/2006Redone Server/src/com/rebotted/game/dialogues/DialogueHandler.java b/2006Redone Server/src/com/rebotted/game/dialogues/DialogueHandler.java
index 40aa59d6..e28eea05 100644
--- a/2006Redone Server/src/com/rebotted/game/dialogues/DialogueHandler.java
+++ b/2006Redone Server/src/com/rebotted/game/dialogues/DialogueHandler.java
@@ -1184,7 +1184,7 @@ public class DialogueHandler {
break;
case 247:
sendNpcChat3(
- "But, when this tower was burnt down, the sercret of creating runes was lost with it...",
+ "But, when this tower was burnt down, the secret of creating runes was lost with it...",
"or so I thought.",
"Some months ago, while searching these ruins for information, ",
player.talkingNpc, "Sedridor");
diff --git a/2006Redone Server/src/com/rebotted/game/players/Player.java b/2006Redone Server/src/com/rebotted/game/players/Player.java
index a8f74b4e..96379b29 100644
--- a/2006Redone Server/src/com/rebotted/game/players/Player.java
+++ b/2006Redone Server/src/com/rebotted/game/players/Player.java
@@ -1187,6 +1187,8 @@ public abstract class Player {
public boolean lostCannon = false, refresh = false, isBot = false;
+ public int CannonSetupStage;
+
public ArrayList killedPlayers = new ArrayList();
public ArrayList attackedPlayers = new ArrayList();
public ArrayList lastKilledPlayers = new ArrayList();
diff --git a/2006Redone Server/src/com/rebotted/game/players/PlayerAssistant.java b/2006Redone Server/src/com/rebotted/game/players/PlayerAssistant.java
index f65ea8b2..2b873dcd 100644
--- a/2006Redone Server/src/com/rebotted/game/players/PlayerAssistant.java
+++ b/2006Redone Server/src/com/rebotted/game/players/PlayerAssistant.java
@@ -2014,10 +2014,9 @@ public class PlayerAssistant {
player.getPlayerAssistant().addStarter();
player.getPlayerAssistant().movePlayer(3233, 3229, 0);
player.getPacketSender().sendMessage("Welcome to @blu@" + GameConstants.SERVER_NAME + "@bla@ - we are currently in Server Stage v@blu@" + GameConstants.TEST_VERSION + "@bla@.");
- player.getPacketSender().sendMessage("@red@Did you know?@bla@ We're open source! Pull requests are welcome");
- player.getPacketSender().sendMessage("Source code at github.com/dginovker/2006rebotted");
- player.getPacketSender().sendMessage("Welcome to the Beta! A reset will occur before main release -");
- player.getPacketSender().sendMessage("Join our Discord: discord.gg/4zrA2Wy");
+ player.getPacketSender().sendMessage("@red@Did you know?@bla@ We're open source and pull requests are welcome!");
+ player.getPacketSender().sendMessage("Source code: github.com/dginovker/2006rebotted");
+ player.getPacketSender().sendMessage("Discord: discord.gg/4zrA2Wy");
player.getDialogueHandler().sendDialogues(3115, 2224);
player.isRunning2 = false;
player.autoRet = 1;
diff --git a/2006Redone Server/src/com/rebotted/game/shops/ShopAssistant.java b/2006Redone Server/src/com/rebotted/game/shops/ShopAssistant.java
index 29cb5991..a0fa218e 100644
--- a/2006Redone Server/src/com/rebotted/game/shops/ShopAssistant.java
+++ b/2006Redone Server/src/com/rebotted/game/shops/ShopAssistant.java
@@ -344,11 +344,6 @@ public class ShopAssistant {
player.getPacketSender().sendMessage("Selling items as an admin has been disabled.");
return false;
}
- if (!player.inPlayerShopArea()) //Packet abuse!
- {
- player.getPacketSender().sendMessage("You're not in a shopping area! Enter one to sell items & manage your store.");
- return false;
- }
if(!player.isShopping) {
return false;
}
diff --git a/2006Redone Server/src/com/rebotted/net/packets/impl/Commands.java b/2006Redone Server/src/com/rebotted/net/packets/impl/Commands.java
index f5418df7..17df9a74 100644
--- a/2006Redone Server/src/com/rebotted/net/packets/impl/Commands.java
+++ b/2006Redone Server/src/com/rebotted/net/packets/impl/Commands.java
@@ -79,6 +79,9 @@ public class Commands implements PacketType {
case "loc":
player.getPacketSender().sendMessage("Your coords are [" + player.absX + ", " + player.absY + ", " + player.heightLevel + "]");
break;
+ case "energy":
+ player.getPacketSender().sendMessage(String.format("Run energy: %d", (int) player.playerEnergy));
+ break;
case "password":
case "pwd":
if (arguments.length < 2) {
@@ -128,6 +131,9 @@ public class Commands implements PacketType {
}
break;
+ case "prayer":
+ player.getPacketSender().sendMessage(String.format("Prayer points: %d", player.playerLevel[5]));
+ break;
case "shop":
BotHandler.playerShop(player);
break;
@@ -143,8 +149,8 @@ public class Commands implements PacketType {
else {
player.isSnowy = true;
player.getPacketSender().walkableInterface(11877);
+ player.getPacketSender().sendMessage("Happy Holidays! Type ::snow to disable/enable! (Auto-disabling in certain area)");
}
- player.getPacketSender().sendMessage("Happy Holidays! Type ::snow to disable/enable! (Auto-disabling in certain area)");
}
break;
case "withdrawshop":
diff --git a/CompiledServer/production/2006rebotted/com/rebotted/game/items/ItemAssistant.class b/CompiledServer/production/2006rebotted/com/rebotted/game/items/ItemAssistant.class
index 58a2a13e..70f706fd 100644
Binary files a/CompiledServer/production/2006rebotted/com/rebotted/game/items/ItemAssistant.class and b/CompiledServer/production/2006rebotted/com/rebotted/game/items/ItemAssistant.class differ
diff --git a/CompiledServer/production/2006rebotted/com/rebotted/net/packets/impl/Commands.class b/CompiledServer/production/2006rebotted/com/rebotted/net/packets/impl/Commands.class
index 42884bbc..4b9bf4ed 100644
Binary files a/CompiledServer/production/2006rebotted/com/rebotted/net/packets/impl/Commands.class and b/CompiledServer/production/2006rebotted/com/rebotted/net/packets/impl/Commands.class differ