Merge remote-tracking branch 'origin/master' into waric

Conflicts:
	world/map/db/item_db.txt

33 files changed, 364 insertions, 122 deletions

diff --git a/world/map/npc/009-3/warp.txt b/world/map/npc/009-3/warp.txt
index 7f709abd..9bb9ab28 100644
--- a/world/map/npc/009-3/warp.txt
+++ b/world/map/npc/009-3/warp.txt
@@ -1,4 +1,4 @@
-009-3.gat,162,80,0|script|#PVPCaveBarrier|45,1,1,{
+009-3.gat,162,80,0|script|#PVPCaveBarrier|45,0,0,{
     mes "Do you want to enter the PVP cave? It costs 150GP.";
     menu
         "No.", L_Exit,
diff --git a/world/map/npc/010-2/loratay.txt b/world/map/npc/010-2/loratay.txt
index 978c3712..f34d9c57 100644
--- a/world/map/npc/010-2/loratay.txt
+++ b/world/map/npc/010-2/loratay.txt
@@ -2,6 +2,9 @@
 
     set @ROBE_COCOONS_NR, 150; // must be multiple of ten
     set @ROBE_ZENY, 10000;
+    set @ROBE_SHEETS_NR, 6;      // number of silk sheets required for the silk robe. Must be less than 10.
+    set @ROBE_SHEETS_ZENY, 6000; // price of the silk robe when bringing silk sheets.
+    set @Robe_with_sheets, 0;    // will be set to 1 if silk robe is made with sheets
     set @FINEDRESS_COCOONS, 180;
     set @SORCERER_ROBE_SEW_ZENY, 25000;
     set @SORCERER_ROBE_NUM_COTTON_CLOTH, 2;
@@ -683,13 +686,13 @@ L_robe:
     mes "[Lora Tay the Seamstress]";
     mes "\"A robe?  Well, as long as you're not asking me to make it out of cotton...\"";
     next;
-    if (countitem("SilkCocoon") == 0)
+    if (countitem("SilkCocoon")== 0 && countitem("SilkSheet")== 0)
         goto L_robe_nosilk;
 
 L_robe_menu:
     menu
         "Here, I have some silk cocoons!", -,
-        "Here, I have some silk sheets!", L_robe_nosilk,
+        "Here, I have some silk sheets!", L_robe_sheets,
         "Where can I find silk?", L_where_silk,
         "How much silk do you need?", L_how_much_silk,
         "Oh, never mind.", L_main_menu;
@@ -723,10 +726,33 @@ L_robe_menu:
         goto L_TooMany;
     set Zeny, Zeny - @ROBE_ZENY;
     delitem "SilkCocoon", @ROBE_COCOONS_NR;
-    getitem "SilkRobe", 1;
     mes "[Lora Tay the Seamstress]";
     mes "The seamstress puts your cocoons and GP away, takes your measurements and pulls out several silk sheets.  She asks you to stretch out your arms, then pins the silk sheets in place all over your body.";
     next;
+    goto L_get_robe;
+
+L_robe_sheets:
+    set @Robe_with_sheets, 1;
+    mes "[Lora Tay the Seamstress]";
+    mes "\"Let's see... " + @ROBE_SHEETS_NR + " silk sheets and " + @ROBE_SHEETS_ZENY + " GP should just about cover that.\"";
+    next;
+    menu
+        "I'm not interested.", L_main_menu,
+        "Very well then, here you are.", -;
+    if (countitem("SilkSheet") < @ROBE_SHEETS_NR)
+        goto L_robe_missing_sheets;
+    if (Zeny < @ROBE_SHEETS_ZENY)
+        goto L_robe_sheet_missing_Zeny;
+    getinventorylist;
+    if (@inventorylist_count == 100 && countitem("SilkSheet") > @ROBE_SHEETS_NR)
+        goto L_TooMany;
+    set Zeny, Zeny - @ROBE_SHEETS_ZENY;
+    delitem "SilkSheet", @ROBE_SHEETS_NR;
+    mes "[Lora Tay the Seamstress]";
+    mes "The seamstress puts your GP away, takes your measurements and puts the silk sheets on the table.  She asks you to stretch out your arms, then pins the silk sheets in place all over your body.";
+    next;
+    
+L_get_robe:
     mes "[Lora Tay the Seamstress]";
     mes "She proceeds to make a number of mysterious marks on the sheets with a charcoal pen.  Meanwhile, your arms are getting tired, but you're afraid to lower them-- she used a lot of pins to put everything into place, and you lost track of where they went...";
     next;
@@ -736,10 +762,18 @@ L_robe_menu:
     next;
     mes "[Lora Tay the Seamstress]";
     mes "She then treats the seams with some odorless liquid, making them vanish completely.  Finally she hands you the finished robe.";
+    getitem "SilkRobe", 1;
+    if (@Robe_with_sheets == 1) 
+        goto L_robe_sheet_end;
     mes "\"Here you are now, this will fit.  And don't you dare tell anyone that I did this!  I'm not about to start a silk cocoon collection!\"";
     next;
     goto L_main_menu;
 
