Merge branch 'main' into desertrescue

.devcontainer/devcontainer.json

@@ -13,6 +13,9 @@
 	  		]
 	  	}
 	},
+	"containerEnv": {
+		"SHELL": "/bin/bash"
+	},
 	"remoteUser": "vscode",
 	"postStartCommand": "bash -c 'chmod +x setup.sh && ./setup.sh'"
 }

.env.example

@@ -5,6 +5,9 @@
 # WEB_PORT=80
 # WEB_CORS=false
 
+## management server
+# WEB_MANAGEMENT_PORT=8898
+
 ## game server
 # NODE_ID=10
 # NODE_PORT=43594
@@ -14,7 +17,7 @@
 # NODE_KILLTIMER=50
 # NODE_ALLOW_CHEATS=true
 # NODE_DEBUG=true
-# NODE_DEBUG_PROFILER=false
+# NODE_DEBUG_PROFILE=false
 # NODE_STAFF=pazaz
 # NODE_CLIENT_ROUTEFINDER=true
 # NODE_SOCKET_TIMEOUT=true

data/src/maps/m42_153.jm2

@@ -7667,7 +7667,7 @@
 0 30 24: 1623 1
 0 30 30: 995 1
 0 32 23: 995 1
-0 33 24: 995 1
 0 33 26: 995 3
 0 33 27: 995 1
 0 33 29: 995 7
+0 34 24: 995 1

data/src/maps/m43_51.jm2

@@ -6367,5 +6367,5 @@
 
 ==== OBJ ====
 0 10 22: 1469 1
-0 13 14: 1469 1
+0 13 25: 1469 1
 0 32 25: 1467 1

data/src/pack/loc.pack

@@ -649,7 +649,7 @@
 648=loc_648
 649=loc_649
 650=loc_650
-651=loc_651
+651=digsite_buried_skeleton
 652=loc_652
 653=loc_653
 654=loc_654
@@ -2348,32 +2348,32 @@
 2347=loc_2347
 2348=loc_2348
 2349=loc_2349
-2350=loc_2350
-2351=loc_2351
-2352=loc_2352
-2353=loc_2353
-2354=loc_2354
+2350=digsite_winch
+2351=digsite_private_dig_winch
+2352=digsite_private_dig_exit_rope
+2353=digsite_blocked_altar_exit_rope
+2354=digsite_sacks_empty
 2355=loc_2355
-2356=loc_2356
-2357=loc_2357
-2358=loc_2358
-2359=loc_2359
-2360=loc_2360
-2361=loc_2361
-2362=loc_2362
-2363=loc_2363
+2356=digsite_sacks_specimen_jars
+2357=digsite_bush_empty
+2358=digsite_bush_rock_sample
+2359=digsite_sealed_barrel
+2360=digsite_chest_open
+2361=digsite_chest
+2362=digsite_blocked_altar_brick
+2363=digsite_panning_point
 2364=loc_2364
 2365=loc_2365
-2366=loc_2366
-2367=loc_2367
-2368=loc_2368
-2369=loc_2369
-2370=loc_2370
+2366=digsite_signpost_training_site
+2367=digsite_signpost_level_1_site
+2368=digsite_signpost_level_2_site
+2369=digsite_signpost_level_3_site
+2370=digsite_signpost_private_site
 2371=loc_2371
-2372=loc_2372
-2373=loc_2373
-2374=loc_2374
-2375=loc_2375
+2372=exam_centre_bookcase_chemicals
+2373=exam_centre_cupboard_rock_pick
+2374=exam_centre_cupboard_rock_pick_open
+2375=specimen_tray
 2376=loc_2376
 2377=loc_2377
 2378=loc_2378
@@ -2419,19 +2419,19 @@
 2418=loc_2418
 2419=loc_2419
 2420=loc_2420
-2421=loc_2421
-2422=loc_2422
-2423=loc_2423
-2424=loc_2424
-2425=loc_2425
-2426=loc_2426
-2427=loc_2427
-2428=loc_2428
-2429=loc_2429
-2430=loc_2430
-2431=loc_2431
-2432=loc_2432
-2433=loc_2433
+2421=witchaven_north_lever_down
+2422=witchaven_north_lever_up
+2423=witchaven_south_lever_down
+2424=witchaven_south_lever_up
+2425=witchaven_north_room_lever_down
+2426=witchaven_north_room_lever_up
+2427=witchaven_south_west_door
+2428=witchaven_door_open
+2429=witchaven_south_east_door
+2430=witchaven_goldmine_door
+2431=witchaven_north_door
+2432=edgeville_dungeon_chronozon_gate_west
+2433=edgeville_dungeon_chronozon_gate_east
 2434=loc_2434
 2435=loc_2435
 2436=loc_2436

data/src/pack/npc.pack

@@ -105,9 +105,9 @@
 104=ghost_draynor_manor
 105=bear_brown
 106=bear_black
-107=npc_107
-108=npc_108
-109=npc_109
+107=scorpion
+108=poison_scorpion
+109=pit_scorpion
 110=fire_giant
 111=ice_giant
 112=moss_giant
@@ -173,7 +173,7 @@
 172=dark_wizard_earth
 173=npc_173
 174=dark_wizard_water
-175=npc_175
+175=mugger
 176=npc_176
 177=npc_177
 178=black_knight
@@ -435,7 +435,7 @@
 434=macro_event_watchman4
 435=macro_event_watchman5
 436=macro_event_watchman6
-437=npc_437
+437=brownimp
 438=macro_event_dryad1
 439=macro_event_dryad2
 440=macro_event_dryad3
@@ -975,15 +975,15 @@
 974=npc_974
 975=npc_975
 976=npc_976
-977=npc_977
-978=npc_978
-979=npc_979
-980=npc_980
-981=npc_981
-982=npc_982
-983=npc_983
-984=npc_984
-985=npc_985
+977=blessed_spider
+978=blessed_giant_rat
+979=slave1_upass
+980=slave2_upass
+981=slave3_upass
+982=slave4_upass
+983=slave5_upass
+984=slave6_upass
+985=slave7_upass
 986=boulder_upass
 987=unicorn_upass
 988=sir_jerro