Merge pull request #79 from wushin/Tile-Fixes-Map-Travelv2014.4.16

Tile map fixes sprite travel

11 files changed, 24 insertions, 209 deletions

diff --git a/world/map/npc/021-1/_import.txt b/world/map/npc/021-1/_import.txt
index 0a5c51a9..9a1b1507 100644
--- a/world/map/npc/021-1/_import.txt
+++ b/world/map/npc/021-1/_import.txt
@@ -7,7 +7,6 @@ npc: npc/021-1/bakery.txt
 npc: npc/021-1/banu.txt
 npc: npc/021-1/eurni.txt
 npc: npc/021-1/gate_guards.txt
-npc: npc/021-1/hetchel.txt
 npc: npc/021-1/hideandseek.txt
 npc: npc/021-1/imec.txt
 npc: npc/021-1/inac.txt
@@ -19,4 +18,3 @@ npc: npc/021-1/sewer_east.txt
 npc: npc/021-1/sewer_north.txt
 npc: npc/021-1/sewer_west.txt
 npc: npc/021-1/weellos.txt
-npc: npc/021-1/workers.txt
diff --git a/world/map/npc/021-1/_warps.txt b/world/map/npc/021-1/_warps.txt
index 618c057a..429a522f 100644
--- a/world/map/npc/021-1/_warps.txt
+++ b/world/map/npc/021-1/_warps.txt
@@ -1,6 +1,11 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
 // North Tulimshar warps
 
+021-1.gat,128,119|warp|To Tulimshar Musuem|0,-1,021-2.gat,71,177
+021-1.gat,144,22|warp|To Tulimshar Noble|3,-1,068-1.gat,34,105
+021-1.gat,157,44|warp|To Tulimshar Castle|-1,0,069-1.gat,21,44
+021-1.gat,157,97|warp|To Tulimshar Castle|-1,0,069-1.gat,21,97
+021-1.gat,135,119|warp|To Tulimshar Musuem|-1,-1,021-2.gat,90,177
 021-1.gat,55,146|warp|To South Tulimshar|3,-1,001-1.gat,44,21
 021-1.gat,136,147|warp|To South Tulimshar|0,-1,001-1.gat,125,22
 021-1.gat,53,134|warp|To Government Building|-1,-1,021-2.gat,27,29
@@ -10,11 +15,11 @@
 021-1.gat,103,96|warp|To Bakery|-1,-1,021-2.gat,122,23
 021-1.gat,49,64|warp|To Tulimshar Canyon|3,-1,024-1.gat,86,73
 021-1.gat,53,99|warp|To Wizard's Rest|-1,-1,021-2.gat,25,66
-021-1.gat,52,95|warp|To Wizard's Rest|-1,-1,021-2.gat,23,98
+021-1.gat,52,95|warp|To Wizard's Rest|-1,-1,021-2.gat,70,63
 021-1.gat,73,22|warp|To Tulimshar Port|3,-1,022-1.gat,73,109
 021-1.gat,113,22|warp|To Tulimshar Port|3,-1,022-1.gat,113,109
-021-1.gat,43,110|warp|To Store|-1,-1,021-2.gat,28,129
 021-1.gat,132,31|warp|To Tulimshar Forge|-1,-1,021-2.gat,79,138
 021-1.gat,133,24|warp|To Tulimshar Forge|-1,-1,021-2.gat,75,92
 021-1.gat,125,27|warp|To Tulimshar Forge|-1,-1,021-2.gat,124,68
 021-1.gat,125,31|warp|To Tulimshar Forge|-1,-1,021-2.gat,72,138
+021-1.gat,43,110|warp|To Store|-1,-1,021-2.gat,28,129
diff --git a/world/map/npc/021-1/bakery.txt b/world/map/npc/021-1/bakery.txt
index 2a4fb127..46337613 100644
--- a/world/map/npc/021-1/bakery.txt
+++ b/world/map/npc/021-1/bakery.txt
@@ -1,6 +1,6 @@
 // Outside the bakery
 
