feat: August 31st Alpha Updates (#816)

Be sure to test Underground Pass and Big Chompy Bird Hunting! ## Content Changes ### Features * #797 * #809 * #810 * #811 * #814 ### Fixes * #792 * #793 * #798 * #802 * #806 * #807 * #808 * #812 * #815 ## Engine Changes ### Fixes * #803 * #804
2004Scape · Aug 31, 2024 · 95fd957 · 95fd957
2 parents 5e1ed1b + c623dd7
commit 95fd957
Show file tree

Hide file tree

Showing 158 changed files with 5,891 additions and 2,849 deletions.
diff --git a/data/src/maps/m36_153.jm2 b/data/src/maps/m36_153.jm2
@@ -7359,7 +7359,6 @@
 0 29 59: 140
 0 30 61: 140
 0 31 55: 140
-0 32 4: 975
 0 34 52: 140
 0 34 59: 140
 0 36 56: 140

diff --git a/data/src/maps/m37_150.jm2 b/data/src/maps/m37_150.jm2
@@ -9736,7 +9736,6 @@
 0 53 32: 47
 0 54 22: 47
 0 54 31: 78
-0 54 59: 975
 
 ==== OBJ ====
 0 35 60: 954 1
diff --git a/data/src/maps/m37_151.jm2 b/data/src/maps/m37_151.jm2
@@ -9399,7 +9399,6 @@
 2 38 58: 185 22 2
 
 ==== NPC ====
-0 3 4: 975
 0 19 21: 114
 0 21 19: 114
 0 26 43: 73
@@ -9429,3 +9428,4 @@
 0 18 13: 1482 1
 0 48 34: 1484 1
 0 49 9: 1493 1
+0 14 4: 2529 1
diff --git a/data/src/models/loc/model_loc_68_8.ob2 → data/src/models/loc/model_beehive_8.ob2 b/data/src/models/loc/model_loc_68_8.ob2 → data/src/models/loc/model_beehive_8.ob2
diff --git a/data/src/models/loc/model_loc_3216_8.ob2 → .../src/models/loc/model_mudpile_upass_8.ob2 b/data/src/models/loc/model_loc_3216_8.ob2 → .../src/models/loc/model_mudpile_upass_8.ob2
diff --git a/data/src/models/loc/model_loc_3238_0.ob2 → data/src/models/loc/model_upass_ledge_0.ob2 b/data/src/models/loc/model_loc_3238_0.ob2 → data/src/models/loc/model_upass_ledge_0.ob2
diff --git a/data/src/pack/loc.pack b/data/src/pack/loc.pack
@@ -66,7 +66,7 @@
 65=loc_65
 66=loc_66
 67=loc_67
-68=loc_68
+68=beehive
 69=loc_69
 70=loc_70
 71=loc_71
@@ -303,7 +303,7 @@
 302=loc_302
 303=loc_303
 304=loc_304
-305=loc_305
+305=beehive_scenery
 306=loc_306
 307=loc_307
 308=loc_308
@@ -2649,7 +2649,7 @@
 2648=loc_2648
 2649=loc_2649
 2650=loc_2650
-2651=loc_2651
+2651=quest_murder_beehive
 2652=loc_2652
 2653=loc_2653
 2654=loc_2654
@@ -2880,8 +2880,8 @@
 2879=loc_2879
 2880=loc_2880
 2881=loc_2881
-2882=loc_2882
-2883=loc_2883
+2882=border_gate_toll_left
+2883=border_gate_toll_right
 2884=loc_2884
 2885=loc_2885
 2886=loc_2886
@@ -3214,7 +3214,7 @@
 3213=loc_3213
 3214=loc_3214
 3215=loc_3215
-3216=loc_3216
+3216=mudpile_upass
 3217=loc_3217
 3218=loc_3218
 3219=loc_3219
@@ -3236,7 +3236,7 @@
 3235=loc_3235
 3236=loc_3236
 3237=loc_3237
-3238=loc_3238
+3238=upass_ledge
 3239=loc_3239
 3240=loc_3240
 3241=loc_3241

diff --git a/data/src/pack/model.pack b/data/src/pack/model.pack
@@ -1503,7 +1503,7 @@
 1502=model_loc_1114_8
 1503=model_loc_568_8
 1504=model_loc_2375_8
-1505=model_loc_68_8
+1505=model_beehive_8
 1506=model_loc_2359_8
 1507=model_loc_881_8
 1508=model_loc_821_8
@@ -1755,7 +1755,7 @@
 1754=model_1754
 1755=model_1755_obj_wear
 1756=model_1756
-1757=model_loc_3216_8
+1757=model_mudpile_upass_8
 1758=model_loc_698_8
 1759=model_loc_870_8
 1760=model_loc_1998_8
@@ -1802,7 +1802,7 @@
 1801=model_loc_8_8
 1802=model_loc_9_8
 1803=model_loc_2010_8
-1804=model_loc_3238_0
+1804=model_upass_ledge_0
 1805=model_loc_1996_8
 1806=model_loc_2151_8
 1807=model_1807

diff --git a/data/src/pack/npc.pack b/data/src/pack/npc.pack
@@ -984,24 +984,24 @@
 983=npc_983
 984=npc_984
 985=npc_985
-986=npc_986
-987=npc_987
+986=boulder_upass
+987=unicorn_upass
 988=sir_jerro
 989=sir_carl
 990=sir_harry
 991=npc_991
-992=npc_992
-993=npc_993
-994=npc_994
-995=npc_995
-996=npc_996
-997=npc_997
+992=kardia
+993=witches_cat
+994=nilhoof
+995=klank
+996=kamen
+997=kalrag
 998=othainian
 999=doomion
 1000=holthion
 1001=darkmage
-1002=npc_1002
-1003=npc_1003
+1002=iban_disciple
+1003=lord_iban
 1004=npc_1004
 1005=npc_1005
 1006=sea_slug

diff --git a/data/src/pack/obj.pack b/data/src/pack/obj.pack
@@ -596,7 +596,7 @@
 595=cert_lit_torch
 596=unlit_torch
 597=cert_unlit_torch
-598=obj_598
+598=unlit_arrow
 599=obj_599
 600=book_of_astrology
 601=keep_key
@@ -1483,24 +1483,24 @@
 1482=obj_1482
 1483=obj_1483
 1484=obj_1484
-1485=obj_1485
-1486=obj_1486
-1487=obj_1487
-1488=obj_1488
-1489=obj_1489
-1490=obj_1490
-1491=obj_1491
-1492=obj_1492
-1493=obj_1493
-1494=obj_1494
-1495=obj_1495
-1496=obj_1496
-1497=obj_1497
-1498=obj_1498
-1499=obj_1499
-1500=obj_1500
+1485=damp_cloth
+1486=piece_of_railing
+1487=upass_unicorn_horn
+1488=upass_jerro_badge
+1489=upass_carl_badge
+1490=upass_harry_badge
+1491=upass_witches_cat
+1492=doll_of_iban
+1493=old_journal
+1494=history_of_iban
+1495=klanks_gauntlets
+1496=ibans_dove
+1497=amulet_of_othanian
+1498=amulet_of_doomion
+1499=amulet_of_holthion
+1500=ibans_shadow
 1501=dwarf_brew
-1502=obj_1502
+1502=ibans_ashes
 1503=elena_warrant
 1504=hangover_cure
 1505=elena_teleport_scroll

diff --git a/data/src/pack/seq.pack b/data/src/pack/seq.pack
@@ -589,7 +589,7 @@
 588=chat_neutral1
 589=chat_neutral2
 590=chat_neutral3
-591=chat_default
+591=chat_neutral4
 592=chat_shifty1
 593=chat_shifty2
 594=chat_shifty3

diff --git a/data/src/pack/varp.pack b/data/src/pack/varp.pack
@@ -160,7 +160,7 @@
 159=seaslug_progress
 160=imp_progress
 161=upass_progress
-162=varp_162
+162=upass_map_mechanisms
 163=varp_163
 164=varp_164
 165=elena_progress
@@ -286,7 +286,7 @@
 285=duelstatus
 286=duel_settings
 287=split_privatechat
-288=varp_288
+288=iban_staff_charges
 289=varp_289
 290=ring_of_recoil
 291=ring_of_forging

diff --git a/data/src/scripts/_test/scripts/engine/debug_npc.rs2 b/data/src/scripts/_test/scripts/engine/debug_npc.rs2
@@ -25,3 +25,15 @@ if (npc_find(coord, $npc, 5, 0) = true) {
 } else {
     mes("No NPC found");
 }
+
+[debugproc,npc_anim](npc $npc, seq $seq)
+if ($npc = null | $seq = null) {
+    @debugusage("::npc_anim (name) (op)", "::npc_anim chompy_bird chompy_walk", "");
+    return;
+}
+
+if (npc_find(coord, $npc, 5, 0) = true) {
+    npc_anim($seq, 0);
+} else {
+    mes("No NPC found");
+}