+L_robe_sheet_end:
+    mes "\"Here you are now, this will fit. Thank you for bringing the sheets. People are so lazy nowadays! \"";
+    next;
+    goto L_main_menu;
+
 L_robe_missing_cocoons:
     mes "[Lora Tay the Seamstress]";
     mes "\"" + @ROBE_COCOONS_NR + " cocoons is what I said, not " + countitem("SilkCocoon") + ".";
@@ -753,6 +787,19 @@ L_robe_missing_Zeny:
     next;
     goto L_main_menu;
 
+L_robe_missing_sheets:
+    mes "[Lora Tay the Seamstress]";
+    mes "\"" + @ROBE_SHEETS_NR + " silk sheets is what I said, not " + countitem("SilkSheet") + ".";
+    mes @ROBE_SHEETS_NR + " is " + (10-@ROBE_SHEETS_NR) + " less than you have fingers, in case that helps.\"";
+    next;
+    goto L_main_menu;
+
+L_robe_sheet_missing_Zeny:
+    mes "[Lora Tay the Seamstress]";
+    mes "\"No, no no.  The way this works is that you give me the GP first and I give you the robe afterwards.  You're " + (@ROBE_SHEETS_ZENY - Zeny) + " GP short, so come back when you can afford the robe!\"";
+    next;
+    goto L_main_menu;
+
 L_where_silk:
     mes "[Lora Tay the Seamstress]";
     mes "\"Oh, Hetchel on the Tulimshar Marketplace can weave them for you.\"";
@@ -776,6 +823,11 @@ L_robe_nosilk:
     goto L_main_menu;
 
 L_end:
+    set @ROBE_COCOONS_NR, 0; 
+    set @ROBE_ZENY, 0;
+    set @ROBE_SHEETS_NR, 0;
+    set @ROBE_SHEETS_ZENY, 0;
+    set @Robe_with_sheets, 0;
     close;
 
 // Input: @items (array of items you want to choose from)
diff --git a/world/map/npc/018-3/evil-obelisk.txt b/world/map/npc/018-3/evil-obelisk.txt
index c80e3b59..aec1345b 100644
--- a/world/map/npc/018-3/evil-obelisk.txt
+++ b/world/map/npc/018-3/evil-obelisk.txt
@@ -3,8 +3,16 @@
 018-3.gat,67,28,0|script|Evil Obelisk|185,{
     callfunc "ClearVariables";
     set @map$, "018-3.gat";
-    set @x, 67;
-    set @y, 28;
+    set @x0, 56;
+    set @y0, 22;
+    set @x1, 77;
+    set @y1, 37;
     callfunc "EvilObelisk";
+//clearing vars
+    set @map$, "";
+    set @x0, 0;
+    set @y0, 0;
+    set @x1, 0;
+    set @y1, 0;
     close;
 }
diff --git a/world/map/npc/020-1/soul-menhir.txt b/world/map/npc/020-1/soul-menhir.txt
index 68a81acc..cdcc05c1 100644
--- a/world/map/npc/020-1/soul-menhir.txt
+++ b/world/map/npc/020-1/soul-menhir.txt
@@ -3,8 +3,8 @@
 020-1.gat,63,89,0|script|Soul Menhir|346,{
     callfunc "ClearVariables";
     set @map$, "020-1.gat";
-    setarray @Xs, 62, 63, 64, 62, 64, 62, 63, 64;
-    setarray @Ys, 88, 88, 88, 89, 89, 90, 90, 90;
+    setarray @Xs, 62, 63, 64, 62, 64, 62, 64;
+    setarray @Ys, 88, 88, 88, 89, 89, 90, 90;
     set @x, 0;
     set @y, 0;
     callfunc "SoulMenhir";
diff --git a/world/map/npc/021-1/_import.txt b/world/map/npc/021-1/_import.txt
index 30acb5b8..9fa30a77 100644
--- a/world/map/npc/021-1/_import.txt
+++ b/world/map/npc/021-1/_import.txt
@@ -7,12 +7,12 @@ 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
 npc: npc/021-1/mapflags.txt
 npc: npc/021-1/north_shops.txt
 npc: npc/021-1/npcs.txt
-npc: npc/021-1/royal_guards.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 5d620e74..618c057a 100644
--- a/world/map/npc/021-1/_warps.txt
+++ b/world/map/npc/021-1/_warps.txt
@@ -7,10 +7,14 @@
 021-1.gat,55,134|warp|To Government Building|-1,-1,021-2.gat,33,29
 021-1.gat,57,134|warp|To Government Building|-1,-1,021-2.gat,39,29
 021-1.gat,103,100|warp|To Tulimshar Bakery|-1,-1,021-2.gat,91,27
-021-1.gat,103,96|warp|toBakery|-1,-1,021-2.gat,122,23
+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 Tulimshar Forge|-1,-1,021-2.gat,25,66
-021-1.gat,52,95|warp|To Tulimshar Forge|-1,-1,021-2.gat,23,98
+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,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,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
diff --git a/world/map/npc/021-1/gate_guards.txt b/world/map/npc/021-1/gate_guards.txt
index 6af33f2f..ad0e80b4 100644
--- a/world/map/npc/021-1/gate_guards.txt
+++ b/world/map/npc/021-1/gate_guards.txt
@@ -21,20 +21,25 @@
 }
 
 // Guards by the gates to East Tulimshar