-021-1.gat,105,104,0|shop|Ara|163,WhiteCake :-1,ChocolateCake :-1,OrangeCake :-1,AppleCake :-1,CherryCake :-1
+021-1.gat,103,103,0|shop|Ara|163,WhiteCake :-1,ChocolateCake :-1,OrangeCake :-1,AppleCake :-1,CherryCake :-1
 
 021-1.gat,108,102,0|script|Itka|114,
 {
diff --git a/world/map/npc/021-1/gate_guards.txt b/world/map/npc/021-1/gate_guards.txt
index 2cb97658..b26b5ec3 100644
--- a/world/map/npc/021-1/gate_guards.txt
+++ b/world/map/npc/021-1/gate_guards.txt
@@ -11,7 +11,7 @@
 021-1.gat,110,23,0|script|Guard#port2|104,
 {
     mes "[Guard]";
-    mes "\"I'm not quite sure why I'm here, since that bridge is out.\"";
+    mes "\"You wouldn't believe the refuse that comes in from the docks.\"";
     close;
 }
 
diff --git a/world/map/npc/021-1/hetchel.txt b/world/map/npc/021-1/hetchel.txt
deleted file mode 100644
index ab44b747..00000000
--- a/world/map/npc/021-1/hetchel.txt
+++ /dev/null
@@ -1,146 +0,0 @@
-//  Hetchel the Silk Weaver
-//  bh28,
-//  2013-03, GPLv2.
-//
-//  Hetchel is referred to by Lora Tay.
-//  She weaves and sells standard double elbow square silk sheets.
-//  She could also sell, dyed sheets, Silk robes from Lora Tay.
-//  (6000 with cocoons, 40000 (?) with no cocoons).
-//
-//  Hetchel's workshop is actually under repair, Shé'll be back in 021-2 when workers have finished their job.
-//
-//  QUEST_WG_state: Global variable indicating winter gloves status.
-//  Lora Tay proposes silk Robe if (QUEST_WG_state>= 11).
-//  @SHEET_COCOONS_NR : Number of cocoons required per sheet.
-//  Might ne calculated from @ROBE_COCOONS_NR/@ROBE_SHEETS_NR
-//  Actually: 150∕6 = 25
-//  @SHEET_ZENY       : Money to pay per sheet: A sixth of 10000-2*500-6000
-//  @SheetCount Number of sheets to buy (variable).
-
-021-1.gat,120,39,0|script|Hetchel|376,
-{
-    set @SHEET_COCOONS_NR, 25;
-    set @SHEET_ZENY, 500;
-    set @SheetCount, 0;
-
-    if (QUEST_WG_state < 11)
-        goto L_WG_quest_not_done;
-    mes "[Hetchel the weaver]";
-    mes "\"Hello I am Hetchel, I weave fine textiles, what can I do for you?\"";
-    menu
-        "Sorry to bother, I'm just visiting.", L_end,
-        "I am looking for silk sheets, Lora Tay told me that I could find some in this market. Can you help?", L_main_menu;
-
-L_WG_quest_not_done:
-    mes "[Hetchel the weaver]";
-    mes "\"Hello I am Hetchel, I weave fine textiles.";
-    mes "My best client is Lora Tay, at Dimond's.";
-    mes "What can I do for you?\"";
-    menu
-        "Sorry to bother, I'm new to this country, just visting.", L_end,
-        "What are you selling?", L_main_menu;
-
-L_main_menu:
-    mes "[Hetchel]";
-    mes "\"I have some silk sheets: double-elbow squares.\"";
-    menu
-        "I'm not interested at the moment, maybe later; thanks anyway.", L_end,
-        "Can I buy some?", L_Next;
-//        "Do you have a silk robe I could buy?", L_robe,
-//        "Goodbye.", L_end;
-
-L_Next:
-    mes "[Hetchel]";
-    mes "\"Sure but you need to provide raw materials.";
-    mes "I'll need " + @SHEET_COCOONS_NR +" silk cocoons per sheet,";
-    mes "and also " + @SHEET_ZENY +" GP per sheet for my work.\"";
-    next;
-    if (countitem("SilkCocoon") == 0)
-        goto L_sheet_no_cocoon;
-    goto L_sheet_menu;
-
-L_sheet_menu:
-    menu
-        "I have what you asked for.", L_Next1,
-        "Sorry I didn't pay attention enough, what do you need?", L_how_many_cocoons,
-        "Oops! Sorry, I'll come back soon with them.", L_end;
-
-L_Next1:
-    mes "[Hetchel]";
-    mes "\"How many would you like?\"";
-    input @SheetCount;
-    if (@SheetCount == 0)
-        goto L_zero_sheet;
-    if (countitem("SilkCocoon") < @SheetCount * @SHEET_COCOONS_NR)
-        goto L_sheet_missing_cocoons;
-    if (Zeny < @SheetCount * @SHEET_ZENY)
-        goto L_sheet_missing_Zeny;
-    getinventorylist;
-    if (@inventorylist_count == 100 && countitem("SilkSheet") < 1 && countitem("SilkCocoon") > @SheetCount * @SHEET_COCOONS_NR)
-        goto L_TooMany;
-    set Zeny, Zeny - @SheetCount * @SHEET_ZENY;
-    delitem "SilkCocoon", @SheetCount * @SHEET_COCOONS_NR;
-    getitem "SilkSheet", @SheetCount;
-    mes "[Hetchel]";
-    mes "\"Thank you, I hope the sheets will fit your needs.";
-    mes "Please greet Lora for me when you see her.\"";
-    emotion EMOTE_HAPPY;
-    goto L_end;
-
-L_sheet_missing_cocoons:
-    mes "[Hetchel]";
-    mes "\"I'm sorry, but I need " + @SheetCount * @SHEET_COCOONS_NR + ", not " + countitem("SilkCocoon") + ".\"";
-    goto L_end;
-
-L_sheet_missing_Zeny:
-    mes "[Hetchel]";
-    mes "\"No, no no. The way this works is that you give me the GP first and I give you the sheets afterwards.";
-    mes "You're " + (@SheetCount * @SHEET_ZENY - Zeny) + " GP short, so come back when you can afford the sheets you asked for!\"";
-    goto L_end;
-
-L_how_many_cocoons:
-    mes "[Hetchel]";
-    mes "\"I need an average of " + @SHEET_COCOONS_NR + " cocoons per sheet";
-    mes "and also " + @SHEET_ZENY + " GP per sheet for my work.\"";
-    next;
-    goto L_sheet_menu;
-
-L_sheet_no_cocoon:
-    mes "[Hetchel]";
-    mes "\"You don't have any cocoon? I'm sorry I can't do anything for you.\"";
-    menu
-        "I'll seek for them.", L_end,
-        "Where can I get cocoons?", L_Next2;
-
-L_Next2:
-    mes "[Hetchel]";
-    mes "\"Silk cocoons come from Silkworms. Silkworms live in the woodland area around Hurnscald.";
-    mes "Silkworms like especially woods and dark areas. You can go there by ferry.\"";
-    goto L_end;
-
-//L_robe:
-//    mes "[Hetchel]";
-//    mes "\"I am not a seamstress but I have a few silk robes from Lora Tay left.";
-//    mes "It is not your size as Lora made them for me, but Tondar was kind enough";
-//    mes "to cast a spell on it, so that it will fit to you as soon as you wear it.";
-//    mes "However his prices are not that low.\"";
-//    next;
-//    goto L_main_menu;
-
-L_zero_sheet:
-    mes "[Hetchel]";
-    mes "\"It's the best way to get quickly served!\"";
-    goto L_end;
-
-L_TooMany:
-    mes "[Hetchel]";
-    mes "\"Your bag hasn't room enough. Store some things and come back.\"";
-    goto L_end;
-
-L_end:
-    set @SHEET_COCOONS_NR, 0;
-    set @SHEET_ZENY, 0;
-    set @SheetCount, 0;
-    close;
-}
-
diff --git a/world/map/npc/021-1/hideandseek.txt b/world/map/npc/021-1/hideandseek.txt
index 9ca48bc2..44c628a1 100644
--- a/world/map/npc/021-1/hideandseek.txt
+++ b/world/map/npc/021-1/hideandseek.txt
@@ -56,7 +56,7 @@ L_Next:
 L_Next1:
     mes "[Ayasha]";
     mes "\"Great! You can take my turn with searching. You need to find all five of my friends.";
-    mes "They're hiding somewhere in this part of the city, you don't have to pass an archway to find them. But they're allowed to hide on the rooftops.\"";
+    mes "They're hiding somewhere in the city, you will have to explore to find them. They could be hiding anywhere.\"";
 
     set QUEST_NorthTulimshar, QUEST_NorthTulimshar | $@hideandseekNT_started;
     goto L_Close;
@@ -64,7 +64,7 @@ L_Next1:
 L_Doing:
     mes "[Ayasha]";
     mes "\"You still need to find some of my friends. There are five of them.";
-    mes "Remember, they're hiding somewhere in this part of the city, you don't have to pass an archway to find them. But it is allowed to hide on the buildings roof.\"";
+    mes "Remember, they're hiding somewhere in the city, you will have to explore to find them. They could be hiding anywhere.\"";
     goto L_Close;
 
 L_Reward:
@@ -93,7 +93,7 @@ L_Close:
     close;
 }
 
