From f91d834dbf58b44af5a6fc8e903aa8f4d654c496 Mon Sep 17 00:00:00 2001 From: Jared Adams Date: Mon, 12 Jan 2009 11:35:42 +0000 Subject: Adjust Sandra to need 5 normal stingers and 1 red Inventory size check was also adjusted to be smarter about arrows and more consice. --- npc/001-1_Tulimshar/sandra.txt | 56 ++++++++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 27 deletions(-) (limited to 'npc') diff --git a/npc/001-1_Tulimshar/sandra.txt b/npc/001-1_Tulimshar/sandra.txt index 048bfa19..314e009a 100644 --- a/npc/001-1_Tulimshar/sandra.txt +++ b/npc/001-1_Tulimshar/sandra.txt @@ -4,31 +4,31 @@ if(Scorp == 2) goto L_Done; if(Scorp == 1) goto L_Progress; - set @TEMP,rand(3); + set @TEMP, rand(4); + if(@TEMP == 0) goto L_Opening0; if(@TEMP == 1) goto L_Opening1; if(@TEMP == 2) goto L_Opening2; if(@TEMP == 3) goto L_Opening3; - if(@TEMP == 0) goto L_Opening4; -L_Opening1: +L_Opening0: mes "[Sandra]"; - mes "\"In the outskirts of Tulimshar, there wanders a red scorpion. I need a favor, please help me. Will you?\""; + mes "\"In the outskirts of Tulimshar, there are some scorpions. I need a favor, please help me. Will you?\""; next; goto L_Ask; -L_Opening2: +L_Opening1: mes "[Sandra]"; - mes "\"When you venture in the outskirts of Tulimshar, you can spot a red scorpion. Will you help me kill one?\""; + mes "\"When you venture in the outskirts of Tulimshar, you can spot scorpions. Will you help me kill some?\""; next; goto L_Ask; -L_Opening3: +L_Opening2: mes "[Sandra]"; - mes "\"The red scorpion stinger carries many properties used in potions. Will you get some for me?\""; + mes "\"The scorpion stinger carries many properties used in potions. Will you get some for me?\""; next; goto L_Ask; -L_Opening4: +L_Opening3: mes "[Sandra]"; mes "\"You look sturdy enough, will you help me get something?\""; next; @@ -40,26 +40,26 @@ L_Ask: "No", L_No; L_Yes: - if(@TEMP == 1) goto L_Req1; - if(@TEMP == 2) goto L_Req2; - if(@TEMP == 3) goto L_Req3; + set @TEMP, rand(3); if(@TEMP == 0) goto L_Req1; + if(@TEMP == 1) goto L_Req2; + if(@TEMP == 2) goto L_Req3; -L_Req1: +L_Req0: mes "[Sandra]"; - mes "\"I need you to slaughter the red scorpion found outside of Tulimshar and bring me 5 [Red Stingers].\""; + mes "\"I need 5 [Scorpion Stingers] and 1 [Red Scoprion Stinger].\""; next; goto L_Set; -L_Req2: +L_Req1: mes "[Sandra]"; - mes "\"I heard a while ago that the stinger of a red scorpion can be used for medical purposes. I need you to help me get 5 [Red Stingers].\""; + mes "\"I heard a while ago that scorpion stingers can be used for medical purposes. I need you to help me get 5 [Scorpion Stingers] and 1 [Red Scoprion Stinger].\""; next; goto L_Set; -L_Req3: +L_Req2: mes "[Sandra]"; - mes "\"Bring me 5 [Red Stingers] and i will reward you greatly.\""; + mes "\"Bring me 5 [Scorpion Stingers] and 1 [Red Scoprion Stinger]. I'll give you something if you do.\""; next; goto L_Set; @@ -70,23 +70,25 @@ L_Set: close; L_Progress: - if (countitem(517) >= 5) goto L_Have; - mes "[Sandra]"; - mes "\"Please hurry and bring me 5 [Red Stingers].\""; - close; - -L_Have: + if (countitem(507) < 5) goto L_NotEnough; + if (countitem(517) < 1) goto L_NotEnough; mes "[Sandra]"; mes "\"Excellent!"; - mes "You brought me 5 [Red Stingers]!\""; + mes "You brought me 5 [Scorpion Stingers] and 1 [Red Scoprion Stinger]!\""; getinventorylist; - if (@inventorylist_count == 100 && countitem(517) > 5) goto L_TooMany; - delitem 517, 5; + if ((@inventorylist_count - (countitem(507) == 5) - (countitem(517) == 1)) > 99 - (countitem(1199) == 0)) goto L_TooMany; + delitem 507, 5; + delitem 517, 1; getitem 1200, 1; getitem 1199, 100; set Scorp, 2; close; +L_NotEnough: + mes "[Sandra]"; + mes "\"Please hurry and bring me 5 [Scorpion Stingers] and 1 [Red Scoprion Stinger].\""; + close; + L_Done: mes "[Sandra]"; mes "\"Thank you for all your help!\""; -- cgit v1.2.3-60-g2f50 From d66e5af9f0024f897a8d239aa5100b30c487a45b Mon Sep 17 00:00:00 2001 From: Bjørn Lindeijer Date: Mon, 12 Jan 2009 20:57:52 +0100 Subject: Added long corridor to cat cave So that you can't click on the pot while standing in the entrance. Also removed one spider since getting killed while talking to an NPC is buggy on the client. --- data/015-3.wlk | Bin 4100 -> 4100 bytes npc/015-1_Woodland/_warps.txt | 2 +- npc/015-3/_mobs.txt | 1 - npc/015-3/_warps.txt | 2 +- npc/015-3/barrier.txt | 2 +- 5 files changed, 3 insertions(+), 4 deletions(-) (limited to 'npc') diff --git a/data/015-3.wlk b/data/015-3.wlk index 9a01b2e2..25ef46b1 100644 Binary files a/data/015-3.wlk and b/data/015-3.wlk differ diff --git a/npc/015-1_Woodland/_warps.txt b/npc/015-1_Woodland/_warps.txt index cb9044e9..75e377a4 100644 --- a/npc/015-1_Woodland/_warps.txt +++ b/npc/015-1_Woodland/_warps.txt @@ -1,4 +1,4 @@ // 015-1 Woodland warps 015-1.gat,93,55 warp ToWoodland -1,0,010-1.gat,15,55 -015-1.gat,59,31 warp to 015_3 -1,-1,015-3.gat,31,36 +015-1.gat,59,31 warp to 015_3 -1,-1,015-3.gat,31,42 diff --git a/npc/015-3/_mobs.txt b/npc/015-3/_mobs.txt index 7ed7bc67..1c1d9941 100644 --- a/npc/015-3/_mobs.txt +++ b/npc/015-3/_mobs.txt @@ -4,7 +4,6 @@ 015-3.gat,29,31,2,2 monster Maggots 1002,2,0,0,Mob015-3::On1002 015-3.gat,23,19,1,1 monster Maggots 1002,1,0,0,Mob015-3::On1002 015-3.gat,40,19,1,1 monster Spider 1012,1,0,0,Mob015-3::On1012 -015-3.gat,29,35,2,1 monster Spider 1012,1,0,0,Mob015-3::On1012 015-3.gat,0,0,0 script Mob015-3 -1,{ diff --git a/npc/015-3/_warps.txt b/npc/015-3/_warps.txt index 90107d63..8b8a83d7 100644 --- a/npc/015-3/_warps.txt +++ b/npc/015-3/_warps.txt @@ -1,3 +1,3 @@ // 015-3 warps -015-3.gat,31,37 warp to 015-1 -1,-1,015-1.gat,59,32 +015-3.gat,31,43 warp to 015-1 -1,-1,015-1.gat,59,32 diff --git a/npc/015-3/barrier.txt b/npc/015-3/barrier.txt index 4039e9f5..3abffbb1 100644 --- a/npc/015-3/barrier.txt +++ b/npc/015-3/barrier.txt @@ -1,7 +1,7 @@ // You can only enter the cat cave naked, otherwise the cat's reaction scares // you away. You can also get in while wearing the cat ears. -015-3.gat,31,36,0 script #CatCaveBarrier 127,1,1,{ +015-3.gat,31,42,0 script #CatCaveBarrier 127,1,1,{ if (getequipid(equip_head) != 1217 && (getequipid(equip_head) > 0 || getequipid(equip_shield) > 0 || -- cgit v1.2.3-60-g2f50