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

Tile map fixes sprite travel

5 files changed, 10 insertions, 19 deletions

diff --git a/world/map/npc/001-2/casino.txt b/world/map/npc/001-2/casino.txt
index e14decd6..1c9c61cf 100644
--- a/world/map/npc/001-2/casino.txt
+++ b/world/map/npc/001-2/casino.txt
@@ -15,32 +15,32 @@ L_End:
     end;
 }
 
-001-2.gat,134,23,0|script|Valdo|117,
+001-2.gat,39,32,0|script|Valdo|117,
 {
     mes "[Valdo the Worker]";
     mes "\"Please let me work. I'm really in a hurry!\"";
     close;
 }
 
-001-2.gat,37,65,0|script|Slot1|400,
+001-2.gat,37,65,0|script|Slots#1|400,
 {
     callfunc "SlotMachine";
     close;
 }
 
-001-2.gat,39,65,0|script|Slot2|400,
+001-2.gat,39,65,0|script|Slots#2|400,
 {
     callfunc "SlotMachine";
     close;
 }
 
-001-2.gat,41,65,0|script|Slot3|400,
+001-2.gat,41,65,0|script|Slots#3|400,
 {
     callfunc "SlotMachine";
     close;
 }
 
-001-2.gat,32,67,0|shop|MoneyChanger|124,CasinoCoins :-1
+001-2.gat,102,27,0|shop|MoneyChanger|124,CasinoCoins :-1
 
 001-2.gat,28,63,0|script|BlackJack|107,
 {
diff --git a/world/map/npc/001-2/mapflags.txt b/world/map/npc/001-2/mapflags.txt
index 6a7c6a90..41bab423 100644
--- a/world/map/npc/001-2/mapflags.txt
+++ b/world/map/npc/001-2/mapflags.txt
@@ -1 +1,2 @@
 001-2.gat|mapflag|town
+001-2.gat|mapflag|resave|001-1,57,71
diff --git a/world/map/npc/001-2/phaet.txt b/world/map/npc/001-2/phaet.txt
index ebeaa4a0..5711047e 100644
--- a/world/map/npc/001-2/phaet.txt
+++ b/world/map/npc/001-2/phaet.txt
@@ -1,6 +1,6 @@
 //
 
-001-2.gat,24,23,0|script|Phaet|125,
+001-2.gat,132,25,0|script|Phaet|125,0,0,
 {
     mes "[Phaet the Royal Guard]";
     mes "\"Hey, you seem tough enough! Would you like to prove your skills? I'll let you in the arena if you give me 50 gp. You can fight against other players there.\"";
diff --git a/world/map/npc/001-2/shops.txt b/world/map/npc/001-2/shops.txt
index 1857a5df..00db7c93 100644
--- a/world/map/npc/001-2/shops.txt
+++ b/world/map/npc/001-2/shops.txt
@@ -1,13 +1,3 @@
-//
+// Bartender
 
-001-2.gat,26,26,0|shop|InnKeeper|112,Beer :-1,Cake :-1,CherryCake :-1
-
-001-2.gat,103,26,0|script|Rebecca|118,
-{
-    set @npcname$, "Rebecca the Inn Keeper";
-    set @cost, 100;
-    callfunc "Inn";
-    set @npcname$, "";
-    set @cost, 0;
-    close;
-}
+001-2.gat,21,27,0|shop|Bartender#Casino|112,Beer :-1,Cake :-1,CherryCake :-1
diff --git a/world/map/npc/001-2/troupe_leader.txt b/world/map/npc/001-2/troupe_leader.txt
index f48cd51a..996e14e7 100644
--- a/world/map/npc/001-2/troupe_leader.txt
+++ b/world/map/npc/001-2/troupe_leader.txt
@@ -1,6 +1,6 @@
 //
 
-001-2.gat,34,25,0|script|Troupe Leader|165,
+001-2.gat,34,23,0|script|Troupe Leader|165,
 {
     callfunc "ClearVariables";