-021-1.gat,63,107,0|script|Latif|262,
+022-1.gat,112,23,0|script|Latif|262,
 {
     set @child_number, 1;
     callfunc "XmasList";
@@ -146,7 +146,7 @@ L_Doing:
 
 L_Done:
     mes "[Latif]";
-    mes "\"Inside that building over there is a workshop. My father works there and wants me to do that too when I'm grown up. But I don't want do that! I want to go on an adventure! Just like you.\"";
+    mes "\"Inside the building in the Northeastern market, there is a workshop. My father works there and wants me to do that too when I'm grown up. But I don't want do that! I want to go on an adventure! Just like you.\"";
     goto L_Close;
 
 L_Close:
@@ -155,7 +155,7 @@ L_Close:
     close;
 }
 
-021-1.gat,123,116,0|script|Charda|260,
+001-1.gat,39,33,0|script|Charda|260,
 {
     set @child_number, 2;
     callfunc "XmasList";
@@ -170,7 +170,7 @@ L_Close:
     mes "[Charda]";
     mes "\"Hello. Psht, be careful. I'm playing hide and seek with Ayasha. You'll draw attention to my hiding place.\"";
     next;
-    mes "\"Do you want to go to the bazaar? It's west and then south from here. Ian is there, he helps all those adventurers that come here.\"";
+    mes "\"They will never find me in the bazaar. Ian is here, he helps all those adventurers that come here.\"";
     goto L_Close;
 
 L_Find:
@@ -261,7 +261,7 @@ L_Close:
     close;
 }
 
