feat: Misc content.

data/pack/obj.pack

@@ -1,6 +1,6 @@
 0=obj_0
 1=obj_1
-2=obj_2
+2=mcannonball
 3=obj_3
 4=ammo_mould
 5=instruction_manual
@@ -2575,106 +2575,106 @@
 2574=trail_sextant
 2575=trail_watch
 2576=trail_chart
-2577=ranger_boots
-2578=cert_ranger_boots
+2577=trail_ranger_boots
+2578=cert_trail_ranger_boots
 2579=wizards_boots
 2580=cert_wizards_boots
-2581=robin_hood_hat
-2582=cert_robin_hood_hat
-2583=black_platebody_t
-2584=cert_black_platebody_t
-2585=black_platelegs_t
-2586=cert_black_platelegs_t
-2587=black_full_helm_t
-2588=cert_black_full_helm_t
-2589=black_kiteshield_t
-2590=cert_black_kiteshield_t
-2591=black_platebody_g
-2592=cert_black_platebody_g
-2593=black_platelegs_g
-2594=cert_black_platelegs_g
-2595=black_full_helm_g
-2596=cert_black_full_helm_g
-2597=black_kiteshield_g
-2598=cert_black_kiteshield_g
-2599=adamant_platebody_t
-2600=cert_adamant_platebody_t
-2601=adamant_platelegs_t
-2602=cert_adamant_platelegs_t
-2603=adamant_kiteshield_t
-2604=cert_adamant_kiteshield_t
-2605=adamant_full_helm_t
-2606=cert_adamant_full_helm_t
-2607=adamant_platebody_g
-2608=cert_adamant_platebody_g
-2609=adamant_platelegs_g
-2610=cert_adamant_platelegs_g
-2611=adamant_kiteshield_g
-2612=cert_adamant_kiteshield_g
-2613=adamant_full_helm_g
-2614=cert_adamant_full_helm_g
-2615=rune_platebody_g
-2616=cert_rune_platebody_g
-2617=rune_platelegs_g
-2618=cert_rune_platelegs_g
-2619=rune_full_helm_g
-2620=cert_rune_full_helm_g
-2621=rune_kiteshield_g
-2622=cert_rune_kiteshield_g
-2623=rune_platebody_t
-2624=cert_rune_platebody_t
-2625=rune_platelegs_t
-2626=cert_rune_platelegs_t
-2627=rune_full_helm_t
-2628=cert_rune_full_helm_t
-2629=rune_kiteshield_t
-2630=cert_rune_kiteshield_t
+2581=trail_robin_hood_hat
+2582=cert_trail_robin_hood_hat
+2583=black_platebody_trim
+2584=cert_black_platebody_trim
+2585=black_platelegs_trim
+2586=cert_black_platelegs_trim
+2587=black_full_helm_trim
+2588=cert_black_full_helm_trim
+2589=black_kiteshield_trim
+2590=cert_black_kiteshield_trim
+2591=black_platebody_gold
+2592=cert_black_platebody_gold
+2593=black_platelegs_gold
+2594=cert_black_platelegs_gold
+2595=black_full_helm_gold
+2596=cert_black_full_helm_gold
+2597=black_kiteshield_gold
+2598=cert_black_kiteshield_gold
+2599=adamant_platebody_trim
+2600=cert_adamant_platebody_trim
+2601=adamant_platelegs_trim
+2602=cert_adamant_platelegs_trim
+2603=adamant_kiteshield_trim
+2604=cert_adamant_kiteshield_trim
+2605=adamant_full_helm_trim
+2606=cert_adamant_full_helm_trim
+2607=adamant_platebody_gold
+2608=cert_adamant_platebody_gold
+2609=adamant_platelegs_gold
+2610=cert_adamant_platelegs_gold
+2611=adamant_kiteshield_gold
+2612=cert_adamant_kiteshield_gold
+2613=adamant_full_helm_gold
+2614=cert_adamant_full_helm_gold
+2615=rune_platebody_gold
+2616=cert_rune_platebody_gold
+2617=rune_platelegs_gold
+2618=cert_rune_platelegs_gold
+2619=rune_full_helm_gold
+2620=cert_rune_full_helm_gold
+2621=rune_kiteshield_gold
+2622=cert_rune_kiteshield_gold
+2623=rune_platebody_trim
+2624=cert_rune_platebody_trim
+2625=rune_platelegs_trim
+2626=cert_rune_platelegs_trim
+2627=rune_full_helm_trim
+2628=cert_rune_full_helm_trim
+2629=rune_kiteshield_trim
+2630=cert_rune_kiteshield_trim
 2631=trail_highwayman_mask
 2632=cert_trail_highwayman_mask
