feat: August 23rd Alpha Updates (#795)

## Content Changes ### Features * #778 * #780 * #786 * #791 ### Fixes * #774 * #775 * #776 * #777 * #779 * #781 * #782 * #785 * #787 * #789 * #790 * #794 ## Engine Changes ### Features * #788 ### Fixes * #784
2004Scape · Aug 23, 2024 · 5e1ed1b · 5e1ed1b
2 parents 7685298 + 567e395
commit 5e1ed1b
Show file tree

Hide file tree

Showing 72 changed files with 758 additions and 296 deletions.
diff --git a/data/src/models/loc/model_loc_3377_8.ob2 → ...ls/loc/chompybird_ogre_chest_closed_8.ob2 b/data/src/models/loc/model_loc_3377_8.ob2 → ...ls/loc/chompybird_ogre_chest_closed_8.ob2
diff --git a/data/src/models/loc/model_loc_3378_8.ob2 → ...dels/loc/chompybird_ogre_chest_open_8.ob2 b/data/src/models/loc/model_loc_3378_8.ob2 → ...dels/loc/chompybird_ogre_chest_open_8.ob2
diff --git a/data/src/models/loc/model_loc_3375_8.ob2 → ...src/models/loc/model_ogre_spitroast_8.ob2 b/data/src/models/loc/model_loc_3375_8.ob2 → ...src/models/loc/model_ogre_spitroast_8.ob2
diff --git a/data/src/models/loc/model_loc_3372_8.ob2 → ...oc/model_ogre_spitroast_with_chompy_8.ob2 b/data/src/models/loc/model_loc_3372_8.ob2 → ...oc/model_ogre_spitroast_with_chompy_8.ob2
diff --git a/data/src/pack/loc.pack b/data/src/pack/loc.pack
@@ -3370,13 +3370,13 @@
 3369=loc_3369
 3370=loc_3370
 3371=achey_tree_stump
-3372=loc_3372
-3373=loc_3373
-3374=loc_3374
-3375=loc_3375
+3372=ogre_spitroast_raw_chompy
+3373=ogre_spitroast_cooked_chompy
+3374=ogre_spitroast_burnt_chompy
+3375=ogre_spitroast
 3376=loc_3376
-3377=loc_3377
-3378=loc_3378
+3377=chompybird_ogre_chest_closed
+3378=chompybird_ogre_chest_open
 3379=chompybird_cave_entrance
 3380=chompybird_cave_exit_a
 3381=chompybird_cave_exit_b

diff --git a/data/src/pack/model.pack b/data/src/pack/model.pack
@@ -3447,8 +3447,8 @@
 3446=model_3446_spotanim
 3447=model_3447_obj
 3448=model_loc_2023_8
-3449=model_loc_3378_8
-3450=model_loc_3377_8
+3449=chompybird_ogre_chest_open_8
+3450=chompybird_ogre_chest_closed_8
 3451=model_loc_3371_8
-3452=model_loc_3375_8
-3453=model_loc_3372_8
+3452=model_ogre_spitroast_8
+3453=model_ogre_spitroast_with_chompy_8
diff --git a/data/src/pack/seq.pack b/data/src/pack/seq.pack
@@ -1023,5 +1023,5 @@
 1022=seq_1022
 1023=seq_1023
 1024=seq_1024
-1025=ogre_seq_1025
-1026=human_ogre_bellows_use
+1025=ogre_attackbow
+1026=human_ogre_bellows_use
diff --git a/data/src/scripts/_test/scripts/engine/debug_loc.rs2 b/data/src/scripts/_test/scripts/engine/debug_loc.rs2
@@ -9,3 +9,16 @@ if ($loc = null) {
 }
 
 loc_add(coord, $loc, 0, centrepiece_straight, 500);
+
+[debugproc,loc_anim](loc $loc, seq $seq)
+if ($loc = null | $seq = null) {
+    @debugusage("::loc_anim (name) (seq)", "::loc_anim ogre_spitroast spit_anim", "");
+    return;
+}
+
+loc_findallzone(coord);
+while (loc_findnext = true) {
+    if (loc_type = $loc) {
+        loc_anim($seq);
+    }
+}
diff --git a/data/src/scripts/_unpack/all.loc b/data/src/scripts/_unpack/all.loc
@@ -13341,23 +13341,6 @@ active=yes
 op1=Climb-down
 mapscene=7
 
-[loc_2619]
-name=Barrel
-desc=A wooden barrel for storage.
-model=model_loc_362
-op1=Search
-
-[loc_2620]
-name=Crate
-desc=An old crate for storage.
-model=model_loc_0
-op1=Search
-retex1s=darkwood
-retex1d=wood2
-retex2s=elfwood
-retex2d=wood2
-category=empty_crate
-
 [loc_2621]
 name=Door
 model=model_loc_3
@@ -18295,43 +18278,43 @@ width=2
 length=2
 mapscene=0
 
-[loc_3372]
+[ogre_spitroast_raw_chompy]
 name=Ogre spitroast
 desc=Useful for ogre dinners.
-model=model_loc_3372
+model=model_ogre_spitroast_with_chompy
 width=2
 anim=spit_anim
 hasalpha=yes
 blockrange=no
 recol1s=26156
 recol1d=19014
 
-[loc_3373]
+[ogre_spitroast_cooked_chompy]
 name=Ogre spitroast
 desc=Useful for ogre dinners.
-model=model_loc_3372
+model=model_ogre_spitroast_with_chompy
 width=2
 anim=spit_anim
 hasalpha=yes
 blockrange=no
 recol1s=26156
 recol1d=14690
 
-[loc_3374]
+[ogre_spitroast_burnt_chompy]
 name=Ogre spitroast
 desc=Useful for ogre dinners.
-model=model_loc_3372
+model=model_ogre_spitroast_with_chompy
 width=2
 anim=spit_anim
 hasalpha=yes
 blockrange=no
 recol1s=26156
 recol1d=6273
 
-[loc_3375]
+[ogre_spitroast]
 name=Ogre spitroast
 desc=Useful for ogre dinners.
-model=model_loc_3375
+model=model_ogre_spitroast
 width=2
 anim=seq_1016
 hasalpha=yes
@@ -18349,24 +18332,24 @@ blockrange=no
 recol1s=10400
 recol1d=12580
 
-[loc_3377]
+[chompybird_ogre_chest_closed]
 name=Locked Ogre chest
 desc=Hmmm, a rock for a lock....
-model=model_loc_3377
+model=chompybird_ogre_chest_closed
 width=2
 op1=Unlock
 
-[loc_3378]
+[chompybird_ogre_chest_open]
 name=Unlocked Ogre chest
 desc=Some stealthy thief must have picked the ogre lock!
-model=model_loc_3378
+model=chompybird_ogre_chest_open
 width=2
 op1=Search
 
 [loc_3382]
 name=Ogre spitroast
 desc=Useful for ogre dinners.
-model=model_loc_3372
+model=model_ogre_spitroast_with_chompy
 width=2
 anim=spit_anim
 hasalpha=yes
@@ -18375,7 +18358,7 @@ blockrange=no
 [loc_3383]
 name=Ogre spitroast
 desc=Useful for ogre dinners.
-model=model_loc_3372
+model=model_ogre_spitroast_with_chompy
 width=2
 anim=spit_anim
 hasalpha=yes

diff --git a/data/src/scripts/_unpack/all.npc b/data/src/scripts/_unpack/all.npc
@@ -6365,34 +6365,6 @@ head1=model_52_idk_head
 head2=model_81_idk_head
 head3=model_37_npc_head
 
-[gunnjorn]
-vislevel=hide
-name=Gunnjorn
-desc=He maintains this agility course
-walkanim=human_walk_f,human_walk_b,human_walk_l,human_walk_r
-readyanim=human_ready
-op1=Talk-to
-recol1s=2340
-recol1d=8354
-recol2s=15360
-recol2d=15855
-recol3s=6273
-recol3d=27240
-recol4s=14724
-recol4d=13539
-model1=model_219_obj_wear
-model2=model_248_idk
-model3=model_299_npc
-model4=model_173_npc
-model5=model_176_idk
-model6=model_274_idk
-model7=model_242_npc
-model8=model_185_obj_wear
-model9=model_550_obj_wear
-head1=model_57_obj_wear
-head2=model_75_npc_head
-head3=model_80_idk_head
-
 [npc_613]
 vislevel=hide
 name=Digsite workman

diff --git a/data/src/scripts/_unpack/all.seq b/data/src/scripts/_unpack/all.seq
@@ -13118,7 +13118,7 @@ frame13=anim_3973
 frame14=anim_3975
 frame15=anim_3962
 
-[ogre_seq_1025]
+[ogre_attackbow]
 frame1=anim_3979
 frame2=anim_3981
 frame3=anim_3983

diff --git a/data/src/scripts/areas/area_barbarian_outpost/configs/barbarian_outpost.npc b/data/src/scripts/areas/area_barbarian_outpost/configs/barbarian_outpost.npc
@@ -29,4 +29,32 @@ model9=model_550_obj_wear
 head1=model_57_obj_wear
 head2=model_84_idk_head
 head3=model_75_npc_head
-wanderrange=2
+wanderrange=2
+
+[gunnjorn]
+vislevel=hide
+name=Gunnjorn
+desc=He maintains this agility course
+walkanim=human_walk_f,human_walk_b,human_walk_l,human_walk_r
+readyanim=human_ready
+op1=Talk-to
+recol1s=2340
+recol1d=8354
+recol2s=15360
+recol2d=15855
+recol3s=6273
+recol3d=27240
+recol4s=14724
+recol4d=13539
+model1=model_219_obj_wear
+model2=model_248_idk
+model3=model_299_npc
+model4=model_173_npc
+model5=model_176_idk
+model6=model_274_idk
+model7=model_242_npc
+model8=model_185_obj_wear
+model9=model_550_obj_wear
+head1=model_57_obj_wear
+head2=model_75_npc_head
+head3=model_80_idk_head
diff --git a/data/src/scripts/areas/area_barbarian_outpost/scripts/barbarian_outpost_guard.rs2 b/data/src/scripts/areas/area_barbarian_outpost/scripts/barbarian_outpost_guard.rs2
@@ -56,6 +56,7 @@ if(inv_total(inv, barcrawl_card) = 0 & inv_total(bank, barcrawl_card) = 0) {
         }
         ~mesbox("You give the card to the barbarian");
         ~chatnpc("<p,happy>Yep that seems fine, you can come in now.|I never learned to read,|but you look like you've drunk plenty.");
+        return;
     }
     ~chatplayer("<p,sad>I haven't finished it yet.");
     ~chatnpc("<p,neutral>Well come back when you have, you lightweight.");

