From c0ba38cd4b68491e28e467889804ebc09c9c002e Mon Sep 17 00:00:00 2001 From: Ben Longbons Date: Wed, 2 Apr 2014 11:06:32 -0700 Subject: Clean up main scripts --- world/map/npc/001-1/trader.txt | 24 +++++++----------------- 1 file changed, 7 insertions(+), 17 deletions(-) (limited to 'world/map/npc/001-1/trader.txt') diff --git a/world/map/npc/001-1/trader.txt b/world/map/npc/001-1/trader.txt index cf2854ef..eaf95ffd 100644 --- a/world/map/npc/001-1/trader.txt +++ b/world/map/npc/001-1/trader.txt @@ -15,9 +15,8 @@ mes "\"Hello. I came here to trade wares with the people of Tulimshar. Unfortunately for you, I've traded everything I had.\""; next; menu - "Oh. I'll go then.", -, + "Oh. I'll go then.", L_Close, "You don't have anything?", L_More; - goto L_Close; L_More: mes "[Trader]"; @@ -25,8 +24,7 @@ L_More: next; menu "Yes?", L_Except, - "Ok then.", -; - goto L_Close; + "Ok then.", L_Close; L_Except: mes "[Trader]"; @@ -34,8 +32,7 @@ L_Except: next; menu "Sure.", L_Teach, - "No thank you.", -; - goto L_Close; + "No thank you.", L_Close; L_Teach: if (Zeny < 5) goto L_NotEnoughMoney; @@ -67,32 +64,28 @@ L_Trademenu: "Do you have Iron Powder?", L_Iron, "How about Sulphur Powder?", L_Sulphur, "I need Medium Healing Potions.", L_Healpots, - "I think I have everything I need, thanks.", -; - goto L_Close; + "I think I have everything I need, thanks.", L_Close; L_Iron: mes "[Trader]"; mes "\"I do have a few of those. I will give you 4 Iron Powders for 1 Iron Ore and " + @Ironprice + "gp.\""; menu "Sure.", L_Ipowder, - "What a ripoff! No way!", -; - goto L_Close; + "What a ripoff! No way!", L_Close; L_Sulphur: mes "[Trader]"; mes "\"I can trade you 5 Sulphur Powders for 1 Pile of Ash and " + @Sulphurprice + "gp.\""; menu "Here you go.", L_Spowder, - "Are you nuts?! Forget it!", -; - goto L_Close; + "Are you nuts?! Forget it!", L_Close; L_Healpots: mes "[Trader]"; mes "\"Healing potions are always useful, but I rarely need anything larger than the small ones. I will happily trade you 1 Medium Healing Potion for 3 Small Healing Potions and " + @Potionprice + "gp.\""; menu "Alright.", L_Pots, - "Whoa, that's way too much.", -; - goto L_Close; + "Whoa, that's way too much.", L_Close; L_Ipowder: if (countitem("IronOre") < 1) goto L_Missing; @@ -107,7 +100,6 @@ L_Ipowder: menu "Yes.", L_Trademenu, "No.", L_No; - goto L_Close; L_Spowder: if (countitem("PileOfAsh") < 1) goto L_Missing; @@ -122,7 +114,6 @@ L_Spowder: menu "Yes.", L_Trademenu, "No.", L_No; - goto L_Close; L_Pots: if (countitem("SmallHealingPotion") < 3) goto L_Missing; @@ -137,7 +128,6 @@ L_Pots: menu "Yes.", L_Trademenu, "No.", L_No; - goto L_Close; L_Full: mes "[Trader]"; -- cgit v1.2.3-60-g2f50