-021-1.gat,98,25,0|script|Rasin|263,
+023-1.gat,32,31,0|script|Rasin|263,
 {
     set @child_number, 4;
     callfunc "XmasList";
@@ -274,7 +274,7 @@ L_Close:
     if (@state > 0) goto L_Doing;
 
     mes "[Rasin]";
-    mes "\"The harbor is up north from here. There you can take a ferry to other places.";
+    mes "\"The harbor is to the East from here. There you can take a ferry to other places.";
     mes "And now go away, I'm playing hide and seek and Ayasha shouldn't see me here. You'll draw her attention when you talk to me.\"";
     goto L_Close;
 
@@ -302,7 +302,7 @@ L_Close:
     close;
 }
 
-021-1.gat,155,25,0|script|Ghada|265,
+068-1.gat,94,84,0|script|Ghada|265,
 {
     set @child_number, 5;
     callfunc "XmasList";
@@ -314,7 +314,7 @@ L_Close:
     if ((@state > 0) && !(QUEST_NorthTulimshar & $@hideandseekNT_found5)) goto L_Find;
     if (@state > 0) goto L_Doing;
 
-    mes "You see a girl standing behind the building. She has a look of intense concentration on her face.";
+    mes "You see a girl standing behind the a tree. She has a look of intense concentration on her face.";
     menu
         "Hi, what are you doing there?",L_Next,
         "(Leave)",L_Close;
diff --git a/world/map/npc/021-1/imec.txt b/world/map/npc/021-1/imec.txt
index 7a5eb975..61e1fca7 100644
--- a/world/map/npc/021-1/imec.txt
+++ b/world/map/npc/021-1/imec.txt
@@ -13,7 +13,7 @@ OnInit:
     end;
 }
 