-2633=blue_berret
-2634=cert_blue_berret
-2635=black_berret
-2636=cert_black_berret
-2637=white_berret
-2638=cert_white_berret
-2639=obj_2639
-2640=cert_obj_2639
-2641=obj_2641
-2642=cert_obj_2641
-2643=obj_2643
-2644=cert_obj_2643
-2645=obj_2645
-2646=cert_obj_2645
-2647=obj_2647
-2648=cert_obj_2647
-2649=obj_2649
-2650=cert_obj_2649
-2651=pirates_hat
-2652=cert_pirates_hat
-2653=zamorak_platebody
-2654=cert_zamorak_platebody
-2655=zamorak_platelegs
-2656=cert_zamorak_platelegs
-2657=zamorak_full_helm
-2658=cert_zamorak_full_helm
-2659=zamorak_kiteshield
-2660=cert_zamorak_kiteshield
-2661=saradomin_platebody
-2662=cert_saradomin_platebody
-2663=saradomin_platelegs
-2664=cert_saradomin_platelegs
-2665=saradomin_full_helm
-2666=cert_saradomin_full_helm
-2667=saradomin_kiteshield
-2668=cert_saradomin_kiteshield
-2669=guthix_platebody
-2670=cert_guthix_platebody
-2671=guthix_platelegs
-2672=cert_guthix_platelegs
-2673=guthix_full_helm
-2674=cert_guthix_full_helm
-2675=guthix_kiteshield
-2676=cert_guthix_kiteshield
+2633=trail_berret_blue
+2634=cert_trail_berret_blue
+2635=trail_berret_black
+2636=cert_trail_berret_black
+2637=trail_berret_white
+2638=cert_trail_berret_white
+2639=trail_cavalier_tan
+2640=cert_trail_cavalier_tan
+2641=trail_cavalier_brown
+2642=cert_trail_cavalier_brown
+2643=trail_cavalier_black
+2644=cert_trail_cavalier_black
+2645=trail_headband_red
+2646=cert_trail_headband_red
+2647=trail_headband_black
+2648=cert_trail_headband_black
+2649=trail_headband_brown
+2650=cert_trail_headband_brown
+2651=trail_pirates_hat
+2652=cert_trail_pirates_hat
+2653=rune_platebody_zamorak
+2654=cert_rune_platebody_zamorak
+2655=rune_platelegs_zamorak
+2656=cert_rune_platelegs_zamorak
+2657=rune_full_helm_zamorak
+2658=cert_rune_full_helm_zamorak
+2659=rune_kiteshield_zamorak
+2660=cert_rune_kiteshield_zamorak
+2661=rune_platebody_saradomin
+2662=cert_rune_platebody_saradomin
+2663=rune_platelegs_saradomin
+2664=cert_rune_platelegs_saradomin
+2665=rune_full_helm_saradomin
+2666=cert_rune_full_helm_saradomin
+2667=rune_kiteshield_saradomin
+2668=cert_rune_kiteshield_saradomin
+2669=rune_platebody_guthix
+2670=cert_rune_platebody_guthix
+2671=rune_platelegs_guthix
+2672=cert_rune_platelegs_guthix
+2673=rune_full_helm_guthix
+2674=cert_rune_full_helm_guthix
+2675=rune_kiteshield_guthix
+2676=cert_rune_kiteshield_guthix
 2677=trail_clue_easy_simple_exp001
 2678=trail_clue_easy_simple_exp002
 2679=trail_clue_easy_simple_exp003
