From efc6b3c8be1930bc18735350900ccf6ad4ac4c86 Mon Sep 17 00:00:00 2001
From: Danial <RedSparr0w@users.noreply.github.com>
Date: Thu, 31 Oct 2019 14:21:19 +1300
Subject: [PATCH] Misc changes (#129)

* fixup "cantattack" command

* remove duplicate code

* fix brimhaven vines

* fixup cluescroll drops

* add clicktotele alias

* check player has an axe

* remove duplicate item id
---
 .idea/misc.xml                                |   2 +-
 .idea/workspace.xml                           |  19 +++++++++-----
 .../game/content/skills/core/Woodcutting.java |   2 +-
 .../src/redone/game/items/Item.java           |   2 +-
 .../src/redone/game/npcs/NpcHandler.java      |  16 ++++--------
 .../game/objects/impl/BrimhavenVines.java     |  24 ++++++++++++------
 .../src/redone/net/packets/impl/Commands.java |   3 ++-
 .../src/redone/world/ItemHandler.java         |  13 +++-------
 .../content/skills/core/Woodcutting.class     | Bin 10645 -> 10635 bytes
 9 files changed, 42 insertions(+), 39 deletions(-)

diff --git a/.idea/misc.xml b/.idea/misc.xml
index fb83acef..048d263d 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="false" project-jdk-name="1.8.0_222" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="false" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/CompiledServer" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index da4d252a..59d252af 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -6,9 +6,14 @@
     </artifacts-to-build>
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="e34c4650-a3c9-498e-b05e-c1cbb72d0ad7" name="Default Changelist" comment="">
+    <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$/CompiledServer/artifacts/localhost_2006rebotted_jar/2006rebotted.jar" beforeDir="false" afterPath="$PROJECT_DIR$/CompiledServer/artifacts/localhost_2006rebotted_jar/2006rebotted.jar" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/2006Redone Server/src/redone/game/npcs/NpcHandler.java" beforeDir="false" afterPath="$PROJECT_DIR$/2006Redone Server/src/redone/game/npcs/NpcHandler.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/2006Redone Server/src/redone/net/packets/impl/Commands.java" beforeDir="false" afterPath="$PROJECT_DIR$/2006Redone Server/src/redone/net/packets/impl/Commands.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/2006Redone Server/src/redone/world/ObjectHandler.java" beforeDir="false" afterPath="$PROJECT_DIR$/2006Redone Server/src/redone/world/ObjectHandler.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/CompiledServer/production/2006rebotted/redone/net/packets/impl/Commands.class" beforeDir="false" afterPath="$PROJECT_DIR$/CompiledServer/production/2006rebotted/redone/net/packets/impl/Commands.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/CompiledServer/production/2006rebotted/redone/world/ObjectHandler.class" beforeDir="false" afterPath="$PROJECT_DIR$/CompiledServer/production/2006rebotted/redone/world/ObjectHandler.class" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
@@ -23,7 +28,7 @@
   <component name="PropertiesComponent">
     <property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
     <property name="last_opened_file_path" value="$PROJECT_DIR$/2006Redone Client/METAs/Client Meta" />
-    <property name="project.structure.last.edited" value="Artifacts" />
+    <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>
@@ -39,7 +44,7 @@
       </list>
     </option>
   </component>
-  <component name="RunManager" selected="Application.Client">
+  <component name="RunManager" selected="Application.Server">
     <configuration name="Client" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
       <option name="MAIN_CLASS_NAME" value="Client" />
       <module name="2006rebotted" />
@@ -82,8 +87,8 @@
     </list>
     <recent_temporary>
       <list>
-        <item itemvalue="Application.FileServer" />
         <item itemvalue="Application.Server" />
+        <item itemvalue="Application.FileServer" />
         <item itemvalue="Application.Client" />
       </list>
     </recent_temporary>
@@ -106,7 +111,9 @@
       <map>
         <entry key="MAIN">
           <value>
-            <State />
+            <State>
+              <option name="COLUMN_ORDER" />
+            </State>
           </value>
         </entry>
       </map>
diff --git a/2006Redone Server/src/redone/game/content/skills/core/Woodcutting.java b/2006Redone Server/src/redone/game/content/skills/core/Woodcutting.java
index c87991a0..1b994523 100644
--- a/2006Redone Server/src/redone/game/content/skills/core/Woodcutting.java	
+++ b/2006Redone Server/src/redone/game/content/skills/core/Woodcutting.java	
@@ -175,7 +175,7 @@ public class Woodcutting {
 		}
 	}
 	