-021-1.gat,120,33,0|script|Imec|162,
+021-1.gat,120,31,0|script|Imec|162,
 {
     set @state, ((QUEST_NorthTulimshar & $@ImecShopNT_MASK) >> $@ImecShopNT_SHIFT);
     set @money, 500;
diff --git a/world/map/npc/021-1/mapflags.txt b/world/map/npc/021-1/mapflags.txt
index 2661c9ff..ffa56dfe 100644
--- a/world/map/npc/021-1/mapflags.txt
+++ b/world/map/npc/021-1/mapflags.txt
@@ -1 +1,2 @@
 021-1.gat|mapflag|town
+021-1.gat|mapflag|resave|001-1,57,71
diff --git a/world/map/npc/021-1/north_shops.txt b/world/map/npc/021-1/north_shops.txt
index 80e34433..81a05a20 100644
--- a/world/map/npc/021-1/north_shops.txt
+++ b/world/map/npc/021-1/north_shops.txt
@@ -3,7 +3,7 @@
 // More high-end stuff to satisfy the richer people in Royal Tulimshar
 
 // Some clothing
-021-1.gat,135,38,0|shop|Inar|108,SlingShot :-1,SlingBullet :-1,CottonShirt :-1,CottonShorts :-1,CottonBoots :-1,DesertShirt :-1,SilkRobe :-5,DesertHat :-4
+021-1.gat,135,36,0|shop|Inar|108,CottonShirt :-1,CottonShorts :-1,CottonBoots :-1,CottonHeadband :-1
 
 021-1.gat,129,40,0|script|Well|400,
 {
@@ -12,30 +12,9 @@
 }
 
 // An officer (for security)
-021-1.gat,128,36,0|script|Officer|150,
+021-1.gat,128,37,0|script|Officer|150,
 {
     mes "[Officer]";
     mes "I'm here for extra security for this market.";
     close;
 }
-
-// A snobby store that won't sell to the player
-// takes part in quest given by 021-2/kylian.txt
-021-1.gat,138,29,0|script|Latoy|106,
-{
-    set QUEST_NorthTulimshar, QUEST_NorthTulimshar | $@knowLatoyNT;
-    set @kylian, ((QUEST_NorthTulimshar & $@businessmanNT_MASK) >> $@businessmanNT_SHIFT);
-
-    mes "[Latoy]";
-    mes "\"There's nothing here you could want or afford.\"";
-    if (@kylian != 7)
-        goto L_Close;
-    next;
-    mes "Maybe this is the kind of shop Kylian is looking for?";
-    goto L_Close;
-
-L_Close:
-    set @kylian, 0;
-    close;
-}
-
diff --git a/world/map/npc/021-1/weellos.txt b/world/map/npc/021-1/weellos.txt
index 98565f9e..cb75bde1 100644
--- a/world/map/npc/021-1/weellos.txt
+++ b/world/map/npc/021-1/weellos.txt
@@ -9,7 +9,7 @@
     if isin("021-1.gat", 130, 120, 140, 125) goto L_In;
 
     mes "[Weellos]";
-    mes "\"This is a very historic building. One of the oldest in the area.\"";
+    mes "\"This is a very historic building. One of the oldest in the area. It's been turned into a museum.\"";
     goto L_BeforeClose;
 
 // If the player is inside the fence with Weellos
diff --git a/world/map/npc/021-1/workers.txt b/world/map/npc/021-1/workers.txt
deleted file mode 100644
index cdba39b3..00000000
--- a/world/map/npc/021-1/workers.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-//
-
-021-1.gat,144,22,0|script|Construction Worker#1|155,
-{
-    mes "[Construction worker]";
-    mes "\"I can't let you beyond this gate.  The area is closed for renovation.\"";
-    close;
-}
-
-021-1.gat,156,97,0|script|Construction Worker#2|155,
-{
-    mes "[Construction worker]";
-    mes "\"East Tulimshar is closed for repairs.\"";
-    close;
-}
-
-021-1.gat,156,44,0|script|Construction Worker#3|155,
-{
-    mes "[Construction worker]";
-    mes "\"East Tulimshar is closed for repairs.\"";
-    close;
-}