@@ -2859,7 +2859,7 @@
 2858=trail_clue_medium_anagram_exp012
 2859=wolf_bones
 2860=cert_wolf_bones
-2861=obj_2861
+2861=wolfbone_arrowheads
 2862=achey_logs
 2863=cert_achey_logs
 2864=obj_2864

data/src/scripts/areas/area_combat_training/configs/combat_training_camp.npc

@@ -23,4 +23,10 @@ model8=model_329_npc
 head1=model_48_npc_head
 head2=model_85_idk_head
 wanderrange=0
-moverestrict=nomove
+moverestrict=nomove
+category=shop_keeper
+param=owned_shop,armoury_combat_training_camp
+param=shop_sell_multiplier,1500
+param=shop_buy_multiplier,500
+param=shop_delta,10
+param=shop_title,Armoury

data/src/scripts/areas/area_combat_training/scripts/combat_training_camp_npcs.rs2

@@ -0,0 +1,49 @@
+// Shop Keeper
+// TODO - facial animations.
+// TODO - linebreaks.
+[opnpc1,npc_561]
+~chatplayer(neutral, "Hello.");
+~chatnpc(neutral, "So, are you looking to buy weapons? King Lathas keeps us very well stocked.");
+
+def_int $option = ~p_choice2("What do you have?", 0, "No thanks.", 1);
+
+switch_int ($option) {
+    case 0: {
+        ~chatplayer(neutral, "What do you have?");
+        ~chatnpc(neutral, "Take a look.");
+        ~openshop_activenpc;
+    }
+
+    case 1: {
+        ~chatplayer(neutral, "No thanks.");
+    }
+}
+
+// Mace Guard
+// TODO - facial animations.
+[opnpc1,npc_344]
+~chatplayer(neutral, "Hello there.");
+~chatnpc(neutral, "What do you want - leave us be!");
+
+// Crossbow Guard
+// TODO - facial animations.
+// TODO - linebreaks.
+[opnpc1,npc_346]
+~chatplayer(neutral, "Hello.");
+
+def_int $random = random(2);
+
+switch_int ($random) {
+    case 0: {
+        ~chatnpc(neutral, "Hello soldier.");
+        ~chatplayer(neutral, "I'm more of an adventurer really.");
+        ~chatnpc(neutral, "In this day and age we're all soldiers. No time to waste gassing, Fight! Fight! Fight!");
+    }
+
+    case 1: {
+        ~chatnpc(neutral, "Well hello brave warrior. These ogres have been terrorising the area, they've eaten four of our children this week alone.");
+        ~chatplayer(neutral, "Brutes!");
+        ~chatnpc(neutral, "So we decided to use them for target practice. A fair punishment.");
+        ~chatplayer(neutral, "Indeed.");
+    }
+}

data/src/scripts/levelrequire/scripts/tier10.rs2

@@ -22,14 +22,14 @@
 [opheld2,black_chainbody] @levelrequire_defence(10, last_slot);
 [opheld2,black_platebody] @levelrequire_defence(10, last_slot);
 