-	public boolean hasAxe(Client player) {
+	public static boolean hasAxe(Client player) {
 		for (int i = 0; i < Axe_Settings.length; i++) {
 			if (player.getItemAssistant().playerHasItem(Axe_Settings[i][0]) || player.playerEquipment[player.playerWeapon] == Axe_Settings[i][0]) {
 				return true;
diff --git a/2006Redone Server/src/redone/game/items/Item.java b/2006Redone Server/src/redone/game/items/Item.java
index 650ea132..fe871ab9 100644
--- a/2006Redone Server/src/redone/game/items/Item.java	
+++ b/2006Redone Server/src/redone/game/items/Item.java	
@@ -88,7 +88,7 @@ public class Item {
 			6062 };
 	public static int rings[] = { 8082, 773, 1635, 1637, 1639, 1641, 1643,
 			1645, 2550, 2552, 2554, 2556, 2558, 2560, 2562, 2564, 2566, 2568,
-			2570, 2572, 4202, 4657, 6465, 6737, 6731, 6735, 6735, 6583, 6733 };
+			2570, 2572, 4202, 4657, 6465, 6737, 6731, 6735, 6583, 6733 };
 	public static int body[] = { 7608, 2520, 430, 7362, 7364, 636, 638, 640,
 			642, 644, 8064, 426, 430, 1005, 1757, 7592, 8031, 8027, 6617, 8019,
 			8014, 8002, 7376, 544, 7372, 7370, 577, 7974, 7970, 7965, 7961,
diff --git a/2006Redone Server/src/redone/game/npcs/NpcHandler.java b/2006Redone Server/src/redone/game/npcs/NpcHandler.java
index f772435e..9e8f947e 100644
--- a/2006Redone Server/src/redone/game/npcs/NpcHandler.java	
+++ b/2006Redone Server/src/redone/game/npcs/NpcHandler.java	
@@ -935,7 +935,7 @@ public class NpcHandler {
 							break;
 					}
 					if (Misc.random(1, 256) == 1) {
-						int level = npcs[i].combatLevel;
+						int level = getNpcListCombat(npcs[i].npcType);
 						if (level >= 2 && level <= 24) // easy
 							Server.itemHandler.createGroundItem(c, 2677, npcs[i].absX, npcs[i].absY, 1, c.playerId);
 						else if (level <= 40) // easy → medium
@@ -944,8 +944,8 @@ public class NpcHandler {
 							Server.itemHandler.createGroundItem(c, 2678, npcs[i].absX, npcs[i].absY, 1, c.playerId);
 						else if (level <= 150) // medium → hard
 							Server.itemHandler.createGroundItem(c, 2678 + Misc.random(0, 1), npcs[i].absX, npcs[i].absY, 1, c.playerId);
-						else // hard
-							Server.itemHandler.createGroundItem(c, 2678 + Misc.random(0, 1), npcs[i].absX, npcs[i].absY, 1, c.playerId);
+						else if (level > 150)// hard
+							Server.itemHandler.createGroundItem(c, 2679, npcs[i].absX, npcs[i].absY, 1, c.playerId);
 					}
 				}
 			}
@@ -1387,16 +1387,10 @@ public class NpcHandler {
 				token = token.trim();
 				token2 = line.substring(spot + 1);
 				token2 = token2.trim();
-				token2_2 = token2.replaceAll("\t\t", "\t");
-				token2_2 = token2_2.replaceAll("\t\t", "\t");
-				token2_2 = token2_2.replaceAll("\t\t", "\t");
-				token2_2 = token2_2.replaceAll("\t\t", "\t");
-				token2_2 = token2_2.replaceAll("\t\t", "\t");
+				token2_2 = token2.replaceAll("\t+", "\t");
 				token3 = token2_2.split("\t");
 				if (token.equals("npc")) {
-					newNPCList(Integer.parseInt(token3[0]), token3[1],
-							Integer.parseInt(token3[2]),
-							Integer.parseInt(token3[3]));
+					newNPCList(Integer.parseInt(token3[0]), token3[1], Integer.parseInt(token3[2]), Integer.parseInt(token3[3]));
 				}
 			} else {
 				if (line.equals("[ENDOFNPCLIST]")) {
diff --git a/2006Redone Server/src/redone/game/objects/impl/BrimhavenVines.java b/2006Redone Server/src/redone/game/objects/impl/BrimhavenVines.java
index 08f4b53f..444369c6 100644
--- a/2006Redone Server/src/redone/game/objects/impl/BrimhavenVines.java	
+++ b/2006Redone Server/src/redone/game/objects/impl/BrimhavenVines.java	
@@ -1,5 +1,6 @@
 package redone.game.objects.impl;
 
+import redone.game.content.skills.core.Woodcutting;
 import redone.game.players.Client;
 
 /**
@@ -8,6 +9,11 @@ import redone.game.players.Client;
 public class BrimhavenVines {
 
 	public static void handleBrimhavenVines(Client c, int objectType) {
+		if (!Woodcutting.hasAxe(c)) {
+			c.getActionSender().sendMessage("You will need an axe to chop through these!");
+			return;
+		}
+		c.getActionSender().sendMessage("You chop your way through the vines.");
 		switch (objectType) {
 		case 12987:
 		case 12986:
@@ -31,21 +37,23 @@ public class BrimhavenVines {
 		}
 	}
 
-	public static void moveThroughVinesX(Client c, int originX, int x1, int y1,
-			int x2, int y2) {
+	public static void moveThroughVinesX(Client c, int originX, int x1, int y1, int x2, int y2) {
+		int x = c.getX();
+		int y = c.getY();
 		if (c.absX <= originX) {
-			c.getPlayerAssistant().walkTo(x1, y1);
+			c.getPlayerAssistant().movePlayer(x + x1, y + y1, 0);
 		} else {
-			c.getPlayerAssistant().walkTo(x2, y2);
+			c.getPlayerAssistant().movePlayer(x + x2, y + y2, 0);
 		}
 	}
 
-	public static void moveThroughVinesY(Client c, int originY, int x1, int y1,
-			int x2, int y2) {
+	public static void moveThroughVinesY(Client c, int originY, int x1, int y1, int x2, int y2) {
+		int x = c.getX();
+		int y = c.getY();
 		if (c.absY <= originY) {
-			c.getPlayerAssistant().walkTo(x1, y1);
+			c.getPlayerAssistant().movePlayer(x + x1, y + y1, 0);
 		} else {
-			c.getPlayerAssistant().walkTo(x2, y2);
+			c.getPlayerAssistant().movePlayer(x + x2, y + y2, 0);
 		}
 	}
 
diff --git a/2006Redone Server/src/redone/net/packets/impl/Commands.java b/2006Redone Server/src/redone/net/packets/impl/Commands.java
index 836c2802..0ab2f2f2 100644
--- a/2006Redone Server/src/redone/net/packets/impl/Commands.java	
+++ b/2006Redone Server/src/redone/net/packets/impl/Commands.java	
@@ -522,6 +522,7 @@ public class Commands implements PacketType {
         public static void developerCommands(Client player, String playerCommand, String[] arguments) {
                 switch (playerCommand.toLowerCase()) {
                         case "clicktotele":
+                        case "ctt": // alias
                                 player.clickToTele = !player.clickToTele;
                                 player.getActionSender().sendMessage("Click to teleport: " + (player.clickToTele ? "Enabled" : "Disabled"));
                                 break;
@@ -627,7 +628,7 @@ public class Commands implements PacketType {
                                         }
                                 } catch (Exception ಠ_ಠ) {}
                                 break;
-                        case "cantAttack":
+                        case "cantattack":
                                 player.npcCanAttack = !player.npcCanAttack;
                                 player.getActionSender().sendMessage("Npcs " + (player.npcCanAttack ? "can" : "can no longer") + " attack you.");
                                 break;
diff --git a/2006Redone Server/src/redone/world/ItemHandler.java b/2006Redone Server/src/redone/world/ItemHandler.java
index 233ad624..b1540004 100644
--- a/2006Redone Server/src/redone/world/ItemHandler.java	
+++ b/2006Redone Server/src/redone/world/ItemHandler.java	
@@ -305,9 +305,7 @@ public int itemAmount(String name, int itemId, int itemX, int itemY) {
 
 	public ItemList ItemList[] = new ItemList[Constants.ITEM_LIMIT];
 
-	public void newItemList(int ItemId, String ItemName,
-			String ItemDescription, double ShopValue, double LowAlch,
-			double HighAlch, int Bonuses[]) {
+	public void newItemList(int ItemId, String ItemName, String ItemDescription, double ShopValue, double LowAlch, double HighAlch, int Bonuses[]) {
 		// first, search for a free slot
 		int slot = -1;
 		for (int i = 0; i < 11740; i++) {
@@ -386,11 +384,7 @@ public int itemAmount(String name, int itemId, int itemX, int itemY) {
 				token = token.trim();
 				token2 = line.substring(spot + 1);
 				token2 = token2.trim();
-				token2_2 = token2.replaceAll("\t\t", "\t");
-				token2_2 = token2_2.replaceAll("\t\t", "\t");
-				token2_2 = token2_2.replaceAll("\t\t", "\t");
-				token2_2 = token2_2.replaceAll("\t\t", "\t");
-				token2_2 = token2_2.replaceAll("\t\t", "\t");
+				token2_2 = token2.replaceAll("\t+", "\t");
 				token3 = token2_2.split("\t");
 				if (token.equals("item")) {
 					int[] Bonuses = new int[12];
@@ -412,8 +406,7 @@ public int itemAmount(String name, int itemId, int itemX, int itemY) {
 				if (line.equals("[ENDOFITEMLIST]")) {
 					try {
 						characterfile.close();
-					} catch (IOException ioexception) {
-					}
+					} catch (IOException ಠ_ಠ) {}
 					//return true;
 				}
 			}
diff --git a/CompiledServer/production/2006rebotted/redone/game/content/skills/core/Woodcutting.class b/CompiledServer/production/2006rebotted/redone/game/content/skills/core/Woodcutting.class
index 271fbbf09680f8c9ca02b911a621c86b50b017eb..63959b2cfe87d02bc8ad52288935a6e8d62a6b01 100644
GIT binary patch
delta 112
zcmbOl+#S4Ohp0OzLnlKQ10zE=0|P@Z12Y2?khWm9k>13>vu_cDzScGdULaH2h*@tN
z1K%tLF|92O{6H+A2Nhkwz{;|wg>mwKQEhQCpl&7x6NYYvbfAeqa~O&kiWwL-dy9Dq
F0|0BN7We=F

delta 122
zcmeAUo*KMihp0OvLnlKQ10zE=0|Uc!24)~+V6b4emD$9=vu_cDzV<c-ULaG(h*@tN
z1K%tLG3_l3{6H+A2Nhkwz{;|wg=zACQEf#9pl&7x6NYYvbRZ2hharz4A4r2(MGVCZ
KjGG<Byo3Q$As8h9