Added warning for 32-bit and > 1.8 Java versions (#264 )

* Added warning for 32-bit and > 1.8 Java versions * Clarify why
Remove rare protection, add all NPCs to a static list (#254 )
2026-07-02 16:49:03 +00:00 · 2019-12-10 19:21:45 -05:00 · 2019-12-09 22:59:54 -05:00 · 2019-12-09 18:50:39 -05:00 · 2019-12-07 21:19:44 -05:00 · 2019-12-07 21:16:18 -05:00
3100 changed files with 88931 additions and 83701 deletions
@@ -7,13 +7,7 @@
  </component>
  <component name="ChangeListManager">
    <list default="true" id="9c1d485e-b413-4c80-b742-7c5a88c1c73c" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/2006Redone Server/data/logs/shopbuying/bot.txt" beforeDir="false" afterPath="$PROJECT_DIR$/2006Redone Server/data/logs/shopbuying/bot.txt" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/2006Redone Server/src/redone/game/content/combat/CombatAssistant.java" beforeDir="false" afterPath="$PROJECT_DIR$/2006Redone Server/src/redone/game/content/combat/CombatAssistant.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/CompiledServer/production/2006rebotted/redone/game/content/combat/CombatAssistant.class" beforeDir="false" afterPath="$PROJECT_DIR$/CompiledServer/production/2006rebotted/redone/game/content/combat/CombatAssistant.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/CompiledServer/production/2006rebotted/redone/game/players/Trading$1.class" beforeDir="false" afterPath="$PROJECT_DIR$/CompiledServer/production/2006rebotted/redone/game/players/Trading$1.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/CompiledServer/production/2006rebotted/redone/game/players/Trading.class" beforeDir="false" afterPath="$PROJECT_DIR$/CompiledServer/production/2006rebotted/redone/game/players/Trading.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/CompiledServer/production/2006rebotted/redone/game/shops/ShopAssistant.class" beforeDir="false" afterPath="$PROJECT_DIR$/CompiledServer/production/2006rebotted/redone/game/shops/ShopAssistant.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
    </list>
    <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
    <option name="SHOW_DIALOG" value="false" />
@@ -21,46 +15,6 @@
    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
    <option name="LAST_RESOLUTION" value="IGNORE" />
  </component>
-  <component name="FileEditorManager">
-    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/2006Redone Server/src/redone/game/shops/ShopAssistant.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="618">
-              <caret line="396" column="115" selection-start-line="396" selection-start-column="115" selection-end-line="396" selection-end-column="115" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/2006Redone Server/src/redone/game/content/combat/CombatAssistant.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="197">
-              <caret line="2066" column="71" selection-start-line="2066" selection-start-column="71" selection-end-line="2066" selection-end-column="71" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/2006Redone Server/src/redone/game/players/Trading.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="404">
-              <caret line="74" column="108" lean-forward="true" selection-start-line="74" selection-start-column="108" selection-end-line="74" selection-end-column="108" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/2006Redone Server/src/redone/util/Misc.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="115">
-              <caret line="8" column="30" lean-forward="true" selection-start-line="8" selection-start-column="30" selection-end-line="8" selection-end-column="30" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-    </leaf>
-  </component>
  <component name="FindInProjectRecents">
    <findStrings>
      <find>math.sq</find>
@@ -69,13 +23,6 @@
  <component name="Git.Settings">
    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
  </component>
-  <component name="IdeDocumentHistory">
-    <option name="CHANGED_PATHS">
-      <list>
-        <option value="$PROJECT_DIR$/2006Redone Server/src/redone/game/content/combat/CombatAssistant.java" />
-      </list>
-    </option>
-  </component>
  <component name="ProjectFrameBounds">
    <option name="x" value="-7" />
    <option name="width" value="1294" />
@@ -101,7 +48,7 @@
      </list>
    </option>
  </component>
-  <component name="RunManager" selected="Application.Server">
+  <component name="RunManager" selected="Application.GameEngine">
    <configuration name="Client" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
      <option name="MAIN_CLASS_NAME" value="Client" />
      <module name="2006rebotted" />
@@ -123,8 +70,8 @@
        <option name="Make" enabled="true" />
      </method>
    </configuration>
-    <configuration name="Server" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
-      <option name="MAIN_CLASS_NAME" value="redone.Server" />
+    <configuration name="GameEngine" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
+      <option name="MAIN_CLASS_NAME" value="com.rebotted.GameEngine" />
      <module name="2006rebotted" />
      <option name="WORKING_DIRECTORY" value="2006Redone Server" />
      <extension name="coverage">
@@ -139,12 +86,12 @@
    </configuration>
    <list>
      <item itemvalue="Application.FileServer" />
-      <item itemvalue="Application.Server" />
+      <item itemvalue="Application.GameEngine" />
      <item itemvalue="Application.Client" />
    </list>
    <recent_temporary>
      <list>
-        <item itemvalue="Application.Server" />
+        <item itemvalue="Application.GameEngine" />
        <item itemvalue="Application.FileServer" />
        <item itemvalue="Application.Client" />
      </list>
@@ -155,7 +102,7 @@
  </component>
  <component name="TaskManager">
    <task active="true" id="Default" summary="Default task">
-      <changelist id="e34c4650-a3c9-498e-b05e-c1cbb72d0ad7" name="Default Changelist" comment="" />
+      <changelist id="9c1d485e-b413-4c80-b742-7c5a88c1c73c" name="Default Changelist" comment="" />
      <created>1572306880139</created>
      <option name="number" value="Default" />
      <option name="presentableId" value="Default" />
@@ -163,50 +110,12 @@
    </task>
    <servers />
  </component>
-  <component name="ToolWindowManager">
-    <frame x="-7" y="0" width="974" height="1047" extended-state="0" />
-    <editor active="true" />
-    <layout>
-      <window_info content_ui="combo" id="Project" order="0" weight="0.25" />
-      <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
-      <window_info id="Image Layers" order="2" />
-      <window_info id="Designer" order="3" />
-      <window_info id="UI Designer" order="4" />
-      <window_info id="Capture Tool" order="5" />
-      <window_info id="Favorites" order="6" side_tool="true" />
-      <window_info anchor="bottom" id="Message" order="0" />
-      <window_info anchor="bottom" id="Find" order="1" />
-      <window_info active="true" anchor="bottom" id="Run" order="2" visible="true" weight="0.032822758" />
-      <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
-      <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
-      <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
-      <window_info anchor="bottom" id="TODO" order="6" />
-      <window_info anchor="bottom" id="Terminal" order="7" />
-      <window_info anchor="bottom" id="Event Log" order="8" side_tool="true" />
-      <window_info anchor="bottom" id="Version Control" order="9" />
-      <window_info anchor="bottom" id="Messages" order="10" />
-      <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
-      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="1" weight="0.25" />
-      <window_info anchor="right" id="Palette" order="2" />
-      <window_info anchor="right" id="Ant Build" order="3" weight="0.25" />
-      <window_info anchor="right" id="Maven" order="4" />
-      <window_info anchor="right" id="Theme Preview" order="5" />
-      <window_info anchor="right" id="Capture Analysis" order="6" />
-      <window_info anchor="right" id="Palette&#9;" order="7" />
-    </layout>
-  </component>
  <component name="Vcs.Log.Tabs.Properties">
    <option name="TAB_STATES">
      <map>
        <entry key="MAIN">
          <value>
            <State>
-              <option name="RECENTLY_FILTERED_USER_GROUPS">
-                <collection />
-              </option>
-              <option name="RECENTLY_FILTERED_BRANCH_GROUPS">
-                <collection />
-              </option>
              <option name="COLUMN_ORDER" />
            </State>
          </value>
@@ -228,20 +137,4 @@
      </map>
    </option>
  </component>
-  <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/2006Redone Server/src/redone/game/players/Trading.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="404">
-          <caret line="74" column="108" lean-forward="true" selection-start-line="74" selection-start-column="108" selection-end-line="74" selection-end-column="108" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/2006Redone Server/src/redone/game/content/combat/CombatAssistant.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="197">
-          <caret line="2066" column="71" selection-start-line="2066" selection-start-column="71" selection-end-line="2066" selection-end-column="71" />
-        </state>
-      </provider>
-    </entry>
-  </component>
 </project>
@@ -3,11 +3,9 @@
 * THIS IS TO ALLOW LOCAL PARABOT TO CONTINUE TO WORK
 */

+import javax.swing.*;
 import java.applet.AppletContext;
-import java.awt.Color;
-import java.awt.Component;
-import java.awt.Font;
-import java.awt.Graphics;
+import java.awt.*;
 import java.awt.event.KeyEvent;
 import java.io.ByteArrayInputStream;
 import java.io.DataInputStream;
@@ -11537,6 +11535,16 @@ public class Game extends RSApplet {
 	}

 	public Game() {
+	    //Test if they're on 32-bit, warn them if they are
+		if (!System.getProperty("os.arch").contains("64"))
+		{
+			JOptionPane.showMessageDialog(null, "You're running 32-bit java. This will definitely cause problems.\nYou can get the right Java 8 at AdoptOpenJDK.net", "You're running 32-bit Java!", JOptionPane.INFORMATION_MESSAGE);
+			System.out.println("Please upgrade to 64-bit java to avoid problems! (AdoptOpenJDK.net)");
+		}
+		if (Double.parseDouble(System.getProperty("java.specification.version")) >= 1.9) {
+			JOptionPane.showMessageDialog(null, "You're not running Java 8. If you're using Parabot, this will cause problems!\nYou can get Java 8 from AdoptOpenJDK.net", "You're not running Java 8!", JOptionPane.INFORMATION_MESSAGE);
+			System.out.println("Please downgrade to Java 8 to avoid problems! (AdoptOpenJDK.net)");
+		}
 		server = ClientSettings.SERVER_IP;
 		anIntArrayArray825 = new int[104][104];
 		friendsNodeIDs = new int[200];
@@ -0,0 +1,3 @@
+private static final BigInteger RSA_MODULUS = new BigInteger("91553247461173033466542043374346300088148707506479543786501537350363031301992107112953015516557748875487935404852620239974482067336878286174236183516364787082711186740254168914127361643305190640280157664988536979163450791820893999053469529344247707567448479470137716627440246788713008490213212272520901741443");
+
+private static final BigInteger RSA_EXPONENT = new BigInteger("33280025241734061313051117678670856264399753710527826596057587687835856000539511539311834363046145710983857746766009612538140077973762171163294453513440619295457626227183742315140865830778841533445402605660729039310637444146319289077374748018792349647460850308384280105990607337322160553135806205784213241305");
@@ -0,0 +1,3 @@
+private static final BigInteger RSA_MODULUS = new BigInteger("91553247461173033466542043374346300088148707506479543786501537350363031301992107112953015516557748875487935404852620239974482067336878286174236183516364787082711186740254168914127361643305190640280157664988536979163450791820893999053469529344247707567448479470137716627440246788713008490213212272520901741443");
+
+private static final BigInteger RSA_EXPONENT = new BigInteger("65537");
@@ -308,9 +308,9 @@
 243:1:2912:9804
 243:1:2910:9800
 243:1:2905:9808
-3138:1:3461:9485
-3138:1:3460:9482
-3138:1:3460:9480
+3138:1:3461:9485:2
+3138:1:3460:9482:2
+3138:1:3460:9480:2
 1059:1:3093:3487
 954:1:2907:3146
 1963:1:2903:3146
@@ -1,5 +1,5 @@
 //-----ShopID---ShopName----------------------------------------Sell----Buy-----Item----Amount--Item----Amount--Item----Amount--Item----Amount--Item----Amount--Item----Amount--Item----Amount--Item----Amount--Item----Amount--Item----Amount--Item----Amount--Item----Amount--Item----Amount--Item----Amount--Item----Amount--Item----Amount--Item----Amount--Item----Amount
-shop = 2	Amulet_Store	2	2	1718	0	1727	0	1729	0	1725	0	1731	0	
+shop = 2	Amulet_Store	2	2	1718	0	1727	0	1729	0	1725	0	1731	0
 shop = 3	Lowe's Archery Emporium	2	2	882	100	884	100	886	100	888	100	890	30	841	10	839	10	843	10	845	10	849	10	847	10	853	10	851	10
 shop = 4	Hickton's Archery Emperium	2	2	882	1000	884	100	886	0	888	0	890	0	4773	0	4778	0	4783	0	4788	0	4793	0	4798	0	4803	0	39	0	40	0	41	0	42	0	43	0	44	0	841	10	843	10	1133	10	1097	10
 shop = 5	Lletya's_Archery_Shop	2	2	884	1000	886	1000	888	1000	890	500	892	300	843	10	845	10	837	10	849	10	847	10
@@ -17,10 +17,10 @@ shop = 16	Barker's Haberdashery	2	2	2894	10	2896	10	2898	10	2900	10	2902	10	2904
 shop = 17	Lletya_Seamstress	2	2	1734	100	1733	10	1759	100	1763	10	1765	10	1767	1	1769	10	1771	10	1773	10
 shop = 18	Dodgy_Mike's_Second-hand_Clothing	2	2	7114	10	7110	10	7112	10	7116	10	7122	10	7124	10	7126	10	7128	10	7130	10	7132	10	7134	10	7136	10	7138	10
 shop = 19	Agmundi_Quality_Clothes	2	2	5050	10	5052	10	5038	10	5040	10	5044	10	5046	10	5026	10	5028	10	5032	10	5034	10
-shop = 20	Vermundi's Clothes Stall	2	2	950	10	
-shop = 21	Grand_Tree_Groceries	2	2	2171	10	2128	10	1933	10	2169	10	1957	10	1942	10	1965	10	1982	10	1985	10	2120	10	2108	10	2102	10	2114	10	2126	10	2025	10	1973	10	2130	10	1927	10	946	10	2167	10	2164	10	2165	10	2166	10	
+shop = 20	Vermundi's Clothes Stall	2	2	950	10
+shop = 21	Grand_Tree_Groceries	2	2	2171	10	2128	10	1933	10	2169	10	1957	10	1942	10	1965	10	1982	10	1985	10	2120	10	2108	10	2102	10	2114	10	2126	10	2025	10	1973	10	2130	10	1927	10	946	10	2167	10	2164	10	2165	10	2166	10
 shop = 22	Funch's_Fine_Groceries	2	2	2021	10	2019	10	2015	10	2017	10	2114	10	2128	10	2108	10	2102	10	2120	10	2126	10	2025	10	1973	10	1975	10	2130	10	1927	10	946	10	2026	10
-shop = 23	Frenita's_Cookery_Shop	2	2	2313	10	1955	0	1887	10	1923	10	1942	10	590	10	1935	10	1931	30	1973	10	1933	500	1980	10	
+shop = 23	Frenita's_Cookery_Shop	2	2	2313	10	1955	0	1887	10	1923	10	1942	10	590	10	1935	10	1931	30	1973	10	1933	500	1980	10
 shop = 24	Dommik's Crafting Shop	2	2	1755	10	1733	10	1734	1000	5523	10	1592	10	1595	10	1597	10	1599	10	2976	1
 shop = 25	Rommik's Crafting shop	2	2	1755	10	1733	10	1734	1000	5523	10	1592	10	1595	10	1597	10	1599	10	2976	10
 shop = 26	Farming_Shop	2	2	5376	10	6032	10	5418	10	6036	10	5350	10	5341	10	5329	10	5343	10	952	10	5325	10	1925	10	5331	10	5996	0	6006	0	1965	0	5994	0	5931	0	6000	0	1957	0	1942	0	5504	0	5986	0	1982	0	5982	0	6002	0	5998	0
@@ -39,12 +39,12 @@ shop = 38	Al_Kharid_Gems	2	2	1623	0	1621	0	1619	0	1617	0	1607	0	1605	0	1603	0	16
 shop = 39	Greenstone_Gems	2	2	1607	0	1605	0	1603	0	1601	0
 shop = 40	Peksa's_Helmet_Shop	2	2	1139	10	1137	10	1141	10	1143	10	1145	10	1155	10	1153	10	1157	10	1159	10	1161	10
 shop = 41	Skulgrimens_Battle_Gear	2	2	1337	10	1335	10	1339	10	1341	10	1343	10	1345	10	1347	0	3749	10	3751	10	3753	10	3755	10
-shop = 42	Frincos_Fabulous_Herb_Store	2	2	229	10	233	10	221	10	
-shop = 43	Jatix's_Herblore_Shop	2	2	229	10	233	10	221	10	
+shop = 42	Frincos_Fabulous_Herb_Store	2	2	229	10	233	10	221	10
+shop = 43	Jatix's_Herblore_Shop	2	2	229	10	233	10	221	10
 shop = 44	Gardener_Gunhild	2	2	3899	100	5341	100
 shop = 45	Grum's_Gold_Exchange	2	2	1635	0	1637	0	1639	0	1641	0	1643	0	1654	0	1656	0	1658	0	1660	0	1662	0	1673	0	1675	0	1677	0	1679	0	1681	0
 shop = 46	Ali_the_Kebab_seller	2	2	1971	1000
-shop = 47	Karim's_Kebabs	2	2	1971	1000	
+shop = 47	Karim's_Kebabs	2	2	1971	1000
 shop = 48	Kjut's_Kebabs	2	2	1971	1000
 shop = 49	Flynn's Mace Shop	2	2	1422	10	1420	10	1424	8	1428	6	1430	4
 shop = 50	Ali's_Discount_Wares	2	2	1931	30	1935	10	1823	30	1833	10	1837	10	1925	10	4593	10	4591	10	970	10	946	10	590	10	1265	10	2138	10
@@ -56,46 +56,46 @@ shop = 55	Battle_Runes	2	2	554	100	555	100	556	100	557	100	559	100	558	100	562	3
 shop = 56	Tutab's_Magic_Market	2	2	554	1000	555	1000	556	1000	557	1000	563	100	221	10	4006	10	4023	10
 shop = 57	Void_Knight_Magic_Store	2	2	554	1000	555	1000	556	1000	557	1000	558	1000	559	1000	562	300	560	300
 shop = 58	TzHaar_Mej_Roh's_Rune_Store	2	2	554	5000	555	5000	556	5000	557	5000	558	5000	559	5000	560	2500	562	2500
-shop = 59	Nurmofs_Pickaxe_Shop	2	2	1265	10	1267	10	1269	10	1273	10	1271	10	1275	10
+shop = 59	Nurmof's_Pickaxe_Shop	2	2	1265	10	1267	10	1269	10	1273	10	1271	10	1275	10
 shop = 60	Drogo's_Mining_Emporium	2	2	2347	10	1265	10	436	0	438	0	440	0	453	0	2349	0	2351	0	2357	0
 shop = 61	Pickaxe_is_Mine	2	2	1265	10	1269	10	1273	10	1271	10	1275	10
 shop = 62	Zenesha's_Platebody_Shop	2	2	1117	10	1115	10	1119	10	1125	10	1121	10
 shop = 63	Horviks_Platebody_Shop	2	2	1103	10	1101	10	1139	10	1137	10	1115	10	1117	10	1173	10	1175	10	1075	10	1067	10	1087	10	1081	10	1119	10	1125	10	1121	10	1097	10	1133	10
-shop = 64	Louie_Legs	2	2	1075	10	1067	10	1069	10	1071	10	1073	10	
-shop = 65	Seddu's_Adventurer_Store	2	2	1093	10	1079	10	1113	10	1099	10	1065	10	1193	10	1151	10	
+shop = 64	Louie_Legs	2	2	1075	10	1067	10	1069	10	1071	10	1073	10
+shop = 65	Seddu's_Adventurer_Store	2	2	1093	10	1079	10	1113	10	1099	10	1065	10	1193	10	1151	10
 shop = 66	Ranael's Super Skirt Store	2	2	1087	10	1081	10	1083	10	1089	10	1085	10	1091	10
 shop = 67	Zeke's Superior Scimitars	2	2	1321	10	1323	10	1325	10	1329	10
 shop = 68	Daga's Scimitar Smithy	2	2	1321	10	1323	10	1325	10	1329	10	4587	10
 shop = 69	Cassie's_Shield_Shop	2	2	1171	10	1173	10	1189	10	1175	10	1191	10	1177	10	1193	10	1181	10
 shop = 70	Silk_Trader	2	2	950	100
-shop = 71	The_Spice_is_Right	2	2	1931	30	2169	10	5970	0	175	10	
+shop = 71	The_Spice_is_Right	2	2	1931	30	2169	10	5970	0	175	10
 shop = 72	Zaff's_Superior_Staves	2	2	1379	10	1389	10	1381	10	1383	10	1385	10	1387	10
 shop = 73	Dwarven_Shopping_Store	2	2	1931	30	1935	10	1735	10	1925	10	590	10	1755	10	2347	10
 shop = 74	Aurel's_Supplies	2	2	1351	10	590	10	3363	10	353	10	952	10
-shop = 75	Al_Kharid_General_Store	1	1	1931	30	1935	10	1735	10	1925	30	1923	10	590	10	1755	10	2347	10	550	10	
-shop = 76	Ifaba's_General_Store	1	1	1931	30	1935	10	954	10	1925	30	590	10	2347	10			
-shop = 77	Aemad's Adventuring Supplies	1	1	227	10	1265	10	1349	10	2142	10	590	10	1759	100	882	1000	954	10	970	10	946	10	1935	10	
-shop = 78	West_Ardougne_General_Store1	1	1931	10	954	10	1265	10	1925	30	590	10	1415	10	1061	10	841	10	882	100	329	10	2327	10	2309	10	2142	10	
+shop = 75	Al_Kharid_General_Store	1	1	1931	30	1935	10	1735	10	1925	30	1923	10	590	10	1755	10	2347	10	550	10
+shop = 76	Ifaba's_General_Store	1	1	1931	30	1935	10	954	10	1925	30	590	10	2347	10
+shop = 77	Aemad's Adventuring Supplies	1	1	227	10	1265	10	1349	10	2142	10	590	10	1759	100	882	1000	954	10	970	10	946	10	1935	10
+shop = 78	West_Ardougne_General_Store1	1	1931	10	954	10	1265	10	1925	30	590	10	1415	10	1061	10	841	10	882	100	329	10	2327	10	2309	10	2142	10
 shop = 79	Bandit_Bargains	1	1	1831	30	1823	30	1937	10	1921	10	1935	10	1923	10	1925	30	1837	10	1833	10	1835	10	946	10
 shop = 80	Canifis_General_Store	1	1	1733	10	1734	1000	1931	30	1925	30	1935	10	590	10	1755	10	2347	10	3377	10	946	10
-shop = 81	Arhein's_Store	1	1	1925	30	1265	10	1923	10	1887	10	590	10	1755	10	2347	10	954	10	1931	30	946	10	
-shop = 82	Edgeville_General_Store	1	1	1931	30	1935	10	1735	10	1925	30	1923	10	1887	10	590	10	1755	10	2347	10	550	10	
-shop = 83	Falador_General_Store	1	1	1931	30	1935	10	1735	10	1925	30	1923	10	1887	10	590	10	1755	10	2347	10	550	10	
-shop = 84	Karamja_General_Store	1	1	1931	30	1935	10	1735	10	1925	30	1923	10	1887	10	590	10	1755	10	2347	10	
-shop = 85	Gunslik's_Assorted_Items	1	1	1935	10	1925	30	590	10	1755	10	2347	10	36	10	973	10	1059	10	229	300	233	10	954	10	
+shop = 81	Arhein's_Store	1	1	1925	30	1265	10	1923	10	1887	10	590	10	1755	10	2347	10	954	10	1931	30	946	10
+shop = 82	Edgeville_General_Store	1	1	1931	30	1935	10	1735	10	1925	30	1923	10	1887	10	590	10	1755	10	2347	10	550	10
+shop = 83	Falador_General_Store	1	1	1931	30	1935	10	1735	10	1925	30	1923	10	1887	10	590	10	1755	10	2347	10	550	10
+shop = 84	Karamja_General_Store	1	1	1931	30	1935	10	1735	10	1925	30	1923	10	1887	10	590	10	1755	10	2347	10
+shop = 85	Gunslik's_Assorted_Items	1	1	1935	10	1925	30	590	10	1755	10	2347	10	36	10	973	10	1059	10	229	300	233	10	954	10
 shop = 86	The_Lighthouse_Store	1	1	954	10	2347	10	1755	10	946	10	952	10	590	10	36	10	273	10	233	10	1931	30	1925	30	1929	10	1935	10	1937	300	229	10	227	10	2019	10	2021	10	2015	10	1915	10	2017	10	1909	10	1913	10	1907	10
-shop = 87	Lletya_General_Store	1	1	1931	30	1935	10	1735	10	1925	30	1923	10	1887	10	590	10	1755	10	2347	10	
-shop = 88	Lumbridge_General_Store	1	1	1931	30	1935	10	1735	10	1925	30	1923	10	1887	10	590	10	1755	10	2347	10	550	10	
-shop = 89	Razmire's_General_Store	1	1	1931	30	1935	10	1735	10	1925	10	590	10	1755	10	2347	10	3424	500	227	300	1933	10	3678	10	
-shop = 90	Nardah_General_Store	1	1	1931	30	1935	10	1735	10	1925	30	1923	10	1887	10	590	10	1755	10	2347	10	
+shop = 87	Lletya_General_Store	1	1	1931	30	1935	10	1735	10	1925	30	1923	10	1887	10	590	10	1755	10	2347	10
+shop = 88	Lumbridge_General_Store	1	1	1931	30	1935	10	1735	10	1925	30	1923	10	1887	10	590	10	1755	10	2347	10	550	10
+shop = 89	Razmire's_General_Store	1	1	1931	30	1935	10	1735	10	1925	10	590	10	1755	10	2347	10	3424	500	227	300	1933	10	3678	10
+shop = 90	Nardah_General_Store	1	1	1931	30	1935	10	1735	10	1925	30	1923	10	1887	10	590	10	1755	10	2347	10
 shop = 91	Arnold's_Ecletic_Supplies	1	1	303	10	311	1	2309	10	1925	30	1927	10	1733	10	1734	1000	1917	10	1785	10	946	10
 shop = 92	Pollniveach_General_Store	1	1	1931	30	1935	10	1825	10	1833	10	1837	10	1925	10	4593	10	4591	10	1985	10	2120	10	1982	10	1937	10	1921	10	1929	10
-shop = 93	Port_Phasmatys_General_Store	1	1	1931	300	1925	300	1735	10	1935	10	590	10	1735	10	2347	10	
-shop = 94	Sigmund_the_Merchant	1	1	590	10	954	1	1931	30	2142	10	2309	10	952	10	36	10	1755	10	229	10	227	10	1925	10	1944	10	1942	10	233	10	2347	10	1929	10	
-shop = 95	Rimmington_General_Store	1	1	1931	30	1935	10	1735	10	1925	30	1923	10	1887	10	590	10	1755	10	2347	10	550	10	
+shop = 93	Port_Phasmatys_General_Store	1	1	1931	300	1925	300	1735	10	1935	10	590	10	1735	10	2347	10
+shop = 94	Sigmund_the_Merchant	1	1	590	10	954	1	1931	30	2142	10	2309	10	952	10	36	10	1755	10	229	10	227	10	1925	10	1944	10	1942	10	233	10	2347	10	1929	10
+shop = 95	Rimmington_General_Store	1	1	1931	30	1935	10	1735	10	1925	30	1923	10	1887	10	590	10	1755	10	2347	10	550	10
 shop = 96	Obli's_General_Store	1	1	590	10	229	10	233	10	1931	30	1351	10	1265	10	1349	10	1129	10	1059	10	2142	10	2309	10	952	10	36	10	1755	10	2347	10	970	10	973	10	227	10	975	10	954	10
-shop = 97	Jiminua's_Jungle_Store	1	1	590	10	36	10	1931	30	954	10	1129	10	1059	10	1061	10	2142	10	2309	10	229	300	227	300	233	10	175	10	970	10	973	10	946	10	2347	10	975	10	1755	10	952	10	1351	10	1265	10	1349	10	
-shop = 98	Bolkoy's_Village_Shop	1	1	1931	30	1265	10	1935	10	1735	10	1925	30	590	10	1755	10	2347	10	882	1000	2142	10	
+shop = 97	Jiminua's_Jungle_Store	1	1	590	10	36	10	1931	30	954	10	1129	10	1059	10	1061	10	2142	10	2309	10	229	300	227	300	233	10	175	10	970	10	973	10	946	10	2347	10	975	10	1755	10	952	10	1351	10	1265	10	1349	10
+shop = 98	Bolkoy's_Village_Shop	1	1	1931	30	1265	10	1935	10	1735	10	1925	30	590	10	1755	10	2347	10	882	1000	2142	10
 shop = 99	Quartermaster's_Store	1	1	1931	30	1935	10	1735	10	590	10	2309	10	3190	10	3192	10	3194	10	3196	10	3198	10	3200	10	3202	10	3204	10
 shop = 100	Varrock_General_Store	1	1	1931	30	1935	10	1735	10	1925	30	1923	10	590	10	1755	10	2347	10	550	10	946	10
 shop = 101	Void_Knight_General_Store	1	1	1931	30	1935	10	1735	10	1925	30	1923	10	590	10	1755	10	2347	10	1351	10	7934	10
@@ -109,38 +109,242 @@ shop = 108	Fur_Trader	2	2	948	10	958	10
 shop = 109	Slayer_Shop	2	2	4155	10	4166	10	4161	20	6696	20	7051	10	4551	10	7159	10	6720	10	4168	10	4164	10	4158	10	4172	50000	4170	10	7432	10	7421	1000	4162	10	4156	10
 shop = 110	Sams_Cape_Shop	2	2	4333	10	4353	10	4373	10	4393	10	4413	10
 shop = 111	Range_Guild_Exchange_Store	2	2	47	30	1133	10	1135	1	829	20	1169	1	892	50
-shop = 112	Castle_Wars_Ticket_Exchange	2	2	4071	10	4069	10	4070	10	4072	10	4068	10	4506	10	4504	10	4505	10	4507	10	4503	10	4511	10	4509	10	4510	10	4512	10	4508	10	4513	10	4514	10	4515	10	4516	10	
+shop = 112	Castle_Wars_Ticket_Exchange	2	2	4071	10	4069	10	4070	10	4072	10	4068	10	4506	10	4504	10	4505	10	4507	10	4503	10	4511	10	4509	10	4510	10	4512	10	4508	10	4513	10	4514	10	4515	10	4516	10
 shop = 113	Karamja_Wines_Spirts_Beers	2	2	1917	10	431	10	1993	10
-shop = 114	Burthrope_Supplies	2	2	1931	30	1935	10	1735	10	1925	30	590	10	1755	10	2347	10	946	10	1980	10	
+shop = 114	Burthorpe_Supplies	2	2	1931	30	1935	10	1735	10	1925	30	590	10	1755	10	2347	10	946	10	1980	10
 shop = 115	Dead_Man's_Chest	2	2	1915	10	3164	10
 shop = 116	Shrimp_and_Parrot	2	2	347	10	339	10	361	10	379	10	373	10	3144	10
-shop = 117	Pick_and_Lute	2	2	1905	10	1907	10	1913	10		
+shop = 117	Pick_and_Lute	2	2	1905	10	1907	10	1913	10
 shop = 118	Martin_Thwait_Lost_and_Found	2	2	954	10	1523	10	1755	10	946	10	5560	10	864	10	863	10	865	10	3095	10	3096	10	3097	10
 shop = 119	Aarons_Archery_Appendages	2	2	1129	10	1131	10	1133	10	1095	10	1097	10	1169	10	1063	10
 shop = 120	Dargaud's_Bows_and_Arrows	2	2	52	1000	39	300	40	300	41	100	42	100	43	100	44	30	882	1000	884	300	886	300	888	100	890	100	892	100	4773	0	4778	0	4783	0	4788	0	4793	0	4798	0	4803	0	841	10	843	10	849	10
 shop = 121	Authentic_Throwing_Weapons	2	2	825	1000	826	1000	827	1000	828	300	829	100	830	100	800	1000	801	1000	802	300	803	300	804	100	805	100
-shop = 122	Magic_Guild_Store_Mystic_Robes		2	2	4089	10	4091	10	4093	10	4095	10	4097	10	
+shop = 122	Magic_Guild_Store_Mystic_Robes		2	2	4089	10	4091	10	4093	10	4095	10	4097	10
 shop = 123	Magic_Guild_Store_Runes_and_Staves	2	2	556	1000	555	1000	557	1000	554	1000	558	1000	559	1000	562	300	561	300	560	1000	563	100	565	100	566	100	1387	10	1383	10	1381	10	1385	10
-shop = 124	Scavvo's_Rune_Store	2	2	1093	10	1079	10	1432	10	1113	10	1303	10	1289	10	1099	10	1065	10	1169	10	
+shop = 124	Scavvo's_Rune_Store	2	2	1093	10	1079	10	1432	10	1113	10	1303	10	1289	10	1099	10	1065	10	1169	10
 shop = 125	Valaine's_Shop_of_Champions	2	2	1019	10	1165	10	1077	10	1123	10
-shop = 126	Mage_Arena_Staves	2	2	2415	10	2416	10	2417	10	
+shop = 126	Mage_Arena_Staves	2	2	2415	10	2416	10	2417	10
 shop = 127	Quality_Weapons_Store	2	2	1365	10	1369	10	1285	10	1287	10	1325	10	1297	10	853	10	851	10	888	100	890	100
 shop = 128	Quality_Armour_Shop	2	2	1105	10	1107	10	1109	10	1111	10	1141	10	1143	10	1145	10	1177	10	1195	10
 shop = 129	Vigr's Warhammers	2	2	1337	10	1335	10	1339	10	1341	10	1343	10	1345	10
-shop = 130	Carefree_Crafting_Stall	2	2	1755	10	1592	10	1597	10	1733	10	1734	1000	1759	100	
+shop = 130	Carefree_Crafting_Stall	2	2	1755	10	1592	10	1597	10	1733	10	1734	1000	1759	100
 shop = 131	Keldagrim's_Best_Bread	2	2	2309	10	1891	10	1901	10
 shop = 132	Silver_Cog_Silver_Stall	2	2	1718	10	442	0	2355	0
 shop = 133	Gianne's_Restraunt	2	2	2223	10	2225	10	2221	10	2219	10	2227	10	2233	10	2231	10	2235	10	2229	10	2241	10	2243	10	2239	10	2237	10
 shop = 134	Gulluck_and_Sons	2	2	882	1000	841	10	39	100	40	100	41	100	42	100	1349	10	1353	10	1369	10	1307	10	1309	10	1311	10	1313	10	1315	10	1317	10
 shop = 135	Tony's_Pizza_Bases	2	2	2283	10
 shop = 136	Wilderness_General_Store	1	1	1931	30	1935	10	1735	10	1925	30	1923	10	590	10	1755	10	2347	10	550	10	946	10
-shop = 137	Neil's_Wilderness_Cape_Shop	2	2	4327	10
-	4347	10	4367	10	4387	10	4407	10
+shop = 137	Neil's_Wilderness_Cape_Shop	2	2	4327	10	4347	10	4367	10	4387	10	4407	10
 shop = 138	Tzhaar_Hur_Tel's_Equipment_Store	2	2	6522	10	6523	10	6524	10	6525	10	6526	10	6527	10	6528	10	6568	10
 shop = 139	Tzhaar_Hur_Lek's_Ore_and_Gem_Store	2	2	438	5	436	5	453	2	1623	1	1621	1	6571	1
 shop = 140	William's_Wilderness_Cape_Shop	2	2	4315	10	4335	10	4355	10	4375	10	4395	10
-shop = 141	Edward's_Wilderness_Cape_Shop	2	2	4323	10	4343	10	4363	10	4383	10	4403	10	
-shop = 142	Blurberry's_Bar	2	2	2028	10	2030	10	2032	10	2034	10	2036	10	2038	10	2040	10	
+shop = 141	Edward's_Wilderness_Cape_Shop	2	2	4323	10	4343	10	4363	10	4383	10	4403	10
+shop = 142	Blurberry's_Bar	2	2	2028	10	2030	10	2032	10	2034	10	2036	10	2038	10	2040	10
 shop = 143	Shop_of_Distaste	2	2	2518	100
-shop = 144	Nulodion's_Multicannon_Parts	2	2	2	10000000	6	100	8	100	10	100	12	100
+shop = 144	Nulodion's_Multicannon_Parts	2	2	6	100	8	100	10	100	12	100
+shop = 145	Legends_Guild_Shop_of_Useful_Items	2	2	299	6	1590	5	1542	3	2368	1	1052	3
+shop = 192	Legends'_Guild_General_Store	1	1	373	20	2323	5	121	3	886	500
+// Npc not added yet, Shop may not be 317
+shop = 146	Martin_Thwait's_Lost_and_Found	2	2	954	50	1523	25	1755	30	946	20	5560	25	864	15	863	10	865	5	3095	3	3096	2	3097	1
+shop = 147	Grace's_Graceful_Clothing	2	2
+shop = 148	Toad_and_Chicken	2	2	1905	12	1907	12	1913	12
+shop = 149	Crossbow_Shop	2	2
+shop = 150	Multicannon_parts_for_sale	2	2	8	5	6	5	12	5	10	5	4	5	5	5
+shop = 151	Frincos's_Fabulous_Herb_Store	2	2	229	50	233	3	221	50
+shop = 152	Garden_Centre	2	2
+shop = 153	Flynn's_Mace_Market	2	2	1422	5	1420	4	1424	4	1428	3	1430	2
+shop = 154	Herquin's_Gems	2	2	1623	1	1621	0	1619	0	1617	0	1607	1	1605	0	1603	0	1601	0
+shop = 155	Wayne's_Chains!_-_Chainmail_Specialist	2	2	1103	3	1101	2	1105	1	1107	1	1109	1	1111	1
+shop = 156	Prospector_Percy's_Nugget_Shop	2	2
+shop = 157	Brian's_Battleaxe_Bazaar	2	2	1375	4	1363	3	1365	2	1367	1	1369	1	1371	1
+shop = 158	Gerrant's_Fishy_Business	2	2	303	5	307	5	309	5	311	2	301	2	313	1500	314	1000	317	0	327	200	345	0	321	0	335	0	349	0	331	0	359	0	377	0	371	0
+shop = 159	Brian's_Archery_Supplies	2	2	886	1500	888	1000	890	800	843	4	845	4	849	3	847	3	853	2	851	2
+shop = 160	Rommik's_Crafty_Supplies	2	2	1755	2	1592	4	1597	2	1595	2	1733	3	1734	100	1599	3	2976	6	5523	10
+shop = 161	Gaius'_Two_Handed_Shop	2	2	1307	4	1309	3	1311	2	1313	1	1315	1	1317	1
+shop = 162	Sarah's_Farming_Shop	2	2	5341	500	5343	500	5329	500	952	500	5325	500	5331	500	5356	500	6032	500	5418	500	5376	500	1942	0	1957	0	1965	0	1982	0	5986	0	5504	0	5982	0	5994	0	5996	0	5998	0	6000	0	6002	0	5931	0	6006	0	6036	100
+shop = 163	Dal's_General_Ogre_Supplies	2	2	1931	30	1935	10	946	10	1925	30	590	10	1755	10	2347	10
+shop = 164	Grud's_Herblore_Stall	2	2	229	50	233	3	221	50
+shop = 165	Uglug's_Stuffsies	2	2	4844	100	2862	100	1777	10	2876	0	2878	10	4850	0	946	5	4773	0	4778	0	4783	0	4788	0	4793	0	4798	0	4803	0	4827	0
+shop = 166	Mythical_Cape_Store	2	2	1052	50
+shop = 167	Myths'_Guild_Herbalist	2	2	233	5	229	50	221	50
+shop = 168	Myths'_Guild_Armoury	2	2	2368	1	2368	1
+shop = 169	Myths'_Guild_Weaponry	2	2	1215	2	1305	2	1434	2	1377	2
+shop = 170	Etceteria_Fish	2	2	303	5	307	5	309	5	311	2	301	2	313	1500	314	1000	305	5	317	0	327	200	345	0	353	0	341	0	321	0	335	0	349	0	331	0	359	0	377	0	363	0	371	0	383	0
+shop = 171	Island_Greengrocer	2	2	1965	10	1942	10	1957	10	1982	10	1550	2
+shop = 172	Armour_Shop	2	2	1109	4	1143	4	1159	4	1181	4	1197	4	1071	4	1085	4	1121	4
+shop = 173	Contraband_Yak_Produce	2	2
+shop = 174	Flosi's_Fishmongers	2	2	377	5	359	20	331	20	341	20	383	0
+shop = 175	Keepa_Kettilon's_Store	2	2	361	20	329	20	339	20	379	10	373	0	385	0
+shop = 176	Ore_Store	2	2	436	20	438	10	440	10	442	5	453	10	444	5	447	0	449	0
+shop = 177	Weapons_Galore	2	2	1299	4	1343	4	1369	4	3099	4	1315	4
+shop = 178	Moon_Clan_General_Store	2	2	1931	5	1935	2	1735	2	1925	3	1923	2	1887	2	590	3	1755	2	2347	5
+shop = 179	Baba_Yaga's_Magic_Shop	2	2	556	5000	555	5000	557	5000	554	5000	558	5000	559	5000	562	250	561	250	560	250	563	250	565	250	566	250	1391	5	1387	2	1383	2	1381	2	1385	2
+shop = 180	Moon_Clan_Fine_Clothes	2	2
+shop = 181	Miscellanian_General_Store	2	2	1931	5	1935	2	1735	2	1925	3	1923	2	1887	2	590	3	1755	2	2347	5
+shop = 182	Greengrocer_of_Miscellania	2	2	1965	10	1942	10	1957	10	1982	10	1550	2
+shop = 183	Island_Fishmonger	2	2	303	5	307	5	309	5	311	2	301	2	313	1500	314	1000	305	5	317	0	327	200	345	0	353	0	341	0	321	0	335	0	349	0	331	0	359	0	377	0	363	0	371	0	383	0
+shop = 184	Miscellanian_Clothes_Shop	2	2	3767	5	3769	5	3771	5	3773	5	3775	5	3793	5	3795	5	5032	3	5034	3	5026	3	5028	3	5050	3	5052	3	5038	3	5040	3	5044	3	5046	3
+shop = 185	Miscellanian_Food_Shop	2	2	2309	5	1985	5	1965	5	1942	5	1957	5	1933	5	1973	2	1927	5
+shop = 186	Neitiznot_Supplies	2	2	946	10	2347	10	1734	10	1733	10	1351	10	1759	100
+shop = 187	Fremennik_Fish_Monger	2	2	303	5	307	5	309	5	311	2	301	2	313	1500	314	1000	305	5	317	0	327	200	345	0	353	0	341	0	321	0	335	0	349	0	331	0	359	0	377	0	363	0	371	0	383	0
+shop = 188	Fremennik_Fur_Trader	2	2	948	3	958	3
+shop = 189	Pie_Shop	2	2	7162	50	2325	5	2327	4	7170	0	2323	3	7178	2	7188	1	7198	0	7208	0	7218	0
+shop = 190	Fishing_Guild_Shop	2	2	313	2000	314	1500	341	0	353	0	363	0	359	0	377	0	371	0	339	0	355	0	365	0	361	0	379	0	373	0
+shop = 191	Happy_Heroes'_H'emporium	2	2	1377	1	1434	1
+shop = 193	Yarsul's_Prodigious_Pickaxes	2	2	1265	6	1267	5	1269	4	1273	3	1271	2	1275	1
+shop = 194	Hendor's_Awesome_Ores	2	2	436	0	438	0	440	0	447	0	449	0	451	0	453	0
+shop = 195	Mining_Guild_Mineral_Exchange	2	2
+shop = 196	Mythical_Cape_Store	2	2	1052	50
+shop = 197	Myths'_Guild_Armoury	2	2	2368	1	2368	1
+shop = 198	Myths'_Guild_Herbalist	2	2	233	5	229	50	221	50
+shop = 199	Myths'_Guild_Weaponry	2	2	1215	2	1305	2	1434	2	1377	2
+shop = 200	Authentic_Trowing_Weapons	2	2	825	900	826	800	827	700	828	600	829	500	830	400	800	900	801	800	802	700	803	600	804	500	805	400
+shop = 201	Warrior_Guild_Armoury	2	2	1363	5	1365	2	1369	1	1277	5	1279	4	1281	4	1283	3	1285	3	1287	2	1291	4	1293	3	1295	3	1297	2	1299	2	1301	1	1205	10	1203	6	1207	5	1217	4	1209	3	1211	2	1422	5	1420	4	1424	4	1428	3	1430	2	1307	4	1309	3	1311	2	1313	1	1315	1	1317	1	1103	5	1101	3	1105	3	1139	5	1137	3	1141	3
+shop = 202	Warrior_Guild_Food_Shop	2	2	333	10	365	10	2289	5	6705	10	2003	10
+shop = 203	Warrior_Guild_Potion_Shop	2	2	115	10	121	10	133	10
+shop = 204	Magic_Guild_Store_-_Mystic_Robes	2	2	4089	1000	4091	1000	4093	1000	4095	1000	4097	1000
+shop = 205	Magic_Guild_Store_-_Runes_and_Staves	2	2	4089	1000	4091	1000	4093	1000	4095	1000	4097	1000
+shop = 206	Magic_Guild_Store_-_Runes_and_Staves	2	2	556	5000	555	5000	557	5000	554	5000	558	5000	559	5000	562	250	561	250	560	250	563	250	565	250	566	250	1391	5	1387	2	1383	2	1381	2	1385	2
+shop = 207	Harry's_Fishing_Shop	2	2	303	5	307	5	311	2	301	2	313	1200	305	5	317	0	327	0	345	0	353	0	341	0	321	0	359	0	377	0	363	0	371	0	383	0
+shop = 208	Hickton's_Archery_Emporium	2	2	877	200	882	1000	884	800	886	0	888	0	890	0	892	0	4773	0	4778	0	4783	0	4788	0	4793	0	4798	0	4803	0	39	1000	40	800	41	600	42	400	43	200	44	100	841	4	839	2	837	2	843	4	845	4	4827	0	1133	2	1097	2
+shop = 209	Vanessa's_Farming_Shop	2	2	5341	500	5343	500	5329	500	952	500	5325	500	5331	500	5354	500	6032	500	5418	500	5376	500	1942	0	1957	0	1965	0	1982	0	5986	0	5504	0	5982	0	5994	0	5996	0	5998	0	6000	0	6002	0	5931	0	6006	0	6036	100
+shop = 210	Aemad's_Adventuring_Supplies	2	2	227	500	1265	2	1349	2	2142	2	590	2	1759	30	882	500	954	20	970	50	946	2
+shop = 211	Ardougne_Baker's_Stall	2	2	2309	10	1891	3	1901	6	1973	9
+shop = 212	Ardougne_Fur_Stall	2	2	948	3	958	3
+shop = 213	Ardougne_Gem_Stall	2	2	1607	2	1605	1	1603	1	1601	0
+shop = 214	Ardougne_Silver_Stall	2	2	1714	2	442	1	2355	1
+shop = 215	Ardougne_Spice_Stall	2	2	2007	1	946	1	1550	2
+shop = 216	Zenesha's_Plate_Mail_Body_Shop	2	2	1117	3	1115	1	1119	1	1125	1	1121	1
+shop = 217	Richard's_Farming_Shop	2	2	5341	500	5343	500	5329	500	952	500	5325	500	5331	500	5356	500	6032	500	5418	500	5376	500	1942	0	1957	0	1965	0	1982	0	5986	0	5504	0	5982	0	5994	0	5996	0	5998	0	6000	0	6002	0	5931	0	6006	0	6036	100
+shop = 218	Armoury	2	2	882	200	877	200	841	4	839	2	837	2	39	800	40	800	41	800	42	800	1349	5	1353	3	1363	5	1365	2	1369	1	1307	4	1309	3	1311	2	1313	1	1315	1	1317	1
+shop = 219	Arnold's_Eclectic_Supplies	2	2	303	2	311	2	7944	1	7946	0	2309	1	1931	4	1927	1	1733	3	1734	15	1917	10	1785	2	946	1
+shop = 220	Khazard_General_Store	2	2	1265	5	1931	3	1935	2	1735	2	1925	2	590	2	1755	2	2347	5	954	30	1933	30	583	30	1941	500	946	10
+shop = 221	Gianne's_Restaurant	2	2	2227	3	2219	3	2221	3	2225	3	2223	3	2233	3	2231	3	2235	3	2229	3	2237	3	2243	3	2239	3	2241	3
+shop = 222	Blurberry_Bar	2	2	2064	10	2074	10	2092	10	2084	10	2048	10	2080	10	2054	10
+shop = 223	West_Ardougne_General_Store	2	2	1931	3	954	3	1265	2	1925	2	590	2	2347	3	1061	2	839	2	882	20	329	10	2327	10	2309	5	2142	10
+shop = 224	Lovecraft's_Tackle	2	2	303	5	307	5	309	5	311	2	301	2	313	1500	314	1000	317	0	327	200	345	0	321	0	335	0	349	0	331	0	359	0	377	0	371	0
+shop = 225	Aleck's_Hunter_Emporium	2	2	596	20
+shop = 226	Rasolo_the_Wandering_Merchant	2	2	1969	1	2023	1	660	1	1215	1	550	1	583	1	1941	1	273	1	970	1	975	1	1599	1	2976	1	1823	1	1837	1	1854	1	2524	1	3377	1	2894	1	1909	1	3787	1	3711	1	3678	1	3424	1	3420	1	5	1
+shop = 227	Davon's_Amulet_Store	2	2	1718	0	1727	0	1729	0	1725	0	1731	0
+shop = 228	The_Shrimp_and_Parrot	2	2	347	5	339	5	361	5	379	3	373	2	3144	3
+shop = 229	Karamja_Wines,_Spirits,_and_Beers	2	2	1917	3	431	3	1993	1
+shop = 230	Fernahei's_Fishing_Hut	2	2	307	5	309	5	313	200	314	800	335	0	349	0	331	0
+shop = 231	Gabooty's_Tai_Bwo_Wannai_Cooperative	2	2	6341	50	6343	50	6345	50	6347	50	6349	50	6313	50	6315	50	6317	50	6351	50	6353	50	6355	50	6357	50	6359	50	1625	0	1627	0	1629	0	6361	50	6363	50	6365	50	6367	50	6369	50	1609	0	1611	0	1613	0	6371	50	6373	50	6375	50	6377	50	6379	50	6311	0
+shop = 232	Gabooty's_Tai_Bwo_Wannai_Drinky_Store	2	2	2084	0	2092	0	2048	0	2054	0	2064	0	2074	0
+shop = 233	Tamayu's_Spear_Stall	2	2	3170	10	3171	10	3172	5	3173	2	3174	0	3175	0	3188	10
+shop = 234	Tiadeche's_Karambwan_Stall	2	2	3142	10	3150	50	3157	2
+shop = 235	TzHaar-Hur-Lek's_Ore_and_Gem_Store	2	2
+shop = 236	TzHaar-Hur-Tel's_Equipment_Store	2	2
+shop = 237	TzHaar-Mej-Roh's_Rune_Store	2	2
+shop = 238	TzHaar-Hur-Rin's_Ore_and_Gem_Store	2	2	438	25	436	25	440	15	442	12	453	20	444	12	447	4	449	2	451	1	1623	16	1621	12	1619	8	1617	6	1631	0	6571	1
+shop = 239	TzHaar-Hur-Zal's_Equipment_Store	2	2
+shop = 240	Al-Kharid_General_Store	2	2	1931	5	1935	2	1735	2	1925	3	1923	2	1887	2	590	3	1755	2	2347	5	550	5
+shop = 241	Dommik's_Crafting_Store	2	2	1755	2	1592	10	1597	2	1595	10	1733	3	1734	100	1599	3	2976	10	5523	10
+shop = 242	Gem_Trader	2	2	1623	1	1621	1	1619	0	1617	0	1607	1	1605	1	1603	0	1601	0
+shop = 243	Louie's_Armoured_Legs_Bazaar	2	2	1075	5	1067	3	1069	2	1077	1	1071	1	1073	1
+shop = 244	Ranael's_Super_Skirt_Store	2	2	1087	5	1081	3	1083	2	1089	1	1085	1	1091	1
+shop = 245	Shantay_Pass_Shop	2	2	1823	100	1831	100	1937	10	1921	10	1929	10	946	10	1833	10	1835	10	1837	10	2349	10	314	500	2347	10	1925	0	1923	0	1935	0	1854	500	954	20
+shop = 246	Zeke's_Superior_Scimitars	2	2	1321	5	1323	3	1325	2	1329	1
+shop = 247	The_Big_Heist_Lodge	2	2	4627	10
+shop = 248	Bedabin_Village_Bartering	2	2	1823	5	1831	5	1937	5	1921	5	1929	5	946	5	2347	5
+shop = 249	Nardah_Hunter_Shop	2	2	596	20
+shop = 250	Rok's_Chocs_Box	2	2	6794	30	1973	25
+shop = 251	Seddu's_Adventurer's_Store	2	2	1093	1	1079	1	1113	1	1099	1	1065	1	1193	1	1151	1
+shop = 252	Pollnivneach_General_Store	2	2	1931	3	1935	2	1825	20	1833	3	1837	2	1925	12	4593	11	4591	12	1985	5	2120	5	1982	5	1937	5	1921	7	1929	8
+shop = 253	The_Asp_&amp;_Snake_Bar	2	2	1917	83	2017	10	1993	13	2015	5	2021	4	1915	12
+shop = 254	Blades_by_Urbi	2	2	1205	1	1203	1	1207	1	1217	0	1209	1	1211	1	1213	1	1215	0	1321	1	1323	1	1325	1
+shop = 255	Jamila's_Craft_Stall	2	2	1755	2	1592	4	1597	2	1595	2	1733	3	1734	100	1599	3	2976	6	5523	10
+shop = 256	Nathifa's_Bake_Stall	2	2	2309	10	1891	3	1901	8	1823	50
+shop = 257	Raetul_and_Co's_Cloth_Store	2	2	4684	20	1833	20	1835	20	1837	20	950	10	1734	50	1733	20
+shop = 258	Dorgesh-Kaan_General_Supplies	2	2	596	5	590	2	1931	5	1935	2	1923	2	1887	2	954	3	1785	1
+shop = 259	Nardok's_Bone_Weapons	2	2	5018	10	5016	10
+shop = 260	Miltog's_Lamps	2	2	596	15	4525	4	4525	2	4546	1	5013	1	590	10	4522	0	4537	0	4548	0
+shop = 261	Reldak's_Leather_Armour	2	2
+shop = 262	Ava's_Odds_and_Ends	2	2	314	1000	884	40	886	10	40	30	41	20
+shop = 263	Diango's_Toy_Store	2	2	2520	10	2522	10	2524	10	2526	10	4613	250
+shop = 264	Draynor_Seed_Market	2	2	5318	20	5319	10	5324	5	5322	0	5320	0	5323	0	5321	0	5305	20	5306	5	5097	20	5096	20	5307	20	5308	10	5309	5	5310	0	5311	0
+shop = 265	Fortunato's_Fine_Wine	2	2	1993	5	1935	3	7919	2	7810	500
+shop = 266	Bounty_Hunter_Store	2	2
+shop = 267	Helmet_Shop	2	2	1139	5	1137	3	1141	3	1143	1	1145	1	1155	4	1153	3	1157	2	1159	1	1161	1
+shop = 268	Bob's_Brilliant_Axes	2	2	1265	5	1351	10	1349	5	1353	3	1363	5	1365	2	1369	1
+shop = 269	Aubury's_Rune_Shop	2	2	556	5000	558	5000	554	5000	555	5000	557	5000	559	5000	562	250	560	250
+shop = 270	Construction_Supplies	2	2	4819	95	4820	95	1539	95
+shop = 271	Fancy_Clothes_Store	2	2	1949	0	579	3	1023	1	958	3	948	3	1733	3	1734	100	1059	10	1061	10	426	3	428	3	1757	10	1013	10	1015	3	1011	2	1007	10	1025	10
+shop = 272	Horvik's_Armour_Shop	2	2	1103	5	1101	3	1105	3	1109	1	1117	3	1115	1	1119	1	1125	1	1121	1	1067	1	1133	1	1097	1
+shop = 273	Lowe's_Archery_Emporium	2	2	882	2000	884	1500	886	1000	888	800	890	600	877	1500	841	4	839	4	843	3	845	3	849	2	847	2	853	1	851	1	837	2
+shop = 274	Thessalia's_Fine_Clothes	2	2	1005	3	1129	12	1059	10	1061	10	1757	1	1013	5	1015	3	1011	2	1007	4	950	5	426	3	428	3
+shop = 275	Varrock_Swordshop	2	2	1277	5	1279	4	1281	4	1283	3	1285	3	1287	2	1291	4	1293	3	1295	3	1297	2	1299	2	1301	1	1205	10	1203	6	1207	5	1217	4	1209	3	1211	2
+shop = 276	Zaff's_Superior_Staffs!	2	2	1391	5	1379	5	1389	5	1381	2	1383	2	1385	2	1387	2
+shop = 277	Ye_Olde_Tea_Shoppe	2	2	712	20
+shop = 278	General_Store	2	2	1733	10	1734	50	1931	5	1925	3	1935	2	590	3	1755	2	2347	5	3377	10	946	2
+shop = 279	Barker's_Haberdashery	2	2	2894	5	2896	5	2898	5	2900	5	2902	5	2904	5	2906	5	2908	5	2910	5	2912	5	2914	5	2916	5	2918	5	2920	5	2922	5	2924	5	2926	5	2928	5	2930	5	2932	5	2934	5	2936	5	2938	5	2940	5	2942	5	1007	5	1019	5	1021	5	1023	5	1027	5
+shop = 280	Rufus'_Meat_Emporium	2	2	2132	10	2138	10	2134	10	2136	10	335	5	349	5	331	5	383	1
+shop = 281	Trader_Sven's_Black_Market_Goods	2	2
+shop = 282	Razmire_General_Store	2	2	1931	5	1935	2	1735	2	1925	3	1923	2	1887	2	590	3	1755	2	2347	5	3422	150	227	100	1933	100	3678	3
+shop = 283	Razmire_Builders'_Merchants	2	2	3211	1000	3420	1000	1941	1000	960	10
+shop = 284	Ak-Haranu's_Exotic_Shop	2	2	4740	500
+shop = 285	Alice's_Farming_Shop	2	2	5341	500	5343	500	5329	500	952	500	5325	500	5331	500	5356	500	6032	500	5418	500	5376	500	1942	0	1957	0	1965	0	1982	0	5986	0	5504	0	5982	0	5994	0	5996	0	5998	0	6000	0	6002	0	5931	0	6006	0	6036	100
+shop = 286	Lletya_Archery_Shop	2	2	884	2000	886	500	888	500	890	450	892	400	877	1500	843	5	845	5	837	5	849	5	847	5
+shop = 287	Lletya_Food_Store	2	2	2309	10	379	15	1993	3	1985	10	1891	5
+shop = 288	Quartermaster's_Stores	2	2	1931	5	1935	2	1735	3	590	3	2309	10	3190	10	3192	10	3194	10	3196	10	3198	7	3200	7	3202	7	3204	5
+shop = 289	Armour_Store	2	2	1147	0	1163	0	1127	0	1093	0	1185	0	1201	0	1113	0	1079	0	1145	0	1161	0	1123	0	1091	0	1183	0	1199	0	1111	0	1073	0	1143	0	1159	0	1121	0	1085	0	1181	0	1197	0	1109	0	1071	0
+shop = 290	Crossbow_Shop	2	2
+shop = 291	Green_Gemstone_Gems	2	2	1607	3	1605	1	1603	1	1601	0
+shop = 292	Ore_Seller	2	2	436	100	438	100	440	100	447	100	442	100	444	100	453	100
+shop = 293	Pickaxe-Is-Mine	2	2	1265	6	1269	4	1273	3	1271	2	1275	1
+shop = 294	Vermundi's_Clothes_Stall	2	2	5036	3	5024	3	5030	3	5048	3	5042	3	950	5
+shop = 295	Keldagrim_Stonemason	2	2	3420	1000	4692	20	4703	10
+shop = 296	Quality_Weapons_Shop	2	2	1365	10	1369	10	1285	10	1287	10	1325	10	1297	10	1303	10	853	10	851	10	888	100	890	100
+shop = 297	Vigr's_Warhammers	2	2	1337	5	1335	4	1339	3	1341	3	1343	2	1345	1
+shop = 298	Leprechaun_Larry's_Farming_Supplies	2	2	5341	6	5343	4	5329	1	952	3	5325	2	5331	2	1925	2	6036	5	2026	10	1480	3
+shop = 299	Filamina's_Wares	2	2	1379	5	1389	5	1381	2	1383	2	1385	2	1387	2
+shop = 300	Regath's_Wares	2	2	227	30	954	10	554	500	555	500	556	500	557	500	558	300	559	300	565	50	566	50	579	1	1017	1	221	300
+shop = 301	Thyria's_Wares	2	2	554	5000	555	5000	556	5000	557	5000	558	5000	559	5000	562	250	560	150
+shop = 302	The_Golden_Field	2	2	1917	10	5763	10	1993	5	712	5
+shop = 303	The_Haymaker's_Arms	2	2	1917	10	5763	10	1993	5	712	5
+shop = 304	Little_Shop_of_Horace	2	2	227	60	1931	30	1935	5	1925	5	1923	5	975	1	1735	2	954	30	590	2	952	5	1759	30	1755	2	2347	5	1733	2	1734	40
+shop = 305	Logava_Gricoller's_Cooking_Supplies	2	2	2313	5	1887	2	1923	2	590	3	1935	3	1931	12	1980	3	946	3	1759	30	1942	5	1955	2	2309	2	1973	1	1985	3	1933	8
+shop = 306	Perry's_Chop-chop_Shop	2	2	1351	4	1349	3	1353	2	1355	1	1357	1	1359	1	590	2
+shop = 307	Vannah's_Farm_Store	2	2	5341	5	5343	5	5329	5	952	5	5325	5	5331	5	5354	100	6032	100	1925	100	5418	100	5376	100	6036	40
+shop = 308	The_Deeper_Lode	2	2	1917	10	1913	1	1911	3	1971	2	1919	0
+shop = 309	Little_Munty's_Little_Shop	2	2	1265	20	1931	50000	1935	5	1925	5	1923	5	590	2	1759	30	1755	2	2347	5
+shop = 310	Toothy's_Pickaxes	2	2	1265	5	1267	3	1269	3	1273	2	1271	1	1275	1	1931	50000
+shop = 311	Thirus_Urkar's_Fine_Dynamite_Store	2	2	590	2
+shop = 312	Frankie's_Fishing_Emporium	2	2	317	50	327	50	345	25	353	25	341	0	321	0	359	0	377	0	363	0	371	0	383	0
+shop = 313	Kenelme's_Wares	2	2	1933	3	2132	1	1965	3	1963	3	1951	1	2309	0	1973	1	1985	3	1982	3	1942	1
+shop = 314	Leenz's_General_Supplies	2	2	1931	50000	1935	5	1925	5	1923	5	590	2	2347	5	4819	500	4820	500
+shop = 315	Tynan's_Fishing_Supplies	2	2	1925	1000	303	5	305	5	307	5	311	2	301	2	313	1200
+shop = 316	Warrens_Fish_Monger	2	2	303	5	307	5	309	5	311	2	301	2	313	1500	314	1000	317	0	327	200	345	0	321	0	335	0	349	0	331	0	359	0	377	0	371	0
+shop = 317	Warrens_General_Store	2	2	1931	3	1935	2	1735	2	1925	2	1923	2	590	2	1755	2	2347	5	952	5	946	4
+shop = 318	Briget's_Weapons	2	2	1363	5	1365	2	1369	1	1277	5	1279	4	1281	4	1283	3	1285	3	1287	2	1291	4	1293	3	1295	3	1297	2	1299	2	1301	1	1205	10	1203	6	1207	5	1217	4	1209	3	1211	2	1422	5	1420	4	1424	4	1428	3	1430	2	1307	4	1309	3	1311	2	1313	1	1315	1	1317	1	1321	5	1323	4	1325	4	1327	3	1329	3
+shop = 319	Briget's_Armour	2	2	1103	5	1101	3	1105	3	1075	3	1067	2	1069	2	1087	3	1081	2	1083	2	1139	5	1137	3	1141	3
+shop = 320	Jennifer's_General_Field_Supplies	2	2	1931	5	1935	2	1735	2	1925	3	1923	2	1887	2	590	2	1755	2	1351	10	7934	25
+shop = 321	Daga's_Scimitar_Smithy	2	2	1321	10	1323	10	1325	8	1329	6	4587	4
+shop = 322	Hamab's_Crafting_Emporium	2	2	1755	10	1592	10	1597	10	4020	10	1733	10	1734	100	1759	100
+shop = 323	Oobapohk's_Javelin_Store	2	2	825	500	826	500	827	500	828	500	829	500	830	500
+shop = 324	Solihib's_Food_Stall	2	2	4012	200	1963	1000	4016	10	4014	20
+shop = 325	Magic_Stall	2	2	554	1000	555	1000	556	1000	557	1000	563	250	4008	10	4006	10	4023	10
+shop = 326	Fossil_Island_General_Store	2	2	1931	5	1935	2	1925	3	1923	2	1887	2	590	2	1755	2	2347	5	954	5
+shop = 327	Petrified_Pete's_Ore_Shop	2	2
+shop = 328	Mairin's_Market	2	2
+shop = 329	Smithing_Smith's_Shop	2	2	1321	5	1323	3	1325	2	1329	1	2347	5
+shop = 330	Two_Feet_Charley's_Fish_Shop	2	2	317	10	327	10	345	7	353	7	341	6	321	5	359	4	377	2	363	2	371	1
+shop = 331	The_Other_Inn	2	2	1917	3	7157	3	1993	1	2003	5
+shop = 332	Harpoon_Joe's_House_of_'Rum'	2	2	1917	3	7157	3	1993	1	2003	5
+shop = 333	Void_Knight_Archery_Store	2	2	825	10	826	10	827	10	828	5	829	5	830	5	39	10	40	10	41	10	42	5	43	5	44	5
+shop = 334	Bandit_Duty_Free	2	2	1931	5	1935	2	590	2	1755	2	2347	5	1265	5	1351	10
+shop = 335	Darren's_Wilderness_Cape_Shop	2	2	4321	100	4341	100	4361	100	4381	100	4401	100
+shop = 336	Edmond's_Wilderness_Cape_Shop	2	2	4329	100	4349	100	4369	100	4389	100	4409	100
+shop = 337	Ian's_Wilderness_Cape_Shop	2	2	4317	100	4337	100	4357	100	4377	100	4397	100
+shop = 338	Larry's_Wilderness_Cape_Shop	2	2	4319	100	4339	100	4359	100	4379	100	4399	100
+shop = 339	Lundail's_Arena-side_Rune_Shop	2	2	554	200	555	200	556	200	557	200	558	140	559	140	561	250	562	250	563	250	564	20	560	250
+shop = 340	Mage_Arena_Staffs	2	2	2415	5	2416	5	2417	5
+shop = 341	Richard's_Wilderness_Cape_Shop	2	2	4325	100	4345	100	4365	100	4385	100	4405	100
+shop = 342	Sam's_Wilderness_Cape_Shop	2	2	4333	100	4353	100	4373	100	4393	100	4413	100
+shop = 343	Simon's_Wilderness_Cape_Shop	2	2	4331	100	4351	100	4371	100	4391	100	4411	100
+shop = 344	Irksol	2	2	1641	5
+shop = 345	Jukat	2	2	1305	2	1215	2
+shop = 346	Fairy_Fixit's_Fairy_Enchantment	2	2
+shop = 347	Crossbow_Shop_(White_Wolf_Mountain)	2	2
+shop = 348	Trader_Stan's_Trading_Post	2	2	1931	5	1935	2	1735	2	1925	3	1923	2	1887	2	590	3	1755	2	2347	5	550	5	954	2	946	2	2114	15	1963	15	2108	10	4286	10	1785	10	1783	10	401	20	1781	10	301	20	307	20	1941	30	3226	20	1025	5
 [ENDOFSHOPLIST]
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Daniel Ginovker	f3b47bb0d6	Added warning for 32-bit and > 1.8 Java versions (#264 ) * Added warning for 32-bit and > 1.8 Java versions * Clarify why	2019-12-10 19:21:45 -05:00
Daniel Ginovker	dc4694c24c	Remove rare protection, add all NPCs to a static list (#254 )	2019-12-09 22:59:54 -05:00
Daniel Ginovker	a9d720fbae	Remove some perma aggro monsters (#252 )	2019-12-09 18:50:39 -05:00
dginovker	ba7daa72d5	Latest compile	2019-12-07 21:19:44 -05:00
Gptaqbc	55a35a26b2	A lot of fixes (#242 ) * Fixed stuff related to shop trading > Refactored stuff to facilitate resolving an issue regarding sellnig item to a full shop > Removed double value message in shop * Fixed some stuff related to agility -Removed a useless obstacle in wilderness course that alowed insane xp gains; -Added some 'flexibility' to some obstacles at agility pyramid; -Removed useless vars; -Added proper xp to obstacles; -Added bonus xp for completing agility pyramid -Most likely more; *Animations still missing: Crossing gaps and jumping gaps* * resolve conflicts * delete old files * A lot of fixes Christmas Cracker (anim other player & text & admin right & rare protection) Added check in stack value when withdrawing from bank to prevent losing items when max int value is reached fixed double message on pickpocketing when in combat Renamed methods Removed unused methods Removed admin restriction when trying to use the cannon Cleaned KBD drops Boots of lightness weight reduction is fixed More...	2019-12-07 21:16:18 -05:00
Mr Extremez	8e524cdcda	Couple quick fixes (#240 ) - Fix global drops at KQ - Should fix pickpocketing crash hopefully closes #236 closes #233	2019-12-06 16:12:48 -05:00
dginovker	9c21669609	Merge branch 'misc2' of https://github.com/RedSparr0w/2006rebotted	2019-12-05 23:08:25 -05:00
dginovker	06798c5e90	Merge branch 'RedSparr0w-misc2'	2019-12-05 23:06:30 -05:00
RedSparr0w	8317f3f031	check player has completed tutorial island	2019-12-06 15:14:31 +13:00
dginovker	d9d450f61e	Latest compile	2019-12-05 12:58:10 -05:00
Mr Extremez	8af938548b	More fixes (#235 ) - Dwarf cannon can now be seen by anyone and not just the person who sets it down (they can also see the rotation now) - Fixed doors being removed when clicking them - Removed banking command for regular players - Fixed nulodion now only gives if you have space - Updated nulodion message so it doesnt say to find him at home - Npcs wont follow you if you turn on the cantAttack comamand (for admins - Fixed gate at KBD - Fixed the gates at Ice giants in wildy #closes 132 #closes 203 #closes 211 #closes 6 also this one should be closed from previous patch #closes 219	2019-12-05 12:55:25 -05:00
dginovker	9fb110bb41	Latest compile, hopefully fix bug	2019-12-04 22:24:07 -05:00
Mr Extremez	402d732975	Some fixes (#231 ) * Some fixes - Changed lumbridge teleport to require 31 magic instead of 32 - Added back gaining items from thieving stalls - Fixed dialgoue issue after leveling up skill (such as smithing) - Made god capes untradable - Removed cannon balls from shop (they werent supposed to be in there) * refactor pickpocketing slightly * more refactoring, actual random * refactor, each stall has it's own respawn timer * refactor argument names * Update Stalls.java	2019-12-04 21:13:47 -05:00
RedSparr0w	199df17cf9	bots don't drop items	2019-12-02 21:00:16 +13:00
dginovker	256452114c	latest compile	2019-12-01 19:08:27 -05:00
Gptaqbc	e2cf6d2998	Agility fixes (#224 ) * Fixed stuff related to shop trading > Refactored stuff to facilitate resolving an issue regarding sellnig item to a full shop > Removed double value message in shop * Fixed some stuff related to agility -Removed a useless obstacle in wilderness course that alowed insane xp gains; -Added some 'flexibility' to some obstacles at agility pyramid; -Removed useless vars; -Added proper xp to obstacles; -Added bonus xp for completing agility pyramid -Most likely more; *Animations still missing: Crossing gaps and jumping gaps* * resolve conflicts * delete old files	2019-12-01 19:03:29 -05:00
Danial	705f624a2b	Add message showing how many coins you collected from your shop (#227 )	2019-12-01 19:03:04 -05:00
dginovker	fdac3e1422	Latest compile	2019-12-01 13:58:48 -05:00
dginovker	414c9c3d0d	New .sh script paths	2019-12-01 13:55:30 -05:00
Danial	bbb33d243e	Fixup, Add new command (#226 ) * refactor saving * add command to change password * cleanup	2019-12-01 13:40:54 -05:00
dginovker	930bc8d37b	class cleanup + latest compile	2019-11-29 20:27:51 -05:00
Danial	d4b16a25aa	Fixup being able to kill monsters without correct slayer level (#220 ) * Cannon only fire at npcs on same height level. * Cannon cannot kill monsters if you do not have the slayer level	2019-11-29 00:04:53 -05:00
Danial	680a0c2ee0	Add more shop definitions, Add legends guild stores (#217 ) * remove trailing \t add legends guil shop * Add missing shops * remove out of scope items (non 317) * fix item id * Add legends guild shop npc * Add Legends Guild General Store. * Update ShopHandler.java	2019-11-28 11:49:14 -05:00
Mr Extremez	68256e41d8	Some more minor clean up (#215 ) * General clean up - Reduced woodcutting code by alot, reverted the array to an enum - Moved the login player method to the packet sender - Deleted some dead code/cleaned up * More random cleanup/refractoring - Moved combat constants to combatconstants.java - Moved dialogue options to dialogueoptions.java - Deleted more dead code * Replaced some poorly written methods - refreshSkill, levelUp, and getTotalLevel all used way too much code for such a simple function so cleaned it up - deleted a few other bits of dead code * Fight caves - Should fix fight caves npcs nulling out in the middle of your waves if they are too far away - Also removed some unneeded scynchronization in itemassistant.java * Gates - Started cleaning up gate system, still can be improved a lot more	2019-11-28 11:47:06 -05:00
Daniel Ginovker	20303071de	Updated setup guide for new refactor (#214 )	2019-11-25 12:33:43 -05:00
Mr Extremez	d876a923b9	Cleanup part 1 (#213 ) * Clean up part 1 - Removed lots of dead code - Removed unncessary files not in use - Cleaned up small bits of code - Removed a few warnings - Server.java ---> GameEngine.java - Constants.java ---> GameConstants.java * Cape Dye Rewrote cape dying * Packaging - redone ----> com.rebotted * PacketSender/clean up - ActionSender ---> PacketSender - Moved many more packets to packetsender - Cleaned up more dead code * Merge Client/Player - Merged Client.java with Player.java (both were doing same thing so redundant to have both) - Removed some more dead code - Tidy a few small things up * Quests/more clean up - Removed more dead code - Made quests static in order to clean them up a bit * More cleanup - Removed some more of the dead quest code - Correcting naming of some of the shop variables	2019-11-25 12:08:56 -05:00
Danial	3d1ae1b288	remove deleteItem2 → deleteItem (#212 )	2019-11-24 23:07:52 -05:00
dginovker	f1ea4810dd	Merge fix:	2019-11-24 14:09:18 -05:00
dginovker	c9c3888c20	runserver.sh loop update	2019-11-24 14:04:38 -05:00
dginovker	a50f7d548b	Merge branch 'RedSparr0w-bot'	2019-11-24 14:00:35 -05:00
dginovker	fd31f57f5d	Merged:	2019-11-24 13:59:52 -05:00
mikeysasse2	3650170a84	Fixed random trees everywhere (#209 ) * Fixed random trees everywhere * Npcs will no longer face southwest every time they take a step. Added a fixed for walking forever after teleporting/region change (only tested that walking still works, never tested if the fix would resolve the issue). You can now only click an object once per tick.	2019-11-24 13:48:02 -05:00
RedSparr0w	4e8832cded	tidy up	2019-11-24 23:47:47 +13:00
RedSparr0w	4b78f6c136	give slayer xp on kill	2019-11-24 23:41:43 +13:00
dginovker	8393c0c928	Pmods can run ;:update	2019-11-24 01:00:38 -05:00
RedSparr0w	564f400007	check un noted version for buy price etc	2019-11-24 17:50:34 +13:00
RedSparr0w	c3f4e831a3	trim the excess tabs	2019-11-24 16:43:02 +13:00
RedSparr0w	9d57cb6d1a	Buy noted items from player owned stores	2019-11-24 16:37:03 +13:00
RedSparr0w	ab57946a01	items are un noted when sold to shop	2019-11-24 16:28:31 +13:00
RedSparr0w	f7d719c811	refactor saving	2019-11-24 16:27:10 +13:00
RedSparr0w	2498cff188	Only un note items if its not player owned	2019-11-24 15:38:46 +13:00
RedSparr0w	209b3b3bf3	Update HighscoresHandler.java	2019-11-24 13:16:10 +13:00
RedSparr0w	4f5c808298	Fixup highscores, ignore admin dev and bots	2019-11-24 13:02:53 +13:00
RedSparr0w	8920ff512a	Face bot random direction	2019-11-24 00:13:17 +13:00
RedSparr0w	66cc2e47fe	dont count bots toward player count, add playerBotCount	2019-11-23 21:22:48 +13:00
RedSparr0w	e110ba296e	Exclude bots from player counts	2019-11-23 21:08:51 +13:00
RedSparr0w	2104fd9918	Bots use normal chat, with effects	2019-11-23 20:40:56 +13:00
RedSparr0w	576bee32c3	lowercase item name	2019-11-23 17:39:38 +13:00
RedSparr0w	c91027f25f	lowercase metric	2019-11-23 17:32:12 +13:00
RedSparr0w	64ce050d10	add gp to lower prices	2019-11-23 17:25:19 +13:00
RedSparr0w	bda929229e	Fixup free space check	2019-11-23 17:07:13 +13:00
RedSparr0w	05a3a912f6	Add comments	2019-11-23 17:05:25 +13:00
RedSparr0w	4c42557332	Tidy up number formating	2019-11-23 17:01:18 +13:00
RedSparr0w	f4ea14f2bf	Fixup rounding for millions	2019-11-23 16:47:32 +13:00
RedSparr0w	e42394fdbe	Update ShopHandler.class	2019-11-23 16:26:06 +13:00
RedSparr0w	28b7163c6d	Add another check to not remove items	2019-11-23 16:25:48 +13:00
RedSparr0w	ded7cd28b8	Set currencyName	2019-11-23 16:13:24 +13:00
RedSparr0w	626d237a8e	reset workspace	2019-11-23 15:53:01 +13:00
RedSparr0w	4445fc0871	Update workspace.xml	2019-11-23 15:05:30 +13:00
RedSparr0w	e519d1b00b	Fixup buying too many items	2019-11-23 14:58:44 +13:00
RedSparr0w	2b93d72a15	Add trade zones	2019-11-23 14:32:16 +13:00
RedSparr0w	2683ab888b	Make it so bots cannot be attacked by npcs	2019-11-23 14:05:58 +13:00
RedSparr0w	3a4895590e	fixup close shop, re-open shop	2019-11-23 14:01:42 +13:00
RedSparr0w	a1ff2458f1	update close shop method	2019-11-23 13:48:46 +13:00
RedSparr0w	5a520fa316	Add close shop command	2019-11-23 13:29:17 +13:00
RedSparr0w	aa61fc5cbf	add ability to withdraw your profits	2019-11-23 12:38:41 +13:00
RedSparr0w	b920549af0	don't charge player to withdraw items from their store	2019-11-23 12:02:22 +13:00
RedSparr0w	10c7adf74d	fixup ordering of shop items	2019-11-23 11:39:03 +13:00
RedSparr0w	d2cf6fac12	Take players appearance	2019-11-23 11:17:40 +13:00
RedSparr0w	b940e8e859	Set custom prices	2019-11-23 11:05:43 +13:00
RedSparr0w	e0925538c7	Remove items from players store/bank	2019-11-23 02:20:06 +13:00
RedSparr0w	ca12809861	Semi functional player shops	2019-11-23 01:44:57 +13:00
RedSparr0w	3afb44615e	Update shops.cfg	2019-11-23 01:43:52 +13:00
RedSparr0w	bff9e44d8f	remove logging	2019-11-22 21:25:57 +13:00
RedSparr0w	d6ec93b199	Fixup shops	2019-11-22 21:23:36 +13:00
RedSparr0w	abc3a9859f	Merge remote-tracking branch 'upstream/master' into bot	2019-11-22 20:48:03 +13:00
RedSparr0w	ae883964af	Check if shop owned by player to sell items	2019-11-22 20:47:36 +13:00
RedSparr0w	d62e5a8d70	increase total stores, decrease total items	2019-11-22 20:47:18 +13:00
RedSparr0w	544f266c8f	Open player shop	2019-11-22 20:46:39 +13:00
RedSparr0w	23081c0eac	Update ShopHandler.java	2019-11-22 20:45:58 +13:00
RedSparr0w	8b4969a882	Update bot properName	2019-11-22 20:45:42 +13:00
RedSparr0w	e282778f22	Update BotHandler.java	2019-11-22 20:45:26 +13:00
RedSparr0w	b6a590d44f	Update PlayerAssistant.java	2019-11-22 20:45:18 +13:00
RedSparr0w	7627ed80eb	Give bot same stats as player	2019-11-22 19:39:51 +13:00
RedSparr0w	0543919ed1	empty bots inventory	2019-11-22 19:26:26 +13:00
RedSparr0w	a91dc597e9	update bots handling, spawn bot on player	2019-11-22 19:11:03 +13:00
RedSparr0w	07472a9a90	more stuff	2019-11-22 17:28:14 +13:00
RedSparr0w	6e3f76329a	force logout on timeout	2019-11-22 16:40:18 +13:00
dginovker	03721c5c1a	Emergency fix	2019-11-21 21:23:11 -05:00
dginovker	3c332cd653	Latest compile	2019-11-21 21:11:28 -05:00
Mr Extremez	34f2665858	Redemption Prayer/Fixes/Clues/Tidying up/Rares (#207 ) - closes #205 - closes #197 - closes #145 Does the followiwng - Adds functional redemption prayer - Fixes max stack deletion when trading - Adds toggle for clue scrolls, currently set on disabled until someone gets the time to finish clue scrolls - Cleans up a few minor things - Removes a few bits of dead code - Re enables rare detection	2019-11-21 21:09:17 -05:00
RedSparr0w	447fc738d9	initial bots	2019-11-22 13:03:02 +13:00
Danial	4b3bb7ade7	Random slayer task amounts, Move unequiped item to same slot as weapon you are equiping (#206 ) * 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	2019-11-21 14:10:30 -05:00