-[opheld2,black_platebody_t] @levelrequire_defence(10, last_slot);
-[opheld2,black_platelegs_t] @levelrequire_defence(10, last_slot);
-[opheld2,black_full_helm_t] @levelrequire_defence(10, last_slot);
-[opheld2,black_kiteshield_t] @levelrequire_defence(10, last_slot);
-[opheld2,black_platebody_g] @levelrequire_defence(10, last_slot);
-[opheld2,black_platelegs_g] @levelrequire_defence(10, last_slot);
-[opheld2,black_full_helm_g] @levelrequire_defence(10, last_slot);
-[opheld2,black_kiteshield_g] @levelrequire_defence(10, last_slot);
+[opheld2,black_platebody_trim] @levelrequire_defence(10, last_slot);
+[opheld2,black_platelegs_trim] @levelrequire_defence(10, last_slot);
+[opheld2,black_full_helm_trim] @levelrequire_defence(10, last_slot);
+[opheld2,black_kiteshield_trim] @levelrequire_defence(10, last_slot);
+[opheld2,black_platebody_gold] @levelrequire_defence(10, last_slot);
+[opheld2,black_platelegs_gold] @levelrequire_defence(10, last_slot);
+[opheld2,black_full_helm_gold] @levelrequire_defence(10, last_slot);
+[opheld2,black_kiteshield_gold] @levelrequire_defence(10, last_slot);
 
 // Ranged
 [opheld2,hardleather_body] @levelrequire_defence(10, last_slot);

data/src/scripts/levelrequire/scripts/tier30.rs2

@@ -28,14 +28,14 @@
 [opheld2,adamant_chainbody] @levelrequire_defence(30, last_slot);
 [opheld2,adamant_platebody] @levelrequire_defence(30, last_slot);
 
-[opheld2,adamant_platebody_t] @levelrequire_defence(30, last_slot);
-[opheld2,adamant_platelegs_t] @levelrequire_defence(30, last_slot);
-[opheld2,adamant_full_helm_t] @levelrequire_defence(30, last_slot);
-[opheld2,adamant_kiteshield_t] @levelrequire_defence(30, last_slot);
-[opheld2,adamant_platebody_g] @levelrequire_defence(30, last_slot);
-[opheld2,adamant_platelegs_g] @levelrequire_defence(30, last_slot);
-[opheld2,adamant_full_helm_g] @levelrequire_defence(30, last_slot);
-[opheld2,adamant_kiteshield_g] @levelrequire_defence(30, last_slot);
+[opheld2,adamant_platebody_trim] @levelrequire_defence(30, last_slot);
+[opheld2,adamant_platelegs_trim] @levelrequire_defence(30, last_slot);
+[opheld2,adamant_full_helm_trim] @levelrequire_defence(30, last_slot);
+[opheld2,adamant_kiteshield_trim] @levelrequire_defence(30, last_slot);
+[opheld2,adamant_platebody_gold] @levelrequire_defence(30, last_slot);
+[opheld2,adamant_platelegs_gold] @levelrequire_defence(30, last_slot);
+[opheld2,adamant_full_helm_gold] @levelrequire_defence(30, last_slot);
+[opheld2,adamant_kiteshield_gold] @levelrequire_defence(30, last_slot);
 
 // Ranged
 [opheld2,maple_longbow] @levelrequire_ranged(30, last_slot);

data/src/scripts/levelrequire/scripts/tier40.rs2

@@ -28,30 +28,31 @@
 [opheld2,rune_chainbody] @levelrequire_defence(40, last_slot);
 [opheld2,rune_platebody] @levelrequire_dragon_slayer_quest_defence(40, last_slot);
 