diff --git a/data/src/scripts/areas/area_barbarian_outpost/scripts/gunnjorn.rs2 b/data/src/scripts/areas/area_barbarian_outpost/scripts/gunnjorn.rs2
@@ -0,0 +1,3 @@
+[opnpc1,gunnjorn]
+~chatnpc("<p,happy>Haha welcome to my obstacle course.|Have fun, but remember this isn't a child's playground.|People have died here.");
+~chatnpc("<p,happy>The best way to train,|is to go round the course in a clockwise direction.");
diff --git a/data/src/scripts/areas/area_mage_arena/scripts/chamber.rs2 b/data/src/scripts/areas/area_mage_arena/scripts/chamber.rs2
@@ -3,7 +3,7 @@
 [oploc1,loc_2875] @pray_at_statue("Guthix", guthixcape, ^mage_arena_guthix);
 
 [label,pray_at_statue](string $name, namedobj $cape, int $stage)
-~forcewalk(movecoord(loc_coord, 0, 0, -2));
+~forcewalk2(movecoord(loc_coord, 0, 0, -2));
 facesquare(loc_coord);
 if (%magearena_progress <= ^mage_arena_prayed_at_statue) { // first time
     %magearena_progress = $stage;

diff --git a/data/src/scripts/areas/area_mage_arena/scripts/mage_arena.rs2 b/data/src/scripts/areas/area_mage_arena/scripts/mage_arena.rs2
@@ -49,7 +49,7 @@ if (%magearena_progress >= ^mage_arena_complete) {
 }
 
 if ($outside_edge ! coord) {
-    ~forcewalk($outside_edge);
+    ~forcewalk2($outside_edge);
 }
 facesquare($inside_edge);
 mes("You step into the pool.");