+021-1.gat,146,23,0|script|Guard|104,{
+    mes "[Guard]";
+    mes "\"I make sure less desirables don't enter the Noble District.\"";
+    close;
+}
 021-1.gat,156,42,0|script|Guard|104,{
     mes "[Guard]";
-    mes "\"It's still a mess in East Tulimshar. The volcano and earthquake did a lot of damage.\"";
+    mes "\"The volcano and earthquake did a lot of damage, but the citizens of Tulimshar sure did a good job of cleaning up.\"";
     close;
 }
 
 021-1.gat,156,95,0|script|Guard|104,{
     mes "[Guard]";
-    mes "\"It can get quite dangerous east of town. But for now, the passage is closed.\"";
+    mes "\"The Palace is East of here. That is where you will find the Council of Wizards.\"";
     close;
 }
 
 // Near the bazaar, outside the government building
-021-1.gat,58,135,0|script|Guard|123,{
+021-1.gat,55,136,0|script|Guard|123,{
     mes "[Guard]";
     mes "\"This is a government building. They have some clerical and tax offices in here. There is also a jail in the subbasement.\"";
     close;
diff --git a/world/map/npc/021-1/hetchel.txt b/world/map/npc/021-1/hetchel.txt
new file mode 100644
index 00000000..e7ca7bd9
--- /dev/null
+++ b/world/map/npc/021-1/hetchel.txt
@@ -0,0 +1,144 @@
+//  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?", -;
+    next;
+    goto 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?", -;
+    next;
+
+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?", -;
+//        "Do you have any silk robe I could buy?", L_robe,
+//        "Goodbye.", L_end;
+    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;
+
+L_sheet_menu:
+    menu
+        "I have what you asked for.", -,
+        "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;
+    next;
+    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?", -;
+    next;
+    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;
+//
+//L_robe_menu:
+//    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.\"";
+
+L_end:
+    set @SHEET_COCOONS_NR, 0;
+    set @SHEET_ZENY, 0;
+    set @SheetCount, 0;
+    close;
+}
+
diff --git a/world/map/npc/021-1/imec.txt b/world/map/npc/021-1/imec.txt
index 5ad150f8..ac541c87 100644
--- a/world/map/npc/021-1/imec.txt
+++ b/world/map/npc/021-1/imec.txt
@@ -10,7 +10,7 @@ OnInit:
     end;
 }
 
-021-1.gat,128,36,0|script|Imec|162,{
+021-1.gat,120,33,0|script|Imec|162,{
 
     set @state, ((QUEST_NorthTulimshar & $@ImecShopNT_MASK) >> $@ImecShopNT_SHIFT);
     set @money, 500;
diff --git a/world/map/npc/021-1/north_shops.txt b/world/map/npc/021-1/north_shops.txt
index 75df89e0..71b9e757 100644
--- a/world/map/npc/021-1/north_shops.txt
+++ b/world/map/npc/021-1/north_shops.txt
@@ -3,7 +3,18 @@
 // More high-end stuff to satisfy the richer people in Royal Tulimshar
 
 // Some clothing
-021-1.gat,136,38,0|shop|Inar|108,CottonShirt :-1,CottonShorts :-1,CottonBoots :-1,DesertShirt :-1,SilkRobe :-5,DesertHat :-4
+021-1.gat,135,38,0|shop|Inar|108,CottonShirt :-1,CottonShorts :-1,CottonBoots :-1,DesertShirt :-1,SilkRobe :-5,DesertHat :-4
+
+021-1.gat,129,40,0|script|Well|400,{
+    callfunc "WaterBottle";
+}
+
+// An officer (for security)
+021-1.gat,128,36,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
@@ -25,31 +36,3 @@ L_Close:
     close;
 }
 
-// A barber (later we can make it so certain styles need to come from him, for a price)
-021-1.gat,119,29,0|script|Issay|156,{
-    mes "[Issay the Barber]";
-    mes "\"Do you need a change of style?\"";
-    next;
-    callfunc "Barber";
-    mes "[Issay the Barber]";
-    mes "\"Come again!\"";
-    close;
-}
-
-// Another banker
-021-1.gat,122,32,0|script|Hydusun|149,{
-    set @npcname$, "Hydusun";
-    callfunc "Banker";
-    close;
-}
-
-021-1.gat,129,40,0|script|Well|400,{
-    callfunc "WaterBottle";
-}
-
-// An officer (for security)
-021-1.gat,130,38,0|script|Officer|150,{
-    mes "[Officer]";
-    mes "I'm here for extra security for this market.";
-    close;
-}
diff --git a/world/map/npc/021-1/npcs.txt b/world/map/npc/021-1/npcs.txt
index 89a3111e..662a69e2 100644
--- a/world/map/npc/021-1/npcs.txt
+++ b/world/map/npc/021-1/npcs.txt
@@ -10,7 +10,7 @@
     close;
 }
 