-[opheld2,rune_platebody_t] @levelrequire_dragon_slayer_quest_defence(40, last_slot);
-[opheld2,rune_platelegs_t] @levelrequire_defence(40, last_slot);
-[opheld2,rune_full_helm_t] @levelrequire_defence(40, last_slot);
-[opheld2,rune_kiteshield_t] @levelrequire_defence(40, last_slot);
-[opheld2,rune_platebody_g] @levelrequire_dragon_slayer_quest_defence(40, last_slot);
-[opheld2,rune_platelegs_g] @levelrequire_defence(40, last_slot);
-[opheld2,rune_full_helm_g] @levelrequire_defence(40, last_slot);
-[opheld2,rune_kiteshield_g] @levelrequire_defence(40, last_slot);
+[opheld2,rune_platebody_trim] @levelrequire_dragon_slayer_quest_defence(40, last_slot);
+[opheld2,rune_platelegs_trim] @levelrequire_defence(40, last_slot);
+[opheld2,rune_full_helm_trim] @levelrequire_defence(40, last_slot);
+[opheld2,rune_kiteshield_trim] @levelrequire_defence(40, last_slot);
+[opheld2,rune_platebody_gold] @levelrequire_dragon_slayer_quest_defence(40, last_slot);
+[opheld2,rune_platelegs_gold] @levelrequire_defence(40, last_slot);
+[opheld2,rune_full_helm_gold] @levelrequire_defence(40, last_slot);
+[opheld2,rune_kiteshield_gold] @levelrequire_defence(40, last_slot);
 
-[opheld2,zamorak_platebody] @levelrequire_dragon_slayer_quest_defence(40, last_slot);
-[opheld2,zamorak_platelegs] @levelrequire_defence(40, last_slot);
-[opheld2,zamorak_full_helm] @levelrequire_defence(40, last_slot);
-[opheld2,zamorak_kiteshield] @levelrequire_defence(40, last_slot);
-[opheld2,saradomin_platebody] @levelrequire_dragon_slayer_quest_defence(40, last_slot);
-[opheld2,saradomin_platelegs] @levelrequire_defence(40, last_slot);
-[opheld2,saradomin_full_helm] @levelrequire_defence(40, last_slot);
-[opheld2,saradomin_kiteshield] @levelrequire_defence(40, last_slot);
-[opheld2,guthix_platebody] @levelrequire_dragon_slayer_quest_defence(40, last_slot);
-[opheld2,guthix_platelegs] @levelrequire_defence(40, last_slot);
-[opheld2,guthix_full_helm] @levelrequire_defence(40, last_slot);
-[opheld2,guthix_kiteshield] @levelrequire_defence(40, last_slot);
+[opheld2,rune_platebody_zamorak] @levelrequire_dragon_slayer_quest_defence(40, last_slot);
+[opheld2,rune_platelegs_zamorak] @levelrequire_defence(40, last_slot);
+[opheld2,rune_full_helm_zamorak] @levelrequire_defence(40, last_slot);
+[opheld2,rune_kiteshield_zamorak] @levelrequire_defence(40, last_slot);
+[opheld2,rune_platebody_saradomin] @levelrequire_dragon_slayer_quest_defence(40, last_slot);
+[opheld2,rune_platelegs_saradomin] @levelrequire_defence(40, last_slot);
+[opheld2,rune_full_helm_saradomin] @levelrequire_defence(40, last_slot);
+[opheld2,rune_kiteshield_saradomin] @levelrequire_defence(40, last_slot);
+[opheld2,rune_platebody_guthix] @levelrequire_dragon_slayer_quest_defence(40, last_slot);
+[opheld2,rune_platelegs_guthix] @levelrequire_defence(40, last_slot);
+[opheld2,rune_full_helm_guthix] @levelrequire_defence(40, last_slot);
+[opheld2,rune_kiteshield_guthix] @levelrequire_defence(40, last_slot);
 
 // Ranged
-[opheld2,robin_hood_hat] @levelrequire_ranged(40, last_slot);
+[opheld2,trail_robin_hood_hat] @levelrequire_ranged(40, last_slot);
+[opheld2,trail_ranger_boots] @levelrequire_ranged(40, last_slot);
 [opheld2,yew_longbow] @levelrequire_ranged(40, last_slot);
 [opheld2,yew_shortbow] @levelrequire_ranged(40, last_slot);
 [opheld2,dragonhide_body] @levelrequire_dragon_slayer_quest_ranged_and_defence(40, 40, last_slot);