diff options
Diffstat (limited to 'world/map/npc/020-2')
| -rw-r--r-- | world/map/npc/020-2/baktar.txt | 30 | ||||
| -rw-r--r-- | world/map/npc/020-2/furquest.txt | 2 |
2 files changed, 18 insertions, 14 deletions
diff --git a/world/map/npc/020-2/baktar.txt b/world/map/npc/020-2/baktar.txt index 822da870..91e1b7e0 100644 --- a/world/map/npc/020-2/baktar.txt +++ b/world/map/npc/020-2/baktar.txt @@ -95,13 +95,13 @@ "Good bye", L_Close; L_KnowAlready: - mes @npcname$; - mes "\"I love Tulimshar's stuff. I'm collecting souvenirs from Tulimshar to help remind me of all the great times I had there. If you give me an interesting item from the area, I'll give you a nice reward. So, you have a new item?\""; + mes @npcname$; + mes "\"I love Tulimshar's stuff. I'm collecting souvenirs from Tulimshar to help remind me of all the great times I had there. If you give me an interesting item from the area, I'll give you a nice reward. So, you have a new item?\""; goto L_startitem; L_exotic: - mes @npcname$; - mes "\"I said that because I love Tulimshar's stuff...I'm collecting souvenirs from Tulimshar to help remind me of all the great times I had there. If you give me an interesting item maybe I can give you a nice reward. But I don't need a lot, I just need one of each item.\""; + mes @npcname$; + mes "\"I said that because I love Tulimshar's stuff...I'm collecting souvenirs from Tulimshar to help remind me of all the great times I had there. If you give me an interesting item maybe I can give you a nice reward. But I don't need a lot, I just need one of each item.\""; menu "I have some items on me maybe you'll like them ", L_startitem, "Don't touch my stuff!", L_Close, @@ -184,9 +184,10 @@ L_MenuItems: if (@menuid[@menu] == 5) goto L_skin_Item; if (@menuid[@menu] == 6) goto L_BugLegItem; //if Never mind - mes @npcname$; - mes "\"Ok, goodbye then.\""; + mes @npcname$; + mes "\"Ok, goodbye then.\""; close; + L_DesertHat_Item: if(@Q_status & (1<<@BIT_DESERTHAT)) goto L_havealready; if (countitem("DesertHat") < 1) goto L_Noitem; @@ -196,6 +197,7 @@ L_DesertHat_Item: set @Q_status, @Q_status | (1<<@BIT_DESERTHAT); callsub S_Update_Var; close; + L_DesertShirt_Item: if(@Q_status & (1<<@BIT_DESERTSHIRT)) goto L_havealready; if (countitem("DesertShirt") < 1) goto L_Noitem; @@ -205,6 +207,7 @@ L_DesertShirt_Item: set @Q_status, @Q_status | (1<<@BIT_DESERTSHIRT); callsub S_Update_Var; close; + L_SerfHat_Item: if(@Q_status & (1<<@BIT_SERFHAT)) goto L_havealready; if (countitem("SerfHat") < 1) goto L_Noitem; @@ -214,6 +217,7 @@ L_SerfHat_Item: set @Q_status, @Q_status | (1<<@BIT_SERFHAT); callsub S_Update_Var; close; + L_tongue_Item: if(@Q_status & (1<<@BIT_MS_TONGUE)) goto L_havealready; if (countitem("MountainSnakeTongue") < 1) goto L_Noitem; @@ -223,6 +227,7 @@ L_tongue_Item: set @Q_status, @Q_status | (1<<@BIT_MS_TONGUE); callsub S_Update_Var; close; + L_egg_Item: if(@Q_status & (1<<@BIT_MS_EGG)) goto L_havealready; if (countitem("MountainSnakeEgg") < 1) goto L_Noitem; @@ -232,6 +237,7 @@ L_egg_Item: set @Q_status, @Q_status | (1<<@BIT_MS_EGG); callsub S_Update_Var; close; + L_skin_Item: if(@Q_status & (1<<@BIT_SNAKESKIN)) goto L_havealready; if (countitem("SnakeSkin") < 1) goto L_Noitem; @@ -241,6 +247,7 @@ L_skin_Item: set @Q_status, @Q_status | (1<<@BIT_SNAKESKIN); callsub S_Update_Var; close; + L_BugLegItem: if(@Q_status & (1<<@BIT_BUGLEG)) goto L_havealready; if (countitem("BugLeg") < 1) goto L_Noitem; @@ -267,8 +274,6 @@ S_Update_Var: | (@Q_status << @Q_SHIFT)); return; - - //# The following stage is completely cutoff the first. //# So there is no linking between the upper and lower part, except for one goto at the very beginning // @@ -346,7 +351,8 @@ L_2_talk2: close; L_2_talk3: - menu "Ok, I am a professional in doing such things", L_2_professional, + menu + "Ok, I am a professional in doing such things", L_2_professional, "Hey do you really mean it? ", L_2_professional, "You calmed down again?", L_Close, "Oh a packrat! By the way, is that trash over there yours?", L_2_name, @@ -379,8 +385,9 @@ L_2_name: mes @npcname$; mes "\"What is your name again?\""; - menu "I am sorry for the joke... Please forgive me", L_Next, - "They call me Mistakes. I am a professional killer as well. You heard about that business in the terranite cave?", L_Next; + menu + "I am sorry for the joke... Please forgive me", L_Next, + "They call me Mistakes. I am a professional killer as well. You heard about that business in the terranite cave?", L_Next; L_Next: mes @npcname$; @@ -396,4 +403,3 @@ S_Update_Var2: | (@Q_status2_bits << @Q_SHIFT2_BITS)); return; } - diff --git a/world/map/npc/020-2/furquest.txt b/world/map/npc/020-2/furquest.txt index 17cb3283..9d694716 100644 --- a/world/map/npc/020-2/furquest.txt +++ b/world/map/npc/020-2/furquest.txt @@ -572,7 +572,6 @@ L_Next11: set Zeny, Zeny - @FINEDRESS_GP; getitem "FineDress", 1; set QUEST_WG_state, 23; - close; L_State_17_NoMoney: @@ -595,5 +594,4 @@ L_State_18: L_Close: close; - } |