diff --git a/data/src/pack/npc.pack b/data/src/pack/npc.pack index fc55999cdb..6f7a03e721 100644 --- a/data/src/pack/npc.pack +++ b/data/src/pack/npc.pack @@ -857,7 +857,7 @@ 856=gorad 857=npc_857 858=ogre_guard_east -859=npc_859 +859=ogre_guard_west 860=npc_860 861=npc_861 862=npc_862 diff --git a/data/src/scripts/_unpack/all.loc b/data/src/scripts/_unpack/all.loc index 3d944e754d..eae529f9b7 100644 --- a/data/src/scripts/_unpack/all.loc +++ b/data/src/scripts/_unpack/all.loc @@ -13406,6 +13406,8 @@ desc=An entrance to Gu'Tanoth. model=model_loc_52 op1=Open active=yes +category=double_door_open_and_close_left +param=next_loc_stage,loc_1562 [loc_2789] name=City gate @@ -13414,6 +13416,8 @@ model=model_loc_52 op1=Open active=yes mirror=yes +category=double_door_open_and_close_right +param=next_loc_stage,loc_1563 [loc_2790] name=Chest diff --git a/data/src/scripts/areas/area_yanille/configs/ogre.npc b/data/src/scripts/areas/area_yanille/configs/ogre.npc index 383db6435f..cd79d05702 100644 --- a/data/src/scripts/areas/area_yanille/configs/ogre.npc +++ b/data/src/scripts/areas/area_yanille/configs/ogre.npc @@ -258,7 +258,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_4369 -[npc_859] +[ogre_guard_west] name=Ogre guard desc=An ogre that guards. size=2 diff --git a/data/src/scripts/quests/quest_itwatchtower/scripts/gorad.rs2 b/data/src/scripts/quests/quest_itwatchtower/scripts/gorad.rs2 index 529ca3e889..47c4b3435c 100644 --- a/data/src/scripts/quests/quest_itwatchtower/scripts/gorad.rs2 +++ b/data/src/scripts/quests/quest_itwatchtower/scripts/gorad.rs2 @@ -12,5 +12,5 @@ if(%itwatchtower_progress >= ^itwatchtower_given_fingernails) { ~chatnpc("I am Gorad, and you are tiny.|Go now and I won't chase you!"); } } else { - es("Gorad is busy; try again later."); + mes("Gorad is busy; try again later."); } \ No newline at end of file diff --git a/data/src/scripts/quests/quest_itwatchtower/scripts/ogre_guard.rs2 b/data/src/scripts/quests/quest_itwatchtower/scripts/ogre_guard.rs2 index 86446ea936..2103836e71 100644 --- a/data/src/scripts/quests/quest_itwatchtower/scripts/ogre_guard.rs2 +++ b/data/src/scripts/quests/quest_itwatchtower/scripts/ogre_guard.rs2 @@ -35,7 +35,7 @@ if(%itwatchtower_gold >= ^itwatchtower_found_gold) { if(last_useitem = gold_bar) p_opnpc(1); else ~chatnpc("That is not what I want, creature! Bring me a bar of pure gold and I will let you pass."); } else { - mes("The ogre has not asked you for anything.") + mes("The ogre has not asked you for anything."); } [opnpc1,ogre_guard_west] @@ -48,7 +48,7 @@ if(inv_total(inv, ogre_relic) > 0) { ~chatplayer("I have a relic!"); %itwatchtower_progress = ^itwatchtower_given_relic; ~chatnpc("It's got the statue of Dalgroth. Welcome to Gu'Tanoth, friend of the ogres."); - // enter city + if(loc_find(0_39_47_8_54, loc_2788) = true) p_oploc(1); return; } mes("The guard pushes you back down the hill."); @@ -62,5 +62,5 @@ if(%itwatchtower_progress >= 4) { if(last_useitem = ogre_relic) p_opnpc(1); else ~chatnpc("That is of no use to me, creature!"); } else { - mes("The ogre has not asked you for anything.") + mes("The ogre has not asked you for anything."); } \ No newline at end of file diff --git a/data/src/scripts/quests/quest_itwatchtower/scripts/toban.rs2 b/data/src/scripts/quests/quest_itwatchtower/scripts/toban.rs2 index fdb942e06f..1a8491f587 100644 --- a/data/src/scripts/quests/quest_itwatchtower/scripts/toban.rs2 +++ b/data/src/scripts/quests/quest_itwatchtower/scripts/toban.rs2 @@ -19,7 +19,7 @@ if(testbit(%itwatchtower_bits, ^itwatchtower_helped_toban) = true) { if(inv_total(inv, dragon_bones) > 0) { inv_del(inv, dragon_bones, 1); inv_add(inv, relic_part_3, 1); - %itwatchtower_bits = setbit(itwatchtower_bits, ^itwatchtower_helped_toban); + %itwatchtower_bits = setbit(%itwatchtower_bits, ^itwatchtower_helped_toban); ~chatplayer("When I say I will get something, I get it!"); ~chatnpc("Hahaha! Small t'ing has done it. Toban is glad - take this..."); ~objbox(relic_part_3, "The ogre gives you part of a statue.", 250, 0, 0);