-021-1.gat,75,67,0|script|Silvia|207,{
+021-1.gat,76,67,0|script|Silvia|207,{
     set @npcname$, "Silvia";
 
     mes "[" + @npcname$ + "]";
@@ -22,7 +22,7 @@
     close;
 }
 
-021-1.gat,45,77,0|script|Pauline|208,{
+021-1.gat,55,66,0|script|Pauline|208,{
     set @npcname$, "Pauline";
 
     mes "[" + @npcname$ + "]";
@@ -32,7 +32,7 @@
     close;
 }
 
-021-1.gat,49,123,0|script|Michel|215,{
+021-1.gat,51,123,0|script|Michel|215,{
     set @npcname$, "Michel";
 
     mes "[" + @npcname$ + "]";
diff --git a/world/map/npc/021-1/royal_guards.txt b/world/map/npc/021-1/royal_guards.txt
deleted file mode 100644
index 1920e43b..00000000
--- a/world/map/npc/021-1/royal_guards.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-//
-
-021-1.gat,141,23,0|script|Guard|126,{
-    mes "[Guard]";
-    mes "\"Stay away.\"";
-    close;
-}
-
-021-1.gat,147,23,0|script|Guard|126,{
-    mes "[Guard]";
-    mes "\"Stay away.\"";
-    close;
-}
diff --git a/world/map/npc/021-2/_import.txt b/world/map/npc/021-2/_import.txt
index bb80fc32..7b955fb5 100644
--- a/world/map/npc/021-2/_import.txt
+++ b/world/map/npc/021-2/_import.txt
@@ -4,11 +4,13 @@ map: 021-2.gat
 npc: npc/021-2/_mobs.txt
 npc: npc/021-2/_warps.txt
 npc: npc/021-2/bakery.txt
+npc: npc/021-2/bank.txt
+npc: npc/021-2/barber.txt
 npc: npc/021-2/government_building.txt
 npc: npc/021-2/heathin.txt
+npc: npc/021-2/hotel_receptionist.txt
 npc: npc/021-2/inya.txt
 npc: npc/021-2/jhedia.txt
 npc: npc/021-2/kylian.txt
 npc: npc/021-2/mapflags.txt
-npc: npc/021-2/workshop.txt
 npc: npc/021-2/yanis.txt
diff --git a/world/map/npc/021-2/_warps.txt b/world/map/npc/021-2/_warps.txt
index ad18520c..4614f970 100644
--- a/world/map/npc/021-2/_warps.txt
+++ b/world/map/npc/021-2/_warps.txt
@@ -2,7 +2,6 @@
 // North Tulimshar Indoor warps
 
 021-2.gat,27,30|warp|To Outside|-1,-1,021-1.gat,53,135
-021-2.gat,33,30|warp|To Outside|-1,-1,021-1.gat,55,135
 021-2.gat,39,30|warp|To Outside|-1,-1,021-1.gat,57,135
 021-2.gat,91,28|warp|To Outside|-1,-1,021-1.gat,103,101
 021-2.gat,122,24|warp|To Roof|-1,-1,021-1.gat,103,97
@@ -13,4 +12,12 @@
 021-2.gat,46,97|warp|To First Floor|0,-1,021-2.gat,46,58
 021-2.gat,46,57|warp|To Second Floor|0,-1,021-2.gat,46,96
 021-2.gat,70,58|warp|To Main Room|-1,-1,021-2.gat,42,54
-021-2.gat,28,130|warp|to Outside|-1,-1,021-1.gat,43,111
+021-2.gat,28,130|warp|To Outside|-1,-1,021-1.gat,43,111
+021-2.gat,28,130|warp|To Outside|-1,-1,021-1.gat,43,111
+021-2.gat,84,93|warp|To First Floor|-1,0,021-2.gat,80,125
+021-2.gat,84,123|warp|To Second Floor|-1,0,021-2.gat,81,95
+021-2.gat,79,139|warp|To Outside|-1,-1,021-1.gat,132,32
+021-2.gat,72,139|warp|To Outside|-1,-1,021-1.gat,125,32
+021-2.gat,124,69|warp|To Outside|-1,-1,021-1.gat,125,28
+021-2.gat,75,93|warp|To Outside|-1,-1,021-1.gat,133,25
+021-2.gat,33,30|warp|To Outside|-1,-1,021-1.gat,55,135
diff --git a/world/map/npc/021-2/bank.txt b/world/map/npc/021-2/bank.txt
new file mode 100644
index 00000000..5ebbe5ea
--- /dev/null
+++ b/world/map/npc/021-2/bank.txt
@@ -0,0 +1,7 @@
+// Another banker
+021-2.gat,69,135,0|script|Hydusun|149,{
+    set @npcname$, "Hydusun";
+    callfunc "Banker";
+    close;
+}
+
diff --git a/world/map/npc/021-2/barber.txt b/world/map/npc/021-2/barber.txt
new file mode 100644
index 00000000..d0ff401e
--- /dev/null
+++ b/world/map/npc/021-2/barber.txt
@@ -0,0 +1,11 @@
+// A barber (later we can make it so certain styles need to come from him, for a price)
+021-2.gat,72,101,0|script|Issay|156,{
+    mes "[Issay the Barber]";
+    mes "\"Do you need a change of style?\"";
+    next;
+    callfunc "Barber";
+    mes "[Issay the Barber]";
+    mes "\"Come again!\"";
+    close;
+}
+
diff --git a/world/map/npc/021-2/heathin.txt b/world/map/npc/021-2/heathin.txt
index 526e64e0..681f40df 100644
--- a/world/map/npc/021-2/heathin.txt
+++ b/world/map/npc/021-2/heathin.txt
@@ -1,6 +1,6 @@
 //Items for NPC are incomplete.  Makes "simple ring" which can be crafted into a useful ring by Inya and terranite armor.
 
-021-2.gat,29,55,0|script|Heathin|147,{
+021-2.gat,70,129,0|script|Heathin|147,{
 
     set @TARROW_REQ_TERRA_ORE, 1;
     set @TARROW_REQ_COAL, 5;
diff --git a/world/map/npc/021-2/workshop.txt b/world/map/npc/021-2/hotel_receptionist.txt
index ed23ab5b..0a7fcbb2 100644
--- a/world/map/npc/021-2/workshop.txt
+++ b/world/map/npc/021-2/hotel_receptionist.txt
@@ -3,9 +3,9 @@
 // The receptionist
 021-2.gat,22,63,0|script|Sonir|118,{
     mes "[Sonir]";
-    mes "\"This is Tulimshar's main workshop. Much crafting happens here.\"";
+    mes "\"Welcome to The Wizards's Rest!\"";
     next;
     mes "[Sonir]";
-    mes "\"We also have limited housing on the second floor.\"";
+    mes "\"We have limited housing on the second floor.\"";
     close;
-}
\ No newline at end of file
+}
diff --git a/world/map/npc/021-2/inya.txt b/world/map/npc/021-2/inya.txt
index 946bdb33..4a70730c 100644
--- a/world/map/npc/021-2/inya.txt
+++ b/world/map/npc/021-2/inya.txt
@@ -1,7 +1,7 @@
 //Gemstones: Diamond (white) , Ruby (red), Emerald (green), Sapphire (blue), Topaz (yellow), Amethyst (purple)
 //The power of the gems is important to future balance of these rings.  Are they related to stats, tiers of power, schools of magic?
 
-021-2.gat,43,62,0|script|Inya|106,{
+021-2.gat,80,134,0|script|Inya|106,{
 
     mes "[Inya]";
     mes "\"I am Inya, a jeweler of fine rings.  If you have a Simple Ring and a gem, I can make a nice ring for you for 1,000,000 gold pieces.\"";
diff --git a/world/map/npc/021-2/jhedia.txt b/world/map/npc/021-2/jhedia.txt
index 32f043f3..1bffd0eb 100644
--- a/world/map/npc/021-2/jhedia.txt
+++ b/world/map/npc/021-2/jhedia.txt
@@ -1,6 +1,6 @@
 // Ingot maker takes iron ore, gives ingots for future crafting purposes.
 
-021-2.gat,23,55,0|script|Jhedia|160,{
+021-2.gat,70,124,0|script|Jhedia|160,{
 
     set @Cost_Per_Ingot, 1000;
     set @Iron_Ore_Per, 5;
diff --git a/world/map/npc/029-1/barrier.txt b/world/map/npc/029-1/barrier.txt
index 85882c89..54ef3878 100644
--- a/world/map/npc/029-1/barrier.txt
+++ b/world/map/npc/029-1/barrier.txt
@@ -1,4 +1,4 @@
-029-1.gat,54,36,0|script|#CandorBarrier|45,1,1,{
+029-1.gat,54,37,0|script|#CandorBarrier|45,0,0,{
     if ($@FIGHT_CAVE_STATUS == 1) goto L_Block;
     warp "029-3.gat", 46, 23;
     end;
diff --git a/world/map/npc/029-3/barrier.txt b/world/map/npc/029-3/barrier.txt
index acfb642c..bfd4e3be 100644
--- a/world/map/npc/029-3/barrier.txt
+++ b/world/map/npc/029-3/barrier.txt
@@ -1,4 +1,4 @@
-029-3.gat,45,20,0|script|#FightCaveBarrier|45,1,1,{
+029-3.gat,46,21,0|script|#FightCaveBarrier|45,0,0,{
     if ($@FIGHT_CAVE_STATUS == 1) goto L_Block;
     warp "029-1.gat", 54, 39;
     end;
diff --git a/world/map/npc/031-1/house.txt b/world/map/npc/031-1/house.txt
index 70093c3f..b35d816f 100644
--- a/world/map/npc/031-1/house.txt
+++ b/world/map/npc/031-1/house.txt
@@ -2,7 +2,7 @@
 // player can enter, if Cindy is already saved and the player has been invited, quest status > 2
 // author: Jenalya
 
-031-1.gat,95,80,0|script|#Door|45,1,1,{
+031-1.gat,95,80,0|script|#Door|45,0,0,{
     set @Q_Nivalis_state_MASK, NIBBLE_5_MASK;
     set @Q_Nivalis_state_SHIFT, NIBBLE_5_SHIFT;
 
diff --git a/world/map/npc/031-3/labyrinth.txt b/world/map/npc/031-3/labyrinth.txt
index ed06cf60..39a8ba90 100644
--- a/world/map/npc/031-3/labyrinth.txt
+++ b/world/map/npc/031-3/labyrinth.txt
@@ -1,9 +1,9 @@
 // Conditional warp for yeti cave
 // Authors: Jenalya
 
-031-3.gat,46,24,0|script|#YetiBarrier|45,1,1,{
+031-3.gat,46,24,0|script|#YetiBarrier|45,0,0,{
     if ($@FIGHT_YETI_STATUS == 1) goto L_Blocked;
-    warp "031-4.gat", 40, 69;
+    warp "031-4.gat", 40, 70;
     end;
 
 L_Blocked:
diff --git a/world/map/npc/031-4/barrier.txt b/world/map/npc/031-4/barrier.txt
index 243bb0d1..83daffd7 100644
--- a/world/map/npc/031-4/barrier.txt
+++ b/world/map/npc/031-4/barrier.txt
@@ -1,6 +1,6 @@
-031-4.gat,40,71,0|script|#YetiBarrier|45,1,1,{
+031-4.gat,40,71,0|script|#YetiBarrier|45,0,0,{
     if ($@FIGHT_YETI_STATUS == 1) goto L_Block;
-    warp "031-3.gat", 46, 27;
+    warp "031-3.gat", 46, 25;
     end;
 
 L_Block:
diff --git a/world/map/npc/034-1/_warps.txt b/world/map/npc/034-1/_warps.txt
index 9c0acf36..be29b7b1 100644
--- a/world/map/npc/034-1/_warps.txt
+++ b/world/map/npc/034-1/_warps.txt
@@ -5,3 +5,5 @@
 034-1.gat,16,103|warp|To Deep Snow Forest|-1,1,045-1.gat,176,133
 034-1.gat,15,31|warp|To Deep Snow Forest|-1,0,045-1.gat,174,59
 034-1.gat,95,18|warp|ToHighlands1|0,-1,046-1.gat,95,116
+034-1.gat,31,68|warp|To Trapper|-1,-1,034-2.gat,28,31
+034-1.gat,64,99|warp|To Cabin|-1,-1,034-2.gat,73,29
diff --git a/world/map/npc/034-2/_import.txt b/world/map/npc/034-2/_import.txt
new file mode 100644
index 00000000..07dfa138
--- /dev/null
+++ b/world/map/npc/034-2/_import.txt
@@ -0,0 +1,5 @@
+// Map 034-2: Trappers Huts
+// This file is generated automatically. All manually changes will be removed when running the Converter.
+map: 034-2.gat
+npc: npc/034-2/_mobs.txt
+npc: npc/034-2/_warps.txt
diff --git a/world/map/npc/034-2/_mobs.txt b/world/map/npc/034-2/_mobs.txt
new file mode 100644
index 00000000..9cabee2a
--- /dev/null
+++ b/world/map/npc/034-2/_mobs.txt
@@ -0,0 +1,8 @@
+// This file is generated automatically. All manually changes will be removed when running the Converter.
+// Trappers Huts mobs
+
+
+
+034-2.gat,0,0,0|script|Mob034-2|-1,{
+    end;
+}
diff --git a/world/map/npc/034-2/_warps.txt b/world/map/npc/034-2/_warps.txt
new file mode 100644
index 00000000..3f06da7f
--- /dev/null
+++ b/world/map/npc/034-2/_warps.txt
@@ -0,0 +1,5 @@
+// This file is generated automatically. All manually changes will be removed when running the Converter.
+// Trappers Huts warps
+
+034-2.gat,28,32|warp|To Outside|-1,-1,034-1.gat,31,69
+034-2.gat,73,30|warp|To Outside|-1,-1,034-1.gat,64,100
diff --git a/world/map/npc/056-2/barrier.txt b/world/map/npc/056-2/barrier.txt
index c72a17f7..dc26dbfb 100644
--- a/world/map/npc/056-2/barrier.txt
+++ b/world/map/npc/056-2/barrier.txt
@@ -1,4 +1,4 @@
-056-2.gat,23,33,0|script|#Barrier|45,1,1,{
+056-2.gat,23,33,0|script|#Barrier|45,0,0,{
     if (Mirak_Bantime > gettimetick(2))
         goto L_Block;
     if (BaseLevel < 25)
diff --git a/world/map/npc/_import.txt b/world/map/npc/_import.txt
index c16ab26e..05d7791e 100644
--- a/world/map/npc/_import.txt
+++ b/world/map/npc/_import.txt
@@ -83,6 +83,7 @@ import: npc/032-1/_import.txt
 import: npc/032-3/_import.txt
 import: npc/033-1/_import.txt
 import: npc/034-1/_import.txt
+import: npc/034-2/_import.txt
 import: npc/041-1/_import.txt
 import: npc/042-1/_import.txt
 import: npc/042-2/_import.txt
diff --git a/world/map/npc/functions/evil_obelisk.txt b/world/map/npc/functions/evil_obelisk.txt
index 30fe927d..f1447375 100644
--- a/world/map/npc/functions/evil_obelisk.txt
+++ b/world/map/npc/functions/evil_obelisk.txt
@@ -3,62 +3,67 @@ function|script|EvilObelisk|{
     mes "(A mystical aura surrounds this stone.  It seems to crave money.)";
     next;
 
+    set @cost_jacko, 6500;
+    set @cost_gy1, 4000;
+    set @cost_gy2, 3000;
+    set @cost_skull, 2800;
+    set @cost_snake, 2500;
+
     menu
-        "Pay it 200,000 gold", L_JACKO,
-        "Pay it 100,000 gold", L_GRAVEYARD1,
-        "Pay it 75,000 gold", L_GRAVEYARD2,
-        "Pay it 50,000 gold", L_SKULL,
-        "Pay it 25,000 gold", L_SNAKE,
-        "Don't pay it anything.", -;
-    close;
-    return;
+        "Don't pay it anything.", -,
+        "Pay it " + @cost_jacko + " gold.", L_JACKO,
+        "Pay it " + @cost_gy1 + " gold.", L_GRAVEYARD1,
+        "Pay it " + @cost_gy2 + " gold.", L_GRAVEYARD2,
+        "Pay it " + @cost_skull + " gold.", L_SKULL,
+        "Pay it " + @cost_snake + " gold.", L_SNAKE;
+    goto L_Close;
 
 L_JACKO:
-    if (Zeny < 200000)
+    if (Zeny < @cost_jacko)
         goto L_NotEnough;
-    set Zeny, Zeny - 200000;
+    set Zeny, Zeny - @cost_jacko;
     set @mob_id, 1022;
-    set @mob_count, rand(2) + 1;
+    set @mob_count, rand(1,2);
     goto L_Summon;
 
 L_GRAVEYARD1:
-    if (Zeny < 100000)
+    if (Zeny < @cost_gy1)
         goto L_NotEnough;
     set @temp, rand(2);
     if(@temp == 0)
         set @mob_id, 1036;  // Zombie
     if(@temp == 1)
         set @mob_id, 1045;  // Fallen
-    set @mob_count, rand(2) + 1;
-    set Zeny, Zeny - 100000;
+    set @mob_count, rand(1,2);
+    set Zeny, Zeny - @cost_gy1;
     goto L_Summon;
 
 L_GRAVEYARD2:
-    if (Zeny < 75000)
+    if (Zeny < @cost_gy2)
         goto L_NotEnough;
     set @temp, rand(2);
     if(@temp == 0)
         set @mob_id, 1044;  // Lady Skelly
     if(@temp == 1)
         set @mob_id, 1043;  // Normal Skelly
-    set @mob_count, rand(2) + 1;
-    set Zeny, Zeny - 75000;
+    set @mob_count, rand(1,2);
+    set Zeny, Zeny - @cost_gy2;
     goto L_Summon;
 
 L_SKULL:
-    if (Zeny < 50000)
+    if (Zeny < @cost_skull)
         goto L_NotEnough;
     set @temp, rand(2);
     if(@temp == 0)
         set @mob_id, 1024;  // Poison
     if(@temp == 1)
         set @mob_id, 1023;  // Fire
-    set @mob_count, rand(4) + 1;
-    set Zeny, Zeny - 50000;
+    set @mob_count, rand(1,4);
+    set Zeny, Zeny - @cost_skull;
     goto L_Summon;
 
 L_SNAKE:
-    if (Zeny < 25000)
+    if (Zeny < @cost_snake)
         goto L_NotEnough;
     set @temp, rand(4);
     if(@temp == 0)
@@ -69,17 +74,24 @@ L_SNAKE:
         set @mob_id, 1010;  // Normal
     if(@temp == 3)
         set @mob_id, 1021;  // Cave
-    set @mob_count, rand(4) + 1;
-    set Zeny, Zeny - 25000;
+    set @mob_count, rand(1,4);
+    set Zeny, Zeny - @cost_snake;
     goto L_Summon;
 
 L_Summon:
-    monster @map$, @x, @y, "Evil", @mob_id, @mob_count;
-    close;
-    return;
+    areamonster @map$, @x0, @y0, @x1, @y1, "Evil", @mob_id, @mob_count;
+    goto L_Close;
 
 L_NotEnough:
     mes "You don't have that much money";
-    close;
+    goto L_Close;
+
+L_Close:
+    set @cost_jacko, 0;
+    set @cost_gy1, 0;
+    set @cost_gy2, 0;
+    set @cost_skull, 0;
+    set @cost_snake, 0;
     return;
+
 }
diff --git a/world/map/npc/functions/game_rules.txt b/world/map/npc/functions/game_rules.txt
index 01fc163c..7cc2bd63 100644
--- a/world/map/npc/functions/game_rules.txt
+++ b/world/map/npc/functions/game_rules.txt
@@ -30,13 +30,13 @@ L_English:
     goto L_End;
 
 L_German:
-    mes "Wir bitten um das Einhalten der folgenden Regeln:";
+    mes "Wir bitten um das Einhalten folgender Regeln:";
     mes "1. Keine Beleidigungen, Schimpfwörter, Schmähungen oder Rufmord.";
     mes "2. Keine 'bots' (automatisierte Spieler). Dies beinhaltet JEGLICHE Teilnahme am Spiel während der Abwesenheit des Spielers. Es beinhaltet auch das automatisierte Folgen anderer Spieler.";
     mes "3. Kein 'spamming' oder 'flooding' (schnelles Wiederholen von Nachrichten oder Aufforderungen zum Warenhandel).";
     mes "4. Kein Betteln.";
-    mes "5. Englisch ist die einzige zulässige Sprache im öffentlichen Raum.";
-    mes "6. Behandelt andere so, wie Ihr behandelt werden wollt.";
+    mes "5. Englisch ist die einzig zulässige Sprache im öffentlichen Raum.";
+    mes "6. Behandele andere so, wie du selbst behandelt werden willst.";
     mes "Jegliche Regelverstöße können bestraft werden, entweder durch ein Zurücksetzen der Charaktereigenschaften und -besitztümer auf den Ausgangszustand, oder durch einen temporären oder permanenten Ausschluss aus dem Spiel.";
     next;
     mes "Automatisiertes Spielverhalten liegt vor, wenn ein sich bewegender/kämpfender Spieler nicht intelligent auf Gesprächsaufforderungen reagiert.";
@@ -86,30 +86,29 @@ L_French:
     goto L_End;
 
 L_Spanish:
-    mes "ATTENTION: this translation is outdated. Please refer to the English version and submit a patch.";
-    mes "Los jugadores que infringan las normas siguientes pueden ser censurados( incluso de forma permanente) o se podran resetear sus cuentas a la discrecion de los administradores:";
-    mes "1. No abuse de otros jugadores (incluye insultos, palabras mal sonantes , y demas dirigidos a una o varias personas en particular)";
-    mes "2. No utilizar programas automaticos ( se entiende por esto cualquier actividad realizada sin que el jugador este tocando el teclado fisicamente)";
+    mes "Los jugadores que infringan las siguientes reglas pueden ser bloqueados (incluso permanentemente) o sus personajes reseteados segun la discrecion de los administradores.";
+    mes "1. No abuse de otros jugadores (esto incluye insultos, palabras mal sonantes, burlas, etc. dirigidas a una o varias personas)";
+    mes "2. No utilizar programas automaticos (esto hace referencia a cualquier tipo de actividad llevada a cabo sin que el jugador este tocando el teclado directamente o al seguimiento automatico)";
     mes "3. No envie mensajes publicitarios o inunde el chat de mensajes (incluyendo los mensajes referidos al comercio en el juego)";
-    mes "4. Esta prohibida cualquier forma de mendicidad";
-    mes "5. Hable solamente en Ingles en el chat publico";
-    mes "6. Trata a los demas de la misma manera que te gustaria ser tratado";
+    mes "4. No mendigar.";
+    mes "5. Escriba unicamente en Ingles en el chat publico";
+    mes "6. Trate a los demas de la misma forma que le gustaria ser tratado";
     next;
-    mes "El uso de programas automaticos se investigara hablando con jugadores que esten moviendose y/o atacando.";
+    mes "El uso de programas automaticos para jugar sin estar frente al teclado se determinara hablando con los jugadores que esten moviendose y/o atacando.";
+    mes "El seguimiento automatizado sera determinado por observacion.";
     next;
     goto L_End;
 
 L_Swedish:
-    mes "ATTENTION: this translation is outdated. Please refer to the English version and submit a patch.";
-    mes "Spelare som bryter mot dessa regler riskerar att helt sonika bli utkastade (antingen under kort period eller permanent), den som kastats ut kan be en GM om att starta om sitt konto.";
-    mes "1. Skymfa inte andra (svordomar och annat riktat till att skada en eller flera individer)";
-    mes "2. Inga bottar (med bottande avses ALLA aktiviteter som sker bortom tangentbordet)";
+    mes "Spelare som bryter mot dessa regler riskerar att bli utkastade eller portade (antingen under kort period eller permanent), den som blivit portad/bannlyst ut kan be en GM om att starta om sitt konto.";
+    mes "1. Förolämpa inte medspelare (svordomar och annat riktat till att skada en eller flera individer)";
+    mes "2. Inga bottar (med bottande avses ALLA aktiviteter som sker när spelaren inte aktivt spelar eller styr sin karraktär)";
     mes "3. Inget spammande/floodande (inklusive meddelanden om byteshandel)";
     mes "4. Tigg inte";
     mes "5. Prata bara engelska i den offentliga chatten";
     mes "6. Behandla andra som du vill bli behandlad";
     next;
-    mes "Hysta misstankar om bottande kontrolleras genom att prata med spelaren under dess kringvandrande eller attackerande.";
+    mes "Vid misstankar om bottande kontrolleras detta genom att prata med spelaren under dess kringvandrande eller attackerande.";
     next;
     goto L_End;