diff --git a/data/configs/drop_tables.json b/data/configs/drop_tables.json index 3509289..99fed4f 100644 --- a/data/configs/drop_tables.json +++ b/data/configs/drop_tables.json @@ -16621,6 +16621,524 @@ } ] }, + { + "ids": "1020,4910", + "main": [ + { + "minAmount": "1", + "weight": "25", + "id": "565", + "maxAmount": "2" + }, + { + "minAmount": "1", + "weight": "25", + "id": "560", + "maxAmount": "1" + }, + { + "minAmount": "1", + "weight": "25", + "id": "563", + "maxAmount": "1" + }, + { + "minAmount": "2", + "weight": "25", + "id": "562", + "maxAmount": "2" + }, + { + "minAmount": "15", + "weight": "25", + "id": "557", + "maxAmount": "20" + }, + { + "minAmount": "2", + "weight": "25", + "id": "561", + "maxAmount": "2" + }, + { + "minAmount": "1", + "weight": "25", + "id": "1440", + "maxAmount": "1" + }, + { + "minAmount": "1", + "weight": "5", + "id": "1385", + "maxAmount": "1" + }, + { + "minAmount": "1", + "weight": "25", + "id": "199", + "maxAmount": "1" + }, + { + "minAmount": "1", + "weight": "25", + "id": "201", + "maxAmount": "1" + }, + { + "minAmount": "1", + "weight": "25", + "id": "203", + "maxAmount": "1" + }, + { + "minAmount": "1", + "weight": "25", + "id": "205", + "maxAmount": "1" + }, + { + "minAmount": "1", + "weight": "25", + "id": "207", + "maxAmount": "1" + }, + { + "minAmount": "1", + "weight": "25", + "id": "209", + "maxAmount": "1" + }, + { + "minAmount": "1", + "weight": "25", + "id": "211", + "maxAmount": "1" + }, + { + "minAmount": "1", + "weight": "25", + "id": "213", + "maxAmount": "1" + }, + { + "minAmount": "1", + "weight": "25", + "id": "215", + "maxAmount": "1" + }, + { + "minAmount": "1", + "weight": "25", + "id": "2485", + "maxAmount": "1" + }, + { + "minAmount": "1", + "weight": "25", + "id": "217", + "maxAmount": "1" + }, + { + "minAmount": "12", + "weight": "50", + "id": "995", + "maxAmount": "12" + }, + { + "minAmount": "42", + "weight": "50", + "id": "995", + "maxAmount": "42" + }, + { + "minAmount": "250", + "weight": "50", + "id": "995", + "maxAmount": "250" + }, + { + "minAmount": "3000", + "weight": "50", + "id": "995", + "maxAmount": "3000" + }, + { + "minAmount": "1", + "weight": "50", + "id": "1623", + "maxAmount": "1" + }, + { + "minAmount": "1", + "weight": "50", + "id": "1621", + "maxAmount": "1" + }, + { + "minAmount": "1", + "weight": "50", + "id": "1619", + "maxAmount": "1" + }, + { + "minAmount": "1", + "weight": "25", + "id": "1617", + "maxAmount": "1" + }, + { + "minAmount": "1", + "weight": "25", + "id": "987", + "maxAmount": "1" + }, + { + "minAmount": "1", + "weight": "25", + "id": "985", + "maxAmount": "1" + }, + { + "minAmount": "1", + "weight": "5", + "id": "1631", + "maxAmount": "1" + }, + { + "minAmount": "1", + "weight": "5", + "id": "1615", + "maxAmount": "1" + }, + { + "minAmount": "1", + "weight": "25", + "id": "1215", + "maxAmount": "1" + }, + { + "minAmount": "5", + "weight": "5", + "id": "830", + "maxAmount": "5" + }, + { + "minAmount": "20", + "weight": "5", + "id": "829", + "maxAmount": "20" + }, + { + "minAmount": "1", + "weight": "5", + "id": "1319", + "maxAmount": "1" + }, + { + "minAmount": "1", + "weight": "5", + "id": "1247", + "maxAmount": "1" + }, + { + "minAmount": "1", + "weight": "5", + "id": "1249", + "maxAmount": "1" + }, + { + "minAmount": "50", + "weight": "5", + "id": "1216", + "maxAmount": "50" + }, + { + "minAmount": "1", + "weight": "5", + "id": "1185", + "maxAmount": "1" + }, + { + "minAmount": "1", + "weight": "5", + "id": "1201", + "maxAmount": "1" + }, + { + "minAmount": "1", + "weight": "5", + "id": "2366", + "maxAmount": "1" + }, + { + "minAmount": "1", + "weight": "5", + "id": "1149", + "maxAmount": "1" + }, + { + "minAmount": "200", + "weight": "25", + "id": "9143", + "maxAmount": "200" + }, + { + "minAmount": "150", + "weight": "5", + "id": "9342", + "maxAmount": "150" + }, + { + "minAmount": "150", + "weight": "5", + "id": "892", + "maxAmount": "200" + }, + { + "minAmount": "500", + "weight": "5", + "id": "892", + "maxAmount": "500" + }, + { + "minAmount": "200", + "weight": "5", + "id": "1392", + "maxAmount": "200" + }, + { + "minAmount": "1000", + "weight": "5", + "id": "574", + "maxAmount": "1000" + }, + { + "minAmount": "1000", + "weight": "5", + "id": "570", + "maxAmount": "1000" + }, + { + "minAmount": "1", + "weight": "25", + "id": "1444", + "maxAmount": "1" + }, + { + "minAmount": "25", + "weight": "25", + "id": "1441", + "maxAmount": "35" + }, + { + "minAmount": "25", + "weight": "25", + "id": "1443", + "maxAmount": "35" + }, + { + "minAmount": "1", + "weight": "25", + "id": "1452", + "maxAmount": "1" + }, + { + "minAmount": "1", + "weight": "25", + "id": "1462", + "maxAmount": "1" + }, + { + "minAmount": "500", + "weight": "25", + "id": "7937", + "maxAmount": "15000" + }, + { + "minAmount": "47", + "weight": "5", + "id": "561", + "maxAmount": "77" + }, + { + "minAmount": "20", + "weight": "5", + "id": "566", + "maxAmount": "20" + }, + { + "minAmount": "45", + "weight": "5", + "id": "563", + "maxAmount": "45" + }, + { + "minAmount": "50", + "weight": "5", + "id": "560", + "maxAmount": "50" + }, + { + "minAmount": "121", + "weight": "5", + "id": "560", + "maxAmount": "121" + }, + { + "minAmount": "50", + "weight": "5", + "id": "565", + "maxAmount": "50" + }, + { + "minAmount": "125", + "weight": "25", + "id": "372", + "maxAmount": "250" + }, + { + "minAmount": "1000", + "weight": "25", + "id": "372", + "maxAmount": "1000" + }, + { + "minAmount": "250", + "weight": "25", + "id": "384", + "maxAmount": "500" + }, + { + "minAmount": "150", + "weight": "25", + "id": "533", + "maxAmount": "500" + }, + { + "minAmount": "150", + "weight": "25", + "id": "454", + "maxAmount": "7500" + }, + { + "minAmount": "150", + "weight": "25", + "id": "450", + "maxAmount": "800" + }, + { + "minAmount": "100", + "weight": "5", + "id": "443", + "maxAmount": "100" + }, + { + "minAmount": "100", + "weight": "5", + "id": "452", + "maxAmount": "100" + }, + { + "minAmount": "1000", + "weight": "5", + "id": "2362", + "maxAmount": "7000" + }, + { + "minAmount": "1", + "weight": "5", + "id": "2364", + "maxAmount": "1" + }, + { + "minAmount": "50", + "weight": "5", + "id": "2364", + "maxAmount": "50" + }, + { + "minAmount": "33", + "weight": "25", + "id": "258", + "maxAmount": "33" + }, + { + "minAmount": "25", + "weight": "25", + "id": "2999", + "maxAmount": "250" + }, + { + "minAmount": "30", + "weight": "25", + "id": "3001", + "maxAmount": "120" + }, + { + "minAmount": "10", + "weight": "25", + "id": "270", + "maxAmount": "100" + }, + { + "minAmount": "250", + "weight": "5", + "id": "6686", + "maxAmount": "250" + }, + { + "minAmount": "3", + "weight": "25", + "id": "5321", + "maxAmount": "3" + }, + { + "minAmount": "1", + "weight": "5", + "id": "5315", + "maxAmount": "50" + }, + { + "minAmount": "1", + "weight": "5", + "id": "5316", + "maxAmount": "6" + }, + { + "minAmount": "10", + "weight": "5", + "id": "5289", + "maxAmount": "10" + }, + { + "minAmount": "1", + "weight": "5", + "id": "5300", + "maxAmount": "1" + }, + { + "minAmount": "1", + "weight": "5", + "id": "5304", + "maxAmount": "31" + }, + { + "minAmount": "100", + "weight": "5", + "id": "1516", + "maxAmount": "20000" + } + ], + "charm": [], + "default": [ + { + "minAmount": "1", + "weight": "100", + "id": "2892", + "maxAmount": "1" + } + ] + }, { "ids": "1021", "main": [ diff --git a/data/configs/npc_spawns.json b/data/configs/npc_spawns.json index faba4e6..8af5bae 100644 --- a/data/configs/npc_spawns.json +++ b/data/configs/npc_spawns.json @@ -849,7 +849,7 @@ }, { "npc_id": "316", - "loc_data": "{2986,3176,0,0,4}-{3086,3227,0,0,1}-{2996,3157,0,0,1}-{2986,3176,0,0,0}-{2986,3176,0,0,0}-{3085,3230,0,0,0}" + "loc_data": "{2986,3176,0,0,4}-{3086,3227,0,0,1}-{2996,3157,0,0,1}-{2986,3176,0,0,0}-{2986,3176,0,0,0}-{3085,3230,0,0,0}-{162,41,0,0,6}" }, { "npc_id": "322", diff --git a/data/configs/shops.json b/data/configs/shops.json index ee1c563..a1bba0b 100644 --- a/data/configs/shops.json +++ b/data/configs/shops.json @@ -1781,6 +1781,15 @@ "currency": "995", "high_alch": "0" }, + { + "id": "199", + "title": "The Researcher's Wares", + "general_store": "0", + "stock": "{7409,1}-{4081,1}-{10588,1}-{7003,1}-{4502,1}-{775,1}-{777,1}-{776,1}-{6617,1}-{6619,1}-{6623,1}-{6625,1}-{6627,1}-{6629,1}-{6631,1}-{6633,1}-{2379,1}", + "npcs": "4568", + "currency": "995", + "high_alch": "0" + }, { "id": "200", "title": "The Teleporter's Tabs", diff --git a/run-windows.cmd b/run-windows.cmd index 4ecd660..e1e291f 100644 --- a/run-windows.cmd +++ b/run-windows.cmd @@ -5,6 +5,38 @@ set data="%~dp0\data\" set database="%~dp0\database\" set home=%~dp0 +:CHECK_JAVA +java -version 1>nul 2>nul || ( + echo ERROR: Java not installed! + GOTO OPENJDK +) +for /f tokens^=2-5^ delims^=.-_^" %%j in ('java -fullversion 2^>^&1') do set "jver=%%j%%k%%l%%m" + +if %jver% LSS 180261 ( + echo Current Java version is outdated. Java 8 Update 261 is the minimum. + GOTO JAVA_VERSION_ERROR +) + +if %jver% GTR 190000 ( + echo Current Java version is not Java 8. + GOTO JAVA_VERSION_ERROR +) + +GOTO start + +:JAVA_VERSION_ERROR +echo. +echo Expected min version: +echo openjdk full version "1.8.0_261-b12" +echo. +echo Current Java install: +java -fullversion +echo. + +:OPENJDK +echo Opening OpenJDK 8 download page . . . +start https://adoptopenjdk.net/?variant=openjdk8^&jvmVariant=hotspot +pause :start :: Initial menu displayed to the user diff --git a/server.jar b/server.jar index 53d8c17..7a6c546 100644 Binary files a/server.jar and b/server.jar differ