Merge branch 'master' of https://github.com/dginovker/2006rebotted

.idea/workspace.xml

@@ -7,14 +7,19 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="9c1d485e-b413-4c80-b742-7c5a88c1c73c" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/2006Redone Server/src/com/rebotted/net/packets/impl/Commands.java" beforeDir="false" afterPath="$PROJECT_DIR$/2006Redone Server/src/com/rebotted/net/packets/impl/Commands.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/CompiledServer/production/2006rebotted/com/rebotted/net/packets/impl/Commands.class" beforeDir="false" afterPath="$PROJECT_DIR$/CompiledServer/production/2006rebotted/com/rebotted/net/packets/impl/Commands.class" afterDir="false" />
     </list>
-    <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
     <option name="LAST_RESOLUTION" value="IGNORE" />
   </component>
+  <component name="FileColors">
+    <fileColor scope="Local Unit Tests" color="#161c22" />
+    <fileColor scope="Android Instrumented Tests" color="#161c22" />
+  </component>
   <component name="FindInProjectRecents">
     <findStrings>
       <find>math.sq</find>
@@ -29,25 +34,20 @@
     <option name="height" value="1407" />
   </component>
   <component name="ProjectId" id="1Sr1PyvKre5eWJ6XgOrqWrHM5hp" />
+  <component name="ProjectViewState">
+    <option name="hideEmptyMiddlePackages" value="true" />
+    <option name="showExcludedFiles" value="true" />
+    <option name="showLibraryContents" value="true" />
+  </component>
   <component name="PropertiesComponent">
     <property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
+    <property name="WebServerToolWindowFactoryState" value="false" />
+    <property name="aspect.path.notification.shown" value="true" />
     <property name="last_opened_file_path" value="$PROJECT_DIR$/2006Redone Client/METAs/Client Meta" />
     <property name="project.structure.last.edited" value="Project" />
     <property name="project.structure.proportion" value="0.15" />
     <property name="project.structure.side.proportion" value="0.2" />
   </component>
-  <component name="RunDashboard">
-    <option name="ruleStates">
-      <list>
-        <RuleState>
-          <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
-        </RuleState>
-        <RuleState>
-          <option name="name" value="StatusDashboardGroupingRule" />
-        </RuleState>
-      </list>
-    </option>
-  </component>
   <component name="RunManager" selected="Application.GameEngine">
     <configuration name="Client" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
       <option name="MAIN_CLASS_NAME" value="Client" />
@@ -97,6 +97,18 @@
       </list>
     </recent_temporary>
   </component>
+  <component name="ServiceViewManager">
+    <option name="viewStates">
+      <list>
+        <serviceView>
+          <treeState>
+            <expand />
+            <select />
+          </treeState>
+        </serviceView>
+      </list>
+    </option>
+  </component>
   <component name="SvnConfiguration">
     <configuration />
   </component>
@@ -107,9 +119,14 @@
       <option name="number" value="Default" />
       <option name="presentableId" value="Default" />
       <updated>1572306880139</updated>
+      <workItem from="1576853591840" duration="1190000" />
+      <workItem from="1576854792240" duration="1663000" />
     </task>
     <servers />
   </component>
+  <component name="TypeScriptGeneratedFilesManager">
+    <option name="version" value="1" />
+  </component>
   <component name="Vcs.Log.Tabs.Properties">
     <option name="TAB_STATES">
       <map>
@@ -137,4 +154,22 @@
       </map>
     </option>
   </component>
+  <component name="WindowStateProjectService">
+    <state width="1877" height="266" key="GridCell.Tab.0.bottom" timestamp="1576858443106">
+      <screen x="0" y="40" width="1920" height="1040" />
+    </state>
+    <state width="1877" height="266" key="GridCell.Tab.0.bottom/0.40.1920.1040@0.40.1920.1040" timestamp="1576858443106" />
+    <state width="1877" height="266" key="GridCell.Tab.0.center" timestamp="1576858443106">
+      <screen x="0" y="40" width="1920" height="1040" />
+    </state>
+    <state width="1877" height="266" key="GridCell.Tab.0.center/0.40.1920.1040@0.40.1920.1040" timestamp="1576858443106" />
+    <state width="1877" height="266" key="GridCell.Tab.0.left" timestamp="1576858443105">
+      <screen x="0" y="40" width="1920" height="1040" />
+    </state>
+    <state width="1877" height="266" key="GridCell.Tab.0.left/0.40.1920.1040@0.40.1920.1040" timestamp="1576858443105" />
+    <state width="1877" height="266" key="GridCell.Tab.0.right" timestamp="1576858443106">
+      <screen x="0" y="40" width="1920" height="1040" />
+    </state>
+    <state width="1877" height="266" key="GridCell.Tab.0.right/0.40.1920.1040@0.40.1920.1040" timestamp="1576858443106" />
+  </component>
 </project>

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;
-	
 }

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);

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);

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;

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) {

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");

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<String> killedPlayers = new ArrayList<String>();
 	public ArrayList<Integer> attackedPlayers = new ArrayList<Integer>();
 	public ArrayList<String> lastKilledPlayers = new ArrayList<String>();

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("@red@Did you know?@bla@ We're open source and pull requests are welcome!");
-			player.getPacketSender().sendMessage("Source code at github.com/dginovker/2006rebotted");
+			player.getPacketSender().sendMessage("Source code: github.com/dginovker/2006rebotted");
-			player.getPacketSender().sendMessage("Welcome to the Beta! A reset will occur before main release -");
+			player.getPacketSender().sendMessage("Discord: discord.gg/4zrA2Wy");
-			player.getPacketSender().sendMessage("Join our Discord: discord.gg/4zrA2Wy");
 			player.getDialogueHandler().sendDialogues(3115, 2224);
 			player.isRunning2 = false;
 			player.autoRet = 1;

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;
 		}

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":