chore(content): Naming some unnamed npcs, locs (#1318)

data/src/pack/loc.pack

@@ -170,8 +170,8 @@
 169=loc_169
 170=muddy_chest_closed
 171=muddy_chest_opened
-172=loc_172
-173=loc_173
+172=closed_crystal_chest
+173=opened_crystal_chest
 174=rubble_1
 175=rubble_2
 176=loc_176
@@ -2036,7 +2036,7 @@
 2035=loc_2035
 2036=loc_2036
 2037=loc_2037
-2038=loc_2038
+2038=combat_training_dummy
 2039=loc_2039
 2040=loc_2040
 2041=loc_2041

data/src/pack/npc.pack

@@ -117,7 +117,7 @@
 116=cyclops
 117=giant
 118=npc_118
-119=npc_119
+119=chaos_dwarf
 120=npc_120
 121=npc_121
 122=hobgoblin
@@ -132,7 +132,7 @@
 131=penguin
 132=monkey
 133=black_unicorn
-134=npc_134
+134=poison_spider
 135=mammoth
 136=terrorbird
 137=npc_137
@@ -171,7 +171,7 @@
 170=gnome_pilot
 171=brimstail
 172=dark_wizard_earth
-173=npc_173
+173=invrigar_the_necromancer
 174=dark_wizard_water
 175=mugger
 176=witch_draynor
@@ -871,10 +871,10 @@
 870=enclave_guard
 871=ogre_shaman
 872=watchtower_wizard
-873=npc_873
-874=npc_874
-875=npc_875
-876=npc_876
+873=ogre_trader_1
+874=ogre_merchant
+875=ogre_trader_2
+876=ogre_trader_3
 877=tower_guard
 878=colonel_radick
 879=delrith

data/src/scripts/_unpack/all.loc

@@ -440,7 +440,7 @@ forceapproach=north
 recol1s=10570
 recol1d=15621
 
-[loc_172]
+[closed_crystal_chest]
 name=Closed chest
 desc=I wonder what's inside.
 model=wooden_chest
@@ -449,7 +449,7 @@ forceapproach=north
 recol1s=10570
 recol1d=14800
 
-[loc_173]
+[opened_crystal_chest]
 name=Open chest
 desc=Perhaps I should search it.
 model=model_loc_76

data/src/scripts/_unpack/all.npc

@@ -3263,7 +3263,7 @@ param=attack_sound,baxe_crush
 // TODO SOUNDS
 // https://raw.githubusercontent.com/Joshua-F/osrs-dumps/refs/heads/master/config/dump.npc npc_290
 
-[npc_119]
+[chaos_dwarf]
 walkanim=dwarf_walk
 readyanim=dwarf_ready
 name=Chaos dwarf
@@ -3737,7 +3737,7 @@ category=unicorn
 // osrs stats and Vislvl match 1:1
 // https://raw.githubusercontent.com/Joshua-F/osrs-dumps/refs/heads/master/config/dump.npc npc_2849
 
-[npc_134]
+[poison_spider]
 walkanim=giantspider_walk
 readyanim=giantspider_ready
 name=Poison spider
@@ -4308,7 +4308,7 @@ huntmode=ranged
 // osrs stats and Vislvl match 1:1
 // https://raw.githubusercontent.com/Joshua-F/osrs-dumps/refs/heads/master/config/dump.npc npc_510
 
-[npc_173]
+[invrigar_the_necromancer]
 name=Invrigar the Necromancer
 desc=An evil user of Magic powers
 walkanim=human_walk_f,human_walk_b,human_walk_l,human_walk_r

data/src/scripts/areas/area_ardougne_east/scripts/necromancer_tower.rs2

@@ -1,10 +1,10 @@
-[ai_queue1,npc_173] ~npc_default_retaliate;
+[ai_queue1,invrigar_the_necromancer] ~npc_default_retaliate;
 
-[ai_applayer2,npc_173] 
+[ai_applayer2,invrigar_the_necromancer] 
 npc_setmode(opplayer2);
 ~invrigar_attack;
 
-[ai_opplayer2,npc_173] 
+[ai_opplayer2,invrigar_the_necromancer] 
 ~invrigar_attack;
 
 [ai_queue1,necromancer] ~npc_default_retaliate;

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

@@ -1,4 +1,4 @@
-[loc_2038]
+[combat_training_dummy]
 name=Dummy
 desc=I've met less intelligent conversationalists.
 model=model_loc_823

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

@@ -42,7 +42,7 @@ if(%biohazard_progress < ^biohazard_complete) {
 }
 ~open_and_close_double_door2(~check_axis(coord, loc_coord, loc_angle), $side, grate_open);
 
-[oploc1,loc_2038] // Combat training camp dummy
+[oploc1,combat_training_dummy] // Combat training camp dummy
 ~player_combat_stat;
 if (%damagestyle = ^style_ranged_accurate | %damagestyle = ^style_ranged_longrange | %damagestyle = ^style_ranged_rapid) {
     mes("You can't use ranged attacks on the dummy.");

data/src/scripts/areas/area_taverly/scripts/crystal_chest.rs2

@@ -1,7 +1,7 @@
-[oploc1,loc_172]
+[oploc1,closed_crystal_chest]
 @open_crystal_chest;
 
-[oplocu,loc_172]
+[oplocu,closed_crystal_chest]
 if(last_useitem = crystal_key) {
     @open_crystal_chest;
 } else {
@@ -14,7 +14,7 @@ if (inv_total(inv, crystal_key) > 0) {
     mes("You unlock the chest with your key.");
     anim(human_openchest, 0);
     sound_synth(chest_open, 0, 0);
-    loc_change(loc_173, 2);
+    loc_change(opened_crystal_chest, 2);
     p_delay(0);
     inv_del(inv, crystal_key, 1);
     mes("You find some treasure in the chest!");

data/src/scripts/areas/area_yanille/configs/ogre.npc

@@ -541,7 +541,7 @@ param=death_sound,giant_death
 // osrs stats and Vislvl match 1:1
 // https://raw.githubusercontent.com/Joshua-F/osrs-dumps/refs/heads/master/config/dump.npc npc_4382
 
-[npc_873]
+[ogre_trader_1]
 name=Ogre trader
 desc=Funnily enough, doesn't actually buy or sell ogres.
 size=2
@@ -577,7 +577,7 @@ param=shop_delta,30
 param=shop_title,Dal's General Ogre Supplies
 // https://raw.githubusercontent.com/Joshua-F/osrs-dumps/refs/heads/master/config/dump.npc npc_4401
 
-[npc_874]
+[ogre_merchant]
 name=Ogre merchant
 desc=Funnily enough, doesn't actually buy or sell ogres.
 size=2
@@ -613,7 +613,7 @@ param=shop_delta,30
 param=shop_title,Grud's Herblore Stall.
 // https://raw.githubusercontent.com/Joshua-F/osrs-dumps/refs/heads/master/config/dump.npc npc_4402
 
-[npc_875]
+[ogre_trader_2]
 name=Ogre trader
 desc=Funnily enough, doesn't actually buy or sell ogres.
 size=2
@@ -643,7 +643,7 @@ param=death_sound,giant_death
 param=death_drop,big_bones
 // https://raw.githubusercontent.com/Joshua-F/osrs-dumps/refs/heads/master/config/dump.npc npc_4403
 
-[npc_876]
+[ogre_trader_3]
 name=Ogre trader
 desc=Funnily enough, doesn't actually buy or sell ogres.
 size=2

data/src/scripts/areas/area_yanille/scripts/ogre_merchant.rs2

@@ -1,4 +1,4 @@
-[opnpc1,npc_874]
+[opnpc1,ogre_merchant]
 ~chatnpc("<p,quiz>Does the little creature want to buy sumfin'?");
 switch_int(~p_choice2("Yes I do.", 1, "No I don't.", 2)) {
     case 1 :

data/src/scripts/areas/area_yanille/scripts/ogre_trader.rs2

@@ -1,4 +1,4 @@
-[opnpc1,npc_873]
+[opnpc1,ogre_trader_1]
 ~chatnpc("<p,quiz>What the human be wantin'?");
 switch_int(~p_choice2("Can I see what you are selling?", 1, "I don't need anything.", 2)) {
     case 1 :
@@ -10,11 +10,11 @@ switch_int(~p_choice2("Can I see what you are selling?", 1, "I don't need anythi
         ~chatnpc("<p,bored>As you wish.");
 }
 
-[opnpc1,npc_875]
+[opnpc1,ogre_trader_2]
 ~chatnpc("<p,angry>Arr, small thing wants my food, does it?|I'll teach you to deal with ogres!");
 ~npc_retaliate(0);
 
-[opnpc3,npc_875]
+[opnpc3,ogre_trader_2]
 ~chatnpc("<p,angry>Arr, small thing wants my food, does it?|I'll teach you to deal with ogres!");
 ~npc_retaliate(0);
 
@@ -23,7 +23,7 @@ if (stat(thieving) < 15) {
     ~mesbox("You need a Thieving level of 15 to steal from this stall."); // OSRS (matches RSC)
     return;
 }
-if(npc_find(coord, npc_875, 3, 2) = true) {
+if(npc_find(coord, ogre_trader_2, 3, 2) = true) {
     ~chatnpc("<p,angry>Grr! Get your hands off those cakes!");
     ~npc_retaliate(0);
     return;
@@ -37,10 +37,10 @@ inv_add(inv, rock_cake, 1);
 loc_change(loc_2792, 11); // 11t osrs
 stat_advance(thieving, 65);
 
-[opnpc1,npc_876]
+[opnpc1,ogre_trader_3]
 ~chatnpc("<p,angry>Grrr, little animal; I shall destroy you!");
 ~npc_retaliate(0);
 
-[opnpc3,npc_876]
+[opnpc3,ogre_trader_3]
 ~chatnpc("<p,angry>Trade with me? Who do you think you are?");
 ~npc_retaliate(0);

data/src/scripts/drop tables/scripts/chaos_dwarf.rs2

@@ -1,4 +1,4 @@
-[ai_queue3,npc_119]
+[ai_queue3,chaos_dwarf]
 gosub(npc_death);
 if (npc_findhero = false) {
     return;

data/src/scripts/quests/quest_itwatchtower/scripts/quest_itwatchtower.rs2

@@ -339,7 +339,7 @@ p_delay(0);
 loc_change(loc_3273, 300);
 mes("Ahh! There is a spider inside.");
 mes("Someone's idea of a joke...");
-npc_add(coord, npc_134, 1000);
+npc_add(coord, poison_spider, 1000);
 ~npc_retaliate(0);
 
 [oploc1,loc_2827]
@@ -362,7 +362,7 @@ switch_int(random(8)) {
         inv_add(inv, bones, 1);
         ~chatplayer("<p,bored>Oh great, some bones!");
     case 4 :
-        npc_add(map_findsquare(coord, 1, 1, ^map_findsquare_lineofwalk), npc_119, 1000);
+        npc_add(map_findsquare(coord, 1, 1, ^map_findsquare_lineofwalk), chaos_dwarf, 1000);
         ~npc_retaliate(0);
         ~chatplayer("<p,quiz>How on earth did this dwarf get in here?");
     case 5 :
@@ -374,7 +374,7 @@ switch_int(random(8)) {
         ~npc_retaliate(0);
         ~chatplayer("<p,shock>Hey! A scorpion is in here!");     
     case 7 :
-        npc_add(map_findsquare(coord, 1, 1, ^map_findsquare_lineofwalk), npc_134, 1000);
+        npc_add(map_findsquare(coord, 1, 1, ^map_findsquare_lineofwalk), poison_spider, 1000);
         ~npc_retaliate(0);
         ~chatplayer("<p,shock>Oh no, not one of these spider things!");     
 }